From dc326bec68170ac51467cedd6ba80dc3d8fdd09a Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Wed, 12 Jan 2022 15:00:16 +0100
Subject: [PATCH] Legend: always fit texts

---
 .../res/layout/fragment_legend_compose.xml    | 101 +++---
 .../res/layout/fragment_legend_folders.xml    | 114 +++---
 .../res/layout/fragment_legend_keyboard.xml   | 101 +++---
 .../res/layout/fragment_legend_messages.xml   | 324 ++++++++++--------
 .../fragment_legend_synchronization.xml       | 155 +++++----
 5 files changed, 445 insertions(+), 350 deletions(-)

diff --git a/app/src/main/res/layout/fragment_legend_compose.xml b/app/src/main/res/layout/fragment_legend_compose.xml
index da2a8d06cc..421abe0bfc 100644
--- a/app/src/main/res/layout/fragment_legend_compose.xml
+++ b/app/src/main/res/layout/fragment_legend_compose.xml
@@ -18,21 +18,22 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_pick"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvPick"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/tvPick"
             app:srcCompat="@drawable/twotone_person_add_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvPick"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_pick"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivPick"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivPick"
-            app:layout_constraintTop_toTopOf="@id/ivPick" />
+            app:layout_constraintTop_toTopOf="parent" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivCC"
@@ -40,21 +41,22 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_cc"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvCC"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivPick"
+            app:layout_constraintTop_toTopOf="@id/tvCC"
             app:srcCompat="@drawable/twotone_people_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvCC"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_cc"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivCC"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivCC"
-            app:layout_constraintTop_toTopOf="@id/ivCC" />
+            app:layout_constraintTop_toBottomOf="@id/tvPick" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivLink"
@@ -62,21 +64,22 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_link"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvLink"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivCC"
+            app:layout_constraintTop_toTopOf="@id/tvLink"
             app:srcCompat="@drawable/twotone_insert_link_45_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvLink"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_link"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivLink"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivLink"
-            app:layout_constraintTop_toTopOf="@id/ivLink" />
+            app:layout_constraintTop_toBottomOf="@id/tvCC" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivFile"
@@ -84,21 +87,22 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_file"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvFile"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivLink"
+            app:layout_constraintTop_toTopOf="@id/tvFile"
             app:srcCompat="@drawable/twotone_attachment_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvFile"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_file"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivFile"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivFile"
-            app:layout_constraintTop_toTopOf="@id/ivFile" />
+            app:layout_constraintTop_toBottomOf="@id/tvLink" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivPicture"
@@ -106,21 +110,22 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_picture"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvPicture"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivFile"
+            app:layout_constraintTop_toTopOf="@id/tvPicture"
             app:srcCompat="@drawable/twotone_image_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvPicture"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_picture"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivPicture"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivPicture"
-            app:layout_constraintTop_toTopOf="@id/ivPicture" />
+            app:layout_constraintTop_toBottomOf="@id/tvFile" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivPhoto"
@@ -128,21 +133,22 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_photo"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvPhoto"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivPicture"
+            app:layout_constraintTop_toTopOf="@id/tvPhoto"
             app:srcCompat="@drawable/twotone_photo_camera_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvPhoto"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_photo"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivPhoto"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivPhoto"
-            app:layout_constraintTop_toTopOf="@id/ivPhoto" />
+            app:layout_constraintTop_toBottomOf="@id/tvPicture" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivAudio"
@@ -150,21 +156,22 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_audio"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvAudio"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivPhoto"
+            app:layout_constraintTop_toTopOf="@id/tvAudio"
             app:srcCompat="@drawable/twotone_record_voice_over_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvAudio"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_audio"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivAudio"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivAudio"
-            app:layout_constraintTop_toTopOf="@id/ivAudio" />
+            app:layout_constraintTop_toBottomOf="@id/tvPhoto" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivBold"
@@ -172,21 +179,22 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_bold"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvBold"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivAudio"
+            app:layout_constraintTop_toTopOf="@id/tvBold"
             app:srcCompat="@drawable/twotone_format_bold_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvBold"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_bold"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivBold"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivBold"
-            app:layout_constraintTop_toTopOf="@id/ivBold" />
+            app:layout_constraintTop_toBottomOf="@id/tvAudio" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivItalic"
@@ -194,21 +202,22 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_italic"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvItalic"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivBold"
+            app:layout_constraintTop_toTopOf="@id/tvItalic"
             app:srcCompat="@drawable/twotone_format_italic_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvItalic"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_italic"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivItalic"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivItalic"
-            app:layout_constraintTop_toTopOf="@id/ivItalic" />
+            app:layout_constraintTop_toBottomOf="@id/tvBold" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivUnderline"
@@ -216,21 +225,22 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_underline"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvUnderline"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivItalic"
+            app:layout_constraintTop_toTopOf="@id/tvUnderline"
             app:srcCompat="@drawable/twotone_format_underlined_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvUnderline"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_underline"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivUnderline"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivUnderline"
-            app:layout_constraintTop_toTopOf="@id/ivUnderline" />
+            app:layout_constraintTop_toBottomOf="@id/tvItalic" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivStyle"
@@ -238,20 +248,21 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_text_style"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvStyle"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivUnderline"
+            app:layout_constraintTop_toTopOf="@id/tvStyle"
             app:srcCompat="@drawable/twotone_text_format_24_options" />
 
         <eu.faircode.email.FixedTextView
