diff --git a/www/common/common-messenger.js b/www/common/common-messenger.js
index 99d9d3e6a..fb6bebf69 100644
--- a/www/common/common-messenger.js
+++ b/www/common/common-messenger.js
@@ -435,6 +435,7 @@ define([
                             return null;
                         }
                     }).filter(function (decrypted) {
+                        if (decrypted.d && decrypted.d[0] !== Types.message) { return; }
                         return decrypted;
                     }).map(function (O) {
                         return {
diff --git a/www/contacts/messenger-ui.js b/www/contacts/messenger-ui.js
index c466ebe60..69675b3e5 100644
--- a/www/contacts/messenger-ui.js
+++ b/www/contacts/messenger-ui.js
@@ -499,7 +499,6 @@ define([
         };
 
         messenger.on('message', function (message) {
-            common.notify();
             var chanId = message.channel;
 
             var chat = getChat(chanId);
@@ -514,6 +513,7 @@ define([
                 console.error('expected channel [%s] to be open', chanId);
                 return;
             }
+            common.notify();
 
             channel.messages.push(message);