diff --git a/app/src/main/java/com/nextcloud/talk/controllers/base/BaseController.kt b/app/src/main/java/com/nextcloud/talk/controllers/base/BaseController.kt
index 316ebd43c..9456bc6b0 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/base/BaseController.kt
+++ b/app/src/main/java/com/nextcloud/talk/controllers/base/BaseController.kt
@@ -117,19 +117,15 @@ abstract class BaseController : ButterKnifeController(), ComponentCallbacks {
                 it.inputEditText.hint = getSearchHint()
 
                 val layoutParams = it.toolbar.layoutParams as AppBarLayout.LayoutParams
-                val layoutParamsForContainer = it.container.layoutParams as CoordinatorLayout.LayoutParams
 
                 if (value) {
                     layoutParams.scrollFlags = AppBarLayout.LayoutParams.SCROLL_FLAG_SCROLL or AppBarLayout.LayoutParams.SCROLL_FLAG_SNAP or AppBarLayout.LayoutParams.SCROLL_FLAG_ENTER_ALWAYS
-                    layoutParamsForContainer.behavior = FABAwareScrollingViewBehavior()
                     it.appBar.setBackgroundResource(R.color.transparent)
                 } else {
                     layoutParams.scrollFlags = 0
-                    layoutParamsForContainer.behavior = AppBarLayout.ScrollingViewBehavior()
                     it.appBar.setBackgroundResource(R.color.colorPrimary)
                 }
 
-                it.container.layoutParams = layoutParamsForContainer
                 it.toolbar.layoutParams = layoutParams
             }
         }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 098c23941..c9e44d8ee 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -55,7 +55,7 @@
         android:id="@+id/controller_container"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:layout_behavior="com.nextcloud.talk.utils.animations.FABAwareScrollingViewBehavior" />
+        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/floatingActionButton"
diff --git a/app/src/main/res/layout/conversations_list_view.xml b/app/src/main/res/layout/conversations_list_view.xml
index 5cddf55e0..6d1bd71b6 100644
--- a/app/src/main/res/layout/conversations_list_view.xml
+++ b/app/src/main/res/layout/conversations_list_view.xml
@@ -31,6 +31,8 @@
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recyclerView"
             android:layout_width="match_parent"
+            android:clipToPadding="false"
+            android:paddingBottom="64dp"
             android:layout_height="match_parent"
             tools:listitem="@layout/rv_item_conversation_with_last_message" />