Merge pull request #559 from BeaudanBrown/mention-bug

Check against null message body when detecting mentions

js/models/messages.js

@@ -1971,7 +1971,10 @@
             } else {
               const ourNumber = textsecure.storage.user.getNumber();
 
-              if (message.attributes.body.indexOf(`@${ourNumber}`) !== -1) {
+              if (
+                message.attributes.body &&
+                message.attributes.body.indexOf(`@${ourNumber}`) !== -1
+              ) {
                 conversation.set({ mentionedUs: true });
               }