2 files changed, 6 insertions, 2 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index 59ee47a137..910ee8dd5b 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -1,5 +1,6 @@
 require 'action_mailer/adv_attr_accessor'
 require 'action_mailer/part'
+require 'tmail/net'
 
 module ActionMailer #:nodoc:
   # Usage:
@@ -280,9 +281,12 @@ module ActionMailer #:nodoc:
       end
 
       def perform_delivery_smtp(mail)
+        destinations = mail.destinations
+        mail.ready_to_send
+
         Net::SMTP.start(server_settings[:address], server_settings[:port], server_settings[:domain], 
             server_settings[:user_name], server_settings[:password], server_settings[:authentication]) do |smtp|
-          smtp.sendmail(mail.encoded, mail.from, mail.destinations)
+          smtp.sendmail(mail.encoded, mail.from, destinations)
         end
       end
 
diff --git a/actionmailer/lib/action_mailer/vendor/tmail/net.rb b/actionmailer/lib/action_mailer/vendor/tmail/net.rb
index 0ef433b88a..202bc22672 100755
--- a/actionmailer/lib/action_mailer/vendor/tmail/net.rb
+++ b/actionmailer/lib/action_mailer/vendor/tmail/net.rb
@@ -61,7 +61,7 @@ module TMail
     end
 
     def add_message_id( fqdn = nil )
-      self.message_id = ::TMail::new_msgid(fqdn)
+      self.message_id = ::TMail::new_message_id(fqdn)
     end
 
     def add_date