From c82df2b4544d76bb42e008ae7295601f4772e6fd Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 9 Mar 2019 10:02:17 +0000
Subject: [PATCH] Revised addresses section

---
 .../eu/faircode/email/AdapterMessage.java     | 141 ++++++----
 app/src/main/res/layout/include_addresses.xml | 248 ++++++++++++++++
 .../main/res/layout/item_message_compact.xml  | 263 +----------------
 .../main/res/layout/item_message_normal.xml   | 266 +-----------------
 4 files changed, 355 insertions(+), 563 deletions(-)
 create mode 100644 app/src/main/res/layout/include_addresses.xml

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 267f7a0d2a..462548a8e2 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -200,10 +200,21 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         private View vwRipple;
 
         private ImageView ivExpanderAddress;
-        private TextView tvFromEx;
+
         private ImageView ivSearchContact;
         private ImageView ivNotifyContact;
         private ImageView ivAddContact;
+
+        private TextView tvFromExTitle;
+        private TextView tvToTitle;
+        private TextView tvReplyToTitle;
+        private TextView tvCcTitle;
+        private TextView tvBccTitle;
+        private TextView tvIdentityTitle;
+        private TextView tvTimeExTitle;
+        private TextView tvSizeExTitle;
+
+        private TextView tvFromEx;
         private TextView tvTo;
         private TextView tvReplyTo;
         private TextView tvCc;
@@ -211,6 +222,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         private TextView tvIdentity;
         private TextView tvTimeEx;
         private TextView tvSizeEx;
+
         private TextView tvSubjectEx;
         private TextView tvFlags;
         private TextView tvKeywords;
@@ -238,7 +250,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         private RecyclerView rvImage;
 
         private Group grpDay;
-        private Group grpAddress;
         private Group grpHeaders;
         private Group grpAttachments;
         private Group grpExpanded;
@@ -277,10 +288,21 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             vwRipple = itemView.findViewById(R.id.vwRipple);
 
             ivExpanderAddress = itemView.findViewById(R.id.ivExpanderAddress);
-            tvFromEx = itemView.findViewById(R.id.tvFromEx);
+
             ivSearchContact = itemView.findViewById(R.id.ivSearchContact);
             ivNotifyContact = itemView.findViewById(R.id.ivNotifyContact);
             ivAddContact = itemView.findViewById(R.id.ivAddContact);
+
+            tvFromExTitle = itemView.findViewById(R.id.tvFromExTitle);
+            tvToTitle = itemView.findViewById(R.id.tvToTitle);
+            tvReplyToTitle = itemView.findViewById(R.id.tvReplyToTitle);
+            tvCcTitle = itemView.findViewById(R.id.tvCcTitle);
+            tvBccTitle = itemView.findViewById(R.id.tvBccTitle);
+            tvIdentityTitle = itemView.findViewById(R.id.tvIdentityTitle);
+            tvTimeExTitle = itemView.findViewById(R.id.tvTimeExTitle);
+            tvSizeExTitle = itemView.findViewById(R.id.tvSizeExTitle);
+
+            tvFromEx = itemView.findViewById(R.id.tvFromEx);
             tvTo = itemView.findViewById(R.id.tvTo);
             tvReplyTo = itemView.findViewById(R.id.tvReplyTo);
             tvCc = itemView.findViewById(R.id.tvCc);
@@ -288,6 +310,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             tvIdentity = itemView.findViewById(R.id.tvIdentity);
             tvTimeEx = itemView.findViewById(R.id.tvTimeEx);
             tvSizeEx = itemView.findViewById(R.id.tvSizeEx);
+
             tvSubjectEx = itemView.findViewById(R.id.tvSubjectEx);
             tvFlags = itemView.findViewById(R.id.tvFlags);
             tvKeywords = itemView.findViewById(R.id.tvKeywords);
@@ -329,7 +352,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             rvImage.setAdapter(adapterImage);
 
             grpDay = itemView.findViewById(R.id.grpDay);
