diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java
index 045c6e240..9b7103c00 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java
@@ -390,10 +390,7 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
     int defaultBottomMargin   = readDimen(R.dimen.message_bubble_bottom_padding);
     int collapsedBottomMargin = readDimen(R.dimen.message_bubble_collapsed_bottom_padding);
     if (!updatingFooter                                                &&
-        !hasOnlyThumbnail(messageRecord)                               &&
-        !hasSticker(messageRecord)                                     &&
-        !hasSharedContact(messageRecord)                               &&
-        !isViewOnceMessage(messageRecord)                              &&
+        getActiveFooter(messageRecord) == footer                       &&
         !hasAudio(messageRecord)                                       &&
         isFooterVisible(messageRecord, nextMessageRecord, groupThread) &&
         !bodyText.isJumbomoji()                                        &&