-            android:id="@+id/tvSize"
+            android:id="@+id/tvStyle"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_text_style"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivStyle"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivStyle"
-            app:layout_constraintTop_toTopOf="@id/ivStyle" />
+            app:layout_constraintTop_toBottomOf="@id/tvUnderline" />
     </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 6fd738c2ba..532ec8ebc3 100644
--- a/app/src/main/res/layout/fragment_legend_folders.xml
+++ b/app/src/main/res/layout/fragment_legend_folders.xml
@@ -18,21 +18,22 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_unified"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvUnified"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/tvUnified"
             app:srcCompat="@drawable/twotone_folder_special_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvUnified"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_unified"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivType"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivType"
-            app:layout_constraintTop_toTopOf="@id/ivType" />
+            app:layout_constraintTop_toTopOf="parent" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivInbox"
@@ -40,21 +41,22 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_inbox"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvInbox"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivType"
+            app:layout_constraintTop_toTopOf="@+id/tvInbox"
             app:srcCompat="@drawable/twotone_inbox_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvInbox"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_inbox"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivInbox"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivInbox"
-            app:layout_constraintTop_toTopOf="@id/ivInbox" />
+            app:layout_constraintTop_toBottomOf="@id/tvUnified" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivDrafts"
@@ -62,21 +64,22 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_drafts"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvDrafts"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivInbox"
+            app:layout_constraintTop_toTopOf="@+id/tvDrafts"
             app:srcCompat="@drawable/twotone_drafts_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvDrafts"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_drafts"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivDrafts"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivDrafts"
-            app:layout_constraintTop_toTopOf="@id/ivDrafts" />
+            app:layout_constraintTop_toBottomOf="@id/tvInbox" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivSent"
@@ -84,21 +87,22 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_sent"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvSent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivDrafts"
+            app:layout_constraintTop_toTopOf="@+id/tvSent"
             app:srcCompat="@drawable/twotone_forward_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvSent"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_sent"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivSent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivSent"
-            app:layout_constraintTop_toTopOf="@id/ivSent" />
+            app:layout_constraintTop_toBottomOf="@id/tvDrafts" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivArchive"
@@ -106,21 +110,22 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_archive"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvArchive"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivSent"
+            app:layout_constraintTop_toTopOf="@+id/tvArchive"
             app:srcCompat="@drawable/twotone_archive_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvArchive"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_archive"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivArchive"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivArchive"
-            app:layout_constraintTop_toTopOf="@id/ivArchive" />
+            app:layout_constraintTop_toBottomOf="@id/tvSent" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivTrash"
@@ -128,21 +133,22 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_trash"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvTrash"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivArchive"
+            app:layout_constraintTop_toTopOf="@+id/tvTrash"
             app:srcCompat="@drawable/twotone_delete_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvTrash"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_trash"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivTrash"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivTrash"
-            app:layout_constraintTop_toTopOf="@id/ivTrash" />
+            app:layout_constraintTop_toBottomOf="@id/tvArchive" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivJunk"
@@ -150,21 +156,22 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_junk"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvJunk"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivTrash"
+            app:layout_constraintTop_toTopOf="@+id/tvJunk"
             app:srcCompat="@drawable/twotone_report_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvJunk"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_junk"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivJunk"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivJunk"
-            app:layout_constraintTop_toTopOf="@id/ivJunk" />
+            app:layout_constraintTop_toBottomOf="@id/tvTrash" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivPrimary"
@@ -172,21 +179,22 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_primary"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvPrimary"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivJunk"
+            app:layout_constraintTop_toTopOf="@+id/tvPrimary"
             app:srcCompat="@drawable/twotone_star_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvPrimary"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_primary"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivPrimary"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivPrimary"
-            app:layout_constraintTop_toTopOf="@id/ivPrimary" />
+            app:layout_constraintTop_toBottomOf="@id/tvJunk" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivSubscribed"
@@ -194,21 +202,22 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_subscribed"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvSubscribed"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivPrimary"
+            app:layout_constraintTop_toTopOf="@+id/tvSubscribed"
             app:srcCompat="@drawable/twotone_bookmark_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvSubscribed"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_subscribed"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivSubscribed"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivSubscribed"
-            app:layout_constraintTop_toTopOf="@id/ivSubscribed" />
+            app:layout_constraintTop_toBottomOf="@id/tvPrimary" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivRule"
@@ -216,21 +225,22 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_edit_rules"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvRule"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivSubscribed"
+            app:layout_constraintTop_toTopOf="@+id/tvRule"
             app:srcCompat="@drawable/twotone_filter_alt_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvRule"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_rule"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivRule"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivRule"
-            app:layout_constraintTop_toTopOf="@id/ivRule" />
+            app:layout_constraintTop_toBottomOf="@id/tvSubscribed" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivNotify"
@@ -238,21 +248,22 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_notify"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvNotify"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivRule"
+            app:layout_constraintTop_toTopOf="@+id/tvNotify"
             app:srcCompat="@drawable/twotone_notifications_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvNotify"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_notify"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivNotify"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivNotify"
-            app:layout_constraintTop_toTopOf="@id/ivNotify" />
+            app:layout_constraintTop_toBottomOf="@id/tvRule" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvDownloadFetch"
@@ -281,12 +292,12 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:gravity="center_vertical"
-            android:minHeight="72dp"
+            android:minHeight="48dp"
             android:text="@string/title_legend_download_fetch"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivDownloadFetch"
-            app:layout_constraintTop_toBottomOf="@id/ivNotify" />
+            app:layout_constraintTop_toBottomOf="@id/tvNotify" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvSyncKeep"
@@ -315,7 +326,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:gravity="center_vertical"
-            android:minHeight="72dp"
+            android:minHeight="48dp"
             android:text="@string/title_legend_sync_keep"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             app:layout_constraintEnd_toEndOf="parent"
