diff --git a/js/models/conversations.js b/js/models/conversations.js
index 1818e2c63..90f32524e 100644
--- a/js/models/conversations.js
+++ b/js/models/conversations.js
@@ -104,7 +104,7 @@
             unreadCount : 0,
             active_at   : now,
             timestamp   : now,
-            lastMessage : body
+            lastMessage : message.getNotificationText()
         });
 
         var sendFunc;
diff --git a/js/models/messages.js b/js/models/messages.js
index 06d00d249..66e333ab9 100644
--- a/js/models/messages.js
+++ b/js/models/messages.js
@@ -307,12 +307,12 @@
                 if (!conversation_timestamp || message.get('sent_at') > conversation_timestamp) {
                     conversation.set({
                         timestamp: message.get('sent_at'),
-                        lastMessage: message.getDescription()
+                        lastMessage: message.getNotificationText()
                     });
                 }
                 else if (!conversation.get('lastMessage')) {
                     conversation.set({
-                        lastMessage: message.getDescription()
+                        lastMessage: message.getNotificationText()
                     });
                 }