diff --git a/lib/messagebus/mailer.rb b/lib/messagebus/mailer.rb
index 6ad43ab18..5b3d52e34 100644
--- a/lib/messagebus/mailer.rb
+++ b/lib/messagebus/mailer.rb
@@ -7,15 +7,20 @@ module Messagebus
     attr_accessor :settings
 
     def new(*settings)
+        self.settings = {}
         self
     end
 
    def from_header_parse(string)
      string.split('<')[0].delete('"')
    end
+   
+   def deliver(message)
+     deliver!(message)
+   end
 
    def deliver!(message)
-    msg = {:toEmail => message.to.first, :subject => message.subject, :fromEmail =>message.from.first, :fromName => from_header_parse(message[:from].to_s)}
+    msg = {:toEmail => message.to.first, :subject => message.subject, :fromEmail => AppConfig[:smtp_sender_address], :fromName => from_header_parse(message[:from].to_s)}
 
     if message.multipart?
       msg[:plaintextBody] = message.text_part.body.to_s if message.text_part