@@ -328,20 +339,21 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_stop"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvStop"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvSyncKeepLegend"
+            app:layout_constraintTop_toTopOf="@id/tvStop"
             app:srcCompat="@drawable/twotone_stop_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvStop"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_stop"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivStop"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivStop"
-            app:layout_constraintTop_toTopOf="@id/ivStop" />
+            app:layout_constraintTop_toBottomOf="@id/tvSyncKeepLegend" />
     </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 85164aff41..041ce89435 100644
--- a/app/src/main/res/layout/fragment_legend_keyboard.xml
+++ b/app/src/main/res/layout/fragment_legend_keyboard.xml
@@ -20,21 +20,22 @@
             android:text="Enter"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             android:textColor="?android:attr/textColorPrimary"
+            app:layout_constraintBottom_toBottomOf="@+id/tvOpen"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/tvOpen"
             app:srcCompat="@drawable/twotone_person_add_24" />
 
         <eu.faircode.email.FixedTextView
-            android:id="@+id/tvPick"
+            android:id="@+id/tvOpen"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_enter"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/tvEnter"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/tvEnter"
-            app:layout_constraintTop_toTopOf="@id/tvEnter" />
+            app:layout_constraintTop_toTopOf="parent" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvA"
@@ -43,19 +44,21 @@
             android:gravity="center"
             android:text="A"
             android:textAppearance="@style/TextAppearance.AppCompat.Large"
+            app:layout_constraintBottom_toBottomOf="@+id/tvArchive"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvEnter" />
+            app:layout_constraintTop_toTopOf="@id/tvArchive" />
 
         <eu.faircode.email.FixedTextView
+            android:id="@+id/tvArchive"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_a"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/tvA"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/tvA"
-            app:layout_constraintTop_toTopOf="@id/tvA" />
+            app:layout_constraintTop_toBottomOf="@id/tvOpen" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvC"
@@ -64,19 +67,21 @@
             android:gravity="center"
             android:text="C"
             android:textAppearance="@style/TextAppearance.AppCompat.Large"
+            app:layout_constraintBottom_toBottomOf="@+id/tvCompose"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvA" />
+            app:layout_constraintTop_toTopOf="@id/tvCompose" />
 
         <eu.faircode.email.FixedTextView
+            android:id="@+id/tvCompose"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_c"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/tvC"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/tvC"
-            app:layout_constraintTop_toTopOf="@id/tvC" />
+            app:layout_constraintTop_toBottomOf="@id/tvArchive" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvD"
@@ -85,19 +90,21 @@
             android:gravity="center"
             android:text="D"
             android:textAppearance="@style/TextAppearance.AppCompat.Large"
+            app:layout_constraintBottom_toBottomOf="@+id/tvTrash"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvC" />
+            app:layout_constraintTop_toTopOf="@id/tvTrash" />
 
         <eu.faircode.email.FixedTextView
+            android:id="@+id/tvTrash"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_d"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/tvD"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/tvD"
-            app:layout_constraintTop_toTopOf="@id/tvD" />
+            app:layout_constraintTop_toBottomOf="@id/tvCompose" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvM"
@@ -106,19 +113,21 @@
             android:gravity="center"
             android:text="M"
             android:textAppearance="@style/TextAppearance.AppCompat.Large"
+            app:layout_constraintBottom_toBottomOf="@+id/tvMenu"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvD" />
+            app:layout_constraintTop_toTopOf="@id/tvMenu" />
 
         <eu.faircode.email.FixedTextView
+            android:id="@+id/tvMenu"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_m"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/tvM"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/tvM"
-            app:layout_constraintTop_toTopOf="@id/tvM" />
+            app:layout_constraintTop_toBottomOf="@id/tvTrash" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvN"
@@ -127,19 +136,21 @@
             android:gravity="center"
             android:text="N"
             android:textAppearance="@style/TextAppearance.AppCompat.Large"
+            app:layout_constraintBottom_toBottomOf="@+id/tvNext"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvM" />
+            app:layout_constraintTop_toTopOf="@id/tvNext" />
 
         <eu.faircode.email.FixedTextView
+            android:id="@+id/tvNext"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_n"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/tvN"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/tvN"
-            app:layout_constraintTop_toTopOf="@id/tvN" />
+            app:layout_constraintTop_toBottomOf="@id/tvMenu" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvP"
@@ -148,19 +159,21 @@
             android:gravity="center"
             android:text="P"
             android:textAppearance="@style/TextAppearance.AppCompat.Large"
+            app:layout_constraintBottom_toBottomOf="@+id/tvPrevious"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvN" />
+            app:layout_constraintTop_toTopOf="@id/tvPrevious" />
 
         <eu.faircode.email.FixedTextView
+            android:id="@+id/tvPrevious"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_p"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/tvP"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/tvP"
-            app:layout_constraintTop_toTopOf="@id/tvP" />
+            app:layout_constraintTop_toBottomOf="@id/tvNext" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvR"
@@ -169,19 +182,21 @@
             android:gravity="center"
             android:text="R"
             android:textAppearance="@style/TextAppearance.AppCompat.Large"
+            app:layout_constraintBottom_toBottomOf="@+id/tvReply"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvP" />
+            app:layout_constraintTop_toTopOf="@id/tvReply" />
 
         <eu.faircode.email.FixedTextView
