diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationOptionsMenu.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationOptionsMenu.kt
index 96800e3e85..0421355246 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationOptionsMenu.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationOptionsMenu.kt
@@ -189,10 +189,6 @@ internal object ConversationOptionsMenu {
         }
       })
 
-      if (threadId == -1L) {
-        hideMenuItem(menu, R.id.menu_view_media)
-      }
-
       menu.findItem(R.id.menu_format_text_submenu).subMenu?.clearHeader()
       menu.findItem(R.id.edittext_bold).applyTitleSpan(MessageStyler.boldStyle())
       menu.findItem(R.id.edittext_italic).applyTitleSpan(MessageStyler.italicStyle())
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationRepository.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationRepository.java
index 885834782c..0a22c67510 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationRepository.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationRepository.java
@@ -111,7 +111,7 @@ public class ConversationRepository {
         conversationRecipient.getExpiresInSeconds() == 0 &&
         !conversationRecipient.isGroup() &&
         conversationRecipient.isRegistered() &&
-        (threadId == -1 || SignalDatabase.messages().canSetUniversalTimer(threadId)))
+        SignalDatabase.messages().canSetUniversalTimer(threadId))
     {
       showUniversalExpireTimerUpdate = true;
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ThreadAnimationState.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/ThreadAnimationState.kt
deleted file mode 100644
index 207657b85c..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ThreadAnimationState.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.thoughtcrime.securesms.conversation
-
-/**
- * Represents how conversation bubbles should animate at any given time.
- */
-data class ThreadAnimationState constructor(
-  val threadId: Long,
-  val threadMetadata: ConversationData?,
-  val hasCommittedNonEmptyMessageList: Boolean
-) {
-  fun shouldPlayMessageAnimations(): Boolean {
-    return when {
-      threadId == -1L || threadMetadata == null -> false
-      threadMetadata.threadSize == 0 -> true
-      threadMetadata.threadSize > 0 && hasCommittedNonEmptyMessageList -> true
-      else -> false
-    }
-  }
-}