diff --git a/addons/mail/static/src/js/services/mail_manager.js b/addons/mail/static/src/js/services/mail_manager.js
index 8b34399b331..3af4f775e26 100644
--- a/addons/mail/static/src/js/services/mail_manager.js
+++ b/addons/mail/static/src/js/services/mail_manager.js
@@ -112,14 +112,15 @@ var MailManager =  AbstractService.extend({
             if (!options.silent) {
                 this._mailBus.trigger('new_message', message);
             }
-        }
-        if (data.moderation_status === 'accepted') {
-            message.setModerationStatus('accepted', {
-                additionalThreadIDs: data.channel_ids
-            });
-        }
-        if (options.domain && options.domain !== []) {
-            this._addMessageToThreads(message, options.domain);
+        } else {
+            if (data.moderation_status === 'accepted') {
+                message.setModerationStatus('accepted', {
+                    additionalThreadIDs: data.channel_ids
+                });
+            }
+            if (options.domain && options.domain !== []) {
+                this._addMessageToThreads(message, options.domain);
+            }
         }
         return message;
     },