diff --git a/config/environments/development.rb b/config/environments/development.rb
index 063adbd1b..fdd10c25d 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -24,4 +24,16 @@ Diaspora::Application.configure do
   config.active_support.deprecation = :log
   config.middleware.use MongoMapper::ClearDevMemory
   #config.threadsafe!
+
+  config.action_mailer.delivery_method = :smtp
+  config.action_mailer.default_url_options = {:host => 'pivots.joindiaspora.com'}
+  config.action_mailer.smtp_settings = {
+    :address => 'pivots.joindiaspora.com',
+    :port => 587,
+    :domain => 'mail.joindiaspora.com',
+    :authentication => 'plain',
+    :user_name => 'diaspora-pivots@joindiaspora.com',
+    :password => "xy289|]G+R*-kA",
+    :enable_starttls_auto => true
+  }
 end
diff --git a/config/environments/production.rb b/config/environments/production.rb
index bdeeea249..6a7c03599 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -48,4 +48,15 @@ Diaspora::Application.configure do
   config.i18n.fallbacks = true
   config.threadsafe!
 
+  config.action_mailer.delivery_method = :smtp
+  config.action_mailer.default_url_options = {:host => 'pivots.joindiaspora.com'}
+  config.action_mailer.smtp_settings = {
+    :address => 'pivots.joindiaspora.com',
+    :port => 587,
+    :domain => 'mail.joindiaspora.com',
+    :authentication => 'plain',
+    :user_name => 'diaspora-pivots@joindiaspora.com',
+    :password => "xy289|]G+R*-kA",
+    :enable_starttls_auto => true
+  }
 end
diff --git a/config/initializers/mailer_config.rb b/config/initializers/mailer_config.rb
deleted file mode 100644
index 4890422cf..000000000
--- a/config/initializers/mailer_config.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-#   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
-#   the COPYRIGHT file.
-
-Diaspora::Application.configure do
-  config.action_mailer.delivery_method = :smtp
-  config.action_mailer.default_url_options = {:host => 'pivots.joindiaspora.com'}
-  config.action_mailer.smtp_settings = {
-    :address => 'pivots.joindiaspora.com',
-    :port => 587,
-    :domain => 'mail.joindiaspora.com',
-    :authentication => 'plain',
-    :user_name => 'diaspora-pivots@joindiaspora.com',
-    :password => "xy289|]G+R*-kA",
-    :enable_starttls_auto => true
-  }
-end