diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationViewModel.java
index 43b85da70d..38956d3224 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationViewModel.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationViewModel.java
@@ -93,7 +93,7 @@ class ConversationViewModel extends ViewModel {
       ConversationDataSource dataSource = new ConversationDataSource(context, data.getThreadId());
       PagingConfig           config     = new PagingConfig.Builder()
                                                           .setPageSize(25)
-                                                          .setBufferPages(1)
+                                                          .setBufferPages(3)
                                                           .setStartIndex(Math.max(startPosition, 0))
                                                           .build();