diff --git a/app/lint-baseline.xml b/app/lint-baseline.xml
index d8c1d08f5..faf24b90d 100644
--- a/app/lint-baseline.xml
+++ b/app/lint-baseline.xml
@@ -4300,7 +4300,7 @@
         errorLine2="     ~~~~~~~~">
         <location
             file="src/main/res/layout/item_conversation.xml"
-            line="233"
+            line="234"
             column="6"/>
     </issue>
 
diff --git a/app/src/main/res/layout-sw640dp/fragment_timeline.xml b/app/src/main/res/layout-sw640dp/fragment_timeline.xml
index f4c2c99ce..22b9e6f3f 100644
--- a/app/src/main/res/layout-sw640dp/fragment_timeline.xml
+++ b/app/src/main/res/layout-sw640dp/fragment_timeline.xml
@@ -22,7 +22,8 @@
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/recyclerView"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent" />
+                    android:layout_height="match_parent"
+                    android:scrollbars="vertical" />
 
                 <app.pachli.view.BackgroundMessageView
                     android:id="@+id/statusView"
diff --git a/app/src/main/res/layout-sw640dp/fragment_timeline_notifications.xml b/app/src/main/res/layout-sw640dp/fragment_timeline_notifications.xml
index 4362f40f7..b4ebe216e 100644
--- a/app/src/main/res/layout-sw640dp/fragment_timeline_notifications.xml
+++ b/app/src/main/res/layout-sw640dp/fragment_timeline_notifications.xml
@@ -18,7 +18,6 @@
 
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -40,7 +39,8 @@
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/recyclerView"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent" />
+                    android:layout_height="match_parent"
+                    android:scrollbars="vertical" />
 
                 <app.pachli.view.BackgroundMessageView
                     android:id="@+id/statusView"
diff --git a/app/src/main/res/layout/activity_announcements.xml b/app/src/main/res/layout/activity_announcements.xml
index 09d66e9a2..18e7facc0 100644
--- a/app/src/main/res/layout/activity_announcements.xml
+++ b/app/src/main/res/layout/activity_announcements.xml
@@ -28,7 +28,8 @@
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/announcementsList"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent" />
+                android:layout_height="match_parent"
+                android:scrollbars="vertical" />
 
             <app.pachli.view.BackgroundMessageView
                 android:id="@+id/errorMessageView"
diff --git a/app/src/main/res/layout/activity_drafts.xml b/app/src/main/res/layout/activity_drafts.xml
index 08976508e..e34c5d5d7 100644
--- a/app/src/main/res/layout/activity_drafts.xml
+++ b/app/src/main/res/layout/activity_drafts.xml
@@ -14,6 +14,7 @@
         android:id="@+id/draftsRecyclerView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:scrollbars="vertical"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
 
     <app.pachli.view.BackgroundMessageView
diff --git a/app/src/main/res/layout/activity_filters.xml b/app/src/main/res/layout/activity_filters.xml
index 8908e0b1e..37a210f63 100644
--- a/app/src/main/res/layout/activity_filters.xml
+++ b/app/src/main/res/layout/activity_filters.xml
@@ -24,6 +24,7 @@
                 android:id="@+id/filtersList"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
+                android:scrollbars="vertical"
                 app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
 
             <app.pachli.view.BackgroundMessageView
diff --git a/app/src/main/res/layout/activity_followed_tags.xml b/app/src/main/res/layout/activity_followed_tags.xml
index fae8e5c3b..dbb17cc7d 100644
--- a/app/src/main/res/layout/activity_followed_tags.xml
+++ b/app/src/main/res/layout/activity_followed_tags.xml
@@ -14,6 +14,7 @@
         android:id="@+id/followedTagsView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:scrollbars="vertical"
         tools:itemCount="5"
         tools:listitem="@layout/item_followed_hashtag"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
diff --git a/app/src/main/res/layout/activity_lists.xml b/app/src/main/res/layout/activity_lists.xml
index 07bd4d088..5790d6897 100644
--- a/app/src/main/res/layout/activity_lists.xml
+++ b/app/src/main/res/layout/activity_lists.xml
@@ -29,7 +29,8 @@
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/listsRecycler"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent" />
+                    android:layout_height="match_parent"
+                    android:scrollbars="vertical" />
 
                 <app.pachli.view.BackgroundMessageView
                     android:id="@+id/messageView"
diff --git a/app/src/main/res/layout/activity_scheduled_status.xml b/app/src/main/res/layout/activity_scheduled_status.xml
index e8cc6c02a..70c571b29 100644
--- a/app/src/main/res/layout/activity_scheduled_status.xml
+++ b/app/src/main/res/layout/activity_scheduled_status.xml
@@ -36,7 +36,8 @@
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/scheduledTootList"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent" />
+                    android:layout_height="match_parent"
+                    android:scrollbars="vertical" />
 
                 <app.pachli.view.BackgroundMessageView
                     android:id="@+id/errorMessageView"
diff --git a/app/src/main/res/layout/fragment_account_list.xml b/app/src/main/res/layout/fragment_account_list.xml
index 12dc3abb0..eb410a110 100644
--- a/app/src/main/res/layout/fragment_account_list.xml
+++ b/app/src/main/res/layout/fragment_account_list.xml
@@ -16,7 +16,8 @@
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/recyclerView"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent" />
+                android:layout_height="match_parent"
+                android:scrollbars="vertical" />
 
             <app.pachli.view.BackgroundMessageView
                 android:id="@+id/messageView"
