diff --git a/app/src/main/res/layout/conversation_activity.xml b/app/src/main/res/layout/conversation_activity.xml
index 0d2715957..93c042345 100644
--- a/app/src/main/res/layout/conversation_activity.xml
+++ b/app/src/main/res/layout/conversation_activity.xml
@@ -198,27 +198,33 @@
 
     <ViewStub
         android:id="@+id/review_banner_stub"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:inflatedId="@+id/review_banner"
         android:layout="@layout/review_banner_view"
-        app:layout_constraintTop_toBottomOf="@id/toolbar"/>
+        app:layout_constraintTop_toBottomOf="@id/toolbar"
+        app:layout_constraintStart_toStartOf="@id/parent_start_guideline"
+        app:layout_constraintEnd_toEndOf="@id/parent_end_guideline"/>
 
     <ViewStub
         android:id="@+id/unverified_banner_stub"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         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"/>
+        app:layout_constraintTop_toBottomOf="@id/review_banner_stub"
+        app:layout_constraintStart_toStartOf="@id/parent_start_guideline"
+        app:layout_constraintEnd_toEndOf="@id/parent_end_guideline"/>
 
     <ViewStub
         android:id="@+id/reminder_stub"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:inflatedId="@+id/reminder"
         android:layout="@layout/conversation_activity_reminderview_stub"
-        app:layout_constraintTop_toBottomOf="@id/unverified_banner_stub"/>
+        app:layout_constraintTop_toBottomOf="@id/unverified_banner_stub"
+        app:layout_constraintStart_toStartOf="@id/parent_start_guideline"
+        app:layout_constraintEnd_toEndOf="@id/parent_end_guideline"/>
 
     <View
         android:id="@+id/conversation_toolbar_shadow"