Add message_id to AM payload and don't send bcc and cc if they were not sent.

1 files changed, 8 insertions, 9 deletions

diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index 91a0007084..5b4a8c0751 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -426,15 +426,14 @@ module ActionMailer #:nodoc:
       end
 
       def set_payload_for_mail(payload, mail) #:nodoc:
-        payload[:subject]  = mail.subject
-        payload[:to]       = mail.to
-        payload[:from]     = mail.from
-        payload[:bcc]      = mail.bcc
-        payload[:cc]       = mail.cc
-        payload[:reply_to] = mail.reply_to
-        payload[:date]     = mail.date
-        payload[:body]     = mail.body.encoded
-        payload[:mail]     = mail.encoded
+        payload[:message_id] = mail.message_id
+        payload[:subject]    = mail.subject
+        payload[:to]         = mail.to
+        payload[:from]       = mail.from
+        payload[:bcc]        = mail.bcc if mail.bcc.present?
+        payload[:cc]         = mail.cc  if mail.cc.present?
+        payload[:date]       = mail.date
+        payload[:mail]       = mail.encoded
       end
 
       private