diff --git a/app/src/main/java/eu/faircode/email/FixedRecyclerView.java b/app/src/main/java/eu/faircode/email/FixedRecyclerView.java
index 14c96e2206..20961f3f74 100644
--- a/app/src/main/java/eu/faircode/email/FixedRecyclerView.java
+++ b/app/src/main/java/eu/faircode/email/FixedRecyclerView.java
@@ -59,6 +59,17 @@ public class FixedRecyclerView extends RecyclerView {
                 .getDrawable(androidx.recyclerview.R.styleable.RecyclerView_fastScrollHorizontalThumbDrawable);
         Drawable horizontalTrackDrawable = a
                 .getDrawable(androidx.recyclerview.R.styleable.RecyclerView_fastScrollHorizontalTrackDrawable);
+
+        if (verticalThumbDrawable == null)
+            verticalThumbDrawable = (StateListDrawable) context.getDrawable(R.drawable.scroll_thumb);
+        if (verticalTrackDrawable == null)
+            verticalTrackDrawable = context.getDrawable(R.drawable.scroll_track);
+
+        if (horizontalThumbDrawable == null)
+            horizontalThumbDrawable = (StateListDrawable) context.getDrawable(R.drawable.scroll_thumb);
+        if (horizontalTrackDrawable == null)
+            horizontalTrackDrawable = context.getDrawable(R.drawable.scroll_track);
+
         Resources resources = getContext().getResources();
         new FastScrollerEx(this, verticalThumbDrawable, verticalTrackDrawable,
                 horizontalThumbDrawable, horizontalTrackDrawable,
diff --git a/app/src/main/res/layout/activity_eml.xml b/app/src/main/res/layout/activity_eml.xml
index e5cefae078..971cec442c 100644
--- a/app/src/main/res/layout/activity_eml.xml
+++ b/app/src/main/res/layout/activity_eml.xml
@@ -227,7 +227,7 @@
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toBottomOf="@id/tvSubject" />
 
-                    <androidx.recyclerview.widget.RecyclerView
+                    <eu.faircode.email.FixedRecyclerView
                         android:id="@+id/rvAttachment"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/activity_setup.xml b/app/src/main/res/layout/activity_setup.xml
index a19fbe2fbc..6c4f9bc276 100644
--- a/app/src/main/res/layout/activity_setup.xml
+++ b/app/src/main/res/layout/activity_setup.xml
@@ -18,7 +18,7 @@
         android:layout_gravity="start"
         android:background="?attr/colorDrawerBackground">
 
-        <androidx.recyclerview.widget.RecyclerView
+        <eu.faircode.email.FixedRecyclerView
             android:id="@+id/rvMenu"
             android:layout_width="0dp"
             android:layout_height="0dp"
diff --git a/app/src/main/res/layout/dialog_keyword_manage.xml b/app/src/main/res/layout/dialog_keyword_manage.xml
index cc0000241b..15c5a75560 100644
--- a/app/src/main/res/layout/dialog_keyword_manage.xml
+++ b/app/src/main/res/layout/dialog_keyword_manage.xml
@@ -5,7 +5,7 @@
     android:layout_height="wrap_content"
     android:padding="12dp">
 
-    <androidx.recyclerview.widget.RecyclerView
+    <eu.faircode.email.FixedRecyclerView
         android:id="@+id/rvKeyword"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/dialog_rule_match.xml b/app/src/main/res/layout/dialog_rule_match.xml
index a661e7ae9a..42d62befb5 100644
--- a/app/src/main/res/layout/dialog_rule_match.xml
+++ b/app/src/main/res/layout/dialog_rule_match.xml
@@ -16,7 +16,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <androidx.recyclerview.widget.RecyclerView
+    <eu.faircode.email.FixedRecyclerView
         android:id="@+id/rvMessage"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/dialog_virus_total.xml b/app/src/main/res/layout/dialog_virus_total.xml
index 51f9e872ca..dc2f2d2174 100644
--- a/app/src/main/res/layout/dialog_virus_total.xml
+++ b/app/src/main/res/layout/dialog_virus_total.xml
@@ -138,7 +138,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvLabel" />
 
-        <androidx.recyclerview.widget.RecyclerView
+        <eu.faircode.email.FixedRecyclerView
             android:id="@+id/rvScan"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_accounts.xml b/app/src/main/res/layout/fragment_accounts.xml
index d1a167a1a7..1a546bd8c7 100644
--- a/app/src/main/res/layout/fragment_accounts.xml
+++ b/app/src/main/res/layout/fragment_accounts.xml
@@ -38,7 +38,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/tvHintActions" />
 
-            <androidx.recyclerview.widget.RecyclerView
+            <eu.faircode.email.FixedRecyclerView
                 android:id="@+id/rvAccount"
                 android:layout_width="0dp"
                 android:layout_height="0dp"
diff --git a/app/src/main/res/layout/fragment_answers.xml b/app/src/main/res/layout/fragment_answers.xml
index 10eae290cf..ec21bc1726 100644
--- a/app/src/main/res/layout/fragment_answers.xml
+++ b/app/src/main/res/layout/fragment_answers.xml
@@ -10,7 +10,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <androidx.recyclerview.widget.RecyclerView
+        <eu.faircode.email.FixedRecyclerView
             android:id="@+id/rvAnswer"
             android:layout_width="0dp"
             android:layout_height="0dp"
diff --git a/app/src/main/res/layout/fragment_certificates.xml b/app/src/main/res/layout/fragment_certificates.xml
index b6f9ef7b17..2c671d9e7e 100644
--- a/app/src/main/res/layout/fragment_certificates.xml
+++ b/app/src/main/res/layout/fragment_certificates.xml
@@ -10,7 +10,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <androidx.recyclerview.widget.RecyclerView
+        <eu.faircode.email.FixedRecyclerView
             android:id="@+id/rvCertificate"
             android:layout_width="0dp"
             android:layout_height="0dp"
diff --git a/app/src/main/res/layout/fragment_compose.xml b/app/src/main/res/layout/fragment_compose.xml
index e196d6b0a7..de98ce70ec 100644
--- a/app/src/main/res/layout/fragment_compose.xml
+++ b/app/src/main/res/layout/fragment_compose.xml
@@ -262,7 +262,7 @@
                     app:layout_constraintTop_toBottomOf="@+id/vSeparatorAttachments"
                     app:srcCompat="@drawable/twotone_delete_24" />
 
-                <androidx.recyclerview.widget.RecyclerView
+                <eu.faircode.email.FixedRecyclerView
                     android:id="@+id/rvAttachment"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_contacts.xml b/app/src/main/res/layout/fragment_contacts.xml
index bb072e5962..cbe3e5b574 100644
--- a/app/src/main/res/layout/fragment_contacts.xml
+++ b/app/src/main/res/layout/fragment_contacts.xml
@@ -22,7 +22,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <androidx.recyclerview.widget.RecyclerView
+        <eu.faircode.email.FixedRecyclerView
             android:id="@+id/rvContacts"
             android:layout_width="0dp"
             android:layout_height="0dp"
diff --git a/app/src/main/res/layout/fragment_identities.xml b/app/src/main/res/layout/fragment_identities.xml
index da9a879f89..4a897afb68 100644
--- a/app/src/main/res/layout/fragment_identities.xml
+++ b/app/src/main/res/layout/fragment_identities.xml
@@ -20,7 +20,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <androidx.recyclerview.widget.RecyclerView
+        <eu.faircode.email.FixedRecyclerView
             android:id="@+id/rvIdentity"
             android:layout_width="0dp"
             android:layout_height="0dp"
diff --git a/app/src/main/res/layout/fragment_logs.xml b/app/src/main/res/layout/fragment_logs.xml
index 96d67b8064..0f05ff9faf 100644
--- a/app/src/main/res/layout/fragment_logs.xml
+++ b/app/src/main/res/layout/fragment_logs.xml
@@ -7,7 +7,7 @@
     android:layout_marginHorizontal="3dp"
     tools:context="eu.faircode.email.ActivityView">
 
-    <androidx.recyclerview.widget.RecyclerView
+    <eu.faircode.email.FixedRecyclerView
         android:id="@+id/rvLog"
         android:layout_width="0dp"
         android:layout_height="0dp"
diff --git a/app/src/main/res/layout/fragment_operations.xml b/app/src/main/res/layout/fragment_operations.xml
index 4ffd74dc3b..faf099dadb 100644
--- a/app/src/main/res/layout/fragment_operations.xml
+++ b/app/src/main/res/layout/fragment_operations.xml
@@ -27,7 +27,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <androidx.recyclerview.widget.RecyclerView
+    <eu.faircode.email.FixedRecyclerView
         android:id="@+id/rvOperation"
         android:layout_width="0dp"
         android:layout_height="0dp"
diff --git a/app/src/main/res/layout/fragment_options_privacy.xml b/app/src/main/res/layout/fragment_options_privacy.xml
index 30f12b3f78..e27640d6a0 100644
--- a/app/src/main/res/layout/fragment_options_privacy.xml
+++ b/app/src/main/res/layout/fragment_options_privacy.xml
@@ -751,7 +751,7 @@
                     app:layout_constraintTop_toBottomOf="@+id/swDisconnectLinks"
                     app:switchPadding="12dp" />
 
-                <androidx.recyclerview.widget.RecyclerView
+                <eu.faircode.email.FixedRecyclerView
                     android:id="@+id/rvDisconnect"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_options_synchronize.xml b/app/src/main/res/layout/fragment_options_synchronize.xml
index 3a2cb6b975..0f0c5780c7 100644
--- a/app/src/main/res/layout/fragment_options_synchronize.xml
+++ b/app/src/main/res/layout/fragment_options_synchronize.xml
@@ -240,7 +240,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvPollHint" />
 
-                <androidx.recyclerview.widget.RecyclerView
+                <eu.faircode.email.FixedRecyclerView
                     android:id="@+id/rvExempted"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -1158,7 +1158,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvUseBlocklistPopHint" />
 
-                <androidx.recyclerview.widget.RecyclerView
+                <eu.faircode.email.FixedRecyclerView
                     android:id="@+id/rvBlocklist"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_order.xml b/app/src/main/res/layout/fragment_order.xml
index 524697905e..1df62c0c61 100644
--- a/app/src/main/res/layout/fragment_order.xml
+++ b/app/src/main/res/layout/fragment_order.xml
@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     tools:context="eu.faircode.email.ActivitySetup">
 
-    <androidx.recyclerview.widget.RecyclerView
+    <eu.faircode.email.FixedRecyclerView
         android:id="@+id/rvOrder"
         android:layout_width="0dp"
         android:layout_height="0dp"
diff --git a/app/src/main/res/layout/fragment_rules.xml b/app/src/main/res/layout/fragment_rules.xml
index 5d75a2d6e2..dcd9212701 100644
--- a/app/src/main/res/layout/fragment_rules.xml
+++ b/app/src/main/res/layout/fragment_rules.xml
@@ -10,7 +10,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <androidx.recyclerview.widget.RecyclerView
+        <eu.faircode.email.FixedRecyclerView
             android:id="@+id/rvRule"
             android:layout_width="0dp"
             android:layout_height="0dp"
diff --git a/app/src/main/res/layout/include_message_attachments.xml b/app/src/main/res/layout/include_message_attachments.xml
index 720b846bd5..6163d8b54e 100644
--- a/app/src/main/res/layout/include_message_attachments.xml
+++ b/app/src/main/res/layout/include_message_attachments.xml
@@ -82,7 +82,7 @@
         app:barrierDirection="bottom"
         app:constraint_referenced_ids="cbInline,ibSaveAttachments,ibDownloadAttachments" />
 
-    <androidx.recyclerview.widget.RecyclerView
+    <eu.faircode.email.FixedRecyclerView
         android:id="@+id/rvAttachment"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/include_message_images.xml b/app/src/main/res/layout/include_message_images.xml
index bba1ae37ee..16dc9c4b2b 100644
--- a/app/src/main/res/layout/include_message_images.xml
+++ b/app/src/main/res/layout/include_message_images.xml
@@ -41,7 +41,7 @@
         app:layout_constraintTop_toBottomOf="@+id/vSeparatorImages"
         app:srcCompat="@drawable/twotone_share_24" />
 
-    <androidx.recyclerview.widget.RecyclerView
+    <eu.faircode.email.FixedRecyclerView
         android:id="@+id/rvImage"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/include_nav.xml b/app/src/main/res/layout/include_nav.xml
index 8088230473..b88befd188 100644
--- a/app/src/main/res/layout/include_nav.xml
+++ b/app/src/main/res/layout/include_nav.xml
@@ -109,7 +109,7 @@
         app:layout_constraintTop_toBottomOf="@id/vSeparatorOptions"
         app:srcCompat="@drawable/expander3" />
 
-    <androidx.recyclerview.widget.RecyclerView
+    <eu.faircode.email.FixedRecyclerView
         android:id="@+id/rvAccount"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -139,7 +139,7 @@
         app:layout_constraintTop_toBottomOf="@id/vSeparatorAccount"
         app:srcCompat="@drawable/expander" />
 
-    <androidx.recyclerview.widget.RecyclerView
+    <eu.faircode.email.FixedRecyclerView
         android:id="@+id/rvUnified"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -169,7 +169,7 @@
         app:layout_constraintTop_toBottomOf="@id/vSeparatorUnified"
         app:srcCompat="@drawable/expander" />
 
-    <androidx.recyclerview.widget.RecyclerView
+    <eu.faircode.email.FixedRecyclerView
         android:id="@+id/rvSearch"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -199,7 +199,7 @@
         app:layout_constraintTop_toBottomOf="@id/vSeparatorSearch"
         app:srcCompat="@drawable/expander" />
 
-    <androidx.recyclerview.widget.RecyclerView
+    <eu.faircode.email.FixedRecyclerView
         android:id="@+id/rvMenu"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -229,7 +229,7 @@
         app:layout_constraintTop_toBottomOf="@id/vSeparatorMenu"
         app:srcCompat="@drawable/expander" />
 
-    <androidx.recyclerview.widget.RecyclerView
+    <eu.faircode.email.FixedRecyclerView
         android:id="@+id/rvMenuExtra"
         android:layout_width="0dp"
         android:layout_height="wrap_content"