diff --git a/src/org/thoughtcrime/securesms/ConversationFragment.java b/src/org/thoughtcrime/securesms/ConversationFragment.java
index 9ed1b88cf3..14899030c2 100644
--- a/src/org/thoughtcrime/securesms/ConversationFragment.java
+++ b/src/org/thoughtcrime/securesms/ConversationFragment.java
@@ -81,6 +81,15 @@ public class ConversationFragment extends ListFragment
     this.listener = (ConversationFragmentListener)activity;
   }
 
+  @Override
+  public void onResume() {
+    super.onResume();
+
+    if (getListAdapter() != null) {
+      ((ConversationAdapter) getListAdapter()).notifyDataSetChanged();
+    }
+  }
+
   public void onNewIntent() {
     if (actionMode != null) {
       actionMode.finish();
diff --git a/src/org/thoughtcrime/securesms/ConversationListFragment.java b/src/org/thoughtcrime/securesms/ConversationListFragment.java
index d758889ebe..368b6756d3 100644
--- a/src/org/thoughtcrime/securesms/ConversationListFragment.java
+++ b/src/org/thoughtcrime/securesms/ConversationListFragment.java
@@ -109,6 +109,7 @@ public class ConversationListFragment extends ListFragment
     super.onResume();
 
     initializeReminders();
+    ((ConversationListAdapter)getListAdapter()).notifyDataSetChanged();
   }
 
   @Override