diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java
index 3a9eeb493e..c67c55e61e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java
@@ -629,7 +629,6 @@ public class SmsDatabase extends MessagingDatabase {
     long threadId = getThreadIdForMessage(messageId);
     db.delete(TABLE_NAME, ID_WHERE, new String[] {messageId+""});
     boolean threadDeleted = DatabaseComponent.get(context).threadDatabase().update(threadId, false, true);
-    notifyConversationListeners(threadId);
     return threadDeleted;
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
index 16f14bf314..5b3973c048 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
@@ -1512,18 +1512,12 @@ open class Storage(context: Context, helper: SQLCipherOpenHelper, private val co
             }
             recipientDb.setApproved(sender, true)
             recipientDb.setApprovedMe(sender, true)
-            val expirationConfig = getExpirationConfiguration(threadId)
-            val expiryMode = expirationConfig?.expiryMode
-            val expiresInMillis = (expiryMode?.expirySeconds ?: 0) * 1000L
-            val expireStartedAt = if (expiryMode is ExpiryMode.AfterSend) {
-                response.sentTimestamp!!
-            } else 0
             val message = IncomingMediaMessage(
                 sender.address,
                 response.sentTimestamp!!,
                 -1,
-                expiresInMillis,
-                expireStartedAt,
+                0,
+                0,
                 false,
                 false,
                 true,