diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapter.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapter.kt
index f68ea1da4a..adebfc5375 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapter.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapter.kt
@@ -32,7 +32,7 @@ class ConversationAdapter(context: Context, cursor: Cursor) : CursorRecyclerView
 
     override fun getItemViewType(cursor: Cursor): Int {
         val message = getMessage(cursor)!!
-        if (message.isExpirationTimerUpdate) { return ViewType.Control.rawValue }
+        if (message.isControlMessage) { return ViewType.Control.rawValue }
         return ViewType.Visible.rawValue
     }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/model/DisplayRecord.java b/app/src/main/java/org/thoughtcrime/securesms/database/model/DisplayRecord.java
index c8b7ca648b..6e3f63c5ec 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/model/DisplayRecord.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/DisplayRecord.java
@@ -127,4 +127,8 @@ public abstract class DisplayRecord {
   public boolean isMissedCall() {
     return SmsDatabase.Types.isMissedCall(type);
   }
+
+  public boolean isControlMessage() {
+    return isGroupUpdateMessage() || isExpirationTimerUpdate() || isDataExtractionNotification();
+  }
 }