diff --git a/addons/test_mail/tests/test_mail_mail.py b/addons/test_mail/tests/test_mail_mail.py
index 86ce0a087ca..04f48e1a992 100644
--- a/addons/test_mail/tests/test_mail_mail.py
+++ b/addons/test_mail/tests/test_mail_mail.py
@@ -124,9 +124,9 @@ class TestMailMail(TestMailCommon, MockSmtplibCase):
             any_order=True,
         )
 
-        self.assert_email_sent_smtp(message_from='"test@unknown_domain.com" <notifications@test.com>',
+        self.assert_email_sent_smtp(message_from='"test" <notifications@test.com>',
                                     emails_count=5, from_filter=self.server_notification.from_filter)
-        self.assert_email_sent_smtp(message_from='"test_2@unknown_domain.com" <notifications@test.com>',
+        self.assert_email_sent_smtp(message_from='"test_2" <notifications@test.com>',
                                     emails_count=5, from_filter=self.server_notification.from_filter)
         self.assert_email_sent_smtp(message_from='user_1@test_2.com', emails_count=5, from_filter=self.server_domain_2.from_filter)
         self.assert_email_sent_smtp(message_from='user_2@test_2.com', emails_count=5, from_filter=self.server_domain_2.from_filter)
diff --git a/addons/test_mass_mailing/tests/test_mailing_server.py b/addons/test_mass_mailing/tests/test_mailing_server.py
index 494d7ed16f2..0bc1d35c222 100644
--- a/addons/test_mass_mailing/tests/test_mailing_server.py
+++ b/addons/test_mass_mailing/tests/test_mailing_server.py
@@ -76,7 +76,7 @@ class TestMassMailingServer(TestMassMailCommon, MockSmtplibCase):
         self.assertEqual(self.find_mail_server_mocked.call_count, 1)
         self.assert_email_sent_smtp(
             smtp_from='notifications@test.com',
-            message_from='"Testing (unknow_email@unknow_domain.com)" <notifications@test.com>',
+            message_from='"Testing" <notifications@test.com>',
             from_filter=self.server_notification.from_filter,
             emails_count=8,
         )
diff --git a/odoo/addons/base/tests/test_ir_mail_server.py b/odoo/addons/base/tests/test_ir_mail_server.py
index 4522f91a234..2b66984d550 100644
--- a/odoo/addons/base/tests/test_ir_mail_server.py
+++ b/odoo/addons/base/tests/test_ir_mail_server.py
@@ -7,7 +7,6 @@ from odoo.addons.base.tests.common import MockSmtplibCase
 from odoo.tests.common import TransactionCase
 from odoo.tools import mute_logger
 
-
 class TestIrMailServer(TransactionCase, MockSmtplibCase):
 
     def setUp(self):
@@ -132,7 +131,7 @@ class TestIrMailServer(TransactionCase, MockSmtplibCase):
 
         self.assert_email_sent_smtp(
             smtp_from='notifications@test.com',
-            message_from='"Name (test@unknown_domain.com)" <notifications@test.com>',
+            message_from='"Name" <notifications@test.com>',
             from_filter='notifications@test.com',
         )
 
@@ -145,7 +144,7 @@ class TestIrMailServer(TransactionCase, MockSmtplibCase):
 
         self.assert_email_sent_smtp(
             smtp_from='notifications@test.com',
-            message_from='"test@unknown_domain.com" <notifications@test.com>',
+            message_from='"test" <notifications@test.com>',
             from_filter='notifications@test.com',
         )
 
@@ -179,7 +178,7 @@ class TestIrMailServer(TransactionCase, MockSmtplibCase):
 
         self.assert_email_sent_smtp(
             smtp_from=default_bounce_adress,
-            message_from='"Name (test@unknown_domain.com)" <notifications@test.com>',
+            message_from='"Name" <notifications@test.com>',
             from_filter='test.com',
         )
 
@@ -230,7 +229,7 @@ class TestIrMailServer(TransactionCase, MockSmtplibCase):
         self.connect_mocked.assert_called_once()
         self.assert_email_sent_smtp(
             smtp_from='notifications@test.com',
-            message_from='"Name (test@unknown_domain.com)" <notifications@test.com>',
+            message_from='"Name" <notifications@test.com>',
             from_filter='notifications@test.com',
         )
 
@@ -262,7 +261,7 @@ class TestIrMailServer(TransactionCase, MockSmtplibCase):
         self.connect_mocked.assert_called_once()
         self.assert_email_sent_smtp(
             smtp_from=default_bounce_adress,
-            message_from='"Name (test@unknown_domain.com)" <notifications@test.com>',
+            message_from='"Name" <notifications@test.com>',
             from_filter='test.com',
         )
 
@@ -314,7 +313,7 @@ class TestIrMailServer(TransactionCase, MockSmtplibCase):
         self.connect_mocked.assert_called_once()
         self.assert_email_sent_smtp(
             smtp_from=default_bounce_adress,
-            message_from='"test@unknown_domain.com" <notifications@test.com>',
+            message_from='"test" <notifications@test.com>',
             from_filter='test.com',
         )
 
@@ -357,7 +356,7 @@ class TestIrMailServer(TransactionCase, MockSmtplibCase):
         self.connect_mocked.assert_called_once()
         self.assert_email_sent_smtp(
             smtp_from=default_bounce_adress,
-            message_from='"test@unknown_domain.com" <notifications@test.com>',
+            message_from='"test" <notifications@test.com>',
             from_filter='test.com',
         )
 
diff --git a/odoo/tools/mail.py b/odoo/tools/mail.py
index 499ca3e371d..2d320d4125f 100644
--- a/odoo/tools/mail.py
+++ b/odoo/tools/mail.py
@@ -606,7 +606,7 @@ def encapsulate_email(old_email, new_email):
     e.g.
     * Old From: "Admin" <admin@gmail.com>
     * New From: notifications@odoo.com
-    * Output:   "Admin (admin@gmail.com)" <notifications@odoo.com>
+    * Output: "Admin" <notifications@odoo.com>
     """
     old_email_split = getaddresses([old_email])
     if not old_email_split or not old_email_split[0]:
@@ -616,10 +616,11 @@ def encapsulate_email(old_email, new_email):
     if not new_email_split or not new_email_split[0]:
         return
 
-    if old_email_split[0][0]:
-        name_part = '%s (%s)' % old_email_split[0]
+    old_name, old_email = old_email_split[0]
+    if old_name:
+        name_part = old_name
     else:
-        name_part = old_email_split[0][1]
+        name_part = old_email.split("@")[0]
 
     return formataddr((
         name_part,