X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2b7f92029f678417025f57c8f6d28e9aea82ad98..399fe3c12a7612f1ad79d376f2859d9c6fd38839:/config/initializers/action_mailer.rb?ds=inline

diff --git a/config/initializers/action_mailer.rb b/config/initializers/action_mailer.rb
index db6c1b9b7..9a8ef011b 100644
--- a/config/initializers/action_mailer.rb
+++ b/config/initializers/action_mailer.rb
@@ -3,14 +3,5 @@ ActionMailer::Base.smtp_settings = {
   :address => 'localhost',
   :port => 25, 
   :domain => 'localhost',
+  :enable_starttls_auto => false
 }
-
-# Monkey patch to fix return-path bug in ActionMailer 2.2.2
-# Can be removed once we go to 2.3
-module Net
-  class SMTP
-    def sendmail(msgstr, from_addr, *to_addrs)
-      send_message(msgstr, from_addr.to_s.sub(/^<(.*)>$/, "\\1"), *to_addrs)
-    end
-  end
-end