diff --git a/app/src/main/res/layout-land/layout_main.xml b/app/src/main/res/layout-land/layout_main.xml
index 6ca37163de492e40800b1b6f980d4773afc5c38e..4f23eab72dccd9c3792dda2e0995a0f06c4de67f 100644
--- a/app/src/main/res/layout-land/layout_main.xml
+++ b/app/src/main/res/layout-land/layout_main.xml
@@ -24,14 +24,14 @@
   android:layout_height="match_parent"
   android:gravity="bottom">
 
-  <include layout="@layout/layout_toolbar" />
-
   <android.support.design.widget.CoordinatorLayout
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_marginBottom="?actionBarSize"
     android:orientation="vertical">
 
+    <include layout="@layout/layout_toolbar" />
+
     <fragment
       android:id="@+id/fragment_messages"
       android:name="de.kuschku.quasseldroid.ui.chat.messages.MessageListFragment"
@@ -39,12 +39,6 @@
       android:layout_height="match_parent"
       tools:layout="@layout/fragment_messages" />
 
-    <de.kuschku.quasseldroid.util.ui.ShadowView
-      android:layout_width="match_parent"
-      android:layout_height="16dp"
-      android:gravity="bottom"
-      app:layout_anchor="@id/autocomplete_list" />
-
     <android.support.v7.widget.RecyclerView
       android:id="@+id/autocomplete_list"
       android:layout_width="match_parent"
diff --git a/app/src/main/res/layout-sw600dp-land/layout_main.xml b/app/src/main/res/layout-sw600dp-land/layout_main.xml
index 4cc02bcede54a5d194d2bf9d5d3700939e7f313a..1e0c0825b6a238a012342f10306164a24e17efd6 100644
--- a/app/src/main/res/layout-sw600dp-land/layout_main.xml
+++ b/app/src/main/res/layout-sw600dp-land/layout_main.xml
@@ -38,13 +38,6 @@
       android:layout_marginBottom="?actionBarSize"
       android:orientation="vertical">
 
-      <fragment
-        android:id="@+id/fragment_messages"
-        android:name="de.kuschku.quasseldroid.ui.chat.messages.MessageListFragment"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        tools:layout="@layout/fragment_messages" />
-
       <android.support.v7.widget.RecyclerView
         android:id="@+id/autocomplete_list"
         android:layout_width="match_parent"