diff --git a/Gemfile b/Gemfile
index 0e0778a2c..41c32db5a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -78,6 +78,9 @@ gem 'mail_extract'
 gem 'griddler'
 gem 'griddler-mandrill'
 gem 'griddler-sendgrid'
+gem 'griddler-mailgun'
+gem 'griddler-postmark'
+gem 'griddler-cloudmailin'
 
 gem 'rails-timeago'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 5a83b9458..1a2e1cbd7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -113,8 +113,14 @@ GEM
     griddler (1.1.0)
       htmlentities
       rails (>= 3.2.0)
+    griddler-cloudmailin (0.0.1)
+      griddler
+    griddler-mailgun (1.0.2)
+      griddler
     griddler-mandrill (1.0.2)
       griddler
+    griddler-postmark (1.0.0)
+      griddler
     griddler-sendgrid (0.0.1)
       griddler
     hashie (3.4.1)
@@ -360,7 +366,10 @@ DEPENDENCIES
   globalize-versioning (~> 0.1.0)
   gravtastic
   griddler
+  griddler-cloudmailin
+  griddler-mailgun
   griddler-mandrill
+  griddler-postmark
   griddler-sendgrid
   http_accept_language
   i18n-country-translations
diff --git a/config/initializers/griddler.rb b/config/initializers/griddler.rb
index be1d40131..cdba62ded 100644
--- a/config/initializers/griddler.rb
+++ b/config/initializers/griddler.rb
@@ -4,5 +4,5 @@
   config.processor_class = EmailProcessor # CommentViaEmail
   config.processor_method = :process # :create_comment (A method on CommentViaEmail)
   config.reply_delimiter = '--- Make sure your reply appears above this line ---'
-  config.email_service = :sendgrid # :sendgrid :cloudmailin, :postmark, :mandrill, :mailgun
+  config.email_service = Settings.mail_service # :sendgrid :cloudmailin, :postmark, :mandrill, :mailgun
 end
diff --git a/config/initializers/mail.rb b/config/initializers/mail.rb
index fd71a70d0..40a4c35e3 100644
--- a/config/initializers/mail.rb
+++ b/config/initializers/mail.rb
@@ -1,7 +1,7 @@
 ActionMailer::Base.smtp_settings = {
-    :address   => "smtp.sendgrid.net",
-    :port      => 587,
-    :user_name => Settings.mail_username,
-    :password  => Settings.mail_api_key,
-    :domain    => 'heroku.com'
-  }
+    :address   => Settings.mail_smtp,
+    :port      => Settings.mail_port,
+    :user_name => Settings.smtp_mail_username,
+    :password  => Settings.smtp_mail_password,
+    :domain    => Settings.mail_domain
+}
diff --git a/config/routes.rb b/config/routes.rb
index 56c2a6f2c..0db6392d4 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -83,52 +83,4 @@
   # Mount attachinary
   mount Attachinary::Engine => "/attachinary"
 
-  # Example of regular route:
-  #   get 'products/:id' => 'catalog#view'
-
-  # Example of named route that can be invoked with purchase_url(id: product.id)
-  #   get 'products/:id/purchase' => 'catalog#purchase', as: :purchase
-
-  # Example resource route (maps HTTP verbs to controller actions automatically):
-  #   resources :products
-
-  # Example resource route with options:
-  #   resources :products do
-  #     member do
-  #       get 'short'
-  #       post 'toggle'
-  #     end
-  #
-  #     collection do
-  #       get 'sold'
-  #     end
-  #   end
-
-  # Example resource route with sub-resources:
-  #   resources :products do
-  #     resources :comments, :sales
-  #     resource :seller
-  #   end
-
-  # Example resource route with more complex sub-resources:
-  #   resources :products do
-  #     resources :comments
-  #     resources :sales do
-  #       get 'recent', on: :collection
-  #     end
-  #   end
-
-  # Example resource route with concerns:
-  #   concern :toggleable do
-  #     post 'toggle'
-  #   end
-  #   resources :posts, concerns: :toggleable
-  #   resources :photos, concerns: :toggleable
-
-  # Example resource route within a namespace:
-  #   namespace :admin do
-  #     # Directs /admin/products/* to Admin::ProductsController
-  #     # (app/controllers/admin/products_controller.rb)
-  #     resources :products
-  #   end
 end
diff --git a/config/settings.yml b/config/settings.yml
index 2ad5dce7d..6f5906ecd 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -11,14 +11,20 @@ site_url: http://support.yourdomain.com # This is the URL of your support site
 site_name: Helpy Support # This is the name of your support site
 site_tagline: Support and Helpdesk Software # This is the tagline of your support site
 product_name: # This is the product name your are supporting
-support_phone: # This is support number to be displayed 
-
-# Mandrill Account
-mandrill_username: #Enter your Madrill username
-mandrill_api_key: #Enter your Madrill API Key
+support_phone: # This is support number to be displayed
 
 # Analytics and Tracking
 google_analytics_id: #Enter your analytics ID
 send_usage_data: true
+
+#Mail specific settings:
 admin_email: inbound.support@yourdomain.com
-from_email: inbound.support@yourdomain.com
+from_email: inbound.support@yourdomain.com # This is the email that will be used for email replies (reply to)
+send_email: true #send email or not
+
+mail_service: :mandrill # :sendgrid :cloudmailin, :postmark, :mandrill, :mailgun
+smtp_mail_username: # Enter your SMTP email username
+smtp_mail_password: # Enter your SMTP email password
+mail_smtp: 'smtp.mandrillapp.com' #Enter the server address for your SMTP server
+mail_port: 587 #Enter the port of your SMTP server
+mail_domain: #Enter your the heroku.com if you are on heroku, otherwise enter your domain