diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/reminder/ShareReminder.java b/app/src/main/java/org/thoughtcrime/securesms/components/reminder/ShareReminder.java
index 89815537c3..6da847515a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/reminder/ShareReminder.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/reminder/ShareReminder.java
@@ -40,12 +40,6 @@ public class ShareReminder extends Reminder {
       return false;
     }
 
-    Cursor cursor = null;
-    try {
-      cursor = DatabaseFactory.getThreadDatabase(context).getConversationList();
-      return cursor.getCount() >= 1;
-    } finally {
-      if (cursor != null) cursor.close();
-    }
+    return DatabaseFactory.getThreadDatabase(context).getUnarchivedConversationListCount() >= 1;
   }
 }
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 cc791f0e95..c7bf66fc04 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
@@ -604,10 +604,6 @@ public class ThreadDatabase extends Database {
     return threadRecords;
   }
 
-  public Cursor getConversationList() {
-    return getConversationList("0");
-  }
-
   public Cursor getArchivedConversationList() {
     return getConversationList("1");
   }
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 62a58d4821..502de4557a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/recipients/LiveRecipientCache.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/LiveRecipientCache.java
@@ -149,7 +149,7 @@ public final class LiveRecipientCache {
       ThreadDatabase  threadDatabase = DatabaseFactory.getThreadDatabase(context);
       List<Recipient> recipients     = new ArrayList<>();
 
-      try (ThreadDatabase.Reader reader = threadDatabase.readerFor(threadDatabase.getConversationList())) {
+      try (ThreadDatabase.Reader reader = threadDatabase.readerFor(threadDatabase.getRecentConversationList(CACHE_WARM_MAX, false, false))) {
         int          i      = 0;
         ThreadRecord record = null;