diff --git a/addons/mail/models/ir_attachment.py b/addons/mail/models/ir_attachment.py
index b14cb985538..92e9e29804d 100644
--- a/addons/mail/models/ir_attachment.py
+++ b/addons/mail/models/ir_attachment.py
@@ -39,9 +39,12 @@ class IrAttachment(models.Model):
     def _delete_and_notify(self):
         for attachment in self:
             if attachment.res_model == 'mail.channel' and attachment.res_id:
-                self.env['bus.bus']._sendone(self.env['mail.channel'].browse(attachment.res_id), 'ir.attachment/delete', {
-                    'id': attachment.id,
-                })
+                target = self.env['mail.channel'].browse(attachment.res_id)
+            else:
+                target = self.env.user.partner_id
+            self.env['bus.bus']._sendone(target, 'ir.attachment/delete', {
+                'id': attachment.id,
+            })
         self.unlink()
 
     def _attachment_format(self, commands=False):
diff --git a/addons/mail/models/mail_message.py b/addons/mail/models/mail_message.py
index 33627bbaed5..275c2b84048 100644
--- a/addons/mail/models/mail_message.py
+++ b/addons/mail/models/mail_message.py
@@ -809,7 +809,7 @@ class Message(models.Model):
         thread._check_can_update_message_content(self)
         self.body = body
         if not attachment_ids:
-            self.attachment_ids.unlink()
+            self.attachment_ids._delete_and_notify()
         else:
             message_values = {
                 'model': self.model,