+            android:id="@+id/tvReply"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_r"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/tvR"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/tvR"
-            app:layout_constraintTop_toTopOf="@id/tvR" />
+            app:layout_constraintTop_toBottomOf="@id/tvPrevious" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvS"
@@ -190,19 +205,21 @@
             android:gravity="center"
             android:text="S"
             android:textAppearance="@style/TextAppearance.AppCompat.Large"
+            app:layout_constraintBottom_toBottomOf="@+id/tvSelect"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvR" />
+            app:layout_constraintTop_toTopOf="@id/tvSelect" />
 
         <eu.faircode.email.FixedTextView
+            android:id="@+id/tvSelect"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_s"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/tvS"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/tvS"
-            app:layout_constraintTop_toTopOf="@id/tvS" />
+            app:layout_constraintTop_toBottomOf="@id/tvReply" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvT"
@@ -211,18 +228,20 @@
             android:gravity="center"
             android:text="T"
             android:textAppearance="@style/TextAppearance.AppCompat.Large"
+            app:layout_constraintBottom_toBottomOf="@+id/tvFocus"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvS" />
+            app:layout_constraintTop_toTopOf="@id/tvFocus" />
 
         <eu.faircode.email.FixedTextView
+            android:id="@+id/tvFocus"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_t"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/tvT"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/tvT"
-            app:layout_constraintTop_toTopOf="@id/tvT" />
+            app:layout_constraintTop_toBottomOf="@id/tvSelect" />
     </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 2d5cdfd217..c8aaab5235 100644
--- a/app/src/main/res/layout/fragment_legend_messages.xml
+++ b/app/src/main/res/layout/fragment_legend_messages.xml
@@ -18,21 +18,22 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_thread"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvThread"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/tvThread"
             app:srcCompat="@drawable/twotone_message_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvThread"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_thread"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivThread"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivThread"
-            app:layout_constraintTop_toTopOf="@id/ivThread" />
+            app:layout_constraintTop_toTopOf="parent" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivBookmark"
@@ -40,22 +41,23 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_thread"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvBookmark"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivThread"
+            app:layout_constraintTop_toTopOf="@id/tvBookmark"
             app:srcCompat="@drawable/twotone_message_24"
             app:tint="?attr/colorAccent" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvBookmark"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_bookmark"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivBookmark"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivBookmark"
-            app:layout_constraintTop_toTopOf="@id/ivBookmark" />
+            app:layout_constraintTop_toBottomOf="@id/tvThread" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivZoom"
@@ -63,21 +65,22 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_zoom"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvZoom"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivBookmark"
+            app:layout_constraintTop_toTopOf="@id/tvZoom"
             app:srcCompat="@drawable/twotone_format_size_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvZoom"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_zoom"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivZoom"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivZoom"
-            app:layout_constraintTop_toTopOf="@id/ivZoom" />
+            app:layout_constraintTop_toBottomOf="@id/tvBookmark" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivDraft"
@@ -85,21 +88,22 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_draft"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvDraft"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivZoom"
+            app:layout_constraintTop_toTopOf="@id/tvDraft"
             app:srcCompat="@drawable/twotone_edit_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvDraft"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_draft"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivDraft"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivDraft"
-            app:layout_constraintTop_toTopOf="@id/ivDraft" />
+            app:layout_constraintTop_toBottomOf="@id/tvZoom" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivAuth"
@@ -107,22 +111,23 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_auth"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvAuth"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivDraft"
+            app:layout_constraintTop_toTopOf="@id/tvAuth"
             app:srcCompat="@drawable/twotone_flag_24"
             app:tint="?attr/colorWarning" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvAuth"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_auth"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivAuth"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivAuth"
-            app:layout_constraintTop_toTopOf="@id/ivAuth" />
+            app:layout_constraintTop_toBottomOf="@id/tvDraft" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivHighPriority"
@@ -130,22 +135,23 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_priority"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvHighPriority"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivAuth"
+            app:layout_constraintTop_toTopOf="@id/tvHighPriority"
             app:srcCompat="@drawable/twotone_priority_high_24"
             app:tint="?attr/colorAccent" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvHighPriority"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_priority"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivHighPriority"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivHighPriority"
-            app:layout_constraintTop_toTopOf="@id/ivHighPriority" />
+            app:layout_constraintTop_toBottomOf="@id/tvAuth" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivLowPriority"
@@ -153,21 +159,22 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_priority"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvLowPriority"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivHighPriority"
+            app:layout_constraintTop_toTopOf="@id/tvLowPriority"
             app:srcCompat="@drawable/twotone_low_priority_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvLowPriority"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_priority_low"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivLowPriority"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivLowPriority"
-            app:layout_constraintTop_toTopOf="@id/ivLowPriority" />
+            app:layout_constraintTop_toBottomOf="@id/tvHighPriority" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivHighImportance"
@@ -175,21 +182,22 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_priority"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvHighImportance"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivLowPriority"
+            app:layout_constraintTop_toTopOf="@id/tvHighImportance"
             app:srcCompat="@drawable/baseline_arrow_upward_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvHighImportance"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_importance"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivHighImportance"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivHighImportance"
-            app:layout_constraintTop_toTopOf="@id/ivHighImportance" />
+            app:layout_constraintTop_toBottomOf="@id/tvLowPriority" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivLowImportance"
@@ -197,21 +205,22 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_priority"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvLowImportance"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivHighImportance"
+            app:layout_constraintTop_toTopOf="@id/tvLowImportance"
             app:srcCompat="@drawable/baseline_arrow_downward_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvLowImportance"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_importance_low"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivLowImportance"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivLowImportance"