-            grpAddress = itemView.findViewById(R.id.grpAddress);
             grpHeaders = itemView.findViewById(R.id.grpHeaders);
             grpAttachments = itemView.findViewById(R.id.grpAttachments);
             grpExpanded = itemView.findViewById(R.id.grpExpanded);
@@ -430,35 +452,9 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             tvError.setVisibility(View.GONE);
             pbLoading.setVisibility(View.VISIBLE);
 
-            tvFlags.setVisibility(View.GONE);
-            tvKeywords.setVisibility(View.GONE);
-
-            pbHeaders.setVisibility(View.GONE);
-            tvNoInternetHeaders.setVisibility(View.GONE);
-
-            cbInline.setVisibility(View.GONE);
-            btnDownloadAttachments.setVisibility(View.GONE);
-            btnSaveAttachments.setVisibility(View.GONE);
-            tvNoInternetAttachments.setVisibility(View.GONE);
-
-            btnHtml.setVisibility(View.GONE);
-            ibQuotes.setVisibility(View.GONE);
-            ibImages.setVisibility(View.GONE);
-            tvBody.setVisibility(View.GONE);
-            vwBody.setVisibility(View.GONE);
-            pbBody.setVisibility(View.GONE);
-            tvNoInternetBody.setVisibility(View.GONE);
-
-            rvImage.setVisibility(View.GONE);
+            clearExpanded();
 
             grpDay.setVisibility(View.GONE);
-            grpAddress.setVisibility(View.GONE);
-            ivSearchContact.setVisibility(View.GONE);
-            ivNotifyContact.setVisibility(View.GONE);
-            ivAddContact.setVisibility(View.GONE);
-            grpHeaders.setVisibility(View.GONE);
-            grpAttachments.setVisibility(View.GONE);
-            grpExpanded.setVisibility(View.GONE);
         }
 
         @SuppressLint("WrongConstant")