diff --git a/app/src/main/res/layout/fragment_accounts_in_list.xml b/app/src/main/res/layout/fragment_accounts_in_list.xml
index 92361e110..e768e2fe3 100644
--- a/app/src/main/res/layout/fragment_accounts_in_list.xml
+++ b/app/src/main/res/layout/fragment_accounts_in_list.xml
@@ -24,6 +24,7 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:layout_marginTop="8dp"
+        android:scrollbars="vertical"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/fragment_instance_list.xml b/app/src/main/res/layout/fragment_instance_list.xml
index fd18ab8f5..9312af319 100644
--- a/app/src/main/res/layout/fragment_instance_list.xml
+++ b/app/src/main/res/layout/fragment_instance_list.xml
@@ -13,7 +13,8 @@
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recyclerView"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent"
+        android:scrollbars="vertical" />
 
     <app.pachli.view.BackgroundMessageView
         android:id="@+id/messageView"
diff --git a/app/src/main/res/layout/fragment_lists_for_account.xml b/app/src/main/res/layout/fragment_lists_for_account.xml
index 00a9f3f98..ba783d236 100644
--- a/app/src/main/res/layout/fragment_lists_for_account.xml
+++ b/app/src/main/res/layout/fragment_lists_for_account.xml
@@ -27,6 +27,7 @@
             android:id="@+id/listsView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:scrollbars="vertical"
             android:visibility="gone"
             tools:visibility="visible" />
 
diff --git a/app/src/main/res/layout/fragment_report_statuses.xml b/app/src/main/res/layout/fragment_report_statuses.xml
index a93a418b4..79416817f 100644
--- a/app/src/main/res/layout/fragment_report_statuses.xml
+++ b/app/src/main/res/layout/fragment_report_statuses.xml
@@ -16,9 +16,8 @@
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recyclerView"
             android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-
-
+            android:layout_height="match_parent"
+            android:scrollbars="vertical" />
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
     <ProgressBar
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index 5a5953ceb..de5ab712f 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -15,8 +15,8 @@
             android:layout_height="match_parent"
             android:layout_gravity="center"
             android:background="?android:attr/windowBackground"
+            android:scrollbars="vertical"
             tools:listitem="@layout/item_account" />
-
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
     <ProgressBar
@@ -45,4 +45,3 @@
         android:visibility="gone" />
 
 </FrameLayout>
-
diff --git a/app/src/main/res/layout/fragment_timeline.xml b/app/src/main/res/layout/fragment_timeline.xml
index 0666b0411..29c38e0e5 100644
--- a/app/src/main/res/layout/fragment_timeline.xml
+++ b/app/src/main/res/layout/fragment_timeline.xml
@@ -16,7 +16,8 @@
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/recyclerView"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent" />
+                android:layout_height="match_parent"
+                android:scrollbars="vertical" />
 
             <app.pachli.view.BackgroundMessageView
                 android:id="@+id/statusView"
diff --git a/app/src/main/res/layout/fragment_timeline_notifications.xml b/app/src/main/res/layout/fragment_timeline_notifications.xml
index 48b75b02f..66196fc8a 100644
--- a/app/src/main/res/layout/fragment_timeline_notifications.xml
+++ b/app/src/main/res/layout/fragment_timeline_notifications.xml
@@ -35,7 +35,8 @@
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/recyclerView"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent" />
+                android:layout_height="match_parent"
+                android:scrollbars="vertical" />
 
             <app.pachli.view.BackgroundMessageView
                 android:id="@+id/statusView"
diff --git a/app/src/main/res/layout/fragment_trending_links.xml b/app/src/main/res/layout/fragment_trending_links.xml
index ad8becc7a..416295098 100644
--- a/app/src/main/res/layout/fragment_trending_links.xml
+++ b/app/src/main/res/layout/fragment_trending_links.xml
@@ -33,7 +33,8 @@
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/recyclerView"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent" />
+                android:layout_height="match_parent"
+                android:scrollbars="vertical" />
 
             <app.pachli.view.BackgroundMessageView
                 android:id="@+id/messageView"
diff --git a/app/src/main/res/layout/fragment_trending_tags.xml b/app/src/main/res/layout/fragment_trending_tags.xml
index ad8becc7a..416295098 100644
--- a/app/src/main/res/layout/fragment_trending_tags.xml
+++ b/app/src/main/res/layout/fragment_trending_tags.xml
@@ -33,7 +33,8 @@
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/recyclerView"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent" />
+                android:layout_height="match_parent"
+                android:scrollbars="vertical" />
 
             <app.pachli.view.BackgroundMessageView
                 android:id="@+id/messageView"
diff --git a/app/src/main/res/layout/item_conversation.xml b/app/src/main/res/layout/item_conversation.xml
index 976707c49..1da91c114 100644
--- a/app/src/main/res/layout/item_conversation.xml
+++ b/app/src/main/res/layout/item_conversation.xml
@@ -208,6 +208,7 @@
         android:layout_marginTop="4dp"
         android:layout_marginBottom="4dp"
         android:nestedScrollingEnabled="false"
+        android:scrollbars="vertical"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@id/status_display_name"
         app:layout_constraintTop_toBottomOf="@id/status_media_preview_container" />