Neissi/Duda - make sure that complex recipients (e.g. 'Foo Bar <foo@bar.com>) are showing properly

2 files changed, 8 insertions, 7 deletions

diff --git a/service/pixelated/adapter/pixelated_mail.py b/service/pixelated/adapter/pixelated_mail.py
index 40e4f71f..cd34fe46 100644
--- a/service/pixelated/adapter/pixelated_mail.py
+++ b/service/pixelated/adapter/pixelated_mail.py
@@ -56,7 +56,7 @@ class PixelatedMail:
     def _split_recipients(self, header_type, temporary_headers):
         if(temporary_headers.get(header_type) is not None):
             recipients = temporary_headers[header_type].split(',')
-            temporary_headers[header_type] = map(lambda x: x.replace(' ', ''), recipients)
+            temporary_headers[header_type] = map(lambda x: x.lstrip(), recipients)
 
     def _extract_headers(self):
         temporary_headers = {}
diff --git a/service/test/adapter/pixelated_mail_test.py b/service/test/adapter/pixelated_mail_test.py
index 66aa3590..7de7c96a 100644
--- a/service/test/adapter/pixelated_mail_test.py
+++ b/service/test/adapter/pixelated_mail_test.py
@@ -90,17 +90,18 @@ class TestPixelatedMail(unittest.TestCase):
 
     def test_extract_headers_should_break_header_in_multiple_recipients(self):
         headers = test_helper.DEFAULT_HEADERS.copy()
-        headers['to'] = "nlima@example.com, ddornelles@example.com"
-        headers['bcc'] = "nlima@example.com, ddornelles@example.com"
-        headers['cc'] = "nlima@example.com, ddornelles@example.com"
+
+        headers['to'] = "nlima@example.com, Duda Dornelles <ddornelles@example.com>"
+        headers['bcc'] = "ddornelles@example.com, Neissi Lima <nlima@example.com>"
+        headers['cc'] = "nlima@example.com, Duda Dornelles <ddornelles@example.com>"
 
         leap_mail = test_helper.leap_mail(headers=headers)
 
         pixelated_mail = PixelatedMail.from_leap_mail(leap_mail)
 
-        self.assertEquals(pixelated_mail.headers['to'], ["nlima@example.com", "ddornelles@example.com"])
-        self.assertEquals(pixelated_mail.headers['bcc'], ["nlima@example.com", "ddornelles@example.com"])
-        self.assertEquals(pixelated_mail.headers['cc'], ["nlima@example.com", "ddornelles@example.com"])
+        self.assertEquals(pixelated_mail.headers['to'], ["nlima@example.com", "Duda Dornelles <ddornelles@example.com>"])
+        self.assertEquals(pixelated_mail.headers['bcc'], ["ddornelles@example.com", "Neissi Lima <nlima@example.com>"])
+        self.assertEquals(pixelated_mail.headers['cc'], ["nlima@example.com", "Duda Dornelles <ddornelles@example.com>"])
 
     def test_mark_as_read(self):
         mail = PixelatedMail.from_dict(self.mail_dict)