From f23add9d5a6b779e477db5816b13af21eee9c1d5 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 21 Jan 2024 13:16:01 +0100
Subject: [PATCH] Fixed views

---
 .../email/AppCompatViewInflaterEx.java        |  3 ++
 .../faircode/email/FixedConstraintLayout.java | 38 +++++++++++++++
 .../email/FixedCoordinatorLayout.java         | 38 +++++++++++++++
 .../eu/faircode/email/FixedFrameLayout.java   | 38 +++++++++++++++
 .../eu/faircode/email/FixedLinearLayout.java  | 38 +++++++++++++++
 .../eu/faircode/email/FixedRecyclerView.java  |  2 +-
 .../faircode/email/FixedRelativeLayout.java   | 38 +++++++++++++++
 ...ScrollViewEx.java => FixedScrollView.java} | 48 +++++++++++++++++--
 app/src/main/res/layout-v31/dialog_theme.xml  |  4 +-
 app/src/main/res/layout-v34/dialog_theme.xml  |  4 +-
 app/src/main/res/layout/activity_clear.xml    |  4 +-
 app/src/main/res/layout/activity_dmarc.xml    |  4 +-
 app/src/main/res/layout/activity_dsn.xml      |  4 +-
 app/src/main/res/layout/activity_eml.xml      |  4 +-
 app/src/main/res/layout/activity_error.xml    |  4 +-
 app/src/main/res/layout/activity_space.xml    |  4 +-
 app/src/main/res/layout/activity_widget.xml   |  4 +-
 .../main/res/layout/activity_widget_sync.xml  |  4 +-
 .../res/layout/activity_widget_unified.xml    |  4 +-
 app/src/main/res/layout/dialog_add_image.xml  |  4 +-
 app/src/main/res/layout/dialog_advanced.xml   |  4 +-
 app/src/main/res/layout/dialog_alias.xml      |  4 +-
 .../main/res/layout/dialog_answer_button.xml  |  4 +-
 app/src/main/res/layout/dialog_ask_again.xml  |  4 +-
 app/src/main/res/layout/dialog_ask_amp.xml    |  4 +-
 app/src/main/res/layout/dialog_ask_full.xml   |  4 +-
 app/src/main/res/layout/dialog_ask_move.xml   |  4 +-
 app/src/main/res/layout/dialog_ask_spam.xml   |  4 +-
 .../main/res/layout/dialog_block_sender.xml   |  4 +-
 .../main/res/layout/dialog_boundary_error.xml |  4 +-
 app/src/main/res/layout/dialog_buttons.xml    |  4 +-
 .../main/res/layout/dialog_certificate.xml    |  4 +-
 .../main/res/layout/dialog_contact_delete.xml |  4 +-
 .../main/res/layout/dialog_contact_group.xml  |  4 +-
 app/src/main/res/layout/dialog_dark.xml       |  4 +-
 app/src/main/res/layout/dialog_debug.xml      |  4 +-
 app/src/main/res/layout/dialog_decrypt.xml    |  4 +-
 app/src/main/res/layout/dialog_deepl.xml      |  4 +-
 .../res/layout/dialog_delete_operations.xml   |  4 +-
 app/src/main/res/layout/dialog_duration.xml   |  4 +-
 .../res/layout/dialog_error_reporting.xml     |  4 +-
 app/src/main/res/layout/dialog_export.xml     |  4 +-
 app/src/main/res/layout/dialog_first.xml      |  4 +-
 app/src/main/res/layout/dialog_folder_all.xml |  4 +-
 .../main/res/layout/dialog_forward_raw.xml    |  4 +-
 app/src/main/res/layout/dialog_identity.xml   |  4 +-
 app/src/main/res/layout/dialog_import.xml     |  4 +-
 .../res/layout/dialog_import_progress.xml     |  4 +-
 .../main/res/layout/dialog_insert_link.xml    |  4 +-
 app/src/main/res/layout/dialog_junk.xml       |  4 +-
 app/src/main/res/layout/dialog_markdown.xml   |  4 +-
 .../main/res/layout/dialog_nav_options.xml    |  4 +-
 app/src/main/res/layout/dialog_no_stream.xml  |  4 +-
 app/src/main/res/layout/dialog_no_viewer.xml  |  4 +-
 app/src/main/res/layout/dialog_notes.xml      |  4 +-
 app/src/main/res/layout/dialog_open_link.xml  |  4 +-
 .../res/layout/dialog_password_protect.xml    |  4 +-
 .../main/res/layout/dialog_permissions.xml    |  4 +-
 app/src/main/res/layout/dialog_print.xml      |  4 +-
 .../main/res/layout/dialog_quick_actions.xml  |  4 +-
 .../res/layout/dialog_reset_questions.xml     |  4 +-
 app/src/main/res/layout/dialog_review.xml     |  4 +-
 .../main/res/layout/dialog_review_account.xml |  4 +-
 app/src/main/res/layout/dialog_search.xml     |  4 +-
 app/src/main/res/layout/dialog_send.xml       |  4 +-
 app/src/main/res/layout/dialog_show_full.xml  |  4 +-
 .../main/res/layout/dialog_show_images.xml    |  4 +-
 app/src/main/res/layout/dialog_swipes.xml     |  4 +-
 app/src/main/res/layout/dialog_sync.xml       |  4 +-
 app/src/main/res/layout/dialog_theme.xml      |  4 +-
 app/src/main/res/layout/dialog_translate.xml  |  4 +-
 app/src/main/res/layout/dialog_unblock.xml    |  4 +-
 app/src/main/res/layout/dialog_unexpected.xml |  4 +-
 app/src/main/res/layout/dialog_view_file.xml  |  4 +-
 .../main/res/layout/dialog_virus_total.xml    |  4 +-
 app/src/main/res/layout/dialog_whois.xml      |  4 +-
 app/src/main/res/layout/fragment_about.xml    |  4 +-
 app/src/main/res/layout/fragment_account.xml  |  4 +-
 app/src/main/res/layout/fragment_answer.xml   |  4 +-
 app/src/main/res/layout/fragment_compose.xml  |  4 +-
 app/src/main/res/layout/fragment_eula.xml     |  4 +-
 app/src/main/res/layout/fragment_folder.xml   |  4 +-
 app/src/main/res/layout/fragment_gmail.xml    |  4 +-
 app/src/main/res/layout/fragment_identity.xml |  4 +-
 .../res/layout/fragment_legend_compose.xml    |  4 +-
 .../res/layout/fragment_legend_folders.xml    |  4 +-
 .../res/layout/fragment_legend_keyboard.xml   |  4 +-
 .../res/layout/fragment_legend_messages.xml   |  4 +-
 .../fragment_legend_synchronization.xml       |  4 +-
 app/src/main/res/layout/fragment_oauth.xml    |  4 +-
 .../res/layout/fragment_options_backup.xml    |  4 +-
 .../res/layout/fragment_options_behavior.xml  |  4 +-
 .../layout/fragment_options_connection.xml    |  4 +-
 .../res/layout/fragment_options_display.xml   |  4 +-
 .../layout/fragment_options_encryption.xml    |  4 +-
 .../layout/fragment_options_integrations.xml  |  4 +-
 .../main/res/layout/fragment_options_misc.xml |  4 +-
 .../layout/fragment_options_notifications.xml |  4 +-
 .../res/layout/fragment_options_privacy.xml   |  4 +-
 .../main/res/layout/fragment_options_send.xml |  4 +-
 .../layout/fragment_options_synchronize.xml   |  4 +-
 app/src/main/res/layout/fragment_pop.xml      |  4 +-
 app/src/main/res/layout/fragment_pro.xml      |  4 +-
 .../main/res/layout/fragment_quick_setup.xml  |  4 +-
 app/src/main/res/layout/fragment_rule.xml     |  4 +-
 app/src/main/res/layout/fragment_setup.xml    |  4 +-
 106 files changed, 433 insertions(+), 202 deletions(-)
 rename app/src/main/java/eu/faircode/email/{ScrollViewEx.java => FixedScrollView.java} (81%)

