diff --git a/js/models/messages.js b/js/models/messages.js
index 3e6e4073b..54fe26b09 100644
--- a/js/models/messages.js
+++ b/js/models/messages.js
@@ -201,8 +201,10 @@
 
                     conversation.save().then(function() {
                         message.save().then(function() {
-                            extension.trigger('message', message); // notify frontend listeners
-                            notifyConversation(message);
+                            extension.trigger('message', message); // inbox fetch
+                            if (message.isIncoming()) {
+                                notifyConversation(message);
+                            }
                         });
                     });
                 });