diff --git a/lib/hubspot/mailer.rb b/lib/hubspot/mailer.rb
index 3d9095c..00a3f1c 100644
--- a/lib/hubspot/mailer.rb
+++ b/lib/hubspot/mailer.rb
@@ -68,11 +68,15 @@ def single_send_params(mail)
           message: { to: mail.to.first }
         }
 
-        data[:message][:from]   = mail.from.first if mail.from.present?
         data[:message][:cc]     = mail.cc         if mail.cc.present?
         data[:message][:bcc]    = mail.bcc        if mail.bcc.present?
         data[:message][:sendId] = mail.send_id    if mail.send_id.present?
 
+        if mail.from.present?
+          raise SenderAddressError.new, "Can't handle multiple from addresses" if mail.from.count > 1
+          data[:message][:from] = mail.header[:from].value
+        end
+
         if mail.reply_to.present?
           if mail.reply_to.size > 1
             data[:message][:replyToList] = mail.reply_to