3 files changed, 19 insertions, 1 deletions
diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md
index 4d8f739403..177dc8109f 100644
--- a/actionmailer/CHANGELOG.md
+++ b/actionmailer/CHANGELOG.md
@@ -4,6 +4,8 @@
 
 * Asynchronously send messages via the Rails Queue *Brian Cardarella*
 
+* Set default Action Mailer options via config.action_mailer.default_options= *Robert Pankowecki*
+
 ## Rails 3.2.5 (Jun 1, 2012) ##
 
 *   No changes.
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index f31e1e007b..ea9a08102f 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -421,6 +421,9 @@ module ActionMailer #:nodoc:
         self.default_params = default_params.merge(value).freeze if value
         default_params
       end
+      #Alias so that we can use it in config/application.rb which requires setters
+      #: config.action_mailer.default_options = {from: "no-replay@example.org"}
+      alias :default_options= :default
 
       # Receives a raw email, parses it into an email object, decodes it,
       # instantiates a new mailer, and passes the email object to the mailer
@@ -786,4 +789,4 @@ module ActionMailer #:nodoc:
 
     ActiveSupport.run_load_hooks(:action_mailer, self)
   end
-end
-\ No newline at end of file
+end
diff --git a/actionmailer/test/base_test.rb b/actionmailer/test/base_test.rb
index 144a6bfe39..9d1b1fda33 100644
--- a/actionmailer/test/base_test.rb
+++ b/actionmailer/test/base_test.rb
@@ -653,6 +653,19 @@ class BaseTest < ActiveSupport::TestCase
     assert_equal "Anonymous mailer body", mailer.welcome.body.encoded.strip
   end
 
+  test "default_from can be set" do
+    class DefaultFromMailer < ActionMailer::Base
+      default :to => 'system@test.lindsaar.net'
+      self.default_options = {from: "robert.pankowecki@gmail.com"}
+
+      def welcome
+        mail(subject: "subject")
+      end
+    end
+
+    assert_equal ["robert.pankowecki@gmail.com"], DefaultFromMailer.welcome.from
+  end
+
   protected
 
     # Execute the block setting the given values and restoring old values after