3 files changed, 19 insertions, 1 deletions
diff --git a/lib/mail_handler/backends/mail_backend.rb b/lib/mail_handler/backends/mail_backend.rb
index 03d78e0a3..561946980 100644
--- a/lib/mail_handler/backends/mail_backend.rb
+++ b/lib/mail_handler/backends/mail_backend.rb
@@ -367,7 +367,9 @@ module MailHandler
             end
 
             def address_from_string(string)
-                Mail::Address.new(string).address
+                mail = Mail.new
+                mail.from = string
+                mail.from[0]
             end
         end
     end
diff --git a/spec/lib/mail_handler/mail_handler_spec.rb b/spec/lib/mail_handler/mail_handler_spec.rb
index fde21b0a7..272b56d0b 100644
--- a/spec/lib/mail_handler/mail_handler_spec.rb
+++ b/spec/lib/mail_handler/mail_handler_spec.rb
@@ -478,3 +478,11 @@ describe 'when getting attachment attributes' do
         end
     end
 end
+
+describe 'when getting the address part from an address string' do
+
+    it 'should handle non-ascii characters in the name input' do
+        address = "\"Someone’s name\" <test@example.com>"
+        MailHandler.address_from_string(address).should == 'test@example.com'
+    end
+end
diff --git a/spec/models/info_request_event_spec.rb b/spec/models/info_request_event_spec.rb
index 842246fd8..eb0de8c86 100644
--- a/spec/models/info_request_event_spec.rb
+++ b/spec/models/info_request_event_spec.rb
@@ -1,3 +1,4 @@
+# coding: utf-8
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe InfoRequestEvent do
@@ -118,6 +119,13 @@ describe InfoRequestEvent do
             @info_request_event.same_email_as_previous_send?.should be_true
         end
 
+        it 'should handle non-ascii characters in the name input' do
+            address = "\"Someone’s name\" <test@example.com>"
+            @info_request_event.stub!(:params).and_return(:email => address)
+            @info_request_event.stub_chain(:info_request, :get_previous_email_sent_to).and_return(address)
+            @info_request_event.same_email_as_previous_send?.should be_true
+        end
+
     end
 
 end