diff --git a/app/src/main/res/layout/conversation_activity.xml b/app/src/main/res/layout/conversation_activity.xml
index 53dfe7b180..9b79e2ef1d 100644
--- a/app/src/main/res/layout/conversation_activity.xml
+++ b/app/src/main/res/layout/conversation_activity.xml
@@ -42,27 +42,6 @@
             android:gravity="bottom"
             android:orientation="vertical">
 
-            <ViewStub
-                android:id="@+id/review_banner_stub"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:inflatedId="@+id/review_banner"
-                android:layout="@layout/review_banner_view" />
-
-            <ViewStub
-                android:id="@+id/unverified_banner_stub"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:inflatedId="@+id/unverified_banner"
-                android:layout="@layout/conversation_activity_unverified_banner_stub" />
-
-            <ViewStub
-                android:id="@+id/reminder_stub"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:inflatedId="@+id/reminder"
-                android:layout="@layout/conversation_activity_reminderview_stub" />
-
             <FrameLayout
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
@@ -215,6 +194,30 @@
 
     </org.thoughtcrime.securesms.util.views.DarkOverflowToolbar>
 
+    <ViewStub
+        android:id="@+id/review_banner_stub"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:inflatedId="@+id/review_banner"
+        android:layout="@layout/review_banner_view"
+        app:layout_constraintTop_toBottomOf="@id/toolbar"/>
+
+    <ViewStub
+        android:id="@+id/unverified_banner_stub"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:inflatedId="@+id/unverified_banner"
+        android:layout="@layout/conversation_activity_unverified_banner_stub"
+        app:layout_constraintTop_toBottomOf="@id/review_banner_stub"/>
+
+    <ViewStub
+        android:id="@+id/reminder_stub"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:inflatedId="@+id/reminder"
+        android:layout="@layout/conversation_activity_reminderview_stub"
+        app:layout_constraintTop_toBottomOf="@id/unverified_banner_stub"/>
+
     <View
         android:id="@+id/conversation_toolbar_shadow"
         android:layout_width="match_parent"