diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
index 964e3c91ef..5e6dd45c21 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
@@ -2162,7 +2162,10 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
         override fun onChanged() {
             super.onChanged()
             if (recyclerView.isScrolledToWithin30dpOfBottom) {
-                recyclerView.scrollToPosition(adapter.itemCount-1)
+                // Note: The adapter itemCount is zero based - so calling this with the itemCount in
+                // a non-zero based manner scrolls us to the bottom of the last message (including
+                // to the bottom of long messages as required by Jira SES-789 / GitHub 1364).
+                recyclerView.scrollToPosition(adapter.itemCount)
             }
         }
     }