-            app:layout_constraintTop_toTopOf="@id/ivLowImportance" />
+            app:layout_constraintTop_toBottomOf="@id/tvHighImportance" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivSigned"
@@ -219,21 +228,22 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_priority"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvSigned"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivLowImportance"
+            app:layout_constraintTop_toTopOf="@id/tvSigned"
             app:srcCompat="@drawable/twotone_gesture_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvSigned"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_signed"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivSigned"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivSigned"
-            app:layout_constraintTop_toTopOf="@id/ivSigned" />
+            app:layout_constraintTop_toBottomOf="@id/tvLowImportance" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivEncrypted"
@@ -241,21 +251,22 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_priority"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvEncrypted"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivSigned"
+            app:layout_constraintTop_toTopOf="@id/tvEncrypted"
             app:srcCompat="@drawable/twotone_lock_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvEncrypted"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_encrypted"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivEncrypted"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivEncrypted"
-            app:layout_constraintTop_toTopOf="@id/ivEncrypted" />
+            app:layout_constraintTop_toBottomOf="@id/tvSigned" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivClassified"
@@ -263,21 +274,22 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_classified"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvClassified"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivEncrypted"
+            app:layout_constraintTop_toTopOf="@id/tvClassified"
             app:srcCompat="@drawable/twotone_push_pin_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvClassified"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_classified"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivClassified"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivClassified"
-            app:layout_constraintTop_toTopOf="@id/ivClassified" />
+            app:layout_constraintTop_toBottomOf="@id/tvEncrypted" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivSnoozed"
@@ -285,21 +297,22 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_snoozed"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvSnoozed"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivClassified"
+            app:layout_constraintTop_toTopOf="@id/tvSnoozed"
             app:srcCompat="@drawable/twotone_timelapse_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvSnoozed"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_snoozed"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivSnoozed"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivSnoozed"
-            app:layout_constraintTop_toTopOf="@id/ivSnoozed" />
+            app:layout_constraintTop_toBottomOf="@id/tvClassified" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivAnswered"
@@ -307,21 +320,22 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_answered"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvAnswered"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivSnoozed"
+            app:layout_constraintTop_toTopOf="@id/tvAnswered"
             app:srcCompat="@drawable/twotone_reply_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvAnswered"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_answered"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivAnswered"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivAnswered"
-            app:layout_constraintTop_toTopOf="@id/ivAnswered" />
+            app:layout_constraintTop_toBottomOf="@id/tvSnoozed" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivForwarded"
@@ -329,21 +343,22 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_answered"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvForwarded"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivAnswered"
+            app:layout_constraintTop_toTopOf="@id/tvForwarded"
             app:srcCompat="@drawable/twotone_forwarded_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvForwarded"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_forwarded"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivForwarded"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivForwarded"
-            app:layout_constraintTop_toTopOf="@id/ivForwarded" />
+            app:layout_constraintTop_toBottomOf="@id/tvAnswered" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivPlain"
@@ -351,21 +366,22 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_plain_only"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvPlain"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivForwarded"
+            app:layout_constraintTop_toTopOf="@id/tvPlain"
             app:srcCompat="@drawable/twotone_notes_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvPlain"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_plain_only"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivPlain"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivPlain"
-            app:layout_constraintTop_toTopOf="@id/ivPlain" />
+            app:layout_constraintTop_toBottomOf="@id/tvForwarded" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivReceipt"
@@ -373,22 +389,23 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_receipt"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvReceiptType"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivPlain"
+            app:layout_constraintTop_toTopOf="@id/tvReceiptType"
             app:srcCompat="@drawable/twotone_playlist_add_check_24"
             app:tint="?attr/colorWarning" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvReceiptType"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_receipt"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivReceipt"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivReceipt"
-            app:layout_constraintTop_toTopOf="@id/ivReceipt" />
+            app:layout_constraintTop_toBottomOf="@id/tvPlain" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivAutoSubmitted"
@@ -396,21 +413,22 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_receipt"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvAutoSubmitted"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivReceipt"
+            app:layout_constraintTop_toTopOf="@id/tvAutoSubmitted"
             app:srcCompat="@drawable/twotone_remove_circle_outline_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvAutoSubmitted"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_auto_submitted"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivAutoSubmitted"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivAutoSubmitted"
-            app:layout_constraintTop_toTopOf="@id/ivAutoSubmitted" />
+            app:layout_constraintTop_toBottomOf="@id/tvReceiptType" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivBrowsed"
@@ -418,21 +436,22 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_browsed"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvBrowsed"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivAutoSubmitted"
+            app:layout_constraintTop_toTopOf="@id/tvBrowsed"
             app:srcCompat="@drawable/twotone_playlist_add_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvBrowsed"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_browsed"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivBrowsed"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivBrowsed"
-            app:layout_constraintTop_toTopOf="@id/ivBrowsed" />
+            app:layout_constraintTop_toBottomOf="@id/tvAutoSubmitted" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivAttachment"
@@ -440,21 +459,22 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_attachment"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvAttachment"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivBrowsed"
+            app:layout_constraintTop_toTopOf="@id/tvAttachment"
             app:srcCompat="@drawable/twotone_attachment_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvAttachment"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_attachment"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivAttachment"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivAttachment"
-            app:layout_constraintTop_toTopOf="@id/ivAttachment" />
+            app:layout_constraintTop_toBottomOf="@id/tvBrowsed" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivStarred"
@@ -462,21 +482,22 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_flagged"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvStarred"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivAttachment"
+            app:layout_constraintTop_toTopOf="@id/tvStarred"
             app:srcCompat="@drawable/baseline_star_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvStarred"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_flagged"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivStarred"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivStarred"
