diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java
index da8b6d5c2b..c549e2a008 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java
@@ -469,7 +469,7 @@ public class MmsSmsDatabase extends Database {
       }
 
       for (ThreadUpdate update : threadUpdates) {
-        threadDatabase.update(update.getThreadId(), false);
+        threadDatabase.updateSilently(update.getThreadId(), false);
       }
 
       db.setTransactionSuccessful();
@@ -483,6 +483,10 @@ public class MmsSmsDatabase extends Database {
           notifyConversationListeners(threadUpdate.getThreadId());
         }
       }
+
+      if (threadUpdates.size() > 0) {
+        notifyConversationListListeners();
+      }
     }
 
     return unhandled;
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 73faa8edb8..dad9459edf 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java
@@ -521,7 +521,7 @@ public class SmsDatabase extends MessageDatabase {
         }
       }
 
-      if (threadUpdates.size() > 0 && receiptType == ReceiptType.DELIVERY) {
+      if (threadUpdates.isEmpty() && receiptType == ReceiptType.DELIVERY) {
         earlyDeliveryReceiptCache.increment(messageId.getTimetamp(), messageId.getRecipientId(), timestamp);
       }