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 bf412185..4a49d337 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
@@ -394,14 +394,11 @@ class ThreadActivity : SimpleActivity() {
         runOnUiThread {
             refreshMenuItems()
             getOrCreateThreadAdapter().apply {
+                val layoutManager = thread_messages_list.layoutManager as LinearLayoutManager
                 val lastPosition = itemCount - 1
-                val lastVisiblePosition = (thread_messages_list.layoutManager as LinearLayoutManager).findLastVisibleItemPosition()
-                val scrollPosition = if (currentList.lastOrNull() != threadItems.lastOrNull() && lastPosition - lastVisiblePosition <= 2) {
-                    lastPosition
-                } else {
-                    -1
-                }
-                updateMessages(threadItems, scrollPosition)
+                val lastVisiblePosition = layoutManager.findLastVisibleItemPosition()
+                val shouldScrollToBottom = currentList.lastOrNull() != threadItems.lastOrNull() && lastPosition - lastVisiblePosition == 1
+                updateMessages(threadItems, if (shouldScrollToBottom) lastPosition else -1)
             }
         }