@@ -701,7 +697,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         }
 
         private void clearExpanded() {
-            grpAddress.setVisibility(View.GONE);
             grpHeaders.setVisibility(View.GONE);
             grpAttachments.setVisibility(View.GONE);
             grpExpanded.setVisibility(View.GONE);
@@ -709,8 +704,28 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             ivSearchContact.setVisibility(View.GONE);
             ivNotifyContact.setVisibility(View.GONE);
             ivAddContact.setVisibility(View.GONE);
+
+            tvFromExTitle.setVisibility(View.GONE);
+            tvToTitle.setVisibility(View.GONE);
+            tvReplyToTitle.setVisibility(View.GONE);
+            tvCcTitle.setVisibility(View.GONE);
+            tvBccTitle.setVisibility(View.GONE);
+            tvIdentityTitle.setVisibility(View.GONE);
+            tvTimeExTitle.setVisibility(View.GONE);
+            tvSizeExTitle.setVisibility(View.GONE);
+
+            tvFromEx.setVisibility(View.GONE);
+            tvTo.setVisibility(View.GONE);
+            tvReplyTo.setVisibility(View.GONE);
+            tvCc.setVisibility(View.GONE);
+            tvBcc.setVisibility(View.GONE);
+            tvIdentity.setVisibility(View.GONE);
+            tvTimeEx.setVisibility(View.GONE);
+            tvSizeEx.setVisibility(View.GONE);
+            tvSubjectEx.setVisibility(View.GONE);
             tvFlags.setVisibility(View.GONE);
             tvKeywords.setVisibility(View.GONE);
+
             pbHeaders.setVisibility(View.GONE);
             tvNoInternetHeaders.setVisibility(View.GONE);
 
@@ -753,12 +768,12 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
             grpExpanded.setVisibility(View.VISIBLE);
 
-            boolean from = (message.from != null && message.from.length > 0);
-            boolean channel = (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O);
-            grpAddress.setVisibility(show_addresses ? View.VISIBLE : View.GONE);
+            boolean hasFrom = (message.from != null && message.from.length > 0);
+            boolean hasChannel = (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O);
+
             ivSearchContact.setVisibility(show_addresses && search && BuildConfig.DEBUG ? View.VISIBLE : View.GONE);
-            ivNotifyContact.setVisibility(show_addresses && channel && from ? View.VISIBLE : View.GONE);
-            ivAddContact.setVisibility(show_addresses && contacts && from ? View.VISIBLE : View.GONE);
+            ivNotifyContact.setVisibility(show_addresses && hasChannel && hasFrom ? View.VISIBLE : View.GONE);
+            ivAddContact.setVisibility(show_addresses && contacts && hasFrom ? View.VISIBLE : View.GONE);
 
             grpHeaders.setVisibility(show_headers ? View.VISIBLE : View.GONE);
             if (show_headers && message.headers == null) {
@@ -783,35 +798,65 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
             // Addresses
             ivExpanderAddress.setImageResource(show_addresses ? R.drawable.baseline_expand_less_24 : R.drawable.baseline_expand_more_24);
-            tvFromEx.setText(MessageHelper.formatAddresses(message.from));
-            tvTo.setText(MessageHelper.formatAddresses(message.to));
-            tvReplyTo.setText(MessageHelper.formatAddresses(message.reply));
-            tvCc.setText(MessageHelper.formatAddresses(message.cc));
-            tvBcc.setText(MessageHelper.formatAddresses(message.bcc));
 
+            String from = MessageHelper.formatAddresses(message.from);
+            String to = MessageHelper.formatAddresses(message.to);
+            String replyto = MessageHelper.formatAddresses(message.reply);
+            String cc = MessageHelper.formatAddresses(message.cc);
+            String bcc = MessageHelper.formatAddresses(message.bcc);
+
+            String identity;
             try {
                 InternetAddress via = new InternetAddress(message.identityEmail, message.identityName);
-                tvIdentity.setText(MessageHelper.formatAddresses(new Address[]{via}));
+                identity = MessageHelper.formatAddresses(new Address[]{via});
             } catch (UnsupportedEncodingException ex) {
-                tvIdentity.setText(ex.getMessage());
+                identity = ex.getMessage();
             }
 
+            tvFromExTitle.setVisibility(show_addresses && !TextUtils.isEmpty(from) ? View.VISIBLE : View.GONE);
+            tvFromEx.setVisibility(show_addresses && !TextUtils.isEmpty(from) ? View.VISIBLE : View.GONE);
+            tvFromEx.setText(from);
+
+            tvToTitle.setVisibility(show_addresses && !TextUtils.isEmpty(to) ? View.VISIBLE : View.GONE);
+            tvTo.setVisibility(show_addresses && !TextUtils.isEmpty(to) ? View.VISIBLE : View.GONE);
+            tvTo.setText(to);
+
+            tvReplyToTitle.setVisibility(show_addresses && !TextUtils.isEmpty(replyto) ? View.VISIBLE : View.GONE);
+            tvReplyTo.setVisibility(show_addresses && !TextUtils.isEmpty(replyto) ? View.VISIBLE : View.GONE);
+            tvReplyTo.setText(replyto);
+
+            tvCcTitle.setVisibility(show_addresses && !TextUtils.isEmpty(cc) ? View.VISIBLE : View.GONE);
+            tvCc.setVisibility(show_addresses && !TextUtils.isEmpty(cc) ? View.VISIBLE : View.GONE);
+            tvCc.setText(cc);
+
+            tvBccTitle.setVisibility(show_addresses && !TextUtils.isEmpty(bcc) ? View.VISIBLE : View.GONE);
+            tvBcc.setVisibility(show_addresses && !TextUtils.isEmpty(bcc) ? View.VISIBLE : View.GONE);
+            tvBcc.setText(bcc);
+
+            tvIdentityTitle.setVisibility(show_addresses && debug && !TextUtils.isEmpty(identity) ? View.VISIBLE : View.GONE);
+            tvIdentity.setVisibility(show_addresses && debug && !TextUtils.isEmpty(identity) ? View.VISIBLE : View.GONE);
+            tvIdentity.setText(identity);
+
+            tvTimeExTitle.setVisibility(show_addresses ? View.VISIBLE : View.GONE);
+            tvTimeEx.setVisibility(show_addresses ? View.VISIBLE : View.GONE);
             tvTimeEx.setText(dtf.format(message.received));
 
-            tvSizeEx.setText(message.size == null ? null : Helper.humanReadableByteCount(message.size, true));
             if (!message.duplicate)
                 tvSizeEx.setAlpha(message.content ? 1.0f : Helper.LOW_LIGHT);
-            tvSizeEx.setVisibility(message.size == null ? View.GONE : View.VISIBLE);
+            tvSizeExTitle.setVisibility(!show_addresses || message.size == null ? View.GONE : View.VISIBLE);
+            tvSizeEx.setVisibility(!show_addresses || message.size == null ? View.GONE : View.VISIBLE);
+            tvSizeEx.setText(message.size == null ? null : Helper.humanReadableByteCount(message.size, true));
 
+            tvSubjectEx.setVisibility(show_addresses ? View.VISIBLE : View.GONE);
             tvSubjectEx.setText(message.subject);
 
             // Flags
+            tvFlags.setVisibility(show_addresses && debug ? View.VISIBLE : View.GONE);
             tvFlags.setText(message.flags);
-            tvFlags.setVisibility(debug ? View.VISIBLE : View.GONE);
 
             // Keywords
+            tvKeywords.setVisibility(show_addresses && message.keywords.length > 0 ? View.VISIBLE : View.GONE);
             tvKeywords.setText(TextUtils.join(" ", message.keywords));
-            tvKeywords.setVisibility(message.keywords.length > 0 ? View.VISIBLE : View.GONE);
 
             // Headers
             if (show_headers && message.headers != null) {
diff --git a/app/src/main/res/layout/include_addresses.xml b/app/src/main/res/layout/include_addresses.xml
new file mode 100644
index 0000000000..364637051e
--- /dev/null
+++ b/app/src/main/res/layout/include_addresses.xml
@@ -0,0 +1,248 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <ImageView
+        android:id="@+id/ivSearchContact"
+        android:layout_width="21dp"
+        android:layout_height="21dp"
+        android:layout_marginEnd="12dp"
+        android:background="?android:attr/selectableItemBackgroundBorderless"
+        android:src="@drawable/baseline_search_24"
+        app:layout_constraintEnd_toStartOf="@+id/ivNotifyContact"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ImageView
+        android:id="@+id/ivNotifyContact"
+        android:layout_width="21dp"
+        android:layout_height="21dp"
+        android:layout_marginEnd="12dp"
+        android:background="?android:attr/selectableItemBackgroundBorderless"
+        android:src="@drawable/baseline_notifications_24"
+        app:layout_constraintEnd_toStartOf="@+id/ivAddContact"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ImageView
+        android:id="@+id/ivAddContact"
+        android:layout_width="21dp"
+        android:layout_height="21dp"
+        android:background="?android:attr/selectableItemBackgroundBorderless"
+        android:src="@drawable/baseline_import_contacts_24"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/tvFromExTitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/title_from"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/ivAddContact" />
+
+    <TextView
+        android:id="@+id/tvFromEx"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="6dp"
+        android:text="From"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        android:textIsSelectable="true"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/barrier_addresses"
+        app:layout_constraintTop_toBottomOf="@id/ivAddContact" />
+
+    <TextView
+        android:id="@+id/tvToTitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/title_to"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tvFromEx" />
+
+    <TextView
+        android:id="@+id/tvTo"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="6dp"
+        android:text="To"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        android:textIsSelectable="true"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/barrier_addresses"
+        app:layout_constraintTop_toBottomOf="@id/tvFromEx" />
+
+    <TextView
+        android:id="@+id/tvReplyToTitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/title_reply_to"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tvTo" />
+
+    <TextView
+        android:id="@+id/tvReplyTo"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="6dp"
+        android:text="Reply to"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        android:textIsSelectable="true"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/barrier_addresses"
+        app:layout_constraintTop_toBottomOf="@id/tvTo" />
+
+    <TextView
+        android:id="@+id/tvCcTitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/title_cc"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tvReplyTo" />
+
+    <TextView
+        android:id="@+id/tvCc"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="6dp"
+        android:text="Cc"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        android:textIsSelectable="true"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/barrier_addresses"
+        app:layout_constraintTop_toBottomOf="@id/tvReplyTo" />
+
+    <TextView
+        android:id="@+id/tvBccTitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/title_bcc"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tvCc" />
+
+    <TextView
+        android:id="@+id/tvBcc"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="6dp"
+        android:text="Bcc"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        android:textIsSelectable="true"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/barrier_addresses"
+        app:layout_constraintTop_toBottomOf="@id/tvCc" />
+
+    <TextView
+        android:id="@+id/tvIdentityTitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/title_via_identity"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tvBcc" />
+
+    <TextView
+        android:id="@+id/tvIdentity"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="6dp"
+        android:text="user@example.org"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        android:textIsSelectable="true"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/barrier_addresses"
+        app:layout_constraintTop_toBottomOf="@id/tvBcc" />
+
+    <TextView
+        android:id="@+id/tvTimeExTitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/title_received"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tvIdentity" />
+
+    <TextView
+        android:id="@+id/tvTimeEx"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="6dp"
+        android:text="12:34:56"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        android:textIsSelectable="true"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/barrier_addresses"
+        app:layout_constraintTop_toBottomOf="@id/tvIdentity" />
+
+    <TextView
+        android:id="@+id/tvSizeExTitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/title_size"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tvTimeEx" />
+
+    <TextView
+        android:id="@+id/tvSizeEx"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="6dp"
+        android:text="123 KB"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        android:textIsSelectable="true"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/barrier_addresses"
+        app:layout_constraintTop_toBottomOf="@id/tvTimeEx" />
+
+    <androidx.constraintlayout.widget.Barrier
+        android:id="@+id/barrier_addresses"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:barrierDirection="end"
+        app:constraint_referenced_ids="
+            tvFromExTitle,tvToTitle,tvReplyToTitle,
+            tvCcTitle,tvBccTitle,
+            tvIdentityTitle,
+            tvTimeExTitle,tvSizeExTitle" />
+
+    <TextView
+        android:id="@+id/tvSubjectEx"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:text="Subject"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        android:textIsSelectable="true"
+        android:textStyle="italic"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tvSizeEx" />
+
+    <TextView
+        android:id="@+id/tvFlags"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:text="Flags"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        android:textIsSelectable="true"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tvSubjectEx" />
+
+    <TextView
+        android:id="@+id/tvKeywords"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:text="Keywords"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        android:textIsSelectable="true"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tvFlags" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_message_compact.xml b/app/src/main/res/layout/item_message_compact.xml
index c648a10a7e..a23f45d00b 100644
--- a/app/src/main/res/layout/item_message_compact.xml
+++ b/app/src/main/res/layout/item_message_compact.xml
@@ -338,258 +338,15 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/vSeparatorAddress" />
 
-        <TextView
-            android:id="@+id/tvFromExTitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:text="@string/title_from"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivExpanderAddress" />
-
-        <TextView
-            android:id="@+id/tvFromEx"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:layout_marginEnd="6dp"
-            android:text="From"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            android:textIsSelectable="true"
-            app:layout_constraintEnd_toStartOf="@+id/ivSearchContact"
-            app:layout_constraintStart_toEndOf="@id/tvFromExTitle"
-            app:layout_constraintTop_toBottomOf="@id/ivExpanderAddress" />
-
-        <ImageView
-            android:id="@+id/ivSearchContact"
-            android:layout_width="21dp"
-            android:layout_height="21dp"
-            android:layout_marginEnd="6dp"
-            android:background="?android:attr/selectableItemBackgroundBorderless"
-            android:src="@drawable/baseline_search_24"
-            app:layout_constraintEnd_toStartOf="@+id/ivNotifyContact"
-            app:layout_constraintTop_toBottomOf="@id/ivExpanderAddress" />
-
-        <ImageView
-            android:id="@+id/ivNotifyContact"
-            android:layout_width="21dp"
-            android:layout_height="21dp"
-            android:layout_marginEnd="6dp"
-            android:background="?android:attr/selectableItemBackgroundBorderless"
-            android:src="@drawable/baseline_notifications_24"
-            app:layout_constraintEnd_toStartOf="@+id/ivAddContact"
-            app:layout_constraintTop_toBottomOf="@id/ivExpanderAddress" />
-
-        <ImageView
-            android:id="@+id/ivAddContact"
-            android:layout_width="21dp"
-            android:layout_height="21dp"
-            android:layout_marginEnd="6dp"
-            android:background="?android:attr/selectableItemBackgroundBorderless"
-            android:src="@drawable/baseline_import_contacts_24"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivExpanderAddress" />
-
-        <TextView
-            android:id="@+id/tvToTitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:text="@string/title_to"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvFromEx" />
-
-        <TextView
-            android:id="@+id/tvTo"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:layout_marginEnd="6dp"
-            android:text="To"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            android:textIsSelectable="true"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/tvToTitle"
-            app:layout_constraintTop_toBottomOf="@id/tvFromEx" />
-
-        <TextView
-            android:id="@+id/tvReplyToTitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:text="@string/title_reply_to"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvTo" />
-
-        <TextView
-            android:id="@+id/tvReplyTo"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:layout_marginEnd="6dp"
-            android:text="Reply to"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            android:textIsSelectable="true"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/tvReplyToTitle"
-            app:layout_constraintTop_toBottomOf="@id/tvTo" />
-
-        <TextView
-            android:id="@+id/tvCcTitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:text="@string/title_cc"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvReplyTo" />
-
-        <TextView
-            android:id="@+id/tvCc"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:layout_marginEnd="6dp"
-            android:text="Cc"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            android:textIsSelectable="true"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/tvCcTitle"
-            app:layout_constraintTop_toBottomOf="@id/tvReplyTo" />
-
-        <TextView
-            android:id="@+id/tvBccTitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:text="@string/title_bcc"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvCc" />
-
-        <TextView
-            android:id="@+id/tvBcc"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:layout_marginEnd="6dp"
-            android:text="Bcc"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            android:textIsSelectable="true"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/tvBccTitle"
-            app:layout_constraintTop_toBottomOf="@id/tvCc" />
-
-        <TextView
-            android:id="@+id/tvIdentityTitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:text="@string/title_via_identity"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvBcc" />
-
-        <TextView
-            android:id="@+id/tvIdentity"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:layout_marginEnd="6dp"
-            android:text="user@example.org"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            android:textIsSelectable="true"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/tvIdentityTitle"
-            app:layout_constraintTop_toBottomOf="@id/tvBcc" />
-
-        <TextView
-            android:id="@+id/tvTimeExTitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:text="@string/title_received"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvIdentity" />
-
-        <TextView
-            android:id="@+id/tvTimeEx"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:layout_marginEnd="6dp"
-            android:text="12:34:56"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            android:textIsSelectable="true"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/tvTimeExTitle"
-            app:layout_constraintTop_toBottomOf="@id/tvIdentity" />
-
-        <TextView
-            android:id="@+id/tvSizeExTitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:text="@string/title_size"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvTimeEx" />
-
-        <TextView
-            android:id="@+id/tvSizeEx"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:layout_marginEnd="6dp"
-            android:text="123 KB"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            android:textIsSelectable="true"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/tvSizeExTitle"
-            app:layout_constraintTop_toBottomOf="@id/tvTimeEx" />
-
-        <TextView
-            android:id="@+id/tvSubjectEx"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:layout_marginEnd="6dp"
-            android:text="Subject"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            android:textIsSelectable="true"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvSizeEx" />
-
-        <TextView
-            android:id="@+id/tvFlags"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:layout_marginEnd="6dp"
-            android:text="Flags"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            android:textIsSelectable="true"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvSubjectEx" />
-
-        <TextView
-            android:id="@+id/tvKeywords"
-            android:layout_width="0dp"
+        <include
+            android:id="@+id/inAddresses"
+            layout="@layout/include_addresses"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="6dp"
             android:layout_marginEnd="6dp"
-            android:text="Keywords"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            android:textIsSelectable="true"
-            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvFlags" />
+            app:layout_constraintTop_toBottomOf="@id/ivExpanderAddress" />
 
         <View
             android:id="@+id/vSeparatorHeaders"
@@ -601,7 +358,7 @@
             android:background="?attr/colorSeparator"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvKeywords" />
+            app:layout_constraintTop_toBottomOf="@id/inAddresses" />
 
         <TextView
             android:id="@+id/tvHeaders"
@@ -837,14 +594,6 @@
             android:layout_height="0dp"
             app:constraint_referenced_ids="tvDay,vSeparatorDay" />
 
-        <androidx.constraintlayout.widget.Group
-            android:id="@+id/grpAddress"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            app:constraint_referenced_ids="
-            tvFromExTitle,tvFromEx,tvToTitle,tvTo,tvReplyToTitle,tvReplyTo,tvCcTitle,tvCc,tvBccTitle,tvBcc,
-            tvIdentityTitle,tvIdentity,tvTimeExTitle,tvTimeEx,tvSizeExTitle,tvSizeEx,tvSubjectEx" />
-
         <androidx.constraintlayout.widget.Group
             android:id="@+id/grpHeaders"
             android:layout_width="0dp"
diff --git a/app/src/main/res/layout/item_message_normal.xml b/app/src/main/res/layout/item_message_normal.xml
index 594f6df78c..5ef1ac0ca5 100644
--- a/app/src/main/res/layout/item_message_normal.xml
+++ b/app/src/main/res/layout/item_message_normal.xml
@@ -301,8 +301,8 @@
 
         <View
             android:id="@+id/vwRipple"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_width="411dp"
+            android:layout_height="125dp"
             android:background="?android:attr/selectableItemBackground"
             app:layout_constraintBottom_toTopOf="@+id/vSeparatorAddress"
             app:layout_constraintEnd_toEndOf="parent"
@@ -331,258 +331,15 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/vSeparatorAddress" />
 
-        <TextView
-            android:id="@+id/tvFromExTitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:text="@string/title_from"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivExpanderAddress" />
-
-        <TextView
-            android:id="@+id/tvFromEx"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:layout_marginEnd="6dp"
-            android:text="From"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            android:textIsSelectable="true"
-            app:layout_constraintEnd_toStartOf="@+id/ivSearchContact"
-            app:layout_constraintStart_toEndOf="@id/tvFromExTitle"
-            app:layout_constraintTop_toBottomOf="@id/ivExpanderAddress" />
-
-        <ImageView
-            android:id="@+id/ivSearchContact"
-            android:layout_width="21dp"
-            android:layout_height="21dp"
-            android:layout_marginEnd="6dp"
-            android:background="?android:attr/selectableItemBackgroundBorderless"
-            android:src="@drawable/baseline_search_24"
-            app:layout_constraintEnd_toStartOf="@+id/ivNotifyContact"
-            app:layout_constraintTop_toBottomOf="@id/ivExpanderAddress" />
-
-        <ImageView
-            android:id="@+id/ivNotifyContact"
-            android:layout_width="21dp"
-            android:layout_height="21dp"
-            android:layout_marginEnd="6dp"
-            android:background="?android:attr/selectableItemBackgroundBorderless"
-            android:src="@drawable/baseline_notifications_24"
-            app:layout_constraintEnd_toStartOf="@+id/ivAddContact"
-            app:layout_constraintTop_toBottomOf="@id/ivExpanderAddress" />
-
-        <ImageView
-            android:id="@+id/ivAddContact"
-            android:layout_width="21dp"
-            android:layout_height="21dp"
-            android:layout_marginEnd="6dp"
-            android:background="?android:attr/selectableItemBackgroundBorderless"
-            android:src="@drawable/baseline_import_contacts_24"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivExpanderAddress" />
-
-        <TextView
-            android:id="@+id/tvToTitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:text="@string/title_to"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvFromEx" />
-
-        <TextView
-            android:id="@+id/tvTo"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:layout_marginEnd="6dp"
-            android:text="To"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            android:textIsSelectable="true"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/tvToTitle"
-            app:layout_constraintTop_toBottomOf="@id/tvFromEx" />
-
-        <TextView
-            android:id="@+id/tvReplyToTitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:text="@string/title_reply_to"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvTo" />
-
-        <TextView
-            android:id="@+id/tvReplyTo"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:layout_marginEnd="6dp"
-            android:text="Reply to"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            android:textIsSelectable="true"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/tvReplyToTitle"
-            app:layout_constraintTop_toBottomOf="@id/tvTo" />
-
-        <TextView
-            android:id="@+id/tvCcTitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:text="@string/title_cc"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvReplyTo" />
-
-        <TextView
-            android:id="@+id/tvCc"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:layout_marginEnd="6dp"
-            android:text="Cc"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            android:textIsSelectable="true"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/tvCcTitle"
-            app:layout_constraintTop_toBottomOf="@id/tvReplyTo" />
-
-        <TextView
-            android:id="@+id/tvBccTitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:text="@string/title_bcc"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvCc" />
-
-        <TextView
-            android:id="@+id/tvBcc"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:layout_marginEnd="6dp"
-            android:text="Bcc"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            android:textIsSelectable="true"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/tvBccTitle"
-            app:layout_constraintTop_toBottomOf="@id/tvCc" />
-
-        <TextView
-            android:id="@+id/tvIdentityTitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:text="@string/title_via_identity"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvBcc" />
-
-        <TextView
-            android:id="@+id/tvIdentity"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:layout_marginEnd="6dp"
-            android:text="user@example.org"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            android:textIsSelectable="true"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/tvIdentityTitle"
-            app:layout_constraintTop_toBottomOf="@id/tvBcc" />
-
-        <TextView
-            android:id="@+id/tvTimeExTitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:text="@string/title_received"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvIdentity" />
-
-        <TextView
-            android:id="@+id/tvTimeEx"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:layout_marginEnd="6dp"
-            android:text="12:34:56"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            android:textIsSelectable="true"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/tvTimeExTitle"
-            app:layout_constraintTop_toBottomOf="@id/tvIdentity" />
-
-        <TextView
-            android:id="@+id/tvSizeExTitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:text="@string/title_size"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvTimeEx" />
-
-        <TextView
-            android:id="@+id/tvSizeEx"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:layout_marginEnd="6dp"
-            android:text="123 KB"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            android:textIsSelectable="true"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/tvSizeExTitle"
-            app:layout_constraintTop_toBottomOf="@id/tvTimeEx" />
-
-        <TextView
-            android:id="@+id/tvSubjectEx"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:layout_marginEnd="6dp"
-            android:text="Subject"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            android:textIsSelectable="true"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvSizeEx" />
-
-        <TextView
-            android:id="@+id/tvFlags"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:layout_marginEnd="6dp"
-            android:text="Flags"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            android:textIsSelectable="true"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvSubjectEx" />
-
-        <TextView
-            android:id="@+id/tvKeywords"
-            android:layout_width="0dp"
+        <include
+            android:id="@+id/inAddresses"
+            layout="@layout/include_addresses"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="6dp"
             android:layout_marginEnd="6dp"
-            android:text="Keywords"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            android:textIsSelectable="true"
-            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvFlags" />
+            app:layout_constraintTop_toBottomOf="@id/ivExpanderAddress" />
 
         <View
             android:id="@+id/vSeparatorHeaders"
@@ -594,7 +351,7 @@
             android:background="?attr/colorSeparator"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvKeywords" />
+            app:layout_constraintTop_toBottomOf="@id/inAddresses" />
 
         <TextView
             android:id="@+id/tvHeaders"
@@ -823,13 +580,6 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/rvImage" />
 
-        <androidx.constraintlayout.widget.Group
-            android:id="@+id/grpAddress"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            app:constraint_referenced_ids="tvFromExTitle,tvFromEx,tvToTitle,tvTo,tvReplyToTitle,tvReplyTo,tvCcTitle,tvCc,tvBccTitle,tvBcc,
-            tvIdentityTitle,tvIdentity,tvTimeExTitle,tvTimeEx,tvSizeExTitle,tvSizeEx,tvSubjectEx" />
-
         <androidx.constraintlayout.widget.Group
             android:id="@+id/grpDay"
             android:layout_width="0dp"