diff --git a/app/src/main/java/eu/faircode/email/ScrollViewEx.java b/app/src/main/java/eu/faircode/email/ScrollViewEx.java
new file mode 100644
index 0000000000..faa83354ab
--- /dev/null
+++ b/app/src/main/java/eu/faircode/email/ScrollViewEx.java
@@ -0,0 +1,42 @@
+package eu.faircode.email;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.ScrollView;
+
+/*
+    This file is part of FairEmail.
+
+    FairEmail is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    FairEmail is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
+
+    Copyright 2018-2020 by Marcel Bokhorst (M66B)
+*/
+
+public class ScrollViewEx extends ScrollView {
+    public ScrollViewEx(Context context) {
+        super(context);
+    }
+
+    public ScrollViewEx(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public ScrollViewEx(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    public ScrollViewEx(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+}
diff --git a/app/src/main/res/layout/activity_dsn.xml b/app/src/main/res/layout/activity_dsn.xml
index f18a58468e..f10c724dbf 100644
--- a/app/src/main/res/layout/activity_dsn.xml
+++ b/app/src/main/res/layout/activity_dsn.xml
@@ -5,7 +5,7 @@
     android:layout_height="match_parent"
     tools:context="eu.faircode.email.ActivityDSN">
 
-    <ScrollView
+    <eu.faircode.email.ScrollViewEx
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
@@ -36,7 +36,7 @@
                 android:layout_height="0dp"
                 app:constraint_referenced_ids="tvHeaders" />
         </androidx.constraintlayout.widget.ConstraintLayout>
-    </ScrollView>
+    </eu.faircode.email.ScrollViewEx>
 
     <eu.faircode.email.ContentLoadingProgressBar
         android:id="@+id/pbWait"
diff --git a/app/src/main/res/layout/activity_eml.xml b/app/src/main/res/layout/activity_eml.xml
index abd68f3ff4..98062f3b43 100644
--- a/app/src/main/res/layout/activity_eml.xml
+++ b/app/src/main/res/layout/activity_eml.xml
@@ -5,7 +5,7 @@
     android:layout_height="match_parent"
     tools:context="eu.faircode.email.ActivityEML">
 
-    <ScrollView
+    <eu.faircode.email.ScrollViewEx
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
@@ -238,7 +238,7 @@
                     rvAttachment,
                     vSeparatorBody,tvBody" />
         </androidx.constraintlayout.widget.ConstraintLayout>
-    </ScrollView>
+    </eu.faircode.email.ScrollViewEx>
 
     <eu.faircode.email.ContentLoadingProgressBar
         android:id="@+id/pbWait"
diff --git a/app/src/main/res/layout/activity_view_landscape.xml b/app/src/main/res/layout/activity_view_landscape.xml
index 78ae7f9d41..849e8041c7 100644
--- a/app/src/main/res/layout/activity_view_landscape.xml
+++ b/app/src/main/res/layout/activity_view_landscape.xml
@@ -29,7 +29,7 @@
             android:layout_weight="1" />
     </LinearLayout>
 
-    <ScrollView
+    <eu.faircode.email.ScrollViewEx
         android:id="@+id/drawer_container"
         android:layout_width="270dp"
         android:layout_height="match_parent"
@@ -41,5 +41,5 @@
             layout="@layout/include_nav"
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
-    </ScrollView>
+    </eu.faircode.email.ScrollViewEx>
 </eu.faircode.email.DrawerLayoutEx>
diff --git a/app/src/main/res/layout/activity_view_portrait.xml b/app/src/main/res/layout/activity_view_portrait.xml
index 90f3d96e3b..703965ce74 100644
--- a/app/src/main/res/layout/activity_view_portrait.xml
+++ b/app/src/main/res/layout/activity_view_portrait.xml
@@ -10,7 +10,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
-    <ScrollView
+    <eu.faircode.email.ScrollViewEx
         android:id="@+id/drawer_container"
         android:layout_width="270dp"
         android:layout_height="match_parent"
@@ -22,5 +22,5 @@
             layout="@layout/include_nav"
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
-    </ScrollView>
+    </eu.faircode.email.ScrollViewEx>
 </eu.faircode.email.DrawerLayoutEx>
diff --git a/app/src/main/res/layout/activity_widget.xml b/app/src/main/res/layout/activity_widget.xml
index 380df23d39..a5e7f9b296 100644
--- a/app/src/main/res/layout/activity_widget.xml
+++ b/app/src/main/res/layout/activity_widget.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -110,4 +110,4 @@
             android:layout_height="0dp"
             app:constraint_referenced_ids="tvAccount,spAccount,cbSemiTransparent,clLayout,btnSave" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</ScrollView>
\ No newline at end of file
+</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_ask_again.xml b/app/src/main/res/layout/dialog_ask_again.xml
index 2da6c1c523..ac560cb337 100644
--- a/app/src/main/res/layout/dialog_ask_again.xml
+++ b/app/src/main/res/layout/dialog_ask_again.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -30,4 +30,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvMessage" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</ScrollView>
\ No newline at end of file
+</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_boundary_error.xml b/app/src/main/res/layout/dialog_boundary_error.xml
index 42d3be0882..6150c28039 100644
--- a/app/src/main/res/layout/dialog_boundary_error.xml
+++ b/app/src/main/res/layout/dialog_boundary_error.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -31,4 +31,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvMessage" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</ScrollView>
\ No newline at end of file
+</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_certificate.xml b/app/src/main/res/layout/dialog_certificate.xml
index e97a35eb3d..3b430ef36c 100644
--- a/app/src/main/res/layout/dialog_certificate.xml
+++ b/app/src/main/res/layout/dialog_certificate.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -148,4 +148,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvAfter" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</ScrollView>
\ No newline at end of file
+</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_duration.xml b/app/src/main/res/layout/dialog_duration.xml
index 429f748fae..b34189a52d 100644
--- a/app/src/main/res/layout/dialog_duration.xml
+++ b/app/src/main/res/layout/dialog_duration.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -75,4 +75,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/timePicker" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</ScrollView>
\ No newline at end of file
+</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_error_reporting.xml b/app/src/main/res/layout/dialog_error_reporting.xml
index 7a22a99a38..3217959598 100644
--- a/app/src/main/res/layout/dialog_error_reporting.xml
+++ b/app/src/main/res/layout/dialog_error_reporting.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -51,4 +51,4 @@
             app:layout_constraintTop_toTopOf="@id/btnInfo"
             app:srcCompat="@drawable/baseline_open_in_new_24" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</ScrollView>
\ No newline at end of file
+</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_first.xml b/app/src/main/res/layout/dialog_first.xml
index 9fcb19e04e..89da86af88 100644
--- a/app/src/main/res/layout/dialog_first.xml
+++ b/app/src/main/res/layout/dialog_first.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -63,4 +63,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/btnInfo" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</ScrollView>
\ No newline at end of file
+</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_folder_all.xml b/app/src/main/res/layout/dialog_folder_all.xml
index 59ab2dbdc7..7ebba530a3 100644
--- a/app/src/main/res/layout/dialog_folder_all.xml
+++ b/app/src/main/res/layout/dialog_folder_all.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -98,4 +98,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/etKeepDays" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</ScrollView>
\ No newline at end of file
+</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_junk.xml b/app/src/main/res/layout/dialog_junk.xml
index 42fe81770b..669033fb4e 100644
--- a/app/src/main/res/layout/dialog_junk.xml
+++ b/app/src/main/res/layout/dialog_junk.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -61,4 +61,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvBlockHint" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</ScrollView>
\ No newline at end of file
+</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_markdown.xml b/app/src/main/res/layout/dialog_markdown.xml
index febe28de36..98c8374fd9 100644
--- a/app/src/main/res/layout/dialog_markdown.xml
+++ b/app/src/main/res/layout/dialog_markdown.xml
@@ -6,7 +6,7 @@
     android:layout_height="wrap_content"
     tools:context="eu.faircode.email.ActivityView">
 
-    <ScrollView
+    <eu.faircode.email.ScrollViewEx
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:orientation="vertical"
@@ -30,7 +30,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
         </androidx.constraintlayout.widget.ConstraintLayout>
-    </ScrollView>
+    </eu.faircode.email.ScrollViewEx>
 
     <eu.faircode.email.ContentLoadingProgressBar
         android:id="@+id/pbWait"
diff --git a/app/src/main/res/layout/dialog_open_link.xml b/app/src/main/res/layout/dialog_open_link.xml
index ec2e85017a..8e27998118 100644
--- a/app/src/main/res/layout/dialog_open_link.xml
+++ b/app/src/main/res/layout/dialog_open_link.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -181,4 +181,4 @@
             android:layout_height="0dp"
             app:constraint_referenced_ids="tvOwnerTitle,tvHost,tvOwner" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</ScrollView>
\ No newline at end of file
+</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_review.xml b/app/src/main/res/layout/dialog_review.xml
index dd857e8e21..4439534547 100644
--- a/app/src/main/res/layout/dialog_review.xml
+++ b/app/src/main/res/layout/dialog_review.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -31,4 +31,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvMessage" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</ScrollView>
\ No newline at end of file
+</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_review_account.xml b/app/src/main/res/layout/dialog_review_account.xml
index 79f61dc8bb..fe9aca2303 100644
--- a/app/src/main/res/layout/dialog_review_account.xml
+++ b/app/src/main/res/layout/dialog_review_account.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -84,4 +84,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvRight" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</ScrollView>
\ No newline at end of file
+</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_search.xml b/app/src/main/res/layout/dialog_search.xml
index 732751999c..8a9dabfbb9 100644
--- a/app/src/main/res/layout/dialog_search.xml
+++ b/app/src/main/res/layout/dialog_search.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -284,4 +284,4 @@
             tvAnd,cbUnseen,cbFlagged,cbHidden,cbEncrypted,cbAttachments,
             btnAfter,btnBefore,tvBefore,tvAfter" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</ScrollView>
\ No newline at end of file
+</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_send.xml b/app/src/main/res/layout/dialog_send.xml
index 33b5931224..6492edeed6 100644
--- a/app/src/main/res/layout/dialog_send.xml
+++ b/app/src/main/res/layout/dialog_send.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -274,4 +274,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbNotAgain" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</ScrollView>
\ No newline at end of file
+</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_setup.xml b/app/src/main/res/layout/dialog_setup.xml
index b620fb26a9..2c65f73ca1 100644
--- a/app/src/main/res/layout/dialog_setup.xml
+++ b/app/src/main/res/layout/dialog_setup.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -90,4 +90,4 @@
             android:layout_height="0dp"
             app:constraint_referenced_ids="four,title4" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</ScrollView>
\ No newline at end of file
+</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_show_full.xml b/app/src/main/res/layout/dialog_show_full.xml
index 4d3a467961..8b0398f66b 100644
--- a/app/src/main/res/layout/dialog_show_full.xml
+++ b/app/src/main/res/layout/dialog_show_full.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -51,4 +51,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbNotAgain" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</ScrollView>
\ No newline at end of file
+</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_show_images.xml b/app/src/main/res/layout/dialog_show_images.xml
index 10a3cdda74..a2b03b9207 100644
--- a/app/src/main/res/layout/dialog_show_images.xml
+++ b/app/src/main/res/layout/dialog_show_images.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -71,4 +71,4 @@
             android:layout_height="0dp"
             app:constraint_referenced_ids="ivTracking,tvTracking,ivInfo" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</ScrollView>
\ No newline at end of file
+</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_swipes.xml b/app/src/main/res/layout/dialog_swipes.xml
index a2fc836e27..555752390a 100644
--- a/app/src/main/res/layout/dialog_swipes.xml
+++ b/app/src/main/res/layout/dialog_swipes.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -65,4 +65,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvRight" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</ScrollView>
\ No newline at end of file
+</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_theme.xml b/app/src/main/res/layout/dialog_theme.xml
index 7497b6e464..b56c47a715 100644
--- a/app/src/main/res/layout/dialog_theme.xml
+++ b/app/src/main/res/layout/dialog_theme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -132,4 +132,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/swSystem" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</ScrollView>
\ No newline at end of file
+</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml
index a128a6d353..4ea0cf4e78 100644
--- a/app/src/main/res/layout/fragment_about.xml
+++ b/app/src/main/res/layout/fragment_about.xml
@@ -41,7 +41,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvVersion" />
 
-    <ScrollView
+    <eu.faircode.email.ScrollViewEx
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:orientation="vertical"
@@ -63,5 +63,5 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
         </androidx.constraintlayout.widget.ConstraintLayout>
-    </ScrollView>
+    </eu.faircode.email.ScrollViewEx>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_account.xml b/app/src/main/res/layout/fragment_account.xml
index 69fdae018f..f69a42e51e 100644
--- a/app/src/main/res/layout/fragment_account.xml
+++ b/app/src/main/res/layout/fragment_account.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<eu.faircode.email.ScrollViewEx 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:id="@+id/scroll"
@@ -965,4 +965,4 @@
             android:layout_height="0dp"
             app:constraint_referenced_ids="tvErrorTitle,tvError" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</ScrollView>
+</eu.faircode.email.ScrollViewEx>
diff --git a/app/src/main/res/layout/fragment_compose.xml b/app/src/main/res/layout/fragment_compose.xml
index f0b9fcefbc..1683f83002 100644
--- a/app/src/main/res/layout/fragment_compose.xml
+++ b/app/src/main/res/layout/fragment_compose.xml
@@ -11,7 +11,7 @@
         android:layout_height="match_parent"
         app:layout_behavior="eu.faircode.email.BehaviorBottomPadding">
 
-        <ScrollView
+        <eu.faircode.email.ScrollViewEx
             android:layout_width="match_parent"
             android:layout_height="0dp"
             app:layout_constraintBottom_toTopOf="@+id/style_bar"
@@ -466,7 +466,7 @@
                     android:layout_height="0dp"
                     app:constraint_referenced_ids="ibCloseRefHint,tvReferenceHint" />
             </androidx.constraintlayout.widget.ConstraintLayout>
-        </ScrollView>
+        </eu.faircode.email.ScrollViewEx>
 
         <com.google.android.material.bottomnavigation.BottomNavigationView
             android:id="@+id/style_bar"
diff --git a/app/src/main/res/layout/fragment_eula.xml b/app/src/main/res/layout/fragment_eula.xml
index 8ee1c62662..b66f206e96 100644
--- a/app/src/main/res/layout/fragment_eula.xml
+++ b/app/src/main/res/layout/fragment_eula.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<eu.faircode.email.ScrollViewEx 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"
@@ -41,4 +41,4 @@
             app:layout_constraintStart_toEndOf="@id/btnCancel"
             app:layout_constraintTop_toBottomOf="@id/inEula" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</ScrollView>
+</eu.faircode.email.ScrollViewEx>
diff --git a/app/src/main/res/layout/fragment_folder.xml b/app/src/main/res/layout/fragment_folder.xml
index 868a5214b5..e656a3525d 100644
--- a/app/src/main/res/layout/fragment_folder.xml
+++ b/app/src/main/res/layout/fragment_folder.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<eu.faircode.email.ScrollViewEx 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:id="@+id/scroll"
@@ -333,4 +333,4 @@
             android:layout_height="0dp"
             app:constraint_referenced_ids="etPoll,tvMultiply,tvPoll" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</ScrollView>
+</eu.faircode.email.ScrollViewEx>
diff --git a/app/src/main/res/layout/fragment_gmail.xml b/app/src/main/res/layout/fragment_gmail.xml
index ef1f79eebd..46d430b8b4 100644
--- a/app/src/main/res/layout/fragment_gmail.xml
+++ b/app/src/main/res/layout/fragment_gmail.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<eu.faircode.email.ScrollViewEx 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:id="@+id/scroll"
@@ -146,4 +146,4 @@
             android:layout_height="0dp"
             app:constraint_referenced_ids="tvErrorTitle,tvError,tvDraftsHint,btnSupport" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</ScrollView>
+</eu.faircode.email.ScrollViewEx>
diff --git a/app/src/main/res/layout/fragment_identity.xml b/app/src/main/res/layout/fragment_identity.xml
index 3c84f58a59..f4b09bb6a7 100644
--- a/app/src/main/res/layout/fragment_identity.xml
+++ b/app/src/main/res/layout/fragment_identity.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<eu.faircode.email.ScrollViewEx 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:id="@+id/scroll"
@@ -759,4 +759,4 @@
             android:layout_height="0dp"
             app:constraint_referenced_ids="tvErrorTitle,tvError" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</ScrollView>
+</eu.faircode.email.ScrollViewEx>
diff --git a/app/src/main/res/layout/fragment_legend_compose.xml b/app/src/main/res/layout/fragment_legend_compose.xml
index c97ed0562d..359fe87194 100644
--- a/app/src/main/res/layout/fragment_legend_compose.xml
+++ b/app/src/main/res/layout/fragment_legend_compose.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<eu.faircode.email.ScrollViewEx 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"
@@ -276,4 +276,4 @@
             app:layout_constraintStart_toEndOf="@id/ivColor"
             app:layout_constraintTop_toTopOf="@id/ivColor" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</ScrollView>
\ No newline at end of file
+</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_legend_folders.xml b/app/src/main/res/layout/fragment_legend_folders.xml
index 843c2e9526..badecc1dcf 100644
--- a/app/src/main/res/layout/fragment_legend_folders.xml
+++ b/app/src/main/res/layout/fragment_legend_folders.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<eu.faircode.email.ScrollViewEx 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"
@@ -344,4 +344,4 @@
             app:layout_constraintStart_toEndOf="@id/ivStop"
             app:layout_constraintTop_toTopOf="@id/ivStop" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</ScrollView>
+</eu.faircode.email.ScrollViewEx>
diff --git a/app/src/main/res/layout/fragment_legend_keyboard.xml b/app/src/main/res/layout/fragment_legend_keyboard.xml
index bdfe06f935..abdbd3c000 100644
--- a/app/src/main/res/layout/fragment_legend_keyboard.xml
+++ b/app/src/main/res/layout/fragment_legend_keyboard.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<eu.faircode.email.ScrollViewEx 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"
@@ -225,4 +225,4 @@
             app:layout_constraintStart_toEndOf="@id/tvT"
             app:layout_constraintTop_toTopOf="@id/tvT" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</ScrollView>
\ No newline at end of file
+</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_legend_messages.xml b/app/src/main/res/layout/fragment_legend_messages.xml
index 72bdd17f16..eed2603fb8 100644
--- a/app/src/main/res/layout/fragment_legend_messages.xml
+++ b/app/src/main/res/layout/fragment_legend_messages.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<eu.faircode.email.ScrollViewEx 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"
@@ -608,4 +608,4 @@
             app:layout_constraintStart_toEndOf="@id/ivBrokenImage"
             app:layout_constraintTop_toTopOf="@id/ivBrokenImage" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</ScrollView>
+</eu.faircode.email.ScrollViewEx>
diff --git a/app/src/main/res/layout/fragment_legend_synchronization.xml b/app/src/main/res/layout/fragment_legend_synchronization.xml
index 6cb16540fc..57bf9c966b 100644
--- a/app/src/main/res/layout/fragment_legend_synchronization.xml
+++ b/app/src/main/res/layout/fragment_legend_synchronization.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<eu.faircode.email.ScrollViewEx 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"
@@ -342,4 +342,4 @@
             app:layout_constraintStart_toEndOf="@id/ivWaiting"
             app:layout_constraintTop_toTopOf="@id/ivWaiting" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</ScrollView>
+</eu.faircode.email.ScrollViewEx>
diff --git a/app/src/main/res/layout/fragment_oauth.xml b/app/src/main/res/layout/fragment_oauth.xml
index 8897809a3f..7efb735e62 100644
--- a/app/src/main/res/layout/fragment_oauth.xml
+++ b/app/src/main/res/layout/fragment_oauth.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<eu.faircode.email.ScrollViewEx 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:id="@+id/scroll"
@@ -150,4 +150,4 @@
             android:layout_height="0dp"
             app:constraint_referenced_ids="tvErrorTitle,tvError,btnSupport" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</ScrollView>
+</eu.faircode.email.ScrollViewEx>
diff --git a/app/src/main/res/layout/fragment_options_behavior.xml b/app/src/main/res/layout/fragment_options_behavior.xml
index ea9f728111..ade43a312d 100644
--- a/app/src/main/res/layout/fragment_options_behavior.xml
+++ b/app/src/main/res/layout/fragment_options_behavior.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<eu.faircode.email.ScrollViewEx 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"
@@ -424,4 +424,4 @@
             android:layout_height="0dp"
             app:constraint_referenced_ids="swConversationActions,swConversationActionsReplies" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</ScrollView>
+</eu.faircode.email.ScrollViewEx>
diff --git a/app/src/main/res/layout/fragment_options_connection.xml b/app/src/main/res/layout/fragment_options_connection.xml
index 8754ddb800..311dc7fdb8 100644
--- a/app/src/main/res/layout/fragment_options_connection.xml
+++ b/app/src/main/res/layout/fragment_options_connection.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<eu.faircode.email.ScrollViewEx 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"
@@ -285,4 +285,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/tvConnectionType" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</ScrollView>
+</eu.faircode.email.ScrollViewEx>
diff --git a/app/src/main/res/layout/fragment_options_display.xml b/app/src/main/res/layout/fragment_options_display.xml
index 9572deaade..79b6d17ceb 100644
--- a/app/src/main/res/layout/fragment_options_display.xml
+++ b/app/src/main/res/layout/fragment_options_display.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<eu.faircode.email.ScrollViewEx 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"
@@ -883,4 +883,4 @@
             app:layout_constraintTop_toBottomOf="@id/tvAdvanced"
             app:switchPadding="12dp" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</ScrollView>
+</eu.faircode.email.ScrollViewEx>
diff --git a/app/src/main/res/layout/fragment_options_encryption.xml b/app/src/main/res/layout/fragment_options_encryption.xml
index 3c14742254..b29c048b1a 100644
--- a/app/src/main/res/layout/fragment_options_encryption.xml
+++ b/app/src/main/res/layout/fragment_options_encryption.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<eu.faircode.email.ScrollViewEx 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"
@@ -198,4 +198,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/btnManageKeys" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</ScrollView>
+</eu.faircode.email.ScrollViewEx>
diff --git a/app/src/main/res/layout/fragment_options_misc.xml b/app/src/main/res/layout/fragment_options_misc.xml
index c263fe8f5a..90584acc60 100644
--- a/app/src/main/res/layout/fragment_options_misc.xml
+++ b/app/src/main/res/layout/fragment_options_misc.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<eu.faircode.email.ScrollViewEx 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"
@@ -368,4 +368,4 @@
             android:layout_height="0dp"
             app:constraint_referenced_ids="tvProcessors,tvMemoryClass,tvStorageSpace,tvFingerprint,btnCharsets" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</ScrollView>
+</eu.faircode.email.ScrollViewEx>
diff --git a/app/src/main/res/layout/fragment_options_notifications.xml b/app/src/main/res/layout/fragment_options_notifications.xml
index f3946caaff..45ff3547c6 100644
--- a/app/src/main/res/layout/fragment_options_notifications.xml
+++ b/app/src/main/res/layout/fragment_options_notifications.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<eu.faircode.email.ScrollViewEx 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"
@@ -481,4 +481,4 @@
             android:layout_height="0dp"
             app:constraint_referenced_ids="swLight,btnSound" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</ScrollView>
+</eu.faircode.email.ScrollViewEx>
diff --git a/app/src/main/res/layout/fragment_options_privacy.xml b/app/src/main/res/layout/fragment_options_privacy.xml
index 91cc4bfd24..9d299f0739 100644
--- a/app/src/main/res/layout/fragment_options_privacy.xml
+++ b/app/src/main/res/layout/fragment_options_privacy.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<eu.faircode.email.ScrollViewEx 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"
@@ -278,4 +278,4 @@
             android:layout_height="0dp"
             app:constraint_referenced_ids="swSafeBrowsing,btnSafeBrowsing" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</ScrollView>
+</eu.faircode.email.ScrollViewEx>
diff --git a/app/src/main/res/layout/fragment_options_send.xml b/app/src/main/res/layout/fragment_options_send.xml
index d79a3ad88c..b4870418d1 100644
--- a/app/src/main/res/layout/fragment_options_send.xml
+++ b/app/src/main/res/layout/fragment_options_send.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<eu.faircode.email.ScrollViewEx 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"
@@ -360,4 +360,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/swLookupMx" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</ScrollView>
+</eu.faircode.email.ScrollViewEx>
diff --git a/app/src/main/res/layout/fragment_options_synchronize.xml b/app/src/main/res/layout/fragment_options_synchronize.xml
index 1a7c3aeff4..96dcc72e36 100644
--- a/app/src/main/res/layout/fragment_options_synchronize.xml
+++ b/app/src/main/res/layout/fragment_options_synchronize.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<eu.faircode.email.ScrollViewEx 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"
@@ -487,4 +487,4 @@
             android:layout_height="0dp"
             app:constraint_referenced_ids="tvExempted,rvExempted" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</ScrollView>
\ No newline at end of file
+</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_pop.xml b/app/src/main/res/layout/fragment_pop.xml
index 85c0322d3d..9dac6f5a27 100644
--- a/app/src/main/res/layout/fragment_pop.xml
+++ b/app/src/main/res/layout/fragment_pop.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<eu.faircode.email.ScrollViewEx 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:id="@+id/scroll"
@@ -439,4 +439,4 @@
             android:layout_height="0dp"
             app:constraint_referenced_ids="tvErrorTitle,tvError" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</ScrollView>
+</eu.faircode.email.ScrollViewEx>
diff --git a/app/src/main/res/layout/fragment_pro.xml b/app/src/main/res/layout/fragment_pro.xml
index 92fd02b83e..773b0c12c0 100644
--- a/app/src/main/res/layout/fragment_pro.xml
+++ b/app/src/main/res/layout/fragment_pro.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<eu.faircode.email.ScrollViewEx 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"
@@ -133,4 +133,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvPriceHint" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</ScrollView>
+</eu.faircode.email.ScrollViewEx>
diff --git a/app/src/main/res/layout/fragment_quick_setup.xml b/app/src/main/res/layout/fragment_quick_setup.xml
index d5f13e2eb6..43a15352a3 100644
--- a/app/src/main/res/layout/fragment_quick_setup.xml
+++ b/app/src/main/res/layout/fragment_quick_setup.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<eu.faircode.email.ScrollViewEx 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:id="@+id/scroll"
@@ -246,4 +246,4 @@
             android:layout_height="0dp"
             app:constraint_referenced_ids="tvErrorTitle,tvError,tvErrorHint" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</ScrollView>
+</eu.faircode.email.ScrollViewEx>
diff --git a/app/src/main/res/layout/fragment_rule.xml b/app/src/main/res/layout/fragment_rule.xml
index 67826c706b..58453d7887 100644
--- a/app/src/main/res/layout/fragment_rule.xml
+++ b/app/src/main/res/layout/fragment_rule.xml
@@ -11,7 +11,7 @@
         android:layout_height="match_parent"
         app:layout_behavior="eu.faircode.email.BehaviorBottomPadding">
 
-        <ScrollView
+        <eu.faircode.email.ScrollViewEx
             android:id="@+id/scroll"
             android:layout_width="match_parent"
             android:layout_height="0dp"
@@ -728,7 +728,7 @@
                     android:layout_height="0dp"
                     app:constraint_referenced_ids="tvAutomation" />
             </androidx.constraintlayout.widget.ConstraintLayout>
-        </ScrollView>
+        </eu.faircode.email.ScrollViewEx>
 
         <com.google.android.material.bottomnavigation.BottomNavigationView
             android:id="@+id/bottom_navigation"
diff --git a/app/src/main/res/layout/fragment_setup.xml b/app/src/main/res/layout/fragment_setup.xml
index dedc916df0..ca1c75425a 100644
--- a/app/src/main/res/layout/fragment_setup.xml
+++ b/app/src/main/res/layout/fragment_setup.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<eu.faircode.email.ScrollViewEx 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"
@@ -569,4 +569,4 @@
             android:layout_height="0dp"
             app:constraint_referenced_ids="tvDataSaver,btnDataSaver" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</ScrollView>
+</eu.faircode.email.ScrollViewEx>