diff --git a/addons/mail/models/ir_attachment.py b/addons/mail/models/ir_attachment.py
index 4330059c495..ee51ed8382e 100644
--- a/addons/mail/models/ir_attachment.py
+++ b/addons/mail/models/ir_attachment.py
@@ -13,9 +13,9 @@ class IrAttachment(models.Model):
         """
         super(IrAttachment, self)._post_add_create()
         for record in self:
-            record.register_as_main_attachment()
+            record.register_as_main_attachment(force=False)
 
-    def register_as_main_attachment(self):
+    def register_as_main_attachment(self, force=True):
         """ Registers this attachment as the main one of the model it is
         attached to.
         """
@@ -24,4 +24,5 @@ class IrAttachment(models.Model):
         # message_main_attachment_id field can be empty, that's why we compare to False;
         # we are just checking that it exists on the model before writing it
         if related_record and hasattr(related_record, 'message_main_attachment_id'):
-            related_record.message_main_attachment_id = self
+            if force or not related_record.message_main_attachment_id:
+                related_record.message_main_attachment_id = self