diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/ScrollToPositionDelegate.kt b/app/src/main/java/org/thoughtcrime/securesms/components/ScrollToPositionDelegate.kt
index c342d10ed8..107dec2f09 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/ScrollToPositionDelegate.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/ScrollToPositionDelegate.kt
@@ -191,10 +191,10 @@ class ScrollToPositionDelegate private constructor(
       if (abs(layoutManager.findFirstVisibleItemPosition() - position) < SCROLL_ANIMATION_THRESHOLD) {
         val child: View? = layoutManager.findViewByPosition(position)
         if (child == null || !layoutManager.isViewPartiallyVisible(child, true, false)) {
-          layoutManager.scrollToPositionWithOffset(position, recyclerView.height / 4)
+          layoutManager.scrollToPositionWithOffset(position, recyclerView.height / 3)
         }
       } else {
-        layoutManager.scrollToPositionWithOffset(position, recyclerView.height / 4)
+        layoutManager.scrollToPositionWithOffset(position, recyclerView.height / 3)
       }
     }
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
index 416dd94718..81a2c43750 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
@@ -317,6 +317,7 @@ import org.thoughtcrime.securesms.util.hasAudio
 import org.thoughtcrime.securesms.util.hasGiftBadge
 import org.thoughtcrime.securesms.util.hasNonTextSlide
 import org.thoughtcrime.securesms.util.isValidReactionTarget
+import org.thoughtcrime.securesms.util.padding
 import org.thoughtcrime.securesms.util.savedStateViewModel
 import org.thoughtcrime.securesms.util.toMillis
 import org.thoughtcrime.securesms.util.viewModel
@@ -602,6 +603,10 @@ class ConversationFragment :
       viewModel.onChatBoundsChanged(Rect(left, top, right, bottom))
     }
 
+    binding.toolbar.addOnLayoutChangeListener { _, _, _, _, bottom, _, _, _, _ ->
+      binding.conversationItemRecycler.padding(top = bottom)
+    }
+
     binding.conversationItemRecycler.addItemDecoration(ChatColorsDrawable.ChatColorsItemDecoration)
   }