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 {
// - eu.faircode.email.AppCompatViewInflaterEx
@@ -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 @@
-
-
-
-
\ No newline at end of file
+
\ 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 @@
-
-
-
-
-
\ No newline at end of file
+
\ 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 @@
-
-
\ No newline at end of file
+
\ 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 @@
-
-
\ No newline at end of file
+
\ 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 @@
-
-
@@ -31,13 +31,13 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
-
-
-
-
+
-
+
-
\ No newline at end of file
+
\ 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 @@
-
-
@@ -31,13 +31,13 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
-
-
-
+
-
+
-
\ No newline at end of file
+
\ 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 @@
-
-
@@ -31,13 +31,13 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
-
-
-
+
@@ -59,7 +59,7 @@
android:layout_width="0dp"
android:layout_height="0dp"
app:constraint_referenced_ids="cardMessage" />
-
+
-
\ No newline at end of file
+
\ 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 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
+
-
-
-
+
-
+
-
\ No newline at end of file
+
\ 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 @@
-
-
@@ -31,13 +31,13 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
-
-
-
-
-
-
+
-
+
-
\ No newline at end of file
+
\ 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 @@
-
-
-
-
+
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 @@
-
-
-
-
-
-
+
+
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 @@
-
-
-
\ No newline at end of file
+
\ 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">
-
-
-
-
+
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">
-
-
-
+
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">
-
-
-
-
+
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">
-
-
-
-
+
-
+
\ 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">
-
@@ -59,5 +59,5 @@
android:text="@string/title_save"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/btnColor" />
-
+
\ 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">
-
-
-
-
-
-
+
\ 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">
-
-
-
-
-
-
-
-
+
\ 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">
-
-
-
-
-
-
+
\ 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">
-
-
-
-
-
-
+
\ 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">
-
-
-
-
+
\ 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">
-
-
-
-
+
\ 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">
-
-
-
-
-
-
-
+
\ 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">
-
-
-
+
\ 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">
-
-
-
-
-
+
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">
-
-
-
-
+
\ 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">
-
-
-
-
+
\ 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">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
\ 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">
-
-
-
-
+
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">
-
-
-
-
-
-
-
-
+
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">
-
-
-
-
-
-
-
+
\ 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">
-
-
-
+
\ 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 @@
-
-
-
\ No newline at end of file
+
\ 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 @@
-
-
-
\ No newline at end of file
+
\ 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">
-
-
-
-
-
+
\ 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">
-
-
-
-
-
+
\ 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">
-
-
-
-
-
-
-
-
-
-
-
+
\ 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">
-
-
-
-
-
-
-
-
+
\ 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 @@
-
-
-
-
-
\ No newline at end of file
+
\ 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">
-
-
-
-
-
-
-
+
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">
-
-
-
-
-
+
\ 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">
-
-
-
-
+
\ 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">
-
-
-
-
+
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">
-
-
-
-
-
-
-
+
\ 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">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
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 @@
-
-
-
\ No newline at end of file
+
\ 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 @@
-
-
\ No newline at end of file
+
\ 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 @@
-
-
-
-
+
-
-
\ No newline at end of file
+
\ 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">
-
-
-
-
-
-
-
-
-
-
+
\ 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">
-
-
-
-
-
-
+
\ 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">
-
-
-
-
-
-
-
-
-
+
\ 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">
-
-
-
-
+
\ 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">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
\ 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">
-
-
-
-
-
-
-
-
-
-
-
-
+
\ 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 @@
-
-
-
\ No newline at end of file
+
\ 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 @@
-
-
-
\ No newline at end of file
+
\ 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">
-
-
-
-
-
+
\ 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">
-
-
-
-
+
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">
-
-
-
+
\ 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 @@
-
-
-
\ No newline at end of file
+
\ 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">
-
-
-
-
-
-
+
\ 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">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
\ 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 @@
-
-
-
\ No newline at end of file
+
\ 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 @@
-
-
-
+
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">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
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">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
\ 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">
-
-
-
-
+
\ 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">
-
-
-
-
-
+
\ 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">
-
-
-
-
-
-
+
\ 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">
-
-
-
-
-
-
-
-
+
\ 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">
-
-
-
-
-
-
+
\ 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">
-
-
-
-
-
+
\ 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">
-
-
-
-
+
\ 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 @@
-
-
-
-
-
-
-
@@ -94,7 +94,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
-
-
+
-
\ No newline at end of file
+
\ 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">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
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 @@
-
-
-
-
+
-
+
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 @@
-
-
@@ -18,7 +18,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
-
@@ -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" />
-
+
-
-
+
+
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 @@
-
-
@@ -40,7 +40,7 @@
android:layout_width="0dp"
android:layout_height="0dp"
app:constraint_referenced_ids="rvAnswer" />
-
+
-
+
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 @@
-
-
@@ -37,7 +37,7 @@
android:layout_width="0dp"
android:layout_height="0dp"
app:constraint_referenced_ids="rvCertificate" />
-
+
-
+
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 @@
-
-
@@ -26,7 +26,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
-
@@ -57,7 +57,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/spIdentity" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
\ No newline at end of file
+
+
\ 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 @@
-
-
-
-
+
-
+
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">
-
@@ -44,5 +44,5 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/btnCancel"
app:layout_constraintTop_toBottomOf="@id/inEula" />
-
+
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">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
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 @@
-
-
-
-
-
-
-
+
-
+
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">
-
-
-
-
-
-
-
-
-
-
-
+
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 @@
-
-
-
-
+
-
+
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">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
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 @@
-
-
+
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">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
\ 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">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
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">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
\ 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">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
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">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
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 @@
-
-
+
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 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
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">
-
-
-
-
-
-
-
-
-
-
-
+
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 @@
-
@@ -12,4 +12,4 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
-
\ No newline at end of file
+
\ 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 @@
-
-
-
-
+
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 @@
-
-
+
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">
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
+
-
+
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">
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
+
-
+
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">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
+
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
+
-
+
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">
-
-
-
-
-
-
-
+
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
+
-
-
-
-
-
+
-
+
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">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
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">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
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">
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
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">
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
+
-
+
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">
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
+
-
+
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 @@
-
-
+
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">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
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">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
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">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
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 @@
-
-
@@ -22,7 +22,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
\ No newline at end of file
+
+
\ 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 @@
-
-
@@ -40,7 +40,7 @@
android:layout_width="0dp"
android:layout_height="0dp"
app:constraint_referenced_ids="rvRule" />
-
+
-
+
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">
-
@@ -30,14 +30,14 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
+
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
+
-
+
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 @@
-
-
-
-
-
-
-
-
+
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 @@
-
-
-
\ No newline at end of file
+
\ 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 @@
-
@@ -13,7 +13,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
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 @@
-
@@ -25,7 +25,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/vSeparatorAttachments" />
-
-
-
-
+
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 @@
-
@@ -40,7 +40,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/inAttachments" />
-
-
-
-
-
-
-
-
-
-
+
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 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
\ 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 @@
-
@@ -22,7 +22,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
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 @@
-
@@ -14,7 +14,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
-
-
-
-
-
+
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 @@
-
@@ -14,7 +14,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
-
-
-
+
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 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
+
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 @@
-
@@ -20,7 +20,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
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 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
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 @@
-
@@ -8,7 +8,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
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 @@
-
-
@@ -18,5 +18,5 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
-
-
\ No newline at end of file
+
+
\ 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 @@
-
@@ -8,7 +8,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
-
-
-
-
-
-
-
-
-
-
+
-
+
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 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
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 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
+
\ 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 @@
-
-
@@ -18,5 +18,5 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
-
-
\ No newline at end of file
+
+
\ 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 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
+
\ 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 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
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 @@
-
@@ -9,7 +9,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
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 @@
-
-
-
-
-
-
-
+
+
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 @@
-
@@ -8,7 +8,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
-
@@ -22,7 +22,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
-
-
-
-
+
-
+
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 @@
-
-
-
-
\ No newline at end of file
+
\ 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 @@
-
@@ -8,7 +8,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
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 @@
-
-
-
-
-
-
-
+
+
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 @@
-
-
-
-
-
-
+
+
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 @@
-
-
-
-
\ No newline at end of file
+
\ 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 @@
-
-
@@ -10,7 +10,7 @@
android:layout_height="wrap_content"
android:foreground="?android:attr/selectableItemBackground">
-
-
+
-
+
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 @@
-
@@ -10,7 +10,7 @@
android:layout_height="wrap_content"
android:foreground="?android:attr/selectableItemBackground">
-
-
-
+
-
+
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 @@
-
@@ -10,7 +10,7 @@
android:layout_height="wrap_content"
android:foreground="?android:attr/selectableItemBackground">
-
-
+
-
+
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 @@
-
-
-
\ No newline at end of file
+
\ 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 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
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 @@
-
-
-
-
-
-
+
+
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 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
+
\ 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 @@
-
-
-
-
-
-
-
\ No newline at end of file
+
+
\ 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 @@
-
@@ -8,7 +8,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
-
-
-
-
-
-
-
-
-
+
-
\ No newline at end of file
+
\ 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 @@
-
-
-
-
-
-
\ No newline at end of file
+
+
\ 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 @@
-
-
-
\ No newline at end of file
+
\ 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 @@
-
-
-
+
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 @@
-
-
-
-
-
\ No newline at end of file
+
\ 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 @@
-
-
-
-
\ No newline at end of file
+
\ 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 @@
-
@@ -13,7 +13,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@android:id/text1" />
-
-
-
-
\ No newline at end of file
+
\ 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 @@
-
-
-
\ No newline at end of file
+
\ 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 @@
-
-
-
\ No newline at end of file
+
\ 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">
-