From 3e20dcd3baa009650f9baf804719e02ae4e9fb21 Mon Sep 17 00:00:00 2001
From: Maxwell Salzberg <maxwell@joindiaspora.com>
Date: Wed, 2 Nov 2011 11:21:16 -0700
Subject: [PATCH] another chance at fixing emails

---
 lib/messagebus/mailer.rb | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/messagebus/mailer.rb b/lib/messagebus/mailer.rb
index ab3cd7471..87f7ce21c 100644
--- a/lib/messagebus/mailer.rb
+++ b/lib/messagebus/mailer.rb
@@ -22,15 +22,20 @@ module Messagebus
      string.split('<')[0] 
     end
 
+    def from_header_parse(message)
+     message['from'].to_s || AppConfig[:smtp_sender_address]
+    end
+
     private
 
     def deliver(message)
       # here we want  = {:fromEmail => message['from'].to_s}
       #this is required due to weird bug in action mailer
-      from_header = message['from'].to_s
+      from_header = from_header_parse(message)
+
       @client.send_common_info = {:fromEmail => from_header, :customHeaders => {"sender"=> from_header}}
       message.to.each do |addressee|
-        m = {:toEmail => addressee, :subject => message.subject, :fromName => message_parse(from_header)}
+        m = {:toEmail => addressee, :fromEmail => from_header, :subject => message.subject, :fromName => message_parse(from_header)}
         @things = []
 
         if message.multipart?