diff --git a/addons/mass_mailing/tests/test_mailing_list.py b/addons/mass_mailing/tests/test_mailing_list.py
index 6fa18139357..9ce0e538853 100644
--- a/addons/mass_mailing/tests/test_mailing_list.py
+++ b/addons/mass_mailing/tests/test_mailing_list.py
@@ -195,14 +195,18 @@ class TestMailingContactImport(MassMailCommon):
         ))
 
         contact_import.contact_list = '''
+            invalid line1
             alice@example.com
             bob@example.com
+            invalid line2
             "Bob" <bob@EXAMPLE.com>
             "Test" <bob@example.com>
+
+            invalid line3, with a comma
             already_exists_list_1@example.com
             already_exists_list_2@example.com
             "Test" <already_exists_list_1_and_2@example.com>
-            invalid line
+            invalid line4
         '''
         contact_import = contact_import.save()
 
diff --git a/addons/mass_mailing/wizard/mailing_contact_import.py b/addons/mass_mailing/wizard/mailing_contact_import.py
index 1a1629faf77..faeac46c2ee 100644
--- a/addons/mass_mailing/wizard/mailing_contact_import.py
+++ b/addons/mass_mailing/wizard/mailing_contact_import.py
@@ -16,7 +16,7 @@ class MailingContactImport(models.TransientModel):
         """Import each lines of "contact_list" as a new contact."""
         self.ensure_one()
 
-        contacts = tools.email_split_tuples(self.contact_list)
+        contacts = tools.email_split_tuples(', '.join(self.contact_list.splitlines()))
         if not contacts:
             return {
                 'type': 'ir.actions.client',