-            app:layout_constraintTop_toTopOf="@id/ivStarred" />
+            app:layout_constraintTop_toBottomOf="@id/tvAttachment" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivSearch"
@@ -484,21 +505,22 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_search"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvSearch"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivStarred"
+            app:layout_constraintTop_toTopOf="@id/tvSearch"
             app:srcCompat="@drawable/twotone_search_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvSearch"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_search"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivSearch"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivSearch"
-            app:layout_constraintTop_toTopOf="@id/ivSearch" />
+            app:layout_constraintTop_toBottomOf="@id/tvStarred" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivPin"
@@ -506,21 +528,22 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_pin"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvPin"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivSearch"
+            app:layout_constraintTop_toTopOf="@id/tvPin"
             app:srcCompat="@drawable/twotone_person_pin_circle_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvPin"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_pin"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivPin"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivPin"
-            app:layout_constraintTop_toTopOf="@id/ivPin" />
+            app:layout_constraintTop_toBottomOf="@id/tvSearch" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivContacts"
@@ -528,21 +551,22 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_contacts"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvContacts"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivPin"
+            app:layout_constraintTop_toTopOf="@id/tvContacts"
             app:srcCompat="@drawable/twotone_import_contacts_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvContacts"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_contacts"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivContacts"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivContacts"
-            app:layout_constraintTop_toTopOf="@id/ivContacts" />
+            app:layout_constraintTop_toBottomOf="@id/tvPin" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivView"
@@ -550,21 +574,22 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_view"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvView"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivContacts"
+            app:layout_constraintTop_toTopOf="@id/tvView"
             app:srcCompat="@drawable/twotone_visibility_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvView"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_view"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivView"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivView"
-            app:layout_constraintTop_toTopOf="@id/ivView" />
+            app:layout_constraintTop_toBottomOf="@id/tvContacts" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivHide"
@@ -572,21 +597,22 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_hide"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvHide"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivView"
+            app:layout_constraintTop_toTopOf="@id/tvHide"
             app:srcCompat="@drawable/twotone_visibility_off_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvHide"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_hide"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivHide"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivHide"
-            app:layout_constraintTop_toTopOf="@id/ivHide" />
+            app:layout_constraintTop_toBottomOf="@id/tvView" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivDownload"
@@ -594,21 +620,22 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_download"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvDownload"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivHide"
+            app:layout_constraintTop_toTopOf="@id/tvDownload"
             app:srcCompat="@drawable/twotone_cloud_download_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvDownload"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_download"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivDownload"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivDownload"
-            app:layout_constraintTop_toTopOf="@id/ivDownload" />
+            app:layout_constraintTop_toBottomOf="@id/tvHide" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivRule"
@@ -616,21 +643,22 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_create_rule"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvRule"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivDownload"
+            app:layout_constraintTop_toTopOf="@id/tvRule"
             app:srcCompat="@drawable/twotone_filter_alt_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvRule"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_create_rule"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivRule"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivRule"
-            app:layout_constraintTop_toTopOf="@id/ivRule" />
+            app:layout_constraintTop_toBottomOf="@id/tvDownload" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivUnsubscribe"
@@ -638,21 +666,22 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_show_unsubscribe"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvUnsubscribe"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivRule"
+            app:layout_constraintTop_toTopOf="@id/tvUnsubscribe"
             app:srcCompat="@drawable/twotone_unsubscribe_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvUnsubscribe"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_show_unsubscribe"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivUnsubscribe"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivUnsubscribe"
-            app:layout_constraintTop_toTopOf="@id/ivUnsubscribe" />
+            app:layout_constraintTop_toBottomOf="@id/tvRule" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivOriginal"
@@ -660,21 +689,22 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_view"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvOriginal"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivUnsubscribe"
+            app:layout_constraintTop_toTopOf="@id/tvOriginal"
             app:srcCompat="@drawable/twotone_fullscreen_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvOriginal"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_original"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivOriginal"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivOriginal"
-            app:layout_constraintTop_toTopOf="@id/ivOriginal" />
+            app:layout_constraintTop_toBottomOf="@id/tvUnsubscribe" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivReformatted"
@@ -682,21 +712,22 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_hide"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvReformatted"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivOriginal"
+            app:layout_constraintTop_toTopOf="@id/tvReformatted"
             app:srcCompat="@drawable/twotone_fullscreen_exit_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvReformatted"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_reformatted"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivReformatted"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivReformatted"
-            app:layout_constraintTop_toTopOf="@id/ivReformatted" />
+            app:layout_constraintTop_toBottomOf="@id/tvOriginal" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivExternalImage"
@@ -704,21 +735,22 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_external_image"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvExternalImage"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivReformatted"
+            app:layout_constraintTop_toTopOf="@id/tvExternalImage"
             app:srcCompat="@drawable/twotone_image_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvExternalImage"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_external_image"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivExternalImage"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivExternalImage"
-            app:layout_constraintTop_toTopOf="@id/ivExternalImage" />
+            app:layout_constraintTop_toBottomOf="@id/tvReformatted" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivEmbeddedImage"
@@ -726,21 +758,22 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_embedded_image"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvEmbeddedImage"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivExternalImage"
+            app:layout_constraintTop_toTopOf="@id/tvEmbeddedImage"
             app:srcCompat="@drawable/twotone_photo_library_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvEmbeddedImage"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_embedded_image"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivEmbeddedImage"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivEmbeddedImage"
