diff --git a/app/src/main/res/layout/include_message_navigation.xml b/app/src/main/res/layout/include_message_navigation.xml
index b2913a09ba..6a3fc004d7 100644
--- a/app/src/main/res/layout/include_message_navigation.xml
+++ b/app/src/main/res/layout/include_message_navigation.xml
@@ -36,6 +36,20 @@
         app:layout_constraintTop_toBottomOf="@id/vSeparator"
         app:srcCompat="@drawable/expander_hor" />
 
+    <androidx.constraintlayout.helper.widget.Flow
+        android:id="@+id/ibFlow"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="3dp"
+        app:constraint_referenced_ids="ibMore,ibInbox,ibJunk,ibTrash,ibArchive,ibMove,ibAnswer,ibUnsubscribe,ibRule,ibUndo"
+        app:flow_horizontalBias="0"
+        app:flow_horizontalGap="3dp"
+        app:flow_horizontalStyle="packed"
+        app:flow_wrapMode="chain"
+        app:layout_constraintEnd_toStartOf="@+id/ibVerify"
+        app:layout_constraintStart_toEndOf="@id/ibTools"
+        app:layout_constraintTop_toBottomOf="@id/vSeparator" />
+
     <ImageButton
         android:id="@+id/ibMore"
         android:layout_width="36dp"
@@ -45,23 +59,8 @@
         android:padding="6dp"
         android:scaleType="fitCenter"
         android:tooltipText="@string/title_more"
-        app:layout_constraintStart_toEndOf="@+id/ibTools"
-        app:layout_constraintTop_toBottomOf="@id/vSeparator"
-        app:srcCompat="@drawable/baseline_more_horiz_24" />
-
-    <androidx.constraintlayout.helper.widget.Flow
-        android:id="@+id/ibFlow"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="3dp"
-        app:constraint_referenced_ids="ibInbox,ibJunk,ibTrash,ibArchive,ibMove,ibAnswer,ibUnsubscribe,ibRule,ibUndo"
-        app:flow_horizontalBias="0"
-        app:flow_horizontalGap="3dp"
-        app:flow_horizontalStyle="packed"
-        app:flow_wrapMode="chain"
-        app:layout_constraintEnd_toStartOf="@+id/ibVerify"
-        app:layout_constraintStart_toEndOf="@+id/ibMore"
-        app:layout_constraintTop_toBottomOf="@id/vSeparator" />
+        app:srcCompat="@drawable/baseline_more_horiz_24"
+        tools:ignore="MissingConstraints" />
 
     <ImageButton
         android:id="@+id/ibJunk"