diff --git a/addons/email_template/tests/test_mail.py b/addons/email_template/tests/test_mail.py
index 2e1a8c5267a..2556864df7c 100644
--- a/addons/email_template/tests/test_mail.py
+++ b/addons/email_template/tests/test_mail.py
@@ -64,7 +64,7 @@ class test_message_compose(TestMailBase):
             'body_html': '${object.description}',
             'user_signature': True,
             'attachment_ids': [(0, 0, _attachments[0]), (0, 0, _attachments[1])],
-            'email_to': 'b@b.b c@c.c',
+            'email_to': 'b@b.b, c@c.c',
             'email_cc': 'd@d.d'
             })
 
@@ -191,7 +191,7 @@ class test_message_compose(TestMailBase):
         email_template.write(cr, uid, [email_template_id], {
             'model_id': user_model_id,
             'body_html': '${object.login}',
-            'email_to': '${object.email} c@c',
+            'email_to': '${object.email}, c@c',
             'email_recipients': '%i,%i' % (p_b_id, p_c_id),
             'email_cc': 'd@d',
             })
diff --git a/addons/email_template/wizard/mail_compose_message.py b/addons/email_template/wizard/mail_compose_message.py
index 2f1e266848e..22bb53beae3 100644
--- a/addons/email_template/wizard/mail_compose_message.py
+++ b/addons/email_template/wizard/mail_compose_message.py
@@ -146,7 +146,7 @@ class mail_compose_message(osv.TransientModel):
 
         # transform email_to, email_cc into partner_ids
         partner_ids = set()
-        mails = tools.email_split(values.pop('email_to', '') + ' ' + values.pop('email_cc', ''))
+        mails = tools.email_split(values.pop('email_to', '')) + tools.email_split(values.pop('email_cc', ''))
         ctx = dict((k, v) for k, v in (context or {}).items() if not k.startswith('default_'))
         for mail in mails:
             partner_id = self.pool.get('res.partner').find_or_create(cr, uid, mail, context=ctx)