diff --git a/app/src/main/java/eu/faircode/email/AppCompatViewInflaterEx.java b/app/src/main/java/eu/faircode/email/AppCompatViewInflaterEx.java
index 729ac07693..b865f6a158 100644
--- a/app/src/main/java/eu/faircode/email/AppCompatViewInflaterEx.java
+++ b/app/src/main/java/eu/faircode/email/AppCompatViewInflaterEx.java
@@ -90,6 +90,9 @@ public class AppCompatViewInflaterEx extends AppCompatViewInflater {
         if ("FrameLayout".equals(name))
             return new FixedFrameLayout(context, attrs);
 
+        if ("ScrollView".equals(name))
+            return new FixedScrollView(context, attrs);
+
         if ("View".equals(name))
             return new FixedView(context, attrs);
 
diff --git a/app/src/main/java/eu/faircode/email/FixedConstraintLayout.java b/app/src/main/java/eu/faircode/email/FixedConstraintLayout.java
index d8e36d932c..6ba80086da 100644
--- a/app/src/main/java/eu/faircode/email/FixedConstraintLayout.java
+++ b/app/src/main/java/eu/faircode/email/FixedConstraintLayout.java
@@ -27,6 +27,9 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.constraintlayout.widget.ConstraintLayout;
 
+import java.util.Map;
+import java.util.WeakHashMap;
+
 public class FixedConstraintLayout extends ConstraintLayout {
     public FixedConstraintLayout(@NonNull Context context) {
         super(context);
@@ -119,4 +122,39 @@ public class FixedConstraintLayout extends ConstraintLayout {
             return false;
         }
     }
+
+    private final Map<Runnable, Runnable> mapRunnable = new WeakHashMap<>();
+
+    @Override
+    public boolean post(Runnable action) {
+        Runnable wrapped = new RunnableEx("post") {
+            @Override
+            protected void delegate() {
+                action.run();
+            }
+        };
+        mapRunnable.put(action, wrapped);
+        return super.post(wrapped);
+    }
+
+    @Override
+    public boolean postDelayed(Runnable action, long delayMillis) {
+        Runnable wrapped = new RunnableEx("postDelayed") {
+            @Override
+            protected void delegate() {
+                action.run();
+            }
+        };
+        mapRunnable.put(action, wrapped);
+        return super.postDelayed(wrapped, delayMillis);
+    }
+
+    @Override
+    public boolean removeCallbacks(Runnable action) {
+        Runnable wrapped = mapRunnable.get(action);
+        if (wrapped == null)
+            return super.removeCallbacks(action);
+        else
+            return super.removeCallbacks(wrapped);
+    }
 }
diff --git a/app/src/main/java/eu/faircode/email/FixedCoordinatorLayout.java b/app/src/main/java/eu/faircode/email/FixedCoordinatorLayout.java
index c43b40ad38..d0a659530d 100644
--- a/app/src/main/java/eu/faircode/email/FixedCoordinatorLayout.java
+++ b/app/src/main/java/eu/faircode/email/FixedCoordinatorLayout.java
@@ -27,6 +27,9 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 
+import java.util.Map;
+import java.util.WeakHashMap;
+
 public class FixedCoordinatorLayout extends CoordinatorLayout {
     public FixedCoordinatorLayout(@NonNull Context context) {
         super(context);
@@ -59,4 +62,39 @@ public class FixedCoordinatorLayout extends CoordinatorLayout {
             return false;
         }
     }
+
+    private final Map<Runnable, Runnable> mapRunnable = new WeakHashMap<>();
+
+    @Override
+    public boolean post(Runnable action) {
+        Runnable wrapped = new RunnableEx("post") {
+            @Override
+            protected void delegate() {
+                action.run();
+            }
+        };
+        mapRunnable.put(action, wrapped);
+        return super.post(wrapped);
+    }
+
+    @Override
+    public boolean postDelayed(Runnable action, long delayMillis) {
+        Runnable wrapped = new RunnableEx("postDelayed") {
+            @Override
+            protected void delegate() {
+                action.run();
+            }
+        };
+        mapRunnable.put(action, wrapped);
+        return super.postDelayed(wrapped, delayMillis);
+    }
+
+    @Override
+    public boolean removeCallbacks(Runnable action) {
+        Runnable wrapped = mapRunnable.get(action);
+        if (wrapped == null)
+            return super.removeCallbacks(action);
+        else
+            return super.removeCallbacks(wrapped);
+    }
 }
diff --git a/app/src/main/java/eu/faircode/email/FixedFrameLayout.java b/app/src/main/java/eu/faircode/email/FixedFrameLayout.java
index 83dcda3910..b2d6ec0ebe 100644
--- a/app/src/main/java/eu/faircode/email/FixedFrameLayout.java
+++ b/app/src/main/java/eu/faircode/email/FixedFrameLayout.java
@@ -27,6 +27,9 @@ import android.widget.FrameLayout;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import java.util.Map;
+import java.util.WeakHashMap;
+
 public class FixedFrameLayout extends FrameLayout {
     public FixedFrameLayout(@NonNull Context context) {
         super(context);
@@ -72,4 +75,39 @@ public class FixedFrameLayout extends FrameLayout {
             return false;
         }
     }
+
+    private final Map<Runnable, Runnable> mapRunnable = new WeakHashMap<>();
+
+    @Override
+    public boolean post(Runnable action) {
+        Runnable wrapped = new RunnableEx("post") {
+            @Override
+            protected void delegate() {
+                action.run();
+            }
+        };
+        mapRunnable.put(action, wrapped);
+        return super.post(wrapped);
+    }
+
+    @Override
+    public boolean postDelayed(Runnable action, long delayMillis) {
+        Runnable wrapped = new RunnableEx("postDelayed") {
+            @Override
+            protected void delegate() {
+                action.run();
+            }
+        };
+        mapRunnable.put(action, wrapped);
+        return super.postDelayed(wrapped, delayMillis);
+    }
+
+    @Override
+    public boolean removeCallbacks(Runnable action) {
+        Runnable wrapped = mapRunnable.get(action);
+        if (wrapped == null)
+            return super.removeCallbacks(action);
+        else
+            return super.removeCallbacks(wrapped);
+    }
 }
diff --git a/app/src/main/java/eu/faircode/email/FixedLinearLayout.java b/app/src/main/java/eu/faircode/email/FixedLinearLayout.java
index 7f3405e3bf..a9905aa37b 100644
--- a/app/src/main/java/eu/faircode/email/FixedLinearLayout.java
+++ b/app/src/main/java/eu/faircode/email/FixedLinearLayout.java
@@ -26,6 +26,9 @@ import android.widget.LinearLayout;
 
 import androidx.annotation.Nullable;
 
+import java.util.Map;
+import java.util.WeakHashMap;
+
 public class FixedLinearLayout extends LinearLayout {
     public FixedLinearLayout(Context context) {
         super(context);
@@ -52,4 +55,39 @@ public class FixedLinearLayout extends LinearLayout {
             return false;
         }
     }
+
+    private final Map<Runnable, Runnable> mapRunnable = new WeakHashMap<>();
+
+    @Override
+    public boolean post(Runnable action) {
+        Runnable wrapped = new RunnableEx("post") {
+            @Override
+            protected void delegate() {
+                action.run();
+            }
+        };
+        mapRunnable.put(action, wrapped);
+        return super.post(wrapped);
+    }
+
+    @Override
+    public boolean postDelayed(Runnable action, long delayMillis) {
+        Runnable wrapped = new RunnableEx("postDelayed") {
+            @Override
+            protected void delegate() {
+                action.run();
+            }
+        };
+        mapRunnable.put(action, wrapped);
+        return super.postDelayed(wrapped, delayMillis);
+    }
+
+    @Override
+    public boolean removeCallbacks(Runnable action) {
+        Runnable wrapped = mapRunnable.get(action);
+        if (wrapped == null)
+            return super.removeCallbacks(action);
+        else
+            return super.removeCallbacks(wrapped);
+    }
 }
diff --git a/app/src/main/java/eu/faircode/email/FixedRecyclerView.java b/app/src/main/java/eu/faircode/email/FixedRecyclerView.java
index d9e0d8c6cc..fa3cfc5a0f 100644
--- a/app/src/main/java/eu/faircode/email/FixedRecyclerView.java
+++ b/app/src/main/java/eu/faircode/email/FixedRecyclerView.java
@@ -211,7 +211,7 @@ public class FixedRecyclerView extends RecyclerView {
         }
     }
 
