diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
index 3c49c642..0c4a3a52 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
@@ -367,20 +367,21 @@ class ThreadActivity : SimpleActivity() {
     private fun fetchNextMessages() {
         if (messages.isEmpty() || allMessagesFetched || loadingOlderMessages) return
 
-        //toast("fetchNextMessages")
-
         val date = messages.first().date
         if (oldestMessageDate == date) {
             allMessagesFetched = true
             return
         }
 
+        toast("fetchNextMessages")
+
         oldestMessageDate = date
         loadingOlderMessages = true
 
         ensureBackgroundThread {
             val olderMessages = getMessages(threadId, true, oldestMessageDate)
             messages.addAll(0, olderMessages)
+            threadItems = getThreadItems()
 
             allMessagesFetched = olderMessages.size < MESSAGES_LIMIT || olderMessages.size == 0
 
@@ -391,7 +392,7 @@ class ThreadActivity : SimpleActivity() {
             runOnUiThread {
                 loadingOlderMessages = false
                 val itemAtRefreshIndex = messages.indexOfFirst { it == topItemAtRefresh }
-                adapter.updateMessages(getThreadItems(), itemAtRefreshIndex)
+                adapter.updateMessages(threadItems, itemAtRefreshIndex)
             }
         }
     }
diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/Constants.kt
index 0cdf98fc..a4a38499 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/Constants.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/Constants.kt
@@ -54,7 +54,7 @@ const val FILE_SIZE_600_KB = 614_400L
 const val FILE_SIZE_1_MB = 1_048_576L
 const val FILE_SIZE_2_MB = 2_097_152L
 
-const val MESSAGES_LIMIT = 15
+const val MESSAGES_LIMIT = 100
 
 fun refreshMessages() {
     EventBus.getDefault().post(Events.RefreshMessages())