diff --git a/src/org/thoughtcrime/securesms/ConversationItem.java b/src/org/thoughtcrime/securesms/ConversationItem.java
index f8b9a56313..b6fb8395f7 100644
--- a/src/org/thoughtcrime/securesms/ConversationItem.java
+++ b/src/org/thoughtcrime/securesms/ConversationItem.java
@@ -248,7 +248,9 @@ public class ConversationItem extends LinearLayout {
   }
 
   private boolean hasMedia(MessageRecord messageRecord) {
-    return messageRecord.isMms() && ((MediaMmsMessageRecord)messageRecord).getPartCount() > 0;
+    return messageRecord.isMms()              &&
+           !messageRecord.isMmsNotification() &&
+           ((MediaMmsMessageRecord)messageRecord).getPartCount() > 0;
   }
 
   private void setBodyText(MessageRecord messageRecord) {