Merge branch 'hotfix/0.12.0.1' into rails-3-develop

Conflicts:
    locale/he_IL/app.po
    locale/nb_NO/app.po

1 files changed, 9 insertions, 0 deletions

diff --git a/lib/mail_handler/backends/mail_extensions.rb b/lib/mail_handler/backends/mail_extensions.rb
index a5b6bc97e..029331802 100644
--- a/lib/mail_handler/backends/mail_extensions.rb
+++ b/lib/mail_handler/backends/mail_extensions.rb
@@ -46,6 +46,15 @@ module Mail
 
             self
         end
+
+        def set_envelope_header
+            raw_string = raw_source.to_s
+            if match_data = raw_source.to_s.match(/\AFrom\s(#{TEXT}+)#{CRLF}/m)
+               set_envelope(match_data[1])
+               self.raw_source = raw_string.sub(match_data[0], "")
+            end
+        end
+
     end
 
     # A patched version of the parameter hash that handles nil values without throwing