diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index f63f612b1..75b1eb340 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -37,7 +37,9 @@
             android:orientation="vertical"
             android:padding="2dp">
 
-            <include layout="@layout/message_content"/>
+            <include
+                android:id="@+id/message_content"
+                layout="@layout/message_content"/>
 
             <LinearLayout
                 android:layout_width="wrap_content"
@@ -82,6 +84,8 @@
                     android:layout_gravity="center_vertical"
                     android:gravity="center_vertical"
                     android:text="@string/sending"
+                    android:accessibilityTraversalAfter="@id/message_photo"
+                    android:accessibilityTraversalBefore="@id/message_content"
                     android:textAppearance="@style/TextAppearance.Conversations.Caption"/>
             </LinearLayout>
         </LinearLayout>
diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index 82d122ec8..f84d07e34 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -51,7 +51,9 @@
             android:orientation="vertical"
             android:padding="2dp">
 
-            <include layout="@layout/message_content" />
+            <include
+                android:id="@+id/message_content"
+                layout="@layout/message_content" />
 
             <LinearLayout
                 android:layout_width="wrap_content"
@@ -67,6 +69,8 @@
                     android:layout_gravity="center_vertical"
                     android:layout_marginEnd="4sp"
                     android:layout_marginRight="4sp"
+                    android:accessibilityTraversalAfter="@id/message_photo"
+                    android:accessibilityTraversalBefore="@id/message_content"
                     android:gravity="center_vertical"
                     android:text="@string/sending"
                     android:textAppearance="@style/TextAppearance.Conversations.Caption" />
diff --git a/src/main/res/menu/activity_conversations.xml b/src/main/res/menu/activity_conversations.xml
index bb399a68a..dbe3c37a0 100644
--- a/src/main/res/menu/activity_conversations.xml
+++ b/src/main/res/menu/activity_conversations.xml
@@ -6,7 +6,7 @@
         android:orderInCategory="10"
         android:title="@string/scan_qr_code"
         android:visible="@bool/show_qr_code_scan"
-        app:showAsAction="always" />
+        app:showAsAction="always"/>
     <item
         android:icon="?attr/icon_search"
         android:orderInCategory="11"