diff --git a/CHANGELOG-upstream.md b/CHANGELOG-upstream.md
index 640944692..496cfbe47 100644
--- a/CHANGELOG-upstream.md
+++ b/CHANGELOG-upstream.md
@@ -17,6 +17,7 @@
* Expose new "Multi-device mode" option instead of "Delete from server" for chatmail profiles
* Opened in-chat apps got a 'About Apps' menu item
* Avoid gray avatar on profile creation
+* Avoid last item in chat list being covered by the floating button
* Add disk usage statistics to log
* Update to core 2.29.0
diff --git a/src/main/java/org/thoughtcrime/securesms/AllMediaDocumentsFragment.java b/src/main/java/org/thoughtcrime/securesms/AllMediaDocumentsFragment.java
index bcbbec1a4..62407dcd0 100644
--- a/src/main/java/org/thoughtcrime/securesms/AllMediaDocumentsFragment.java
+++ b/src/main/java/org/thoughtcrime/securesms/AllMediaDocumentsFragment.java
@@ -70,8 +70,6 @@ public class AllMediaDocumentsFragment
this.noMedia = ViewUtil.findById(view, R.id.no_documents);
this.gridManager = new StickyHeaderGridLayoutManager(1);
- // allow content to be drawn behind the navigation bar
- recyclerView.setClipToPadding(false);
// add padding to avoid content hidden behind system bars
ViewUtil.applyWindowInsets(recyclerView, true, false, true, true);
diff --git a/src/main/java/org/thoughtcrime/securesms/AllMediaGalleryFragment.java b/src/main/java/org/thoughtcrime/securesms/AllMediaGalleryFragment.java
index 31b605979..48f8b4635 100644
--- a/src/main/java/org/thoughtcrime/securesms/AllMediaGalleryFragment.java
+++ b/src/main/java/org/thoughtcrime/securesms/AllMediaGalleryFragment.java
@@ -66,8 +66,6 @@ public class AllMediaGalleryFragment
this.noMedia = ViewUtil.findById(view, R.id.no_images);
this.gridManager = new StickyHeaderGridLayoutManager(getCols());
- // allow content to be drawn behind the navigation bar
- recyclerView.setClipToPadding(false);
// add padding to avoid content hidden behind system bars
ViewUtil.applyWindowInsets(recyclerView, true, false, true, true);
diff --git a/src/main/java/org/thoughtcrime/securesms/BlockedContactsActivity.java b/src/main/java/org/thoughtcrime/securesms/BlockedContactsActivity.java
index 52a150a62..e5ca41b4f 100644
--- a/src/main/java/org/thoughtcrime/securesms/BlockedContactsActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/BlockedContactsActivity.java
@@ -60,8 +60,6 @@ public class BlockedContactsActivity extends PassphraseRequiredActionBarActivity
recyclerView = ViewUtil.findById(view, R.id.recycler_view);
recyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
- // allow content to be drawn behind the navigation bar
- recyclerView.setClipToPadding(false);
// add padding to avoid content hidden behind system bars
ViewUtil.applyWindowInsets(recyclerView);
diff --git a/src/main/java/org/thoughtcrime/securesms/ContactSelectionListFragment.java b/src/main/java/org/thoughtcrime/securesms/ContactSelectionListFragment.java
index 2aed613ba..4fdee4852 100644
--- a/src/main/java/org/thoughtcrime/securesms/ContactSelectionListFragment.java
+++ b/src/main/java/org/thoughtcrime/securesms/ContactSelectionListFragment.java
@@ -114,8 +114,6 @@ public class ContactSelectionListFragment extends Fragment
recyclerView = ViewUtil.findById(view, R.id.recycler_view);
- // allow content to be drawn behind the navigation bar
- recyclerView.setClipToPadding(false);
// add padding to avoid content hidden behind system bars
ViewUtil.applyWindowInsets(recyclerView, true, false, true, true);
diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationListFragment.java b/src/main/java/org/thoughtcrime/securesms/ConversationListFragment.java
index 79839993b..74dc5bbf5 100644
--- a/src/main/java/org/thoughtcrime/securesms/ConversationListFragment.java
+++ b/src/main/java/org/thoughtcrime/securesms/ConversationListFragment.java
@@ -108,8 +108,6 @@ public class ConversationListFragment extends BaseConversationListFragment
emptyState = ViewUtil.findById(view, R.id.empty_state);
emptySearch = ViewUtil.findById(view, R.id.empty_search);
- // allow content to be drawn behind the navigation bar
- list.setClipToPadding(false);
// add padding to avoid content hidden behind system bars
ViewUtil.applyWindowInsets(list, true, archive, true, true);
diff --git a/src/main/java/org/thoughtcrime/securesms/ProfileFragment.java b/src/main/java/org/thoughtcrime/securesms/ProfileFragment.java
index 230f650d4..e9c9a19c5 100644
--- a/src/main/java/org/thoughtcrime/securesms/ProfileFragment.java
+++ b/src/main/java/org/thoughtcrime/securesms/ProfileFragment.java
@@ -69,8 +69,6 @@ public class ProfileFragment extends Fragment
RecyclerView list = ViewUtil.findById(view, R.id.recycler_view);
- // allow content to be drawn behind the navigation bar
- list.setClipToPadding(false);
// add padding to avoid content hidden behind system bars
ViewUtil.applyWindowInsets(list);
diff --git a/src/main/res/layout/conversation_list_fragment.xml b/src/main/res/layout/conversation_list_fragment.xml
index 26e24fae5..42986331f 100644
--- a/src/main/res/layout/conversation_list_fragment.xml
+++ b/src/main/res/layout/conversation_list_fragment.xml
@@ -45,6 +45,8 @@
android:id="@+id/list"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:paddingBottom="88dp"
+ android:clipToPadding="false"
android:scrollbars="vertical"
android:nextFocusDown="@+id/fab"
android:nextFocusForward="@+id/fab"
diff --git a/src/main/res/layout/profile_documents_fragment.xml b/src/main/res/layout/profile_documents_fragment.xml
index a28bd577a..6331c2864 100644
--- a/src/main/res/layout/profile_documents_fragment.xml
+++ b/src/main/res/layout/profile_documents_fragment.xml
@@ -8,6 +8,7 @@
android:id="@+id/recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:clipToPadding="false"
android:scrollbars="vertical" />
diff --git a/src/main/res/layout/profile_gallery_fragment.xml b/src/main/res/layout/profile_gallery_fragment.xml
index 212a539f1..6ca5006e5 100644
--- a/src/main/res/layout/profile_gallery_fragment.xml
+++ b/src/main/res/layout/profile_gallery_fragment.xml
@@ -8,6 +8,7 @@
android:id="@+id/media_grid"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:clipToPadding="false"
android:scrollbars="vertical" />