diff --git a/src/org/thoughtcrime/securesms/ConversationItem.java b/src/org/thoughtcrime/securesms/ConversationItem.java
index b679b13ab..efbf85d3e 100644
--- a/src/org/thoughtcrime/securesms/ConversationItem.java
+++ b/src/org/thoughtcrime/securesms/ConversationItem.java
@@ -147,17 +147,18 @@ public class ConversationItem extends LinearLayout {
     this.groupThread       = groupThread;
 
     setBodyText(messageRecord);
+
     if (messageRecord.getGroupAction() < 1) {
       setStatusIcons(messageRecord);
       setContactPhoto(messageRecord);
       setGroupMessageStatus(messageRecord);
       setEvents(messageRecord);
-    }
 
-    if (messageRecord instanceof NotificationMmsMessageRecord) {
-      setNotificationMmsAttributes((NotificationMmsMessageRecord)messageRecord);
-    } else if (messageRecord instanceof MediaMmsMessageRecord) {
-      setMediaMmsAttributes((MediaMmsMessageRecord)messageRecord);
+      if (messageRecord instanceof NotificationMmsMessageRecord) {
+        setNotificationMmsAttributes((NotificationMmsMessageRecord)messageRecord);
+      } else if (messageRecord instanceof MediaMmsMessageRecord) {
+        setMediaMmsAttributes((MediaMmsMessageRecord)messageRecord);
+      }
     }
   }