diff --git a/src/main/res/layout/activity_channel_discovery.xml b/src/main/res/layout/activity_channel_discovery.xml
index 6ed46433ea032a93a112d5f0aaf9cebc99c63010..055b9aff2328c5d091fea3122505ee6c44634e53 100644
--- a/src/main/res/layout/activity_channel_discovery.xml
+++ b/src/main/res/layout/activity_channel_discovery.xml
@@ -13,26 +13,27 @@
             android:id="@+id/toolbar"
             layout="@layout/toolbar" />
 
-
         <ProgressBar
             android:id="@+id/progressBar"
             style="?android:attr/progressBarStyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:layout_anchor="@+id/list"
-            android:layout_gravity="center_horizontal"/>
+            android:layout_gravity="center_horizontal"
+            app:layout_anchor="@+id/list" />
 
         <android.support.design.widget.CoordinatorLayout
             android:id="@+id/coordinator"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="?attr/color_background_primary">
+
             <android.support.v7.widget.RecyclerView
                 android:id="@+id/list"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:background="?attr/color_background_primary"
                 android:orientation="vertical"
+                android:scrollbars="vertical"
                 android:visibility="gone"
                 app:layoutManager="android.support.v7.widget.LinearLayoutManager" />
         </android.support.design.widget.CoordinatorLayout>
diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml
index 19b5807be5f51d389ae42403c8c8968c91cc6b44..db67a7889178a4e80aac22724f82afab81031409 100644
--- a/src/main/res/layout/fragment_conversation.xml
+++ b/src/main/res/layout/fragment_conversation.xml
@@ -61,23 +61,6 @@
             android:layout_alignParentBottom="true"
             android:background="?attr/color_background_primary">
 
-            <android.support.v7.widget.RecyclerView
-                android:id="@+id/media_preview"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentLeft="true"
-                android:layout_toStartOf="@+id/textSendButton"
-                android:layout_toLeftOf="@+id/textSendButton"
-                android:orientation="horizontal"
-                android:paddingTop="8dp"
-                android:requiresFadingEdge="horizontal"
-                android:visibility="gone"
-                app:layoutManager="android.support.v7.widget.LinearLayoutManager"
-                tools:listitem="@layout/media_preview">
-
-            </android.support.v7.widget.RecyclerView>
-
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -98,6 +81,19 @@
                     android:textAppearance="@style/TextAppearance.Conversations.Caption.Highlight"
                     android:visibility="gone" />
 
+                <android.support.v7.widget.RecyclerView
+                    android:id="@+id/media_preview"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:paddingTop="8dp"
+                    android:requiresFadingEdge="horizontal"
+                    android:visibility="gone"
+                    app:layoutManager="android.support.v7.widget.LinearLayoutManager"
+                    tools:listitem="@layout/media_preview">
+
+                </android.support.v7.widget.RecyclerView>
+
                 <eu.siacs.conversations.ui.widget.EditMessage
                     android:id="@+id/textinput"
                     style="@style/Widget.Conversations.EditText"