diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java
index 5ce686a9b..fdd303144 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java
@@ -573,7 +573,7 @@ public class ConversationActivity extends BriarActivity
 							this::showImageOnboarding);
 				}
 				List<ConversationItem> items = createItems(headers);
-				adapter.addAll(items);
+				adapter.replaceAll(items);
 				list.showData();
 				if (layoutManagerState == null) {
 					scrollToBottom();
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationAdapter.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationAdapter.java
index 2e8d81d82..73d2a5f13 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationAdapter.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationAdapter.java
@@ -120,11 +120,11 @@ class ConversationAdapter
 	}
 
 	@Override
-	public void addAll(Collection<ConversationItem> itemsToAdd) {
+	public void replaceAll(Collection<ConversationItem> itemsToReplace) {
 		items.beginBatchedUpdates();
 		// there can be items already in the adapter
 		// SortedList takes care of duplicates and detecting changed items
-		items.addAll(itemsToAdd);
+		items.replaceAll(itemsToReplace);
 		updateTimersInBatch();
 		items.endBatchedUpdates();
 	}