diff --git a/app/src/main/res/layout/include_message_body.xml b/app/src/main/res/layout/include_message_body.xml
index 2e3ce41e95..820a40d7aa 100644
--- a/app/src/main/res/layout/include_message_body.xml
+++ b/app/src/main/res/layout/include_message_body.xml
@@ -2,7 +2,8 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:accessibilityTraversalBefore="@+id/inNavigation">
 
     <include
         android:id="@+id/inAddresses"
@@ -36,6 +37,7 @@
         layout="@layout/include_message_navigation"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:accessibilityTraversalBefore="@+id/tvBody"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/inAttachments" />