diff --git a/app/src/main/res/layout/conversation_activity_attachment_editor_stub.xml b/app/src/main/res/layout/conversation_activity_attachment_editor_stub.xml
index 62f2988f53..ddb67e4a45 100644
--- a/app/src/main/res/layout/conversation_activity_attachment_editor_stub.xml
+++ b/app/src/main/res/layout/conversation_activity_attachment_editor_stub.xml
@@ -2,7 +2,6 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/attachment_editor"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center_horizontal"
diff --git a/app/src/main/res/layout/v2_conversation_fragment.xml b/app/src/main/res/layout/v2_conversation_fragment.xml
index 9aad6f05c0..d5ded2a141 100644
--- a/app/src/main/res/layout/v2_conversation_fragment.xml
+++ b/app/src/main/res/layout/v2_conversation_fragment.xml
@@ -223,13 +223,13 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         app:barrierDirection="top"
-        app:constraint_referenced_ids="conversation_input_panel,attachment_editor_stub,attachment_editor,conversation_disabled_input,scheduled_messages_stub,scheduled_messages,conversation_search_bottom_bar" />
+        app:constraint_referenced_ids="conversation_input_panel,attachment_editor_stub,conversation_disabled_input,scheduled_messages_stub,scheduled_messages,conversation_search_bottom_bar" />
 
     <ViewStub
         android:id="@+id/attachment_editor_stub"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:inflatedId="@+id/attachment_editor"
+        android:inflatedId="@+id/attachment_editor_stub"
         android:layout="@layout/conversation_activity_attachment_editor_stub"
         app:layout_constraintBottom_toTopOf="@+id/conversation_input_panel"
         app:layout_constraintEnd_toEndOf="@id/parent_end_guideline"
@@ -239,11 +239,13 @@
         android:id="@+id/scheduled_messages_stub"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="8dp"
         android:inflatedId="@+id/scheduled_messages"
         android:layout="@layout/conversation_activity_scheduled_messages_stub"
-        app:layout_constraintBottom_toTopOf="@+id/conversation_input_panel"
+        app:layout_constraintBottom_toTopOf="@+id/attachment_editor_stub"
         app:layout_constraintEnd_toEndOf="@id/parent_end_guideline"
-        app:layout_constraintStart_toStartOf="@id/parent_start_guideline" />
+        app:layout_constraintStart_toStartOf="@id/parent_start_guideline"
+        app:layout_goneMarginBottom="0dp" />
 
     <include
         android:id="@+id/conversation_input_panel"