From 7cae4e67c47b9b13bd7721d711f52df2e37fade9 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 10 Jun 2022 09:29:07 +0200
Subject: [PATCH] Use view inflator to inject fixed views

---
 .../email/AppCompatViewInflaterEx.java        |  47 +++++
 ...youtEx.java => FixedConstraintLayout.java} |  10 +-
 ...outEx.java => FixedCoordinatorLayout.java} |   8 +-
 ...ameLayoutEx.java => FixedFrameLayout.java} |  10 +-
 ...ViewEx.java => FixedNestedScrollView.java} |   8 +-
 app/src/main/res/layout/action_bar.xml        |   8 +-
 app/src/main/res/layout/action_button.xml     |   2 +-
 .../main/res/layout/action_button_text.xml    |   8 +-
 app/src/main/res/layout/activity_amp.xml      |   4 +-
 app/src/main/res/layout/activity_answer.xml   |   4 +-
 app/src/main/res/layout/activity_billing.xml  |   2 +-
 app/src/main/res/layout/activity_clear.xml    |  16 +-
 app/src/main/res/layout/activity_compose.xml  |   2 +-
 app/src/main/res/layout/activity_dmarc.xml    |  14 +-
 app/src/main/res/layout/activity_dsn.xml      |  14 +-
 app/src/main/res/layout/activity_eml.xml      |  60 +++----
 app/src/main/res/layout/activity_error.xml    |  20 +--
 app/src/main/res/layout/activity_main.xml     |   2 +-
 app/src/main/res/layout/activity_setup.xml    |   6 +-
 .../main/res/layout/activity_signature.xml    |  12 +-
 .../main/res/layout/activity_unsupported.xml  |   6 +-
 .../layout/activity_view_landscape_split.xml  |   8 +-
 .../res/layout/activity_view_portrait.xml     |   6 +-
 .../layout/activity_view_portrait_split.xml   |   8 +-
 app/src/main/res/layout/activity_widget.xml   |  10 +-
 .../main/res/layout/activity_widget_sync.xml  |   4 +-
 .../res/layout/activity_widget_unified.xml    |  12 +-
 app/src/main/res/layout/dialog_add_image.xml  |  16 +-
 app/src/main/res/layout/dialog_advanced.xml   |  12 +-
 app/src/main/res/layout/dialog_ask_again.xml  |  12 +-
 app/src/main/res/layout/dialog_ask_amp.xml    |   8 +-
 app/src/main/res/layout/dialog_ask_full.xml   |   8 +-
 app/src/main/res/layout/dialog_ask_move.xml   |  14 +-
 app/src/main/res/layout/dialog_ask_spam.xml   |   6 +-
 .../main/res/layout/dialog_block_sender.xml   |  10 +-
 .../main/res/layout/dialog_boundary_error.xml |   8 +-
 app/src/main/res/layout/dialog_buttons.xml    |   8 +-
 .../main/res/layout/dialog_certificate.xml    |  38 ++--
 .../main/res/layout/dialog_contact_group.xml  |   8 +-
 app/src/main/res/layout/dialog_deepl.xml      |  16 +-
 .../res/layout/dialog_delete_operations.xml   |  14 +-
 app/src/main/res/layout/dialog_duration.xml   |   6 +-
 .../main/res/layout/dialog_edit_contact.xml   |   6 +-
 app/src/main/res/layout/dialog_edit_name.xml  |   6 +-
 .../res/layout/dialog_error_reporting.xml     |  10 +-
 app/src/main/res/layout/dialog_export.xml     |  10 +-
 app/src/main/res/layout/dialog_first.xml      |  22 +--
 app/src/main/res/layout/dialog_folder_all.xml |  16 +-
 .../main/res/layout/dialog_folder_select.xml  |  10 +-
 .../main/res/layout/dialog_forward_raw.xml    |  14 +-
 app/src/main/res/layout/dialog_identity.xml   |  10 +-
 app/src/main/res/layout/dialog_import.xml     |   8 +-
 .../res/layout/dialog_import_progress.xml     |   8 +-
 .../main/res/layout/dialog_insert_link.xml    |  14 +-
 app/src/main/res/layout/dialog_junk.xml       |  30 ++--
 .../main/res/layout/dialog_keyword_add.xml    |   6 +-
 .../main/res/layout/dialog_keyword_manage.xml |   4 +-
 app/src/main/res/layout/dialog_markdown.xml   |  12 +-
 .../main/res/layout/dialog_nav_options.xml    |  20 +--
 app/src/main/res/layout/dialog_no_stream.xml  |  12 +-
 app/src/main/res/layout/dialog_no_viewer.xml  |  18 +-
 app/src/main/res/layout/dialog_notes.xml      |   8 +-
 app/src/main/res/layout/dialog_open_link.xml  |  42 ++---
 .../main/res/layout/dialog_permissions.xml    |  24 +--
 app/src/main/res/layout/dialog_pin_ask.xml    |   6 +-
 app/src/main/res/layout/dialog_pin_set.xml    |   6 +-
 app/src/main/res/layout/dialog_print.xml      |  10 +-
 .../main/res/layout/dialog_quick_actions.xml  |   8 +-
 .../res/layout/dialog_reset_questions.xml     |   6 +-
 app/src/main/res/layout/dialog_response.xml   |   6 +-
 app/src/main/res/layout/dialog_review.xml     |  12 +-
 .../main/res/layout/dialog_review_account.xml |  34 ++--
 app/src/main/res/layout/dialog_rule_match.xml |   6 +-
 .../main/res/layout/dialog_save_search.xml    |   6 +-
 app/src/main/res/layout/dialog_search.xml     |  42 ++---
 app/src/main/res/layout/dialog_send.xml       |  64 +++----
 app/src/main/res/layout/dialog_show_full.xml  |   8 +-
 .../main/res/layout/dialog_show_images.xml    |  10 +-
 app/src/main/res/layout/dialog_swipes.xml     |  12 +-
 app/src/main/res/layout/dialog_sync.xml       |  16 +-
 app/src/main/res/layout/dialog_theme.xml      |  12 +-
 app/src/main/res/layout/dialog_translate.xml  |  10 +-
 app/src/main/res/layout/dialog_unexpected.xml |   8 +-
 app/src/main/res/layout/fragment_about.xml    |  20 +--
 app/src/main/res/layout/fragment_account.xml  |  92 +++++-----
 app/src/main/res/layout/fragment_accounts.xml |  10 +-
 app/src/main/res/layout/fragment_answer.xml   |  12 +-
 app/src/main/res/layout/fragment_answers.xml  |   8 +-
 .../main/res/layout/fragment_certificates.xml |   8 +-
 app/src/main/res/layout/fragment_compose.xml  |  58 +++----
 app/src/main/res/layout/fragment_contacts.xml |  10 +-
 app/src/main/res/layout/fragment_eula.xml     |   4 +-
 app/src/main/res/layout/fragment_folder.xml   |  40 ++---
 app/src/main/res/layout/fragment_folders.xml  |  16 +-
 app/src/main/res/layout/fragment_gmail.xml    |  22 +--
 .../main/res/layout/fragment_identities.xml   |  10 +-
 app/src/main/res/layout/fragment_identity.xml |  84 ++++-----
 app/src/main/res/layout/fragment_legend.xml   |   4 +-
 .../res/layout/fragment_legend_compose.xml    |  48 ++---
 .../res/layout/fragment_legend_folders.xml    |  68 ++++----
 .../res/layout/fragment_legend_keyboard.xml   |  44 ++---
 .../res/layout/fragment_legend_messages.xml   | 164 +++++++++---------
 .../fragment_legend_synchronization.xml       |  74 ++++----
 app/src/main/res/layout/fragment_logs.xml     |   4 +-
 app/src/main/res/layout/fragment_messages.xml |  78 ++++-----
 app/src/main/res/layout/fragment_oauth.xml    |  22 +--
 .../main/res/layout/fragment_open_full.xml    |   4 +-
 .../main/res/layout/fragment_operations.xml   |   8 +-
 app/src/main/res/layout/fragment_options.xml  |   4 +-
 .../res/layout/fragment_options_behavior.xml  |  50 +++---
 .../layout/fragment_options_connection.xml    |  60 +++----
 .../res/layout/fragment_options_display.xml   | 156 ++++++++---------
 .../layout/fragment_options_encryption.xml    |  54 +++---
 .../main/res/layout/fragment_options_misc.xml | 154 ++++++++--------
 .../layout/fragment_options_notifications.xml |  76 ++++----
 .../res/layout/fragment_options_privacy.xml   |  64 +++----
 .../main/res/layout/fragment_options_send.xml |  56 +++---
 .../layout/fragment_options_synchronize.xml   | 102 +++++------
 app/src/main/res/layout/fragment_order.xml    |   4 +-
 app/src/main/res/layout/fragment_pop.xml      |  54 +++---
 app/src/main/res/layout/fragment_pro.xml      |  32 ++--
 .../main/res/layout/fragment_quick_setup.xml  |  46 ++---
 app/src/main/res/layout/fragment_rule.xml     |  96 +++++-----
 app/src/main/res/layout/fragment_rules.xml    |   8 +-
 app/src/main/res/layout/fragment_setup.xml    | 136 +++++++--------
 app/src/main/res/layout/include_eula.xml      |  16 +-
 .../res/layout/include_message_action.xml     |   6 +-
 .../res/layout/include_message_addresses.xml  |  78 ++++-----
 .../layout/include_message_attachments.xml    |  10 +-
 .../main/res/layout/include_message_body.xml  |  22 +--
 .../res/layout/include_message_calendar.xml   |  18 +-
 .../res/layout/include_message_compact.xml    |  66 +++----
 .../res/layout/include_message_headers.xml    |  12 +-
 .../res/layout/include_message_images.xml     |   8 +-
 .../res/layout/include_message_navigation.xml |  76 ++++----
 .../res/layout/include_message_normal.xml     |  66 +++----
 app/src/main/res/layout/include_nav.xml       |  26 +--
 app/src/main/res/layout/item_account.xml      |  52 +++---
 .../main/res/layout/item_account_exempted.xml |   8 +-
 app/src/main/res/layout/item_answer.xml       |  24 +--
 app/src/main/res/layout/item_attachment.xml   |  26 +--
 .../main/res/layout/item_attachment_eml.xml   |  20 +--
 .../res/layout/item_blocklist_enabled.xml     |   8 +-
 app/src/main/res/layout/item_certificate.xml  |  20 +--
 app/src/main/res/layout/item_contact.xml      |  22 +--
 app/src/main/res/layout/item_folder.xml       |  48 ++---
 .../main/res/layout/item_folder_select.xml    |  14 +-
 .../res/layout/item_folder_unselectable.xml   |  14 +-
 app/src/main/res/layout/item_group.xml        |   8 +-
 app/src/main/res/layout/item_identity.xml     |  36 ++--
 app/src/main/res/layout/item_image.xml        |  14 +-
 app/src/main/res/layout/item_keyword.xml      |  12 +-
 app/src/main/res/layout/item_log.xml          |   8 +-
 .../main/res/layout/item_menu_ellipsize.xml   |   2 +-
 .../main/res/layout/item_message_compact.xml  |   8 +-
 .../res/layout/item_message_duplicate.xml     |  10 +-
 .../main/res/layout/item_message_normal.xml   |   8 +-
 .../res/layout/item_message_placeholder.xml   |   6 +-
 app/src/main/res/layout/item_nav.xml          |  22 +--
 app/src/main/res/layout/item_nav_group.xml    |  12 +-
 app/src/main/res/layout/item_operation.xml    |  18 +-
 app/src/main/res/layout/item_order.xml        |  14 +-
 app/src/main/res/layout/item_rule.xml         |  22 +--
 app/src/main/res/layout/item_rule_match.xml   |  12 +-
 app/src/main/res/layout/search_suggestion.xml |   6 +-
 app/src/main/res/layout/spinner_account.xml   |   6 +-
 app/src/main/res/layout/spinner_contact.xml   |  10 +-
 .../main/res/layout/spinner_contact_group.xml |   8 +-
 app/src/main/res/layout/spinner_identity.xml  |  10 +-
 app/src/main/res/layout/spinner_item1.xml     |   6 +-
 .../res/layout/spinner_item1_dropdown.xml     |   6 +-
 app/src/main/res/layout/toast.xml             |   2 +-
 172 files changed, 2062 insertions(+), 2015 deletions(-)
 rename app/src/main/java/eu/faircode/email/{ConstraintLayoutEx.java => FixedConstraintLayout.java} (92%)
 rename app/src/main/java/eu/faircode/email/{CoordinatorLayoutEx.java => FixedCoordinatorLayout.java} (83%)
 rename app/src/main/java/eu/faircode/email/{FrameLayoutEx.java => FixedFrameLayout.java} (81%)
 rename app/src/main/java/eu/faircode/email/{NestedScrollViewEx.java => FixedNestedScrollView.java} (63%)

diff --git a/app/src/main/java/eu/faircode/email/AppCompatViewInflaterEx.java b/app/src/main/java/eu/faircode/email/AppCompatViewInflaterEx.java
index b2e648df2a..669928d9e7 100644
--- a/app/src/main/java/eu/faircode/email/AppCompatViewInflaterEx.java
+++ b/app/src/main/java/eu/faircode/email/AppCompatViewInflaterEx.java
@@ -26,8 +26,12 @@ import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatViewInflater;
+import androidx.appcompat.widget.AppCompatImageButton;
+import androidx.appcompat.widget.AppCompatImageView;
+import androidx.appcompat.widget.AppCompatTextView;
 
 public class AppCompatViewInflaterEx extends AppCompatViewInflater {
     // <item name="viewInflaterClass">eu.faircode.email.AppCompatViewInflaterEx</item>
@@ -106,6 +110,49 @@ public class AppCompatViewInflaterEx extends AppCompatViewInflater {
                 }
             };
 
+        if ("FrameLayout".equals(name))
+            return new FixedFrameLayout(context, attrs);
+
+        if ("View".equals(name))
+            return new View(context, attrs) {
+                @Override
+                public boolean dispatchTouchEvent(MotionEvent ev) {
+                    try {
+                        return super.dispatchTouchEvent(ev);
+                    } catch (Throwable ex) {
+                        Log.e(ex);
+                        return false;
+                    }
+                }
+            };
+
+        if ("androidx.coordinatorlayout.widget.CoordinatorLayout".equals(name))
+            return new FixedCoordinatorLayout(context, attrs);
+
+        if ("androidx.constraintlayout.widget.ConstraintLayout".equals(name))
+            return new FixedConstraintLayout(context, attrs);
+
+        if ("androidx.core.widget.NestedScrollView".equals(name))
+            return new FixedNestedScrollView(context, attrs);
+
         return super.createView(context, name, attrs);
     }
+
+    @NonNull
+    @Override
+    protected AppCompatTextView createTextView(Context context, AttributeSet attrs) {
+        return new FixedTextView(context, attrs);
+    }
+
+    @NonNull
+    @Override
+    protected AppCompatImageView createImageView(Context context, AttributeSet attrs) {
+        return new FixedImageView(context, attrs);
+    }
+
+    @NonNull
+    @Override
+    protected AppCompatImageButton createImageButton(Context context, AttributeSet attrs) {
+        return new FixedImageButton(context, attrs);
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/eu/faircode/email/ConstraintLayoutEx.java b/app/src/main/java/eu/faircode/email/FixedConstraintLayout.java
similarity index 92%
rename from app/src/main/java/eu/faircode/email/ConstraintLayoutEx.java
rename to app/src/main/java/eu/faircode/email/FixedConstraintLayout.java
index 200f2450c5..4bb00fd010 100644
--- a/app/src/main/java/eu/faircode/email/ConstraintLayoutEx.java
+++ b/app/src/main/java/eu/faircode/email/FixedConstraintLayout.java
@@ -27,20 +27,20 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.constraintlayout.widget.ConstraintLayout;
 
-public class ConstraintLayoutEx extends ConstraintLayout {
-    public ConstraintLayoutEx(@NonNull Context context) {
+public class FixedConstraintLayout extends ConstraintLayout {
+    public FixedConstraintLayout(@NonNull Context context) {
         super(context);
     }
 
-    public ConstraintLayoutEx(@NonNull Context context, @Nullable AttributeSet attrs) {
+    public FixedConstraintLayout(@NonNull Context context, @Nullable AttributeSet attrs) {
         super(context, attrs);
     }
 
-    public ConstraintLayoutEx(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+    public FixedConstraintLayout(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
     }
 
-    public ConstraintLayoutEx(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+    public FixedConstraintLayout(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr, int defStyleRes) {
         super(context, attrs, defStyleAttr, defStyleRes);
     }
 
diff --git a/app/src/main/java/eu/faircode/email/CoordinatorLayoutEx.java b/app/src/main/java/eu/faircode/email/FixedCoordinatorLayout.java
similarity index 83%
rename from app/src/main/java/eu/faircode/email/CoordinatorLayoutEx.java
rename to app/src/main/java/eu/faircode/email/FixedCoordinatorLayout.java
index e7e85ba8c2..47ffea852c 100644
--- a/app/src/main/java/eu/faircode/email/CoordinatorLayoutEx.java
+++ b/app/src/main/java/eu/faircode/email/FixedCoordinatorLayout.java
@@ -27,16 +27,16 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 
-public class CoordinatorLayoutEx extends CoordinatorLayout {
-    public CoordinatorLayoutEx(@NonNull Context context) {
+public class FixedCoordinatorLayout extends CoordinatorLayout {
+    public FixedCoordinatorLayout(@NonNull Context context) {
         super(context);
     }
 
-    public CoordinatorLayoutEx(@NonNull Context context, @Nullable AttributeSet attrs) {
+    public FixedCoordinatorLayout(@NonNull Context context, @Nullable AttributeSet attrs) {
         super(context, attrs);
     }
 
-    public CoordinatorLayoutEx(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+    public FixedCoordinatorLayout(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
     }
 
diff --git a/app/src/main/java/eu/faircode/email/FrameLayoutEx.java b/app/src/main/java/eu/faircode/email/FixedFrameLayout.java
similarity index 81%
rename from app/src/main/java/eu/faircode/email/FrameLayoutEx.java
rename to app/src/main/java/eu/faircode/email/FixedFrameLayout.java
index 28f41d750c..c5fce20904 100644
--- a/app/src/main/java/eu/faircode/email/FrameLayoutEx.java
+++ b/app/src/main/java/eu/faircode/email/FixedFrameLayout.java
@@ -27,20 +27,20 @@ import android.widget.FrameLayout;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-public class FrameLayoutEx extends FrameLayout {
-    public FrameLayoutEx(@NonNull Context context) {
+public class FixedFrameLayout extends FrameLayout {
+    public FixedFrameLayout(@NonNull Context context) {
         super(context);
     }
 
-    public FrameLayoutEx(@NonNull Context context, @Nullable AttributeSet attrs) {
+    public FixedFrameLayout(@NonNull Context context, @Nullable AttributeSet attrs) {
         super(context, attrs);
     }
 
-    public FrameLayoutEx(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+    public FixedFrameLayout(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
     }
 
-    public FrameLayoutEx(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+    public FixedFrameLayout(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr, int defStyleRes) {
         super(context, attrs, defStyleAttr, defStyleRes);
     }
 
diff --git a/app/src/main/java/eu/faircode/email/NestedScrollViewEx.java b/app/src/main/java/eu/faircode/email/FixedNestedScrollView.java
similarity index 63%
rename from app/src/main/java/eu/faircode/email/NestedScrollViewEx.java
rename to app/src/main/java/eu/faircode/email/FixedNestedScrollView.java
index 802f6eafac..a531037849 100644
--- a/app/src/main/java/eu/faircode/email/NestedScrollViewEx.java
+++ b/app/src/main/java/eu/faircode/email/FixedNestedScrollView.java
@@ -7,16 +7,16 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.widget.NestedScrollView;
 
-public class NestedScrollViewEx extends NestedScrollView {
-    public NestedScrollViewEx(@NonNull Context context) {
+public class FixedNestedScrollView extends NestedScrollView {
+    public FixedNestedScrollView(@NonNull Context context) {
         super(context);
     }
 
-    public NestedScrollViewEx(@NonNull Context context, @Nullable AttributeSet attrs) {
+    public FixedNestedScrollView(@NonNull Context context, @Nullable AttributeSet attrs) {
         super(context, attrs);
     }
 
-    public NestedScrollViewEx(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+    public FixedNestedScrollView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
     }
 
diff --git a/app/src/main/res/layout/action_bar.xml b/app/src/main/res/layout/action_bar.xml
index d8508a7daa..c682163876 100644
--- a/app/src/main/res/layout/action_bar.xml
+++ b/app/src/main/res/layout/action_bar.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ConstraintLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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">
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -16,7 +16,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -27,4 +27,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/title" />
-</eu.faircode.email.ConstraintLayoutEx>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/action_button.xml b/app/src/main/res/layout/action_button.xml
index 18b04d742b..3aec878003 100644
--- a/app/src/main/res/layout/action_button.xml
+++ b/app/src/main/res/layout/action_button.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.FixedImageButton xmlns:android="http://schemas.android.com/apk/res/android"
+<ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     style="@android:style/Widget.ActionButton"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/action_button_text.xml b/app/src/main/res/layout/action_button_text.xml
index e486aa5228..b08e95e3cc 100644
--- a/app/src/main/res/layout/action_button_text.xml
+++ b/app/src/main/res/layout/action_button_text.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ConstraintLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:theme="?actionBarTheme">
 
-    <eu.faircode.email.FixedImageButton
+    <ImageButton
         android:id="@+id/button"
         style="@android:style/Widget.ActionButton"
         android:layout_width="wrap_content"
@@ -16,7 +16,7 @@
         app:srcCompat="@drawable/twotone_lock_24"
         app:tint="?android:attr/textColorPrimary" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -29,4 +29,4 @@
         app:layout_constraintBottom_toBottomOf="@id/button"
         app:layout_constraintEnd_toEndOf="@id/button"
         app:layout_constraintTop_toTopOf="@id/button" />
-</eu.faircode.email.ConstraintLayoutEx>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_amp.xml b/app/src/main/res/layout/activity_amp.xml
index 2a442963fd..3b587cf336 100644
--- a/app/src/main/res/layout/activity_amp.xml
+++ b/app/src/main/res/layout/activity_amp.xml
@@ -1,4 +1,4 @@
-<eu.faircode.email.ConstraintLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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"
@@ -26,4 +26,4 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:constraint_referenced_ids="wvAmp" />
-</eu.faircode.email.ConstraintLayoutEx>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_answer.xml b/app/src/main/res/layout/activity_answer.xml
index fec7190010..6e0a9235d7 100644
--- a/app/src/main/res/layout/activity_answer.xml
+++ b/app/src/main/res/layout/activity_answer.xml
@@ -1,4 +1,4 @@
-<eu.faircode.email.ConstraintLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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"
@@ -26,4 +26,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
-</eu.faircode.email.ConstraintLayoutEx>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_billing.xml b/app/src/main/res/layout/activity_billing.xml
index 37c9c3f1c6..fa467c73fa 100644
--- a/app/src/main/res/layout/activity_billing.xml
+++ b/app/src/main/res/layout/activity_billing.xml
@@ -1,4 +1,4 @@
-<eu.faircode.email.FrameLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/content_frame"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_clear.xml b/app/src/main/res/layout/activity_clear.xml
index 3654ca6449..1f6c555a29 100644
--- a/app/src/main/res/layout/activity_clear.xml
+++ b/app/src/main/res/layout/activity_clear.xml
@@ -1,4 +1,4 @@
-<eu.faircode.email.ConstraintLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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"
@@ -15,7 +15,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        <eu.faircode.email.ConstraintLayoutEx
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
@@ -31,13 +31,13 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent">
 
-                <eu.faircode.email.ConstraintLayoutEx
+                <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:paddingHorizontal="6dp"
                     android:paddingVertical="12dp">
 
-                    <eu.faircode.email.FixedTextView
+                    <TextView
                         android:id="@+id/tvTitle"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
@@ -52,7 +52,7 @@
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
 
-                    <eu.faircode.email.FixedTextView
+                    <TextView
                         android:id="@+id/tvMessage"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
@@ -86,8 +86,8 @@
                         android:text="@android:string/cancel"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintTop_toBottomOf="@id/tvMessage" />
-                </eu.faircode.email.ConstraintLayoutEx>
+                </androidx.constraintlayout.widget.ConstraintLayout>
             </androidx.cardview.widget.CardView>
-        </eu.faircode.email.ConstraintLayoutEx>
+        </androidx.constraintlayout.widget.ConstraintLayout>
     </eu.faircode.email.ScrollViewEx>
-</eu.faircode.email.ConstraintLayoutEx>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_compose.xml b/app/src/main/res/layout/activity_compose.xml
index 87993ea757..b7baf10132 100644
--- a/app/src/main/res/layout/activity_compose.xml
+++ b/app/src/main/res/layout/activity_compose.xml
@@ -1,4 +1,4 @@
-<eu.faircode.email.FrameLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/content_frame"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_dmarc.xml b/app/src/main/res/layout/activity_dmarc.xml
index f70c404eee..3bc077c7e9 100644
--- a/app/src/main/res/layout/activity_dmarc.xml
+++ b/app/src/main/res/layout/activity_dmarc.xml
@@ -1,4 +1,4 @@
-<eu.faircode.email.ConstraintLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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"
@@ -15,7 +15,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        <eu.faircode.email.ConstraintLayoutEx
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
@@ -31,13 +31,13 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent">
 
-                <eu.faircode.email.ConstraintLayoutEx
+                <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:paddingHorizontal="6dp"
                     android:paddingVertical="12dp">
 
-                    <eu.faircode.email.FixedTextView
+                    <TextView
                         android:id="@+id/tvDmarc"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
@@ -48,7 +48,7 @@
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
-                </eu.faircode.email.ConstraintLayoutEx>
+                </androidx.constraintlayout.widget.ConstraintLayout>
             </androidx.cardview.widget.CardView>
 
             <androidx.constraintlayout.widget.Group
@@ -56,7 +56,7 @@
                 android:layout_width="0dp"
                 android:layout_height="0dp"
                 app:constraint_referenced_ids="cardDmarc" />
-        </eu.faircode.email.ConstraintLayoutEx>
+        </androidx.constraintlayout.widget.ConstraintLayout>
     </eu.faircode.email.ScrollViewEx>
 
     <eu.faircode.email.ContentLoadingProgressBar
@@ -69,4 +69,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
-</eu.faircode.email.ConstraintLayoutEx>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_dsn.xml b/app/src/main/res/layout/activity_dsn.xml
index 316849aa08..61507fd79c 100644
--- a/app/src/main/res/layout/activity_dsn.xml
+++ b/app/src/main/res/layout/activity_dsn.xml
@@ -1,4 +1,4 @@
-<eu.faircode.email.ConstraintLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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"
@@ -15,7 +15,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        <eu.faircode.email.ConstraintLayoutEx
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
@@ -31,13 +31,13 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent">
 
-                <eu.faircode.email.ConstraintLayoutEx
+                <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:paddingHorizontal="6dp"
                     android:paddingVertical="12dp">
 
-                    <eu.faircode.email.FixedTextView
+                    <TextView
                         android:id="@+id/tvHeaders"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
@@ -50,7 +50,7 @@
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
-                </eu.faircode.email.ConstraintLayoutEx>
+                </androidx.constraintlayout.widget.ConstraintLayout>
             </androidx.cardview.widget.CardView>
 
 
@@ -59,7 +59,7 @@
                 android:layout_width="0dp"
                 android:layout_height="0dp"
                 app:constraint_referenced_ids="cardMessage" />
-        </eu.faircode.email.ConstraintLayoutEx>
+        </androidx.constraintlayout.widget.ConstraintLayout>
     </eu.faircode.email.ScrollViewEx>
 
     <eu.faircode.email.ContentLoadingProgressBar
@@ -72,4 +72,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
-</eu.faircode.email.ConstraintLayoutEx>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_eml.xml b/app/src/main/res/layout/activity_eml.xml
index fa36c16b12..6c2c026239 100644
--- a/app/src/main/res/layout/activity_eml.xml
+++ b/app/src/main/res/layout/activity_eml.xml
@@ -1,4 +1,4 @@
-<eu.faircode.email.ConstraintLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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"
@@ -15,11 +15,11 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        <eu.faircode.email.ConstraintLayoutEx
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
-            <eu.faircode.email.FixedTextView
+            <TextView
                 android:id="@+id/tvHint"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -45,13 +45,13 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tvHint">
 
-                <eu.faircode.email.ConstraintLayoutEx
+                <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:paddingHorizontal="6dp"
                     android:paddingVertical="12dp">
 
-                    <eu.faircode.email.FixedTextView
+                    <TextView
                         android:id="@+id/tvFromTitle"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -61,7 +61,7 @@
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
 
-                    <eu.faircode.email.FixedTextView
+                    <TextView
                         android:id="@+id/tvFrom"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
@@ -73,7 +73,7 @@
                         app:layout_constraintStart_toEndOf="@id/tvFromTitle"
                         app:layout_constraintTop_toTopOf="parent" />
 
-                    <eu.faircode.email.FixedTextView
+                    <TextView
                         android:id="@+id/tvToTitle"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -83,7 +83,7 @@
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toBottomOf="@id/tvFrom" />
 
-                    <eu.faircode.email.FixedTextView
+                    <TextView
                         android:id="@+id/tvTo"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
@@ -95,7 +95,7 @@
                         app:layout_constraintStart_toEndOf="@id/tvToTitle"
                         app:layout_constraintTop_toBottomOf="@id/tvFrom" />
 
-                    <eu.faircode.email.FixedTextView
+                    <TextView
                         android:id="@+id/tvReplyToTitle"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -105,7 +105,7 @@
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toBottomOf="@id/tvTo" />
 
-                    <eu.faircode.email.FixedTextView
+                    <TextView
                         android:id="@+id/tvReplyTo"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
@@ -117,7 +117,7 @@
                         app:layout_constraintStart_toEndOf="@id/tvReplyToTitle"
                         app:layout_constraintTop_toBottomOf="@id/tvTo" />
 
-                    <eu.faircode.email.FixedTextView
+                    <TextView
                         android:id="@+id/tvCcTitle"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -127,7 +127,7 @@
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toBottomOf="@id/tvReplyTo" />
 
-                    <eu.faircode.email.FixedTextView
+                    <TextView
                         android:id="@+id/tvCc"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
@@ -139,7 +139,7 @@
                         app:layout_constraintStart_toEndOf="@id/tvCcTitle"
                         app:layout_constraintTop_toBottomOf="@id/tvReplyTo" />
 
-                    <eu.faircode.email.FixedTextView
+                    <TextView
                         android:id="@+id/tvBccTitle"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -149,7 +149,7 @@
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toBottomOf="@id/tvCc" />
 
-                    <eu.faircode.email.FixedTextView
+                    <TextView
                         android:id="@+id/tvBcc"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
@@ -161,7 +161,7 @@
                         app:layout_constraintStart_toEndOf="@id/tvBccTitle"
                         app:layout_constraintTop_toBottomOf="@id/tvCc" />
 
-                    <eu.faircode.email.FixedTextView
+                    <TextView
                         android:id="@+id/tvSentTitle"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -171,7 +171,7 @@
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toBottomOf="@id/tvBcc" />
 
-                    <eu.faircode.email.FixedTextView
+                    <TextView
                         android:id="@+id/tvSent"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
@@ -183,7 +183,7 @@
                         app:layout_constraintStart_toEndOf="@id/tvSentTitle"
                         app:layout_constraintTop_toBottomOf="@id/tvBcc" />
 
-                    <eu.faircode.email.FixedTextView
+                    <TextView
                         android:id="@+id/tvReceivedTitle"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -193,7 +193,7 @@
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toBottomOf="@id/tvSent" />
 
-                    <eu.faircode.email.FixedTextView
+                    <TextView
                         android:id="@+id/tvReceived"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
@@ -205,7 +205,7 @@
                         app:layout_constraintStart_toEndOf="@id/tvReceivedTitle"
                         app:layout_constraintTop_toBottomOf="@id/tvSent" />
 
-                    <eu.faircode.email.FixedTextView
+                    <TextView
                         android:id="@+id/tvSubject"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
@@ -245,7 +245,7 @@
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toBottomOf="@id/rvAttachment" />
 
-                    <eu.faircode.email.FixedTextView
+                    <TextView
                         android:id="@+id/tvBody"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
@@ -257,7 +257,7 @@
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toBottomOf="@id/vSeparatorBody" />
 
-                </eu.faircode.email.ConstraintLayoutEx>
+                </androidx.constraintlayout.widget.ConstraintLayout>
             </androidx.cardview.widget.CardView>
 
             <androidx.cardview.widget.CardView
@@ -273,13 +273,13 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/cardMessage">
 
-                <eu.faircode.email.ConstraintLayoutEx
+                <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:paddingHorizontal="6dp"
                     android:paddingVertical="12dp">
 
-                    <eu.faircode.email.FixedTextView
+                    <TextView
                         android:id="@+id/tvStructure"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
@@ -293,7 +293,7 @@
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
 
-                    <eu.faircode.email.FixedImageButton
+                    <ImageButton
                         android:id="@+id/ibEml"
                         android:layout_width="36dp"
                         android:layout_height="36dp"
@@ -303,7 +303,7 @@
                         app:layout_constraintBottom_toBottomOf="@id/tvStructure"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:srcCompat="@drawable/baseline_code_24" />
-                </eu.faircode.email.ConstraintLayoutEx>
+                </androidx.constraintlayout.widget.ConstraintLayout>
             </androidx.cardview.widget.CardView>
 
             <androidx.cardview.widget.CardView
@@ -319,13 +319,13 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/cardStructure">
 
-                <eu.faircode.email.ConstraintLayoutEx
+                <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:paddingHorizontal="6dp"
                     android:paddingVertical="12dp">
 
-                    <eu.faircode.email.FixedTextView
+                    <TextView
                         android:id="@+id/tvHeaders"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
@@ -338,7 +338,7 @@
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
-                </eu.faircode.email.ConstraintLayoutEx>
+                </androidx.constraintlayout.widget.ConstraintLayout>
             </androidx.cardview.widget.CardView>
 
             <androidx.constraintlayout.widget.Group
@@ -346,7 +346,7 @@
                 android:layout_width="0dp"
                 android:layout_height="0dp"
                 app:constraint_referenced_ids="cardMessage,cardStructure" />
-        </eu.faircode.email.ConstraintLayoutEx>
+        </androidx.constraintlayout.widget.ConstraintLayout>
     </eu.faircode.email.ScrollViewEx>
 
     <eu.faircode.email.ContentLoadingProgressBar
@@ -359,4 +359,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
-</eu.faircode.email.ConstraintLayoutEx>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_error.xml b/app/src/main/res/layout/activity_error.xml
index 6b3a7481e4..ef1fda1c1d 100644
--- a/app/src/main/res/layout/activity_error.xml
+++ b/app/src/main/res/layout/activity_error.xml
@@ -1,4 +1,4 @@
-<eu.faircode.email.ConstraintLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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"
@@ -15,7 +15,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        <eu.faircode.email.ConstraintLayoutEx
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
@@ -31,13 +31,13 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent">
 
-                <eu.faircode.email.ConstraintLayoutEx
+                <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:paddingHorizontal="6dp"
                     android:paddingVertical="12dp">
 
-                    <eu.faircode.email.FixedTextView
+                    <TextView
                         android:id="@+id/tvTitle"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
@@ -52,7 +52,7 @@
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
 
-                    <eu.faircode.email.FixedTextView
+                    <TextView
                         android:id="@+id/tvMessage"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
@@ -80,7 +80,7 @@
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toBottomOf="@id/tvMessage" />
 
-                    <eu.faircode.email.FixedImageButton
+                    <ImageButton
                         android:id="@+id/ibSetting"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -91,7 +91,7 @@
                         app:layout_constraintTop_toBottomOf="@id/btnPassword"
                         app:srcCompat="@drawable/twotone_settings_24" />
 
-                    <eu.faircode.email.FixedImageButton
+                    <ImageButton
                         android:id="@+id/ibInfo"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -101,8 +101,8 @@
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintTop_toBottomOf="@id/btnPassword"
                         app:srcCompat="@drawable/twotone_info_24" />
-                </eu.faircode.email.ConstraintLayoutEx>
+                </androidx.constraintlayout.widget.ConstraintLayout>
             </androidx.cardview.widget.CardView>
-        </eu.faircode.email.ConstraintLayoutEx>
+        </androidx.constraintlayout.widget.ConstraintLayout>
     </eu.faircode.email.ScrollViewEx>
-</eu.faircode.email.ConstraintLayoutEx>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 7d39a9115d..715d7834e3 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,4 +1,4 @@
-<eu.faircode.email.FrameLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/content_frame"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_setup.xml b/app/src/main/res/layout/activity_setup.xml
index e02afb5fc5..a19fbe2fbc 100644
--- a/app/src/main/res/layout/activity_setup.xml
+++ b/app/src/main/res/layout/activity_setup.xml
@@ -6,12 +6,12 @@
     android:layout_height="match_parent"
     tools:context="eu.faircode.email.ActivitySetup">
 
-    <eu.faircode.email.FrameLayoutEx
+    <FrameLayout
         android:id="@+id/content_frame"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/drawer_container"
         android:layout_width="270dp"
         android:layout_height="match_parent"
@@ -26,5 +26,5 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.drawerlayout.widget.DrawerLayout>
diff --git a/app/src/main/res/layout/activity_signature.xml b/app/src/main/res/layout/activity_signature.xml
index 1d35730bc8..54df6ebff8 100644
--- a/app/src/main/res/layout/activity_signature.xml
+++ b/app/src/main/res/layout/activity_signature.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.CoordinatorLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="eu.faircode.email.ActivitySignature">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:layout_behavior="eu.faircode.email.BehaviorBottomPadding">
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvHtmlRemark"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -39,7 +39,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvHtmlRemark" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibFull"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -78,5 +78,5 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:menu="@menu/action_signature" />
-    </eu.faircode.email.ConstraintLayoutEx>
-</eu.faircode.email.CoordinatorLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/activity_unsupported.xml b/app/src/main/res/layout/activity_unsupported.xml
index 457e38b9aa..0805db87d9 100644
--- a/app/src/main/res/layout/activity_unsupported.xml
+++ b/app/src/main/res/layout/activity_unsupported.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ConstraintLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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"
     android:padding="12dp">
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvWarning"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -27,4 +27,4 @@
         android:text="@string/app_continue"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvWarning" />
-</eu.faircode.email.ConstraintLayoutEx>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_view_landscape_split.xml b/app/src/main/res/layout/activity_view_landscape_split.xml
index b22fbb7dfe..2770cc67f7 100644
--- a/app/src/main/res/layout/activity_view_landscape_split.xml
+++ b/app/src/main/res/layout/activity_view_landscape_split.xml
@@ -12,7 +12,7 @@
         android:focusableInTouchMode="false"
         android:orientation="horizontal">
 
-        <eu.faircode.email.FrameLayoutEx
+        <FrameLayout
             android:id="@+id/content_frame"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -24,14 +24,14 @@
             android:layout_height="match_parent"
             android:background="?attr/colorSeparator" />
 
-        <eu.faircode.email.FrameLayoutEx
+        <FrameLayout
             android:id="@+id/content_pane"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_weight="1" />
     </LinearLayout>
 
-    <eu.faircode.email.NestedScrollViewEx
+    <androidx.core.widget.NestedScrollView
         android:id="@+id/drawer_container"
         android:layout_width="270dp"
         android:layout_height="match_parent"
@@ -43,5 +43,5 @@
             layout="@layout/include_nav"
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
-    </eu.faircode.email.NestedScrollViewEx>
+    </androidx.core.widget.NestedScrollView>
 </eu.faircode.email.DrawerLayoutEx>
diff --git a/app/src/main/res/layout/activity_view_portrait.xml b/app/src/main/res/layout/activity_view_portrait.xml
index b2d37c9b07..f885f4913a 100644
--- a/app/src/main/res/layout/activity_view_portrait.xml
+++ b/app/src/main/res/layout/activity_view_portrait.xml
@@ -5,12 +5,12 @@
     android:layout_height="match_parent"
     tools:context="eu.faircode.email.ActivityView">
 
-    <eu.faircode.email.FrameLayoutEx
+    <FrameLayout
         android:id="@+id/content_frame"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
-    <eu.faircode.email.NestedScrollViewEx
+    <androidx.core.widget.NestedScrollView
         android:id="@+id/drawer_container"
         android:layout_width="270dp"
         android:layout_height="match_parent"
@@ -22,5 +22,5 @@
             layout="@layout/include_nav"
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
-    </eu.faircode.email.NestedScrollViewEx>
+    </androidx.core.widget.NestedScrollView>
 </eu.faircode.email.DrawerLayoutEx>
diff --git a/app/src/main/res/layout/activity_view_portrait_split.xml b/app/src/main/res/layout/activity_view_portrait_split.xml
index 29847f799d..d9a0a98a74 100644
--- a/app/src/main/res/layout/activity_view_portrait_split.xml
+++ b/app/src/main/res/layout/activity_view_portrait_split.xml
@@ -12,7 +12,7 @@
         android:focusableInTouchMode="false"
         android:orientation="vertical">
 
-        <eu.faircode.email.FrameLayoutEx
+        <FrameLayout
             android:id="@+id/content_frame"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -25,14 +25,14 @@
             android:layout_marginVertical="1dp"
             android:background="?attr/colorSeparator" />
 
-        <eu.faircode.email.FrameLayoutEx
+        <FrameLayout
             android:id="@+id/content_pane"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_weight="1" />
     </LinearLayout>
 
-    <eu.faircode.email.NestedScrollViewEx
+    <androidx.core.widget.NestedScrollView
         android:id="@+id/drawer_container"
         android:layout_width="270dp"
         android:layout_height="match_parent"
@@ -44,5 +44,5 @@
             layout="@layout/include_nav"
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
-    </eu.faircode.email.NestedScrollViewEx>
+    </androidx.core.widget.NestedScrollView>
 </eu.faircode.email.DrawerLayoutEx>
diff --git a/app/src/main/res/layout/activity_widget.xml b/app/src/main/res/layout/activity_widget.xml
index 1f3bb0c547..13c5a990e9 100644
--- a/app/src/main/res/layout/activity_widget.xml
+++ b/app/src/main/res/layout/activity_widget.xml
@@ -8,11 +8,11 @@
     android:scrollbarStyle="outsideOverlay"
     tools:context="eu.faircode.email.ActivityWidget">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvAccount"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -65,7 +65,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbSemiTransparent" />
 
-        <eu.faircode.email.ConstraintLayoutEx
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/clLayout"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -110,7 +110,7 @@
                 app:layout_constraintEnd_toEndOf="@id/inNew"
                 app:layout_constraintStart_toStartOf="@+id/inNew"
                 app:layout_constraintTop_toBottomOf="@id/inNew" />
-        </eu.faircode.email.ConstraintLayoutEx>
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
         <Button
             android:id="@+id/btnSave"
@@ -139,5 +139,5 @@
             android:layout_width="0dp"
             android:layout_height="0dp"
             app:constraint_referenced_ids="tvAccount,spAccount,cbSemiTransparent,btnColor,clLayout,btnSave" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
\ 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 6a7749fb04..181f7c2991 100644
--- a/app/src/main/res/layout/activity_widget_sync.xml
+++ b/app/src/main/res/layout/activity_widget_sync.xml
@@ -8,7 +8,7 @@
     android:scrollbarStyle="outsideOverlay"
     tools:context="eu.faircode.email.ActivityWidgetSync">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
@@ -59,5 +59,5 @@
             android:text="@string/title_save"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/btnColor" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
\ 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 daf3532de4..58c66bf0cc 100644
--- a/app/src/main/res/layout/activity_widget_unified.xml
+++ b/app/src/main/res/layout/activity_widget_unified.xml
@@ -8,11 +8,11 @@
     android:scrollbarStyle="outsideOverlay"
     tools:context="eu.faircode.email.ActivityWidgetUnified">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvAccount"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -29,7 +29,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvAccount" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvFolder"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -133,7 +133,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/btnColor" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvFontSize"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -151,7 +151,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvFontSize" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvPadding"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -230,5 +230,5 @@
         cbUnseen,cbFlagged,
         cbSemiTransparent,btnColor,
         tvFontSize,spFontSize,tvPadding,spPadding,btnSave" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
\ 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 51721314df..ba29f48364 100644
--- a/app/src/main/res/layout/dialog_add_image.xml
+++ b/app/src/main/res/layout/dialog_add_image.xml
@@ -6,11 +6,11 @@
     android:padding="24dp"
     android:scrollbarStyle="outsideOverlay">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvTitle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -21,7 +21,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivType"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -70,7 +70,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/rgAction" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibResize"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -94,7 +94,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbResize" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvResize"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -114,7 +114,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/spResize" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvPrivacy"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -135,7 +135,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvPrivacy" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvNotAgain"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -145,5 +145,5 @@
             android:textStyle="italic"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbNotAgain" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_advanced.xml b/app/src/main/res/layout/dialog_advanced.xml
index a01c53175e..1bebec7947 100644
--- a/app/src/main/res/layout/dialog_advanced.xml
+++ b/app/src/main/res/layout/dialog_advanced.xml
@@ -7,11 +7,11 @@
     android:padding="24dp"
     android:scrollbarStyle="outsideOverlay">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvCaption"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -26,7 +26,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvMessage"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -37,7 +37,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvCaption" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvRemark"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -48,7 +48,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvMessage" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvSetup"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -58,5 +58,5 @@
             android:textColor="?android:attr/textColorPrimary"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvRemark" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_ask_again.xml b/app/src/main/res/layout/dialog_ask_again.xml
index e2aee37d92..0728afd610 100644
--- a/app/src/main/res/layout/dialog_ask_again.xml
+++ b/app/src/main/res/layout/dialog_ask_again.xml
@@ -6,11 +6,11 @@
     android:padding="24dp"
     android:scrollbarStyle="outsideOverlay">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvMessage"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -22,7 +22,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibInfo"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -43,7 +43,7 @@
             app:barrierDirection="bottom"
             app:constraint_referenced_ids="tvMessage,ibInfo" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvRemark"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -65,7 +65,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvRemark" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvAccept"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -77,5 +77,5 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbNotAgain" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
\ 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 dc786a1c54..3dccf462ab 100644
--- a/app/src/main/res/layout/dialog_ask_amp.xml
+++ b/app/src/main/res/layout/dialog_ask_amp.xml
@@ -6,11 +6,11 @@
     android:padding="24dp"
     android:scrollbarStyle="outsideOverlay">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvMessage"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -25,7 +25,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvRemark"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -49,5 +49,5 @@
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvRemark" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
\ 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 08f01b7db0..57fa37c093 100644
--- a/app/src/main/res/layout/dialog_ask_full.xml
+++ b/app/src/main/res/layout/dialog_ask_full.xml
@@ -6,11 +6,11 @@
     android:padding="24dp"
     android:scrollbarStyle="outsideOverlay">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvMessage"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -22,7 +22,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvRemark"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -43,5 +43,5 @@
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvRemark" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
\ 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 28c4318658..1401394dd5 100644
--- a/app/src/main/res/layout/dialog_ask_move.xml
+++ b/app/src/main/res/layout/dialog_ask_move.xml
@@ -6,11 +6,11 @@
     android:padding="24dp"
     android:scrollbarStyle="outsideOverlay">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvMessages"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -22,7 +22,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvSourceFolders"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -38,7 +38,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvMessages" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivArrow"
             android:layout_width="48dp"
             android:layout_height="48dp"
@@ -50,7 +50,7 @@
             app:srcCompat="@drawable/baseline_arrow_downward_24"
             app:tint="?android:attr/textColorSecondary" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvTargetFolders"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -78,7 +78,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvTargetFolders" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvJunkLearn"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -89,5 +89,5 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/cbNotAgain" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
\ 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 3e33bb42db..edb000f7a8 100644
--- a/app/src/main/res/layout/dialog_ask_spam.xml
+++ b/app/src/main/res/layout/dialog_ask_spam.xml
@@ -6,11 +6,11 @@
     android:padding="24dp"
     android:scrollbarStyle="outsideOverlay">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvMessage"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -34,5 +34,5 @@
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvMessage" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
\ 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 75f25c4916..4838fe37b2 100644
--- a/app/src/main/res/layout/dialog_block_sender.xml
+++ b/app/src/main/res/layout/dialog_block_sender.xml
@@ -6,11 +6,11 @@
     android:padding="24dp"
     android:scrollbarStyle="outsideOverlay">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvMessage"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -22,7 +22,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvJunkHint"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -38,7 +38,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/tvMessage" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvPopHint"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -49,5 +49,5 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/tvJunkHint" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
diff --git a/app/src/main/res/layout/dialog_boundary_error.xml b/app/src/main/res/layout/dialog_boundary_error.xml
index f06298b837..58c7d392a5 100644
--- a/app/src/main/res/layout/dialog_boundary_error.xml
+++ b/app/src/main/res/layout/dialog_boundary_error.xml
@@ -6,11 +6,11 @@
     android:padding="24dp"
     android:scrollbarStyle="outsideOverlay">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvMessage"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -20,7 +20,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvError"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -33,5 +33,5 @@
             android:textColor="?android:attr/textColorPrimary"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvMessage" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
\ 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 7ad219fdf2..7b08d89856 100644
--- a/app/src/main/res/layout/dialog_buttons.xml
+++ b/app/src/main/res/layout/dialog_buttons.xml
@@ -7,11 +7,11 @@
     android:padding="24dp"
     android:scrollbarStyle="outsideOverlay">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvTitle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -21,7 +21,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvHint"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -303,5 +303,5 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbHeaders" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_certificate.xml b/app/src/main/res/layout/dialog_certificate.xml
index 08e28e0502..f2a3547e29 100644
--- a/app/src/main/res/layout/dialog_certificate.xml
+++ b/app/src/main/res/layout/dialog_certificate.xml
@@ -6,11 +6,11 @@
     android:padding="24dp"
     android:scrollbarStyle="outsideOverlay">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvCaption"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -21,7 +21,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvCertificateInvalid"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -32,7 +32,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvCaption" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvCertificateReason"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -41,7 +41,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvCertificateInvalid" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvSenderTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -51,7 +51,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvCertificateReason" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvSender"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -60,7 +60,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvSenderTitle" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvEmailTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -70,7 +70,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvSender" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvEmail"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -79,7 +79,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvEmailTitle" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvEmailInvalid"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -90,7 +90,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvEmail" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvSubjectTitle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -102,7 +102,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvEmailInvalid" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibInfo"
             android:layout_width="24dp"
             android:layout_height="24dp"
@@ -114,7 +114,7 @@
             app:srcCompat="@drawable/twotone_info_24"
             app:tint="?attr/colorAccent" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvSubject"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -123,7 +123,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvSubjectTitle" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvValidityTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -133,7 +133,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvSubject" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvAfter"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -143,7 +143,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/tvValidityTitle" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvBefore"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -154,7 +154,7 @@
             app:layout_constraintStart_toEndOf="@id/tvAfter"
             app:layout_constraintTop_toBottomOf="@+id/tvValidityTitle" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvExpired"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -165,7 +165,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvAfter" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvAlgorithmTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -175,7 +175,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvExpired" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvAlgorithm"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -183,5 +183,5 @@
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvAlgorithmTitle" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
\ 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 72ccb6c240..6bd6b19269 100644
--- a/app/src/main/res/layout/dialog_contact_group.xml
+++ b/app/src/main/res/layout/dialog_contact_group.xml
@@ -6,11 +6,11 @@
     android:padding="24dp"
     android:scrollbarStyle="outsideOverlay">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvGroup"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -22,7 +22,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibInfo"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -64,5 +64,5 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/spGroup" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
diff --git a/app/src/main/res/layout/dialog_deepl.xml b/app/src/main/res/layout/dialog_deepl.xml
index 9d5c7b8cca..1f1265af9d 100644
--- a/app/src/main/res/layout/dialog_deepl.xml
+++ b/app/src/main/res/layout/dialog_deepl.xml
@@ -6,11 +6,11 @@
     android:padding="24dp"
     android:scrollbarStyle="outsideOverlay">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvDeepL"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -23,7 +23,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibInfo"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -71,7 +71,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbPro" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvFormal"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -100,7 +100,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbSmall" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvHtml"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -111,7 +111,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbHtml" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvUsage"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -121,7 +121,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvHtml" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvPrivacy"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -134,5 +134,5 @@
             android:textColor="?android:attr/textColorLink"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvUsage" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
diff --git a/app/src/main/res/layout/dialog_delete_operations.xml b/app/src/main/res/layout/dialog_delete_operations.xml
index 684447fabb..5752598c35 100644
--- a/app/src/main/res/layout/dialog_delete_operations.xml
+++ b/app/src/main/res/layout/dialog_delete_operations.xml
@@ -6,11 +6,11 @@
     android:padding="24dp"
     android:scrollbarStyle="outsideOverlay">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvAddImage"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -43,7 +43,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbError" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvFetch"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -65,7 +65,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvFetch" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvMove"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -86,7 +86,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvMove" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvFlag"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -108,7 +108,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvFlag" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvDelete"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -119,5 +119,5 @@
             android:textSize="12sp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbDelete" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_duration.xml b/app/src/main/res/layout/dialog_duration.xml
index ffc4d5c39c..2fab95b48e 100644
--- a/app/src/main/res/layout/dialog_duration.xml
+++ b/app/src/main/res/layout/dialog_duration.xml
@@ -7,11 +7,11 @@
     android:padding="24dp"
     android:scrollbarStyle="outsideOverlay">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvDuration"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -75,5 +75,5 @@
             app:layout_constraintHeight_max="180dp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/timePicker" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_edit_contact.xml b/app/src/main/res/layout/dialog_edit_contact.xml
index 1d6412dec3..d59f6954f9 100644
--- a/app/src/main/res/layout/dialog_edit_contact.xml
+++ b/app/src/main/res/layout/dialog_edit_contact.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ConstraintLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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"
     android:padding="24dp">
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvCaption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -69,4 +69,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/etName" />
-</eu.faircode.email.ConstraintLayoutEx>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_edit_name.xml b/app/src/main/res/layout/dialog_edit_name.xml
index 395691177a..d0a73fec1f 100644
--- a/app/src/main/res/layout/dialog_edit_name.xml
+++ b/app/src/main/res/layout/dialog_edit_name.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ConstraintLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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"
     android:padding="24dp">
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvName"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -43,4 +43,4 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/etName" />
 
-</eu.faircode.email.ConstraintLayoutEx>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ 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 9f760f8bac..5e1d1f6984 100644
--- a/app/src/main/res/layout/dialog_error_reporting.xml
+++ b/app/src/main/res/layout/dialog_error_reporting.xml
@@ -6,11 +6,11 @@
     android:padding="24dp"
     android:scrollbarStyle="outsideOverlay">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvMessage"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -22,7 +22,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvExplanation"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -45,7 +45,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvExplanation" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivExternal"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -54,5 +54,5 @@
             app:layout_constraintStart_toEndOf="@id/btnInfo"
             app:layout_constraintTop_toTopOf="@id/btnInfo"
             app:srcCompat="@drawable/twotone_open_in_new_24" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
\ 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 2684c4e330..b5129f6131 100644
--- a/app/src/main/res/layout/dialog_export.xml
+++ b/app/src/main/res/layout/dialog_export.xml
@@ -7,11 +7,11 @@
     android:padding="24dp"
     android:scrollbarStyle="outsideOverlay">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvCaption"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -64,7 +64,7 @@
                 android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
         </com.google.android.material.textfield.TextInputLayout>
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvExportHint"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -75,7 +75,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tilPassword2" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvEncrypted"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -85,5 +85,5 @@
             android:textStyle="italic"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvExportHint" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_first.xml b/app/src/main/res/layout/dialog_first.xml
index c51b6e5d88..f601927b7a 100644
--- a/app/src/main/res/layout/dialog_first.xml
+++ b/app/src/main/res/layout/dialog_first.xml
@@ -7,11 +7,11 @@
     android:padding="24dp"
     android:scrollbarStyle="outsideOverlay">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvImportant"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -24,7 +24,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvSync"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -35,7 +35,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvImportant" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvSyncNote"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -46,7 +46,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvSync" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvBattery"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -57,7 +57,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvSyncNote" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibBatteryInfo"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -71,7 +71,7 @@
             app:srcCompat="@drawable/twotone_info_24"
             app:tint="?attr/colorAccent" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvReformat"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -82,7 +82,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/ibBatteryInfo" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibReformatInfo"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -96,7 +96,7 @@
             app:srcCompat="@drawable/twotone_info_24"
             app:tint="?attr/colorAccent" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvDesign"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -107,7 +107,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/ibReformatInfo" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvJunk"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -117,5 +117,5 @@
             android:textColor="?android:attr/textColorPrimary"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvDesign" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_folder_all.xml b/app/src/main/res/layout/dialog_folder_all.xml
index 6cbc3c8fa9..9a3d247dca 100644
--- a/app/src/main/res/layout/dialog_folder_all.xml
+++ b/app/src/main/res/layout/dialog_folder_all.xml
@@ -6,11 +6,11 @@
     android:padding="24dp"
     android:scrollbarStyle="outsideOverlay">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvCaption"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -21,7 +21,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvUser"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -33,7 +33,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvCaption" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvSynchronize"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -79,7 +79,7 @@
                 android:textAppearance="@style/TextAppearance.AppCompat.Small" />
         </RadioGroup>
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvSyncDays"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -101,7 +101,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvSyncDays" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvKeepDays"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -131,7 +131,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/etKeepDays" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvAdvanced"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -158,5 +158,5 @@
             android:text="@string/title_poll_user"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbPollSystem" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_folder_select.xml b/app/src/main/res/layout/dialog_folder_select.xml
index 9b9e02ffd7..efa749ffc9 100644
--- a/app/src/main/res/layout/dialog_folder_select.xml
+++ b/app/src/main/res/layout/dialog_folder_select.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ConstraintLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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"
@@ -18,7 +18,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <eu.faircode.email.FixedImageButton
+    <ImageButton
         android:id="@+id/ibNext"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -29,7 +29,7 @@
         app:layout_constraintTop_toTopOf="@+id/etSearch"
         app:srcCompat="@drawable/twotone_fast_forward_24" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvNoFolder"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -94,7 +94,7 @@
         app:layout_constraintStart_toEndOf="@id/btnFavorite2"
         app:layout_constraintTop_toBottomOf="@id/tvNoFolder" />
 
-    <eu.faircode.email.FixedImageButton
+    <ImageButton
         android:id="@+id/ibResetFavorites"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -140,4 +140,4 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:constraint_referenced_ids="etSearch,ibNext,rvFolder" />
-</eu.faircode.email.ConstraintLayoutEx>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ 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 c4f3416292..83fdc114b5 100644
--- a/app/src/main/res/layout/dialog_forward_raw.xml
+++ b/app/src/main/res/layout/dialog_forward_raw.xml
@@ -7,11 +7,11 @@
     android:padding="24dp"
     android:scrollbarStyle="outsideOverlay">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -22,7 +22,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvRemark"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -33,7 +33,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvTitle" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvOption"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -57,7 +57,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvOption" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvRemaining"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -68,7 +68,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/pbDownloaded" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvNoInternet"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -91,5 +91,5 @@
             android:text="@string/title_auto_confirm"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvNoInternet" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
diff --git a/app/src/main/res/layout/dialog_identity.xml b/app/src/main/res/layout/dialog_identity.xml
index ac67ee2d14..a2210a5d77 100644
--- a/app/src/main/res/layout/dialog_identity.xml
+++ b/app/src/main/res/layout/dialog_identity.xml
@@ -6,11 +6,11 @@
     android:padding="24dp"
     android:scrollbarStyle="outsideOverlay">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvIdentity"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -41,7 +41,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/pbWait" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvPrimaryHint"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -65,7 +65,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvPrimaryHint" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvNoIdentities"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -98,5 +98,5 @@
             android:layout_width="0dp"
             android:layout_height="0dp"
             app:constraint_referenced_ids="tvNoIdentities,btnFix" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
\ 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 f09846112d..2d57c3593a 100644
--- a/app/src/main/res/layout/dialog_import.xml
+++ b/app/src/main/res/layout/dialog_import.xml
@@ -7,11 +7,11 @@
     android:padding="24dp"
     android:scrollbarStyle="outsideOverlay">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvCaption"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -55,7 +55,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tilPassword1" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvImportHint"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -121,5 +121,5 @@
             android:text="@string/title_setup_import_settings"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbAnswers" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
\ 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 601877db59..9556ccacc8 100644
--- a/app/src/main/res/layout/dialog_import_progress.xml
+++ b/app/src/main/res/layout/dialog_import_progress.xml
@@ -6,11 +6,11 @@
     android:padding="24dp"
     android:scrollbarStyle="outsideOverlay">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvCaption"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -21,7 +21,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvLog"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -32,5 +32,5 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvCaption" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
diff --git a/app/src/main/res/layout/dialog_insert_link.xml b/app/src/main/res/layout/dialog_insert_link.xml
index 03675075e1..50e8759098 100644
--- a/app/src/main/res/layout/dialog_insert_link.xml
+++ b/app/src/main/res/layout/dialog_insert_link.xml
@@ -6,11 +6,11 @@
     android:padding="24dp"
     android:scrollbarStyle="outsideOverlay">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvInsertLink"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -22,7 +22,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvUrl"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -47,7 +47,7 @@
             <requestFocus />
         </eu.faircode.email.EditTextPlain>
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvInsecure"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -59,7 +59,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/etLink" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -104,7 +104,7 @@
             app:layout_constraintStart_toEndOf="@id/btnMetadata"
             app:layout_constraintTop_toTopOf="@id/btnMetadata" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvMetadataRemark"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -115,5 +115,5 @@
             android:textStyle="italic"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/btnMetadata" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_junk.xml b/app/src/main/res/layout/dialog_junk.xml
index 67e041464f..fbfa6050c9 100644
--- a/app/src/main/res/layout/dialog_junk.xml
+++ b/app/src/main/res/layout/dialog_junk.xml
@@ -6,11 +6,11 @@
     android:padding="24dp"
     android:scrollbarStyle="outsideOverlay">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvMessage"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -22,7 +22,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvJunkHint"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -59,7 +59,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbBlockSender" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvBlockDomainHint"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -70,7 +70,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/cbBlockDomain" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibMore"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -81,7 +81,7 @@
             app:layout_constraintTop_toBottomOf="@id/tvBlockDomainHint"
             app:srcCompat="@drawable/expander" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvMore"
             android:layout_width="0dp"
             android:layout_height="0dp"
@@ -105,7 +105,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvMore" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvJunkFilterHint"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -118,7 +118,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbJunkFilter" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibInfoFilter"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -143,7 +143,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvJunkFilterHint" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvBlocklist"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -155,7 +155,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbBlocklist" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvBlocklistHint"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -168,7 +168,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvBlocklist" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibInfoBlocklist"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -194,7 +194,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvBlocklistHint" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibRules"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -208,7 +208,7 @@
             app:layout_constraintTop_toTopOf="@id/btnClear"
             app:srcCompat="@drawable/twotone_filter_alt_24" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibManage"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -222,7 +222,7 @@
             app:layout_constraintTop_toTopOf="@id/btnClear"
             app:srcCompat="@drawable/twotone_person_off_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvClearHint"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -256,5 +256,5 @@
             android:layout_height="0dp"
             app:constraint_referenced_ids="
             btnClear,ibRules,ibManage,tvClearHint" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
diff --git a/app/src/main/res/layout/dialog_keyword_add.xml b/app/src/main/res/layout/dialog_keyword_add.xml
index b7ef341ed5..3080d9692c 100644
--- a/app/src/main/res/layout/dialog_keyword_add.xml
+++ b/app/src/main/res/layout/dialog_keyword_add.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ConstraintLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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"
     android:padding="24dp">
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvKeyword"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -32,4 +32,4 @@
 
         <requestFocus />
     </eu.faircode.email.EditTextPlain>
-</eu.faircode.email.ConstraintLayoutEx>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_keyword_manage.xml b/app/src/main/res/layout/dialog_keyword_manage.xml
index de2f10dd4e..cc0000241b 100644
--- a/app/src/main/res/layout/dialog_keyword_manage.xml
+++ b/app/src/main/res/layout/dialog_keyword_manage.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ConstraintLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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"
@@ -45,4 +45,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
-</eu.faircode.email.ConstraintLayoutEx>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_markdown.xml b/app/src/main/res/layout/dialog_markdown.xml
index aaacde5692..94f2e1c822 100644
--- a/app/src/main/res/layout/dialog_markdown.xml
+++ b/app/src/main/res/layout/dialog_markdown.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ConstraintLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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"
@@ -18,11 +18,11 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        <eu.faircode.email.ConstraintLayoutEx
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
-            <eu.faircode.email.FixedTextView
+            <TextView
                 android:id="@+id/tvMarkdown"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -31,10 +31,10 @@
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
-        </eu.faircode.email.ConstraintLayoutEx>
+        </androidx.constraintlayout.widget.ConstraintLayout>
     </eu.faircode.email.ScrollViewEx>
 
-    <eu.faircode.email.FixedImageButton
+    <ImageButton
         android:id="@+id/ibCancel"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -63,4 +63,4 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:constraint_referenced_ids="scroll,ibCancel" />
-</eu.faircode.email.ConstraintLayoutEx>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_nav_options.xml b/app/src/main/res/layout/dialog_nav_options.xml
index e8ace9b725..3add9f36b4 100644
--- a/app/src/main/res/layout/dialog_nav_options.xml
+++ b/app/src/main/res/layout/dialog_nav_options.xml
@@ -6,11 +6,11 @@
     android:padding="24dp"
     android:scrollbarStyle="outsideOverlay">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -23,7 +23,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivExpanderNav"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -33,7 +33,7 @@
             app:layout_constraintTop_toBottomOf="@id/tvTitle"
             app:srcCompat="@drawable/expander_hor" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivPin"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -43,7 +43,7 @@
             app:layout_constraintTop_toBottomOf="@id/tvTitle"
             app:srcCompat="@drawable/pin" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivHide"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -53,7 +53,7 @@
             app:layout_constraintTop_toBottomOf="@id/tvTitle"
             app:srcCompat="@drawable/twotone_visibility_off_24" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivSettings"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -63,7 +63,7 @@
             app:layout_constraintTop_toBottomOf="@id/tvTitle"
             app:srcCompat="@drawable/twotone_settings_24" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivFetchMore"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -73,7 +73,7 @@
             app:layout_constraintTop_toBottomOf="@id/tvTitle"
             app:srcCompat="@drawable/twotone_get_app_24" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivSync"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -93,7 +93,7 @@
             app:layout_constraintStart_toStartOf="@id/ivExpanderNav"
             app:layout_constraintTop_toTopOf="@id/ivExpanderNav" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tMessage"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -103,5 +103,5 @@
             android:textStyle="italic"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/ivExpanderNav" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
\ 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 8596100bf5..b729a94c8a 100644
--- a/app/src/main/res/layout/dialog_no_stream.xml
+++ b/app/src/main/res/layout/dialog_no_stream.xml
@@ -6,11 +6,11 @@
     android:padding="24dp"
     android:scrollbarStyle="outsideOverlay">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvCaption"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -24,7 +24,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvUri"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -35,7 +35,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvCaption" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvExplanation"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -47,7 +47,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvUri" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibInfo"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -57,5 +57,5 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvExplanation"
             app:srcCompat="@drawable/twotone_info_24" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
\ 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 07379bb150..cfd368603b 100644
--- a/app/src/main/res/layout/dialog_no_viewer.xml
+++ b/app/src/main/res/layout/dialog_no_viewer.xml
@@ -6,11 +6,11 @@
     android:padding="24dp"
     android:scrollbarStyle="outsideOverlay">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvCaption"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -24,7 +24,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvNameTitle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -35,7 +35,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/tvCaption" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvName"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -46,7 +46,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvNameTitle" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvFullName"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -57,7 +57,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvName" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvTypeTitle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -68,7 +68,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/tvFullName" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvType"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -79,7 +79,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvTypeTitle" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvException"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -90,5 +90,5 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/tvType" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
\ 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 d350611ba2..764ce9bafa 100644
--- a/app/src/main/res/layout/dialog_notes.xml
+++ b/app/src/main/res/layout/dialog_notes.xml
@@ -6,11 +6,11 @@
     android:padding="24dp"
     android:scrollbarStyle="outsideOverlay">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvNotes"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -38,7 +38,7 @@
             <requestFocus />
         </eu.faircode.email.EditTextPlain>
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvColor"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -58,5 +58,5 @@
             android:text="@string/title_select"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvColor" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
\ 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 118663d91c..503aa7b0b3 100644
--- a/app/src/main/res/layout/dialog_open_link.xml
+++ b/app/src/main/res/layout/dialog_open_link.xml
@@ -6,11 +6,11 @@
     android:padding="24dp"
     android:scrollbarStyle="outsideOverlay">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvCaption"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -20,7 +20,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibInfo"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -34,7 +34,7 @@
             app:srcCompat="@drawable/twotone_info_24"
             app:tint="?attr/colorAccent" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvTitle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -48,7 +48,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvCaption" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibDifferent"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -71,7 +71,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvTitle" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvLink"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -85,7 +85,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/etLink" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibSearch"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -97,7 +97,7 @@
             app:layout_constraintTop_toBottomOf="@id/tvLink"
             app:srcCompat="@drawable/twotone_search_24" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibShare"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -109,7 +109,7 @@
             app:layout_constraintTop_toBottomOf="@id/tvLink"
             app:srcCompat="@drawable/twotone_share_24" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibCopy"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -120,7 +120,7 @@
             app:layout_constraintTop_toBottomOf="@id/tvLink"
             app:srcCompat="@drawable/twotone_file_copy_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvDifferent"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -132,7 +132,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/ibCopy" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvSuspicious"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -144,7 +144,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvDifferent" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvDisconnect"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -156,7 +156,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvSuspicious" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvDisconnectCategories"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -197,7 +197,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbSanitize" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibMore"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -208,7 +208,7 @@
             app:layout_constraintTop_toBottomOf="@id/cbNotAgain"
             app:srcCompat="@drawable/expander" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvMore"
             android:layout_width="0dp"
             android:layout_height="0dp"
@@ -244,7 +244,7 @@
             app:layout_constraintStart_toEndOf="@id/btnOwner"
             app:layout_constraintTop_toTopOf="@id/btnOwner" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvOwnerRemark"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -254,7 +254,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/btnOwner" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvOwnerTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -264,7 +264,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvOwnerRemark" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvHost"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -275,7 +275,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvOwnerTitle" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvOwner"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -310,7 +310,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/btnSettings" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvReset"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -337,5 +337,5 @@
             android:layout_width="0dp"
             android:layout_height="0dp"
             app:constraint_referenced_ids="tvOwnerTitle,tvHost,tvOwner" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
\ 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 e3d6dd6171..01fa87b524 100644
--- a/app/src/main/res/layout/dialog_permissions.xml
+++ b/app/src/main/res/layout/dialog_permissions.xml
@@ -6,11 +6,11 @@
     android:padding="24dp"
     android:scrollbarStyle="outsideOverlay">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvMessage"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -21,7 +21,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/two"
             android:layout_width="30dp"
             android:layout_height="30dp"
@@ -31,7 +31,7 @@
             app:layout_constraintTop_toBottomOf="@id/tvMessage"
             app:srcCompat="@drawable/twotone_looks_two_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/title2"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -45,7 +45,7 @@
             app:layout_constraintStart_toEndOf="@id/two"
             app:layout_constraintTop_toTopOf="@id/two" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvContactPermissions"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -55,7 +55,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/title2" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvNotificationPermissions"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -65,7 +65,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvContactPermissions" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/three"
             android:layout_width="30dp"
             android:layout_height="30dp"
@@ -75,7 +75,7 @@
             app:layout_constraintTop_toBottomOf="@id/tvNotificationPermissions"
             app:srcCompat="@drawable/twotone_looks_3_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/title3"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -89,7 +89,7 @@
             app:layout_constraintStart_toEndOf="@id/three"
             app:layout_constraintTop_toTopOf="@+id/three" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvDoze"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -99,7 +99,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/title3" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvDozeDevice"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -114,7 +114,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvDoze" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvDozeAndroid12"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -150,5 +150,5 @@
             android:layout_width="0dp"
             android:layout_height="0dp"
             app:constraint_referenced_ids="three,title3,tvDoze" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_pin_ask.xml b/app/src/main/res/layout/dialog_pin_ask.xml
index e165ce2d45..71c048d132 100644
--- a/app/src/main/res/layout/dialog_pin_ask.xml
+++ b/app/src/main/res/layout/dialog_pin_ask.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ConstraintLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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"
     android:padding="24dp">
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvCaption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -32,4 +32,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/tvCaption" />
-</eu.faircode.email.ConstraintLayoutEx>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_pin_set.xml b/app/src/main/res/layout/dialog_pin_set.xml
index 9685889dc5..3d53476d28 100644
--- a/app/src/main/res/layout/dialog_pin_set.xml
+++ b/app/src/main/res/layout/dialog_pin_set.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ConstraintLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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"
     android:padding="24dp">
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvCaption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -29,4 +29,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/tvCaption" />
-</eu.faircode.email.ConstraintLayoutEx>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ 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 bc7c8bf226..f31f29bec1 100644
--- a/app/src/main/res/layout/dialog_print.xml
+++ b/app/src/main/res/layout/dialog_print.xml
@@ -6,11 +6,11 @@
     android:padding="24dp"
     android:scrollbarStyle="outsideOverlay">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvMessage"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -22,7 +22,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvHtmlRemark"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -53,7 +53,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbHeader" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvImagesRemark"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -73,5 +73,5 @@
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvImagesRemark" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
\ 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 c76df68c41..14cc57d688 100644
--- a/app/src/main/res/layout/dialog_quick_actions.xml
+++ b/app/src/main/res/layout/dialog_quick_actions.xml
@@ -7,11 +7,11 @@
     android:padding="24dp"
     android:scrollbarStyle="outsideOverlay">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvTitle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -21,7 +21,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvHint"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -199,5 +199,5 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbDelete" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
diff --git a/app/src/main/res/layout/dialog_reset_questions.xml b/app/src/main/res/layout/dialog_reset_questions.xml
index 4b09d44538..c3d3bdd0f1 100644
--- a/app/src/main/res/layout/dialog_reset_questions.xml
+++ b/app/src/main/res/layout/dialog_reset_questions.xml
@@ -6,11 +6,11 @@
     android:padding="24dp"
     android:scrollbarStyle="outsideOverlay">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvAddImage"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -61,5 +61,5 @@
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbImages" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_response.xml b/app/src/main/res/layout/dialog_response.xml
index 2644e15426..92be77a8af 100644
--- a/app/src/main/res/layout/dialog_response.xml
+++ b/app/src/main/res/layout/dialog_response.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ConstraintLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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"
     android:padding="24dp">
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvCaption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -32,4 +32,4 @@
 
         <requestFocus />
     </eu.faircode.email.EditTextPlain>
-</eu.faircode.email.ConstraintLayoutEx>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ 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 3fc6633603..21601ee3b9 100644
--- a/app/src/main/res/layout/dialog_review.xml
+++ b/app/src/main/res/layout/dialog_review.xml
@@ -6,11 +6,11 @@
     android:padding="24dp"
     android:scrollbarStyle="outsideOverlay">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvMessage"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -22,7 +22,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvExplanation"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -33,7 +33,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvMessage" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvHelp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -48,7 +48,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvExplanation" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvOnce"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -61,5 +61,5 @@
             android:textStyle="italic"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvHelp" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_review_account.xml b/app/src/main/res/layout/dialog_review_account.xml
index 13601d2d5d..c75ff98787 100644
--- a/app/src/main/res/layout/dialog_review_account.xml
+++ b/app/src/main/res/layout/dialog_review_account.xml
@@ -6,11 +6,11 @@
     android:padding="24dp"
     android:scrollbarStyle="outsideOverlay">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvName"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -24,7 +24,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibEditName"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -36,7 +36,7 @@
             app:layout_constraintTop_toTopOf="@+id/tvName"
             app:srcCompat="@drawable/twotone_edit_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvSuccess"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -47,7 +47,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/tvName" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvInbox"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -60,7 +60,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/tvSuccess" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvDrafts"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -73,7 +73,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/tvInbox" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvSent"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -86,7 +86,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/tvDrafts" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvSentWarning"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -98,7 +98,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvSent" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvTrash"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -111,7 +111,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/tvSentWarning" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvJunk"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -124,7 +124,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/tvTrash" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvArchive"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -137,7 +137,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/tvJunk" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvLeftTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -147,7 +147,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@+id/tvLeft" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvRightTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -164,7 +164,7 @@
             app:barrierDirection="end"
             app:constraint_referenced_ids="tvLeftTitle,tvRightTitle" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvLeft"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -177,7 +177,7 @@
             app:layout_constraintStart_toEndOf="@id/barrier"
             app:layout_constraintTop_toBottomOf="@id/tvArchive" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvRight"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -203,7 +203,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvRight" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvAccount"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -225,5 +225,5 @@
             android:text="@string/title_disable_gmail"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvAccount" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_rule_match.xml b/app/src/main/res/layout/dialog_rule_match.xml
index f8000aebc8..a661e7ae9a 100644
--- a/app/src/main/res/layout/dialog_rule_match.xml
+++ b/app/src/main/res/layout/dialog_rule_match.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ConstraintLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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"
     android:padding="24dp">
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvNoMessages"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -53,4 +53,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
-</eu.faircode.email.ConstraintLayoutEx>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_save_search.xml b/app/src/main/res/layout/dialog_save_search.xml
index 5fc7e46a31..b7f1d4fd7a 100644
--- a/app/src/main/res/layout/dialog_save_search.xml
+++ b/app/src/main/res/layout/dialog_save_search.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ConstraintLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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"
     android:padding="24dp">
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvSearch"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -43,4 +43,4 @@
         android:text="@string/title_color"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/etName" />
-</eu.faircode.email.ConstraintLayoutEx>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/dialog_search.xml b/app/src/main/res/layout/dialog_search.xml
index 00d52691a3..5b75e4dc5e 100644
--- a/app/src/main/res/layout/dialog_search.xml
+++ b/app/src/main/res/layout/dialog_search.xml
@@ -8,11 +8,11 @@
     android:padding="24dp"
     android:scrollbarStyle="outsideOverlay">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvCaption"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -24,7 +24,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibInfo"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -52,7 +52,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/tvCaption" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibFlagged"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -64,7 +64,7 @@
             app:srcCompat="@drawable/twotone_star_24"
             tools:ignore="MissingConstraints" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibUnseen"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -76,7 +76,7 @@
             app:srcCompat="@drawable/twotone_mail_24"
             tools:ignore="MissingConstraints" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibInvite"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -88,7 +88,7 @@
             app:srcCompat="@drawable/twotone_event_24"
             tools:ignore="MissingConstraints" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibAttachment"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -100,7 +100,7 @@
             app:srcCompat="@drawable/twotone_attachment_24"
             tools:ignore="MissingConstraints" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibNotes"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -184,7 +184,7 @@
             app:layout_constraintStart_toEndOf="@id/btnSearch2"
             app:layout_constraintTop_toBottomOf="@id/etQuery" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibResetSearches"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -195,7 +195,7 @@
             app:layout_constraintTop_toTopOf="@id/btnSearch1"
             app:srcCompat="@drawable/twotone_cancel_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvHint"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -207,7 +207,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/btnSearch1" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibMore"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -218,7 +218,7 @@
             app:layout_constraintTop_toBottomOf="@id/tvHint"
             app:srcCompat="@drawable/expander" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvMore"
             android:layout_width="0dp"
             android:layout_height="0dp"
@@ -242,7 +242,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/ibMore" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvSearchIndexHint"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -313,7 +313,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbKeywords" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvSearchTextHint"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -325,7 +325,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbMessage" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvSearchTextUnsupported"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -395,7 +395,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbSearchTrash" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvAnd"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -460,7 +460,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbEncrypted" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvMessageSize"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -482,7 +482,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvMessageSize" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvSizeHint"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -519,7 +519,7 @@
             app:layout_constraintStart_toEndOf="@id/btnAfter"
             app:layout_constraintTop_toBottomOf="@id/tvSizeHint" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvAfter"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -530,7 +530,7 @@
             app:layout_constraintStart_toStartOf="@id/btnAfter"
             app:layout_constraintTop_toBottomOf="@id/btnAfter" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvBefore"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -560,5 +560,5 @@
             cbSearchIndex,tvSearchIndexHint,cbSenders,cbRecipients,cbSubject,cbKeywords,cbMessage,tvSearchTextHint,tvSearchTextUnsupported,cbNotes,
             tvAnd,cbUnseen,cbFlagged,cbHidden,cbEncrypted,cbAttachments,
             btnAfter,btnBefore,tvBefore,tvAfter,cbSearchDevice" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
diff --git a/app/src/main/res/layout/dialog_send.xml b/app/src/main/res/layout/dialog_send.xml
index dcc3c8e034..5b10c9aeda 100644
--- a/app/src/main/res/layout/dialog_send.xml
+++ b/app/src/main/res/layout/dialog_send.xml
@@ -7,11 +7,11 @@
     android:padding="24dp"
     android:scrollbarStyle="outsideOverlay">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvMessage"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -22,7 +22,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvSentMissing"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -49,7 +49,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvSentMissing" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvAddressError"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -64,7 +64,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/btnFixSent" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvRemindDsn"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -79,7 +79,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvAddressError" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvRemindSize"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -94,7 +94,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvRemindDsn" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvRemindPgp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -109,7 +109,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvRemindSize" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvRemindSmime"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -124,7 +124,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvRemindPgp" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvRemindTo"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -139,7 +139,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvRemindSmime" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvRemindExtra"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -153,7 +153,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvRemindTo" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvRemindNoReply"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -167,7 +167,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvRemindExtra" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvRemindExternal"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -181,7 +181,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvRemindNoReply" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvRemindSubject"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -195,7 +195,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvRemindExternal" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvRemindText"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -209,7 +209,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvRemindSubject" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvRemindAttachment"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -235,7 +235,7 @@
             app:layout_constraintTop_toBottomOf="@id/tvRemindAttachment"
             app:switchPadding="12dp" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvSendRemindersHint"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -245,7 +245,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/swSendReminders" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvToTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -255,7 +255,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvSendRemindersHint" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvTo"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -267,7 +267,7 @@
             app:layout_constraintStart_toEndOf="@+id/tvToTitle"
             app:layout_constraintTop_toTopOf="@+id/tvToTitle" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvViaTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -277,7 +277,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvTo" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvVia"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -299,7 +299,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvVia" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvPlainHint"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -323,7 +323,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvPlainHint" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvReceiptHint"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -333,7 +333,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbReceipt" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvEncrypt"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -355,7 +355,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvEncrypt" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibEncryption"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -369,7 +369,7 @@
             app:srcCompat="@drawable/twotone_info_24"
             app:tint="?attr/colorAccent" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvPriority"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -391,7 +391,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvPriority" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvSensitivity"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -413,7 +413,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvSensitivity" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibSensitivity"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -427,7 +427,7 @@
             app:srcCompat="@drawable/twotone_info_24"
             app:tint="?attr/colorAccent" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvSendTitle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -439,7 +439,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/spSensitivity" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvSendAt"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -453,7 +453,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvSendTitle" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibSendAt"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -485,7 +485,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbArchive" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvNotAgain"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -512,5 +512,5 @@
             tvEncrypt,spEncrypt,ibEncryption,
             tvPriority,spPriority,
             tvSensitivity,spSensitivity,ibSensitivity" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_show_full.xml b/app/src/main/res/layout/dialog_show_full.xml
index 65c6d3e2e7..f432b3267c 100644
--- a/app/src/main/res/layout/dialog_show_full.xml
+++ b/app/src/main/res/layout/dialog_show_full.xml
@@ -6,11 +6,11 @@
     android:padding="24dp"
     android:scrollbarStyle="outsideOverlay">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvMessage"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -20,7 +20,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvDark"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -72,5 +72,5 @@
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbNotAgainDomain" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_show_images.xml b/app/src/main/res/layout/dialog_show_images.xml
index 3e91f9e706..bbbda53778 100644
--- a/app/src/main/res/layout/dialog_show_images.xml
+++ b/app/src/main/res/layout/dialog_show_images.xml
@@ -6,11 +6,11 @@
     android:padding="24dp"
     android:scrollbarStyle="outsideOverlay">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvMessage"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -20,7 +20,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivTracking"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -30,7 +30,7 @@
             app:srcCompat="@drawable/twotone_my_location_24"
             app:tint="?attr/colorWarning" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvTracking"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -83,5 +83,5 @@
             android:layout_width="0dp"
             android:layout_height="0dp"
             app:constraint_referenced_ids="ivTracking,tvTracking" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_swipes.xml b/app/src/main/res/layout/dialog_swipes.xml
index 67f4d69077..ff78aad2a7 100644
--- a/app/src/main/res/layout/dialog_swipes.xml
+++ b/app/src/main/res/layout/dialog_swipes.xml
@@ -6,11 +6,11 @@
     android:padding="24dp"
     android:scrollbarStyle="outsideOverlay">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -21,7 +21,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvHint"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -31,7 +31,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/tvTitle" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvLeft"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -50,7 +50,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvLeft" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvRight"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -68,5 +68,5 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvRight" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
\ 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 80ed9dbbbb..577919feda 100644
--- a/app/src/main/res/layout/dialog_sync.xml
+++ b/app/src/main/res/layout/dialog_sync.xml
@@ -6,11 +6,11 @@
     android:padding="24dp"
     android:scrollbarStyle="outsideOverlay">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvSync"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -22,7 +22,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvFolder"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -50,7 +50,7 @@
             <requestFocus />
         </eu.faircode.email.EditTextPlain>
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvMonths"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -61,7 +61,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@id/etMonths" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvRemark"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -75,7 +75,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/etMonths" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvRemark2"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -86,7 +86,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvRemark" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvRemark3"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -96,5 +96,5 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvRemark2" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_theme.xml b/app/src/main/res/layout/dialog_theme.xml
index 3027e6bc28..59d9cdbe21 100644
--- a/app/src/main/res/layout/dialog_theme.xml
+++ b/app/src/main/res/layout/dialog_theme.xml
@@ -7,11 +7,11 @@
     android:padding="24dp"
     android:scrollbarStyle="outsideOverlay">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvCaption"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -98,7 +98,7 @@
                 android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
         </RadioGroup>
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvYou"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -156,7 +156,7 @@
                 android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
         </RadioGroup>
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvSystem"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -209,7 +209,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/swComposerLight" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvMore"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -222,5 +222,5 @@
             android:textColor="?android:attr/textColorLink"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/btnMore" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
\ 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 5818e32e18..014d4ad706 100644
--- a/app/src/main/res/layout/dialog_translate.xml
+++ b/app/src/main/res/layout/dialog_translate.xml
@@ -7,11 +7,11 @@
     android:padding="24dp"
     android:scrollbarStyle="outsideOverlay">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvTitle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -26,7 +26,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibAll"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -49,7 +49,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvTitle" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvText"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -75,5 +75,5 @@
             app:layout_constraintStart_toStartOf="@id/tvText"
             app:layout_constraintTop_toTopOf="@id/tvText"
             app:show_delay="0" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
\ 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 74afc9cf2a..d6e5198f22 100644
--- a/app/src/main/res/layout/dialog_unexpected.xml
+++ b/app/src/main/res/layout/dialog_unexpected.xml
@@ -7,11 +7,11 @@
     android:padding="24dp"
     android:scrollbarStyle="outsideOverlay">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvCaption"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -24,7 +24,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvError"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -34,5 +34,5 @@
             android:textIsSelectable="true"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvCaption" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml
index f6acc076da..ec7713d966 100644
--- a/app/src/main/res/layout/fragment_about.xml
+++ b/app/src/main/res/layout/fragment_about.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ConstraintLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="eu.faircode.email.ActivityView">
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvVersion"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -20,7 +20,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvRelease"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -35,7 +35,7 @@
         app:layout_constraintStart_toEndOf="@id/tvVersion"
         app:layout_constraintTop_toTopOf="@id/tvVersion" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvDownloaded"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -46,7 +46,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvRelease" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvUpdated"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -60,7 +60,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvDownloaded" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvCopyright"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -82,7 +82,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvCopyright">
 
-        <eu.faircode.email.ConstraintLayoutEx
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
@@ -94,7 +94,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
-            <eu.faircode.email.FixedTextView
+            <TextView
                 android:id="@+id/tvContributors"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -113,6 +113,6 @@
                 android:orientation="vertical"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/tvContributors" />
-        </eu.faircode.email.ConstraintLayoutEx>
+        </androidx.constraintlayout.widget.ConstraintLayout>
     </eu.faircode.email.ScrollViewEx>
-</eu.faircode.email.ConstraintLayoutEx>
\ No newline at end of file
+</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 4e76b78df4..0d9e0ced83 100644
--- a/app/src/main/res/layout/fragment_account.xml
+++ b/app/src/main/res/layout/fragment_account.xml
@@ -9,7 +9,7 @@
     android:scrollbarStyle="outsideOverlay"
     tools:context="eu.faircode.email.ActivitySetup">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:descendantFocusability="beforeDescendants"
@@ -18,7 +18,7 @@
 
         <!-- provider -->
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvProvider"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -35,7 +35,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvProvider" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvGmailHint"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -48,7 +48,7 @@
 
         <!-- auto config -->
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvDomain"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -58,7 +58,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvGmailHint" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvDomainHint"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -105,7 +105,7 @@
 
         <!-- IMAP/POP3 -->
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvImap"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -117,7 +117,7 @@
 
         <!-- host -->
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvHost"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -139,7 +139,7 @@
 
         <!-- SSL/STARTTLS -->
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvEncryption"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -188,7 +188,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/rgEncryption" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvInsecureRemark"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -204,7 +204,7 @@
 
         <!-- port -->
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvPort"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -227,7 +227,7 @@
 
         <!-- user -->
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvUser"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -250,7 +250,7 @@
 
         <!-- password -->
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvPassword"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -276,7 +276,7 @@
                 android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
         </com.google.android.material.textfield.TextInputLayout>
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvCaseSensitive"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -287,7 +287,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tilPassword" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvAppPassword"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -301,7 +301,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/tvCaseSensitive" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvPasswordStorage"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -326,7 +326,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvPasswordStorage" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvCertificate"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -338,7 +338,7 @@
             app:layout_constraintStart_toEndOf="@id/btnCertificate"
             app:layout_constraintTop_toTopOf="@id/btnCertificate" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvRealm"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -361,7 +361,7 @@
 
         <!-- name -->
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvName"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -371,7 +371,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/etRealm" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvNameRemark"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -392,7 +392,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvNameRemark" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvCategory"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -412,7 +412,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvCategory" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvColor"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -434,7 +434,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvColor" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvColorHint"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -445,7 +445,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/btnColor" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvColorPro"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -495,7 +495,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbIgnoreSchedule" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvLeave"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -524,7 +524,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbPrimary" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvNotifyRemark"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -538,7 +538,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbNotify" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvNotifyPro"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -558,7 +558,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvNotifyPro" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvBrowseHint"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -579,7 +579,7 @@
 
         <!-- keep alive -->
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvInterval"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -599,7 +599,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvInterval" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvIntervalRemark"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -618,7 +618,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvIntervalRemark" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvPartialFetchRemark"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -666,7 +666,7 @@
                 android:text="@string/title_date_header" />
         </RadioGroup>
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvDateRemark"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -710,7 +710,7 @@
             app:layout_constraintStart_toEndOf="@id/btnCheck"
             app:layout_constraintTop_toTopOf="@id/btnCheck" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvIdle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -721,7 +721,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/btnCheck" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvDrafts"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -732,7 +732,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@+id/spDrafts" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvSent"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -743,7 +743,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@+id/spSent" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvArchive"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -754,7 +754,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@+id/spArchive" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvTrash"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -765,7 +765,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@+id/spTrash" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvJunk"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -776,7 +776,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@+id/spJunk" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvLeft"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -787,7 +787,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@+id/spLeft" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvRight"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -798,7 +798,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@+id/spRight" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvMove"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -827,7 +827,7 @@
             app:layout_constraintStart_toEndOf="@id/barrier_folders"
             app:layout_constraintTop_toBottomOf="@id/tvIdle" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvDraftsRemark"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -847,7 +847,7 @@
             app:layout_constraintStart_toEndOf="@id/barrier_folders"
             app:layout_constraintTop_toBottomOf="@id/tvDraftsRemark" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvSentWarning"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -971,7 +971,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/btnSave" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvErrorTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -982,7 +982,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbIdentity" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvError"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -1033,7 +1033,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbTrust" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvInstructions"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -1105,5 +1105,5 @@
             android:layout_width="0dp"
             android:layout_height="0dp"
             app:constraint_referenced_ids="tvErrorTitle,tvError" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
diff --git a/app/src/main/res/layout/fragment_accounts.xml b/app/src/main/res/layout/fragment_accounts.xml
index 1672180cc6..d1a167a1a7 100644
--- a/app/src/main/res/layout/fragment_accounts.xml
+++ b/app/src/main/res/layout/fragment_accounts.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.CoordinatorLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout 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"
@@ -11,11 +11,11 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <eu.faircode.email.ConstraintLayoutEx
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
-            <eu.faircode.email.FixedTextView
+            <TextView
                 android:id="@+id/tvHintActions"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -68,7 +68,7 @@
                 android:layout_width="0dp"
                 android:layout_height="0dp"
                 app:constraint_referenced_ids="rvAccount" />
-        </eu.faircode.email.ConstraintLayoutEx>
+        </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -94,4 +94,4 @@
         app:backgroundTint="?attr/colorFabBackground"
         app:srcCompat="@drawable/twotone_add_24"
         app:tint="?attr/colorFabForeground" />
-</eu.faircode.email.CoordinatorLayoutEx>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_answer.xml b/app/src/main/res/layout/fragment_answer.xml
index 8024ddac19..8c844d1412 100644
--- a/app/src/main/res/layout/fragment_answer.xml
+++ b/app/src/main/res/layout/fragment_answer.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.CoordinatorLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="eu.faircode.email.ActivityView">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:layout_behavior="eu.faircode.email.BehaviorBottomPadding">
@@ -18,7 +18,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent">
 
-            <eu.faircode.email.ConstraintLayoutEx
+            <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
@@ -156,7 +156,7 @@
                     android:layout_width="0dp"
                     android:layout_height="0dp"
                     app:constraint_referenced_ids="etName,etGroup,cbStandard,cbReceipt,cbFavorite,cbHide,btnColor,vSeparator,etText" />
-            </eu.faircode.email.ConstraintLayoutEx>
+            </androidx.constraintlayout.widget.ConstraintLayout>
         </eu.faircode.email.ScrollViewEx>
 
         <com.google.android.material.bottomnavigation.BottomNavigationView
@@ -195,5 +195,5 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
-    </eu.faircode.email.ConstraintLayoutEx>
-</eu.faircode.email.CoordinatorLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_answers.xml b/app/src/main/res/layout/fragment_answers.xml
index 4e91c1738f..10eae290cf 100644
--- a/app/src/main/res/layout/fragment_answers.xml
+++ b/app/src/main/res/layout/fragment_answers.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.CoordinatorLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="eu.faircode.email.ActivityView">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
@@ -40,7 +40,7 @@
             android:layout_width="0dp"
             android:layout_height="0dp"
             app:constraint_referenced_ids="rvAnswer" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fab"
@@ -53,4 +53,4 @@
         app:backgroundTint="?attr/colorFabBackground"
         app:srcCompat="@drawable/twotone_add_24"
         app:tint="?attr/colorFabForeground" />
-</eu.faircode.email.CoordinatorLayoutEx>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_certificates.xml b/app/src/main/res/layout/fragment_certificates.xml
index 6fe25dee98..b6f9ef7b17 100644
--- a/app/src/main/res/layout/fragment_certificates.xml
+++ b/app/src/main/res/layout/fragment_certificates.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.CoordinatorLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="eu.faircode.email.ActivitySetup">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
@@ -37,7 +37,7 @@
             android:layout_width="0dp"
             android:layout_height="0dp"
             app:constraint_referenced_ids="rvCertificate" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fab"
@@ -50,4 +50,4 @@
         app:backgroundTint="?attr/colorFabBackground"
         app:srcCompat="@drawable/twotone_add_24"
         app:tint="?attr/colorFabForeground" />
-</eu.faircode.email.CoordinatorLayoutEx>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_compose.xml b/app/src/main/res/layout/fragment_compose.xml
index e2a7dc1394..0c41c474c2 100644
--- a/app/src/main/res/layout/fragment_compose.xml
+++ b/app/src/main/res/layout/fragment_compose.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.CoordinatorLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="eu.faircode.email.ActivityCompose">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:layout_behavior="eu.faircode.email.BehaviorBottomPadding">
@@ -26,7 +26,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent">
 
-            <eu.faircode.email.ConstraintLayoutEx
+            <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
@@ -57,7 +57,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/spIdentity" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvDomain"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -69,7 +69,7 @@
                     app:layout_constraintStart_toEndOf="@id/etExtra"
                     app:layout_constraintTop_toTopOf="@+id/etExtra" />
 
-                <eu.faircode.email.FixedImageView
+                <ImageView
                     android:id="@+id/ivToLegend"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -100,7 +100,7 @@
                     app:layout_constraintStart_toEndOf="@id/ivToLegend"
                     app:layout_constraintTop_toBottomOf="@id/etExtra" />
 
-                <eu.faircode.email.FixedImageButton
+                <ImageButton
                     android:id="@+id/ibToAdd"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
@@ -115,7 +115,7 @@
                     app:srcCompat="@drawable/twotone_person_add_24"
                     app:tint="?attr/colorAccent" />
 
-                <eu.faircode.email.FixedImageView
+                <ImageView
                     android:id="@+id/ivCcLegend"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -146,7 +146,7 @@
                     app:layout_constraintStart_toEndOf="@id/ivCcLegend"
                     app:layout_constraintTop_toBottomOf="@+id/etTo" />
 
-                <eu.faircode.email.FixedImageButton
+                <ImageButton
                     android:id="@+id/ibCcAdd"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
@@ -161,7 +161,7 @@
                     app:srcCompat="@drawable/twotone_person_add_24"
                     app:tint="?attr/colorAccent" />
 
-                <eu.faircode.email.FixedImageView
+                <ImageView
                     android:id="@+id/ivBccLegend"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -192,7 +192,7 @@
                     app:layout_constraintStart_toEndOf="@id/ivBccLegend"
                     app:layout_constraintTop_toBottomOf="@+id/etCc" />
 
-                <eu.faircode.email.FixedImageButton
+                <ImageButton
                     android:id="@+id/ibBccAdd"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
@@ -223,7 +223,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/etBcc" />
 
-                <eu.faircode.email.FixedImageButton
+                <ImageButton
                     android:id="@+id/ibCcBcc"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
@@ -248,7 +248,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/etSubject" />
 
-                <eu.faircode.email.FixedImageButton
+                <ImageButton
                     android:id="@+id/ibRemoveAttachments"
                     android:layout_width="36dp"
                     android:layout_height="36dp"
@@ -271,7 +271,7 @@
                     app:layout_constraintTop_toBottomOf="@+id/ibRemoveAttachments"
                     app:layout_goneMarginTop="6dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvNoInternetAttachments"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -294,7 +294,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/tvNoInternetAttachments" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvDsn"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -306,7 +306,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/vSeparator" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvResend"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -318,7 +318,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvDsn" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvPlainTextOnly"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -348,7 +348,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvPlainTextOnly" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvNoInternet"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -371,7 +371,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/etBody" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvSignature"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -394,7 +394,7 @@
                     app:layout_constraintStart_toStartOf="@id/ibSignature"
                     app:layout_constraintTop_toTopOf="@+id/tvSignature" />
 
-                <eu.faircode.email.FixedImageButton
+                <ImageButton
                     android:id="@+id/ibSignature"
                     android:layout_width="36dp"
                     android:layout_height="wrap_content"
@@ -418,7 +418,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/tvSignature" />
 
-                <eu.faircode.email.FixedImageButton
+                <ImageButton
                     android:id="@+id/ibCloseRefHint"
                     android:layout_width="wrap_content"
                     android:layout_height="0dp"
@@ -428,7 +428,7 @@
                     app:layout_constraintTop_toTopOf="@+id/tvReferenceHint"
                     app:srcCompat="@drawable/twotone_close_24" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvReferenceHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -444,7 +444,7 @@
                     app:layout_constraintStart_toEndOf="@id/ibCloseRefHint"
                     app:layout_constraintTop_toBottomOf="@id/vSeparatorSignature" />
 
-                <eu.faircode.email.FixedImageButton
+                <ImageButton
                     android:id="@+id/ibWriteAboveBelow"
                     android:layout_width="36dp"
                     android:layout_height="wrap_content"
@@ -458,7 +458,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvReferenceHint"
                     app:srcCompat="@drawable/abovebelow" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvLanguage"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -471,7 +471,7 @@
                     app:layout_constraintStart_toEndOf="@id/ibWriteAboveBelow"
                     app:layout_constraintTop_toBottomOf="@id/tvReferenceHint" />
 
-                <eu.faircode.email.FixedImageButton
+                <ImageButton
                     android:id="@+id/ibReferenceEdit"
                     android:layout_width="36dp"
                     android:layout_height="wrap_content"
@@ -485,7 +485,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvReferenceHint"
                     app:srcCompat="@drawable/twotone_edit_24" />
 
-                <eu.faircode.email.FixedImageButton
+                <ImageButton
                     android:id="@+id/ibReferenceImages"
                     android:layout_width="36dp"
                     android:layout_height="wrap_content"
@@ -499,7 +499,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvReferenceHint"
                     app:srcCompat="@drawable/twotone_image_24" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvReference"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -555,7 +555,7 @@
                     android:layout_width="0dp"
                     android:layout_height="0dp"
                     app:constraint_referenced_ids="ibCloseRefHint,tvReferenceHint" />
-            </eu.faircode.email.ConstraintLayoutEx>
+            </androidx.constraintlayout.widget.ConstraintLayout>
         </eu.faircode.email.ScrollViewEx>
 
         <View
@@ -630,5 +630,5 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
-    </eu.faircode.email.ConstraintLayoutEx>
-</eu.faircode.email.CoordinatorLayoutEx>
\ No newline at end of file
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_contacts.xml b/app/src/main/res/layout/fragment_contacts.xml
index 7758ef4bfe..bb072e5962 100644
--- a/app/src/main/res/layout/fragment_contacts.xml
+++ b/app/src/main/res/layout/fragment_contacts.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.CoordinatorLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="eu.faircode.email.ActivityView">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         tools:context="eu.faircode.email.ActivitySetup">
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvHintActions"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -51,7 +51,7 @@
             android:layout_width="0dp"
             android:layout_height="0dp"
             app:constraint_referenced_ids="rvContacts" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fabAdd"
@@ -64,4 +64,4 @@
         app:backgroundTint="?attr/colorFabBackground"
         app:srcCompat="@drawable/twotone_person_add_24"
         app:tint="?attr/colorFabForeground" />
-</eu.faircode.email.CoordinatorLayoutEx>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_eula.xml b/app/src/main/res/layout/fragment_eula.xml
index 8a312c782c..eba0c8d796 100644
--- a/app/src/main/res/layout/fragment_eula.xml
+++ b/app/src/main/res/layout/fragment_eula.xml
@@ -8,7 +8,7 @@
     android:scrollbarStyle="outsideOverlay"
     tools:context="eu.faircode.email.ActivityMain">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
@@ -44,5 +44,5 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/btnCancel"
             app:layout_constraintTop_toBottomOf="@id/inEula" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
diff --git a/app/src/main/res/layout/fragment_folder.xml b/app/src/main/res/layout/fragment_folder.xml
index be2dc70536..90920ddf2b 100644
--- a/app/src/main/res/layout/fragment_folder.xml
+++ b/app/src/main/res/layout/fragment_folder.xml
@@ -9,14 +9,14 @@
     android:scrollbarStyle="outsideOverlay"
     tools:context="eu.faircode.email.ActivityView">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:descendantFocusability="beforeDescendants"
         android:focusable="true"
         android:focusableInTouchMode="true">
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvParentTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -26,7 +26,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvParent"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -36,7 +36,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvParentTitle" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvName"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -57,7 +57,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvName" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvDisplay"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -78,7 +78,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvDisplay" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvColor"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -118,7 +118,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbHide" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvHideSeenHint"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -190,7 +190,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbPoll" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvMultiply"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -200,7 +200,7 @@
             app:layout_constraintEnd_toStartOf="@+id/tvPoll"
             app:layout_constraintTop_toTopOf="@+id/etPoll" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvPoll"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -209,7 +209,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@+id/etPoll" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvPollRemark"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -250,7 +250,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbAutoClassifySource" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvAutoClassifyPro"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -263,7 +263,7 @@
 
         <!-- after -->
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvSyncDays"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -273,7 +273,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvAutoClassifyPro" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvSyncDaysRemark"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -285,7 +285,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvSyncDays" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibInfo"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -307,7 +307,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvSyncDaysRemark" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvKeepDays"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -317,7 +317,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/etSyncDays" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvKeepDaysRemark"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -358,7 +358,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbKeepAll" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvAutoDeleteHint"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -370,7 +370,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbAutoDelete" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvAutoDeleteArchiveHint"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -381,7 +381,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvAutoDeleteHint" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvInboxRootHint"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -453,5 +453,5 @@
             android:layout_width="0dp"
             android:layout_height="0dp"
             app:constraint_referenced_ids="cbAutoDelete,tvAutoDeleteHint" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
diff --git a/app/src/main/res/layout/fragment_folders.xml b/app/src/main/res/layout/fragment_folders.xml
index 87809fe3e3..39071d733c 100644
--- a/app/src/main/res/layout/fragment_folders.xml
+++ b/app/src/main/res/layout/fragment_folders.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.CoordinatorLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout 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"
@@ -11,11 +11,11 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <eu.faircode.email.ConstraintLayoutEx
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
-            <eu.faircode.email.FixedTextView
+            <TextView
                 android:id="@+id/tvHintActions"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -28,7 +28,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
-            <eu.faircode.email.FixedImageButton
+            <ImageButton
                 android:id="@+id/ibHintActions"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -49,7 +49,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tvHintActions" />
 
-            <eu.faircode.email.FixedTextView
+            <TextView
                 android:id="@+id/tvHintSync"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -62,7 +62,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/vSeparatorActions" />
 
-            <eu.faircode.email.FixedImageButton
+            <ImageButton
                 android:id="@+id/ibHintSync"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -130,7 +130,7 @@
                 android:layout_width="0dp"
                 android:layout_height="0dp"
                 app:constraint_referenced_ids="rvFolder" />
-        </eu.faircode.email.ConstraintLayoutEx>
+        </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -168,4 +168,4 @@
         app:backgroundTint="?attr/colorWarning"
         app:srcCompat="@drawable/twotone_warning_24"
         app:tint="?attr/colorFabForeground" />
-</eu.faircode.email.CoordinatorLayoutEx>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_gmail.xml b/app/src/main/res/layout/fragment_gmail.xml
index 36111b037b..a51aa5e433 100644
--- a/app/src/main/res/layout/fragment_gmail.xml
+++ b/app/src/main/res/layout/fragment_gmail.xml
@@ -9,11 +9,11 @@
     android:scrollbarStyle="outsideOverlay"
     tools:context="eu.faircode.email.ActivitySetup">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -23,7 +23,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvPrivacy"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -37,7 +37,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvTitle" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvGrantHint"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -60,7 +60,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvGrantHint" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvGranted"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -144,7 +144,7 @@
             app:layout_constraintStart_toEndOf="@id/btnSelect"
             app:layout_constraintTop_toTopOf="@id/btnSelect" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvSelectHint"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -154,7 +154,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/btnSelect" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvAppPassword"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -168,7 +168,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvSelectHint" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvErrorTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -179,7 +179,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvAppPassword" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvError"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -191,7 +191,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvErrorTitle" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvDraftsHint"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -222,5 +222,5 @@
             android:layout_width="0dp"
             android:layout_height="0dp"
             app:constraint_referenced_ids="tvErrorTitle,tvError,tvDraftsHint,btnSupport" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
diff --git a/app/src/main/res/layout/fragment_identities.xml b/app/src/main/res/layout/fragment_identities.xml
index b5da86e68f..da9a879f89 100644
--- a/app/src/main/res/layout/fragment_identities.xml
+++ b/app/src/main/res/layout/fragment_identities.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.CoordinatorLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="eu.faircode.email.ActivitySetup">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvHintActions"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -49,7 +49,7 @@
             android:layout_width="0dp"
             android:layout_height="0dp"
             app:constraint_referenced_ids="rvIdentity" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fab"
@@ -62,4 +62,4 @@
         app:backgroundTint="?attr/colorFabBackground"
         app:srcCompat="@drawable/twotone_add_24"
         app:tint="?attr/colorFabForeground" />
-</eu.faircode.email.CoordinatorLayoutEx>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_identity.xml b/app/src/main/res/layout/fragment_identity.xml
index c8246fd4de..7bc2baca82 100644
--- a/app/src/main/res/layout/fragment_identity.xml
+++ b/app/src/main/res/layout/fragment_identity.xml
@@ -9,7 +9,7 @@
     android:scrollbarStyle="outsideOverlay"
     tools:context="eu.faircode.email.ActivitySetup">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:descendantFocusability="beforeDescendants"
@@ -18,7 +18,7 @@
 
         <!--- linked account -->
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvAccount"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -37,7 +37,7 @@
 
         <!-- name -->
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvName"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -61,7 +61,7 @@
 
         <!-- email -->
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvEmail"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -85,7 +85,7 @@
 
         <!-- display name -->
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvDisplay"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -107,7 +107,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvDisplay" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvColor"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -129,7 +129,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvColor" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvColorHint"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -140,7 +140,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/btnColor" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvColorPro"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -178,7 +178,7 @@
 
         <!--- provider -->
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvProvider"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -200,7 +200,7 @@
 
         <!-- auto config -->
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvDomain"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -210,7 +210,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/spProvider" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvDomainHint"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -255,7 +255,7 @@
             app:layout_constraintStart_toEndOf="@id/btnAutoConfig"
             app:layout_constraintTop_toTopOf="@id/btnAutoConfig" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvSmtp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -267,7 +267,7 @@
 
         <!-- host -->
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvHost"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -290,7 +290,7 @@
 
         <!-- SSL/STARTTLS -->
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvEncryption"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -339,7 +339,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/rgEncryption" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvInsecureRemark"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -355,7 +355,7 @@
 
         <!-- port -->
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvPort"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -379,7 +379,7 @@
 
         <!-- username -->
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvUser"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -403,7 +403,7 @@
 
         <!-- password -->
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvPassword"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -430,7 +430,7 @@
                 android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
         </com.google.android.material.textfield.TextInputLayout>
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvCaseSensitiveHint"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -441,7 +441,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tilPassword" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvPasswordStorage"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -466,7 +466,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvPasswordStorage" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvCertificate"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -478,7 +478,7 @@
             app:layout_constraintStart_toEndOf="@id/btnCertificate"
             app:layout_constraintTop_toTopOf="@id/btnCertificate" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvRealm"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -509,7 +509,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/etRealm" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvUseIpHint"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -519,7 +519,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbUseIp" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvEhlo"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -569,7 +569,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbPrimary" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvSelfHint"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -597,7 +597,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbSenderExtra" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvSenderExtra"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -619,7 +619,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvSenderExtra" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibSenderExtra"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -630,7 +630,7 @@
             app:layout_constraintTop_toTopOf="@+id/etSenderExtra"
             app:srcCompat="@drawable/twotone_info_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvSenderExtraHint"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -642,7 +642,7 @@
 
         <!-- reply to -->
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvReplyTo"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -664,7 +664,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvReplyTo" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvCc"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -686,7 +686,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvCc" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvCcHint"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -696,7 +696,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/etCc" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvBcc"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -718,7 +718,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvBcc" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvBccHint"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -728,7 +728,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/etBcc" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvInternal"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -750,7 +750,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvInternal" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvInternalHint"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -760,7 +760,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/etInternal" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvE2Encryption"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -799,7 +799,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbEncryptDefault" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvUnicodeHint"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -809,7 +809,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbUnicode" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvMaxSize"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -853,7 +853,7 @@
             app:layout_constraintStart_toEndOf="@id/btnSave"
             app:layout_constraintTop_toTopOf="@id/btnSave" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvErrorTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -864,7 +864,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/btnSave" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvError"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -915,7 +915,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbTrust" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvInstructions"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -971,5 +971,5 @@
             android:layout_width="0dp"
             android:layout_height="0dp"
             app:constraint_referenced_ids="tvErrorTitle,tvError" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
diff --git a/app/src/main/res/layout/fragment_legend.xml b/app/src/main/res/layout/fragment_legend.xml
index da17449071..2a9a04b6ca 100644
--- a/app/src/main/res/layout/fragment_legend.xml
+++ b/app/src/main/res/layout/fragment_legend.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ConstraintLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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"
@@ -19,4 +19,4 @@
             android:layout_height="wrap_content"
             app:tabMode="scrollable" />
     </androidx.viewpager.widget.ViewPager>
-</eu.faircode.email.ConstraintLayoutEx>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_legend_compose.xml b/app/src/main/res/layout/fragment_legend_compose.xml
index 497af44f24..93bb95af2a 100644
--- a/app/src/main/res/layout/fragment_legend_compose.xml
+++ b/app/src/main/res/layout/fragment_legend_compose.xml
@@ -8,11 +8,11 @@
     android:scrollbarStyle="outsideOverlay"
     tools:context="eu.faircode.email.ActivityView">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivPick"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -23,7 +23,7 @@
             app:layout_constraintTop_toTopOf="@+id/tvPick"
             app:srcCompat="@drawable/twotone_person_add_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvPick"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -35,7 +35,7 @@
             app:layout_constraintStart_toEndOf="@id/ivPick"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivCC"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -46,7 +46,7 @@
             app:layout_constraintTop_toTopOf="@id/tvCC"
             app:srcCompat="@drawable/twotone_people_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvCC"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -58,7 +58,7 @@
             app:layout_constraintStart_toEndOf="@id/ivCC"
             app:layout_constraintTop_toBottomOf="@id/tvPick" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivLink"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -69,7 +69,7 @@
             app:layout_constraintTop_toTopOf="@id/tvLink"
             app:srcCompat="@drawable/twotone_insert_link_45_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvLink"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -81,7 +81,7 @@
             app:layout_constraintStart_toEndOf="@id/ivLink"
             app:layout_constraintTop_toBottomOf="@id/tvCC" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivFile"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -92,7 +92,7 @@
             app:layout_constraintTop_toTopOf="@id/tvFile"
             app:srcCompat="@drawable/twotone_attachment_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvFile"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -104,7 +104,7 @@
             app:layout_constraintStart_toEndOf="@id/ivFile"
             app:layout_constraintTop_toBottomOf="@id/tvLink" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivPicture"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -115,7 +115,7 @@
             app:layout_constraintTop_toTopOf="@id/tvPicture"
             app:srcCompat="@drawable/twotone_image_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvPicture"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -127,7 +127,7 @@
             app:layout_constraintStart_toEndOf="@id/ivPicture"
             app:layout_constraintTop_toBottomOf="@id/tvFile" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivPhoto"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -138,7 +138,7 @@
             app:layout_constraintTop_toTopOf="@id/tvPhoto"
             app:srcCompat="@drawable/twotone_photo_camera_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvPhoto"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -150,7 +150,7 @@
             app:layout_constraintStart_toEndOf="@id/ivPhoto"
             app:layout_constraintTop_toBottomOf="@id/tvPicture" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivAudio"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -161,7 +161,7 @@
             app:layout_constraintTop_toTopOf="@id/tvAudio"
             app:srcCompat="@drawable/twotone_record_voice_over_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvAudio"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -173,7 +173,7 @@
             app:layout_constraintStart_toEndOf="@id/ivAudio"
             app:layout_constraintTop_toBottomOf="@id/tvPhoto" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivBold"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -184,7 +184,7 @@
             app:layout_constraintTop_toTopOf="@id/tvBold"
             app:srcCompat="@drawable/twotone_format_bold_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvBold"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -196,7 +196,7 @@
             app:layout_constraintStart_toEndOf="@id/ivBold"
             app:layout_constraintTop_toBottomOf="@id/tvAudio" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivItalic"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -207,7 +207,7 @@
             app:layout_constraintTop_toTopOf="@id/tvItalic"
             app:srcCompat="@drawable/twotone_format_italic_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvItalic"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -219,7 +219,7 @@
             app:layout_constraintStart_toEndOf="@id/ivItalic"
             app:layout_constraintTop_toBottomOf="@id/tvBold" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivUnderline"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -230,7 +230,7 @@
             app:layout_constraintTop_toTopOf="@id/tvUnderline"
             app:srcCompat="@drawable/twotone_format_underlined_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvUnderline"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -242,7 +242,7 @@
             app:layout_constraintStart_toEndOf="@id/ivUnderline"
             app:layout_constraintTop_toBottomOf="@id/tvItalic" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivStyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -253,7 +253,7 @@
             app:layout_constraintTop_toTopOf="@id/tvStyle"
             app:srcCompat="@drawable/twotone_text_format_24_options" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvStyle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -264,5 +264,5 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivStyle"
             app:layout_constraintTop_toBottomOf="@id/tvUnderline" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_legend_folders.xml b/app/src/main/res/layout/fragment_legend_folders.xml
index 33f9168aa9..5cb1286907 100644
--- a/app/src/main/res/layout/fragment_legend_folders.xml
+++ b/app/src/main/res/layout/fragment_legend_folders.xml
@@ -8,11 +8,11 @@
     android:scrollbarStyle="outsideOverlay"
     tools:context="eu.faircode.email.ActivityView">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivType"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -23,7 +23,7 @@
             app:layout_constraintTop_toTopOf="@+id/tvUnified"
             app:srcCompat="@drawable/twotone_folder_special_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvUnified"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -35,7 +35,7 @@
             app:layout_constraintStart_toEndOf="@id/ivType"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivInbox"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -46,7 +46,7 @@
             app:layout_constraintTop_toTopOf="@+id/tvInbox"
             app:srcCompat="@drawable/twotone_inbox_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvInbox"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -58,7 +58,7 @@
             app:layout_constraintStart_toEndOf="@id/ivInbox"
             app:layout_constraintTop_toBottomOf="@id/tvUnified" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivOutbox"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -69,7 +69,7 @@
             app:layout_constraintTop_toTopOf="@+id/tvOutbox"
             app:srcCompat="@drawable/twotone_outbox_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvOutbox"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -81,7 +81,7 @@
             app:layout_constraintStart_toEndOf="@id/ivOutbox"
             app:layout_constraintTop_toBottomOf="@id/tvInbox" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivDrafts"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -92,7 +92,7 @@
             app:layout_constraintTop_toTopOf="@+id/tvDrafts"
             app:srcCompat="@drawable/twotone_drafts_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvDrafts"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -104,7 +104,7 @@
             app:layout_constraintStart_toEndOf="@id/ivDrafts"
             app:layout_constraintTop_toBottomOf="@id/tvOutbox" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivSent"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -115,7 +115,7 @@
             app:layout_constraintTop_toTopOf="@+id/tvSent"
             app:srcCompat="@drawable/twotone_send_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvSent"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -127,7 +127,7 @@
             app:layout_constraintStart_toEndOf="@id/ivSent"
             app:layout_constraintTop_toBottomOf="@id/tvDrafts" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivArchive"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -138,7 +138,7 @@
             app:layout_constraintTop_toTopOf="@+id/tvArchive"
             app:srcCompat="@drawable/twotone_archive_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvArchive"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -150,7 +150,7 @@
             app:layout_constraintStart_toEndOf="@id/ivArchive"
             app:layout_constraintTop_toBottomOf="@id/tvSent" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivTrash"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -161,7 +161,7 @@
             app:layout_constraintTop_toTopOf="@+id/tvTrash"
             app:srcCompat="@drawable/twotone_delete_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvTrash"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -173,7 +173,7 @@
             app:layout_constraintStart_toEndOf="@id/ivTrash"
             app:layout_constraintTop_toBottomOf="@id/tvArchive" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivJunk"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -184,7 +184,7 @@
             app:layout_constraintTop_toTopOf="@+id/tvJunk"
             app:srcCompat="@drawable/twotone_report_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvJunk"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -196,7 +196,7 @@
             app:layout_constraintStart_toEndOf="@id/ivJunk"
             app:layout_constraintTop_toBottomOf="@id/tvTrash" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivPrimary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -207,7 +207,7 @@
             app:layout_constraintTop_toTopOf="@+id/tvPrimary"
             app:srcCompat="@drawable/twotone_star_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvPrimary"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -219,7 +219,7 @@
             app:layout_constraintStart_toEndOf="@id/ivPrimary"
             app:layout_constraintTop_toBottomOf="@id/tvJunk" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivSubscribed"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -230,7 +230,7 @@
             app:layout_constraintTop_toTopOf="@+id/tvSubscribed"
             app:srcCompat="@drawable/twotone_bookmark_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvSubscribed"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -242,7 +242,7 @@
             app:layout_constraintStart_toEndOf="@id/ivSubscribed"
             app:layout_constraintTop_toBottomOf="@id/tvPrimary" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivRule"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -253,7 +253,7 @@
             app:layout_constraintTop_toTopOf="@+id/tvRule"
             app:srcCompat="@drawable/twotone_filter_alt_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvRule"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -265,7 +265,7 @@
             app:layout_constraintStart_toEndOf="@id/ivRule"
             app:layout_constraintTop_toBottomOf="@id/tvSubscribed" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivNotify"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -276,7 +276,7 @@
             app:layout_constraintTop_toTopOf="@+id/tvNotify"
             app:srcCompat="@drawable/twotone_notifications_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvNotify"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -288,7 +288,7 @@
             app:layout_constraintStart_toEndOf="@id/ivNotify"
             app:layout_constraintTop_toBottomOf="@id/tvRule" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvDownloadFetch"
             android:layout_width="48dp"
             android:layout_height="0dp"
@@ -299,7 +299,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@+id/tvDownloadFetchLegend" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivDownloadFetch"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -310,7 +310,7 @@
             app:layout_constraintTop_toTopOf="@+id/tvDownloadFetchLegend"
             app:srcCompat="@drawable/twotone_mail_outline_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvDownloadFetchLegend"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -322,7 +322,7 @@
             app:layout_constraintStart_toEndOf="@id/ivDownloadFetch"
             app:layout_constraintTop_toBottomOf="@id/tvNotify" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvSyncKeep"
             android:layout_width="48dp"
             android:layout_height="0dp"
@@ -333,7 +333,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@+id/tvSyncKeepLegend" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivSyncKeep"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -344,7 +344,7 @@
             app:layout_constraintTop_toTopOf="@+id/tvSyncKeepLegend"
             app:srcCompat="@drawable/twotone_sync_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvSyncKeepLegend"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -356,7 +356,7 @@
             app:layout_constraintStart_toEndOf="@id/ivSyncKeep"
             app:layout_constraintTop_toBottomOf="@id/tvDownloadFetchLegend" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivStop"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -367,7 +367,7 @@
             app:layout_constraintTop_toTopOf="@id/tvStop"
             app:srcCompat="@drawable/twotone_stop_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvStop"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -378,5 +378,5 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivStop"
             app:layout_constraintTop_toBottomOf="@id/tvSyncKeepLegend" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
diff --git a/app/src/main/res/layout/fragment_legend_keyboard.xml b/app/src/main/res/layout/fragment_legend_keyboard.xml
index e1b5420938..5726f26dc0 100644
--- a/app/src/main/res/layout/fragment_legend_keyboard.xml
+++ b/app/src/main/res/layout/fragment_legend_keyboard.xml
@@ -8,11 +8,11 @@
     android:scrollbarStyle="outsideOverlay"
     tools:context="eu.faircode.email.ActivityView">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvEnter"
             android:layout_width="48dp"
             android:layout_height="48dp"
@@ -25,7 +25,7 @@
             app:layout_constraintTop_toTopOf="@+id/tvOpen"
             app:srcCompat="@drawable/twotone_person_add_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvOpen"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -37,7 +37,7 @@
             app:layout_constraintStart_toEndOf="@id/tvEnter"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvA"
             android:layout_width="48dp"
             android:layout_height="48dp"
@@ -48,7 +48,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@id/tvArchive" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvArchive"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -60,7 +60,7 @@
             app:layout_constraintStart_toEndOf="@id/tvA"
             app:layout_constraintTop_toBottomOf="@id/tvOpen" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvC"
             android:layout_width="48dp"
             android:layout_height="48dp"
@@ -71,7 +71,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@id/tvCompose" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvCompose"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -83,7 +83,7 @@
             app:layout_constraintStart_toEndOf="@id/tvC"
             app:layout_constraintTop_toBottomOf="@id/tvArchive" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvD"
             android:layout_width="48dp"
             android:layout_height="48dp"
@@ -94,7 +94,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@id/tvTrash" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvTrash"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -106,7 +106,7 @@
             app:layout_constraintStart_toEndOf="@id/tvD"
             app:layout_constraintTop_toBottomOf="@id/tvCompose" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvM"
             android:layout_width="48dp"
             android:layout_height="48dp"
@@ -117,7 +117,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@id/tvMenu" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvMenu"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -129,7 +129,7 @@
             app:layout_constraintStart_toEndOf="@id/tvM"
             app:layout_constraintTop_toBottomOf="@id/tvTrash" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvN"
             android:layout_width="48dp"
             android:layout_height="48dp"
@@ -140,7 +140,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@id/tvNext" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvNext"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -152,7 +152,7 @@
             app:layout_constraintStart_toEndOf="@id/tvN"
             app:layout_constraintTop_toBottomOf="@id/tvMenu" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvP"
             android:layout_width="48dp"
             android:layout_height="48dp"
@@ -163,7 +163,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@id/tvPrevious" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvPrevious"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -175,7 +175,7 @@
             app:layout_constraintStart_toEndOf="@id/tvP"
             app:layout_constraintTop_toBottomOf="@id/tvNext" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvR"
             android:layout_width="48dp"
             android:layout_height="48dp"
@@ -186,7 +186,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@id/tvReply" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvReply"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -198,7 +198,7 @@
             app:layout_constraintStart_toEndOf="@id/tvR"
             app:layout_constraintTop_toBottomOf="@id/tvPrevious" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvS"
             android:layout_width="48dp"
             android:layout_height="48dp"
@@ -209,7 +209,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@id/tvSelect" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvSelect"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -221,7 +221,7 @@
             app:layout_constraintStart_toEndOf="@id/tvS"
             app:layout_constraintTop_toBottomOf="@id/tvReply" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvT"
             android:layout_width="48dp"
             android:layout_height="48dp"
@@ -232,7 +232,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@id/tvFocus" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvFocus"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -243,5 +243,5 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/tvT"
             app:layout_constraintTop_toBottomOf="@id/tvSelect" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_legend_messages.xml b/app/src/main/res/layout/fragment_legend_messages.xml
index 7c3e307f98..b8198b662f 100644
--- a/app/src/main/res/layout/fragment_legend_messages.xml
+++ b/app/src/main/res/layout/fragment_legend_messages.xml
@@ -8,11 +8,11 @@
     android:scrollbarStyle="outsideOverlay"
     tools:context="eu.faircode.email.ActivityView">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivThread"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -23,7 +23,7 @@
             app:layout_constraintTop_toTopOf="@+id/tvThread"
             app:srcCompat="@drawable/twotone_message_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvThread"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -35,7 +35,7 @@
             app:layout_constraintStart_toEndOf="@id/ivThread"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivBookmark"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -47,7 +47,7 @@
             app:srcCompat="@drawable/twotone_message_24"
             app:tint="?attr/colorAccent" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvBookmark"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -59,7 +59,7 @@
             app:layout_constraintStart_toEndOf="@id/ivBookmark"
             app:layout_constraintTop_toBottomOf="@id/tvThread" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivZoom"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -70,7 +70,7 @@
             app:layout_constraintTop_toTopOf="@id/tvZoom"
             app:srcCompat="@drawable/twotone_format_size_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvZoom"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -82,7 +82,7 @@
             app:layout_constraintStart_toEndOf="@id/ivZoom"
             app:layout_constraintTop_toBottomOf="@id/tvBookmark" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivDraft"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -93,7 +93,7 @@
             app:layout_constraintTop_toTopOf="@id/tvDraft"
             app:srcCompat="@drawable/twotone_edit_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvDraft"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -105,7 +105,7 @@
             app:layout_constraintStart_toEndOf="@id/ivDraft"
             app:layout_constraintTop_toBottomOf="@id/tvZoom" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivAuth"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -117,7 +117,7 @@
             app:srcCompat="@drawable/twotone_flag_24"
             app:tint="?attr/colorWarning" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvAuth"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -129,7 +129,7 @@
             app:layout_constraintStart_toEndOf="@id/ivAuth"
             app:layout_constraintTop_toBottomOf="@id/tvDraft" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivHighPriority"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -141,7 +141,7 @@
             app:srcCompat="@drawable/twotone_priority_high_24"
             app:tint="?attr/colorAccent" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvHighPriority"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -153,7 +153,7 @@
             app:layout_constraintStart_toEndOf="@id/ivHighPriority"
             app:layout_constraintTop_toBottomOf="@id/tvAuth" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivLowPriority"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -165,7 +165,7 @@
             app:srcCompat="@drawable/twotone_low_priority_24"
             app:tint="?attr/colorAccent" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvLowPriority"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -177,7 +177,7 @@
             app:layout_constraintStart_toEndOf="@id/ivLowPriority"
             app:layout_constraintTop_toBottomOf="@id/tvHighPriority" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivPersonalSensitivity"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -189,7 +189,7 @@
             app:srcCompat="@drawable/twotone_person_24"
             app:tint="?attr/colorAccent" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvPersonalSensitivity"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -201,7 +201,7 @@
             app:layout_constraintStart_toEndOf="@id/ivPersonalSensitivity"
             app:layout_constraintTop_toBottomOf="@id/tvLowPriority" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivPrivateSensitivity"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -213,7 +213,7 @@
             app:srcCompat="@drawable/twotone_people_24"
             app:tint="?attr/colorAccent" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvPrivateSensitivity"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -225,7 +225,7 @@
             app:layout_constraintStart_toEndOf="@id/ivPrivateSensitivity"
             app:layout_constraintTop_toBottomOf="@id/tvPersonalSensitivity" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivConfidentialSensitivity"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -237,7 +237,7 @@
             app:srcCompat="@drawable/twotone_business_24"
             app:tint="?attr/colorAccent" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvConfidentialSensitivity"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -249,7 +249,7 @@
             app:layout_constraintStart_toEndOf="@id/ivConfidentialSensitivity"
             app:layout_constraintTop_toBottomOf="@id/tvPrivateSensitivity" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivHighImportance"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -260,7 +260,7 @@
             app:layout_constraintTop_toTopOf="@id/tvHighImportance"
             app:srcCompat="@drawable/baseline_arrow_upward_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvHighImportance"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -272,7 +272,7 @@
             app:layout_constraintStart_toEndOf="@id/ivHighImportance"
             app:layout_constraintTop_toBottomOf="@id/tvConfidentialSensitivity" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivLowImportance"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -283,7 +283,7 @@
             app:layout_constraintTop_toTopOf="@id/tvLowImportance"
             app:srcCompat="@drawable/baseline_arrow_downward_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvLowImportance"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -295,7 +295,7 @@
             app:layout_constraintStart_toEndOf="@id/ivLowImportance"
             app:layout_constraintTop_toBottomOf="@id/tvHighImportance" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivSigned"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -306,7 +306,7 @@
             app:layout_constraintTop_toTopOf="@id/tvSigned"
             app:srcCompat="@drawable/twotone_gesture_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvSigned"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -318,7 +318,7 @@
             app:layout_constraintStart_toEndOf="@id/ivSigned"
             app:layout_constraintTop_toBottomOf="@id/tvLowImportance" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivEncrypted"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -329,7 +329,7 @@
             app:layout_constraintTop_toTopOf="@id/tvEncrypted"
             app:srcCompat="@drawable/twotone_lock_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvEncrypted"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -341,7 +341,7 @@
             app:layout_constraintStart_toEndOf="@id/ivEncrypted"
             app:layout_constraintTop_toBottomOf="@id/tvSigned" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivClassified"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -352,7 +352,7 @@
             app:layout_constraintTop_toTopOf="@id/tvClassified"
             app:srcCompat="@drawable/twotone_push_pin_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvClassified"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -364,7 +364,7 @@
             app:layout_constraintStart_toEndOf="@id/ivClassified"
             app:layout_constraintTop_toBottomOf="@id/tvEncrypted" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivSnoozed"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -375,7 +375,7 @@
             app:layout_constraintTop_toTopOf="@id/tvSnoozed"
             app:srcCompat="@drawable/twotone_timelapse_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvSnoozed"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -387,7 +387,7 @@
             app:layout_constraintStart_toEndOf="@id/ivSnoozed"
             app:layout_constraintTop_toBottomOf="@id/tvClassified" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivAnswered"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -398,7 +398,7 @@
             app:layout_constraintTop_toTopOf="@id/tvAnswered"
             app:srcCompat="@drawable/twotone_reply_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvAnswered"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -410,7 +410,7 @@
             app:layout_constraintStart_toEndOf="@id/ivAnswered"
             app:layout_constraintTop_toBottomOf="@id/tvSnoozed" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivForwarded"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -421,7 +421,7 @@
             app:layout_constraintTop_toTopOf="@id/tvForwarded"
             app:srcCompat="@drawable/twotone_forwarded_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvForwarded"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -433,7 +433,7 @@
             app:layout_constraintStart_toEndOf="@id/ivForwarded"
             app:layout_constraintTop_toBottomOf="@id/tvAnswered" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivPlain"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -444,7 +444,7 @@
             app:layout_constraintTop_toTopOf="@id/tvPlain"
             app:srcCompat="@drawable/twotone_notes_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvPlain"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -456,7 +456,7 @@
             app:layout_constraintStart_toEndOf="@id/ivPlain"
             app:layout_constraintTop_toBottomOf="@id/tvForwarded" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivReceipt"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -468,7 +468,7 @@
             app:srcCompat="@drawable/twotone_playlist_add_check_24"
             app:tint="?attr/colorWarning" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvReceiptType"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -480,7 +480,7 @@
             app:layout_constraintStart_toEndOf="@id/ivReceipt"
             app:layout_constraintTop_toBottomOf="@id/tvPlain" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivAutoSubmitted"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -491,7 +491,7 @@
             app:layout_constraintTop_toTopOf="@id/tvAutoSubmitted"
             app:srcCompat="@drawable/twotone_remove_circle_outline_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvAutoSubmitted"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -503,7 +503,7 @@
             app:layout_constraintStart_toEndOf="@id/ivAutoSubmitted"
             app:layout_constraintTop_toBottomOf="@id/tvReceiptType" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivBrowsed"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -514,7 +514,7 @@
             app:layout_constraintTop_toTopOf="@id/tvBrowsed"
             app:srcCompat="@drawable/twotone_playlist_add_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvBrowsed"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -526,7 +526,7 @@
             app:layout_constraintStart_toEndOf="@id/ivBrowsed"
             app:layout_constraintTop_toBottomOf="@id/tvAutoSubmitted" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivAttachment"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -537,7 +537,7 @@
             app:layout_constraintTop_toTopOf="@id/tvAttachment"
             app:srcCompat="@drawable/twotone_attachment_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvAttachment"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -549,7 +549,7 @@
             app:layout_constraintStart_toEndOf="@id/ivAttachment"
             app:layout_constraintTop_toBottomOf="@id/tvBrowsed" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivStarred"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -560,7 +560,7 @@
             app:layout_constraintTop_toTopOf="@id/tvStarred"
             app:srcCompat="@drawable/baseline_star_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvStarred"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -572,7 +572,7 @@
             app:layout_constraintStart_toEndOf="@id/ivStarred"
             app:layout_constraintTop_toBottomOf="@id/tvAttachment" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivSearch"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -583,7 +583,7 @@
             app:layout_constraintTop_toTopOf="@id/tvSearch"
             app:srcCompat="@drawable/twotone_search_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvSearch"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -595,7 +595,7 @@
             app:layout_constraintStart_toEndOf="@id/ivSearch"
             app:layout_constraintTop_toBottomOf="@id/tvStarred" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivPin"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -606,7 +606,7 @@
             app:layout_constraintTop_toTopOf="@id/tvPin"
             app:srcCompat="@drawable/twotone_person_pin_circle_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvPin"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -618,7 +618,7 @@
             app:layout_constraintStart_toEndOf="@id/ivPin"
             app:layout_constraintTop_toBottomOf="@id/tvSearch" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivContacts"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -629,7 +629,7 @@
             app:layout_constraintTop_toTopOf="@id/tvContacts"
             app:srcCompat="@drawable/twotone_import_contacts_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvContacts"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -641,7 +641,7 @@
             app:layout_constraintStart_toEndOf="@id/ivContacts"
             app:layout_constraintTop_toBottomOf="@id/tvPin" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -652,7 +652,7 @@
             app:layout_constraintTop_toTopOf="@id/tvView"
             app:srcCompat="@drawable/twotone_visibility_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvView"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -664,7 +664,7 @@
             app:layout_constraintStart_toEndOf="@id/ivView"
             app:layout_constraintTop_toBottomOf="@id/tvContacts" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivHide"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -675,7 +675,7 @@
             app:layout_constraintTop_toTopOf="@id/tvHide"
             app:srcCompat="@drawable/twotone_visibility_off_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvHide"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -687,7 +687,7 @@
             app:layout_constraintStart_toEndOf="@id/ivHide"
             app:layout_constraintTop_toBottomOf="@id/tvView" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivDownload"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -698,7 +698,7 @@
             app:layout_constraintTop_toTopOf="@id/tvDownload"
             app:srcCompat="@drawable/twotone_cloud_download_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvDownload"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -710,7 +710,7 @@
             app:layout_constraintStart_toEndOf="@id/ivDownload"
             app:layout_constraintTop_toBottomOf="@id/tvHide" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivJunk"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -721,7 +721,7 @@
             app:layout_constraintTop_toTopOf="@id/tvJunk"
             app:srcCompat="@drawable/twotone_report_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvJunk"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -733,7 +733,7 @@
             app:layout_constraintStart_toEndOf="@id/ivJunk"
             app:layout_constraintTop_toBottomOf="@id/tvDownload" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivUnsubscribe"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -744,7 +744,7 @@
             app:layout_constraintTop_toTopOf="@id/tvUnsubscribe"
             app:srcCompat="@drawable/twotone_unsubscribe_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvUnsubscribe"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -756,7 +756,7 @@
             app:layout_constraintStart_toEndOf="@id/ivUnsubscribe"
             app:layout_constraintTop_toBottomOf="@id/tvJunk" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivOriginal"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -768,7 +768,7 @@
             app:srcCompat="@drawable/twotone_fullscreen_24"
             app:tint="?attr/colorAccent" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvOriginal"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -780,7 +780,7 @@
             app:layout_constraintStart_toEndOf="@id/ivOriginal"
             app:layout_constraintTop_toBottomOf="@id/tvUnsubscribe" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivReformatted"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -792,7 +792,7 @@
             app:srcCompat="@drawable/twotone_fullscreen_exit_24"
             app:tint="?attr/colorAccent" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvReformatted"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -804,7 +804,7 @@
             app:layout_constraintStart_toEndOf="@id/ivReformatted"
             app:layout_constraintTop_toBottomOf="@id/tvOriginal" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivAmp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -816,7 +816,7 @@
             app:srcCompat="@drawable/twotone_bolt_24"
             app:tint="?attr/colorAccent" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvAmp"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -828,7 +828,7 @@
             app:layout_constraintStart_toEndOf="@id/ivAmp"
             app:layout_constraintTop_toBottomOf="@id/tvReformatted" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivExternalImage"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -839,7 +839,7 @@
             app:layout_constraintTop_toTopOf="@id/tvExternalImage"
             app:srcCompat="@drawable/twotone_image_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvExternalImage"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -851,7 +851,7 @@
             app:layout_constraintStart_toEndOf="@id/ivExternalImage"
             app:layout_constraintTop_toBottomOf="@id/ivAmp" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivEmbeddedImage"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -862,7 +862,7 @@
             app:layout_constraintTop_toTopOf="@id/tvEmbeddedImage"
             app:srcCompat="@drawable/twotone_photo_library_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvEmbeddedImage"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -874,7 +874,7 @@
             app:layout_constraintStart_toEndOf="@id/ivEmbeddedImage"
             app:layout_constraintTop_toBottomOf="@id/tvExternalImage" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivTrackingPixel"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -886,7 +886,7 @@
             app:srcCompat="@drawable/twotone_my_location_24"
             app:tint="?attr/colorWarning" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvTrackingPixel"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -898,7 +898,7 @@
             app:layout_constraintStart_toEndOf="@id/ivTrackingPixel"
             app:layout_constraintTop_toBottomOf="@id/tvEmbeddedImage" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivBrokenImage"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -909,7 +909,7 @@
             app:layout_constraintTop_toTopOf="@id/tvBrokenImage"
             app:srcCompat="@drawable/twotone_broken_image_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvBrokenImage"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -921,7 +921,7 @@
             app:layout_constraintStart_toEndOf="@id/ivBrokenImage"
             app:layout_constraintTop_toBottomOf="@id/tvTrackingPixel" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivDeletePermanent"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -932,7 +932,7 @@
             app:layout_constraintTop_toTopOf="@id/tvDeletePermanent"
             app:srcCompat="@drawable/twotone_delete_forever_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvDeletePermanent"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -943,5 +943,5 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivDeletePermanent"
             app:layout_constraintTop_toBottomOf="@id/tvBrokenImage" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
diff --git a/app/src/main/res/layout/fragment_legend_synchronization.xml b/app/src/main/res/layout/fragment_legend_synchronization.xml
index 9b50056e33..6726f7a8b2 100644
--- a/app/src/main/res/layout/fragment_legend_synchronization.xml
+++ b/app/src/main/res/layout/fragment_legend_synchronization.xml
@@ -8,11 +8,11 @@
     android:scrollbarStyle="outsideOverlay"
     tools:context="eu.faircode.email.ActivityView">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivOAuth"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -23,7 +23,7 @@
             app:layout_constraintTop_toTopOf="@+id/tvOauth"
             app:srcCompat="@drawable/twotone_security_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvOauth"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -35,7 +35,7 @@
             app:layout_constraintStart_toEndOf="@id/ivOAuth"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivPrimaryConnected"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -46,7 +46,7 @@
             app:layout_constraintTop_toTopOf="@id/tvPrimaryConnected"
             app:srcCompat="@drawable/twotone_folder_done_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvPrimaryConnected"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -58,7 +58,7 @@
             app:layout_constraintStart_toEndOf="@id/ivPrimaryConnected"
             app:layout_constraintTop_toBottomOf="@id/tvOauth" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivPrimaryDisconnected"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -69,7 +69,7 @@
             app:layout_constraintTop_toTopOf="@id/tvPrimaryDisconnected"
             app:srcCompat="@drawable/twotone_folder_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvPrimaryDisconnected"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -81,7 +81,7 @@
             app:layout_constraintStart_toEndOf="@id/ivPrimaryDisconnected"
             app:layout_constraintTop_toBottomOf="@id/tvPrimaryConnected" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivDownloadOn"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -92,7 +92,7 @@
             app:layout_constraintTop_toTopOf="@id/tvDownloadOn"
             app:srcCompat="@drawable/twotone_mail_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvDownloadOn"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -104,7 +104,7 @@
             app:layout_constraintStart_toEndOf="@id/ivDownloadOn"
             app:layout_constraintTop_toBottomOf="@id/tvPrimaryDisconnected" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivDownloadOff"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -115,7 +115,7 @@
             app:layout_constraintTop_toTopOf="@id/tvDownloadOff"
             app:srcCompat="@drawable/twotone_mail_outline_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvDownloadOff"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -127,7 +127,7 @@
             app:layout_constraintStart_toEndOf="@id/ivDownloadOff"
             app:layout_constraintTop_toBottomOf="@id/tvDownloadOn" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivSynchronize"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -138,7 +138,7 @@
             app:layout_constraintTop_toTopOf="@id/tvSynchronize"
             app:srcCompat="@drawable/twotone_sync_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvSynchronize"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -150,7 +150,7 @@
             app:layout_constraintStart_toEndOf="@id/ivSynchronize"
             app:layout_constraintTop_toBottomOf="@id/tvDownloadOff" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivSynchronizeOff"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -161,7 +161,7 @@
             app:layout_constraintTop_toTopOf="@id/tvSynchronizeOff"
             app:srcCompat="@drawable/twotone_sync_disabled_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvSynchronizeOff"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -173,7 +173,7 @@
             app:layout_constraintStart_toEndOf="@id/ivSynchronizeOff"
             app:layout_constraintTop_toBottomOf="@id/tvSynchronize" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivSynchronizePoll"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -184,7 +184,7 @@
             app:layout_constraintTop_toTopOf="@id/tvSynchronizePoll"
             app:srcCompat="@drawable/twotone_hourglass_top_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvSynchronizePoll"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -196,7 +196,7 @@
             app:layout_constraintStart_toEndOf="@id/ivSynchronizePoll"
             app:layout_constraintTop_toBottomOf="@id/tvSynchronizeOff" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivDisconnected"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -207,7 +207,7 @@
             app:layout_constraintTop_toTopOf="@id/tvDisconnected"
             app:srcCompat="@drawable/twotone_cloud_off_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvDisconnected"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -219,7 +219,7 @@
             app:layout_constraintStart_toEndOf="@id/ivDisconnected"
             app:layout_constraintTop_toBottomOf="@id/tvSynchronizePoll" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivConnecting"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -230,7 +230,7 @@
             app:layout_constraintTop_toTopOf="@id/tvConnecting"
             app:srcCompat="@drawable/twotone_cloud_queue_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvConnecting"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -242,7 +242,7 @@
             app:layout_constraintStart_toEndOf="@id/ivConnecting"
             app:layout_constraintTop_toBottomOf="@id/tvDisconnected" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivConnected"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -253,7 +253,7 @@
             app:layout_constraintTop_toTopOf="@id/tvConnected"
             app:srcCompat="@drawable/twotone_cloud_done_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvConnected"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -265,7 +265,7 @@
             app:layout_constraintStart_toEndOf="@id/ivConnected"
             app:layout_constraintTop_toBottomOf="@id/tvConnecting" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivBackoff"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -276,7 +276,7 @@
             app:layout_constraintTop_toTopOf="@id/tvBackoff"
             app:srcCompat="@drawable/twotone_update_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvBackoff"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -288,7 +288,7 @@
             app:layout_constraintStart_toEndOf="@id/ivBackoff"
             app:layout_constraintTop_toBottomOf="@id/tvConnected" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibInfoBackoff"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -299,7 +299,7 @@
             app:layout_constraintTop_toTopOf="@id/tvBackoff"
             app:srcCompat="@drawable/twotone_info_24" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivQuota"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -311,7 +311,7 @@
             app:srcCompat="@drawable/twotone_disc_full_24"
             app:tint="?attr/colorWarning" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvQuota"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -323,7 +323,7 @@
             app:layout_constraintStart_toEndOf="@id/ivQuota"
             app:layout_constraintTop_toBottomOf="@id/tvBackoff" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivExecuting"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -334,7 +334,7 @@
             app:layout_constraintTop_toTopOf="@id/tvExecuting"
             app:srcCompat="@drawable/twotone_dns_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvExecuting"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -346,7 +346,7 @@
             app:layout_constraintStart_toEndOf="@id/ivExecuting"
             app:layout_constraintTop_toBottomOf="@id/tvQuota" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivSynchronizing"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -357,7 +357,7 @@
             app:layout_constraintTop_toTopOf="@id/tvSynchronizing"
             app:srcCompat="@drawable/twotone_compare_arrows_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvSynchronizing"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -369,7 +369,7 @@
             app:layout_constraintStart_toEndOf="@id/ivSynchronizing"
             app:layout_constraintTop_toBottomOf="@id/tvExecuting" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivDownloading"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -380,7 +380,7 @@
             app:layout_constraintTop_toTopOf="@id/tvDownloading"
             app:srcCompat="@drawable/twotone_cloud_download_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvDownloading"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -392,7 +392,7 @@
             app:layout_constraintStart_toEndOf="@id/ivDownloading"
             app:layout_constraintTop_toBottomOf="@id/tvSynchronizing" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivClosing"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -403,7 +403,7 @@
             app:layout_constraintTop_toTopOf="@id/tvClosing"
             app:srcCompat="@drawable/twotone_cancel_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvClosing"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -414,5 +414,5 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivClosing"
             app:layout_constraintTop_toBottomOf="@id/tvDownloading" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
diff --git a/app/src/main/res/layout/fragment_logs.xml b/app/src/main/res/layout/fragment_logs.xml
index 023319a859..96d67b8064 100644
--- a/app/src/main/res/layout/fragment_logs.xml
+++ b/app/src/main/res/layout/fragment_logs.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ConstraintLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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"
@@ -34,4 +34,4 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:constraint_referenced_ids="rvLog" />
-</eu.faircode.email.ConstraintLayoutEx>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_messages.xml b/app/src/main/res/layout/fragment_messages.xml
index 4b514129a6..1773c3bfb5 100644
--- a/app/src/main/res/layout/fragment_messages.xml
+++ b/app/src/main/res/layout/fragment_messages.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.CoordinatorLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout 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"
@@ -12,11 +12,11 @@
         android:layout_height="match_parent"
         app:layout_behavior="eu.faircode.email.BehaviorBottomMargin">
 
-        <eu.faircode.email.ConstraintLayoutEx
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
-            <eu.faircode.email.FixedTextView
+            <TextView
                 android:id="@+id/tvAirplane"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -40,7 +40,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tvAirplane" />
 
-            <eu.faircode.email.FixedTextView
+            <TextView
                 android:id="@+id/tvSupport"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -60,7 +60,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tvSupport" />
 
-            <eu.faircode.email.FixedTextView
+            <TextView
                 android:id="@+id/tvHintSupport"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -73,7 +73,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/vSeparatorSupport" />
 
-            <eu.faircode.email.FixedImageButton
+            <ImageButton
                 android:id="@+id/ibHintSupport"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -93,7 +93,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tvHintSupport" />
 
-            <eu.faircode.email.FixedTextView
+            <TextView
                 android:id="@+id/tvHintSwipe"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -106,7 +106,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/vSeparatorHintSupport" />
 
-            <eu.faircode.email.FixedImageButton
+            <ImageButton
                 android:id="@+id/ibHintSwipe"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -126,7 +126,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tvHintSwipe" />
 
-            <eu.faircode.email.FixedTextView
+            <TextView
                 android:id="@+id/tvHintSelect"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -139,7 +139,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/vSeparatorHintSwipe" />
 
-            <eu.faircode.email.FixedImageButton
+            <ImageButton
                 android:id="@+id/ibHintSelect"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -159,7 +159,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tvHintSelect" />
 
-            <eu.faircode.email.FixedTextView
+            <TextView
                 android:id="@+id/tvHintJunk"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -172,7 +172,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/vSeparatorHintSelect" />
 
-            <eu.faircode.email.FixedImageButton
+            <ImageButton
                 android:id="@+id/ibHintJunk"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -273,7 +273,7 @@
                 app:srcCompat="@drawable/twotone_reply_24_options"
                 app:tint="?attr/colorFabForeground" />
 
-            <eu.faircode.email.FixedImageButton
+            <ImageButton
                 android:id="@+id/ibDown"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -288,7 +288,7 @@
                 app:srcCompat="@drawable/twotone_vertical_align_bottom_24"
                 app:tint="?attr/colorAccent" />
 
-            <eu.faircode.email.FixedImageButton
+            <ImageButton
                 android:id="@+id/ibUp"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -303,7 +303,7 @@
                 app:srcCompat="@drawable/twotone_vertical_align_top_24"
                 app:tint="?attr/colorAccent" />
 
-            <eu.faircode.email.FixedImageButton
+            <ImageButton
                 android:id="@+id/ibOutbox"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -316,7 +316,7 @@
                 app:srcCompat="@drawable/twotone_outbox_24"
                 app:tint="?attr/colorAccent" />
 
-            <eu.faircode.email.FixedTextView
+            <TextView
                 android:id="@+id/tvOutboxCount"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -331,7 +331,7 @@
                 app:layout_constraintEnd_toEndOf="@+id/ibOutbox"
                 app:layout_constraintTop_toTopOf="@+id/ibOutbox" />
 
-            <eu.faircode.email.FixedTextView
+            <TextView
                 android:id="@+id/tvDebug"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -344,7 +344,7 @@
                 app:layout_constraintBottom_toTopOf="@+id/etSearch"
                 app:layout_constraintStart_toEndOf="@+id/tvOutboxCount" />
 
-            <eu.faircode.email.FixedImageButton
+            <ImageButton
                 android:id="@+id/ibSeen"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -359,7 +359,7 @@
                 app:srcCompat="@drawable/twotone_drafts_24"
                 app:tint="?attr/colorAccent" />
 
-            <eu.faircode.email.FixedImageButton
+            <ImageButton
                 android:id="@+id/ibUnflagged"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -373,7 +373,7 @@
                 app:srcCompat="@drawable/baseline_star_24"
                 app:tint="?attr/colorAccent" />
 
-            <eu.faircode.email.FixedImageButton
+            <ImageButton
                 android:id="@+id/ibSnoozed"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -471,7 +471,7 @@
                 android:layout_width="0dp"
                 android:layout_height="0dp"
                 app:constraint_referenced_ids="ibOutbox,tvOutboxCount" />
-        </eu.faircode.email.ConstraintLayoutEx>
+        </androidx.constraintlayout.widget.ConstraintLayout>
     </eu.faircode.email.SwipeRefreshLayoutEx>
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -487,7 +487,7 @@
         app:srcCompat="@drawable/twotone_format_list_bulleted_24"
         app:tint="?attr/colorFabForeground" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvSelectedCount"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -512,12 +512,12 @@
         app:layout_anchor="@id/fabMore"
         app:layout_anchorGravity="start|center_vertical">
 
-        <eu.faircode.email.ConstraintLayoutEx
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingEnd="6dp">
 
-            <eu.faircode.email.FixedImageButton
+            <ImageButton
                 android:id="@+id/ibBatchSeen"
                 android:layout_width="48dp"
                 android:layout_height="48dp"
@@ -531,7 +531,7 @@
                 app:layout_constraintTop_toTopOf="parent"
                 app:srcCompat="@drawable/twotone_drafts_24" />
 
-            <eu.faircode.email.FixedImageButton
+            <ImageButton
                 android:id="@+id/ibBatchUnseen"
                 android:layout_width="48dp"
                 android:layout_height="48dp"
@@ -546,7 +546,7 @@
                 app:layout_constraintTop_toTopOf="parent"
                 app:srcCompat="@drawable/twotone_mail_24" />
 
-            <eu.faircode.email.FixedImageButton
+            <ImageButton
                 android:id="@+id/ibBatchSnooze"
                 android:layout_width="48dp"
                 android:layout_height="48dp"
@@ -561,7 +561,7 @@
                 app:layout_constraintTop_toTopOf="parent"
                 app:srcCompat="@drawable/twotone_timelapse_24" />
 
-            <eu.faircode.email.FixedImageButton
+            <ImageButton
                 android:id="@+id/ibBatchHide"
                 android:layout_width="48dp"
                 android:layout_height="48dp"
@@ -576,7 +576,7 @@
                 app:layout_constraintTop_toTopOf="parent"
                 app:srcCompat="@drawable/twotone_visibility_off_24" />
 
-            <eu.faircode.email.FixedImageButton
+            <ImageButton
                 android:id="@+id/ibBatchFlag"
                 android:layout_width="48dp"
                 android:layout_height="48dp"
@@ -591,7 +591,7 @@
                 app:layout_constraintTop_toTopOf="parent"
                 app:srcCompat="@drawable/twotone_star_24" />
 
-            <eu.faircode.email.FixedImageButton
+            <ImageButton
                 android:id="@+id/ibLowImportance"
                 android:layout_width="48dp"
                 android:layout_height="48dp"
@@ -606,7 +606,7 @@
                 app:layout_constraintTop_toTopOf="parent"
                 app:srcCompat="@drawable/baseline_arrow_downward_24" />
 
-            <eu.faircode.email.FixedImageButton
+            <ImageButton
                 android:id="@+id/ibHighImportance"
                 android:layout_width="48dp"
                 android:layout_height="48dp"
@@ -621,7 +621,7 @@
                 app:layout_constraintTop_toTopOf="parent"
                 app:srcCompat="@drawable/baseline_arrow_upward_24" />
 
-            <eu.faircode.email.FixedImageButton
+            <ImageButton
                 android:id="@+id/ibInbox"
                 android:layout_width="48dp"
                 android:layout_height="48dp"
@@ -635,7 +635,7 @@
                 app:layout_constraintTop_toTopOf="parent"
                 app:srcCompat="@drawable/twotone_inbox_24" />
 
-            <eu.faircode.email.FixedImageButton
+            <ImageButton
                 android:id="@+id/ibArchive"
                 android:layout_width="48dp"
                 android:layout_height="48dp"
@@ -649,7 +649,7 @@
                 app:layout_constraintTop_toTopOf="parent"
                 app:srcCompat="@drawable/twotone_archive_24" />
 
-            <eu.faircode.email.FixedImageButton
+            <ImageButton
                 android:id="@+id/ibJunk"
                 android:layout_width="48dp"
                 android:layout_height="48dp"
@@ -663,7 +663,7 @@
                 app:layout_constraintTop_toTopOf="parent"
                 app:srcCompat="@drawable/twotone_report_24" />
 
-            <eu.faircode.email.FixedImageButton
+            <ImageButton
                 android:id="@+id/ibTrash"
                 android:layout_width="48dp"
                 android:layout_height="48dp"
@@ -677,7 +677,7 @@
                 app:layout_constraintTop_toTopOf="parent"
                 app:srcCompat="@drawable/twotone_delete_24" />
 
-            <eu.faircode.email.FixedImageButton
+            <ImageButton
                 android:id="@+id/ibDelete"
                 android:layout_width="48dp"
                 android:layout_height="48dp"
@@ -691,7 +691,7 @@
                 app:layout_constraintTop_toTopOf="parent"
                 app:srcCompat="@drawable/twotone_delete_forever_24" />
 
-            <eu.faircode.email.FixedImageButton
+            <ImageButton
                 android:id="@+id/ibMove"
                 android:layout_width="48dp"
                 android:layout_height="48dp"
@@ -705,7 +705,7 @@
                 app:layout_constraintTop_toTopOf="parent"
                 app:srcCompat="@drawable/twotone_drive_file_move_24" />
 
-            <eu.faircode.email.FixedImageButton
+            <ImageButton
                 android:id="@+id/ibMoreSettings"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -718,7 +718,7 @@
                 app:layout_constraintEnd_toStartOf="@id/ibMove"
                 app:layout_constraintTop_toTopOf="parent"
                 app:srcCompat="@drawable/twotone_settings_24" />
-        </eu.faircode.email.ConstraintLayoutEx>
+        </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.cardview.widget.CardView>
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -756,4 +756,4 @@
         app:backgroundTint="?attr/colorWarning"
         app:srcCompat="@drawable/twotone_warning_24"
         app:tint="?attr/colorFabForeground" />
-</eu.faircode.email.CoordinatorLayoutEx>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_oauth.xml b/app/src/main/res/layout/fragment_oauth.xml
index 60d8ddb151..c9f1c3aab7 100644
--- a/app/src/main/res/layout/fragment_oauth.xml
+++ b/app/src/main/res/layout/fragment_oauth.xml
@@ -9,11 +9,11 @@
     android:scrollbarStyle="outsideOverlay"
     tools:context="eu.faircode.email.ActivitySetup">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -23,7 +23,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvPrivacy"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -80,7 +80,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/etEmail" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvTenantHint"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -143,7 +143,7 @@
             app:layout_constraintStart_toEndOf="@id/btnOAuth"
             app:layout_constraintTop_toTopOf="@id/btnOAuth" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvConfiguring"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -153,7 +153,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/btnOAuth" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvGmailHint"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -164,7 +164,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvConfiguring" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvErrorTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -175,7 +175,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvGmailHint" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvError"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -187,7 +187,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvErrorTitle" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvGmailDraftsHint"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -198,7 +198,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvError" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvOfficeAuthHint"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -250,5 +250,5 @@
             android:layout_width="0dp"
             android:layout_height="0dp"
             app:constraint_referenced_ids="tvErrorTitle,tvError,btnSupport" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
diff --git a/app/src/main/res/layout/fragment_open_full.xml b/app/src/main/res/layout/fragment_open_full.xml
index 5bf05590e4..f64b094dfd 100644
--- a/app/src/main/res/layout/fragment_open_full.xml
+++ b/app/src/main/res/layout/fragment_open_full.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ConstraintLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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">
@@ -12,4 +12,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
-</eu.faircode.email.ConstraintLayoutEx>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_operations.xml b/app/src/main/res/layout/fragment_operations.xml
index f4f471fccb..4ffd74dc3b 100644
--- a/app/src/main/res/layout/fragment_operations.xml
+++ b/app/src/main/res/layout/fragment_operations.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ConstraintLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="eu.faircode.email.ActivityView">
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvNoOperation"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -17,7 +17,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvHintOperation"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -54,4 +54,4 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:constraint_referenced_ids="rvOperation" />
-</eu.faircode.email.ConstraintLayoutEx>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_options.xml b/app/src/main/res/layout/fragment_options.xml
index cf8dce46f7..ca2f6809ca 100644
--- a/app/src/main/res/layout/fragment_options.xml
+++ b/app/src/main/res/layout/fragment_options.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ConstraintLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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"
@@ -20,4 +20,4 @@
             app:tabInlineLabel="true"
             app:tabMode="scrollable" />
     </androidx.viewpager.widget.ViewPager>
-</eu.faircode.email.ConstraintLayoutEx>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_options_behavior.xml b/app/src/main/res/layout/fragment_options_behavior.xml
index 6368347017..adef964349 100644
--- a/app/src/main/res/layout/fragment_options_behavior.xml
+++ b/app/src/main/res/layout/fragment_options_behavior.xml
@@ -12,12 +12,12 @@
     android:scrollbarStyle="outsideOverlay"
     tools:context=".ActivitySetup">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingBottom="24dp">
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvDefault"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -32,7 +32,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibHelp"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -58,13 +58,13 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvDefault">
 
-            <eu.faircode.email.ConstraintLayoutEx
+            <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingHorizontal="6dp"
                 android:paddingVertical="12dp">
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvCaptionGeneral"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -134,7 +134,7 @@
                     app:layout_constraintTop_toBottomOf="@id/swConversationActionsReplies"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvLanguageDetectionHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -145,7 +145,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/swLanguageDetection" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvDelayHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -158,7 +158,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvLanguageDetectionHint" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvDefaultSnooze"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -183,7 +183,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvDefaultSnooze" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="12dp"
@@ -192,7 +192,7 @@
                     app:layout_constraintBottom_toBottomOf="@+id/etDefaultSnooze"
                     app:layout_constraintStart_toEndOf="@+id/etDefaultSnooze"
                     app:layout_constraintTop_toTopOf="@+id/etDefaultSnooze" />
-            </eu.faircode.email.ConstraintLayoutEx>
+            </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.cardview.widget.CardView>
 
         <androidx.cardview.widget.CardView
@@ -208,13 +208,13 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cardGeneral">
 
-            <eu.faircode.email.ConstraintLayoutEx
+            <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingHorizontal="6dp"
                 android:paddingVertical="12dp">
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvCaptionList"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -285,7 +285,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/swQuickScroll" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvSwipeSensitivity"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -318,7 +318,7 @@
                     app:layout_constraintTop_toBottomOf="@id/sbSwipeSensitivity"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvFolderNav"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -329,7 +329,7 @@
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/swFolderNav" />
-            </eu.faircode.email.ConstraintLayoutEx>
+            </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.cardview.widget.CardView>
 
         <androidx.cardview.widget.CardView
@@ -345,13 +345,13 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cardList">
 
-            <eu.faircode.email.ConstraintLayoutEx
+            <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingHorizontal="6dp"
                 android:paddingVertical="12dp">
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvCaptionConversation"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -442,7 +442,7 @@
                     app:layout_constraintTop_toBottomOf="@id/swSwipeMove"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvAutoExpandHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -478,7 +478,7 @@
                     app:layout_constraintTop_toBottomOf="@id/swExpandFirst"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvExpandAllHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -513,7 +513,7 @@
                     app:layout_constraintTop_toBottomOf="@id/swExpandOne"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvAutoSeenHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -540,7 +540,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvAutoSeenHint"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvAutoCloseHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -552,7 +552,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/swAutoClose" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvOnClose"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -599,7 +599,7 @@
                     app:layout_constraintTop_toBottomOf="@id/swAutoCloseUnseen"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvUndoTimeout"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -686,7 +686,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/swResetImportance"
                     app:switchPadding="12dp" />
-            </eu.faircode.email.ConstraintLayoutEx>
+            </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.cardview.widget.CardView>
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
diff --git a/app/src/main/res/layout/fragment_options_connection.xml b/app/src/main/res/layout/fragment_options_connection.xml
index 0b9f734330..ab3c814cb6 100644
--- a/app/src/main/res/layout/fragment_options_connection.xml
+++ b/app/src/main/res/layout/fragment_options_connection.xml
@@ -12,12 +12,12 @@
     android:scrollbarStyle="outsideOverlay"
     tools:context=".ActivitySetup">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingBottom="24dp">
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvDefault"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -32,7 +32,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibHelp"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -58,13 +58,13 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvDefault">
 
-            <eu.faircode.email.ConstraintLayoutEx
+            <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingHorizontal="6dp"
                 android:paddingVertical="12dp">
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvCaptionGeneral"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -87,7 +87,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvCaptionGeneral"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvMeteredHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -99,7 +99,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/swMetered" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvMeteredWarning"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -112,7 +112,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvMeteredHint" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvDownload"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -146,7 +146,7 @@
                     app:layout_constraintTop_toBottomOf="@id/spDownload"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvRoamingHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -170,7 +170,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvRoamingHint"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvRlahHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -181,7 +181,7 @@
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/swRlah" />
-            </eu.faircode.email.ConstraintLayoutEx>
+            </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.cardview.widget.CardView>
 
         <androidx.cardview.widget.CardView
@@ -197,13 +197,13 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cardGeneral">
 
-            <eu.faircode.email.ConstraintLayoutEx
+            <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingHorizontal="6dp"
                 android:paddingVertical="12dp">
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvAdvanced"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -230,7 +230,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvAdvanced"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvDownloadHeadersHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -254,7 +254,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvDownloadHeadersHint"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvDownloadEmlHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -278,7 +278,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvDownloadEmlHint"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvPlainHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -301,7 +301,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvPlainHint"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvValidatedHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -325,7 +325,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvValidatedHint"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvTimeout"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -338,7 +338,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/swVpnOnly" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvTimeoutHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -410,7 +410,7 @@
                     app:layout_constraintTop_toBottomOf="@id/swStandaloneVpn"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvTcpKeepAliveHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -434,7 +434,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvTcpKeepAliveHint"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvSslHardenHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -458,7 +458,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvSslHardenHint"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvCertStrictHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -482,7 +482,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvCertStrictHint" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvNetworkMetered"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -495,7 +495,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/btnManage" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvNetworkRoaming"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -513,7 +513,7 @@
                     android:layout_width="0dp"
                     android:layout_height="0dp"
                     app:constraint_referenced_ids="swValidated,tvValidatedHint,swVpnOnly" />
-            </eu.faircode.email.ConstraintLayoutEx>
+            </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.cardview.widget.CardView>
 
         <androidx.cardview.widget.CardView
@@ -530,13 +530,13 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cardAdvanced">
 
-            <eu.faircode.email.ConstraintLayoutEx
+            <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingHorizontal="6dp"
                 android:paddingVertical="12dp">
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvCaptionDebug"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -562,7 +562,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvCaptionDebug" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvNetworkInfo"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -576,7 +576,7 @@
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/btnCiphers" />
-            </eu.faircode.email.ConstraintLayoutEx>
+            </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.cardview.widget.CardView>
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
diff --git a/app/src/main/res/layout/fragment_options_display.xml b/app/src/main/res/layout/fragment_options_display.xml
index 53c425ed4b..c576f3ec47 100644
--- a/app/src/main/res/layout/fragment_options_display.xml
+++ b/app/src/main/res/layout/fragment_options_display.xml
@@ -12,12 +12,12 @@
     android:scrollbarStyle="outsideOverlay"
     tools:context=".ActivitySetup">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingBottom="24dp">
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvDefault"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -32,7 +32,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibHelp"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -58,13 +58,13 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvDefault">
 
-            <eu.faircode.email.ConstraintLayoutEx
+            <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingHorizontal="6dp"
                 android:paddingVertical="12dp">
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvCaptionGeneral"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -75,7 +75,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvLayoutHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -99,7 +99,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvLayoutHint" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvStartup"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -121,7 +121,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvStartup" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvStartupHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -146,7 +146,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvStartupHint"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvDateHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -267,7 +267,7 @@
                     app:layout_constraintTop_toBottomOf="@id/swShadowHighlight"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvPortrait"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -292,7 +292,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvPortrait"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvPortrait2Hint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -317,7 +317,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvPortrait2Hint"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvPortrait2cHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -330,7 +330,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/swPortrait2c" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvPortraitMinSize"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -354,7 +354,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvPortraitMinSize" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvPortraitSplitMinHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -368,7 +368,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/spPortraitMinSize" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvLandscape"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -394,7 +394,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvLandscape"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvLandscapeHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -407,7 +407,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/swLandscape" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvLandscapeMinSize"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -431,7 +431,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvLandscapeMinSize" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvLandscapeSplitMinHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -457,7 +457,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvLandscapeSplitMinHint"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvColumnWidth"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -479,7 +479,7 @@
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvColumnWidth" />
-            </eu.faircode.email.ConstraintLayoutEx>
+            </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.cardview.widget.CardView>
 
         <androidx.cardview.widget.CardView
@@ -495,13 +495,13 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cardGeneral">
 
-            <eu.faircode.email.ConstraintLayoutEx
+            <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingHorizontal="6dp"
                 android:paddingVertical="12dp">
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvCaptionNavigation"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -578,7 +578,7 @@
                     app:layout_constraintTop_toBottomOf="@id/swNavPinnedCount"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvNavBarColorizeHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -590,7 +590,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/swNavBarColorize" />
 
-            </eu.faircode.email.ConstraintLayoutEx>
+            </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.cardview.widget.CardView>
 
         <androidx.cardview.widget.CardView
@@ -606,13 +606,13 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cardNavigation">
 
-            <eu.faircode.email.ConstraintLayoutEx
+            <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingHorizontal="6dp"
                 android:paddingVertical="12dp">
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvCaptionConversation"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -635,7 +635,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvCaptionConversation"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvThreadingHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -706,7 +706,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/swActionbar"
                     app:switchPadding="12dp" />
-            </eu.faircode.email.ConstraintLayoutEx>
+            </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.cardview.widget.CardView>
 
         <androidx.cardview.widget.CardView
@@ -722,13 +722,13 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cardConversation">
 
-            <eu.faircode.email.ConstraintLayoutEx
+            <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingHorizontal="6dp"
                 android:paddingVertical="12dp">
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvCaptionHeader"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -819,7 +819,7 @@
                     app:layout_constraintTop_toBottomOf="@id/swAvatars"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvBimiHint"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -834,7 +834,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/swBimi" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvBimiUnverified"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -849,7 +849,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvBimiHint" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvBimiVerified"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -864,7 +864,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvBimiUnverified" />
 
-                <eu.faircode.email.FixedImageButton
+                <ImageButton
                     android:id="@+id/ibBimi"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -887,7 +887,7 @@
                     app:layout_constraintTop_toBottomOf="@id/ibBimi"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvGravatarsHint"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -900,7 +900,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/swGravatars" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvGravatarPrivacy"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -926,7 +926,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvGravatarPrivacy"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvLibravatarsHint"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -939,7 +939,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/swLibravatars" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvLibravatarPrivacy"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -965,7 +965,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvLibravatarPrivacy"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvFaviconsHint"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -1029,7 +1029,7 @@
                     app:layout_constraintTop_toBottomOf="@id/swIdenticons"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedImageView
+                <ImageView
                     android:id="@+id/ivRed"
                     android:layout_width="36dp"
                     android:layout_height="36dp"
@@ -1039,7 +1039,7 @@
                     app:layout_constraintTop_toBottomOf="@id/swCircular"
                     app:srcCompat="@drawable/twotone_person_24" />
 
-                <eu.faircode.email.FixedImageView
+                <ImageView
                     android:id="@+id/ivGreen"
                     android:layout_width="36dp"
                     android:layout_height="36dp"
@@ -1049,7 +1049,7 @@
                     app:layout_constraintTop_toBottomOf="@id/swCircular"
                     app:srcCompat="@drawable/twotone_person_24" />
 
-                <eu.faircode.email.FixedImageView
+                <ImageView
                     android:id="@+id/ivBlue"
                     android:layout_width="36dp"
                     android:layout_height="36dp"
@@ -1059,7 +1059,7 @@
                     app:layout_constraintTop_toBottomOf="@id/swCircular"
                     app:srcCompat="@drawable/twotone_person_24" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvSaturation"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -1082,7 +1082,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvSaturation" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvBrightness"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -1105,7 +1105,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvBrightness" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvThreshold"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -1138,7 +1138,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/sbThreshold" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvNameEmail"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -1160,7 +1160,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvNameEmail" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvNameEmailHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -1217,7 +1217,7 @@
                     app:layout_constraintTop_toBottomOf="@id/swDistinguishContacts"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvFontSizeSender"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -1239,7 +1239,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvFontSizeSender" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvSenderEllipsize"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -1260,7 +1260,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvSenderEllipsize" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvSenderEllipsizeRemark"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -1317,7 +1317,7 @@
                     app:layout_constraintTop_toBottomOf="@id/swSubjectItalic"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvHighlightSubjectHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -1329,7 +1329,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/swHighlightSubject" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvFontSizeSubject"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -1351,7 +1351,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvFontSizeSubject" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvSubjectEllipsize"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -1372,7 +1372,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvSubjectEllipsize" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvSubjectEllipsizeRemark"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -1451,7 +1451,7 @@
                     app:layout_constraintTop_toBottomOf="@id/swFlagsBackground"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvPreviewHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -1476,7 +1476,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvPreviewHint"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvPreviewLines"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -1499,7 +1499,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvPreviewLines" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvPreviewLinesHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -1512,7 +1512,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/spPreviewLines" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvPreviewIssue"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -1532,7 +1532,7 @@
                     app:constraint_referenced_ids="
                     swGravatars,tvGravatarsHint,tvGravatarPrivacy,
                     swLibravatars,tvLibravatarsHint,tvLibravatarPrivacy" />
-            </eu.faircode.email.ConstraintLayoutEx>
+            </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.cardview.widget.CardView>
 
         <androidx.cardview.widget.CardView
@@ -1548,13 +1548,13 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cardMessage">
 
-            <eu.faircode.email.ConstraintLayoutEx
+            <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingHorizontal="6dp"
                 android:paddingVertical="12dp">
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvCaptionBody"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -1576,7 +1576,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvCaptionBody"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvMessageZoom"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -1610,7 +1610,7 @@
                     app:layout_constraintTop_toBottomOf="@id/sbMessageZoom"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvOverViewModeHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -1633,7 +1633,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvOverViewModeHint"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvOverrideWidthHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -1656,7 +1656,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvOverrideWidthHint"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvDisplayFont"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -1689,7 +1689,7 @@
                     app:layout_constraintTop_toBottomOf="@id/spDisplayFont"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvMonospacedPreHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -1736,7 +1736,7 @@
                     app:layout_constraintTop_toBottomOf="@id/swCollapseQuotes"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvImagesPlaceholdersHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -1759,7 +1759,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvImagesPlaceholdersHint"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvImagesInlineHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -1793,7 +1793,7 @@
                     app:layout_constraintTop_toBottomOf="@id/swButtonExtra"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvUnzipHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -1833,7 +1833,7 @@
                     android:layout_width="0dp"
                     android:layout_height="0dp"
                     app:constraint_referenced_ids="swUnzip,tvUnzipHint" />
-            </eu.faircode.email.ConstraintLayoutEx>
+            </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.cardview.widget.CardView>
 
         <androidx.cardview.widget.CardView
@@ -1849,13 +1849,13 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cardBody">
 
-            <eu.faircode.email.ConstraintLayoutEx
+            <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingHorizontal="6dp"
                 android:paddingVertical="12dp">
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvAdvanced"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -1894,7 +1894,7 @@
                     app:layout_constraintTop_toBottomOf="@id/swBundledFonts"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvParseClassesHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -1981,7 +1981,7 @@
                     app:layout_constraintTop_toBottomOf="@id/swTextAlign"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvAuthenticationHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -2005,7 +2005,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvAuthenticationHint"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvAuthSome"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -2020,7 +2020,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/swAuthenticationIndicator" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvAuthAll"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -2034,7 +2034,7 @@
                     android:textStyle="italic"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvAuthSome" />
-            </eu.faircode.email.ConstraintLayoutEx>
+            </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.cardview.widget.CardView>
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
diff --git a/app/src/main/res/layout/fragment_options_encryption.xml b/app/src/main/res/layout/fragment_options_encryption.xml
index 23ca41c963..d98600e978 100644
--- a/app/src/main/res/layout/fragment_options_encryption.xml
+++ b/app/src/main/res/layout/fragment_options_encryption.xml
@@ -12,12 +12,12 @@
     android:scrollbarStyle="outsideOverlay"
     tools:context=".ActivitySetup">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingBottom="24dp">
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvDefault"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -32,7 +32,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibHelp"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -58,13 +58,13 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvDefault">
 
-            <eu.faircode.email.ConstraintLayoutEx
+            <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingHorizontal="6dp"
                 android:paddingVertical="12dp">
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvCaptionGeneral"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -75,7 +75,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
 
-                <eu.faircode.email.FixedImageButton
+                <ImageButton
                     android:id="@+id/ibInfo"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -129,7 +129,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/swAutoDecrypt"
                     app:switchPadding="12dp" />
-            </eu.faircode.email.ConstraintLayoutEx>
+            </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.cardview.widget.CardView>
 
         <androidx.cardview.widget.CardView
@@ -145,13 +145,13 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cardGeneral">
 
-            <eu.faircode.email.ConstraintLayoutEx
+            <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingHorizontal="6dp"
                 android:paddingVertical="12dp">
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvCaptionPgp"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -162,7 +162,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvOpenPgp"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -185,7 +185,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvOpenPgp" />
 
-                <eu.faircode.email.FixedImageButton
+                <ImageButton
                     android:id="@+id/ibOpenKeychain"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
@@ -195,7 +195,7 @@
                     app:layout_constraintTop_toTopOf="@id/spOpenPgp"
                     app:srcCompat="@drawable/twotone_open_in_new_24" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvOpenPgpStatus"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -255,7 +255,7 @@
                     android:text="@string/title_advanced_import_pgp"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/swEncryptSubject" />
-            </eu.faircode.email.ConstraintLayoutEx>
+            </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.cardview.widget.CardView>
 
         <androidx.cardview.widget.CardView
@@ -271,13 +271,13 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cardPgp">
 
-            <eu.faircode.email.ConstraintLayoutEx
+            <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingHorizontal="6dp"
                 android:paddingVertical="12dp">
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvCaptionSmime"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -288,7 +288,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvSignAlgoSmime"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -310,7 +310,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvSignAlgoSmime" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvEncryptAlgoSmime"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -332,7 +332,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvEncryptAlgoSmime" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvAlgoHint"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -379,7 +379,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/btnManageCertificates" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvImportKeyHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -403,7 +403,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvImportKeyHint" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvManageKeysHint"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -424,7 +424,7 @@
                     android:text="@string/title_advanced_ca"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvManageKeysHint" />
-            </eu.faircode.email.ConstraintLayoutEx>
+            </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.cardview.widget.CardView>
 
         <androidx.cardview.widget.CardView
@@ -441,13 +441,13 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cardSmine">
 
-            <eu.faircode.email.ConstraintLayoutEx
+            <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingHorizontal="6dp"
                 android:paddingVertical="12dp">
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvCaptionDebug"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -463,7 +463,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvKeySize"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -475,7 +475,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvCaptionDebug" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvProviders"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -487,7 +487,7 @@
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvKeySize" />
-            </eu.faircode.email.ConstraintLayoutEx>
+            </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.cardview.widget.CardView>
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
diff --git a/app/src/main/res/layout/fragment_options_misc.xml b/app/src/main/res/layout/fragment_options_misc.xml
index c89cbb2e46..d0185bd668 100644
--- a/app/src/main/res/layout/fragment_options_misc.xml
+++ b/app/src/main/res/layout/fragment_options_misc.xml
@@ -12,12 +12,12 @@
     android:scrollbarStyle="outsideOverlay"
     tools:context=".ActivitySetup">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingBottom="24dp">
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvDefault"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -32,7 +32,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibHelp"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -58,13 +58,13 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvDefault">
 
-            <eu.faircode.email.ConstraintLayoutEx
+            <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingHorizontal="6dp"
                 android:paddingVertical="12dp">
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvCaptionGeneral"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -133,7 +133,7 @@
                     app:layout_constraintTop_toBottomOf="@id/swExternalAnswer"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvShortcutsHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -156,7 +156,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvShortcutsHint"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvFtsHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -168,7 +168,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/swFts" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvFtsIndexed"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -181,7 +181,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvFtsHint" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvFtsPro"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -203,7 +203,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvFtsPro"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvClassificationHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -216,7 +216,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/swClassification" />
 
-                <eu.faircode.email.FixedImageButton
+                <ImageButton
                     android:id="@+id/ibClassification"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -226,7 +226,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvClassificationHint"
                     app:srcCompat="@drawable/twotone_info_24" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvClassMinProbability"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -249,7 +249,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvClassMinProbability" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvClassMinDifference"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -272,7 +272,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvClassMinDifference" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvLanguage"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -295,7 +295,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvLanguage" />
 
-                <eu.faircode.email.FixedImageButton
+                <ImageButton
                     android:id="@+id/ibResetLanguage"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -307,7 +307,7 @@
                     app:layout_constraintEnd_toEndOf="parent"
                     app:srcCompat="@drawable/twotone_cancel_24" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvLanguageHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -332,7 +332,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvLanguageHint"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedImageButton
+                <ImageButton
                     android:id="@+id/ibDeepL"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -342,7 +342,7 @@
                     app:layout_constraintTop_toBottomOf="@id/swDeepL"
                     app:srcCompat="@drawable/twotone_info_24" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvSdcard"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -368,7 +368,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvSdcard"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedImageButton
+                <ImageButton
                     android:id="@+id/ibChannelUpdated"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
@@ -413,7 +413,7 @@
                     app:layout_constraintTop_toBottomOf="@id/swChangelog"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvUuid"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -451,7 +451,7 @@
                     app:layout_constraintTop_toBottomOf="@id/btnReset"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvCleanupAttachmentsHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -475,7 +475,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvCleanupAttachmentsHint" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvCleanupHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -487,7 +487,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/btnCleanup" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvLastCleanup"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -502,7 +502,7 @@
                     android:layout_width="0dp"
                     android:layout_height="0dp"
                     app:constraint_referenced_ids="swUpdates,swWeekly" />
-            </eu.faircode.email.ConstraintLayoutEx>
+            </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.cardview.widget.CardView>
 
         <androidx.cardview.widget.CardView
@@ -518,13 +518,13 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cardGeneral">
 
-            <eu.faircode.email.ConstraintLayoutEx
+            <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingHorizontal="6dp"
                 android:paddingVertical="12dp">
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvCaptionAdvanced"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -567,7 +567,7 @@
                     app:layout_constraintTop_toBottomOf="@id/swWatchdog"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvExperimentsHint"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -594,7 +594,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvExperimentsHint"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvProtocolHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -633,7 +633,7 @@
                     app:layout_constraintTop_toBottomOf="@id/swLogInfo"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvDebugHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -724,7 +724,7 @@
                     android:layout_width="0dp"
                     android:layout_height="0dp"
                     app:constraint_referenced_ids="swTest1,swTest2,swTest3,swTest4,swTest5" />
-            </eu.faircode.email.ConstraintLayoutEx>
+            </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.cardview.widget.CardView>
 
         <androidx.cardview.widget.CardView
@@ -741,13 +741,13 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cardAdvanced">
 
-            <eu.faircode.email.ConstraintLayoutEx
+            <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingHorizontal="6dp"
                 android:paddingVertical="12dp">
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvCaptionDebug"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -813,7 +813,7 @@
                     app:layout_constraintTop_toBottomOf="@id/swWorkManager"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvExternalStorageFolder"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -825,7 +825,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/swExternalStorage" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvRoomQueryThreads"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -848,7 +848,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvRoomQueryThreads" />
 
-                <eu.faircode.email.FixedImageButton
+                <ImageButton
                     android:id="@+id/ibRoom"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -857,7 +857,7 @@
                     app:layout_constraintTop_toBottomOf="@id/sbRoomQueryThreads"
                     app:srcCompat="@drawable/twotone_check_24" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvRoomHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -905,7 +905,7 @@
                     app:layout_constraintTop_toBottomOf="@id/swCheckpoints"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvSqliteCache"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -928,7 +928,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvSqliteCache" />
 
-                <eu.faircode.email.FixedImageButton
+                <ImageButton
                     android:id="@+id/ibSqliteCache"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -937,7 +937,7 @@
                     app:layout_constraintTop_toBottomOf="@id/sbSqliteCache"
                     app:srcCompat="@drawable/twotone_check_24" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvSqliteCacheHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -949,7 +949,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/ibSqliteCache" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvChunkSize"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -972,7 +972,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvChunkSize" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvThreadRange"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -1194,7 +1194,7 @@
                     app:layout_constraintTop_toBottomOf="@id/swIdleDone"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvLogarithmicBackoffHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -1250,7 +1250,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/swInfra" />
 
-                <eu.faircode.email.FixedImageView
+                <ImageView
                     android:id="@+id/infra_awsses"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
@@ -1259,7 +1259,7 @@
                     app:srcCompat="@drawable/infra_awsses"
                     tools:ignore="MissingConstraints" />
 
-                <eu.faircode.email.FixedImageView
+                <ImageView
                     android:id="@+id/infra_elastic"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
@@ -1268,7 +1268,7 @@
                     app:srcCompat="@drawable/infra_elastic"
                     tools:ignore="MissingConstraints" />
 
-                <eu.faircode.email.FixedImageView
+                <ImageView
                     android:id="@+id/infra_gmail"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
@@ -1277,7 +1277,7 @@
                     app:srcCompat="@drawable/infra_gmail"
                     tools:ignore="MissingConstraints" />
 
-                <eu.faircode.email.FixedImageView
+                <ImageView
                     android:id="@+id/infra_icloud"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
@@ -1286,7 +1286,7 @@
                     app:srcCompat="@drawable/infra_icloud"
                     tools:ignore="MissingConstraints" />
 
-                <eu.faircode.email.FixedImageView
+                <ImageView
                     android:id="@+id/infra_icontact"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
@@ -1295,7 +1295,7 @@
                     app:srcCompat="@drawable/infra_icontact"
                     tools:ignore="MissingConstraints" />
 
-                <eu.faircode.email.FixedImageView
+                <ImageView
                     android:id="@+id/infra_mailchimp"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
@@ -1304,7 +1304,7 @@
                     app:srcCompat="@drawable/infra_mailchimp"
                     tools:ignore="MissingConstraints" />
 
-                <eu.faircode.email.FixedImageView
+                <ImageView
                     android:id="@+id/infra_mailgun"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
@@ -1313,7 +1313,7 @@
                     app:srcCompat="@drawable/infra_mailgun"
                     tools:ignore="MissingConstraints" />
 
-                <eu.faircode.email.FixedImageView
+                <ImageView
                     android:id="@+id/infra_mailjet"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
@@ -1322,7 +1322,7 @@
                     app:srcCompat="@drawable/infra_mailjet"
                     tools:ignore="MissingConstraints" />
 
-                <eu.faircode.email.FixedImageView
+                <ImageView
                     android:id="@+id/infra_mandrill"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
@@ -1331,7 +1331,7 @@
                     app:srcCompat="@drawable/infra_mandrill"
                     tools:ignore="MissingConstraints" />
 
-                <eu.faircode.email.FixedImageView
+                <ImageView
                     android:id="@+id/infra_netcore"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
@@ -1340,7 +1340,7 @@
                     app:srcCompat="@drawable/infra_netcore"
                     tools:ignore="MissingConstraints" />
 
-                <eu.faircode.email.FixedImageView
+                <ImageView
                     android:id="@+id/infra_outlook"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
@@ -1349,7 +1349,7 @@
                     app:srcCompat="@drawable/infra_outlook"
                     tools:ignore="MissingConstraints" />
 
-                <eu.faircode.email.FixedImageView
+                <ImageView
                     android:id="@+id/infra_paypal"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
@@ -1358,7 +1358,7 @@
                     app:srcCompat="@drawable/infra_paypal"
                     tools:ignore="MissingConstraints" />
 
-                <eu.faircode.email.FixedImageView
+                <ImageView
                     android:id="@+id/infra_phpmailer"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
@@ -1367,7 +1367,7 @@
                     app:srcCompat="@drawable/infra_phpmailer"
                     tools:ignore="MissingConstraints" />
 
-                <eu.faircode.email.FixedImageView
+                <ImageView
                     android:id="@+id/infra_postmark"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
@@ -1376,7 +1376,7 @@
                     app:srcCompat="@drawable/infra_postmark"
                     tools:ignore="MissingConstraints" />
 
-                <eu.faircode.email.FixedImageView
+                <ImageView
                     android:id="@+id/infra_salesforce"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
@@ -1385,7 +1385,7 @@
                     app:srcCompat="@drawable/infra_salesforce"
                     tools:ignore="MissingConstraints" />
 
-                <eu.faircode.email.FixedImageView
+                <ImageView
                     android:id="@+id/infra_sendgrid"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
@@ -1394,7 +1394,7 @@
                     app:srcCompat="@drawable/infra_sendgrid"
                     tools:ignore="MissingConstraints" />
 
-                <eu.faircode.email.FixedImageView
+                <ImageView
                     android:id="@+id/infra_sendinblue"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
@@ -1403,7 +1403,7 @@
                     app:srcCompat="@drawable/infra_sendinblue"
                     tools:ignore="MissingConstraints" />
 
-                <eu.faircode.email.FixedImageView
+                <ImageView
                     android:id="@+id/infra_sparkpost"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
@@ -1412,7 +1412,7 @@
                     app:srcCompat="@drawable/infra_sparkpost"
                     tools:ignore="MissingConstraints" />
 
-                <eu.faircode.email.FixedImageView
+                <ImageView
                     android:id="@+id/infra_yahoo"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
@@ -1421,7 +1421,7 @@
                     app:srcCompat="@drawable/infra_yahoo"
                     tools:ignore="MissingConstraints" />
 
-                <eu.faircode.email.FixedImageView
+                <ImageView
                     android:id="@+id/infra_zeptomail"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
@@ -1430,7 +1430,7 @@
                     app:srcCompat="@drawable/infra_zeptomail"
                     tools:ignore="MissingConstraints" />
 
-                <eu.faircode.email.FixedImageView
+                <ImageView
                     android:id="@+id/infra_zoho"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
@@ -1440,7 +1440,7 @@
                     app:srcCompat="@drawable/infra_zoho"
                     tools:ignore="MissingConstraints" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvDkimVerifyHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -1485,7 +1485,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/swTestIab" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvProcessors"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -1496,7 +1496,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/btnImportProviders" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvMemoryClass"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -1506,7 +1506,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvProcessors" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvMemoryUsage"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -1516,7 +1516,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvMemoryClass" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvStorageUsage"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -1527,7 +1527,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvMemoryUsage" />
 
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvCacheUsage"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -1537,7 +1537,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvStorageUsage" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvCursorWindow"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -1548,7 +1548,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvCacheUsage" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvContactInfo"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -1559,7 +1559,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvCursorWindow" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvSuffixes"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -1570,7 +1570,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvContactInfo" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvAndroidId"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -1581,7 +1581,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvSuffixes" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvFingerprint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -1653,7 +1653,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/btnUris" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvPermissions"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -1664,7 +1664,7 @@
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/btnAllPermissions" />
-            </eu.faircode.email.ConstraintLayoutEx>
+            </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.cardview.widget.CardView>
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
diff --git a/app/src/main/res/layout/fragment_options_notifications.xml b/app/src/main/res/layout/fragment_options_notifications.xml
index 943c230873..96d3ce5912 100644
--- a/app/src/main/res/layout/fragment_options_notifications.xml
+++ b/app/src/main/res/layout/fragment_options_notifications.xml
@@ -12,12 +12,12 @@
     android:scrollbarStyle="outsideOverlay"
     tools:context=".ActivitySetup">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingBottom="24dp">
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvDefault"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -32,7 +32,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibHelp"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -58,13 +58,13 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvDefault">
 
-            <eu.faircode.email.ConstraintLayoutEx
+            <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingHorizontal="6dp"
                 android:paddingVertical="12dp">
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvCaptionGeneral"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -87,7 +87,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvCaptionGeneral" />
 
-                <eu.faircode.email.FixedImageButton
+                <ImageButton
                     android:id="@+id/ibClear"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -97,7 +97,7 @@
                     app:layout_constraintTop_toTopOf="@id/btnManage"
                     app:srcCompat="@drawable/twotone_delete_24" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvManageHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -121,7 +121,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvManageHint" />
 
-                <eu.faircode.email.FixedImageView
+                <ImageView
                     android:id="@+id/ivChannelDefault"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
@@ -131,7 +131,7 @@
                     app:layout_constraintTop_toTopOf="@+id/btnManageDefault"
                     app:srcCompat="@drawable/switch_off_on" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvManageDefaultHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -155,7 +155,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvManageDefaultHint" />
 
-                <eu.faircode.email.FixedImageView
+                <ImageView
                     android:id="@+id/ivChannelService"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
@@ -165,7 +165,7 @@
                     app:layout_constraintTop_toTopOf="@+id/btnManageService"
                     app:srcCompat="@drawable/switch_off_on" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvManageServiceHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -177,7 +177,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/btnManageService" />
 
-                <eu.faircode.email.FixedImageButton
+                <ImageButton
                     android:id="@+id/ibWhy"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -187,7 +187,7 @@
                     app:layout_constraintTop_toBottomOf="@+id/tvManageServiceHint"
                     app:srcCompat="@drawable/twotone_info_24" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvNotifySeparate"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -212,7 +212,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvNotifySeparate"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvNotifyActions"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -271,7 +271,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/cbNotifyActionArchive" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvNotifyActionMoveHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -337,7 +337,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/cbNotifyActionHide" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvNotifyActionsHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -350,7 +350,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/cbNotifyActionSnooze" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvNotifyActionsPro"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -396,7 +396,7 @@
                     app:layout_constraintTop_toBottomOf="@id/btnSound"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvNotifyScreenOnHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -419,7 +419,7 @@
                     android:layout_width="0dp"
                     android:layout_height="0dp"
                     app:constraint_referenced_ids="swBackground,tvBackgroundHint,swLight,btnSound" />
-            </eu.faircode.email.ConstraintLayoutEx>
+            </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.cardview.widget.CardView>
 
         <androidx.cardview.widget.CardView
@@ -435,13 +435,13 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cardGeneral">
 
-            <eu.faircode.email.ConstraintLayoutEx
+            <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingHorizontal="6dp"
                 android:paddingVertical="12dp">
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvCaptionAdvanced"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -469,7 +469,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvCaptionAdvanced"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvBadgeHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -481,7 +481,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/swBadge" />
 
-                <eu.faircode.email.FixedImageButton
+                <ImageButton
                     android:id="@+id/ibBadge"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -526,7 +526,7 @@
                     app:layout_constraintTop_toBottomOf="@id/swNotifyBackgroundOnly"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvNotifyKnownPro"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -561,7 +561,7 @@
                     app:layout_constraintTop_toBottomOf="@id/swNotifySummary"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvNotifyRemoveHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -609,7 +609,7 @@
                     app:layout_constraintTop_toBottomOf="@id/swNotifySubtext"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvNotifyPreviewHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -632,7 +632,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvNotifyPreviewHint"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvNotifyPreviewAllHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -655,7 +655,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvNotifyPreviewAllHint"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvNotifyPreviewOnlyHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -678,7 +678,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvNotifyPreviewOnlyHint"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedImageButton
+                <ImageButton
                     android:id="@+id/ibLight"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -700,7 +700,7 @@
                     app:layout_constraintTop_toBottomOf="@id/ibLight"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvWearablePreviewHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -712,7 +712,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/swWearablePreview" />
 
-                <eu.faircode.email.FixedImageButton
+                <ImageButton
                     android:id="@+id/ibWearable"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -733,7 +733,7 @@
                     app:layout_constraintTop_toBottomOf="@id/ibWearable"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvMessagingStyle"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -745,7 +745,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/swMessagingStyle" />
 
-                <eu.faircode.email.FixedImageButton
+                <ImageButton
                     android:id="@+id/ibCar"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -778,7 +778,7 @@
                     app:layout_constraintTop_toBottomOf="@id/swBiometricsNotify"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvBackgroundHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -802,7 +802,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvBackgroundHint"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvNoGrouping"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -815,7 +815,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/swAlertOnce" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvNoChannels"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -827,7 +827,7 @@
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/tvNoGrouping" />
-            </eu.faircode.email.ConstraintLayoutEx>
+            </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.cardview.widget.CardView>
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
diff --git a/app/src/main/res/layout/fragment_options_privacy.xml b/app/src/main/res/layout/fragment_options_privacy.xml
index acb072f589..65d59b5cbe 100644
--- a/app/src/main/res/layout/fragment_options_privacy.xml
+++ b/app/src/main/res/layout/fragment_options_privacy.xml
@@ -12,12 +12,12 @@
     android:scrollbarStyle="outsideOverlay"
     tools:context=".ActivitySetup">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingBottom="24dp">
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvDefault"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -32,7 +32,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibHelp"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -58,13 +58,13 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvDefault">
 
-            <eu.faircode.email.ConstraintLayoutEx
+            <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingHorizontal="6dp"
                 android:paddingVertical="12dp">
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvCaptionGeneral"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -87,7 +87,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvCaptionGeneral"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvConfirmLinksHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -136,7 +136,7 @@
                     app:layout_constraintTop_toBottomOf="@+id/swBrowseLinks"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvConfirmImagesHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -185,7 +185,7 @@
                     app:layout_constraintTop_toBottomOf="@+id/swHtmlImages"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvConfirmHtmlHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -223,7 +223,7 @@
                     app:layout_constraintTop_toBottomOf="@+id/swAskHtml"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvBiometrics"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -258,7 +258,7 @@
                     app:layout_constraintBottom_toBottomOf="@id/btnBiometrics"
                     app:layout_constraintStart_toStartOf="parent" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvPinHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -271,7 +271,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/btnPin" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvBiometricsTimeout"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -321,7 +321,7 @@
                     app:layout_constraintTop_toBottomOf="@+id/swAutoLock"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvAutoLockNavHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -334,7 +334,7 @@
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/swAutoLockNav" />
-            </eu.faircode.email.ConstraintLayoutEx>
+            </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.cardview.widget.CardView>
 
         <androidx.cardview.widget.CardView
@@ -350,13 +350,13 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cardGeneral">
 
-            <eu.faircode.email.ConstraintLayoutEx
+            <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingHorizontal="6dp"
                 android:paddingVertical="12dp">
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvAdvanced"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -384,7 +384,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvAdvanced"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvClientId"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -396,7 +396,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/swClientId" />
 
-                <eu.faircode.email.FixedImageButton
+                <ImageButton
                     android:id="@+id/ibClientId"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -430,7 +430,7 @@
                     app:layout_constraintTop_toBottomOf="@id/swHideTimeZone"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvDisplayHiddenHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -454,7 +454,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvDisplayHiddenHint"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedImageButton
+                <ImageButton
                     android:id="@+id/ibIncognitoKeyboard"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -475,7 +475,7 @@
                     app:layout_constraintTop_toBottomOf="@id/ibIncognitoKeyboard"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvSecureHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -498,7 +498,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvSecureHint"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvGenericUserAgent"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -510,7 +510,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/swGenericUserAgent" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvUserAgentHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -534,7 +534,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvUserAgentHint"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvSafeBrowsingHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -547,7 +547,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/swSafeBrowsing" />
 
-                <eu.faircode.email.FixedImageButton
+                <ImageButton
                     android:id="@+id/ibSafeBrowsing"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -568,7 +568,7 @@
                     app:layout_constraintTop_toBottomOf="@id/ibSafeBrowsing"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvLoadEmojiHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -580,7 +580,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/swLoadEmoji" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvDisconnectBlacklist"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -594,7 +594,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvLoadEmojiHint" />
 
-                <eu.faircode.email.FixedImageButton
+                <ImageButton
                     android:id="@+id/ibDisconnectBlacklist"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -616,7 +616,7 @@
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvDisconnectBlacklist" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvDisconnectBlacklistTime"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -687,7 +687,7 @@
                     app:layout_constraintTop_toBottomOf="@+id/btnClearAll"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvMnemonicHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -699,7 +699,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/swMnemonic" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvMnemonic"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -719,7 +719,7 @@
                     android:layout_width="0dp"
                     android:layout_height="0dp"
                     app:constraint_referenced_ids="swSafeBrowsing,tvSafeBrowsingHint,ibSafeBrowsing" />
-            </eu.faircode.email.ConstraintLayoutEx>
+            </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.cardview.widget.CardView>
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
diff --git a/app/src/main/res/layout/fragment_options_send.xml b/app/src/main/res/layout/fragment_options_send.xml
index cc13a9273b..cdec48dd79 100644
--- a/app/src/main/res/layout/fragment_options_send.xml
+++ b/app/src/main/res/layout/fragment_options_send.xml
@@ -12,12 +12,12 @@
     android:scrollbarStyle="outsideOverlay"
     tools:context=".ActivitySetup">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingBottom="24dp">
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvDefault"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -32,7 +32,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibHelp"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -58,13 +58,13 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvDefault">
 
-            <eu.faircode.email.ConstraintLayoutEx
+            <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingHorizontal="6dp"
                 android:paddingVertical="12dp">
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvCaptionGeneral"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -110,7 +110,7 @@
                     app:layout_constraintTop_toBottomOf="@id/swKeyboardNoFullscreen"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvSuggestNames"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -121,7 +121,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/swSuggestNames" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvSuggestLocal"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -132,7 +132,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvSuggestNames" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvSuggestLocalHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -207,7 +207,7 @@
                     app:layout_constraintTop_toBottomOf="@id/btnLocalContacts"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvAutoIdentity"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -243,7 +243,7 @@
                     app:layout_constraintTop_toBottomOf="@id/swSendChips"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvSendReminders"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -300,7 +300,7 @@
                     app:layout_constraintTop_toBottomOf="@id/swAutoSaveDot"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvSendDelayed"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -322,7 +322,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvSendDelayed" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvAnswerAction"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -355,7 +355,7 @@
                     android:text="@string/title_advanced_sound"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/spAnswerAction" />
-            </eu.faircode.email.ConstraintLayoutEx>
+            </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.cardview.widget.CardView>
 
         <androidx.cardview.widget.CardView
@@ -371,13 +371,13 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cardGeneral">
 
-            <eu.faircode.email.ConstraintLayoutEx
+            <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingHorizontal="6dp"
                 android:paddingVertical="12dp">
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvCaptionMessage"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -388,7 +388,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvComposeFont"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -434,7 +434,7 @@
                     app:layout_constraintTop_toBottomOf="@id/swPrefixOnce"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvAltReFws"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -573,7 +573,7 @@
                     app:layout_constraintTop_toBottomOf="@id/swQuoteLimit"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvSignatureLocation"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -654,7 +654,7 @@
                     android:text="@string/title_edit_signature"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/swSignatureForward" />
-            </eu.faircode.email.ConstraintLayoutEx>
+            </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.cardview.widget.CardView>
 
         <androidx.cardview.widget.CardView
@@ -670,13 +670,13 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cardMessage">
 
-            <eu.faircode.email.ConstraintLayoutEx
+            <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingHorizontal="6dp"
                 android:paddingVertical="12dp">
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvCaptionAdvanced"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -748,7 +748,7 @@
                     app:layout_constraintTop_toBottomOf="@id/swFormatFlowed"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvUsenetSignatureHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -771,7 +771,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvUsenetSignatureHint"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvRemoveSignaturesHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -794,7 +794,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvRemoveSignaturesHint"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvReceiptType"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -850,7 +850,7 @@
                     app:layout_constraintTop_toBottomOf="@id/swForwardNew"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvCheckMxHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -873,7 +873,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvCheckMxHint"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvReplyMoveHint"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -883,7 +883,7 @@
                     android:textStyle="italic"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/swReplyMove" />
-            </eu.faircode.email.ConstraintLayoutEx>
+            </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.cardview.widget.CardView>
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
diff --git a/app/src/main/res/layout/fragment_options_synchronize.xml b/app/src/main/res/layout/fragment_options_synchronize.xml
index 22e70faca5..22ee991e9f 100644
--- a/app/src/main/res/layout/fragment_options_synchronize.xml
+++ b/app/src/main/res/layout/fragment_options_synchronize.xml
@@ -12,12 +12,12 @@
     android:scrollbarStyle="outsideOverlay"
     tools:context=".ActivitySetup">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingBottom="24dp">
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvDefault"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -32,7 +32,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibHelp"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -58,13 +58,13 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvDefault">
 
-            <eu.faircode.email.ConstraintLayoutEx
+            <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingHorizontal="6dp"
                 android:paddingVertical="12dp">
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvCaptionGeneral"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -87,7 +87,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvCaptionGeneral"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvManualHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -99,7 +99,7 @@
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/swEnabled" />
-            </eu.faircode.email.ConstraintLayoutEx>
+            </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.cardview.widget.CardView>
 
         <androidx.cardview.widget.CardView
@@ -115,13 +115,13 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cardGeneral">
 
-            <eu.faircode.email.ConstraintLayoutEx
+            <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingHorizontal="6dp"
                 android:paddingVertical="12dp">
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvWhen"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -144,7 +144,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvWhen"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvOptimizeHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -157,7 +157,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/swOptimize" />
 
-                <eu.faircode.email.FixedImageButton
+                <ImageButton
                     android:id="@+id/ibOptimizeInfo"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -176,7 +176,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvOptimizeHint" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvPollBattery"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -190,7 +190,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/spPollInterval" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvPollHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -203,7 +203,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvPollBattery" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvExempted"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -237,7 +237,7 @@
                     app:layout_constraintTop_toBottomOf="@id/rvExempted"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvSchedulePro"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -247,7 +247,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/swSchedule" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvScheduleStart"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -258,7 +258,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvSchedulePro" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvScheduleSeparator"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -269,7 +269,7 @@
                     app:layout_constraintStart_toEndOf="@id/tvScheduleStart"
                     app:layout_constraintTop_toTopOf="@id/tvScheduleStart" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvScheduleEnd"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -280,7 +280,7 @@
                     app:layout_constraintStart_toEndOf="@id/tvScheduleSeparator"
                     app:layout_constraintTop_toTopOf="@id/tvScheduleStart" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvScheduleHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -349,7 +349,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/cbDay5" />
 
-                <eu.faircode.email.FixedImageButton
+                <ImageButton
                     android:id="@+id/ibSchedules"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -360,7 +360,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvScheduleHint"
                     app:srcCompat="@drawable/twotone_info_24" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvScheduleIgnore"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -392,7 +392,7 @@
                     android:layout_width="0dp"
                     android:layout_height="0dp"
                     app:constraint_referenced_ids="tvExempted,rvExempted" />
-            </eu.faircode.email.ConstraintLayoutEx>
+            </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.cardview.widget.CardView>
 
         <androidx.cardview.widget.CardView
@@ -408,13 +408,13 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cardWhen">
 
-            <eu.faircode.email.ConstraintLayoutEx
+            <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingHorizontal="6dp"
                 android:paddingVertical="12dp">
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvAdvanced"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -430,7 +430,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvQuickSync"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -468,7 +468,7 @@
                     app:layout_constraintTop_toBottomOf="@id/swQuickSyncImap"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvQuickSyncHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -492,7 +492,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvQuickSyncHint"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvNodateHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -515,7 +515,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvNodateHint"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvUnseenHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -527,7 +527,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/swUnseen" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvUnseenHintData"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -552,7 +552,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvUnseenHintData"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvFlaggedHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -564,7 +564,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/swFlagged" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvFlaggedHintData"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -588,7 +588,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvFlaggedHintData"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvDeleteUnseen"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -612,7 +612,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvDeleteUnseen"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvSyncKeptHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -635,7 +635,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvSyncKeptHint"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvGmailThreadHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -658,7 +658,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvGmailThreadHint"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvOutlookThreadHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -683,7 +683,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvOutlookThreadHint"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvSubjectThreading"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -708,7 +708,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvSubjectThreading"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvSyncFolders"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -732,7 +732,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvSyncFolders"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvSyncFoldersPoll"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -779,7 +779,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/swSubscriptions"
                     app:switchPadding="12dp" />
-            </eu.faircode.email.ConstraintLayoutEx>
+            </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.cardview.widget.CardView>
 
         <androidx.cardview.widget.CardView
@@ -795,13 +795,13 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cardAdvanced">
 
-            <eu.faircode.email.ConstraintLayoutEx
+            <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingHorizontal="6dp"
                 android:paddingVertical="12dp">
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvCaptionChecks"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -829,7 +829,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvCaptionChecks"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvCheckAuthenticationHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -841,7 +841,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/swCheckAuthentication" />
 
-                <eu.faircode.email.FixedImageButton
+                <ImageButton
                     android:id="@+id/ibCheckAuthenticationInfo"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -863,7 +863,7 @@
                     app:layout_constraintTop_toBottomOf="@id/ibCheckAuthenticationInfo"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvCheckTlsHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -876,7 +876,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/swCheckTls" />
 
-                <eu.faircode.email.FixedImageButton
+                <ImageButton
                     android:id="@+id/ibCheckTlsInfo"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -899,7 +899,7 @@
                     app:layout_constraintTop_toBottomOf="@id/ibCheckTlsInfo"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvCheckReplyHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -922,7 +922,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvCheckReplyHint"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvCheckMxHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -934,7 +934,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/swCheckMx" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvCheckMxWarning"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -958,7 +958,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvCheckMxWarning"
                     app:switchPadding="12dp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvCheckBlocklistWarning"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -1005,7 +1005,7 @@
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/swUseBlocklistPop" />
-            </eu.faircode.email.ConstraintLayoutEx>
+            </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.cardview.widget.CardView>
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
diff --git a/app/src/main/res/layout/fragment_order.xml b/app/src/main/res/layout/fragment_order.xml
index 4564901b29..524697905e 100644
--- a/app/src/main/res/layout/fragment_order.xml
+++ b/app/src/main/res/layout/fragment_order.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ConstraintLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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"
@@ -33,4 +33,4 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:constraint_referenced_ids="rvOrder" />
-</eu.faircode.email.ConstraintLayoutEx>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_pop.xml b/app/src/main/res/layout/fragment_pop.xml
index 2b91c5e0e3..e36076510f 100644
--- a/app/src/main/res/layout/fragment_pop.xml
+++ b/app/src/main/res/layout/fragment_pop.xml
@@ -9,14 +9,14 @@
     android:scrollbarStyle="outsideOverlay"
     tools:context="eu.faircode.email.ActivitySetup">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:descendantFocusability="beforeDescendants"
         android:focusable="true"
         android:focusableInTouchMode="true">
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvPopSupport"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -26,7 +26,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvPopSent"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -37,7 +37,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvPopSupport" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvPopWarning"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -48,7 +48,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvPopSent" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvHost"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -70,7 +70,7 @@
 
         <!-- SSL/STARTTLS -->
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvEncryption"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -119,7 +119,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/rgEncryption" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvInsecureRemark"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -135,7 +135,7 @@
 
         <!-- port -->
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvPort"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -158,7 +158,7 @@
 
         <!-- user -->
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvUser"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -181,7 +181,7 @@
 
         <!-- password -->
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvPassword"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -206,7 +206,7 @@
                 android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
         </com.google.android.material.textfield.TextInputLayout>
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvCaseSensitive"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -217,7 +217,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tilPassword" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvPasswordStorage"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -233,7 +233,7 @@
 
         <!-- name -->
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvName"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -243,7 +243,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvPasswordStorage" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvNameRemark"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -264,7 +264,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvNameRemark" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvCategory"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -284,7 +284,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvCategory" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvColor"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -306,7 +306,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvColor" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvColorHint"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -317,7 +317,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/btnColor" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvColorPro"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -373,7 +373,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbPrimary" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvNotifyPro"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -420,7 +420,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbLeaveDeleted" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvMax"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -443,7 +443,7 @@
 
         <!-- keep alive -->
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvInterval"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -463,7 +463,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvInterval" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvIntervalRemark"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -482,7 +482,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvIntervalRemark" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvLeft"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -500,7 +500,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvLeft" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvRight"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -552,7 +552,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/btnSave" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvErrorTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -563,7 +563,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbIdentity" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvError"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -591,5 +591,5 @@
             android:layout_width="0dp"
             android:layout_height="0dp"
             app:constraint_referenced_ids="tvErrorTitle,tvError" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
diff --git a/app/src/main/res/layout/fragment_pro.xml b/app/src/main/res/layout/fragment_pro.xml
index 136448b553..76a56688f9 100644
--- a/app/src/main/res/layout/fragment_pro.xml
+++ b/app/src/main/res/layout/fragment_pro.xml
@@ -8,11 +8,11 @@
     android:scrollbarStyle="outsideOverlay"
     tools:context="eu.faircode.email.ActivityView">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvPending"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -25,7 +25,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvActivated"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -46,7 +46,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvActivated" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvInfo"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -65,7 +65,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvInfo" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvList"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -79,7 +79,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbHide" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvWhichever"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -100,7 +100,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvWhichever" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivExternal"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -111,7 +111,7 @@
             app:layout_constraintTop_toTopOf="@+id/btnPurchase"
             app:srcCompat="@drawable/twotone_open_in_new_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvPrice"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -121,7 +121,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/btnPurchase" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvGoogle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -131,7 +131,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvPrice" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvNoPlay"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -142,7 +142,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/tvGoogle" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvHint"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -152,7 +152,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvNoPlay" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvPriceHint"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -166,7 +166,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvHint" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvFamilyHint"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -180,7 +180,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvPriceHint" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvRestoreHint"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -216,7 +216,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/btnSupport" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivConnected"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -225,5 +225,5 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvRestoreHint"
             app:srcCompat="@drawable/twotone_cloud_off_24" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
diff --git a/app/src/main/res/layout/fragment_quick_setup.xml b/app/src/main/res/layout/fragment_quick_setup.xml
index d6d4c8f7d1..13d9db341e 100644
--- a/app/src/main/res/layout/fragment_quick_setup.xml
+++ b/app/src/main/res/layout/fragment_quick_setup.xml
@@ -9,11 +9,11 @@
     android:scrollbarStyle="outsideOverlay"
     tools:context="eu.faircode.email.ActivitySetup">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -23,7 +23,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvPrivacy"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -86,7 +86,7 @@
                 android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
         </com.google.android.material.textfield.TextInputLayout>
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvCharacters"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -96,7 +96,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tilPassword" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvCaseSensitiveHint"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -131,7 +131,7 @@
             app:layout_constraintStart_toEndOf="@id/btnCheck"
             app:layout_constraintTop_toTopOf="@id/btnCheck" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvPatience"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -143,7 +143,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/btnCheck" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvErrorTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -154,7 +154,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvPatience" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvError"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -166,7 +166,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvErrorTitle" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvErrorHint"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -179,7 +179,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvError" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvErrorRemark"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -191,7 +191,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvErrorHint" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvInstructions"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -232,7 +232,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvInstructions" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvUserTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -242,7 +242,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/btnSupport" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvUser"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -253,7 +253,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvUserTitle" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvImapTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -263,7 +263,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvUser" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvImap"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -274,7 +274,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvImapTitle" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvSmtpTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -284,7 +284,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvImap" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvSmtp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -295,7 +295,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvSmtpTitle" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvCertificateInfo"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -305,7 +305,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvSmtp" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvImapFingerprint"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -316,7 +316,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvCertificateInfo" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvImapDnsNames"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -328,7 +328,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvImapFingerprint" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvSmtpFingerprint"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -340,7 +340,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvImapDnsNames" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvSmtpDnsNames"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -407,5 +407,5 @@
             android:layout_width="0dp"
             android:layout_height="0dp"
             app:constraint_referenced_ids="tvErrorTitle,tvError,tvErrorHint,tvErrorRemark,btnSupport" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
diff --git a/app/src/main/res/layout/fragment_rule.xml b/app/src/main/res/layout/fragment_rule.xml
index 87dfa56289..ed2716113c 100644
--- a/app/src/main/res/layout/fragment_rule.xml
+++ b/app/src/main/res/layout/fragment_rule.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.CoordinatorLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="eu.faircode.email.ActivityView">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:layout_behavior="eu.faircode.email.BehaviorBottomPadding">
@@ -22,7 +22,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent">
 
-            <eu.faircode.email.ConstraintLayoutEx
+            <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/content"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -30,7 +30,7 @@
                 android:focusable="true"
                 android:focusableInTouchMode="true">
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvTitle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -39,7 +39,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvFolder"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -49,7 +49,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvTitle" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvName"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -70,7 +70,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvName" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvOrder"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -112,7 +112,7 @@
 
                 <!-- condition -->
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvCondition"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -132,7 +132,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvCondition" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvSender"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -165,7 +165,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/cbSender" />
 
-                <eu.faircode.email.FixedImageButton
+                <ImageButton
                     android:id="@+id/ibSender"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
@@ -186,7 +186,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/etSender" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvAndSender"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -206,7 +206,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvAndSender" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvRecipient"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -239,7 +239,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/cbRecipient" />
 
-                <eu.faircode.email.FixedImageButton
+                <ImageButton
                     android:id="@+id/ibRecipient"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
@@ -252,7 +252,7 @@
                     app:layout_constraintTop_toTopOf="@id/etRecipient"
                     app:srcCompat="@drawable/twotone_person_add_24" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvAndRecipient"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -272,7 +272,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvAndRecipient" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvSubject"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -304,7 +304,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/cbSubject" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvAndSubject"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -332,7 +332,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/vSeparatorAttachments" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvMimeType"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -354,7 +354,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvMimeType" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvAndAttachments"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -374,7 +374,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvAndAttachments" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvHeader"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -406,7 +406,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/cbHeader" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvAndHeader"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -426,7 +426,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvAndHeader" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvBody"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -466,7 +466,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/etBody" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvBodyRemark"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -476,7 +476,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/cbSkipQuotes" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvAndBody"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -496,7 +496,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvAndBody" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvDate"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -508,7 +508,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/vSeparatorDate" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvDateAfter"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -533,7 +533,7 @@
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvDate" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvDateBefore"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -558,7 +558,7 @@
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/btnDateAfter" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvAndDate"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -578,7 +578,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvAndDate" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvSchedule"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -608,7 +608,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="@+id/tvScheduleHourEnd" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvScheduleHourStart"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -619,7 +619,7 @@
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvSchedule" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvScheduleHourEnd"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -630,7 +630,7 @@
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvScheduleHourStart" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvAction"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -658,7 +658,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/vSeparatorAction" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvActionRemark"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -678,7 +678,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvActionRemark" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvHours"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -713,7 +713,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/cbScheduleEnd" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvColor"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -745,7 +745,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/btnColor" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvKeyword"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -765,7 +765,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvKeyword" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvMoveTarget"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -804,7 +804,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/cbMoveSeen" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvAnswerIdentity"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -822,7 +822,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvAnswerIdentity" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvAnswerTemplate"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -868,7 +868,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/cbOriginalText" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvTo"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -889,7 +889,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvTo" />
 
-                <eu.faircode.email.FixedImageButton
+                <ImageButton
                     android:id="@+id/ibTo"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
@@ -929,7 +929,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/cbAttached" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvAnswerRemark"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -985,7 +985,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/btnSound" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvAlarm"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -995,7 +995,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/cbAlarm" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvAlarmDuration"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -1019,7 +1019,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvAlarmDuration" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvAutomation"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -1029,7 +1029,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/etAlarmDuration" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvDelete"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -1127,7 +1127,7 @@
                     android:layout_width="0dp"
                     android:layout_height="0dp"
                     app:constraint_referenced_ids="tvDelete" />
-            </eu.faircode.email.ConstraintLayoutEx>
+            </androidx.constraintlayout.widget.ConstraintLayout>
         </eu.faircode.email.ScrollViewEx>
 
         <com.google.android.material.bottomnavigation.BottomNavigationView
@@ -1153,5 +1153,5 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
-    </eu.faircode.email.ConstraintLayoutEx>
-</eu.faircode.email.CoordinatorLayoutEx>
\ No newline at end of file
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_rules.xml b/app/src/main/res/layout/fragment_rules.xml
index d3b7454080..5d75a2d6e2 100644
--- a/app/src/main/res/layout/fragment_rules.xml
+++ b/app/src/main/res/layout/fragment_rules.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.CoordinatorLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="eu.faircode.email.ActivityView">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
@@ -40,7 +40,7 @@
             android:layout_width="0dp"
             android:layout_height="0dp"
             app:constraint_referenced_ids="rvRule" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fab"
@@ -53,4 +53,4 @@
         app:backgroundTint="?attr/colorFabBackground"
         app:srcCompat="@drawable/twotone_add_24"
         app:tint="?attr/colorFabForeground" />
-</eu.faircode.email.CoordinatorLayoutEx>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_setup.xml b/app/src/main/res/layout/fragment_setup.xml
index 1c7a09aff6..1a4bc74e3d 100644
--- a/app/src/main/res/layout/fragment_setup.xml
+++ b/app/src/main/res/layout/fragment_setup.xml
@@ -13,7 +13,7 @@
     android:scrollbarStyle="outsideOverlay"
     tools:context="eu.faircode.email.ActivitySetup">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingBottom="24dp">
@@ -30,14 +30,14 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent">
 
-            <eu.faircode.email.ConstraintLayoutEx
+            <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingHorizontal="6dp"
                 android:paddingTop="12dp"
                 android:tag="nosuggest">
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvWelcome"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -48,7 +48,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/intro"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -60,7 +60,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/tvWelcome" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/simple"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -73,7 +73,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/intro" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/issue"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -84,7 +84,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/simple" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/analytics"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -95,7 +95,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/issue" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvPrivacy"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -110,7 +110,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/analytics" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvSupport"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -125,7 +125,7 @@
                     app:layout_constraintStart_toEndOf="@id/tvPrivacy"
                     app:layout_constraintTop_toBottomOf="@id/analytics" />
 
-                <eu.faircode.email.FixedImageButton
+                <ImageButton
                     android:id="@+id/ibWelcome"
                     android:layout_width="36dp"
                     android:layout_height="36dp"
@@ -142,7 +142,7 @@
                     android:layout_width="0dp"
                     android:layout_height="0dp"
                     app:constraint_referenced_ids="intro,simple,issue,analytics,tvPrivacy,tvSupport" />
-            </eu.faircode.email.ConstraintLayoutEx>
+            </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.cardview.widget.CardView>
 
         <androidx.cardview.widget.CardView
@@ -158,14 +158,14 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/cardWelcome">
 
-            <eu.faircode.email.ConstraintLayoutEx
+            <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingHorizontal="6dp"
                 android:paddingVertical="12dp"
                 android:tag="nosuggest">
 
-                <eu.faircode.email.FixedImageView
+                <ImageView
                     android:id="@+id/one"
                     android:layout_width="30dp"
                     android:layout_height="30dp"
@@ -174,7 +174,7 @@
                     app:layout_constraintTop_toTopOf="parent"
                     app:srcCompat="@drawable/twotone_looks_one_24" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/title1"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -188,7 +188,7 @@
                     app:layout_constraintStart_toEndOf="@id/one"
                     app:layout_constraintTop_toTopOf="@id/one" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvNoInternet"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -204,7 +204,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/title1" />
 
-                <eu.faircode.email.FixedImageButton
+                <ImageButton
                     android:id="@+id/ibHelp"
                     android:layout_width="48dp"
                     android:layout_height="48dp"
@@ -239,7 +239,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvNoInternet" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvQuickRemarkMultiple"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -250,7 +250,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/btnQuick" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvQuickNew"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -266,7 +266,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvQuickRemarkMultiple" />
 
-                <eu.faircode.email.FixedImageButton
+                <ImageButton
                     android:id="@+id/ibManual"
                     android:layout_width="36dp"
                     android:layout_height="48dp"
@@ -279,7 +279,7 @@
                     app:srcCompat="@drawable/dropdown"
                     app:tint="?attr/colorAccent" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvManual"
                     android:layout_width="wrap_content"
                     android:layout_height="0dp"
@@ -309,7 +309,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/ibManual">
 
-                    <eu.faircode.email.ConstraintLayoutEx
+                    <androidx.constraintlayout.widget.ConstraintLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:paddingHorizontal="6dp"
@@ -322,7 +322,7 @@
                             android:orientation="vertical"
                             app:layout_constraintGuide_percent="0.5" />
 
-                        <eu.faircode.email.FixedTextView
+                        <TextView
                             android:id="@+id/classic"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
@@ -334,7 +334,7 @@
                             app:layout_constraintStart_toStartOf="parent"
                             app:layout_constraintTop_toTopOf="parent" />
 
-                        <eu.faircode.email.FixedTextView
+                        <TextView
                             android:id="@+id/tvDocumentation"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
@@ -358,7 +358,7 @@
                             app:layout_constraintStart_toStartOf="parent"
                             app:layout_constraintTop_toBottomOf="@id/tvDocumentation" />
 
-                        <eu.faircode.email.FixedTextView
+                        <TextView
                             android:id="@+id/tvAccount"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
@@ -371,7 +371,7 @@
                             app:layout_constraintStart_toStartOf="parent"
                             app:layout_constraintTop_toBottomOf="@id/btnAccount" />
 
-                        <eu.faircode.email.FixedTextView
+                        <TextView
                             android:id="@+id/tvImap"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
@@ -382,7 +382,7 @@
                             app:layout_constraintStart_toStartOf="parent"
                             app:layout_constraintTop_toBottomOf="@id/tvAccount" />
 
-                        <eu.faircode.email.FixedTextView
+                        <TextView
                             android:id="@+id/tvPop"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
@@ -407,7 +407,7 @@
                             app:layout_constraintStart_toEndOf="@+id/guideline_center"
                             app:layout_constraintTop_toBottomOf="@id/tvDocumentation" />
 
-                        <eu.faircode.email.FixedTextView
+                        <TextView
                             android:id="@+id/tvIdentity"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
@@ -420,7 +420,7 @@
                             app:layout_constraintStart_toEndOf="@id/guideline_center"
                             app:layout_constraintTop_toBottomOf="@id/btnIdentity" />
 
-                        <eu.faircode.email.FixedTextView
+                        <TextView
                             android:id="@+id/tvSmtp"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
@@ -431,7 +431,7 @@
                             app:layout_constraintStart_toEndOf="@id/guideline_center"
                             app:layout_constraintTop_toBottomOf="@id/tvIdentity" />
 
-                        <eu.faircode.email.FixedTextView
+                        <TextView
                             android:id="@+id/tvAliases"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
@@ -450,7 +450,7 @@
                             app:barrierDirection="bottom"
                             app:constraint_referenced_ids="tvImap,tvPop,tvSmtp,tvAliases" />
 
-                        <eu.faircode.email.FixedTextView
+                        <TextView
                             android:id="@+id/tvAccountIdentity"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
@@ -461,7 +461,7 @@
                             app:layout_constraintStart_toStartOf="parent"
                             app:layout_constraintTop_toBottomOf="@id/barrier_manual" />
 
-                        <eu.faircode.email.FixedTextView
+                        <TextView
                             android:id="@+id/tvExchangeSupport"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
@@ -476,7 +476,7 @@
                             app:layout_constraintStart_toStartOf="parent"
                             app:layout_constraintTop_toBottomOf="@id/tvAccountIdentity" />
 
-                        <eu.faircode.email.FixedTextView
+                        <TextView
                             android:id="@+id/tvIdentityWhat"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
@@ -490,10 +490,10 @@
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintStart_toStartOf="parent"
                             app:layout_constraintTop_toBottomOf="@id/tvExchangeSupport" />
-                    </eu.faircode.email.ConstraintLayoutEx>
+                    </androidx.constraintlayout.widget.ConstraintLayout>
                 </androidx.cardview.widget.CardView>
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvNoComposable"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -517,7 +517,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvNoComposable" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvFree"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -531,7 +531,7 @@
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/btnInbox" />
-            </eu.faircode.email.ConstraintLayoutEx>
+            </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.cardview.widget.CardView>
 
         <androidx.cardview.widget.CardView
@@ -547,14 +547,14 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/cardWizard">
 
-            <eu.faircode.email.ConstraintLayoutEx
+            <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingHorizontal="6dp"
                 android:paddingVertical="12dp"
                 android:tag="nosuggest">
 
-                <eu.faircode.email.FixedImageView
+                <ImageView
                     android:id="@+id/two"
                     android:layout_width="30dp"
                     android:layout_height="30dp"
@@ -564,7 +564,7 @@
                     app:layout_constraintTop_toTopOf="parent"
                     app:srcCompat="@drawable/twotone_looks_two_24" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/title2"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -578,7 +578,7 @@
                     app:layout_constraintStart_toEndOf="@id/two"
                     app:layout_constraintTop_toTopOf="@id/two" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvContactPermissions"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -588,7 +588,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/title2" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvNotificationPermissions"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -598,7 +598,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvContactPermissions" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvPermissionsDone"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -622,7 +622,7 @@
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvNotificationPermissions" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvPermissionsWhy"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -636,7 +636,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/btnPermissions" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvImportContacts"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -649,7 +649,7 @@
                     android:textColor="?android:attr/textColorLink"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvPermissionsWhy" />
-            </eu.faircode.email.ConstraintLayoutEx>
+            </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.cardview.widget.CardView>
 
         <androidx.cardview.widget.CardView
@@ -665,14 +665,14 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/cardPermissions">
 
-            <eu.faircode.email.ConstraintLayoutEx
+            <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingHorizontal="6dp"
                 android:paddingVertical="12dp"
                 android:tag="nosuggest">
 
-                <eu.faircode.email.FixedImageView
+                <ImageView
                     android:id="@+id/three"
                     android:layout_width="30dp"
                     android:layout_height="30dp"
@@ -682,7 +682,7 @@
                     app:layout_constraintTop_toTopOf="parent"
                     app:srcCompat="@drawable/twotone_looks_3_24" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/title3"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -696,7 +696,7 @@
                     app:layout_constraintStart_toEndOf="@id/three"
                     app:layout_constraintTop_toTopOf="@id/three" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvDoze"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -706,7 +706,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/title3" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvDozeDone"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -730,7 +730,7 @@
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvDoze" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvDoze12"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -745,7 +745,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/btnDoze" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvDozeHint"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -755,7 +755,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvDoze12" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvDozeWhy"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -769,7 +769,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvDozeHint" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvBackgroundRestricted"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -797,7 +797,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvBackgroundRestricted" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvDataSaver"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -825,7 +825,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvDataSaver" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvStamina"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -840,7 +840,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/btnDataSaver" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvBatteryUsage"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -854,7 +854,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvStamina" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvSyncStopped"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -879,7 +879,7 @@
                     android:layout_width="0dp"
                     android:layout_height="0dp"
                     app:constraint_referenced_ids="tvDataSaver,btnDataSaver" />
-            </eu.faircode.email.ConstraintLayoutEx>
+            </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.cardview.widget.CardView>
 
         <androidx.cardview.widget.CardView
@@ -895,13 +895,13 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cardDoze">
 
-            <eu.faircode.email.ConstraintLayoutEx
+            <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingHorizontal="6dp"
                 android:paddingTop="12dp">
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvExtra"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -925,7 +925,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvExtra" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvNotificationHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -949,7 +949,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvNotificationHint" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvDeleteHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -985,7 +985,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/btnApp" />
 
-                <eu.faircode.email.FixedTextView
+                <TextView
                     android:id="@+id/tvSupportHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -1009,7 +1009,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvSupportHint" />
 
-                <eu.faircode.email.FixedImageView
+                <ImageView
                     android:id="@+id/ivExternal"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -1019,7 +1019,7 @@
                     app:layout_constraintTop_toTopOf="@id/btnSupport"
                     app:srcCompat="@drawable/twotone_open_in_new_24" />
 
-                <eu.faircode.email.FixedImageButton
+                <ImageButton
                     android:id="@+id/ibExtra"
                     android:layout_width="36dp"
                     android:layout_height="36dp"
@@ -1042,7 +1042,7 @@
                     android:layout_width="0dp"
                     android:layout_height="0dp"
                     app:constraint_referenced_ids="btnNotification,tvNotificationHint,btnDelete,tvDeleteHint,btnApp,btnMore" />
-            </eu.faircode.email.ConstraintLayoutEx>
+            </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.cardview.widget.CardView>
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
diff --git a/app/src/main/res/layout/include_eula.xml b/app/src/main/res/layout/include_eula.xml
index 8af34f1676..9672f8e954 100644
--- a/app/src/main/res/layout/include_eula.xml
+++ b/app/src/main/res/layout/include_eula.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ConstraintLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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">
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvWelcome"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -14,7 +14,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvLimitations"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -25,7 +25,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvWelcome" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvEulaTitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -36,7 +36,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvLimitations" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvEula"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -48,7 +48,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvEulaTitle" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvLicense"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -59,7 +59,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvEula" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvGplV3"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -69,4 +69,4 @@
         android:textColor="?android:attr/textColorLink"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvLicense" />
-</eu.faircode.email.ConstraintLayoutEx>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/include_message_action.xml b/app/src/main/res/layout/include_message_action.xml
index a18061bd19..4ffafd9f72 100644
--- a/app/src/main/res/layout/include_message_action.xml
+++ b/app/src/main/res/layout/include_message_action.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ConstraintLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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"
@@ -16,7 +16,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvActionTitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -48,4 +48,4 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:constraint_referenced_ids="vSeparatorAction,tvActionTitle,flow" />
-</eu.faircode.email.ConstraintLayoutEx>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/include_message_addresses.xml b/app/src/main/res/layout/include_message_addresses.xml
index 5e495ec59f..eaf22e90e6 100644
--- a/app/src/main/res/layout/include_message_addresses.xml
+++ b/app/src/main/res/layout/include_message_addresses.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ConstraintLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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">
@@ -13,7 +13,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <eu.faircode.email.FixedImageButton
+    <ImageButton
         android:id="@+id/ibExpanderAddress"
         android:layout_width="0dp"
         android:layout_height="24dp"
@@ -35,7 +35,7 @@
         app:layout_constraintTop_toBottomOf="@id/ibExpanderAddress"
         app:srcCompat="@drawable/twotone_notes_24" />
 
-    <eu.faircode.email.FixedImageButton
+    <ImageButton
         android:id="@+id/ibReceipt"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -76,7 +76,7 @@
         app:layout_constraintTop_toBottomOf="@id/ibExpanderAddress"
         app:srcCompat="@drawable/twotone_raw_on_24" />
 
-    <eu.faircode.email.FixedImageButton
+    <ImageButton
         android:id="@+id/ibSearchContact"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -88,7 +88,7 @@
         app:layout_constraintTop_toBottomOf="@id/ibExpanderAddress"
         app:srcCompat="@drawable/twotone_search_24" />
 
-    <eu.faircode.email.FixedImageButton
+    <ImageButton
         android:id="@+id/ibNotifyContact"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -100,7 +100,7 @@
         app:layout_constraintTop_toBottomOf="@id/ibExpanderAddress"
         app:srcCompat="@drawable/twotone_notifications_24" />
 
-    <eu.faircode.email.FixedImageButton
+    <ImageButton
         android:id="@+id/ibPinContact"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -112,7 +112,7 @@
         app:layout_constraintTop_toBottomOf="@id/ibExpanderAddress"
         app:srcCompat="@drawable/twotone_person_pin_circle_24" />
 
-    <eu.faircode.email.FixedImageButton
+    <ImageButton
         android:id="@+id/ibAddContact"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -131,7 +131,7 @@
         app:barrierDirection="bottom"
         app:constraint_referenced_ids="ivPlain,ibReceipt,ivAutoSubmitted,ivBrowsed,ivRaw,ibSearchContact,ibNotifyContact,ibPinContact,ibAddContact" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvSubmitterTitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -143,7 +143,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/barrier_action" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvSubmitter"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -156,7 +156,7 @@
         app:layout_constraintStart_toEndOf="@+id/barrier_addresses"
         app:layout_constraintTop_toBottomOf="@id/barrier_action" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvDeliveredToTitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -168,7 +168,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvSubmitter" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvDeliveredTo"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -181,7 +181,7 @@
         app:layout_constraintStart_toEndOf="@+id/barrier_addresses"
         app:layout_constraintTop_toBottomOf="@id/tvSubmitter" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvFromExTitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -193,7 +193,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvDeliveredTo" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvFromEx"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -206,7 +206,7 @@
         app:layout_constraintStart_toEndOf="@+id/barrier_addresses"
         app:layout_constraintTop_toBottomOf="@id/tvDeliveredTo" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvToTitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -218,7 +218,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvFromEx" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvTo"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -231,7 +231,7 @@
         app:layout_constraintStart_toEndOf="@+id/barrier_addresses"
         app:layout_constraintTop_toBottomOf="@id/tvFromEx" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvReplyToTitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -243,7 +243,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvTo" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvReplyTo"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -256,7 +256,7 @@
         app:layout_constraintStart_toEndOf="@+id/barrier_addresses"
         app:layout_constraintTop_toBottomOf="@id/tvTo" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvCcTitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -268,7 +268,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvReplyTo" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvCc"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -281,7 +281,7 @@
         app:layout_constraintStart_toEndOf="@+id/barrier_addresses"
         app:layout_constraintTop_toBottomOf="@id/tvReplyTo" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvBccTitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -293,7 +293,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvCc" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvBcc"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -306,7 +306,7 @@
         app:layout_constraintStart_toEndOf="@+id/barrier_addresses"
         app:layout_constraintTop_toBottomOf="@id/tvCc" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvIdentityTitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -318,7 +318,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvBcc" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvIdentity"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -331,7 +331,7 @@
         app:layout_constraintStart_toEndOf="@+id/barrier_addresses"
         app:layout_constraintTop_toBottomOf="@id/tvBcc" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvSentTitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -343,7 +343,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvIdentity" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvSent"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -356,7 +356,7 @@
         app:layout_constraintStart_toEndOf="@+id/barrier_addresses"
         app:layout_constraintTop_toBottomOf="@id/tvIdentity" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvReceivedTitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -368,7 +368,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvSent" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvReceived"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -381,7 +381,7 @@
         app:layout_constraintStart_toEndOf="@+id/barrier_addresses"
         app:layout_constraintTop_toBottomOf="@id/tvSent" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvStoredTitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -393,7 +393,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvReceived" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvStored"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -406,7 +406,7 @@
         app:layout_constraintStart_toEndOf="@+id/barrier_addresses"
         app:layout_constraintTop_toBottomOf="@id/tvReceived" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvSizeExTitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -418,7 +418,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvStored" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvSizeEx"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -431,7 +431,7 @@
         app:layout_constraintStart_toEndOf="@+id/barrier_addresses"
         app:layout_constraintTop_toBottomOf="@id/tvStored" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvLanguageTitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -443,7 +443,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvSizeEx" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvLanguage"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -456,7 +456,7 @@
         app:layout_constraintStart_toEndOf="@+id/barrier_addresses"
         app:layout_constraintTop_toBottomOf="@id/tvSizeEx" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvThreadTitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -468,7 +468,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvLanguage" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvThread"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -494,7 +494,7 @@
             tvSentTitle,tvReceivedTitle,tvStoredTitle,
             tvSizeExTitle,tvLanguageTitle,tvThreadTitle" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvSubjectEx"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -507,7 +507,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvThread" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvFlags"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -520,7 +520,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvSubjectEx" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvKeywordsEx"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -538,4 +538,4 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:constraint_referenced_ids="vSeparatorAddress,ibExpanderAddress" />
-</eu.faircode.email.ConstraintLayoutEx>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/include_message_attachments.xml b/app/src/main/res/layout/include_message_attachments.xml
index 92b66c3274..e84bc700b9 100644
--- a/app/src/main/res/layout/include_message_attachments.xml
+++ b/app/src/main/res/layout/include_message_attachments.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ConstraintLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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">
@@ -25,7 +25,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/vSeparatorAttachments" />
 
-    <eu.faircode.email.FixedImageButton
+    <ImageButton
         android:id="@+id/ibDownloadAttachments"
         android:layout_width="36dp"
         android:layout_height="36dp"
@@ -38,7 +38,7 @@
         app:layout_constraintTop_toBottomOf="@+id/vSeparatorAttachments"
         app:srcCompat="@drawable/twotone_cloud_download_24" />
 
-    <eu.faircode.email.FixedImageButton
+    <ImageButton
         android:id="@+id/ibSaveAttachments"
         android:layout_width="36dp"
         android:layout_height="36dp"
@@ -67,7 +67,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/barrier_internet" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvNoInternetAttachments"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -86,4 +86,4 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:constraint_referenced_ids="vSeparatorAttachments,rvAttachment" />
-</eu.faircode.email.ConstraintLayoutEx>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/include_message_body.xml b/app/src/main/res/layout/include_message_body.xml
index b2967b804a..9bb6c43d38 100644
--- a/app/src/main/res/layout/include_message_body.xml
+++ b/app/src/main/res/layout/include_message_body.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ConstraintLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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">
@@ -40,7 +40,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/inAttachments" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvNoInternetBody"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -53,7 +53,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/inNavigation" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvDownloading"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -75,7 +75,7 @@
         app:layout_constraintStart_toStartOf="@id/tvDownloading"
         app:layout_constraintTop_toTopOf="@id/tvDownloading" />
 
-    <eu.faircode.email.FixedImageButton
+    <ImageButton
         android:id="@+id/ibDownloading"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -86,7 +86,7 @@
         app:layout_constraintTop_toTopOf="@+id/tvDownloading"
         app:srcCompat="@drawable/twotone_info_24" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvBody"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -122,7 +122,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvBody" />
 
-    <eu.faircode.email.FixedImageButton
+    <ImageButton
         android:id="@+id/ibInfrastructure"
         android:layout_width="36dp"
         android:layout_height="36dp"
@@ -133,7 +133,7 @@
         app:layout_constraintTop_toBottomOf="@id/wvBody"
         app:srcCompat="@drawable/infra_awsses" />
 
-    <eu.faircode.email.FixedImageButton
+    <ImageButton
         android:id="@+id/ibTrashBottom"
         android:layout_width="36dp"
         android:layout_height="36dp"
@@ -147,7 +147,7 @@
         app:srcCompat="@drawable/twotone_delete_24"
         app:tint="?attr/colorAccent" />
 
-    <eu.faircode.email.FixedImageButton
+    <ImageButton
         android:id="@+id/ibArchiveBottom"
         android:layout_width="36dp"
         android:layout_height="36dp"
@@ -162,7 +162,7 @@
         app:srcCompat="@drawable/twotone_archive_24"
         app:tint="?attr/colorAccent" />
 
-    <eu.faircode.email.FixedImageButton
+    <ImageButton
         android:id="@+id/ibMoveBottom"
         android:layout_width="36dp"
         android:layout_height="36dp"
@@ -177,7 +177,7 @@
         app:srcCompat="@drawable/twotone_drive_file_move_24"
         app:tint="?attr/colorAccent" />
 
-    <eu.faircode.email.FixedImageButton
+    <ImageButton
         android:id="@+id/ibSeenBottom"
         android:layout_width="36dp"
         android:layout_height="36dp"
@@ -233,4 +233,4 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:constraint_referenced_ids="tvDownloading,pbDownloading,ibDownloading" />
-</eu.faircode.email.ConstraintLayoutEx>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/include_message_calendar.xml b/app/src/main/res/layout/include_message_calendar.xml
index 27dd5e6d40..5f1ff785eb 100644
--- a/app/src/main/res/layout/include_message_calendar.xml
+++ b/app/src/main/res/layout/include_message_calendar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ConstraintLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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"
@@ -16,7 +16,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <eu.faircode.email.FixedImageButton
+    <ImageButton
         android:id="@+id/ibCalendar"
         android:layout_width="36dp"
         android:layout_height="36dp"
@@ -29,7 +29,7 @@
         app:layout_constraintTop_toBottomOf="@id/vSeparatorCalendar"
         app:srcCompat="@drawable/twotone_event_24" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvCalendarSummary"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -43,7 +43,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/vSeparatorCalendar" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvCalendarDescription"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -56,7 +56,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvCalendarSummary" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvCalendarLocation"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -69,7 +69,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvCalendarDescription" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvCalendarStart"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -82,7 +82,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvCalendarLocation" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvCalendarEnd"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -95,7 +95,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvCalendarStart" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvAttendees"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -177,4 +177,4 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:constraint_referenced_ids="btnCalendarAccept,btnCalendarDecline,btnCalendarMaybe" />
-</eu.faircode.email.ConstraintLayoutEx>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/include_message_compact.xml b/app/src/main/res/layout/include_message_compact.xml
index 54565e5df8..5ca95ce23a 100644
--- a/app/src/main/res/layout/include_message_compact.xml
+++ b/app/src/main/res/layout/include_message_compact.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ConstraintLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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">
@@ -22,7 +22,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <eu.faircode.email.FixedImageButton
+    <ImageButton
         android:id="@+id/ibExpander"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -43,7 +43,7 @@
         app:layout_constraintStart_toEndOf="@+id/ibExpander"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <eu.faircode.email.FixedImageButton
+    <ImageButton
         android:id="@+id/ibAvatar"
         android:layout_width="0dp"
         android:layout_height="0dp"
@@ -57,7 +57,7 @@
         app:layout_constraintTop_toBottomOf="@id/paddingTop"
         app:srcCompat="@drawable/twotone_person_24" />
 
-    <eu.faircode.email.FixedImageButton
+    <ImageButton
         android:id="@+id/ibVerified"
         android:layout_width="21dp"
         android:layout_height="21dp"
@@ -69,7 +69,7 @@
         app:srcCompat="@drawable/verified"
         app:tint="?attr/colorAccent" />
 
-    <eu.faircode.email.FixedImageButton
+    <ImageButton
         android:id="@+id/ibAuth"
         android:layout_width="21dp"
         android:layout_height="21dp"
@@ -82,7 +82,7 @@
         app:srcCompat="@drawable/authenticated"
         app:tint="?attr/colorWarning" />
 
-    <eu.faircode.email.FixedImageButton
+    <ImageButton
         android:id="@+id/ibPriority"
         android:layout_width="21dp"
         android:layout_height="21dp"
@@ -94,7 +94,7 @@
         app:srcCompat="@drawable/priority"
         app:tint="?attr/colorAccent" />
 
-    <eu.faircode.email.FixedImageButton
+    <ImageButton
         android:id="@+id/ibSensitivity"
         android:layout_width="21dp"
         android:layout_height="21dp"
@@ -106,7 +106,7 @@
         app:srcCompat="@drawable/sensitivity"
         app:tint="?attr/colorWarning" />
 
-    <eu.faircode.email.FixedImageView
+    <ImageView
         android:id="@+id/ivImportance"
         android:layout_width="21dp"
         android:layout_height="21dp"
@@ -117,7 +117,7 @@
         app:srcCompat="@drawable/importance"
         app:tint="?attr/colorAccent" />
 
-    <eu.faircode.email.FixedImageButton
+    <ImageButton
         android:id="@+id/ibSigned"
         android:layout_width="21dp"
         android:layout_height="21dp"
@@ -129,7 +129,7 @@
         app:layout_constraintTop_toTopOf="@+id/tvFrom"
         app:srcCompat="@drawable/twotone_gesture_24" />
 
-    <eu.faircode.email.FixedImageButton
+    <ImageButton
         android:id="@+id/ibEncrypted"
         android:layout_width="21dp"
         android:layout_height="21dp"
@@ -141,7 +141,7 @@
         app:layout_constraintTop_toTopOf="@+id/tvFrom"
         app:srcCompat="@drawable/twotone_lock_24" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvFrom"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -157,7 +157,7 @@
         app:layout_constraintStart_toEndOf="@id/ibEncrypted"
         app:layout_constraintTop_toBottomOf="@id/paddingTop" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvSize"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -170,7 +170,7 @@
         app:layout_constraintEnd_toStartOf="@+id/tvTime"
         app:layout_constraintTop_toBottomOf="@id/paddingTop" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvTime"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -183,7 +183,7 @@
         app:layout_constraintEnd_toStartOf="@+id/ibFlagged"
         app:layout_constraintTop_toBottomOf="@id/paddingTop" />
 
-    <eu.faircode.email.FixedImageView
+    <ImageView
         android:id="@+id/ivType"
         android:layout_width="21dp"
         android:layout_height="21dp"
@@ -193,7 +193,7 @@
         app:layout_constraintTop_toTopOf="@+id/tvSubject"
         app:srcCompat="@drawable/twotone_edit_24" />
 
-    <eu.faircode.email.FixedImageView
+    <ImageView
         android:id="@+id/ivFound"
         android:layout_width="21dp"
         android:layout_height="21dp"
@@ -204,7 +204,7 @@
         app:layout_constraintTop_toTopOf="@+id/tvSubject"
         app:srcCompat="@drawable/twotone_search_24" />
 
-    <eu.faircode.email.FixedImageButton
+    <ImageButton
         android:id="@+id/ibSnoozed"
         android:layout_width="21dp"
         android:layout_height="21dp"
@@ -216,7 +216,7 @@
         app:layout_constraintTop_toTopOf="@+id/tvSubject"
         app:srcCompat="@drawable/twotone_timelapse_24" />
 
-    <eu.faircode.email.FixedImageView
+    <ImageView
         android:id="@+id/ivClassified"
         android:layout_width="21dp"
         android:layout_height="21dp"
@@ -227,7 +227,7 @@
         app:layout_constraintTop_toTopOf="@+id/tvSubject"
         app:srcCompat="@drawable/twotone_push_pin_24" />
 
-    <eu.faircode.email.FixedImageView
+    <ImageView
         android:id="@+id/ivAnswered"
         android:layout_width="21dp"
         android:layout_height="21dp"
@@ -238,7 +238,7 @@
         app:layout_constraintTop_toTopOf="@+id/tvSubject"
         app:srcCompat="@drawable/twotone_reply_24" />
 
-    <eu.faircode.email.FixedImageView
+    <ImageView
         android:id="@+id/ivForwarded"
         android:layout_width="21dp"
         android:layout_height="21dp"
@@ -249,7 +249,7 @@
         app:layout_constraintTop_toTopOf="@+id/tvSubject"
         app:srcCompat="@drawable/twotone_forwarded_24" />
 
-    <eu.faircode.email.FixedImageView
+    <ImageView
         android:id="@+id/ivAttachments"
         android:layout_width="21dp"
         android:layout_height="21dp"
@@ -259,7 +259,7 @@
         app:layout_constraintTop_toTopOf="@+id/tvSubject"
         app:srcCompat="@drawable/twotone_attachment_24" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvSubject"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -276,7 +276,7 @@
         app:layout_constraintStart_toEndOf="@id/ivAttachments"
         app:layout_constraintTop_toBottomOf="@id/tvFrom" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvCount"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -289,7 +289,7 @@
         app:layout_constraintEnd_toStartOf="@+id/ivThread"
         app:layout_constraintTop_toTopOf="@+id/tvSubject" />
 
-    <eu.faircode.email.FixedImageView
+    <ImageView
         android:id="@+id/ivThread"
         android:layout_width="15dp"
         android:layout_height="15dp"
@@ -299,7 +299,7 @@
         app:layout_constraintTop_toTopOf="@+id/tvSubject"
         app:srcCompat="@drawable/twotone_message_24" />
 
-    <eu.faircode.email.FixedImageButton
+    <ImageButton
         android:id="@+id/ibFlagged"
         android:layout_width="24dp"
         android:layout_height="36dp"
@@ -313,7 +313,7 @@
         app:layout_constraintTop_toBottomOf="@id/paddingTop"
         app:srcCompat="@drawable/baseline_star_24" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvKeywords"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -327,7 +327,7 @@
         app:layout_constraintStart_toEndOf="@id/ibAvatar"
         app:layout_constraintTop_toBottomOf="@id/tvSubject" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvFolder"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -344,7 +344,7 @@
         app:layout_constraintStart_toEndOf="@id/ibAvatar"
         app:layout_constraintTop_toBottomOf="@id/tvKeywords" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvLabels"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -356,7 +356,7 @@
         app:layout_constraintStart_toEndOf="@id/paddingStart"
         app:layout_constraintTop_toBottomOf="@id/tvFolder" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvExpand"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -370,7 +370,7 @@
         app:layout_constraintStart_toEndOf="@id/paddingStart"
         app:layout_constraintTop_toBottomOf="@id/tvLabels" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvPreview"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -384,7 +384,7 @@
         app:layout_constraintStart_toEndOf="@id/paddingStart"
         app:layout_constraintTop_toBottomOf="@id/tvExpand" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvNotes"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -397,7 +397,7 @@
         app:layout_constraintStart_toEndOf="@id/paddingStart"
         app:layout_constraintTop_toBottomOf="@id/tvPreview" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvError"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -412,7 +412,7 @@
         app:layout_constraintStart_toEndOf="@id/paddingStart"
         app:layout_constraintTop_toBottomOf="@id/tvNotes" />
 
-    <eu.faircode.email.FixedImageButton
+    <ImageButton
         android:id="@+id/ibError"
         android:layout_width="27dp"
         android:layout_height="27dp"
@@ -442,4 +442,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvError" />
-</eu.faircode.email.ConstraintLayoutEx>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/include_message_headers.xml b/app/src/main/res/layout/include_message_headers.xml
index 9cb3e9d2f4..e3f68e4043 100644
--- a/app/src/main/res/layout/include_message_headers.xml
+++ b/app/src/main/res/layout/include_message_headers.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ConstraintLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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">
@@ -14,7 +14,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvHeaders"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -30,7 +30,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/vSeparatorHeaders" />
 
-    <eu.faircode.email.FixedImageButton
+    <ImageButton
         android:id="@+id/ibCopyHeaders"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -40,7 +40,7 @@
         app:layout_constraintTop_toBottomOf="@+id/tvHeaders"
         app:srcCompat="@drawable/twotone_file_copy_24" />
 
-    <eu.faircode.email.FixedImageButton
+    <ImageButton
         android:id="@+id/ibCloseHeaders"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -61,7 +61,7 @@
         app:layout_constraintStart_toStartOf="@id/tvHeaders"
         app:layout_constraintTop_toTopOf="@id/tvHeaders" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvNoInternetHeaders"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -79,4 +79,4 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:constraint_referenced_ids="vSeparatorHeaders,tvHeaders,ibCloseHeaders" />
-</eu.faircode.email.ConstraintLayoutEx>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/include_message_images.xml b/app/src/main/res/layout/include_message_images.xml
index 570ee0a11b..f1494bc3d4 100644
--- a/app/src/main/res/layout/include_message_images.xml
+++ b/app/src/main/res/layout/include_message_images.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ConstraintLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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">
@@ -14,7 +14,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <eu.faircode.email.FixedImageButton
+    <ImageButton
         android:id="@+id/ibStoreMedia"
         android:layout_width="36dp"
         android:layout_height="36dp"
@@ -28,7 +28,7 @@
         app:layout_constraintTop_toBottomOf="@+id/vSeparatorImages"
         app:srcCompat="@drawable/twotone_photo_library_24" />
 
-    <eu.faircode.email.FixedImageButton
+    <ImageButton
         android:id="@+id/ibShareImages"
         android:layout_width="36dp"
         android:layout_height="36dp"
@@ -54,4 +54,4 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:constraint_referenced_ids="vSeparatorImages,ibShareImages,rvImage" />
-</eu.faircode.email.ConstraintLayoutEx>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/include_message_navigation.xml b/app/src/main/res/layout/include_message_navigation.xml
index d31c0161db..e55c324855 100644
--- a/app/src/main/res/layout/include_message_navigation.xml
+++ b/app/src/main/res/layout/include_message_navigation.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ConstraintLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/workaround"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -32,7 +32,7 @@
             app:layout_constraintTop_toBottomOf="@id/vSeparator"
             app:show_delay="750" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibTools"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -65,7 +65,7 @@
             android:layout_height="36dp"
             tools:ignore="MissingConstraints" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibMore"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -77,7 +77,7 @@
             app:srcCompat="@drawable/twotone_more_horiz_24"
             tools:ignore="MissingConstraints" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibInbox"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -89,7 +89,7 @@
             app:srcCompat="@drawable/twotone_move_to_inbox_24"
             tools:ignore="MissingConstraints" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibJunk"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -101,7 +101,7 @@
             app:srcCompat="@drawable/twotone_report_24"
             tools:ignore="MissingConstraints" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibTrash"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -113,7 +113,7 @@
             app:srcCompat="@drawable/twotone_delete_24"
             tools:ignore="MissingConstraints" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibArchive"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -125,7 +125,7 @@
             app:srcCompat="@drawable/twotone_archive_24"
             tools:ignore="MissingConstraints" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibMove"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -137,7 +137,7 @@
             app:srcCompat="@drawable/twotone_drive_file_move_24"
             tools:ignore="MissingConstraints" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibCopy"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -149,7 +149,7 @@
             app:srcCompat="@drawable/twotone_file_copy_24"
             tools:ignore="MissingConstraints" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibNotes"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -159,7 +159,7 @@
             app:srcCompat="@drawable/twotone_sticky_note_2_24"
             tools:ignore="MissingConstraints" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibRule"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -171,7 +171,7 @@
             app:srcCompat="@drawable/twotone_filter_alt_24"
             tools:ignore="MissingConstraints" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibKeywords"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -181,7 +181,7 @@
             app:srcCompat="@drawable/twotone_label_important_24"
             tools:ignore="MissingConstraints" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibLabels"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -191,7 +191,7 @@
             app:srcCompat="@drawable/twotone_label_24"
             tools:ignore="MissingConstraints" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibAnswer"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -203,7 +203,7 @@
             app:srcCompat="@drawable/twotone_reply_24"
             tools:ignore="MissingConstraints" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibSeen"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -215,7 +215,7 @@
             app:srcCompat="@drawable/twotone_mail_24"
             tools:ignore="MissingConstraints" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibHide"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -227,7 +227,7 @@
             app:srcCompat="@drawable/twotone_visibility_off_24"
             tools:ignore="MissingConstraints" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibImportance"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -239,7 +239,7 @@
             app:srcCompat="@drawable/importance"
             tools:ignore="MissingConstraints" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibSearch"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -251,7 +251,7 @@
             app:srcCompat="@drawable/twotone_search_24"
             tools:ignore="MissingConstraints" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibSearchText"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -263,7 +263,7 @@
             app:srcCompat="@drawable/twotone_manage_search_24"
             tools:ignore="MissingConstraints" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibTranslate"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -275,7 +275,7 @@
             app:srcCompat="@drawable/twotone_translate_24"
             tools:ignore="MissingConstraints" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibForceLight"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -287,7 +287,7 @@
             app:srcCompat="@drawable/lightdark"
             tools:ignore="MissingConstraints" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibEvent"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -299,7 +299,7 @@
             app:srcCompat="@drawable/twotone_event_24"
             tools:ignore="MissingConstraints" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibShare"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -311,7 +311,7 @@
             app:srcCompat="@drawable/twotone_share_24"
             tools:ignore="MissingConstraints" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibPin"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -323,7 +323,7 @@
             app:srcCompat="@drawable/twotone_push_pin_24"
             tools:ignore="MissingConstraints" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibPrint"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -335,7 +335,7 @@
             app:srcCompat="@drawable/twotone_print_24"
             tools:ignore="MissingConstraints" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibHeaders"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -347,7 +347,7 @@
             app:srcCompat="@drawable/baseline_code_24"
             tools:ignore="MissingConstraints" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibUnsubscribe"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -359,7 +359,7 @@
             app:srcCompat="@drawable/twotone_unsubscribe_24"
             tools:ignore="MissingConstraints" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibUndo"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -372,7 +372,7 @@
             app:tint="?attr/colorAccent"
             tools:ignore="MissingConstraints" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibVerify"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -386,7 +386,7 @@
             app:layout_constraintTop_toBottomOf="@+id/ibAmp"
             app:srcCompat="@drawable/twotone_gesture_24" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibDecrypt"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -399,7 +399,7 @@
             app:layout_constraintTop_toBottomOf="@+id/ibAmp"
             app:srcCompat="@drawable/twotone_lock_open_24" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibAmp"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -413,7 +413,7 @@
             app:srcCompat="@drawable/twotone_bolt_24"
             app:tint="?attr/colorAccent" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibImages"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -428,7 +428,7 @@
             app:srcCompat="@drawable/twotone_image_24"
             app:tint="?attr/colorAccent" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibFull"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -441,9 +441,9 @@
             app:layout_constraintTop_toBottomOf="@id/vSeparator"
             app:srcCompat="@drawable/twotone_fullscreen_24"
             app:tint="?attr/colorAccent" />
-    </eu.faircode.email.ConstraintLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvReformatted"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -455,7 +455,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/workaround" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvSignedData"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -467,4 +467,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvReformatted" />
-</eu.faircode.email.ConstraintLayoutEx>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/include_message_normal.xml b/app/src/main/res/layout/include_message_normal.xml
index bdccef7e17..1c4c87cfe0 100644
--- a/app/src/main/res/layout/include_message_normal.xml
+++ b/app/src/main/res/layout/include_message_normal.xml
@@ -1,4 +1,4 @@
-<eu.faircode.email.ConstraintLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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">
@@ -20,7 +20,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <eu.faircode.email.FixedImageButton
+    <ImageButton
         android:id="@+id/ibExpander"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -41,7 +41,7 @@
         app:layout_constraintStart_toEndOf="@+id/ibExpander"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <eu.faircode.email.FixedImageButton
+    <ImageButton
         android:id="@+id/ibAvatar"
         android:layout_width="0dp"
         android:layout_height="0dp"
@@ -56,7 +56,7 @@
         app:layout_constraintTop_toBottomOf="@id/paddingTop"
         app:srcCompat="@drawable/twotone_person_24" />
 
-    <eu.faircode.email.FixedImageButton
+    <ImageButton
         android:id="@+id/ibVerified"
         android:layout_width="21dp"
         android:layout_height="21dp"
@@ -68,7 +68,7 @@
         app:srcCompat="@drawable/verified"
         app:tint="?attr/colorAccent" />
 
-    <eu.faircode.email.FixedImageButton
+    <ImageButton
         android:id="@+id/ibAuth"
         android:layout_width="21dp"
         android:layout_height="21dp"
@@ -81,7 +81,7 @@
         app:srcCompat="@drawable/authenticated"
         app:tint="?attr/colorWarning" />
 
-    <eu.faircode.email.FixedImageButton
+    <ImageButton
         android:id="@+id/ibPriority"
         android:layout_width="21dp"
         android:layout_height="21dp"
@@ -93,7 +93,7 @@
         app:srcCompat="@drawable/priority"
         app:tint="?attr/colorAccent" />
 
-    <eu.faircode.email.FixedImageButton
+    <ImageButton
         android:id="@+id/ibSensitivity"
         android:layout_width="21dp"
         android:layout_height="21dp"
@@ -105,7 +105,7 @@
         app:srcCompat="@drawable/sensitivity"
         app:tint="?attr/colorWarning" />
 
-    <eu.faircode.email.FixedImageView
+    <ImageView
         android:id="@+id/ivImportance"
         android:layout_width="21dp"
         android:layout_height="21dp"
@@ -116,7 +116,7 @@
         app:srcCompat="@drawable/importance"
         app:tint="?attr/colorAccent" />
 
-    <eu.faircode.email.FixedImageButton
+    <ImageButton
         android:id="@+id/ibSigned"
         android:layout_width="21dp"
         android:layout_height="21dp"
@@ -128,7 +128,7 @@
         app:layout_constraintTop_toTopOf="@+id/tvFrom"
         app:srcCompat="@drawable/twotone_gesture_24" />
 
-    <eu.faircode.email.FixedImageButton
+    <ImageButton
         android:id="@+id/ibEncrypted"
         android:layout_width="21dp"
         android:layout_height="21dp"
@@ -140,7 +140,7 @@
         app:layout_constraintTop_toTopOf="@+id/tvFrom"
         app:srcCompat="@drawable/twotone_lock_24" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvFrom"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -154,7 +154,7 @@
         app:layout_constraintStart_toEndOf="@id/ibEncrypted"
         app:layout_constraintTop_toBottomOf="@id/paddingTop" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvSize"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -167,7 +167,7 @@
         app:layout_constraintEnd_toStartOf="@+id/tvTime"
         app:layout_constraintTop_toBottomOf="@id/paddingTop" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvTime"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -180,7 +180,7 @@
         app:layout_constraintEnd_toStartOf="@+id/ibFlagged"
         app:layout_constraintTop_toBottomOf="@id/paddingTop" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvSubject"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -196,7 +196,7 @@
         app:layout_constraintStart_toEndOf="@id/ibAvatar"
         app:layout_constraintTop_toBottomOf="@id/tvFrom" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvKeywords"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -211,7 +211,7 @@
         app:layout_constraintStart_toEndOf="@id/ibAvatar"
         app:layout_constraintTop_toBottomOf="@id/tvSubject" />
 
-    <eu.faircode.email.FixedImageButton
+    <ImageButton
         android:id="@+id/ibFlagged"
         android:layout_width="42dp"
         android:layout_height="42dp"
@@ -223,7 +223,7 @@
         app:layout_constraintTop_toBottomOf="@id/paddingTop"
         app:srcCompat="@drawable/baseline_star_24" />
 
-    <eu.faircode.email.FixedImageView
+    <ImageView
         android:id="@+id/ivType"
         android:layout_width="21dp"
         android:layout_height="21dp"
@@ -233,7 +233,7 @@
         app:layout_constraintTop_toTopOf="@+id/tvFolder"
         app:srcCompat="@drawable/twotone_edit_24" />
 
-    <eu.faircode.email.FixedImageView
+    <ImageView
         android:id="@+id/ivFound"
         android:layout_width="21dp"
         android:layout_height="21dp"
@@ -244,7 +244,7 @@
         app:layout_constraintTop_toTopOf="@+id/tvFolder"
         app:srcCompat="@drawable/twotone_search_24" />
 
-    <eu.faircode.email.FixedImageButton
+    <ImageButton
         android:id="@+id/ibSnoozed"
         android:layout_width="21dp"
         android:layout_height="21dp"
@@ -256,7 +256,7 @@
         app:layout_constraintTop_toTopOf="@+id/tvFolder"
         app:srcCompat="@drawable/twotone_timelapse_24" />
 
-    <eu.faircode.email.FixedImageView
+    <ImageView
         android:id="@+id/ivClassified"
         android:layout_width="21dp"
         android:layout_height="21dp"
@@ -267,7 +267,7 @@
         app:layout_constraintTop_toTopOf="@+id/tvFolder"
         app:srcCompat="@drawable/twotone_push_pin_24" />
 
-    <eu.faircode.email.FixedImageView
+    <ImageView
         android:id="@+id/ivAnswered"
         android:layout_width="21dp"
         android:layout_height="21dp"
@@ -278,7 +278,7 @@
         app:layout_constraintTop_toTopOf="@+id/tvFolder"
         app:srcCompat="@drawable/twotone_reply_24" />
 
-    <eu.faircode.email.FixedImageView
+    <ImageView
         android:id="@+id/ivForwarded"
         android:layout_width="21dp"
         android:layout_height="21dp"
@@ -289,7 +289,7 @@
         app:layout_constraintTop_toTopOf="@+id/tvFolder"
         app:srcCompat="@drawable/twotone_forwarded_24" />
 
-    <eu.faircode.email.FixedImageView
+    <ImageView
         android:id="@+id/ivAttachments"
         android:layout_width="21dp"
         android:layout_height="21dp"
@@ -299,7 +299,7 @@
         app:layout_constraintTop_toTopOf="@+id/tvFolder"
         app:srcCompat="@drawable/twotone_attachment_24" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvFolder"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -316,7 +316,7 @@
         app:layout_constraintStart_toEndOf="@id/ivAttachments"
         app:layout_constraintTop_toBottomOf="@id/tvKeywords" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvCount"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -329,7 +329,7 @@
         app:layout_constraintEnd_toStartOf="@+id/ivThread"
         app:layout_constraintTop_toTopOf="@+id/tvFolder" />
 
-    <eu.faircode.email.FixedImageView
+    <ImageView
         android:id="@+id/ivThread"
         android:layout_width="15dp"
         android:layout_height="15dp"
@@ -339,7 +339,7 @@
         app:layout_constraintTop_toTopOf="@+id/tvFolder"
         app:srcCompat="@drawable/twotone_message_24" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvLabels"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -352,7 +352,7 @@
         app:layout_constraintStart_toEndOf="@id/paddingStart"
         app:layout_constraintTop_toBottomOf="@id/tvFolder" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvExpand"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -367,7 +367,7 @@
         app:layout_constraintStart_toEndOf="@id/paddingStart"
         app:layout_constraintTop_toBottomOf="@id/tvLabels" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvPreview"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -382,7 +382,7 @@
         app:layout_constraintStart_toEndOf="@id/paddingStart"
         app:layout_constraintTop_toBottomOf="@id/tvExpand" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvNotes"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -396,7 +396,7 @@
         app:layout_constraintStart_toEndOf="@id/paddingStart"
         app:layout_constraintTop_toBottomOf="@id/tvPreview" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvError"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -412,7 +412,7 @@
         app:layout_constraintStart_toEndOf="@id/paddingStart"
         app:layout_constraintTop_toBottomOf="@id/tvNotes" />
 
-    <eu.faircode.email.FixedImageButton
+    <ImageButton
         android:id="@+id/ibError"
         android:layout_width="27dp"
         android:layout_height="27dp"
@@ -440,4 +440,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvError" />
-</eu.faircode.email.ConstraintLayoutEx>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/include_nav.xml b/app/src/main/res/layout/include_nav.xml
index 40c6cd2571..ed97d0e5e3 100644
--- a/app/src/main/res/layout/include_nav.xml
+++ b/app/src/main/res/layout/include_nav.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ConstraintLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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"
@@ -8,7 +8,7 @@
     android:focusable="true"
     android:focusableInTouchMode="true">
 
-    <eu.faircode.email.FixedImageButton
+    <ImageButton
         android:id="@+id/ibExpanderNav"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -19,7 +19,7 @@
         app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@drawable/expander_hor" />
 
-    <eu.faircode.email.FixedImageButton
+    <ImageButton
         android:id="@+id/ibPin"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -32,7 +32,7 @@
         app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@drawable/pin" />
 
-    <eu.faircode.email.FixedImageButton
+    <ImageButton
         android:id="@+id/ibHide"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -45,7 +45,7 @@
         app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@drawable/twotone_visibility_off_24" />
 
-    <eu.faircode.email.FixedImageButton
+    <ImageButton
         android:id="@+id/ibSettings"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -58,7 +58,7 @@
         app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@drawable/twotone_settings_24" />
 
-    <eu.faircode.email.FixedImageButton
+    <ImageButton
         android:id="@+id/ibFetchMore"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -71,7 +71,7 @@
         app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@drawable/twotone_save_alt_24" />
 
-    <eu.faircode.email.FixedImageButton
+    <ImageButton
         android:id="@+id/ibForceSync"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -98,7 +98,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/ibExpanderNav" />
 
-    <eu.faircode.email.FixedImageButton
+    <ImageButton
         android:id="@+id/ibExpanderAccount"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -128,7 +128,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/rvAccount" />
 
-    <eu.faircode.email.FixedImageButton
+    <ImageButton
         android:id="@+id/ibExpanderUnified"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -158,7 +158,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/rvUnified" />
 
-    <eu.faircode.email.FixedImageButton
+    <ImageButton
         android:id="@+id/ibExpanderSearch"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -188,7 +188,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/rvSearch" />
 
-    <eu.faircode.email.FixedImageButton
+    <ImageButton
         android:id="@+id/ibExpanderMenu"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -218,7 +218,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/rvMenu" />
 
-    <eu.faircode.email.FixedImageButton
+    <ImageButton
         android:id="@+id/ibExpanderExtra"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -238,4 +238,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/ibExpanderExtra" />
-</eu.faircode.email.ConstraintLayoutEx>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_account.xml b/app/src/main/res/layout/item_account.xml
index a1d53a3be8..34ccbc781f 100644
--- a/app/src/main/res/layout/item_account.xml
+++ b/app/src/main/res/layout/item_account.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.FrameLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout 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">
@@ -8,7 +8,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <eu.faircode.email.ConstraintLayoutEx
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/clItem"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -32,7 +32,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
-            <eu.faircode.email.FixedImageView
+            <ImageView
                 android:id="@+id/ivState"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
@@ -44,7 +44,7 @@
                 app:layout_constraintTop_toTopOf="@+id/tvName"
                 app:srcCompat="@drawable/twotone_cloud_off_24" />
 
-            <eu.faircode.email.FixedImageView
+            <ImageView
                 android:id="@+id/ivOAuth"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
@@ -55,7 +55,7 @@
                 app:layout_constraintTop_toTopOf="@+id/tvName"
                 app:srcCompat="@drawable/twotone_security_24" />
 
-            <eu.faircode.email.FixedImageView
+            <ImageView
                 android:id="@+id/ivPrimary"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
@@ -66,7 +66,7 @@
                 app:layout_constraintTop_toTopOf="@+id/tvName"
                 app:srcCompat="@drawable/twotone_star_24" />
 
-            <eu.faircode.email.FixedImageView
+            <ImageView
                 android:id="@+id/ivNotify"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
@@ -77,7 +77,7 @@
                 app:layout_constraintTop_toTopOf="@+id/tvName"
                 app:srcCompat="@drawable/twotone_notifications_24" />
 
-            <eu.faircode.email.FixedTextView
+            <TextView
                 android:id="@+id/tvName"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -93,7 +93,7 @@
                 app:layout_constraintStart_toEndOf="@id/ivNotify"
                 app:layout_constraintTop_toBottomOf="@id/marginTop" />
 
-            <eu.faircode.email.FixedImageView
+            <ImageView
                 android:id="@+id/ivSync"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
@@ -104,7 +104,7 @@
                 app:layout_constraintTop_toTopOf="@+id/tvName"
                 app:srcCompat="@drawable/twotone_sync_24" />
 
-            <eu.faircode.email.FixedImageButton
+            <ImageButton
                 android:id="@+id/ibInbox"
                 android:layout_width="36dp"
                 android:layout_height="36dp"
@@ -116,7 +116,7 @@
                 app:layout_constraintTop_toTopOf="@+id/tvName"
                 app:srcCompat="@drawable/twotone_inbox_24" />
 
-            <eu.faircode.email.FixedTextView
+            <TextView
                 android:id="@+id/tvUser"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -130,7 +130,7 @@
                 app:layout_constraintStart_toEndOf="@+id/ivState"
                 app:layout_constraintTop_toBottomOf="@id/tvName" />
 
-            <eu.faircode.email.FixedTextView
+            <TextView
                 android:id="@+id/tvHost"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -144,7 +144,7 @@
                 app:layout_constraintStart_toEndOf="@+id/ivState"
                 app:layout_constraintTop_toBottomOf="@id/tvUser" />
 
-            <eu.faircode.email.FixedTextView
+            <TextView
                 android:id="@+id/tvCreated"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -158,7 +158,7 @@
                 app:layout_constraintStart_toEndOf="@+id/ivState"
                 app:layout_constraintTop_toBottomOf="@id/tvHost" />
 
-            <eu.faircode.email.FixedTextView
+            <TextView
                 android:id="@+id/tvLast"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -172,7 +172,7 @@
                 app:layout_constraintStart_toEndOf="@+id/ivState"
                 app:layout_constraintTop_toBottomOf="@id/tvCreated" />
 
-            <eu.faircode.email.FixedTextView
+            <TextView
                 android:id="@+id/tvUsage"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -184,7 +184,7 @@
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tvHost" />
 
-            <eu.faircode.email.FixedTextView
+            <TextView
                 android:id="@+id/tvBackoff"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -198,7 +198,7 @@
                 app:layout_constraintStart_toEndOf="@+id/ivState"
                 app:layout_constraintTop_toBottomOf="@id/tvLast" />
 
-            <eu.faircode.email.FixedTextView
+            <TextView
                 android:id="@+id/tvQuota"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -214,7 +214,7 @@
                 app:layout_constraintStart_toEndOf="@+id/ivState"
                 app:layout_constraintTop_toBottomOf="@id/tvBackoff" />
 
-            <eu.faircode.email.FixedTextView
+            <TextView
                 android:id="@+id/tvMaxSize"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -227,7 +227,7 @@
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tvBackoff" />
 
-            <eu.faircode.email.FixedTextView
+            <TextView
                 android:id="@+id/tvId"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -240,7 +240,7 @@
                 app:layout_constraintStart_toEndOf="@+id/ivState"
                 app:layout_constraintTop_toBottomOf="@id/tvQuota" />
 
-            <eu.faircode.email.FixedTextView
+            <TextView
                 android:id="@+id/tvCapabilities"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -253,7 +253,7 @@
                 app:layout_constraintStart_toEndOf="@+id/ivState"
                 app:layout_constraintTop_toBottomOf="@id/tvId" />
 
-            <eu.faircode.email.FixedTextView
+            <TextView
                 android:id="@+id/tvIdentity"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -266,7 +266,7 @@
                 app:layout_constraintStart_toEndOf="@id/vwColor"
                 app:layout_constraintTop_toBottomOf="@id/tvCapabilities" />
 
-            <eu.faircode.email.FixedTextView
+            <TextView
                 android:id="@+id/tvDrafts"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -279,7 +279,7 @@
                 app:layout_constraintStart_toEndOf="@id/vwColor"
                 app:layout_constraintTop_toBottomOf="@id/tvIdentity" />
 
-            <eu.faircode.email.FixedTextView
+            <TextView
                 android:id="@+id/tvSent"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -292,7 +292,7 @@
                 app:layout_constraintStart_toEndOf="@id/vwColor"
                 app:layout_constraintTop_toBottomOf="@id/tvDrafts" />
 
-            <eu.faircode.email.FixedTextView
+            <TextView
                 android:id="@+id/tvWarning"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -306,7 +306,7 @@
                 app:layout_constraintStart_toEndOf="@id/vwColor"
                 app:layout_constraintTop_toBottomOf="@id/tvSent" />
 
-            <eu.faircode.email.FixedTextView
+            <TextView
                 android:id="@+id/tvError"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -348,6 +348,6 @@
                 android:layout_width="0dp"
                 android:layout_height="0dp"
                 app:constraint_referenced_ids="ivSync,tvHost" />
-        </eu.faircode.email.ConstraintLayoutEx>
+        </androidx.constraintlayout.widget.ConstraintLayout>
     </eu.faircode.email.ViewCardOptional>
-</eu.faircode.email.FrameLayoutEx>
+</FrameLayout>
diff --git a/app/src/main/res/layout/item_account_exempted.xml b/app/src/main/res/layout/item_account_exempted.xml
index c9d284d2c1..7937694791 100644
--- a/app/src/main/res/layout/item_account_exempted.xml
+++ b/app/src/main/res/layout/item_account_exempted.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.FrameLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout 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">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/clItem"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
@@ -18,5 +18,5 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
-    </eu.faircode.email.ConstraintLayoutEx>
-</eu.faircode.email.FrameLayoutEx>
\ No newline at end of file
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_answer.xml b/app/src/main/res/layout/item_answer.xml
index 8180c7e73d..5e86c59af7 100644
--- a/app/src/main/res/layout/item_answer.xml
+++ b/app/src/main/res/layout/item_answer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.FrameLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout 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">
@@ -8,7 +8,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <eu.faircode.email.ConstraintLayoutEx
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/clItem"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -25,7 +25,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
-            <eu.faircode.email.FixedTextView
+            <TextView
                 android:id="@+id/tvName"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -39,7 +39,7 @@
                 app:layout_constraintStart_toEndOf="@id/vwColor"
                 app:layout_constraintTop_toTopOf="parent" />
 
-            <eu.faircode.email.FixedTextView
+            <TextView
                 android:id="@+id/tvLastApplied"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -51,7 +51,7 @@
                 app:layout_constraintStart_toEndOf="@id/vwColor"
                 app:layout_constraintTop_toBottomOf="@id/tvName" />
 
-            <eu.faircode.email.FixedTextView
+            <TextView
                 android:id="@+id/tvApplied"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -60,7 +60,7 @@
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tvName" />
 
-            <eu.faircode.email.FixedImageView
+            <ImageView
                 android:id="@+id/ivExternal"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -69,7 +69,7 @@
                 app:layout_constraintTop_toTopOf="parent"
                 app:srcCompat="@drawable/twotone_open_in_new_24" />
 
-            <eu.faircode.email.FixedImageView
+            <ImageView
                 android:id="@+id/ivReceipt"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -78,7 +78,7 @@
                 app:layout_constraintTop_toTopOf="parent"
                 app:srcCompat="@drawable/twotone_playlist_add_check_24" />
 
-            <eu.faircode.email.FixedImageView
+            <ImageView
                 android:id="@+id/ivStandard"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -87,7 +87,7 @@
                 app:layout_constraintTop_toTopOf="parent"
                 app:srcCompat="@drawable/twotone_quickreply_24" />
 
-            <eu.faircode.email.FixedImageView
+            <ImageView
                 android:id="@+id/ivSnippet"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -96,7 +96,7 @@
                 app:layout_constraintTop_toTopOf="parent"
                 app:srcCompat="@drawable/twotone_text_snippet_24" />
 
-            <eu.faircode.email.FixedImageView
+            <ImageView
                 android:id="@+id/ivFavorite"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -104,6 +104,6 @@
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 app:srcCompat="@drawable/twotone_star_24" />
-        </eu.faircode.email.ConstraintLayoutEx>
+        </androidx.constraintlayout.widget.ConstraintLayout>
     </eu.faircode.email.ViewCardOptional>
-</eu.faircode.email.FrameLayoutEx>
+</FrameLayout>
diff --git a/app/src/main/res/layout/item_attachment.xml b/app/src/main/res/layout/item_attachment.xml
index 1bc8ae3990..df8f08e4f5 100644
--- a/app/src/main/res/layout/item_attachment.xml
+++ b/app/src/main/res/layout/item_attachment.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.FrameLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout 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">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/clItem"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -13,7 +13,7 @@
         android:paddingTop="6dp"
         android:paddingBottom="6dp">
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibDelete"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -26,7 +26,7 @@
             app:layout_constraintTop_toTopOf="parent"
             app:srcCompat="@drawable/twotone_delete_24" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivType"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -37,7 +37,7 @@
             app:layout_constraintTop_toTopOf="parent"
             app:srcCompat="@drawable/file_bin" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivDisposition"
             android:layout_width="12dp"
             android:layout_height="12dp"
@@ -46,7 +46,7 @@
             app:layout_constraintTop_toTopOf="@+id/ivType"
             app:srcCompat="@drawable/attachment_disposition" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvName"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -59,7 +59,7 @@
             app:layout_constraintStart_toEndOf="@id/ivType"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivStatus"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -70,7 +70,7 @@
             app:layout_constraintTop_toTopOf="parent"
             app:srcCompat="@drawable/twotone_cloud_download_24" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibSave"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -83,7 +83,7 @@
             app:layout_constraintTop_toTopOf="parent"
             app:srcCompat="@drawable/twotone_save_alt_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvType"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -97,7 +97,7 @@
             app:layout_constraintStart_toStartOf="@id/tvName"
             app:layout_constraintTop_toBottomOf="@id/tvName" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvSize"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -108,7 +108,7 @@
             app:layout_constraintStart_toEndOf="@id/tvType"
             app:layout_constraintTop_toBottomOf="@id/tvName" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvError"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -128,5 +128,5 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvError" />
-    </eu.faircode.email.ConstraintLayoutEx>
-</eu.faircode.email.FrameLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</FrameLayout>
diff --git a/app/src/main/res/layout/item_attachment_eml.xml b/app/src/main/res/layout/item_attachment_eml.xml
index 6938664450..1ff932ae94 100644
--- a/app/src/main/res/layout/item_attachment_eml.xml
+++ b/app/src/main/res/layout/item_attachment_eml.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.FrameLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout 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">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/clItem"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -12,7 +12,7 @@
         android:foreground="?attr/selectableItemBackground"
         android:padding="3dp">
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivAttachments"
             android:layout_width="30dp"
             android:layout_height="30dp"
@@ -22,7 +22,7 @@
             app:layout_constraintTop_toTopOf="parent"
             app:srcCompat="@drawable/twotone_attachment_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvName"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -37,7 +37,7 @@
             app:layout_constraintStart_toEndOf="@id/ivAttachments"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvType"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -51,7 +51,7 @@
             app:layout_constraintStart_toStartOf="@id/tvName"
             app:layout_constraintTop_toBottomOf="@id/tvName" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvSize"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -62,7 +62,7 @@
             app:layout_constraintStart_toEndOf="@id/tvType"
             app:layout_constraintTop_toBottomOf="@id/tvName" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivStatus"
             android:layout_width="24dp"
             android:layout_height="24dp"
@@ -71,7 +71,7 @@
             app:layout_constraintTop_toTopOf="parent"
             app:srcCompat="@drawable/twotone_visibility_24" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibSave"
             android:layout_width="wrap_content"
             android:layout_height="0dp"
@@ -82,5 +82,5 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:srcCompat="@drawable/twotone_save_alt_24" />
-    </eu.faircode.email.ConstraintLayoutEx>
-</eu.faircode.email.FrameLayoutEx>
\ No newline at end of file
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_blocklist_enabled.xml b/app/src/main/res/layout/item_blocklist_enabled.xml
index 6fb28d6b2f..5c3b98fb1a 100644
--- a/app/src/main/res/layout/item_blocklist_enabled.xml
+++ b/app/src/main/res/layout/item_blocklist_enabled.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.FrameLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout 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">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/clItem"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
@@ -18,5 +18,5 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
-    </eu.faircode.email.ConstraintLayoutEx>
-</eu.faircode.email.FrameLayoutEx>
\ No newline at end of file
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_certificate.xml b/app/src/main/res/layout/item_certificate.xml
index 5455eda90e..649fc44dcb 100644
--- a/app/src/main/res/layout/item_certificate.xml
+++ b/app/src/main/res/layout/item_certificate.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.FrameLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout 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">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/clItem"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -12,7 +12,7 @@
         android:foreground="?attr/selectableItemBackground"
         android:padding="6dp">
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvEmail"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -22,7 +22,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivIntermediate"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -37,7 +37,7 @@
             app:barrierDirection="bottom"
             app:constraint_referenced_ids="tvEmail,ivIntermediate" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvSubject"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -47,7 +47,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/barrier" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvAfter"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -57,7 +57,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/tvSubject" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvBefore"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -68,7 +68,7 @@
             app:layout_constraintStart_toEndOf="@id/tvAfter"
             app:layout_constraintTop_toBottomOf="@+id/tvSubject" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvExpired"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -77,5 +77,5 @@
             android:textColor="?attr/colorWarning"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvAfter" />
-    </eu.faircode.email.ConstraintLayoutEx>
-</eu.faircode.email.FrameLayoutEx>
\ No newline at end of file
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_contact.xml b/app/src/main/res/layout/item_contact.xml
index 1400c2ba3a..0a0ecabc14 100644
--- a/app/src/main/res/layout/item_contact.xml
+++ b/app/src/main/res/layout/item_contact.xml
@@ -1,15 +1,15 @@
-<eu.faircode.email.FrameLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout 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">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/clItem"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:padding="3dp">
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivType"
             android:layout_width="24dp"
             android:layout_height="24dp"
@@ -19,7 +19,7 @@
             app:layout_constraintTop_toTopOf="@+id/ivAvatar"
             app:srcCompat="@drawable/twotone_call_received_24" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivAvatar"
             android:layout_width="42dp"
             android:layout_height="0dp"
@@ -30,7 +30,7 @@
             app:layout_constraintTop_toTopOf="parent"
             app:srcCompat="@drawable/twotone_person_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvName"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -45,7 +45,7 @@
             app:layout_constraintStart_toEndOf="@+id/ivAvatar"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvEmail"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -60,7 +60,7 @@
             app:layout_constraintStart_toEndOf="@id/ivAvatar"
             app:layout_constraintTop_toBottomOf="@id/tvName" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvTimes"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -70,7 +70,7 @@
             app:layout_constraintEnd_toStartOf="@+id/ivFavorite"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvLast"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -81,7 +81,7 @@
             app:layout_constraintEnd_toStartOf="@+id/ivFavorite"
             app:layout_constraintTop_toBottomOf="@+id/tvTimes" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivFavorite"
             android:layout_width="24dp"
             android:layout_height="24dp"
@@ -91,5 +91,5 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@+id/ivAvatar"
             app:srcCompat="@drawable/twotone_star_24" />
-    </eu.faircode.email.ConstraintLayoutEx>
-</eu.faircode.email.FrameLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</FrameLayout>
diff --git a/app/src/main/res/layout/item_folder.xml b/app/src/main/res/layout/item_folder.xml
index a3974442b3..880e936e47 100644
--- a/app/src/main/res/layout/item_folder.xml
+++ b/app/src/main/res/layout/item_folder.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.FrameLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout 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">
@@ -9,7 +9,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <eu.faircode.email.ConstraintLayoutEx
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/clItem"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -25,7 +25,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
-            <eu.faircode.email.FixedImageView
+            <ImageView
                 android:id="@+id/ivState"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
@@ -36,7 +36,7 @@
                 app:layout_constraintTop_toTopOf="@+id/tvName"
                 app:srcCompat="@drawable/twotone_cloud_off_24" />
 
-            <eu.faircode.email.FixedImageView
+            <ImageView
                 android:id="@+id/ivReadOnly"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
@@ -53,7 +53,7 @@
                 app:layout_constraintStart_toEndOf="@id/ivState"
                 app:layout_constraintTop_toTopOf="parent" />
 
-            <eu.faircode.email.FixedImageButton
+            <ImageButton
                 android:id="@+id/ibExpander"
                 android:layout_width="wrap_content"
                 android:layout_height="0dp"
@@ -67,7 +67,7 @@
                 app:layout_constraintTop_toTopOf="parent"
                 app:srcCompat="@drawable/expander" />
 
-            <eu.faircode.email.FixedImageView
+            <ImageView
                 android:id="@+id/ivUnified"
                 android:layout_width="30dp"
                 android:layout_height="24dp"
@@ -78,7 +78,7 @@
                 app:layout_constraintTop_toTopOf="@+id/tvName"
                 app:srcCompat="@drawable/twotone_folder_special_24" />
 
-            <eu.faircode.email.FixedImageView
+            <ImageView
                 android:id="@+id/ivSubscribed"
                 android:layout_width="30dp"
                 android:layout_height="24dp"
@@ -89,7 +89,7 @@
                 app:layout_constraintTop_toTopOf="@+id/tvName"
                 app:srcCompat="@drawable/twotone_bookmark_24" />
 
-            <eu.faircode.email.FixedImageView
+            <ImageView
                 android:id="@+id/ivRule"
                 android:layout_width="30dp"
                 android:layout_height="24dp"
@@ -100,7 +100,7 @@
                 app:layout_constraintTop_toTopOf="@+id/tvName"
                 app:srcCompat="@drawable/twotone_filter_alt_24" />
 
-            <eu.faircode.email.FixedImageView
+            <ImageView
                 android:id="@+id/ivNotify"
                 android:layout_width="30dp"
                 android:layout_height="24dp"
@@ -111,7 +111,7 @@
                 app:layout_constraintTop_toTopOf="@+id/tvName"
                 app:srcCompat="@drawable/twotone_notifications_24" />
 
-            <eu.faircode.email.FixedImageView
+            <ImageView
                 android:id="@+id/ivAutoAdd"
                 android:layout_width="30dp"
                 android:layout_height="24dp"
@@ -121,7 +121,7 @@
                 app:layout_constraintTop_toTopOf="@+id/tvName"
                 app:srcCompat="@drawable/twotone_add_24" />
 
-            <eu.faircode.email.FixedTextView
+            <TextView
                 android:id="@+id/tvName"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -136,7 +136,7 @@
                 app:layout_constraintStart_toEndOf="@id/ivAutoAdd"
                 app:layout_constraintTop_toTopOf="parent" />
 
-            <eu.faircode.email.FixedTextView
+            <TextView
                 android:id="@+id/tvMessages"
                 android:layout_width="wrap_content"
                 android:layout_height="24dp"
@@ -148,7 +148,7 @@
                 app:layout_constraintEnd_toStartOf="@+id/ibMessages"
                 app:layout_constraintTop_toTopOf="@+id/tvName" />
 
-            <eu.faircode.email.FixedImageButton
+            <ImageButton
                 android:id="@+id/ibMessages"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
@@ -159,7 +159,7 @@
                 app:layout_constraintTop_toTopOf="@+id/tvName"
                 app:srcCompat="@drawable/twotone_mail_outline_24" />
 
-            <eu.faircode.email.FixedImageView
+            <ImageView
                 android:id="@+id/ivType"
                 android:layout_width="30dp"
                 android:layout_height="24dp"
@@ -169,7 +169,7 @@
                 app:layout_constraintTop_toTopOf="@+id/tvType"
                 app:srcCompat="@drawable/twotone_inbox_24" />
 
-            <eu.faircode.email.FixedTextView
+            <TextView
                 android:id="@+id/tvType"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -183,7 +183,7 @@
                 app:layout_constraintStart_toEndOf="@id/ivType"
                 app:layout_constraintTop_toBottomOf="@id/tvName" />
 
-            <eu.faircode.email.FixedTextView
+            <TextView
                 android:id="@+id/tvTotal"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -199,7 +199,7 @@
                 app:layout_constraintStart_toEndOf="@id/tvType"
                 app:layout_constraintTop_toTopOf="@id/tvType" />
 
-            <eu.faircode.email.FixedTextView
+            <TextView
                 android:id="@+id/tvAfter"
                 android:layout_width="wrap_content"
                 android:layout_height="24dp"
@@ -211,7 +211,7 @@
                 app:layout_constraintEnd_toStartOf="@+id/ibSync"
                 app:layout_constraintTop_toTopOf="@+id/tvType" />
 
-            <eu.faircode.email.FixedImageButton
+            <ImageButton
                 android:id="@+id/ibSync"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
@@ -222,7 +222,7 @@
                 app:layout_constraintTop_toTopOf="@+id/tvType"
                 app:srcCompat="@drawable/twotone_sync_24" />
 
-            <eu.faircode.email.FixedTextView
+            <TextView
                 android:id="@+id/tvKeywords"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -236,7 +236,7 @@
                 app:layout_constraintStart_toEndOf="@id/ibExpander"
                 app:layout_constraintTop_toBottomOf="@id/tvType" />
 
-            <eu.faircode.email.FixedTextView
+            <TextView
                 android:id="@+id/tvFlagged"
                 android:layout_width="wrap_content"
                 android:layout_height="24dp"
@@ -248,7 +248,7 @@
                 app:layout_constraintEnd_toStartOf="@+id/ibFlagged"
                 app:layout_constraintTop_toTopOf="@+id/tvKeywords" />
 
-            <eu.faircode.email.FixedImageButton
+            <ImageButton
                 android:id="@+id/ibFlagged"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
@@ -260,7 +260,7 @@
                 app:layout_constraintTop_toTopOf="@+id/tvKeywords"
                 app:srcCompat="@drawable/twotone_star_24" />
 
-            <eu.faircode.email.FixedTextView
+            <TextView
                 android:id="@+id/tvError"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -300,6 +300,6 @@
                 android:layout_width="0dp"
                 android:layout_height="0dp"
                 app:constraint_referenced_ids="ivType,tvType,tvTotal,tvAfter,ibSync" />
-        </eu.faircode.email.ConstraintLayoutEx>
+        </androidx.constraintlayout.widget.ConstraintLayout>
     </eu.faircode.email.ViewCardOptional>
-</eu.faircode.email.FrameLayoutEx>
+</FrameLayout>
diff --git a/app/src/main/res/layout/item_folder_select.xml b/app/src/main/res/layout/item_folder_select.xml
index 306443fcb7..9cb265ec6b 100644
--- a/app/src/main/res/layout/item_folder_select.xml
+++ b/app/src/main/res/layout/item_folder_select.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.FrameLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout 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">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/clItem"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -19,7 +19,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibExpander"
             android:layout_width="36dp"
             android:layout_height="0dp"
@@ -32,7 +32,7 @@
             app:layout_constraintTop_toTopOf="parent"
             app:srcCompat="@drawable/expander" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivType"
             android:layout_width="24dp"
             android:layout_height="36dp"
@@ -43,7 +43,7 @@
             app:layout_constraintTop_toTopOf="@id/ibExpander"
             app:srcCompat="@drawable/twotone_inbox_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvName"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -58,5 +58,5 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivType"
             app:layout_constraintTop_toTopOf="@id/ibExpander" />
-    </eu.faircode.email.ConstraintLayoutEx>
-</eu.faircode.email.FrameLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</FrameLayout>
diff --git a/app/src/main/res/layout/item_folder_unselectable.xml b/app/src/main/res/layout/item_folder_unselectable.xml
index 7cdde76ff6..680ba1446c 100644
--- a/app/src/main/res/layout/item_folder_unselectable.xml
+++ b/app/src/main/res/layout/item_folder_unselectable.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.FrameLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout 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">
@@ -8,7 +8,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <eu.faircode.email.ConstraintLayoutEx
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/clItem"
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
@@ -22,7 +22,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
-            <eu.faircode.email.FixedImageView
+            <ImageView
                 android:id="@+id/ivState"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
@@ -41,7 +41,7 @@
                 app:layout_constraintStart_toEndOf="@id/ivState"
                 app:layout_constraintTop_toTopOf="parent" />
 
-            <eu.faircode.email.FixedImageButton
+            <ImageButton
                 android:id="@+id/ibExpander"
                 android:layout_width="wrap_content"
                 android:layout_height="0dp"
@@ -55,7 +55,7 @@
                 app:layout_constraintTop_toTopOf="parent"
                 app:srcCompat="@drawable/expander" />
 
-            <eu.faircode.email.FixedTextView
+            <TextView
                 android:id="@+id/tvName"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -69,6 +69,6 @@
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toEndOf="@id/ibExpander"
                 app:layout_constraintTop_toTopOf="parent" />
-        </eu.faircode.email.ConstraintLayoutEx>
+        </androidx.constraintlayout.widget.ConstraintLayout>
     </eu.faircode.email.ViewCardOptional>
-</eu.faircode.email.FrameLayoutEx>
+</FrameLayout>
diff --git a/app/src/main/res/layout/item_group.xml b/app/src/main/res/layout/item_group.xml
index f9e595395d..32857d5e56 100644
--- a/app/src/main/res/layout/item_group.xml
+++ b/app/src/main/res/layout/item_group.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ConstraintLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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">
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvCategory"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -16,7 +16,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvDate"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -37,4 +37,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvDate" />
-</eu.faircode.email.ConstraintLayoutEx>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_identity.xml b/app/src/main/res/layout/item_identity.xml
index ece39ff735..e777751b4b 100644
--- a/app/src/main/res/layout/item_identity.xml
+++ b/app/src/main/res/layout/item_identity.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.FrameLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout 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">
@@ -8,7 +8,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <eu.faircode.email.ConstraintLayoutEx
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/clItem"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -32,7 +32,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
-            <eu.faircode.email.FixedImageView
+            <ImageView
                 android:id="@+id/ivState"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
@@ -44,7 +44,7 @@
                 app:layout_constraintTop_toTopOf="@+id/tvName"
                 app:srcCompat="@drawable/twotone_cloud_off_24" />
 
-            <eu.faircode.email.FixedImageView
+            <ImageView
                 android:id="@+id/ivOAuth"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
@@ -55,7 +55,7 @@
                 app:layout_constraintTop_toTopOf="@+id/tvName"
                 app:srcCompat="@drawable/twotone_security_24" />
 
-            <eu.faircode.email.FixedImageView
+            <ImageView
                 android:id="@+id/ivPrimary"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
@@ -66,7 +66,7 @@
                 app:layout_constraintTop_toTopOf="@+id/tvName"
                 app:srcCompat="@drawable/twotone_star_24" />
 
-            <eu.faircode.email.FixedImageView
+            <ImageView
                 android:id="@+id/ivGroup"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
@@ -77,7 +77,7 @@
                 app:layout_constraintTop_toTopOf="@+id/tvName"
                 app:srcCompat="@drawable/twotone_people_24" />
 
-            <eu.faircode.email.FixedTextView
+            <TextView
                 android:id="@+id/tvName"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -93,7 +93,7 @@
                 app:layout_constraintStart_toEndOf="@id/ivGroup"
                 app:layout_constraintTop_toBottomOf="@id/marginTop" />
 
-            <eu.faircode.email.FixedImageView
+            <ImageView
                 android:id="@+id/ivSync"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
@@ -104,7 +104,7 @@
                 app:layout_constraintTop_toTopOf="@+id/tvName"
                 app:srcCompat="@drawable/twotone_sync_24" />
 
-            <eu.faircode.email.FixedTextView
+            <TextView
                 android:id="@+id/tvUser"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -118,7 +118,7 @@
                 app:layout_constraintStart_toEndOf="@+id/ivState"
                 app:layout_constraintTop_toBottomOf="@id/tvName" />
 
-            <eu.faircode.email.FixedTextView
+            <TextView
                 android:id="@+id/tvHost"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -132,7 +132,7 @@
                 app:layout_constraintStart_toEndOf="@+id/ivState"
                 app:layout_constraintTop_toBottomOf="@id/tvUser" />
 
-            <eu.faircode.email.FixedTextView
+            <TextView
                 android:id="@+id/tvAccount"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -142,7 +142,7 @@
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="@id/tvHost" />
 
-            <eu.faircode.email.FixedTextView
+            <TextView
                 android:id="@+id/tvSignKeyId"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -154,7 +154,7 @@
                 app:layout_constraintStart_toEndOf="@+id/ivState"
                 app:layout_constraintTop_toBottomOf="@id/tvHost" />
 
-            <eu.faircode.email.FixedTextView
+            <TextView
                 android:id="@+id/tvLast"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -168,7 +168,7 @@
                 app:layout_constraintStart_toEndOf="@+id/ivState"
                 app:layout_constraintTop_toBottomOf="@id/tvSignKeyId" />
 
-            <eu.faircode.email.FixedTextView
+            <TextView
                 android:id="@+id/tvMaxSize"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -178,7 +178,7 @@
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="@id/tvLast" />
 
-            <eu.faircode.email.FixedTextView
+            <TextView
                 android:id="@+id/tvDrafts"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -191,7 +191,7 @@
                 app:layout_constraintStart_toEndOf="@id/vwColor"
                 app:layout_constraintTop_toBottomOf="@id/tvLast" />
 
-            <eu.faircode.email.FixedTextView
+            <TextView
                 android:id="@+id/tvError"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -212,6 +212,6 @@
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tvError" />
-        </eu.faircode.email.ConstraintLayoutEx>
+        </androidx.constraintlayout.widget.ConstraintLayout>
     </eu.faircode.email.ViewCardOptional>
-</eu.faircode.email.FrameLayoutEx>
+</FrameLayout>
diff --git a/app/src/main/res/layout/item_image.xml b/app/src/main/res/layout/item_image.xml
index fa161c7d8e..ee423f5849 100644
--- a/app/src/main/res/layout/item_image.xml
+++ b/app/src/main/res/layout/item_image.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.FrameLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout 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">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/clItem"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -12,7 +12,7 @@
         android:foreground="?attr/selectableItemBackground"
         android:padding="6dp">
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivImage"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -24,7 +24,7 @@
             app:layout_constraintTop_toTopOf="parent"
             app:srcCompat="@mipmap/ic_launcher" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvCaption"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -35,7 +35,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/ivImage" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvProperties"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -46,5 +46,5 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvCaption" />
-    </eu.faircode.email.ConstraintLayoutEx>
-</eu.faircode.email.FrameLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</FrameLayout>
diff --git a/app/src/main/res/layout/item_keyword.xml b/app/src/main/res/layout/item_keyword.xml
index 1fbb766ba0..4e36379f8f 100644
--- a/app/src/main/res/layout/item_keyword.xml
+++ b/app/src/main/res/layout/item_keyword.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.FrameLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout 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">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/clItem"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -22,7 +22,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@+id/btnColor" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibEdit"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -50,7 +50,7 @@
             app:layout_constraintStart_toEndOf="@id/ibEdit"
             app:layout_constraintTop_toTopOf="@+id/btnColor" />
 
-        <eu.faircode.email.FixedImageButton
+        <ImageButton
             android:id="@+id/ibSave"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -90,5 +90,5 @@
             android:layout_height="0dp"
             android:visibility="visible"
             app:constraint_referenced_ids="etKeyword,ibSave" />
-    </eu.faircode.email.ConstraintLayoutEx>
-</eu.faircode.email.FrameLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</FrameLayout>
diff --git a/app/src/main/res/layout/item_log.xml b/app/src/main/res/layout/item_log.xml
index 72cdd2c57a..e308ad2c1e 100644
--- a/app/src/main/res/layout/item_log.xml
+++ b/app/src/main/res/layout/item_log.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ConstraintLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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">
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvTime"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -15,7 +15,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvData"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -28,4 +28,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/tvTime"
         app:layout_constraintTop_toTopOf="parent" />
-</eu.faircode.email.ConstraintLayoutEx>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_menu_ellipsize.xml b/app/src/main/res/layout/item_menu_ellipsize.xml
index 56c55c3315..67fd0d40b4 100644
--- a/app/src/main/res/layout/item_menu_ellipsize.xml
+++ b/app/src/main/res/layout/item_menu_ellipsize.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.FixedTextView xmlns:android="http://schemas.android.com/apk/res/android"
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:ellipsize="middle"
diff --git a/app/src/main/res/layout/item_message_compact.xml b/app/src/main/res/layout/item_message_compact.xml
index 309f05f4a4..9fa079ceb4 100644
--- a/app/src/main/res/layout/item_message_compact.xml
+++ b/app/src/main/res/layout/item_message_compact.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.FrameLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout 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">
@@ -10,7 +10,7 @@
         android:layout_height="wrap_content"
         android:foreground="?android:attr/selectableItemBackground">
 
-        <eu.faircode.email.ConstraintLayoutEx
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/clItem"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -36,6 +36,6 @@
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/inHeader" />
-        </eu.faircode.email.ConstraintLayoutEx>
+        </androidx.constraintlayout.widget.ConstraintLayout>
     </eu.faircode.email.ViewCardOptional>
-</eu.faircode.email.FrameLayoutEx>
+</FrameLayout>
diff --git a/app/src/main/res/layout/item_message_duplicate.xml b/app/src/main/res/layout/item_message_duplicate.xml
index bff39a1270..fe84488e80 100644
--- a/app/src/main/res/layout/item_message_duplicate.xml
+++ b/app/src/main/res/layout/item_message_duplicate.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.FrameLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout 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">
@@ -10,7 +10,7 @@
         android:layout_height="wrap_content"
         android:foreground="?android:attr/selectableItemBackground">
 
-        <eu.faircode.email.ConstraintLayoutEx
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/clItem"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -19,7 +19,7 @@
             android:focusable="true"
             android:focusableInTouchMode="true">
 
-            <eu.faircode.email.FixedTextView
+            <TextView
                 android:id="@+id/tvFolder"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -29,6 +29,6 @@
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
-        </eu.faircode.email.ConstraintLayoutEx>
+        </androidx.constraintlayout.widget.ConstraintLayout>
     </eu.faircode.email.ViewCardOptional>
-</eu.faircode.email.FrameLayoutEx>
+</FrameLayout>
diff --git a/app/src/main/res/layout/item_message_normal.xml b/app/src/main/res/layout/item_message_normal.xml
index 52429d7c6d..6a73d1786e 100644
--- a/app/src/main/res/layout/item_message_normal.xml
+++ b/app/src/main/res/layout/item_message_normal.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.FrameLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout 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">
@@ -10,7 +10,7 @@
         android:layout_height="wrap_content"
         android:foreground="?android:attr/selectableItemBackground">
 
-        <eu.faircode.email.ConstraintLayoutEx
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/clItem"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -36,6 +36,6 @@
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/inHeader" />
-        </eu.faircode.email.ConstraintLayoutEx>
+        </androidx.constraintlayout.widget.ConstraintLayout>
     </eu.faircode.email.ViewCardOptional>
-</eu.faircode.email.FrameLayoutEx>
+</FrameLayout>
diff --git a/app/src/main/res/layout/item_message_placeholder.xml b/app/src/main/res/layout/item_message_placeholder.xml
index a4ed74b103..3c6170f938 100644
--- a/app/src/main/res/layout/item_message_placeholder.xml
+++ b/app/src/main/res/layout/item_message_placeholder.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ConstraintLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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="210dp">
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center"
@@ -15,4 +15,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
-</eu.faircode.email.ConstraintLayoutEx>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_nav.xml b/app/src/main/res/layout/item_nav.xml
index a243a9f72a..1606d98b58 100644
--- a/app/src/main/res/layout/item_nav.xml
+++ b/app/src/main/res/layout/item_nav.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.FrameLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout 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"
     android:background="?attr/colorDrawerBackground">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/clItem"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:foreground="?attr/selectableItemBackground"
         android:minHeight="42dp">
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivItem"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -23,7 +23,7 @@
             app:layout_constraintTop_toTopOf="parent"
             app:srcCompat="@drawable/twotone_folder_special_24" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivBadge"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -31,7 +31,7 @@
             app:layout_constraintStart_toStartOf="@+id/ivItem"
             app:srcCompat="@drawable/badge" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvCount"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -46,7 +46,7 @@
             app:layout_constraintBottom_toBottomOf="@+id/ivItem"
             app:layout_constraintEnd_toEndOf="@+id/ivItem" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvItem"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -62,7 +62,7 @@
             app:layout_constraintStart_toEndOf="@id/ivItem"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvItemExtra"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -77,7 +77,7 @@
             app:layout_constraintStart_toEndOf="@id/tvItem"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivExtra"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -87,7 +87,7 @@
             app:layout_constraintTop_toTopOf="parent"
             app:srcCompat="@drawable/twotone_open_in_new_24" />
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivWarning"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -97,5 +97,5 @@
             app:layout_constraintTop_toTopOf="parent"
             app:srcCompat="@drawable/twotone_warning_24"
             app:tint="?attr/colorWarning" />
-    </eu.faircode.email.ConstraintLayoutEx>
-</eu.faircode.email.FrameLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</FrameLayout>
diff --git a/app/src/main/res/layout/item_nav_group.xml b/app/src/main/res/layout/item_nav_group.xml
index e2ce3d644e..5ffebff93c 100644
--- a/app/src/main/res/layout/item_nav_group.xml
+++ b/app/src/main/res/layout/item_nav_group.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.FrameLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout 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"
     android:background="?attr/colorDrawerBackground">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/clItem"
         android:layout_width="match_parent"
         android:layout_height="42dp">
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivGroup"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -21,7 +21,7 @@
             app:layout_constraintTop_toTopOf="parent"
             app:srcCompat="@drawable/twotone_horizontal_rule_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvCategory"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -34,5 +34,5 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/ivGroup"
             app:layout_constraintTop_toTopOf="parent" />
-    </eu.faircode.email.ConstraintLayoutEx>
-</eu.faircode.email.FrameLayoutEx>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</FrameLayout>
diff --git a/app/src/main/res/layout/item_operation.xml b/app/src/main/res/layout/item_operation.xml
index c1ae87e413..0abac0c91a 100644
--- a/app/src/main/res/layout/item_operation.xml
+++ b/app/src/main/res/layout/item_operation.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.FrameLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout 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">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/clItem"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -14,7 +14,7 @@
         android:paddingEnd="6dp"
         android:paddingBottom="3dp">
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivState"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -23,7 +23,7 @@
             app:layout_constraintTop_toTopOf="parent"
             app:srcCompat="@drawable/twotone_compare_arrows_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvFolder"
             android:layout_width="150dp"
             android:layout_height="wrap_content"
@@ -37,7 +37,7 @@
             app:layout_constraintStart_toEndOf="@id/ivState"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvOperation"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -53,7 +53,7 @@
             app:layout_constraintStart_toEndOf="@id/tvFolder"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvTime"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -66,7 +66,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvError"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -78,5 +78,5 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivState"
             app:layout_constraintTop_toBottomOf="@id/tvFolder" />
-    </eu.faircode.email.ConstraintLayoutEx>
-</eu.faircode.email.FrameLayoutEx>
\ No newline at end of file
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_order.xml b/app/src/main/res/layout/item_order.xml
index 13bd2bf681..9a76c11b9f 100644
--- a/app/src/main/res/layout/item_order.xml
+++ b/app/src/main/res/layout/item_order.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.FrameLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout 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">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/clItem"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -13,7 +13,7 @@
         android:foreground="?attr/selectableItemBackground"
         android:padding="12dp">
 
-        <eu.faircode.email.FixedImageView
+        <ImageView
             android:id="@+id/ivDragHandle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -22,7 +22,7 @@
             app:layout_constraintTop_toTopOf="@+id/tvTitle"
             app:srcCompat="@drawable/twotone_drag_handle_24" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvTitle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -37,7 +37,7 @@
             app:layout_constraintStart_toEndOf="@id/ivDragHandle"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvSubTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -47,5 +47,5 @@
             app:layout_constraintBottom_toBottomOf="@id/tvTitle"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@id/tvTitle" />
-    </eu.faircode.email.ConstraintLayoutEx>
-</eu.faircode.email.FrameLayoutEx>
\ No newline at end of file
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_rule.xml b/app/src/main/res/layout/item_rule.xml
index d47ab44829..7d086018e1 100644
--- a/app/src/main/res/layout/item_rule.xml
+++ b/app/src/main/res/layout/item_rule.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.FrameLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout 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">
@@ -8,7 +8,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <eu.faircode.email.ConstraintLayoutEx
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/clItem"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -16,7 +16,7 @@
             android:foreground="?attr/selectableItemBackground"
             android:padding="6dp">
 
-            <eu.faircode.email.FixedTextView
+            <TextView
                 android:id="@+id/tvName"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -30,7 +30,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="@+id/ivStop" />
 
-            <eu.faircode.email.FixedTextView
+            <TextView
                 android:id="@+id/tvOrder"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -42,7 +42,7 @@
                 app:layout_constraintEnd_toStartOf="@+id/ivStop"
                 app:layout_constraintTop_toTopOf="@+id/ivStop" />
 
-            <eu.faircode.email.FixedImageView
+            <ImageView
                 android:id="@+id/ivStop"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
@@ -51,7 +51,7 @@
                 app:layout_constraintTop_toTopOf="parent"
                 app:srcCompat="@drawable/twotone_stop_24" />
 
-            <eu.faircode.email.FixedTextView
+            <TextView
                 android:id="@+id/tvCondition"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -61,7 +61,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tvName" />
 
-            <eu.faircode.email.FixedTextView
+            <TextView
                 android:id="@+id/tvAction"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -71,7 +71,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tvCondition" />
 
-            <eu.faircode.email.FixedTextView
+            <TextView
                 android:id="@+id/tvLastApplied"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -82,7 +82,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tvAction" />
 
-            <eu.faircode.email.FixedTextView
+            <TextView
                 android:id="@+id/tvApplied"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -90,6 +90,6 @@
                 android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tvAction" />
-        </eu.faircode.email.ConstraintLayoutEx>
+        </androidx.constraintlayout.widget.ConstraintLayout>
     </eu.faircode.email.ViewCardOptional>
-</eu.faircode.email.FrameLayoutEx>
\ No newline at end of file
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_rule_match.xml b/app/src/main/res/layout/item_rule_match.xml
index 6b6291b46c..65a4a7baea 100644
--- a/app/src/main/res/layout/item_rule_match.xml
+++ b/app/src/main/res/layout/item_rule_match.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.FrameLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout 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">
 
-    <eu.faircode.email.ConstraintLayoutEx
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/clItem"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -12,7 +12,7 @@
         android:foreground="?attr/selectableItemBackground"
         android:padding="6dp">
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvTime"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -23,7 +23,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <eu.faircode.email.FixedTextView
+        <TextView
             android:id="@+id/tvSubject"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -35,5 +35,5 @@
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             app:layout_constraintStart_toEndOf="@id/tvTime"
             app:layout_constraintTop_toTopOf="parent" />
-    </eu.faircode.email.ConstraintLayoutEx>
-</eu.faircode.email.FrameLayoutEx>
\ No newline at end of file
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/search_suggestion.xml b/app/src/main/res/layout/search_suggestion.xml
index 8c068fd43f..7f03ab4847 100644
--- a/app/src/main/res/layout/search_suggestion.xml
+++ b/app/src/main/res/layout/search_suggestion.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ConstraintLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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"
     android:background="?android:colorBackground"
     android:padding="12dp">
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@android:id/text1"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -16,4 +16,4 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
-</eu.faircode.email.ConstraintLayoutEx>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/spinner_account.xml b/app/src/main/res/layout/spinner_account.xml
index 10c6c5aefd..1f97ca57da 100644
--- a/app/src/main/res/layout/spinner_account.xml
+++ b/app/src/main/res/layout/spinner_account.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ConstraintLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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"
@@ -15,7 +15,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="@android:id/text1" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@android:id/text1"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -26,4 +26,4 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toEndOf="@+id/vwColor"
         app:layout_constraintTop_toTopOf="parent" />
-</eu.faircode.email.ConstraintLayoutEx>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/spinner_contact.xml b/app/src/main/res/layout/spinner_contact.xml
index f1983e30a6..f73521c7eb 100644
--- a/app/src/main/res/layout/spinner_contact.xml
+++ b/app/src/main/res/layout/spinner_contact.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ConstraintLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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">
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvName"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -17,7 +17,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvEmail"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -30,7 +30,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvName" />
 
-    <eu.faircode.email.FixedImageView
+    <ImageView
         android:id="@+id/ivPhoto"
         android:layout_width="0dp"
         android:layout_height="36dp"
@@ -41,4 +41,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@+id/tvName"
         app:srcCompat="@drawable/twotone_person_24" />
-</eu.faircode.email.ConstraintLayoutEx>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/spinner_contact_group.xml b/app/src/main/res/layout/spinner_contact_group.xml
index 00eaefaca3..3d5e381c66 100644
--- a/app/src/main/res/layout/spinner_contact_group.xml
+++ b/app/src/main/res/layout/spinner_contact_group.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ConstraintLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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"
     android:padding="6dp">
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvGroup"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -19,7 +19,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvAccount"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -32,4 +32,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvGroup" />
-</eu.faircode.email.ConstraintLayoutEx>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/spinner_identity.xml b/app/src/main/res/layout/spinner_identity.xml
index 99a197f0b6..c7f017a0a9 100644
--- a/app/src/main/res/layout/spinner_identity.xml
+++ b/app/src/main/res/layout/spinner_identity.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ConstraintLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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">
@@ -13,7 +13,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="@android:id/text1" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@android:id/text1"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -28,7 +28,7 @@
         app:layout_constraintStart_toEndOf="@id/vwColor"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@android:id/text2"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -44,7 +44,7 @@
         app:layout_constraintStart_toEndOf="@id/vwColor"
         app:layout_constraintTop_toBottomOf="@android:id/text1" />
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@+id/tvExtra"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -56,4 +56,4 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@android:id/text1" />
-</eu.faircode.email.ConstraintLayoutEx>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/spinner_item1.xml b/app/src/main/res/layout/spinner_item1.xml
index 3f6c84cff9..8ddd8ebb65 100644
--- a/app/src/main/res/layout/spinner_item1.xml
+++ b/app/src/main/res/layout/spinner_item1.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ConstraintLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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"
     android:padding="12dp">
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@android:id/text1"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -14,4 +14,4 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
-</eu.faircode.email.ConstraintLayoutEx>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/spinner_item1_dropdown.xml b/app/src/main/res/layout/spinner_item1_dropdown.xml
index 3f6c84cff9..8ddd8ebb65 100644
--- a/app/src/main/res/layout/spinner_item1_dropdown.xml
+++ b/app/src/main/res/layout/spinner_item1_dropdown.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.faircode.email.ConstraintLayoutEx xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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"
     android:padding="12dp">
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@android:id/text1"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -14,4 +14,4 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
-</eu.faircode.email.ConstraintLayoutEx>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/toast.xml b/app/src/main/res/layout/toast.xml
index 00311ec8db..a86742c50e 100644
--- a/app/src/main/res/layout/toast.xml
+++ b/app/src/main/res/layout/toast.xml
@@ -8,7 +8,7 @@
     android:paddingEnd="12dp"
     android:paddingBottom="6dp">
 
-    <eu.faircode.email.FixedTextView
+    <TextView
         android:id="@android:id/message"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"