diff --git a/app/src/main/java/eu/faircode/email/FragmentFolders.java b/app/src/main/java/eu/faircode/email/FragmentFolders.java
index 2bd78de2c9..0213fc408b 100644
--- a/app/src/main/java/eu/faircode/email/FragmentFolders.java
+++ b/app/src/main/java/eu/faircode/email/FragmentFolders.java
@@ -240,6 +240,15 @@ public class FragmentFolders extends FragmentBase {
             }
         });
 
+        swipeRefresh.setOnChildScrollUpCallback(new SwipeRefreshLayout.OnChildScrollUpCallback() {
+            @Override
+            public boolean canChildScrollUp(@NonNull SwipeRefreshLayout parent, @Nullable View child) {
+                if (!prefs.getBoolean("pull", true))
+                    return true;
+                return rvFolder.canScrollVertically(-1);
+            }
+        });
+
         // Initialize
 
         if (cards && !Helper.isDarkTheme(getContext()))
diff --git a/app/src/main/res/drawable/scroll_thumb.xml b/app/src/main/res/drawable/scroll_thumb.xml
index f0843064e6..cacdbf5781 100644
--- a/app/src/main/res/drawable/scroll_thumb.xml
+++ b/app/src/main/res/drawable/scroll_thumb.xml
@@ -3,13 +3,13 @@
     <item android:state_pressed="true">
         <shape android:shape="rectangle">
             <solid android:color="?attr/colorAccent" />
-            <size android:width="9dp" android:height="60dp" />
+            <size android:width="6dp" android:height="60dp" />
         </shape>
     </item>
     <item>
         <shape android:shape="rectangle">
-            <solid android:color="?attr/colorSeparator" />
-            <size android:width="9dp" android:height="60dp" />
+            <solid android:color="?attr/colorThumb" />
+            <size android:width="6dp" android:height="60dp" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/scroll_thumb_dialog.xml b/app/src/main/res/drawable/scroll_thumb_dialog.xml
deleted file mode 100644
index ea00d2287b..0000000000
--- a/app/src/main/res/drawable/scroll_thumb_dialog.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="?attr/colorAccent" />
-            <size android:width="9dp" android:height="60dp" />
-        </shape>
-    </item>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_folder_select.xml b/app/src/main/res/layout/dialog_folder_select.xml
index 43ff1f0d5a..d97e81d7c0 100644
--- a/app/src/main/res/layout/dialog_folder_select.xml
+++ b/app/src/main/res/layout/dialog_folder_select.xml
@@ -38,14 +38,18 @@
         app:layout_constraintTop_toTopOf="@+id/etSearch"
         app:srcCompat="@drawable/baseline_fast_forward_24" />
 
-    <androidx.recyclerview.widget.RecyclerView
+    <eu.faircode.email.FixedRecyclerView
         android:id="@+id/rvFolder"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="6dp"
         android:scrollbarStyle="outsideOverlay"
-        android:scrollbarThumbVertical="@drawable/scroll_thumb_dialog"
-        android:scrollbars="vertical"
+        android:scrollbars="none"
+        app:fastScrollEnabled="false"
+        app:fastScrollHorizontalThumbDrawable="@drawable/scroll_thumb"
+        app:fastScrollHorizontalTrackDrawable="@drawable/scroll_track"
+        app:fastScrollVerticalThumbDrawable="@drawable/scroll_thumb"
+        app:fastScrollVerticalTrackDrawable="@drawable/scroll_track"
         app:layout_constrainedHeight="true"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/dialog_keyword_manage.xml b/app/src/main/res/layout/dialog_keyword_manage.xml
index 19ce8793ed..6ed94a5276 100644
--- a/app/src/main/res/layout/dialog_keyword_manage.xml
+++ b/app/src/main/res/layout/dialog_keyword_manage.xml
@@ -13,7 +13,7 @@
         android:clipToPadding="false"
         android:paddingBottom="60dp"
         android:scrollbarStyle="outsideOverlay"
-        android:scrollbarThumbVertical="@drawable/scroll_thumb_dialog"
+        android:scrollbarThumbVertical="@drawable/scroll_thumb"
         android:scrollbars="vertical"
         app:layout_constrainedHeight="true"
         app:layout_constraintBottom_toTopOf="@+id/tvPro"
