diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
index c7bf66fc04..f8fae988d9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
@@ -1436,7 +1436,7 @@ public class ThreadDatabase extends Database {
         }
       } else {
         RecipientDetails details = RecipientDetails.forIndividual(context, recipientSettings);
-        recipient = new Recipient(recipientId, details, false);
+        recipient = new Recipient(recipientId, details, true);
       }
 
       int readReceiptCount = TextSecurePreferences.isReadReceiptsEnabled(context) ? cursor.getInt(cursor.getColumnIndexOrThrow(ThreadDatabase.READ_RECEIPT_COUNT))
diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/LiveRecipientCache.java b/app/src/main/java/org/thoughtcrime/securesms/recipients/LiveRecipientCache.java
index 502de4557a..4475a86fa0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/recipients/LiveRecipientCache.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/LiveRecipientCache.java
@@ -160,8 +160,7 @@ public final class LiveRecipientCache {
       }
 
       Log.d(TAG, "Warming up " + recipients.size() + " recipients.");
-      Collections.reverse(recipients);
-      Stream.of(recipients).map(Recipient::getId).forEach(this::getLive);
+      addToCache(recipients);
     });
   }