diff --git a/res/layout/conversation_input_panel.xml b/res/layout/conversation_input_panel.xml
index 8df38d5a61..ca6674e7c2 100644
--- a/res/layout/conversation_input_panel.xml
+++ b/res/layout/conversation_input_panel.xml
@@ -37,12 +37,18 @@
                     app:message_type="preview"
                     tools:visibility="visible"/>
 
-            <LinearLayout android:layout_width="match_parent"
-                          android:layout_height="wrap_content"
-                          android:clipChildren="false"
-                          android:clipToPadding="false">
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:clipChildren="false"
+                android:clipToPadding="false">
+
+                <LinearLayout android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:clipChildren="false"
+                    android:clipToPadding="false">
 
-                <org.thoughtcrime.securesms.components.emoji.EmojiToggle
+                    <org.thoughtcrime.securesms.components.emoji.EmojiToggle
                         android:id="@+id/emoji_toggle"
                         android:layout_width="37dp"
                         android:layout_height="37dp"
@@ -50,7 +56,7 @@
                         android:background="@drawable/touch_highlight_background"
                         android:contentDescription="@string/conversation_activity__emoji_toggle_description" />
 
-                <org.thoughtcrime.securesms.components.ComposeText
+                    <org.thoughtcrime.securesms.components.ComposeText
                         style="@style/ComposeEditText"
                         android:id="@+id/embedded_text_editor"
                         android:layout_width="0dp"
@@ -62,17 +68,17 @@
                         android:nextFocusRight="@+id/send_button"
                         tools:visibility="invisible"
                         tools:hint="Send TextSecure message" >
-                    <requestFocus />
-                </org.thoughtcrime.securesms.components.ComposeText>
+                        <requestFocus />
+                    </org.thoughtcrime.securesms.components.ComposeText>
 
-                <org.thoughtcrime.securesms.components.HidingLinearLayout
+                    <org.thoughtcrime.securesms.components.HidingLinearLayout
                         android:id="@+id/quick_attachment_toggle"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:clipChildren="false"
                         android:clipToPadding="false">
 
-                    <ImageButton
+                        <ImageButton
                             android:id="@+id/quick_camera_toggle"
                             android:layout_width="37dp"
                             android:layout_height="37dp"
@@ -82,14 +88,14 @@
                             android:contentDescription="@string/conversation_activity__quick_attachment_drawer_toggle_camera_description"
                             android:padding="10dp"/>
 
-                    <org.thoughtcrime.securesms.components.MicrophoneRecorderView
+                        <org.thoughtcrime.securesms.components.MicrophoneRecorderView
                             android:id="@+id/recorder_view"
                             android:layout_width="37dp"
                             android:layout_height="37dp"
                             android:clipChildren="false"
                             android:clipToPadding="false">
 
-                        <ImageButton
+                            <ImageButton
                                 android:id="@+id/quick_audio_toggle"
                                 android:layout_width="37dp"
                                 android:layout_height="37dp"
@@ -99,68 +105,72 @@
                                 android:contentDescription="@string/conversation_activity__quick_attachment_drawer_record_and_send_audio_description"
                                 android:padding="10dp"/>
 
-                        <ImageView android:id="@+id/quick_audio_fab"
-                                   android:layout_width="74dp"
-                                   android:layout_height="74dp"
-                                   android:src="@drawable/ic_mic_white_48dp"
-                                   android:background="@drawable/circle_tintable"
-                                   android:backgroundTint="@color/red_400"
-                                   android:visibility="gone"
-                                   android:scaleType="center"/>
+                            <ImageView android:id="@+id/quick_audio_fab"
+                                android:layout_width="74dp"
+                                android:layout_height="74dp"
+                                android:src="@drawable/ic_mic_white_48dp"
+                                android:background="@drawable/circle_tintable"
+                                android:backgroundTint="@color/red_400"
+                                android:visibility="gone"
+                                android:scaleType="center"/>
 
-                    </org.thoughtcrime.securesms.components.MicrophoneRecorderView>
+                        </org.thoughtcrime.securesms.components.MicrophoneRecorderView>
 
-                </org.thoughtcrime.securesms.components.HidingLinearLayout>
+                    </org.thoughtcrime.securesms.components.HidingLinearLayout>
 
-            </LinearLayout>
-        </LinearLayout>
+                </LinearLayout>
 
-        <LinearLayout android:id="@+id/recording_container"
-                      android:layout_width="match_parent"
-                      android:layout_height="wrap_content"
-                      android:layout_gravity="center_vertical"
-                      android:orientation="horizontal"
-                      tools:visibility="gone">
+                <LinearLayout android:id="@+id/recording_container"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:orientation="horizontal"
+                    tools:visibility="gone">
 
-            <TextView android:id="@+id/record_time"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:ellipsize="none"
-                      android:layout_marginLeft="20dp"
-                      android:layout_marginStart="20dp"
-                      android:text="00:00"
-                      android:textColor="#61737b"
-                      android:textSize="20dp"
-                      android:singleLine="true"
-                      android:visibility="gone"
-                      tools:visibility="visible"/>
-
-            <FrameLayout android:layout_width="match_parent"
-                         android:layout_height="match_parent"
-                         android:clipChildren="true">
-
-                <TextView android:id="@+id/slide_to_cancel"
-                          android:layout_width="wrap_content"
-                          android:layout_height="match_parent"
-                          android:gravity="center"
-                          android:drawableLeft="@drawable/ic_keyboard_arrow_left_grey600_24dp"
-                          android:drawableStart="@drawable/ic_keyboard_arrow_left_grey600_24dp"
-                          android:text="@string/conversation_input_panel__slide_to_cancel"
-                          android:textAllCaps="true"
-                          android:textColor="#61737b"
-                          android:textSize="10sp"
-                          android:ellipsize="none"
-                          android:singleLine="true"
-                          android:paddingLeft="20dp"
-                          android:paddingStart="20dp"
-                          android:visibility="gone"
-                          tools:visibility="visible"/>
+                    <TextView android:id="@+id/record_time"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:ellipsize="none"
+                        android:layout_marginLeft="20dp"
+                        android:layout_marginStart="20dp"
+                        android:text="00:00"
+                        android:textColor="#61737b"
+                        android:textSize="20dp"
+                        android:singleLine="true"
+                        android:visibility="gone"
+                        tools:visibility="visible"/>
+
+                    <FrameLayout android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:clipChildren="true">
+
+                        <TextView android:id="@+id/slide_to_cancel"
+                            android:layout_width="wrap_content"
+                            android:layout_height="match_parent"
+                            android:gravity="center"
+                            android:drawableLeft="@drawable/ic_keyboard_arrow_left_grey600_24dp"
+                            android:drawableStart="@drawable/ic_keyboard_arrow_left_grey600_24dp"
+                            android:text="@string/conversation_input_panel__slide_to_cancel"
+                            android:textAllCaps="true"
+                            android:textColor="#61737b"
+                            android:textSize="10sp"
+                            android:ellipsize="none"
+                            android:singleLine="true"
+                            android:paddingLeft="20dp"
+                            android:paddingStart="20dp"
+                            android:visibility="gone"
+                            tools:visibility="visible"/>
+
+                    </FrameLayout>
+
+                </LinearLayout>
 
             </FrameLayout>
 
         </LinearLayout>
 
     </FrameLayout>
+
     <org.thoughtcrime.securesms.components.AnimatingToggle
             android:id="@+id/button_toggle"
             android:layout_width="50dp"