diff --git a/addons/mail/models/mail_thread.py b/addons/mail/models/mail_thread.py
index 260fbfc9c24..499b0461b32 100644
--- a/addons/mail/models/mail_thread.py
+++ b/addons/mail/models/mail_thread.py
@@ -1483,7 +1483,7 @@ class MailThread(models.AbstractModel):
         if partner and partner.id in [val[0] for val in result[self.ids[0]]]:  # already existing partner ID -> skip
             return result
         if partner and partner.email:  # complete profile: id, name <email>
-            result[self.ids[0]].append((partner.id, tools.formataddr((partner.name, partner.email)), reason))
+            result[self.ids[0]].append((partner.id, partner.email_formatted, reason))
         elif partner:  # incomplete profile: id, name
             result[self.ids[0]].append((partner.id, '%s' % (partner.name), reason))
         else:  # unknown partner, we are probably managing an email address
diff --git a/odoo/tools/mail.py b/odoo/tools/mail.py
index e1c999a041f..3e881d0d841 100644
--- a/odoo/tools/mail.py
+++ b/odoo/tools/mail.py
@@ -539,7 +539,7 @@ def formataddr(pair):
         except UnicodeEncodeError:
             # non-ascii name, transcode the name in a safe format
             # rfc2047 - MIME Message Header Extensions for Non-ASCII Text
-            return "=?utf-8?b?{name}?= {addr}".format(
+            return "=?utf-8?b?{name}?= <{addr}>".format(
                 name=base64.b64encode(name.encode('utf-8')).decode('ascii'),
                 addr=address)
         else: