diff --git a/config/initializers/mailer_config.rb b/config/initializers/mailer_config.rb
index 9c6d42741..8723e80ab 100644
--- a/config/initializers/mailer_config.rb
+++ b/config/initializers/mailer_config.rb
@@ -16,10 +16,11 @@ Diaspora::Application.configure do
       end
     elsif AppConfig[:mailer_method] == "sendmail"
       config.action_mailer.delivery_method = :sendmail
-      config.action_mailer.sendmail_settings = {
-        :location => AppConfig[:sendmail_location],
-        :arguments => "-i" if AppConfig[:sendmail_exim_fix]
+      sendmail_settings = {
+        :location => AppConfig[:sendmail_location]
       }
+      sendmail_settings[:arguments] = "-i" if AppConfig[:sendmail_exim_fix]
+      config.action_mailer.sendmail_settings = sendmail_settings
     else
       config.action_mailer.delivery_method = :smtp
       if AppConfig[:smtp_authentication] == "none"