-            app:layout_constraintTop_toTopOf="@id/ivEmbeddedImage" />
+            app:layout_constraintTop_toBottomOf="@id/tvExternalImage" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivTrackingPixel"
@@ -748,22 +781,23 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_tracking_pixel"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvTrackingPixel"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivEmbeddedImage"
+            app:layout_constraintTop_toTopOf="@id/tvTrackingPixel"
             app:srcCompat="@drawable/twotone_my_location_24"
             app:tint="?attr/colorWarning" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvTrackingPixel"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_tracking_pixel"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivTrackingPixel"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivTrackingPixel"
-            app:layout_constraintTop_toTopOf="@id/ivTrackingPixel" />
+            app:layout_constraintTop_toBottomOf="@id/tvEmbeddedImage" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivBrokenImage"
@@ -771,21 +805,22 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_broken_image"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvBrokenImage"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivTrackingPixel"
+            app:layout_constraintTop_toTopOf="@id/tvBrokenImage"
             app:srcCompat="@drawable/twotone_broken_image_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvBrokenImage"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_broken_image"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivBrokenImage"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivBrokenImage"
-            app:layout_constraintTop_toTopOf="@id/ivBrokenImage" />
+            app:layout_constraintTop_toBottomOf="@id/tvTrackingPixel" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivDeletePermanent"
@@ -793,20 +828,21 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_delete_permanently"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvDeletePermanent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivBrokenImage"
+            app:layout_constraintTop_toTopOf="@id/tvDeletePermanent"
             app:srcCompat="@drawable/twotone_delete_forever_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvDeletePermanent"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_delete_permanently"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivDeletePermanent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivDeletePermanent"
-            app:layout_constraintTop_toTopOf="@id/ivDeletePermanent" />
+            app:layout_constraintTop_toBottomOf="@id/tvBrokenImage" />
     </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 c3364a8718..77f29dfa96 100644
--- a/app/src/main/res/layout/fragment_legend_synchronization.xml
+++ b/app/src/main/res/layout/fragment_legend_synchronization.xml
@@ -18,6 +18,7 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_oauth"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvOauth"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:srcCompat="@drawable/twotone_security_24" />
@@ -25,14 +26,14 @@
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvOauth"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_oauth"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivOAuth"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivOAuth"
-            app:layout_constraintTop_toTopOf="@id/ivOAuth" />
+            app:layout_constraintTop_toTopOf="parent" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivPrimaryConnected"
@@ -40,21 +41,22 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_folder_connected"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvPrimaryConnected"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivOAuth"
+            app:layout_constraintTop_toTopOf="@id/tvPrimaryConnected"
             app:srcCompat="@drawable/twotone_folder_done_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvPrimaryConnected"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_folder_connected"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivPrimaryConnected"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivPrimaryConnected"
-            app:layout_constraintTop_toTopOf="@id/ivPrimaryConnected" />
+            app:layout_constraintTop_toBottomOf="@id/tvOauth" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivPrimaryDisconnected"
@@ -62,21 +64,22 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_folder_disconnected"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvPrimaryDisconnected"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivPrimaryConnected"
+            app:layout_constraintTop_toTopOf="@id/tvPrimaryDisconnected"
             app:srcCompat="@drawable/twotone_folder_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvPrimaryDisconnected"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_folder_disconnected"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivPrimaryDisconnected"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivPrimaryDisconnected"
-            app:layout_constraintTop_toTopOf="@id/ivPrimaryDisconnected" />
+            app:layout_constraintTop_toBottomOf="@id/tvPrimaryConnected" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivDownloadOn"
@@ -84,21 +87,22 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_download_on"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvDownloadOn"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivPrimaryDisconnected"
+            app:layout_constraintTop_toTopOf="@id/tvDownloadOn"
             app:srcCompat="@drawable/twotone_mail_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvDownloadOn"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_download_on"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivDownloadOn"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivDownloadOn"
-            app:layout_constraintTop_toTopOf="@id/ivDownloadOn" />
+            app:layout_constraintTop_toBottomOf="@id/tvPrimaryDisconnected" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivDownloadOff"
@@ -106,21 +110,22 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_download_off"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvDownloadOff"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivDownloadOn"
+            app:layout_constraintTop_toTopOf="@id/tvDownloadOff"
             app:srcCompat="@drawable/twotone_mail_outline_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvDownloadOff"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_download_off"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivDownloadOff"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivDownloadOff"
-            app:layout_constraintTop_toTopOf="@id/ivDownloadOff" />
+            app:layout_constraintTop_toBottomOf="@id/tvDownloadOn" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivSynchronize"
@@ -128,21 +133,22 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_synchronize_on"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvSynchronize"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivDownloadOff"
+            app:layout_constraintTop_toTopOf="@id/tvSynchronize"
             app:srcCompat="@drawable/twotone_sync_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvSynchronize"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_synchronize_on"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivSynchronize"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivSynchronize"
-            app:layout_constraintTop_toTopOf="@id/ivSynchronize" />
+            app:layout_constraintTop_toBottomOf="@id/tvDownloadOff" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivSynchronizeOff"
@@ -150,21 +156,22 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_synchronize_off"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvSynchronizeOff"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivSynchronize"
+            app:layout_constraintTop_toTopOf="@id/tvSynchronizeOff"
             app:srcCompat="@drawable/twotone_sync_disabled_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvSynchronizeOff"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_synchronize_off"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivSynchronizeOff"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivSynchronizeOff"
