diff --git a/addons/mail/models/mail_notification.py b/addons/mail/models/mail_notification.py
index e47f337e49153892392f8550ad9871cf368a4045..a45a7223b5ffc20352337d831d806896046dcd72 100644
--- a/addons/mail/models/mail_notification.py
+++ b/addons/mail/models/mail_notification.py
@@ -79,6 +79,6 @@ class Notification(models.Model):
             ('is_read', '=', True),
             ('read_date', '<', fields.Datetime.now() - relativedelta(days=max_age_days)),
             ('res_partner_id.partner_share', '=', False),
-            ('notification_type', '=', 'email')
+            ('notification_status', 'in', ('sent', 'canceled'))
         ]
         return self.search(domain).unlink()
diff --git a/addons/mail/models/mail_thread.py b/addons/mail/models/mail_thread.py
index 27357c8d8cb2d5c6a36bda0c68729f4c2d0d860f..28753cf4dd1aabe6290995318f8105d0d5bd6c0c 100644
--- a/addons/mail/models/mail_thread.py
+++ b/addons/mail/models/mail_thread.py
@@ -1324,7 +1324,6 @@ class MailThread(models.AbstractModel):
            :return: A dict with the following structure, where each
                     field may not be present if missing in original
                     message::
-
                     { 'message_id': msg_id,
                       'subject': subject,
                       'from': from,
@@ -2009,6 +2008,7 @@ class MailThread(models.AbstractModel):
                 'mail_message_id': message.id,
                 'res_partner_id': pid,
                 'notification_type': 'inbox',
+                'notification_status': 'sent',
             } for pid in inbox_pids]
             self.env['mail.notification'].sudo().create(notif_create_values)