Merge remote branch 'mainstream/master'

1 files changed, 3 insertions, 4 deletions

diff --git a/actionmailer/lib/action_mailer/delivery_method/smtp.rb b/actionmailer/lib/action_mailer/delivery_method/smtp.rb
index 86b0ae8329..af30c498b5 100644
--- a/actionmailer/lib/action_mailer/delivery_method/smtp.rb
+++ b/actionmailer/lib/action_mailer/delivery_method/smtp.rb
@@ -1,8 +1,9 @@
+require 'net/smtp'
+
 module ActionMailer
   module DeliveryMethod
     # A delivery method implementation which sends via smtp.
     class Smtp < Method
-
       self.settings = {
         :address              => "localhost",
         :port                 => 25,
@@ -15,8 +16,7 @@ module ActionMailer
 
       def perform_delivery(mail)
         destinations = mail.destinations
-        mail.ready_to_send
-        sender = (mail['return-path'] && mail['return-path'].spec) || mail['from']
+        sender = (mail['return-path'] && mail['return-path'].address) || mail['from']
 
         smtp = Net::SMTP.new(settings[:address], settings[:port])
         smtp.enable_starttls_auto if settings[:enable_starttls_auto] && smtp.respond_to?(:enable_starttls_auto)
@@ -26,6 +26,5 @@ module ActionMailer
         end
       end
     end
-
   end
 end