-            app:layout_constraintTop_toTopOf="@id/ivSynchronizeOff" />
+            app:layout_constraintTop_toBottomOf="@id/tvSynchronize" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivSynchronizePoll"
@@ -172,21 +179,22 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_synchronize_poll"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvSynchronizePoll"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivSynchronizeOff"
+            app:layout_constraintTop_toTopOf="@id/tvSynchronizePoll"
             app:srcCompat="@drawable/twotone_hourglass_top_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvSynchronizePoll"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_synchronize_poll"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivSynchronizePoll"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivSynchronizePoll"
-            app:layout_constraintTop_toTopOf="@id/ivSynchronizePoll" />
+            app:layout_constraintTop_toBottomOf="@id/tvSynchronizeOff" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivDisconnected"
@@ -194,21 +202,22 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_disconnected"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvDisconnected"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivSynchronizePoll"
+            app:layout_constraintTop_toTopOf="@id/tvDisconnected"
             app:srcCompat="@drawable/twotone_cloud_off_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvDisconnected"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_disconnected"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivDisconnected"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivDisconnected"
-            app:layout_constraintTop_toTopOf="@id/ivDisconnected" />
+            app:layout_constraintTop_toBottomOf="@id/tvSynchronizePoll" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivConnecting"
@@ -216,21 +225,22 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_connecting"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvConnecting"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivDisconnected"
+            app:layout_constraintTop_toTopOf="@id/tvConnecting"
             app:srcCompat="@drawable/twotone_cloud_queue_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvConnecting"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_connecting"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivConnecting"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivConnecting"
-            app:layout_constraintTop_toTopOf="@id/ivConnecting" />
+            app:layout_constraintTop_toBottomOf="@id/tvDisconnected" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivConnected"
@@ -238,21 +248,22 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_connected"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvConnected"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivConnecting"
+            app:layout_constraintTop_toTopOf="@id/tvConnected"
             app:srcCompat="@drawable/twotone_cloud_done_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvConnected"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_connected"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivConnected"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivConnected"
-            app:layout_constraintTop_toTopOf="@id/ivConnected" />
+            app:layout_constraintTop_toBottomOf="@id/tvConnecting" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivBackoff"
@@ -260,21 +271,22 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_backoff"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvBackoff"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivConnected"
+            app:layout_constraintTop_toTopOf="@id/tvBackoff"
             app:srcCompat="@drawable/twotone_update_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvBackoff"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_backoff"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivBackoff"
             app:layout_constraintEnd_toStartOf="@id/ibInfoBackoff"
             app:layout_constraintStart_toEndOf="@id/ivBackoff"
-            app:layout_constraintTop_toTopOf="@id/ivBackoff" />
+            app:layout_constraintTop_toBottomOf="@id/tvConnected" />
 
         <eu.faircode.email.FixedImageButton
             android:id="@+id/ibInfoBackoff"
@@ -282,9 +294,9 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_info"
             android:tooltipText="@string/title_info"
-            app:layout_constraintBottom_toBottomOf="@id/ivBackoff"
+            app:layout_constraintBottom_toBottomOf="@id/tvBackoff"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@id/ivBackoff"
+            app:layout_constraintTop_toTopOf="@id/tvBackoff"
             app:srcCompat="@drawable/twotone_info_24" />
 
         <eu.faircode.email.FixedImageView
@@ -293,22 +305,23 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_backoff"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvQuota"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivBackoff"
+            app:layout_constraintTop_toTopOf="@id/tvQuota"
             app:srcCompat="@drawable/twotone_disc_full_24"
             app:tint="?attr/colorWarning" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvQuota"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_quota"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivQuota"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivQuota"
-            app:layout_constraintTop_toTopOf="@id/ivQuota" />
+            app:layout_constraintTop_toBottomOf="@id/tvBackoff" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivExecuting"
@@ -316,21 +329,22 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_executing"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvExecuting"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivQuota"
+            app:layout_constraintTop_toTopOf="@id/tvExecuting"
             app:srcCompat="@drawable/twotone_dns_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvExecuting"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_executing"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivExecuting"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivExecuting"
-            app:layout_constraintTop_toTopOf="@id/ivExecuting" />
+            app:layout_constraintTop_toBottomOf="@id/tvQuota" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivSynchronizing"
@@ -338,21 +352,22 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_synchronizing"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvSynchronizing"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivExecuting"
+            app:layout_constraintTop_toTopOf="@id/tvSynchronizing"
             app:srcCompat="@drawable/twotone_compare_arrows_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvSynchronizing"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_synchronizing"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivSynchronizing"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivSynchronizing"
-            app:layout_constraintTop_toTopOf="@id/ivSynchronizing" />
+            app:layout_constraintTop_toBottomOf="@id/tvExecuting" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivDownloading"
@@ -360,21 +375,22 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_downloading"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvDownloading"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivSynchronizing"
+            app:layout_constraintTop_toTopOf="@id/tvDownloading"
             app:srcCompat="@drawable/twotone_cloud_download_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvDownloading"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_downloading"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivDownloading"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivDownloading"
-            app:layout_constraintTop_toTopOf="@id/ivDownloading" />
+            app:layout_constraintTop_toBottomOf="@id/tvSynchronizing" />
 
         <eu.faircode.email.FixedImageView
             android:id="@+id/ivClosing"
@@ -382,20 +398,21 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_closing"
             android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvClosing"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivDownloading"
+            app:layout_constraintTop_toTopOf="@id/tvClosing"
             app:srcCompat="@drawable/twotone_cancel_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvClosing"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:minHeight="48dp"
             android:text="@string/title_legend_closing"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivClosing"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivClosing"
-            app:layout_constraintTop_toTopOf="@id/ivClosing" />
+            app:layout_constraintTop_toBottomOf="@id/tvDownloading" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>