diff --git a/app/src/main/res/layout/dialog_rule_match.xml b/app/src/main/res/layout/dialog_rule_match.xml
index 6d3a25121f..1647c6ba27 100644
--- a/app/src/main/res/layout/dialog_rule_match.xml
+++ b/app/src/main/res/layout/dialog_rule_match.xml
@@ -22,7 +22,7 @@
         android:layout_height="wrap_content"
         android:padding="12dp"
         android:scrollbarStyle="outsideOverlay"
-        android:scrollbarThumbVertical="@drawable/scroll_thumb_dialog"
+        android:scrollbarThumbVertical="@drawable/scroll_thumb"
         android:scrollbars="vertical"
         app:layout_constrainedHeight="true"
         app:layout_constraintBottom_toTopOf="@+id/btnExecute"
diff --git a/app/src/main/res/layout/fragment_folders.xml b/app/src/main/res/layout/fragment_folders.xml
index 9fe2fb8d62..a8710bf6be 100644
--- a/app/src/main/res/layout/fragment_folders.xml
+++ b/app/src/main/res/layout/fragment_folders.xml
@@ -83,7 +83,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tvHintSync" />
 
-            <androidx.recyclerview.widget.RecyclerView
+            <eu.faircode.email.FixedRecyclerView
                 android:id="@+id/rvFolder"
                 android:layout_width="0dp"
                 android:layout_height="0dp"
@@ -91,7 +91,12 @@
                 android:paddingTop="6dp"
                 android:paddingBottom="90dp"
                 android:scrollbarStyle="outsideOverlay"
-                android:scrollbars="vertical"
+                android:scrollbars="none"
+                app:fastScrollEnabled="false"
+                app:fastScrollHorizontalThumbDrawable="@drawable/scroll_thumb"
+                app:fastScrollHorizontalTrackDrawable="@drawable/scroll_track"
+                app:fastScrollVerticalThumbDrawable="@drawable/scroll_thumb"
+                app:fastScrollVerticalTrackDrawable="@drawable/scroll_track"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index e186c151d1..d2aa59ec73 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -22,6 +22,7 @@
 
     <color name="lightColorItemSelected">#ccc</color>
     <color name="lightColorSeparator">#ccc</color>
+    <color name="lightColorThumb">#ccc</color>
     <color name="lightColorWarning">#ffff0000</color>
 
     <color name="lightColorDrawerScrim">#99000000</color>
@@ -37,6 +38,7 @@
 
     <color name="darkColorItemSelected">#444</color>
     <color name="darkColorSeparator">#444</color>
+    <color name="darkColorThumb">#555</color>
     <color name="darkColorWarning">#ffffb74d</color>
 
     <color name="darkColorDrawerScrim">#997f7f7f</color>
diff --git a/app/src/main/res/values/dimen.xml b/app/src/main/res/values/dimen.xml
index f6c2a5e19c..3304500b28 100644
--- a/app/src/main/res/values/dimen.xml
+++ b/app/src/main/res/values/dimen.xml
@@ -3,4 +3,5 @@
     <dimen name="fab_padding">15dp</dimen>
     <dimen name="design_bottom_navigation_text_size" tools:override="true">12sp</dimen>
     <dimen name="design_bottom_navigation_active_text_size" tools:override="true">12sp</dimen>
+    <dimen name="fastscroll_default_thickness" tools:override="true">6dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 71e1814850..a4a2bae0a6 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -6,6 +6,7 @@
     <attr name="colorHighlight" format="reference" />
     <attr name="colorEncrypt" format="reference" />
     <attr name="colorSeparator" format="reference" />
+    <attr name="colorThumb" format="reference" />
     <attr name="colorWarning" format="reference" />
     <attr name="colorDrawerScrim" format="reference" />
     <attr name="colorDrawerText" format="reference" />
@@ -32,7 +33,7 @@
         <item name="colorEncrypt">@color/colorEncryptLight</item>
 
         <item name="colorSeparator">@color/lightColorSeparator</item>
-
+        <item name="colorThumb">@color/lightColorThumb</item>
         <item name="colorWarning">@color/lightColorWarning</item>
 
         <item name="colorDrawerScrim">@color/lightColorDrawerScrim</item>
@@ -74,7 +75,7 @@
         <item name="colorEncrypt">@color/colorEncryptDark</item>
 
         <item name="colorSeparator">@color/darkColorSeparator</item>
-
+        <item name="colorThumb">@color/darkColorThumb</item>
         <item name="colorWarning">@color/darkColorWarning</item>
 
         <item name="colorDrawerScrim">@color/darkColorDrawerScrim</item>