X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/e1005ce62f7b7cad67e0492581e480250192db70..d6e605414d88a1917bd204522b0df68ea47fec11:/config/initializers/action_mailer.rb

diff --git a/config/initializers/action_mailer.rb b/config/initializers/action_mailer.rb
index 1467b6fe6..98b599ce9 100644
--- a/config/initializers/action_mailer.rb
+++ b/config/initializers/action_mailer.rb
@@ -4,3 +4,13 @@ ActionMailer::Base.smtp_settings = {
   :port => 25, 
   :domain => 'localhost',
 }
+
+# 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