-    private Map<Runnable, Runnable> mapRunnable = new WeakHashMap<>();
+    private final Map<Runnable, Runnable> mapRunnable = new WeakHashMap<>();
 
     @Override
     public boolean post(Runnable action) {
diff --git a/app/src/main/java/eu/faircode/email/FixedRelativeLayout.java b/app/src/main/java/eu/faircode/email/FixedRelativeLayout.java
index 0ca756054b..066d8c6828 100644
--- a/app/src/main/java/eu/faircode/email/FixedRelativeLayout.java
+++ b/app/src/main/java/eu/faircode/email/FixedRelativeLayout.java
@@ -24,6 +24,9 @@ import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.widget.RelativeLayout;
 
+import java.util.Map;
+import java.util.WeakHashMap;
+
 public class FixedRelativeLayout extends RelativeLayout {
     public FixedRelativeLayout(Context context) {
         super(context);
@@ -50,4 +53,39 @@ public class FixedRelativeLayout extends RelativeLayout {
             return false;
         }
     }
+
+    private final Map<Runnable, Runnable> mapRunnable = new WeakHashMap<>();
+
+    @Override
+    public boolean post(Runnable action) {
+        Runnable wrapped = new RunnableEx("post") {
+            @Override
+            protected void delegate() {
+                action.run();
+            }
+        };
+        mapRunnable.put(action, wrapped);
+        return super.post(wrapped);
+    }
+
+    @Override
+    public boolean postDelayed(Runnable action, long delayMillis) {
+        Runnable wrapped = new RunnableEx("postDelayed") {
+            @Override
+            protected void delegate() {
+                action.run();
+            }
+        };
+        mapRunnable.put(action, wrapped);
+        return super.postDelayed(wrapped, delayMillis);
+    }
+
+    @Override
+    public boolean removeCallbacks(Runnable action) {
+        Runnable wrapped = mapRunnable.get(action);
+        if (wrapped == null)
+            return super.removeCallbacks(action);
+        else
+            return super.removeCallbacks(wrapped);
+    }
 }
diff --git a/app/src/main/java/eu/faircode/email/ScrollViewEx.java b/app/src/main/java/eu/faircode/email/FixedScrollView.java
similarity index 81%
rename from app/src/main/java/eu/faircode/email/ScrollViewEx.java
rename to app/src/main/java/eu/faircode/email/FixedScrollView.java
index e4d4aed589..4e55d67c2d 100644
--- a/app/src/main/java/eu/faircode/email/ScrollViewEx.java
+++ b/app/src/main/java/eu/faircode/email/FixedScrollView.java
@@ -5,6 +5,9 @@ import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.widget.ScrollView;
 
+import java.util.Map;
+import java.util.WeakHashMap;
+
 /*
     This file is part of FairEmail.
 
@@ -24,20 +27,20 @@ import android.widget.ScrollView;
     Copyright 2018-2024 by Marcel Bokhorst (M66B)
 */
 
-public class ScrollViewEx extends ScrollView {
-    public ScrollViewEx(Context context) {
+public class FixedScrollView extends ScrollView {
+    public FixedScrollView(Context context) {
         super(context);
     }
 
-    public ScrollViewEx(Context context, AttributeSet attrs) {
+    public FixedScrollView(Context context, AttributeSet attrs) {
         super(context, attrs);
     }
 
-    public ScrollViewEx(Context context, AttributeSet attrs, int defStyleAttr) {
+    public FixedScrollView(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
     }
 
-    public ScrollViewEx(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+    public FixedScrollView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
         super(context, attrs, defStyleAttr, defStyleRes);
     }
 
@@ -129,4 +132,39 @@ public class ScrollViewEx extends ScrollView {
             return false;
         }
     }
+
+    private final Map<Runnable, Runnable> mapRunnable = new WeakHashMap<>();
+
+    @Override
+    public boolean post(Runnable action) {
+        Runnable wrapped = new RunnableEx("post") {
+            @Override
+            protected void delegate() {
+                action.run();
+            }
+        };
+        mapRunnable.put(action, wrapped);
+        return super.post(wrapped);
+    }
+
+    @Override
+    public boolean postDelayed(Runnable action, long delayMillis) {
+        Runnable wrapped = new RunnableEx("postDelayed") {
+            @Override
+            protected void delegate() {
+                action.run();
+            }
+        };
+        mapRunnable.put(action, wrapped);
+        return super.postDelayed(wrapped, delayMillis);
+    }
+
+    @Override
+    public boolean removeCallbacks(Runnable action) {
+        Runnable wrapped = mapRunnable.get(action);
+        if (wrapped == null)
+            return super.removeCallbacks(action);
+        else
+            return super.removeCallbacks(wrapped);
+    }
 }
diff --git a/app/src/main/res/layout-v31/dialog_theme.xml b/app/src/main/res/layout-v31/dialog_theme.xml
index 0cb7bb9740..0862699c59 100644
--- a/app/src/main/res/layout-v31/dialog_theme.xml
+++ b/app/src/main/res/layout-v31/dialog_theme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -425,4 +425,4 @@
                 tvPrimary,tvSecondary,tvTertiary,
                 tvNormal,tvItalic,tvBold" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
+</ScrollView>
diff --git a/app/src/main/res/layout-v34/dialog_theme.xml b/app/src/main/res/layout-v34/dialog_theme.xml
index 7bfe98ab36..5ca0d647ce 100644
--- a/app/src/main/res/layout-v34/dialog_theme.xml
+++ b/app/src/main/res/layout-v34/dialog_theme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -495,4 +495,4 @@
                 tvPrimary,tvSecondary,tvTertiary,
                 tvNormal,tvItalic,tvBold" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
+</ScrollView>
diff --git a/app/src/main/res/layout/activity_clear.xml b/app/src/main/res/layout/activity_clear.xml
index 775a7ae579..17b2e9dfa3 100644
--- a/app/src/main/res/layout/activity_clear.xml
+++ b/app/src/main/res/layout/activity_clear.xml
@@ -5,7 +5,7 @@
     android:layout_height="match_parent"
     tools:context="eu.faircode.email.ActivityClear">
 
-    <eu.faircode.email.ScrollViewEx
+    <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
@@ -101,5 +101,5 @@
                 </androidx.constraintlayout.widget.ConstraintLayout>
             </androidx.cardview.widget.CardView>
         </androidx.constraintlayout.widget.ConstraintLayout>
-    </eu.faircode.email.ScrollViewEx>
+    </ScrollView>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_dmarc.xml b/app/src/main/res/layout/activity_dmarc.xml
index 3bc077c7e9..5311341cbe 100644
--- a/app/src/main/res/layout/activity_dmarc.xml
+++ b/app/src/main/res/layout/activity_dmarc.xml
@@ -5,7 +5,7 @@
     android:layout_height="match_parent"
     tools:context="eu.faircode.email.ActivityDSN">
 
-    <eu.faircode.email.ScrollViewEx
+    <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
@@ -57,7 +57,7 @@
                 android:layout_height="0dp"
                 app:constraint_referenced_ids="cardDmarc" />
         </androidx.constraintlayout.widget.ConstraintLayout>
-    </eu.faircode.email.ScrollViewEx>
+    </ScrollView>
 
     <eu.faircode.email.ContentLoadingProgressBar
         android:id="@+id/pbWait"
diff --git a/app/src/main/res/layout/activity_dsn.xml b/app/src/main/res/layout/activity_dsn.xml
index 61507fd79c..40850e5771 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">
 
-    <eu.faircode.email.ScrollViewEx
+    <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
@@ -60,7 +60,7 @@
                 android:layout_height="0dp"
                 app:constraint_referenced_ids="cardMessage" />
         </androidx.constraintlayout.widget.ConstraintLayout>
-    </eu.faircode.email.ScrollViewEx>
+    </ScrollView>
 
     <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 971cec442c..a3c8e9e738 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">
 
-    <eu.faircode.email.ScrollViewEx
+    <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
@@ -347,7 +347,7 @@
                 android:layout_height="0dp"
                 app:constraint_referenced_ids="cardMessage,cardStructure" />
         </androidx.constraintlayout.widget.ConstraintLayout>
-    </eu.faircode.email.ScrollViewEx>
+    </ScrollView>
 
     <eu.faircode.email.ContentLoadingProgressBar
         android:id="@+id/pbWait"
diff --git a/app/src/main/res/layout/activity_error.xml b/app/src/main/res/layout/activity_error.xml
index 915511224c..bf974a9751 100644
--- a/app/src/main/res/layout/activity_error.xml
+++ b/app/src/main/res/layout/activity_error.xml
@@ -5,7 +5,7 @@
     android:layout_height="match_parent"
     tools:context="eu.faircode.email.ActivityError">
 
-    <eu.faircode.email.ScrollViewEx
+    <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
@@ -114,5 +114,5 @@
                 </androidx.constraintlayout.widget.ConstraintLayout>
             </androidx.cardview.widget.CardView>
         </androidx.constraintlayout.widget.ConstraintLayout>
-    </eu.faircode.email.ScrollViewEx>
+    </ScrollView>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_space.xml b/app/src/main/res/layout/activity_space.xml
index 1319cabf1d..84b387077f 100644
--- a/app/src/main/res/layout/activity_space.xml
+++ b/app/src/main/res/layout/activity_space.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <eu.faircode.email.ScrollViewEx
+    <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
@@ -74,5 +74,5 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/btnFix" />
         </androidx.constraintlayout.widget.ConstraintLayout>
-    </eu.faircode.email.ScrollViewEx>
+    </ScrollView>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_widget.xml b/app/src/main/res/layout/activity_widget.xml
index 5f804b9b7e..db3601ede9 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"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -209,4 +209,4 @@
                 tvFontSize,spFontSize,
                 btnSave" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_widget_sync.xml b/app/src/main/res/layout/activity_widget_sync.xml
index df3689489e..e95baab303 100644
--- a/app/src/main/res/layout/activity_widget_sync.xml
+++ b/app/src/main/res/layout/activity_widget_sync.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -61,4 +61,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/btnColor" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_widget_unified.xml b/app/src/main/res/layout/activity_widget_unified.xml
index 0af1a7bfbe..c332c6b4fe 100644
--- a/app/src/main/res/layout/activity_widget_unified.xml
+++ b/app/src/main/res/layout/activity_widget_unified.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -286,4 +286,4 @@
         cbSemiTransparent,btnColor,
         tvFontSize,spFontSize,tvPadding,spPadding,btnSave" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_add_image.xml b/app/src/main/res/layout/dialog_add_image.xml
index 87027c1fa6..6ee1703906 100644
--- a/app/src/main/res/layout/dialog_add_image.xml
+++ b/app/src/main/res/layout/dialog_add_image.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -180,4 +180,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvNotAgain" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
+</ScrollView>
diff --git a/app/src/main/res/layout/dialog_advanced.xml b/app/src/main/res/layout/dialog_advanced.xml
index aace7afdf6..ba35437569 100644
--- a/app/src/main/res/layout/dialog_advanced.xml
+++ b/app/src/main/res/layout/dialog_advanced.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -60,4 +60,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvRemark" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_alias.xml b/app/src/main/res/layout/dialog_alias.xml
index e6edda93cd..1aaeaaa891 100644
--- a/app/src/main/res/layout/dialog_alias.xml
+++ b/app/src/main/res/layout/dialog_alias.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -91,4 +91,4 @@
             app:layout_constraintTop_toBottomOf="@id/tvRemark"
             app:srcCompat="@drawable/twotone_info_24" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_answer_button.xml b/app/src/main/res/layout/dialog_answer_button.xml
index 5700535a65..b30a6fa3d8 100644
--- a/app/src/main/res/layout/dialog_answer_button.xml
+++ b/app/src/main/res/layout/dialog_answer_button.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -91,4 +91,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/tvAnswerActionWarning" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
+</ScrollView>
diff --git a/app/src/main/res/layout/dialog_ask_again.xml b/app/src/main/res/layout/dialog_ask_again.xml
index 0728afd610..f1c6d90d10 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"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -78,4 +78,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbNotAgain" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_ask_amp.xml b/app/src/main/res/layout/dialog_ask_amp.xml
index 30972be17d..689b3121e2 100644
--- a/app/src/main/res/layout/dialog_ask_amp.xml
+++ b/app/src/main/res/layout/dialog_ask_amp.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -50,4 +50,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvRemark" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_ask_full.xml b/app/src/main/res/layout/dialog_ask_full.xml
index 57fa37c093..ec83244db4 100644
--- a/app/src/main/res/layout/dialog_ask_full.xml
+++ b/app/src/main/res/layout/dialog_ask_full.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -44,4 +44,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvRemark" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_ask_move.xml b/app/src/main/res/layout/dialog_ask_move.xml
index 3165e2d510..0a4020fee9 100644
--- a/app/src/main/res/layout/dialog_ask_move.xml
+++ b/app/src/main/res/layout/dialog_ask_move.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/cbNotAgain" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_ask_spam.xml b/app/src/main/res/layout/dialog_ask_spam.xml
index 3bbda695af..6b60e4e001 100644
--- a/app/src/main/res/layout/dialog_ask_spam.xml
+++ b/app/src/main/res/layout/dialog_ask_spam.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -35,4 +35,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvMessage" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_block_sender.xml b/app/src/main/res/layout/dialog_block_sender.xml
index 68a1771fec..2f966659a1 100644
--- a/app/src/main/res/layout/dialog_block_sender.xml
+++ b/app/src/main/res/layout/dialog_block_sender.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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/tvJunkHint" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
+</ScrollView>
diff --git a/app/src/main/res/layout/dialog_boundary_error.xml b/app/src/main/res/layout/dialog_boundary_error.xml
index 7d92805ed9..325fa63ea8 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"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -34,4 +34,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvMessage" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_buttons.xml b/app/src/main/res/layout/dialog_buttons.xml
index 7356834f5e..32feb18a1a 100644
--- a/app/src/main/res/layout/dialog_buttons.xml
+++ b/app/src/main/res/layout/dialog_buttons.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -356,4 +356,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbUnsubscribe" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
+</ScrollView>
diff --git a/app/src/main/res/layout/dialog_certificate.xml b/app/src/main/res/layout/dialog_certificate.xml
index f2a3547e29..57334f4dca 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"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -184,4 +184,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvAlgorithmTitle" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_contact_delete.xml b/app/src/main/res/layout/dialog_contact_delete.xml
index 432d4bd3a7..bdce1bdebe 100644
--- a/app/src/main/res/layout/dialog_contact_delete.xml
+++ b/app/src/main/res/layout/dialog_contact_delete.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -35,4 +35,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvMessage" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_contact_group.xml b/app/src/main/res/layout/dialog_contact_group.xml
index 404bcceeb3..f215ae18ec 100644
--- a/app/src/main/res/layout/dialog_contact_group.xml
+++ b/app/src/main/res/layout/dialog_contact_group.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -80,4 +80,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/spType" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
+</ScrollView>
diff --git a/app/src/main/res/layout/dialog_dark.xml b/app/src/main/res/layout/dialog_dark.xml
index 0a733d61c4..93b10edcb3 100644
--- a/app/src/main/res/layout/dialog_dark.xml
+++ b/app/src/main/res/layout/dialog_dark.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -29,4 +29,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/tvMessage" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_debug.xml b/app/src/main/res/layout/dialog_debug.xml
index 981fe1d87f..508cd7e081 100644
--- a/app/src/main/res/layout/dialog_debug.xml
+++ b/app/src/main/res/layout/dialog_debug.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -127,4 +127,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvSendRemark" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
+</ScrollView>
diff --git a/app/src/main/res/layout/dialog_decrypt.xml b/app/src/main/res/layout/dialog_decrypt.xml
index 82a0751e50..ddef736a74 100644
--- a/app/src/main/res/layout/dialog_decrypt.xml
+++ b/app/src/main/res/layout/dialog_decrypt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -89,4 +89,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvError" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_deepl.xml b/app/src/main/res/layout/dialog_deepl.xml
index f256c1487a..c6b6169eca 100644
--- a/app/src/main/res/layout/dialog_deepl.xml
+++ b/app/src/main/res/layout/dialog_deepl.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -153,4 +153,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvUsage" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
+</ScrollView>
diff --git a/app/src/main/res/layout/dialog_delete_operations.xml b/app/src/main/res/layout/dialog_delete_operations.xml
index 484db7ded4..d67ba01a89 100644
--- a/app/src/main/res/layout/dialog_delete_operations.xml
+++ b/app/src/main/res/layout/dialog_delete_operations.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -125,4 +125,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbDelete" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
+</ScrollView>
\ 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 142c15f54d..151c67cddc 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"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -74,4 +74,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/timePicker" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
+</ScrollView>
\ 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 5e1d1f6984..f7565bd6b6 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"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -55,4 +55,4 @@
             app:layout_constraintTop_toTopOf="@id/btnInfo"
             app:srcCompat="@drawable/twotone_open_in_new_24" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_export.xml b/app/src/main/res/layout/dialog_export.xml
index 1148f5fcc9..0b5ab407e0 100644
--- a/app/src/main/res/layout/dialog_export.xml
+++ b/app/src/main/res/layout/dialog_export.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -64,4 +64,4 @@
                 android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
         </com.google.android.material.textfield.TextInputLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
+</ScrollView>
\ 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 f601927b7a..7c2267272c 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"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -118,4 +118,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvDesign" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
+</ScrollView>
\ 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 0a2ef71a57..94f1b9aabd 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"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -159,4 +159,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbPollSystem" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_forward_raw.xml b/app/src/main/res/layout/dialog_forward_raw.xml
index c34d2e3ac1..a223b9b48f 100644
--- a/app/src/main/res/layout/dialog_forward_raw.xml
+++ b/app/src/main/res/layout/dialog_forward_raw.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -92,4 +92,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvNoInternet" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
+</ScrollView>
diff --git a/app/src/main/res/layout/dialog_identity.xml b/app/src/main/res/layout/dialog_identity.xml
index a2210a5d77..df48747614 100644
--- a/app/src/main/res/layout/dialog_identity.xml
+++ b/app/src/main/res/layout/dialog_identity.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -99,4 +99,4 @@
             android:layout_height="0dp"
             app:constraint_referenced_ids="tvNoIdentities,btnFix" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_import.xml b/app/src/main/res/layout/dialog_import.xml
index ca6eb0f486..ad7a9df985 100644
--- a/app/src/main/res/layout/dialog_import.xml
+++ b/app/src/main/res/layout/dialog_import.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -128,4 +128,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbSearches" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_import_progress.xml b/app/src/main/res/layout/dialog_import_progress.xml
index 3fc1adab17..d22f44ff18 100644
--- a/app/src/main/res/layout/dialog_import_progress.xml
+++ b/app/src/main/res/layout/dialog_import_progress.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -44,4 +44,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvCaption" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
+</ScrollView>
diff --git a/app/src/main/res/layout/dialog_insert_link.xml b/app/src/main/res/layout/dialog_insert_link.xml
index 4a6b9585a6..7f60caac95 100644
--- a/app/src/main/res/layout/dialog_insert_link.xml
+++ b/app/src/main/res/layout/dialog_insert_link.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -192,4 +192,4 @@
             android:layout_height="0dp"
             app:constraint_referenced_ids="btnUpload,tvDLimit,sbDLimit,tvTLimit,sbTLimit" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
+</ScrollView>
\ 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 de7b2265a7..83aba27d7a 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"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -268,4 +268,4 @@
             app:constraint_referenced_ids="
             btnClear,ibRules,ibManage,tvClearHint" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
+</ScrollView>
diff --git a/app/src/main/res/layout/dialog_markdown.xml b/app/src/main/res/layout/dialog_markdown.xml
index 94f2e1c822..70f4548acc 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">
 
-    <eu.faircode.email.ScrollViewEx
+    <ScrollView
         android:id="@+id/scroll"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -32,7 +32,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
         </androidx.constraintlayout.widget.ConstraintLayout>
-    </eu.faircode.email.ScrollViewEx>
+    </ScrollView>
 
     <ImageButton
         android:id="@+id/ibCancel"
diff --git a/app/src/main/res/layout/dialog_nav_options.xml b/app/src/main/res/layout/dialog_nav_options.xml
index 44649f8333..c299a0c3f4 100644
--- a/app/src/main/res/layout/dialog_nav_options.xml
+++ b/app/src/main/res/layout/dialog_nav_options.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -104,4 +104,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/ivExpanderNav" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_no_stream.xml b/app/src/main/res/layout/dialog_no_stream.xml
index a1de2c0483..4ee11c1914 100644
--- a/app/src/main/res/layout/dialog_no_stream.xml
+++ b/app/src/main/res/layout/dialog_no_stream.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -58,4 +58,4 @@
             app:layout_constraintTop_toBottomOf="@id/tvExplanation"
             app:srcCompat="@drawable/twotone_info_24" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_no_viewer.xml b/app/src/main/res/layout/dialog_no_viewer.xml
index aa8957ac21..f503310108 100644
--- a/app/src/main/res/layout/dialog_no_viewer.xml
+++ b/app/src/main/res/layout/dialog_no_viewer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -91,4 +91,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/tvType" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_notes.xml b/app/src/main/res/layout/dialog_notes.xml
index 764ce9bafa..549b802628 100644
--- a/app/src/main/res/layout/dialog_notes.xml
+++ b/app/src/main/res/layout/dialog_notes.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -59,4 +59,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvColor" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_open_link.xml b/app/src/main/res/layout/dialog_open_link.xml
index 2015f4ed1c..a4617d550a 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"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/scroll"
     android:layout_width="match_parent"
@@ -394,4 +394,4 @@
             android:layout_height="0dp"
             app:constraint_referenced_ids="tvOwnerTitle,tvHost,tvOwner" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_password_protect.xml b/app/src/main/res/layout/dialog_password_protect.xml
index 7cc85c6173..15233b1f16 100644
--- a/app/src/main/res/layout/dialog_password_protect.xml
+++ b/app/src/main/res/layout/dialog_password_protect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -76,4 +76,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tilPassword2" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_permissions.xml b/app/src/main/res/layout/dialog_permissions.xml
index 5e6b8e71ec..ca4eb36315 100644
--- a/app/src/main/res/layout/dialog_permissions.xml
+++ b/app/src/main/res/layout/dialog_permissions.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -156,4 +156,4 @@
             android:layout_height="0dp"
             app:constraint_referenced_ids="three,title3,tvDoze" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_print.xml b/app/src/main/res/layout/dialog_print.xml
index c04b0e66d9..6b307cc09d 100644
--- a/app/src/main/res/layout/dialog_print.xml
+++ b/app/src/main/res/layout/dialog_print.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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/cbMargin" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_quick_actions.xml b/app/src/main/res/layout/dialog_quick_actions.xml
index 5480bace31..97c5923567 100644
--- a/app/src/main/res/layout/dialog_quick_actions.xml
+++ b/app/src/main/res/layout/dialog_quick_actions.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -249,4 +249,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/vSeparator" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
+</ScrollView>
diff --git a/app/src/main/res/layout/dialog_reset_questions.xml b/app/src/main/res/layout/dialog_reset_questions.xml
index 7722b62e7d..1919aa8297 100644
--- a/app/src/main/res/layout/dialog_reset_questions.xml
+++ b/app/src/main/res/layout/dialog_reset_questions.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -72,4 +72,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbImages" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
+</ScrollView>
\ 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 cbf6e8426e..8dff201ac1 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"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -62,4 +62,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvHelp" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
+</ScrollView>
\ 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 c75ff98787..fee3061d2c 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"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -226,4 +226,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvAccount" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
+</ScrollView>
\ 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 6094a1cfb2..4eba9a19f5 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"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -598,4 +598,4 @@
             tvAnd,cbUnseen,cbFlagged,cbHidden,cbEncrypted,cbAttachments,
             tvDate,btnAfter,btnBefore,tvBefore,tvAfter,cbSearchDevice" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
+</ScrollView>
diff --git a/app/src/main/res/layout/dialog_send.xml b/app/src/main/res/layout/dialog_send.xml
index 748047a029..54c1f7036d 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"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -578,4 +578,4 @@
             app:constraint_referenced_ids="
                 tvSentMissing,btnFixSent" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
+</ScrollView>
\ 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 f432b3267c..6ad2799eaf 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"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -73,4 +73,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbNotAgainDomain" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
+</ScrollView>
\ 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 bbbda53778..5b42844f3b 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"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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 @@
             android:layout_height="0dp"
             app:constraint_referenced_ids="ivTracking,tvTracking" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
+</ScrollView>
\ 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 ff78aad2a7..ddd9bfa8c8 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"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -69,4 +69,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvRight" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_sync.xml b/app/src/main/res/layout/dialog_sync.xml
index 577919feda..92f8756361 100644
--- a/app/src/main/res/layout/dialog_sync.xml
+++ b/app/src/main/res/layout/dialog_sync.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -97,4 +97,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvRemark2" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
+</ScrollView>
\ 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 405f39900f..cd57ecf32e 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"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -231,4 +231,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/btnMore" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_translate.xml b/app/src/main/res/layout/dialog_translate.xml
index 014d4ad706..3c4ef78716 100644
--- a/app/src/main/res/layout/dialog_translate.xml
+++ b/app/src/main/res/layout/dialog_translate.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -76,4 +76,4 @@
             app:layout_constraintTop_toTopOf="@id/tvText"
             app:show_delay="0" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_unblock.xml b/app/src/main/res/layout/dialog_unblock.xml
index d226e8b11a..be23a0048f 100644
--- a/app/src/main/res/layout/dialog_unblock.xml
+++ b/app/src/main/res/layout/dialog_unblock.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -35,4 +35,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvCaption" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_unexpected.xml b/app/src/main/res/layout/dialog_unexpected.xml
index 1529dd8481..79a1453f07 100644
--- a/app/src/main/res/layout/dialog_unexpected.xml
+++ b/app/src/main/res/layout/dialog_unexpected.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -48,4 +48,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/tvError" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_view_file.xml b/app/src/main/res/layout/dialog_view_file.xml
index 058d2e133d..d2b62f8628 100644
--- a/app/src/main/res/layout/dialog_view_file.xml
+++ b/app/src/main/res/layout/dialog_view_file.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -52,4 +52,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbNotAgainType" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_virus_total.xml b/app/src/main/res/layout/dialog_virus_total.xml
index dc2f2d2174..5484d6be86 100644
--- a/app/src/main/res/layout/dialog_virus_total.xml
+++ b/app/src/main/res/layout/dialog_virus_total.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -161,4 +161,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_whois.xml b/app/src/main/res/layout/dialog_whois.xml
index 9eb6a74aa6..ee0132e6d4 100644
--- a/app/src/main/res/layout/dialog_whois.xml
+++ b/app/src/main/res/layout/dialog_whois.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/scroll"
     android:layout_width="match_parent"
@@ -62,4 +62,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvHost" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
+</ScrollView>
\ 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 ec7713d966..d5e00c1f5f 100644
--- a/app/src/main/res/layout/fragment_about.xml
+++ b/app/src/main/res/layout/fragment_about.xml
@@ -72,7 +72,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvUpdated" />
 
-    <eu.faircode.email.ScrollViewEx
+    <ScrollView
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:orientation="vertical"
@@ -114,5 +114,5 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/tvContributors" />
         </androidx.constraintlayout.widget.ConstraintLayout>
-    </eu.faircode.email.ScrollViewEx>
+    </ScrollView>
 </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 5a2f453f3f..8e181eaf5c 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"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -1300,4 +1300,4 @@
             android:layout_height="0dp"
             app:constraint_referenced_ids="tvErrorTitle,tvError" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
+</ScrollView>
diff --git a/app/src/main/res/layout/fragment_answer.xml b/app/src/main/res/layout/fragment_answer.xml
index f66da9cd4c..74d36514f1 100644
--- a/app/src/main/res/layout/fragment_answer.xml
+++ b/app/src/main/res/layout/fragment_answer.xml
@@ -11,7 +11,7 @@
         android:layout_height="match_parent"
         app:layout_behavior="eu.faircode.email.BehaviorBottomPadding">
 
-        <eu.faircode.email.ScrollViewEx
+        <ScrollView
             android:layout_width="match_parent"
             android:layout_height="0dp"
             app:layout_constraintBottom_toTopOf="@+id/bottom_navigation"
@@ -172,7 +172,7 @@
                     android:layout_height="0dp"
                     app:constraint_referenced_ids="etName,etGroup,cbStandard,cbReceipt,cbFavorite,cbHide,btnColor,vSeparator,etText" />
             </androidx.constraintlayout.widget.ConstraintLayout>
-        </eu.faircode.email.ScrollViewEx>
+        </ScrollView>
 
         <include
             android:id="@+id/style_bar"
diff --git a/app/src/main/res/layout/fragment_compose.xml b/app/src/main/res/layout/fragment_compose.xml
index de98ce70ec..09cc086094 100644
--- a/app/src/main/res/layout/fragment_compose.xml
+++ b/app/src/main/res/layout/fragment_compose.xml
@@ -18,7 +18,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.ScrollViewEx
+        <ScrollView
             android:id="@+id/scroll"
             android:layout_width="match_parent"
             android:layout_height="0dp"
@@ -556,7 +556,7 @@
                     android:layout_height="0dp"
                     app:constraint_referenced_ids="ibCloseRefHint,tvReferenceHint" />
             </androidx.constraintlayout.widget.ConstraintLayout>
-        </eu.faircode.email.ScrollViewEx>
+        </ScrollView>
 
         <View
             android:id="@+id/vwAnchor"
diff --git a/app/src/main/res/layout/fragment_eula.xml b/app/src/main/res/layout/fragment_eula.xml
index eba0c8d796..1eab8de847 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"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -45,4 +45,4 @@
             app:layout_constraintStart_toEndOf="@id/btnCancel"
             app:layout_constraintTop_toBottomOf="@id/inEula" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
+</ScrollView>
diff --git a/app/src/main/res/layout/fragment_folder.xml b/app/src/main/res/layout/fragment_folder.xml
index a49a9b5f7f..6d369e00e8 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"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -467,4 +467,4 @@
             android:layout_height="0dp"
             app:constraint_referenced_ids="cbAutoDelete,tvAutoDeleteHint" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
+</ScrollView>
diff --git a/app/src/main/res/layout/fragment_gmail.xml b/app/src/main/res/layout/fragment_gmail.xml
index 186613d748..a6db34fbd7 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"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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,btnSupport" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
+</ScrollView>
diff --git a/app/src/main/res/layout/fragment_identity.xml b/app/src/main/res/layout/fragment_identity.xml
index a5af7ff2ff..472934655c 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"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -1173,4 +1173,4 @@
             android:layout_height="0dp"
             app:constraint_referenced_ids="tvErrorTitle,tvError" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
+</ScrollView>
diff --git a/app/src/main/res/layout/fragment_legend_compose.xml b/app/src/main/res/layout/fragment_legend_compose.xml
index 93bb95af2a..430c803bf8 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"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -265,4 +265,4 @@
             app:layout_constraintStart_toEndOf="@id/ivStyle"
             app:layout_constraintTop_toBottomOf="@id/tvUnderline" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
+</ScrollView>
\ 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 5cb1286907..8b8d30984e 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"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -379,4 +379,4 @@
             app:layout_constraintStart_toEndOf="@id/ivStop"
             app:layout_constraintTop_toBottomOf="@id/tvSyncKeepLegend" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
+</ScrollView>
diff --git a/app/src/main/res/layout/fragment_legend_keyboard.xml b/app/src/main/res/layout/fragment_legend_keyboard.xml
index 5726f26dc0..e25fae8172 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"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -244,4 +244,4 @@
             app:layout_constraintStart_toEndOf="@id/tvT"
             app:layout_constraintTop_toBottomOf="@id/tvSelect" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
+</ScrollView>
\ 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 c92cef2993..49c6818d57 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"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -990,4 +990,4 @@
             app:layout_constraintStart_toEndOf="@id/ivDeletePermanent"
             app:layout_constraintTop_toBottomOf="@id/tvExternal" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
+</ScrollView>
diff --git a/app/src/main/res/layout/fragment_legend_synchronization.xml b/app/src/main/res/layout/fragment_legend_synchronization.xml
index 6726f7a8b2..45ec3b1c37 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"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -415,4 +415,4 @@
             app:layout_constraintStart_toEndOf="@id/ivClosing"
             app:layout_constraintTop_toBottomOf="@id/tvDownloading" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
+</ScrollView>
diff --git a/app/src/main/res/layout/fragment_oauth.xml b/app/src/main/res/layout/fragment_oauth.xml
index 8558739839..64a574446e 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"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -298,4 +298,4 @@
             android:layout_height="0dp"
             app:constraint_referenced_ids="tvErrorTitle,tvError,btnSupport" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
+</ScrollView>
diff --git a/app/src/main/res/layout/fragment_options_backup.xml b/app/src/main/res/layout/fragment_options_backup.xml
index 3994131295..eb7425df8a 100644
--- a/app/src/main/res/layout/fragment_options_backup.xml
+++ b/app/src/main/res/layout/fragment_options_backup.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -481,4 +481,4 @@
             </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.cardview.widget.CardView>
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
+</ScrollView>
diff --git a/app/src/main/res/layout/fragment_options_behavior.xml b/app/src/main/res/layout/fragment_options_behavior.xml
index 791dc58d7a..5bcb48809f 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"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -927,4 +927,4 @@
             </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.cardview.widget.CardView>
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
+</ScrollView>
diff --git a/app/src/main/res/layout/fragment_options_connection.xml b/app/src/main/res/layout/fragment_options_connection.xml
index 4357653c41..0077ab6aeb 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"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -906,4 +906,4 @@
             </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.cardview.widget.CardView>
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
+</ScrollView>
diff --git a/app/src/main/res/layout/fragment_options_display.xml b/app/src/main/res/layout/fragment_options_display.xml
index bb55708748..ecea01383d 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"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -2306,4 +2306,4 @@
             </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.cardview.widget.CardView>
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
+</ScrollView>
diff --git a/app/src/main/res/layout/fragment_options_encryption.xml b/app/src/main/res/layout/fragment_options_encryption.xml
index c41280dfee..d36205ac76 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"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -545,4 +545,4 @@
             </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.cardview.widget.CardView>
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
+</ScrollView>
diff --git a/app/src/main/res/layout/fragment_options_integrations.xml b/app/src/main/res/layout/fragment_options_integrations.xml
index 9b96b55d03..b933143e40 100644
--- a/app/src/main/res/layout/fragment_options_integrations.xml
+++ b/app/src/main/res/layout/fragment_options_integrations.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -616,4 +616,4 @@
             </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.cardview.widget.CardView>
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
+</ScrollView>
diff --git a/app/src/main/res/layout/fragment_options_misc.xml b/app/src/main/res/layout/fragment_options_misc.xml
index bb4bbc0d8f..b53eb8596f 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"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -2224,4 +2224,4 @@
             </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.cardview.widget.CardView>
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
+</ScrollView>
diff --git a/app/src/main/res/layout/fragment_options_notifications.xml b/app/src/main/res/layout/fragment_options_notifications.xml
index 67b6e749de..fdf29333e0 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"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -988,4 +988,4 @@
             </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.cardview.widget.CardView>
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
+</ScrollView>
diff --git a/app/src/main/res/layout/fragment_options_privacy.xml b/app/src/main/res/layout/fragment_options_privacy.xml
index e27640d6a0..42d6587623 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"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -843,4 +843,4 @@
             </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.cardview.widget.CardView>
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
+</ScrollView>
diff --git a/app/src/main/res/layout/fragment_options_send.xml b/app/src/main/res/layout/fragment_options_send.xml
index 6b800e0e02..6b4d91e484 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"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -1054,4 +1054,4 @@
             </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.cardview.widget.CardView>
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
+</ScrollView>
diff --git a/app/src/main/res/layout/fragment_options_synchronize.xml b/app/src/main/res/layout/fragment_options_synchronize.xml
index 0f0c5780c7..39437da2cc 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"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -1171,4 +1171,4 @@
             </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.cardview.widget.CardView>
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
+</ScrollView>
diff --git a/app/src/main/res/layout/fragment_pop.xml b/app/src/main/res/layout/fragment_pop.xml
index 86c447de7f..8affc01e1a 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"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -786,4 +786,4 @@
             android:layout_height="0dp"
             app:constraint_referenced_ids="tvErrorTitle,tvError" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
+</ScrollView>
diff --git a/app/src/main/res/layout/fragment_pro.xml b/app/src/main/res/layout/fragment_pro.xml
index ae44a01552..f391796f6f 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"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -230,4 +230,4 @@
             app:layout_constraintTop_toBottomOf="@id/tvRestoreHint"
             app:srcCompat="@drawable/twotone_cloud_off_24" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
+</ScrollView>
diff --git a/app/src/main/res/layout/fragment_quick_setup.xml b/app/src/main/res/layout/fragment_quick_setup.xml
index 87c5d6636c..d36c88ac29 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"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -474,4 +474,4 @@
             android:layout_height="0dp"
             app:constraint_referenced_ids="tvManualHint,btnManual" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
+</ScrollView>
diff --git a/app/src/main/res/layout/fragment_rule.xml b/app/src/main/res/layout/fragment_rule.xml
index 2c93f2d64b..9e3d0ab689 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">
 
-        <eu.faircode.email.ScrollViewEx
+        <ScrollView
             android:id="@+id/scroll"
             android:layout_width="match_parent"
             android:layout_height="0dp"
@@ -1430,7 +1430,7 @@
                     android:layout_height="0dp"
                     app:constraint_referenced_ids="tvUrl,spUrlMethod,etUrl,tvUrlHint" />
             </androidx.constraintlayout.widget.ConstraintLayout>
-        </eu.faircode.email.ScrollViewEx>
+        </ScrollView>
 
         <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 d0e910827b..9d3d08a0a8 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"?>
-<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -1253,4 +1253,4 @@
             </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.cardview.widget.CardView>
     </androidx.constraintlayout.widget.ConstraintLayout>
-</eu.faircode.email.ScrollViewEx>
+</ScrollView>