diff --git a/addons/mail/models/mail_mail.py b/addons/mail/models/mail_mail.py
index d92090feb75..97634425c47 100644
--- a/addons/mail/models/mail_mail.py
+++ b/addons/mail/models/mail_mail.py
@@ -160,7 +160,7 @@ class MailMail(models.Model):
         if notif_mails_ids:
             notifications = self.env['mail.notification'].search([
                 ('notification_type', '=', 'email'),
-                ('mail_id', 'in', notif_mails_ids),
+                ('mail_mail_id', 'in', notif_mails_ids),
                 ('notification_status', 'not in', ('sent', 'canceled'))
             ])
             if notifications:
@@ -360,7 +360,7 @@ class MailMail(models.Model):
                 # mail record.
                 notifs = self.env['mail.notification'].search([
                     ('notification_type', '=', 'email'),
-                    ('mail_id', 'in', mail.ids),
+                    ('mail_mail_id', 'in', mail.ids),
                     ('notification_status', 'not in', ('sent', 'canceled'))
                 ])
                 if notifs:
diff --git a/addons/mail/models/mail_notification.py b/addons/mail/models/mail_notification.py
index 8110ff22612..cd0203a6203 100644
--- a/addons/mail/models/mail_notification.py
+++ b/addons/mail/models/mail_notification.py
@@ -17,7 +17,7 @@ class MailNotification(models.Model):
 
     # origin
     mail_message_id = fields.Many2one('mail.message', 'Message', index=True, ondelete='cascade', required=True)
-    mail_id = fields.Many2one('mail.mail', 'Mail', index=True, help='Optional mail_mail ID. Used mainly to optimize searches.')
+    mail_mail_id = fields.Many2one('mail.mail', 'Mail', index=True, help='Optional mail_mail ID. Used mainly to optimize searches.')
     # recipient
     res_partner_id = fields.Many2one('res.partner', 'Recipient', index=True, ondelete='cascade')
     # status
diff --git a/addons/mail/models/mail_thread.py b/addons/mail/models/mail_thread.py
index f3336657c64..7028beaaf4e 100644
--- a/addons/mail/models/mail_thread.py
+++ b/addons/mail/models/mail_thread.py
@@ -2254,13 +2254,13 @@ class MailThread(models.AbstractModel):
                             tocreate_recipient_ids = [rid for rid in recipient_ids if rid not in existing_notifications.mapped('res_partner_id.id')]
                             existing_notifications.write({
                                 'notification_status': 'ready',
-                                'mail_id': email.id,
+                                'mail_mail_id': email.id,
                             })
                     notif_create_values += [{
                         'mail_message_id': message.id,
                         'res_partner_id': recipient_id,
                         'notification_type': 'email',
-                        'mail_id': email.id,
+                        'mail_mail_id': email.id,
                         'is_read': True,  # discard Inbox notification
                         'notification_status': 'ready',
                     } for recipient_id in tocreate_recipient_ids]
diff --git a/addons/mail/views/mail_notification_views.xml b/addons/mail/views/mail_notification_views.xml
index b96b7f70b71..1b2920a01c3 100644
--- a/addons/mail/views/mail_notification_views.xml
+++ b/addons/mail/views/mail_notification_views.xml
@@ -27,7 +27,7 @@
                         <group string="Source">
                             <field name="mail_message_id"/>
                             <field name="notification_type"/>
-                            <field name="mail_id"/>
+                            <field name="mail_mail_id"/>
                             <field name="res_partner_id"/>
                         </group>
                         <group string="Status">
diff --git a/addons/sms/views/mail_notification_views.xml b/addons/sms/views/mail_notification_views.xml
index ed8cfed4b34..e8f5ea28c3f 100644
--- a/addons/sms/views/mail_notification_views.xml
+++ b/addons/sms/views/mail_notification_views.xml
@@ -19,7 +19,7 @@
             <xpath expr="//field[@name='res_partner_id']" position="after">
                 <field name="sms_number"/>
             </xpath>
-            <xpath expr="//field[@name='mail_id']" position="after">
+            <xpath expr="//field[@name='mail_mail_id']" position="after">
                 <field name="sms_id"/>
             </xpath>
         </field>
diff --git a/addons/test_mail/tests/test_mail_followers.py b/addons/test_mail/tests/test_mail_followers.py
index bd40e61123b..112b9bb40cf 100644
--- a/addons/test_mail/tests/test_mail_followers.py
+++ b/addons/test_mail/tests/test_mail_followers.py
@@ -406,8 +406,8 @@ class AdvancedResponsibleNotifiedTest(TestMailCommon):
         # verify that a mail.mail is attached to it with the correct state ('outgoing')
         mail_notification = mail_message.notification_ids
         self.assertEqual(1, len(mail_notification))
-        self.assertTrue(bool(mail_notification.mail_id))
-        self.assertEqual('outgoing', mail_notification.mail_id.state)
+        self.assertTrue(bool(mail_notification.mail_mail_id))
+        self.assertEqual(mail_notification.mail_mail_id.state, 'outgoing')
 
 
 @tagged('post_install', '-at_install')
diff --git a/addons/test_mail/tests/test_mail_mail.py b/addons/test_mail/tests/test_mail_mail.py
index 82740beed9b..9151d43c488 100644
--- a/addons/test_mail/tests/test_mail_mail.py
+++ b/addons/test_mail/tests/test_mail_mail.py
@@ -153,7 +153,7 @@ class TestMailMailRace(common.TransactionCase):
             'subtype_id': self.ref('mail.mt_comment'),
             'notification_ids': [(0, 0, {
                 'res_partner_id': self.partner.id,
-                'mail_id': mail.id,
+                'mail_mail_id': mail.id,
                 'notification_type': 'email',
                 'is_read': True,
                 'notification_status': 'ready',