1.523 release

app/build.gradle

@@ -12,8 +12,8 @@ android {
         applicationId "eu.faircode.email"
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 522
-        versionName "1.522"
+        versionCode 523
+        versionName "1.523"
         archivesBaseName = "FairEmail-v$versionName"
 
         javaCompileOptions {
@@ -119,7 +119,7 @@ dependencies {
     def material_version = "1.0.0"
     def browser_version = "1.0.0"
     def lifecycle_version = "2.0.0"
-    def room_version = "2.0.0"
+    def room_version = "2.1.0-rc01"
     def paging_version = "2.1.0"
     def preference_version = "1.0.0"
     def work_version = "2.1.0-alpha02"
@@ -137,13 +137,6 @@ dependencies {
 
     // https://developer.android.com/jetpack/androidx/releases/
 
-    // Pin arch/core and sqlite
-    implementation "androidx.core:core:1.0.2"
-    implementation "androidx.arch.core:core-common:2.0.1"
-    implementation "androidx.arch.core:core-runtime:2.0.1"
-    implementation "androidx.sqlite:sqlite:2.0.1"
-    implementation "androidx.sqlite:sqlite-framework:2.0.1"
-
     // https://mvnrepository.com/artifact/androidx.appcompat/appcompat
     implementation "androidx.appcompat:appcompat:$appcompat_version"
 

app/src/main/java/eu/faircode/email/AdapterMessage.java

@@ -93,6 +93,8 @@ import androidx.paging.PagedList;
 import androidx.preference.PreferenceManager;
 import androidx.recyclerview.selection.ItemDetailsLookup;
 import androidx.recyclerview.selection.SelectionTracker;
+import androidx.recyclerview.widget.AdapterListUpdateCallback;
+import androidx.recyclerview.widget.AsyncDifferConfig;
 import androidx.recyclerview.widget.DiffUtil;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -118,6 +120,8 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 import javax.mail.Address;
 import javax.mail.internet.InternetAddress;
@@ -181,6 +185,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
     private DateFormat TF;
     private DateFormat DTF = SimpleDateFormat.getDateTimeInstance(SimpleDateFormat.LONG, SimpleDateFormat.LONG);
 
+    private static ExecutorService executor = Executors.newCachedThreadPool(Helper.backgroundThreadFactory);
+
     private static final List<String> PARANOID_QUERY = Collections.unmodifiableList(Arrays.asList(
             "utm_source",
             "utm_medium",
@@ -319,97 +325,99 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             pbLoading = itemView.findViewById(R.id.pbLoading);
             vwRipple = itemView.findViewById(R.id.vwRipple);
 
-            ConstraintLayout inAttachments = itemView.findViewById(R.id.inAttachments);
-            ConstraintLayout inAttachmentsAlt = itemView.findViewById(R.id.inAttachmentsAlt);
-            inAttachments.setVisibility(attachments_alt ? View.GONE : View.VISIBLE);
-            inAttachmentsAlt.setVisibility(attachments_alt ? View.VISIBLE : View.GONE);
-            ConstraintLayout attachments = (attachments_alt ? inAttachmentsAlt : inAttachments);
+            if (viewType == ViewType.THREAD) {
+                ConstraintLayout inAttachments = itemView.findViewById(R.id.inAttachments);
+                ConstraintLayout inAttachmentsAlt = itemView.findViewById(R.id.inAttachmentsAlt);
+                inAttachments.setVisibility(attachments_alt ? View.GONE : View.VISIBLE);
+                inAttachmentsAlt.setVisibility(attachments_alt ? View.VISIBLE : View.GONE);
+                ConstraintLayout attachments = (attachments_alt ? inAttachmentsAlt : inAttachments);
 
-            ivExpanderAddress = itemView.findViewById(R.id.ivExpanderAddress);
+                ivExpanderAddress = itemView.findViewById(R.id.ivExpanderAddress);
 
-            ibSearchContact = itemView.findViewById(R.id.ibSearchContact);
-            ibNotifyContact = itemView.findViewById(R.id.ibNotifyContact);
-            ibAddContact = itemView.findViewById(R.id.ibAddContact);
+                ibSearchContact = itemView.findViewById(R.id.ibSearchContact);
+                ibNotifyContact = itemView.findViewById(R.id.ibNotifyContact);
+                ibAddContact = itemView.findViewById(R.id.ibAddContact);
 
-            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);
+                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);
-            tvBcc = itemView.findViewById(R.id.tvBcc);
-            tvIdentity = itemView.findViewById(R.id.tvIdentity);
-            tvTimeEx = itemView.findViewById(R.id.tvTimeEx);
-            tvSizeEx = itemView.findViewById(R.id.tvSizeEx);
+                tvFromEx = itemView.findViewById(R.id.tvFromEx);
+                tvTo = itemView.findViewById(R.id.tvTo);
+                tvReplyTo = itemView.findViewById(R.id.tvReplyTo);
+                tvCc = itemView.findViewById(R.id.tvCc);
+                tvBcc = itemView.findViewById(R.id.tvBcc);
+                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);
+                tvSubjectEx = itemView.findViewById(R.id.tvSubjectEx);
+                tvFlags = itemView.findViewById(R.id.tvFlags);
+                tvKeywords = itemView.findViewById(R.id.tvKeywords);
 
-            tvHeaders = itemView.findViewById(R.id.tvHeaders);
-            pbHeaders = itemView.findViewById(R.id.pbHeaders);
-            tvNoInternetHeaders = itemView.findViewById(R.id.tvNoInternetHeaders);
+                tvHeaders = itemView.findViewById(R.id.tvHeaders);
+                pbHeaders = itemView.findViewById(R.id.pbHeaders);
+                tvNoInternetHeaders = itemView.findViewById(R.id.tvNoInternetHeaders);
 
-            tvCalendarSummary = view.findViewById(R.id.tvCalendarSummary);
-            tvCalendarStart = view.findViewById(R.id.tvCalendarStart);
-            tvCalendarEnd = view.findViewById(R.id.tvCalendarEnd);
-            tvAttendees = view.findViewById(R.id.tvAttendees);
-            btnCalendarAccept = view.findViewById(R.id.btnCalendarAccept);
-            btnCalendarDecline = view.findViewById(R.id.btnCalendarDecline);
-            btnCalendarMaybe = view.findViewById(R.id.btnCalendarMaybe);
-            pbCalendarWait = view.findViewById(R.id.pbCalendarWait);
+                tvCalendarSummary = view.findViewById(R.id.tvCalendarSummary);
+                tvCalendarStart = view.findViewById(R.id.tvCalendarStart);
+                tvCalendarEnd = view.findViewById(R.id.tvCalendarEnd);
+                tvAttendees = view.findViewById(R.id.tvAttendees);
+                btnCalendarAccept = view.findViewById(R.id.btnCalendarAccept);
+                btnCalendarDecline = view.findViewById(R.id.btnCalendarDecline);
+                btnCalendarMaybe = view.findViewById(R.id.btnCalendarMaybe);
+                pbCalendarWait = view.findViewById(R.id.pbCalendarWait);
 
-            rvAttachment = attachments.findViewById(R.id.rvAttachment);
-            rvAttachment.setHasFixedSize(false);
-            LinearLayoutManager llm = new LinearLayoutManager(context);
-            rvAttachment.setLayoutManager(llm);
-            rvAttachment.setItemAnimator(null);
+                rvAttachment = attachments.findViewById(R.id.rvAttachment);
+                rvAttachment.setHasFixedSize(false);
+                LinearLayoutManager llm = new LinearLayoutManager(context);
+                rvAttachment.setLayoutManager(llm);
+                rvAttachment.setItemAnimator(null);
 
-            adapterAttachment = new AdapterAttachment(context, owner, true);
-            rvAttachment.setAdapter(adapterAttachment);
+                adapterAttachment = new AdapterAttachment(context, owner, true);
+                rvAttachment.setAdapter(adapterAttachment);
 
-            cbInline = attachments.findViewById(R.id.cbInline);
-            btnDownloadAttachments = attachments.findViewById(R.id.btnDownloadAttachments);
-            btnSaveAttachments = attachments.findViewById(R.id.btnSaveAttachments);
-            tvNoInternetAttachments = attachments.findViewById(R.id.tvNoInternetAttachments);
+                cbInline = attachments.findViewById(R.id.cbInline);
+                btnDownloadAttachments = attachments.findViewById(R.id.btnDownloadAttachments);
+                btnSaveAttachments = attachments.findViewById(R.id.btnSaveAttachments);
+                tvNoInternetAttachments = attachments.findViewById(R.id.tvNoInternetAttachments);
 
-            bnvActions = itemView.findViewById(R.id.bnvActions);
-            if (compact) {
-                bnvActions.setLabelVisibilityMode(LabelVisibilityMode.LABEL_VISIBILITY_UNLABELED);
-                ViewGroup.LayoutParams lparam = bnvActions.getLayoutParams();
-                lparam.height = dp36;
-                bnvActions.setLayoutParams(lparam);
+                bnvActions = itemView.findViewById(R.id.bnvActions);
+                if (compact) {
+                    bnvActions.setLabelVisibilityMode(LabelVisibilityMode.LABEL_VISIBILITY_UNLABELED);
+                    ViewGroup.LayoutParams lparam = bnvActions.getLayoutParams();
+                    lparam.height = dp36;
+                    bnvActions.setLayoutParams(lparam);
+                }
+
+                tbHtml = itemView.findViewById(R.id.tbHtml);
+                ibImages = itemView.findViewById(R.id.ibImages);
+                ibFull = itemView.findViewById(R.id.ibFull);
+                tvBody = itemView.findViewById(R.id.tvBody);
+                vwBody = itemView.findViewById(R.id.vwBody);
+                pbBody = itemView.findViewById(R.id.pbBody);
+                tvNoInternetBody = itemView.findViewById(R.id.tvNoInternetBody);
+
+                rvImage = itemView.findViewById(R.id.rvImage);
+                rvImage.setHasFixedSize(false);
+                StaggeredGridLayoutManager sglm =
+                        new StaggeredGridLayoutManager(2, StaggeredGridLayoutManager.VERTICAL);
+                rvImage.setLayoutManager(sglm);
+                adapterImage = new AdapterImage(context, owner);
+                rvImage.setAdapter(adapterImage);
+
+                grpAddresses = itemView.findViewById(R.id.grpAddresses);
+                grpHeaders = itemView.findViewById(R.id.grpHeaders);
+                grpCalendar = itemView.findViewById(R.id.grpCalendar);
+                grpCalendarResponse = itemView.findViewById(R.id.grpCalendarResponse);
+                grpAttachments = attachments.findViewById(R.id.grpAttachments);
+                grpImages = itemView.findViewById(R.id.grpImages);
             }
-
-            tbHtml = itemView.findViewById(R.id.tbHtml);
-            ibImages = itemView.findViewById(R.id.ibImages);
-            ibFull = itemView.findViewById(R.id.ibFull);
-            tvBody = itemView.findViewById(R.id.tvBody);
-            vwBody = itemView.findViewById(R.id.vwBody);
-            pbBody = itemView.findViewById(R.id.pbBody);
-            tvNoInternetBody = itemView.findViewById(R.id.tvNoInternetBody);
-
-            rvImage = itemView.findViewById(R.id.rvImage);
-            rvImage.setHasFixedSize(false);
-            StaggeredGridLayoutManager sglm =
-                    new StaggeredGridLayoutManager(2, StaggeredGridLayoutManager.VERTICAL);
-            rvImage.setLayoutManager(sglm);
-            adapterImage = new AdapterImage(context, owner);
-            rvImage.setAdapter(adapterImage);
-
-            grpAddresses = itemView.findViewById(R.id.grpAddresses);
-            grpHeaders = itemView.findViewById(R.id.grpHeaders);
-            grpCalendar = itemView.findViewById(R.id.grpCalendar);
-            grpCalendarResponse = itemView.findViewById(R.id.grpCalendarResponse);
-            grpAttachments = attachments.findViewById(R.id.grpAttachments);
-            grpImages = itemView.findViewById(R.id.grpImages);
         }
 
         Rect getItemRect() {
@@ -438,23 +446,25 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             ivSnoozed.setOnClickListener(this);
             ivFlagged.setOnClickListener(this);
 
-            ivExpanderAddress.setOnClickListener(this);
-            ibSearchContact.setOnClickListener(this);
-            ibNotifyContact.setOnClickListener(this);
-            ibAddContact.setOnClickListener(this);
+            if (viewType == ViewType.THREAD) {
+                ivExpanderAddress.setOnClickListener(this);
+                ibSearchContact.setOnClickListener(this);
+                ibNotifyContact.setOnClickListener(this);
+                ibAddContact.setOnClickListener(this);
 
-            btnDownloadAttachments.setOnClickListener(this);
-            btnSaveAttachments.setOnClickListener(this);
+                btnDownloadAttachments.setOnClickListener(this);
+                btnSaveAttachments.setOnClickListener(this);
 
-            tbHtml.setOnCheckedChangeListener(this);
-            ibImages.setOnClickListener(this);
-            ibFull.setOnClickListener(this);
+                tbHtml.setOnCheckedChangeListener(this);
+                ibImages.setOnClickListener(this);
+                ibFull.setOnClickListener(this);
 
-            btnCalendarAccept.setOnClickListener(this);
-            btnCalendarDecline.setOnClickListener(this);
-            btnCalendarMaybe.setOnClickListener(this);
+                btnCalendarAccept.setOnClickListener(this);
+                btnCalendarDecline.setOnClickListener(this);
+                btnCalendarMaybe.setOnClickListener(this);
 
-            bnvActions.setOnNavigationItemSelectedListener(this);
+                bnvActions.setOnNavigationItemSelectedListener(this);
+            }
         }
 
         private void unwire() {
@@ -467,23 +477,25 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             ivSnoozed.setOnClickListener(null);
             ivFlagged.setOnClickListener(null);
 
-            ivExpanderAddress.setOnClickListener(null);
-            ibSearchContact.setOnClickListener(null);
-            ibNotifyContact.setOnClickListener(null);
-            ibAddContact.setOnClickListener(null);
+            if (viewType == ViewType.THREAD) {
+                ivExpanderAddress.setOnClickListener(null);
+                ibSearchContact.setOnClickListener(null);
+                ibNotifyContact.setOnClickListener(null);
+                ibAddContact.setOnClickListener(null);
 
-            btnDownloadAttachments.setOnClickListener(null);
-            btnSaveAttachments.setOnClickListener(null);
+                btnDownloadAttachments.setOnClickListener(null);
+                btnSaveAttachments.setOnClickListener(null);
 
-            tbHtml.setOnCheckedChangeListener(null);
-            ibImages.setOnClickListener(null);
-            ibFull.setOnClickListener(null);
+                tbHtml.setOnCheckedChangeListener(null);
+                ibImages.setOnClickListener(null);
+                ibFull.setOnClickListener(null);
 
-            btnCalendarAccept.setOnClickListener(null);
-            btnCalendarDecline.setOnClickListener(null);
-            btnCalendarMaybe.setOnClickListener(null);
+                btnCalendarAccept.setOnClickListener(null);
+                btnCalendarDecline.setOnClickListener(null);
+                btnCalendarMaybe.setOnClickListener(null);
 
-            bnvActions.setOnNavigationItemSelectedListener(null);
+                bnvActions.setOnNavigationItemSelectedListener(null);
+            }
         }
 
         private void clear() {
@@ -525,7 +537,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 tvFrom.setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize * (message.unseen > 0 ? 1.1f : 1f));
                 tvSubject.setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize * 0.9f);
                 tvPreview.setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize * 0.9f);
-                tvBody.setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize);
+                if (viewType == ViewType.THREAD)
+                    tvBody.setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize);
 
                 int px = Math.round(TypedValue.applyDimension(
                         TypedValue.COMPLEX_UNIT_PX, textSize * (compact ? 1.5f : 3.0f),
@@ -745,8 +758,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     properties.setBody(message.id, null);
                     properties.setHtml(message.id, null);
                 }
-            } else
-                clearExpanded();
+            }
         }
 
         private void clearExpanded() {
@@ -3447,7 +3459,10 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         this.authentication = prefs.getBoolean("authentication", false);
         this.debug = prefs.getBoolean("debug", false);
 
-        this.differ = new AsyncPagedListDiffer<>(this, DIFF_CALLBACK);
+        AsyncDifferConfig<TupleMessageEx> config = new AsyncDifferConfig.Builder<>(DIFF_CALLBACK)
+                .setBackgroundThreadExecutor(executor)
+                .build();
+        this.differ = new AsyncPagedListDiffer<>(new AdapterListUpdateCallback(this), config);
         this.differ.addPagedListListener(new AsyncPagedListDiffer.PagedListListener<TupleMessageEx>() {
             @Override
             public void onCurrentListChanged(@Nullable PagedList<TupleMessageEx> previousList, @Nullable PagedList<TupleMessageEx> currentList) {
@@ -3527,7 +3542,10 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
     @Override
     public int getItemViewType(int position) {
-        return (compact ? R.layout.item_message_compact : R.layout.item_message_normal);
+        if (viewType == ViewType.THREAD)
+            return (compact ? R.layout.item_message_compact : R.layout.item_message_normal);
+        else
+            return (compact ? R.layout.include_message_compact : R.layout.include_message_normal);
     }
 
     @Override

app/src/main/java/eu/faircode/email/DB.java

@@ -89,7 +89,7 @@ public abstract class DB extends RoomDatabase {
     public abstract DaoLog log();
 
     private static DB sInstance;
-    private static ExecutorService executor = Executors.newSingleThreadExecutor(Helper.backgroundThreadFactory);
+    private static ExecutorService executor = Executors.newCachedThreadPool(Helper.backgroundThreadFactory);
 
     private static final String DB_NAME = "fairemail";
 
@@ -835,6 +835,24 @@ public abstract class DB extends RoomDatabase {
                 .build();
     }
 
+    @Override
+    @SuppressWarnings("deprecation")
+    public void beginTransaction() {
+        super.beginTransaction();
+    }
+
+    @Override
+    @SuppressWarnings("deprecation")
+    public void setTransactionSuccessful() {
+        super.setTransactionSuccessful();
+    }
+
+    @Override
+    @SuppressWarnings("deprecation")
+    public void endTransaction() {
+        super.endTransaction();
+    }
+
     public static class Converters {
         @TypeConverter
         public static String[] toStringArray(String value) {

app/src/main/res/layout/include_message_compact.xml

@@ -0,0 +1,331 @@
+<?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:id="@+id/clItem"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?attr/activatableItemBackground"
+    android:descendantFocusability="beforeDescendants"
+    android:focusable="true"
+    android:focusableInTouchMode="true">
+
+    <View
+        android:id="@+id/vwColor"
+        android:layout_width="6dp"
+        android:layout_height="0dp"
+        android:background="@color/colorAccent"
+        app:layout_constraintBottom_toBottomOf="@+id/paddingBottom"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <View
+        android:id="@+id/paddingTop"
+        android:layout_width="match_parent"
+        android:layout_height="12dp"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ImageView
+        android:id="@+id/ivExpander"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical|center_horizontal"
+        android:layout_marginStart="6dp"
+        android:background="?android:attr/selectableItemBackgroundBorderless"
+        android:contentDescription="@string/title_legend_expander"
+        android:src="@drawable/expander"
+        android:visibility="visible"
+        app:layout_constraintBottom_toBottomOf="@+id/paddingBottom"
+        app:layout_constraintStart_toEndOf="@id/vwColor"
+        app:layout_constraintTop_toTopOf="@id/paddingTop" />
+
+    <View
+        android:id="@+id/paddingStart"
+        android:layout_width="6dp"
+        android:layout_height="0dp"
+        android:visibility="gone"
+        app:layout_constraintStart_toEndOf="@+id/ivExpander"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ImageView
+        android:id="@+id/ivAvatar"
+        android:layout_width="0dp"
+        android:layout_height="24dp"
+        android:layout_marginStart="6dp"
+        android:contentDescription="@string/title_legend_avatar"
+        android:src="@drawable/baseline_person_24"
+        app:layout_constraintBottom_toBottomOf="@+id/tvFrom"
+        app:layout_constraintDimensionRatio="1:1"
+        app:layout_constraintStart_toEndOf="@id/paddingStart"
+        app:layout_constraintTop_toBottomOf="@id/paddingTop" />
+
+    <TextView
+        android:id="@+id/tvFrom"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="6dp"
+        android:layout_marginEnd="6dp"
+        android:ellipsize="end"
+        android:gravity="center_vertical"
+        android:minHeight="24dp"
+        android:singleLine="true"
+        android:text="From"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        app:layout_constraintEnd_toStartOf="@+id/tvSize"
+        app:layout_constraintStart_toEndOf="@id/ivAvatar"
+        app:layout_constraintTop_toBottomOf="@id/paddingTop" />
+
+    <TextView
+        android:id="@+id/tvSize"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="6dp"
+        android:gravity="center_vertical"
+        android:maxLines="1"
+        android:text="123 KB"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        android:textColor="?attr/colorUnread"
+        app:layout_constraintBottom_toBottomOf="@+id/tvFrom"
+        app:layout_constraintEnd_toStartOf="@+id/tvTime"
+        app:layout_constraintTop_toBottomOf="@id/paddingTop" />
+
+    <TextView
+        android:id="@+id/tvTime"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="6dp"
+        android:gravity="center_vertical"
+        android:maxLines="1"
+        android:text="Time"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        app:layout_constraintBottom_toBottomOf="@+id/tvFrom"
+        app:layout_constraintEnd_toStartOf="@+id/ivFlagged"
+        app:layout_constraintTop_toBottomOf="@id/paddingTop" />
+
+    <ImageView
+        android:id="@+id/ivType"
+        android:layout_width="21dp"
+        android:layout_height="21dp"
+        android:layout_marginStart="6dp"
+        android:contentDescription="@string/title_legend_folder_type"
+        android:src="@drawable/baseline_edit_24"
+        app:layout_constraintBottom_toBottomOf="@+id/tvSubject"
+        app:layout_constraintStart_toEndOf="@id/paddingStart"
+        app:layout_constraintTop_toTopOf="@+id/tvSubject" />
+
+    <ImageView
+        android:id="@+id/ivSnoozed"
+        android:layout_width="21dp"
+        android:layout_height="21dp"
+        android:layout_marginStart="6dp"
+        android:contentDescription="@string/title_legend_snoozed"
+        android:src="@drawable/baseline_timelapse_24"
+        app:layout_constraintBottom_toBottomOf="@+id/tvSubject"
+        app:layout_constraintStart_toEndOf="@id/ivType"
+        app:layout_constraintTop_toTopOf="@+id/tvSubject" />
+
+    <ImageView
+        android:id="@+id/ivBrowsed"
+        android:layout_width="21dp"
+        android:layout_height="21dp"
+        android:layout_marginStart="6dp"
+        android:contentDescription="@string/title_legend_browsed"
+        android:src="@drawable/baseline_playlist_add_24"
+        app:layout_constraintBottom_toBottomOf="@+id/tvSubject"
+        app:layout_constraintStart_toEndOf="@id/ivSnoozed"
+        app:layout_constraintTop_toTopOf="@+id/tvSubject" />
+
+    <ImageView
+        android:id="@+id/ivAnswered"
+        android:layout_width="21dp"
+        android:layout_height="21dp"
+        android:layout_marginStart="6dp"
+        android:contentDescription="@string/title_legend_answered"
+        android:src="@drawable/baseline_reply_24"
+        app:layout_constraintBottom_toBottomOf="@+id/tvSubject"
+        app:layout_constraintStart_toEndOf="@id/ivBrowsed"
+        app:layout_constraintTop_toTopOf="@+id/tvSubject" />
+
+    <ImageView
+        android:id="@+id/ivPlain"
+        android:layout_width="21dp"
+        android:layout_height="21dp"
+        android:layout_marginStart="6dp"
+        android:contentDescription="@string/title_legend_plain_only"
+        android:src="@drawable/baseline_notes_24"
+        app:layout_constraintBottom_toBottomOf="@+id/tvSubject"
+        app:layout_constraintStart_toEndOf="@id/ivAnswered"
+        app:layout_constraintTop_toTopOf="@+id/tvSubject" />
+
+    <ImageView
+        android:id="@+id/ivReceipt"
+        android:layout_width="21dp"
+        android:layout_height="21dp"
+        android:layout_marginStart="6dp"
+        android:contentDescription="@string/title_legend_receipt"
+        android:src="@drawable/baseline_playlist_add_check_24"
+        app:layout_constraintBottom_toBottomOf="@+id/tvSubject"
+        app:layout_constraintStart_toEndOf="@id/ivPlain"
+        app:layout_constraintTop_toTopOf="@+id/tvSubject" />
+
+    <ImageView
+        android:id="@+id/ivAttachments"
+        android:layout_width="21dp"
+        android:layout_height="21dp"
+        android:layout_marginStart="6dp"
+        android:contentDescription="@string/title_legend_attachment"
+        android:src="@drawable/baseline_attachment_24"
+        app:layout_constraintBottom_toBottomOf="@+id/tvSubject"
+        app:layout_constraintStart_toEndOf="@id/ivReceipt"
+        app:layout_constraintTop_toTopOf="@+id/tvSubject" />
+
+    <TextView
+        android:id="@+id/tvSubject"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="6dp"
+        android:layout_marginEnd="6dp"
+        android:ellipsize="middle"
+        android:gravity="center_vertical"
+        android:minHeight="21dp"
+        android:singleLine="true"
+        android:text="Subject"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        app:layout_constraintEnd_toStartOf="@+id/tvFolder"
+        app:layout_constraintStart_toEndOf="@id/ivAttachments"
+        app:layout_constraintTop_toBottomOf="@id/tvFrom" />
+
+    <TextView
+        android:id="@+id/tvFolder"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="6dp"
+        android:ellipsize="start"
+        android:gravity="end|center_vertical"
+        android:maxWidth="120dp"
+        android:singleLine="true"
+        android:text="Folder"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        app:layout_constraintBottom_toBottomOf="@id/tvSubject"
+        app:layout_constraintEnd_toStartOf="@+id/tvCount"
+        app:layout_constraintStart_toEndOf="@id/tvSubject"
+        app:layout_constraintTop_toTopOf="@+id/tvSubject" />
+
+    <TextView
+        android:id="@+id/tvCount"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="3dp"
+        android:gravity="center_vertical"
+        android:maxLines="1"
+        android:text="3"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        app:layout_constraintBottom_toBottomOf="@id/tvSubject"
+        app:layout_constraintEnd_toStartOf="@+id/ivThread"
+        app:layout_constraintTop_toTopOf="@+id/tvSubject" />
+
+    <ImageView
+        android:id="@+id/ivThread"
+        android:layout_width="15dp"
+        android:layout_height="15dp"
+        android:layout_marginEnd="6dp"
+        android:contentDescription="@string/title_legend_thread"
+        android:src="@drawable/baseline_message_24"
+        app:layout_constraintBottom_toBottomOf="@id/tvSubject"
+        app:layout_constraintEnd_toStartOf="@+id/ivFlagged"
+        app:layout_constraintTop_toTopOf="@+id/tvSubject" />
+
+    <ImageView
+        android:id="@+id/ivFlagged"
+        android:layout_width="24dp"
+        android:layout_height="36dp"
+        android:layout_marginEnd="6dp"
+        android:background="?android:attr/selectableItemBackgroundBorderless"
+        android:contentDescription="@string/title_legend_flagged"
+        android:paddingTop="6dp"
+        android:paddingBottom="6dp"
+        android:src="@drawable/baseline_star_24"
+        android:visibility="visible"
+        app:layout_constraintBottom_toBottomOf="@id/tvSubject"
+        app:layout_constraintEnd_toEndOf="@id/paddingEnd"
+        app:layout_constraintTop_toBottomOf="@id/paddingTop" />
+
+    <TextView
+        android:id="@+id/tvPreview"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="6dp"
+        android:layout_marginEnd="6dp"
+        android:ellipsize="end"
+        android:fontFamily="monospace"
+        android:maxLines="2"
+        android:text="Preview"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        android:textStyle="italic"
+        app:layout_constraintEnd_toStartOf="@+id/paddingEnd"
+        app:layout_constraintStart_toEndOf="@id/paddingStart"
+        app:layout_constraintTop_toBottomOf="@id/tvSubject" />
+
+    <TextView
+        android:id="@+id/tvError"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="6dp"
+        android:layout_marginEnd="6dp"
+        android:text="error"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        android:textColor="?attr/colorWarning"
+        android:textIsSelectable="true"
+        app:layout_constraintEnd_toStartOf="@+id/paddingEnd"
+        app:layout_constraintStart_toEndOf="@id/paddingStart"
+        app:layout_constraintTop_toBottomOf="@id/tvPreview" />
+
+    <View
+        android:id="@+id/paddingEnd"
+        android:layout_width="6dp"
+        android:layout_height="0dp"
+        android:visibility="gone"
+        app:layout_constraintEnd_toStartOf="@+id/vwStatus"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <View
+        android:id="@+id/vwStatus"
+        android:layout_width="6dp"
+        android:layout_height="0dp"
+        android:background="@color/colorPrimary"
+        app:layout_constraintBottom_toBottomOf="@+id/paddingBottom"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <View
+        android:id="@+id/paddingBottom"
+        android:layout_width="match_parent"
+        android:layout_height="12dp"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tvError" />
+
+    <eu.faircode.email.ContentLoadingProgressBar
+        android:id="@+id/pbLoading"
+        style="@style/Base.Widget.AppCompat.ProgressBar"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:indeterminate="true"
+        app:layout_constraintBottom_toBottomOf="@id/paddingBottom"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <View
+        android:id="@+id/vwRipple"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:background="?android:attr/selectableItemBackground"
+        app:layout_constraintBottom_toBottomOf="@id/paddingBottom"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/include_message_normal.xml

@@ -0,0 +1,325 @@
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/clItem"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?attr/activatableItemBackground"
+    android:descendantFocusability="beforeDescendants"
+    android:focusable="true"
+    android:focusableInTouchMode="true">
+
+    <View
+        android:id="@+id/vwColor"
+        android:layout_width="6dp"
+        android:layout_height="0dp"
+        android:background="@color/colorAccent"
+        app:layout_constraintBottom_toBottomOf="@+id/paddingBottom"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <View
+        android:id="@+id/paddingTop"
+        android:layout_width="match_parent"
+        android:layout_height="3dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ImageView
+        android:id="@+id/ivExpander"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical|center_horizontal"
+        android:layout_marginStart="6dp"
+        android:background="?android:attr/selectableItemBackgroundBorderless"
+        android:contentDescription="@string/title_legend_expander"
+        android:src="@drawable/expander"
+        android:visibility="visible"
+        app:layout_constraintBottom_toBottomOf="@+id/paddingBottom"
+        app:layout_constraintStart_toEndOf="@id/vwColor"
+        app:layout_constraintTop_toTopOf="@id/paddingTop" />
+
+    <View
+        android:id="@+id/paddingStart"
+        android:layout_width="6dp"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="@+id/paddingBottom"
+        app:layout_constraintStart_toEndOf="@+id/ivExpander"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ImageView
+        android:id="@+id/ivAvatar"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:contentDescription="@string/title_legend_avatar"
+        android:paddingStart="6dp"
+        android:paddingEnd="6dp"
+        android:src="@drawable/baseline_person_24"
+        app:layout_constraintBottom_toBottomOf="@+id/tvFolder"
+        app:layout_constraintDimensionRatio="1:1"
+        app:layout_constraintStart_toEndOf="@id/paddingStart"
+        app:layout_constraintTop_toBottomOf="@id/paddingTop" />
+
+    <TextView
+        android:id="@+id/tvFrom"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="6dp"
+        android:layout_marginEnd="6dp"
+        android:gravity="center_vertical"
+        android:minHeight="24dp"
+        android:text="From"
+        android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+        app:layout_constraintEnd_toStartOf="@+id/tvSize"
+        app:layout_constraintStart_toEndOf="@id/ivAvatar"
+        app:layout_constraintTop_toBottomOf="@id/paddingTop" />
+
+    <TextView
+        android:id="@+id/tvSize"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="6dp"
+        android:gravity="center_vertical"
+        android:maxLines="1"
+        android:text="123 KB"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        android:textColor="?attr/colorUnread"
+        app:layout_constraintBottom_toBottomOf="@+id/tvFrom"
+        app:layout_constraintEnd_toStartOf="@+id/tvTime"
+        app:layout_constraintTop_toBottomOf="@id/paddingTop" />
+
+    <TextView
+        android:id="@+id/tvTime"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="6dp"
+        android:gravity="center_vertical"
+        android:maxLines="1"
+        android:text="Time"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        app:layout_constraintBottom_toBottomOf="@+id/tvFrom"
+        app:layout_constraintEnd_toStartOf="@+id/ivFlagged"
+        app:layout_constraintTop_toBottomOf="@id/paddingTop" />
+
+    <TextView
+        android:id="@+id/tvSubject"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="6dp"
+        android:layout_marginTop="3dp"
+        android:layout_marginEnd="6dp"
+        android:gravity="center_vertical"
+        android:minHeight="24dp"
+        android:text="Subject"
+        android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+        app:layout_constraintEnd_toStartOf="@+id/ivFlagged"
+        app:layout_constraintStart_toEndOf="@id/ivAvatar"
+        app:layout_constraintTop_toBottomOf="@id/tvFrom" />
+
+    <ImageView
+        android:id="@+id/ivFlagged"
+        android:layout_width="36dp"
+        android:layout_height="36dp"
+        android:background="?android:attr/selectableItemBackgroundBorderless"
+        android:contentDescription="@string/title_legend_flagged"
+        android:padding="6dp"
+        android:src="@drawable/baseline_star_24"
+        android:visibility="visible"
+        app:layout_constraintBottom_toBottomOf="@+id/tvFolder"
+        app:layout_constraintEnd_toEndOf="@id/paddingEnd"
+        app:layout_constraintTop_toBottomOf="@id/paddingTop" />
+
+    <ImageView
+        android:id="@+id/ivType"
+        android:layout_width="21dp"
+        android:layout_height="21dp"
+        android:layout_marginStart="6dp"
+        android:contentDescription="@string/title_legend_folder_type"
+        android:src="@drawable/baseline_edit_24"
+        app:layout_constraintBottom_toBottomOf="@+id/tvFolder"
+        app:layout_constraintStart_toEndOf="@id/ivAvatar"
+        app:layout_constraintTop_toTopOf="@+id/tvFolder" />
+
+    <ImageView
+        android:id="@+id/ivSnoozed"
+        android:layout_width="21dp"
+        android:layout_height="21dp"
+        android:layout_marginStart="6dp"
+        android:contentDescription="@string/title_legend_snoozed"
+        android:src="@drawable/baseline_timelapse_24"
+        app:layout_constraintBottom_toBottomOf="@+id/tvFolder"
+        app:layout_constraintStart_toEndOf="@id/ivType"
+        app:layout_constraintTop_toTopOf="@+id/tvFolder" />
+
+    <ImageView
+        android:id="@+id/ivBrowsed"
+        android:layout_width="21dp"
+        android:layout_height="21dp"
+        android:layout_marginStart="6dp"
+        android:contentDescription="@string/title_legend_browsed"
+        android:src="@drawable/baseline_playlist_add_24"
+        app:layout_constraintBottom_toBottomOf="@+id/tvFolder"
+        app:layout_constraintStart_toEndOf="@id/ivSnoozed"
+        app:layout_constraintTop_toTopOf="@+id/tvFolder" />
+
+    <ImageView
+        android:id="@+id/ivAnswered"
+        android:layout_width="21dp"
+        android:layout_height="21dp"
+        android:layout_marginStart="6dp"
+        android:contentDescription="@string/title_legend_answered"
+        android:src="@drawable/baseline_reply_24"
+        app:layout_constraintBottom_toBottomOf="@+id/tvFolder"
+        app:layout_constraintStart_toEndOf="@id/ivBrowsed"
+        app:layout_constraintTop_toTopOf="@+id/tvFolder" />
+
+    <ImageView
+        android:id="@+id/ivPlain"
+        android:layout_width="21dp"
+        android:layout_height="21dp"
+        android:layout_marginStart="6dp"
+        android:contentDescription="@string/title_legend_plain_only"
+        android:src="@drawable/baseline_notes_24"
+        app:layout_constraintBottom_toBottomOf="@+id/tvFolder"
+        app:layout_constraintStart_toEndOf="@id/ivAnswered"
+        app:layout_constraintTop_toTopOf="@+id/tvFolder" />
+
+    <ImageView
+        android:id="@+id/ivReceipt"
+        android:layout_width="21dp"
+        android:layout_height="21dp"
+        android:layout_marginStart="6dp"
+        android:contentDescription="@string/title_legend_receipt"
+        android:src="@drawable/baseline_playlist_add_check_24"
+        app:layout_constraintBottom_toBottomOf="@+id/tvFolder"
+        app:layout_constraintStart_toEndOf="@id/ivPlain"
+        app:layout_constraintTop_toTopOf="@+id/tvFolder" />
+
+    <ImageView
+        android:id="@+id/ivAttachments"
+        android:layout_width="21dp"
+        android:layout_height="21dp"
+        android:layout_marginStart="6dp"
+        android:contentDescription="@string/title_legend_attachment"
+        android:src="@drawable/baseline_attachment_24"
+        app:layout_constraintBottom_toBottomOf="@+id/tvFolder"
+        app:layout_constraintStart_toEndOf="@id/ivReceipt"
+        app:layout_constraintTop_toTopOf="@+id/tvFolder" />
+
+    <TextView
+        android:id="@+id/tvFolder"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="6dp"
+        android:layout_marginTop="3dp"
+        android:layout_marginEnd="6dp"
+        android:gravity="end|center_vertical"
+        android:minHeight="21dp"
+        android:text="folder"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        app:layout_constraintEnd_toStartOf="@+id/tvCount"
+        app:layout_constraintStart_toEndOf="@id/ivAttachments"
+        app:layout_constraintTop_toBottomOf="@id/tvSubject" />
+
+    <TextView
+        android:id="@+id/tvCount"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="3dp"
+        android:gravity="center_vertical"
+        android:maxLines="1"
+        android:text="3"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        app:layout_constraintBottom_toBottomOf="@+id/tvFolder"
+        app:layout_constraintEnd_toStartOf="@+id/ivThread"
+        app:layout_constraintTop_toTopOf="@+id/tvFolder" />
+
+    <ImageView
+        android:id="@+id/ivThread"
+        android:layout_width="15dp"
+        android:layout_height="15dp"
+        android:layout_marginEnd="6dp"
+        android:contentDescription="@string/title_legend_thread"
+        android:src="@drawable/baseline_message_24"
+        app:layout_constraintBottom_toBottomOf="@+id/tvFolder"
+        app:layout_constraintEnd_toStartOf="@+id/ivFlagged"
+        app:layout_constraintTop_toTopOf="@+id/tvFolder" />
+
+    <TextView
+        android:id="@+id/tvPreview"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="6dp"
+        android:layout_marginTop="3dp"
+        android:layout_marginEnd="6dp"
+        android:ellipsize="end"
+        android:fontFamily="monospace"
+        android:maxLines="2"
+        android:text="Preview"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        android:textStyle="italic"
+        app:layout_constraintEnd_toStartOf="@+id/paddingEnd"
+        app:layout_constraintStart_toEndOf="@id/paddingStart"
+        app:layout_constraintTop_toBottomOf="@id/tvFolder" />
+
+    <TextView
+        android:id="@+id/tvError"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="6dp"
+        android:layout_marginTop="3dp"
+        android:layout_marginEnd="6dp"
+        android:text="error"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        android:textColor="?attr/colorWarning"
+        android:textIsSelectable="true"
+        app:layout_constraintEnd_toStartOf="@+id/paddingEnd"
+        app:layout_constraintStart_toEndOf="@id/paddingStart"
+        app:layout_constraintTop_toBottomOf="@id/tvPreview" />
+
+    <View
+        android:id="@+id/paddingEnd"
+        android:layout_width="6dp"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="@+id/paddingBottom"
+        app:layout_constraintEnd_toStartOf="@+id/vwStatus"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <View
+        android:id="@+id/vwStatus"
+        android:layout_width="6dp"
+        android:layout_height="0dp"
+        android:background="@color/colorPrimary"
+        app:layout_constraintBottom_toBottomOf="@+id/paddingBottom"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <View
+        android:id="@+id/paddingBottom"
+        android:layout_width="match_parent"
+        android:layout_height="3dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tvError" />
+
+    <eu.faircode.email.ContentLoadingProgressBar
+        android:id="@+id/pbLoading"
+        style="@style/Base.Widget.AppCompat.ProgressBar"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:indeterminate="true"
+        app:layout_constraintBottom_toBottomOf="@id/paddingBottom"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <View
+        android:id="@+id/vwRipple"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:background="?android:attr/selectableItemBackground"
+        app:layout_constraintBottom_toBottomOf="@id/paddingBottom"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/item_message_compact.xml

@@ -13,323 +13,11 @@
         android:focusable="true"
         android:focusableInTouchMode="true">
 
-        <View
-            android:id="@+id/vwColor"
-            android:layout_width="6dp"
-            android:layout_height="0dp"
-            android:background="@color/colorAccent"
-            app:layout_constraintBottom_toBottomOf="@+id/paddingBottom"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <View
-            android:id="@+id/paddingTop"
+        <include
+            android:id="@+id/inHeader"
+            layout="@layout/include_message_compact"
             android:layout_width="match_parent"
-            android:layout_height="12dp"
-            android:visibility="gone"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <ImageView
-            android:id="@+id/ivExpander"
-            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical|center_horizontal"
-            android:layout_marginStart="6dp"
-            android:background="?android:attr/selectableItemBackgroundBorderless"
-            android:contentDescription="@string/title_legend_expander"
-            android:src="@drawable/expander"
-            android:visibility="visible"
-            app:layout_constraintBottom_toBottomOf="@+id/paddingBottom"
-            app:layout_constraintStart_toEndOf="@id/vwColor"
-            app:layout_constraintTop_toTopOf="@id/paddingTop" />
-
-        <View
-            android:id="@+id/paddingStart"
-            android:layout_width="6dp"
-            android:layout_height="0dp"
-            android:visibility="gone"
-            app:layout_constraintStart_toEndOf="@+id/ivExpander"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <ImageView
-            android:id="@+id/ivAvatar"
-            android:layout_width="0dp"
-            android:layout_height="24dp"
-            android:layout_marginStart="6dp"
-            android:contentDescription="@string/title_legend_avatar"
-            android:src="@drawable/baseline_person_24"
-            app:layout_constraintBottom_toBottomOf="@+id/tvFrom"
-            app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintStart_toEndOf="@id/paddingStart"
-            app:layout_constraintTop_toBottomOf="@id/paddingTop" />
-
-        <TextView
-            android:id="@+id/tvFrom"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:layout_marginEnd="6dp"
-            android:ellipsize="end"
-            android:gravity="center_vertical"
-            android:singleLine="true"
-            android:minHeight="24dp"
-            android:text="From"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintEnd_toStartOf="@+id/tvSize"
-            app:layout_constraintStart_toEndOf="@id/ivAvatar"
-            app:layout_constraintTop_toBottomOf="@id/paddingTop" />
-
-        <TextView
-            android:id="@+id/tvSize"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="6dp"
-            android:gravity="center_vertical"
-            android:maxLines="1"
-            android:text="123 KB"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            android:textColor="?attr/colorUnread"
-            app:layout_constraintBottom_toBottomOf="@+id/tvFrom"
-            app:layout_constraintEnd_toStartOf="@+id/tvTime"
-            app:layout_constraintTop_toBottomOf="@id/paddingTop" />
-
-        <TextView
-            android:id="@+id/tvTime"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="6dp"
-            android:gravity="center_vertical"
-            android:maxLines="1"
-            android:text="Time"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintBottom_toBottomOf="@+id/tvFrom"
-            app:layout_constraintEnd_toStartOf="@+id/ivFlagged"
-            app:layout_constraintTop_toBottomOf="@id/paddingTop" />
-
-        <ImageView
-            android:id="@+id/ivType"
-            android:layout_width="21dp"
-            android:layout_height="21dp"
-            android:layout_marginStart="6dp"
-            android:contentDescription="@string/title_legend_folder_type"
-            android:src="@drawable/baseline_edit_24"
-            app:layout_constraintBottom_toBottomOf="@+id/tvSubject"
-            app:layout_constraintStart_toEndOf="@id/paddingStart"
-            app:layout_constraintTop_toTopOf="@+id/tvSubject" />
-
-        <ImageView
-            android:id="@+id/ivSnoozed"
-            android:layout_width="21dp"
-            android:layout_height="21dp"
-            android:layout_marginStart="6dp"
-            android:contentDescription="@string/title_legend_snoozed"
-            android:src="@drawable/baseline_timelapse_24"
-            app:layout_constraintBottom_toBottomOf="@+id/tvSubject"
-            app:layout_constraintStart_toEndOf="@id/ivType"
-            app:layout_constraintTop_toTopOf="@+id/tvSubject" />
-
-        <ImageView
-            android:id="@+id/ivBrowsed"
-            android:layout_width="21dp"
-            android:layout_height="21dp"
-            android:layout_marginStart="6dp"
-            android:contentDescription="@string/title_legend_browsed"
-            android:src="@drawable/baseline_playlist_add_24"
-            app:layout_constraintBottom_toBottomOf="@+id/tvSubject"
-            app:layout_constraintStart_toEndOf="@id/ivSnoozed"
-            app:layout_constraintTop_toTopOf="@+id/tvSubject" />
-
-        <ImageView
-            android:id="@+id/ivAnswered"
-            android:layout_width="21dp"
-            android:layout_height="21dp"
-            android:layout_marginStart="6dp"
-            android:contentDescription="@string/title_legend_answered"
-            android:src="@drawable/baseline_reply_24"
-            app:layout_constraintBottom_toBottomOf="@+id/tvSubject"
-            app:layout_constraintStart_toEndOf="@id/ivBrowsed"
-            app:layout_constraintTop_toTopOf="@+id/tvSubject" />
-
-        <ImageView
-            android:id="@+id/ivPlain"
-            android:layout_width="21dp"
-            android:layout_height="21dp"
-            android:layout_marginStart="6dp"
-            android:contentDescription="@string/title_legend_plain_only"
-            android:src="@drawable/baseline_notes_24"
-            app:layout_constraintBottom_toBottomOf="@+id/tvSubject"
-            app:layout_constraintStart_toEndOf="@id/ivAnswered"
-            app:layout_constraintTop_toTopOf="@+id/tvSubject" />
-
-        <ImageView
-            android:id="@+id/ivReceipt"
-            android:layout_width="21dp"
-            android:layout_height="21dp"
-            android:layout_marginStart="6dp"
-            android:contentDescription="@string/title_legend_receipt"
-            android:src="@drawable/baseline_playlist_add_check_24"
-            app:layout_constraintBottom_toBottomOf="@+id/tvSubject"
-            app:layout_constraintStart_toEndOf="@id/ivPlain"
-            app:layout_constraintTop_toTopOf="@+id/tvSubject" />
-
-        <ImageView
-            android:id="@+id/ivAttachments"
-            android:layout_width="21dp"
-            android:layout_height="21dp"
-            android:layout_marginStart="6dp"
-            android:contentDescription="@string/title_legend_attachment"
-            android:src="@drawable/baseline_attachment_24"
-            app:layout_constraintBottom_toBottomOf="@+id/tvSubject"
-            app:layout_constraintStart_toEndOf="@id/ivReceipt"
-            app:layout_constraintTop_toTopOf="@+id/tvSubject" />
-
-        <TextView
-            android:id="@+id/tvSubject"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:layout_marginEnd="6dp"
-            android:ellipsize="middle"
-            android:gravity="center_vertical"
-            android:minHeight="21dp"
-            android:singleLine="true"
-            android:text="Subject"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintEnd_toStartOf="@+id/tvFolder"
-            app:layout_constraintStart_toEndOf="@id/ivAttachments"
-            app:layout_constraintTop_toBottomOf="@id/tvFrom" />
-
-        <TextView
-            android:id="@+id/tvFolder"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="6dp"
-            android:ellipsize="start"
-            android:gravity="end|center_vertical"
-            android:maxWidth="120dp"
-            android:singleLine="true"
-            android:text="Folder"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintBottom_toBottomOf="@id/tvSubject"
-            app:layout_constraintEnd_toStartOf="@+id/tvCount"
-            app:layout_constraintStart_toEndOf="@id/tvSubject"
-            app:layout_constraintTop_toTopOf="@+id/tvSubject" />
-
-        <TextView
-            android:id="@+id/tvCount"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="3dp"
-            android:gravity="center_vertical"
-            android:maxLines="1"
-            android:text="3"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintBottom_toBottomOf="@id/tvSubject"
-            app:layout_constraintEnd_toStartOf="@+id/ivThread"
-            app:layout_constraintTop_toTopOf="@+id/tvSubject" />
-
-        <ImageView
-            android:id="@+id/ivThread"
-            android:layout_width="15dp"
-            android:layout_height="15dp"
-            android:layout_marginEnd="6dp"
-            android:contentDescription="@string/title_legend_thread"
-            android:src="@drawable/baseline_message_24"
-            app:layout_constraintBottom_toBottomOf="@id/tvSubject"
-            app:layout_constraintEnd_toStartOf="@+id/ivFlagged"
-            app:layout_constraintTop_toTopOf="@+id/tvSubject" />
-
-        <ImageView
-            android:id="@+id/ivFlagged"
-            android:layout_width="24dp"
-            android:layout_height="36dp"
-            android:layout_marginEnd="6dp"
-            android:background="?android:attr/selectableItemBackgroundBorderless"
-            android:contentDescription="@string/title_legend_flagged"
-            android:paddingTop="6dp"
-            android:paddingBottom="6dp"
-            android:src="@drawable/baseline_star_24"
-            android:visibility="visible"
-            app:layout_constraintBottom_toBottomOf="@id/tvSubject"
-            app:layout_constraintEnd_toEndOf="@id/paddingEnd"
-            app:layout_constraintTop_toBottomOf="@id/paddingTop" />
-
-        <TextView
-            android:id="@+id/tvPreview"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:layout_marginEnd="6dp"
-            android:ellipsize="end"
-            android:fontFamily="monospace"
-            android:maxLines="2"
-            android:text="Preview"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            android:textStyle="italic"
-            app:layout_constraintEnd_toStartOf="@+id/paddingEnd"
-            app:layout_constraintStart_toEndOf="@id/paddingStart"
-            app:layout_constraintTop_toBottomOf="@id/tvSubject" />
-
-        <TextView
-            android:id="@+id/tvError"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:layout_marginEnd="6dp"
-            android:text="error"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            android:textColor="?attr/colorWarning"
-            android:textIsSelectable="true"
-            app:layout_constraintEnd_toStartOf="@+id/paddingEnd"
-            app:layout_constraintStart_toEndOf="@id/paddingStart"
-            app:layout_constraintTop_toBottomOf="@id/tvPreview" />
-
-        <View
-            android:id="@+id/paddingEnd"
-            android:layout_width="6dp"
-            android:layout_height="0dp"
-            android:visibility="gone"
-            app:layout_constraintEnd_toStartOf="@+id/vwStatus"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <View
-            android:id="@+id/vwStatus"
-            android:layout_width="6dp"
-            android:layout_height="0dp"
-            android:background="@color/colorPrimary"
-            app:layout_constraintBottom_toBottomOf="@+id/paddingBottom"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <View
-            android:id="@+id/paddingBottom"
-            android:layout_width="match_parent"
-            android:layout_height="12dp"
-            android:visibility="gone"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvError" />
-
-        <eu.faircode.email.ContentLoadingProgressBar
-            android:id="@+id/pbLoading"
-            style="@style/Base.Widget.AppCompat.ProgressBar"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:indeterminate="true"
-            app:layout_constraintBottom_toBottomOf="@id/paddingBottom"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <View
-            android:id="@+id/vwRipple"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:background="?android:attr/selectableItemBackground"
-            app:layout_constraintBottom_toBottomOf="@id/paddingBottom"
-            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
@@ -339,7 +27,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/paddingBottom" />
+            app:layout_constraintTop_toBottomOf="@id/inHeader" />
 
         <View
             android:id="@+id/vwBody"

app/src/main/res/layout/item_message_normal.xml

@@ -13,316 +13,11 @@
         android:focusable="true"
         android:focusableInTouchMode="true">
 
-        <View
-            android:id="@+id/vwColor"
-            android:layout_width="6dp"
-            android:layout_height="0dp"
-            android:background="@color/colorAccent"
-            app:layout_constraintBottom_toBottomOf="@+id/paddingBottom"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <View
-            android:id="@+id/paddingTop"
+        <include
+            android:id="@+id/inHeader"
+            layout="@layout/include_message_normal"
             android:layout_width="match_parent"
-            android:layout_height="3dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <ImageView
-            android:id="@+id/ivExpander"
-            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical|center_horizontal"
-            android:layout_marginStart="6dp"
-            android:background="?android:attr/selectableItemBackgroundBorderless"
-            android:contentDescription="@string/title_legend_expander"
-            android:src="@drawable/expander"
-            android:visibility="visible"
-            app:layout_constraintBottom_toBottomOf="@+id/paddingBottom"
-            app:layout_constraintStart_toEndOf="@id/vwColor"
-            app:layout_constraintTop_toTopOf="@id/paddingTop" />
-
-        <View
-            android:id="@+id/paddingStart"
-            android:layout_width="6dp"
-            android:layout_height="0dp"
-            app:layout_constraintStart_toEndOf="@+id/ivExpander"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <ImageView
-            android:id="@+id/ivAvatar"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:contentDescription="@string/title_legend_avatar"
-            android:paddingStart="6dp"
-            android:paddingEnd="6dp"
-            android:src="@drawable/baseline_person_24"
-            app:layout_constraintBottom_toBottomOf="@+id/tvFolder"
-            app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintStart_toEndOf="@id/paddingStart"
-            app:layout_constraintTop_toBottomOf="@id/paddingTop" />
-
-        <TextView
-            android:id="@+id/tvFrom"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:layout_marginEnd="6dp"
-            android:gravity="center_vertical"
-            android:minHeight="24dp"
-            android:text="From"
-            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintEnd_toStartOf="@+id/tvSize"
-            app:layout_constraintStart_toEndOf="@id/ivAvatar"
-            app:layout_constraintTop_toBottomOf="@id/paddingTop" />
-
-        <TextView
-            android:id="@+id/tvSize"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="6dp"
-            android:gravity="center_vertical"
-            android:maxLines="1"
-            android:text="123 KB"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            android:textColor="?attr/colorUnread"
-            app:layout_constraintBottom_toBottomOf="@+id/tvFrom"
-            app:layout_constraintEnd_toStartOf="@+id/tvTime"
-            app:layout_constraintTop_toBottomOf="@id/paddingTop" />
-
-        <TextView
-            android:id="@+id/tvTime"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="6dp"
-            android:gravity="center_vertical"
-            android:maxLines="1"
-            android:text="Time"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintBottom_toBottomOf="@+id/tvFrom"
-            app:layout_constraintEnd_toStartOf="@+id/ivFlagged"
-            app:layout_constraintTop_toBottomOf="@id/paddingTop" />
-
-        <TextView
-            android:id="@+id/tvSubject"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:layout_marginTop="3dp"
-            android:layout_marginEnd="6dp"
-            android:gravity="center_vertical"
-            android:minHeight="24dp"
-            android:text="Subject"
-            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintEnd_toStartOf="@+id/ivFlagged"
-            app:layout_constraintStart_toEndOf="@id/ivAvatar"
-            app:layout_constraintTop_toBottomOf="@id/tvFrom" />
-
-        <ImageView
-            android:id="@+id/ivFlagged"
-            android:layout_width="36dp"
-            android:layout_height="36dp"
-            android:background="?android:attr/selectableItemBackgroundBorderless"
-            android:contentDescription="@string/title_legend_flagged"
-            android:padding="6dp"
-            android:src="@drawable/baseline_star_24"
-            android:visibility="visible"
-            app:layout_constraintBottom_toBottomOf="@+id/tvFolder"
-            app:layout_constraintEnd_toEndOf="@id/paddingEnd"
-            app:layout_constraintTop_toBottomOf="@id/paddingTop" />
-
-        <ImageView
-            android:id="@+id/ivType"
-            android:layout_width="21dp"
-            android:layout_height="21dp"
-            android:layout_marginStart="6dp"
-            android:contentDescription="@string/title_legend_folder_type"
-            android:src="@drawable/baseline_edit_24"
-            app:layout_constraintBottom_toBottomOf="@+id/tvFolder"
-            app:layout_constraintStart_toEndOf="@id/ivAvatar"
-            app:layout_constraintTop_toTopOf="@+id/tvFolder" />
-
-        <ImageView
-            android:id="@+id/ivSnoozed"
-            android:layout_width="21dp"
-            android:layout_height="21dp"
-            android:layout_marginStart="6dp"
-            android:contentDescription="@string/title_legend_snoozed"
-            android:src="@drawable/baseline_timelapse_24"
-            app:layout_constraintBottom_toBottomOf="@+id/tvFolder"
-            app:layout_constraintStart_toEndOf="@id/ivType"
-            app:layout_constraintTop_toTopOf="@+id/tvFolder" />
-
-        <ImageView
-            android:id="@+id/ivBrowsed"
-            android:layout_width="21dp"
-            android:layout_height="21dp"
-            android:layout_marginStart="6dp"
-            android:contentDescription="@string/title_legend_browsed"
-            android:src="@drawable/baseline_playlist_add_24"
-            app:layout_constraintBottom_toBottomOf="@+id/tvFolder"
-            app:layout_constraintStart_toEndOf="@id/ivSnoozed"
-            app:layout_constraintTop_toTopOf="@+id/tvFolder" />
-
-        <ImageView
-            android:id="@+id/ivAnswered"
-            android:layout_width="21dp"
-            android:layout_height="21dp"
-            android:layout_marginStart="6dp"
-            android:contentDescription="@string/title_legend_answered"
-            android:src="@drawable/baseline_reply_24"
-            app:layout_constraintBottom_toBottomOf="@+id/tvFolder"
-            app:layout_constraintStart_toEndOf="@id/ivBrowsed"
-            app:layout_constraintTop_toTopOf="@+id/tvFolder" />
-
-        <ImageView
-            android:id="@+id/ivPlain"
-            android:layout_width="21dp"
-            android:layout_height="21dp"
-            android:layout_marginStart="6dp"
-            android:contentDescription="@string/title_legend_plain_only"
-            android:src="@drawable/baseline_notes_24"
-            app:layout_constraintBottom_toBottomOf="@+id/tvFolder"
-            app:layout_constraintStart_toEndOf="@id/ivAnswered"
-            app:layout_constraintTop_toTopOf="@+id/tvFolder" />
-
-        <ImageView
-            android:id="@+id/ivReceipt"
-            android:layout_width="21dp"
-            android:layout_height="21dp"
-            android:layout_marginStart="6dp"
-            android:contentDescription="@string/title_legend_receipt"
-            android:src="@drawable/baseline_playlist_add_check_24"
-            app:layout_constraintBottom_toBottomOf="@+id/tvFolder"
-            app:layout_constraintStart_toEndOf="@id/ivPlain"
-            app:layout_constraintTop_toTopOf="@+id/tvFolder" />
-
-        <ImageView
-            android:id="@+id/ivAttachments"
-            android:layout_width="21dp"
-            android:layout_height="21dp"
-            android:layout_marginStart="6dp"
-            android:contentDescription="@string/title_legend_attachment"
-            android:src="@drawable/baseline_attachment_24"
-            app:layout_constraintBottom_toBottomOf="@+id/tvFolder"
-            app:layout_constraintStart_toEndOf="@id/ivReceipt"
-            app:layout_constraintTop_toTopOf="@+id/tvFolder" />
-
-        <TextView
-            android:id="@+id/tvFolder"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:layout_marginTop="3dp"
-            android:layout_marginEnd="6dp"
-            android:gravity="end|center_vertical"
-            android:minHeight="21dp"
-            android:text="folder"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintEnd_toStartOf="@+id/tvCount"
-            app:layout_constraintStart_toEndOf="@id/ivAttachments"
-            app:layout_constraintTop_toBottomOf="@id/tvSubject" />
-
-        <TextView
-            android:id="@+id/tvCount"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="3dp"
-            android:gravity="center_vertical"
-            android:maxLines="1"
-            android:text="3"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintBottom_toBottomOf="@+id/tvFolder"
-            app:layout_constraintEnd_toStartOf="@+id/ivThread"
-            app:layout_constraintTop_toTopOf="@+id/tvFolder" />
-
-        <ImageView
-            android:id="@+id/ivThread"
-            android:layout_width="15dp"
-            android:layout_height="15dp"
-            android:layout_marginEnd="6dp"
-            android:contentDescription="@string/title_legend_thread"
-            android:src="@drawable/baseline_message_24"
-            app:layout_constraintBottom_toBottomOf="@+id/tvFolder"
-            app:layout_constraintEnd_toStartOf="@+id/ivFlagged"
-            app:layout_constraintTop_toTopOf="@+id/tvFolder" />
-
-        <TextView
-            android:id="@+id/tvPreview"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:layout_marginTop="3dp"
-            android:layout_marginEnd="6dp"
-            android:ellipsize="end"
-            android:fontFamily="monospace"
-            android:maxLines="2"
-            android:text="Preview"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            android:textStyle="italic"
-            app:layout_constraintEnd_toStartOf="@+id/paddingEnd"
-            app:layout_constraintStart_toEndOf="@id/paddingStart"
-            app:layout_constraintTop_toBottomOf="@id/tvFolder" />
-
-        <TextView
-            android:id="@+id/tvError"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:layout_marginTop="3dp"
-            android:layout_marginEnd="6dp"
-            android:text="error"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            android:textColor="?attr/colorWarning"
-            android:textIsSelectable="true"
-            app:layout_constraintEnd_toStartOf="@+id/paddingEnd"
-            app:layout_constraintStart_toEndOf="@id/paddingStart"
-            app:layout_constraintTop_toBottomOf="@id/tvPreview" />
-
-        <View
-            android:id="@+id/paddingEnd"
-            android:layout_width="6dp"
-            android:layout_height="0dp"
-            app:layout_constraintEnd_toStartOf="@+id/vwStatus"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <View
-            android:id="@+id/vwStatus"
-            android:layout_width="6dp"
-            android:layout_height="0dp"
-            android:background="@color/colorPrimary"
-            app:layout_constraintBottom_toBottomOf="@+id/paddingBottom"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <View
-            android:id="@+id/paddingBottom"
-            android:layout_width="match_parent"
-            android:layout_height="3dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvError" />
-
-        <eu.faircode.email.ContentLoadingProgressBar
-            android:id="@+id/pbLoading"
-            style="@style/Base.Widget.AppCompat.ProgressBar"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:indeterminate="true"
-            app:layout_constraintBottom_toBottomOf="@id/paddingBottom"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <View
-            android:id="@+id/vwRipple"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:background="?android:attr/selectableItemBackground"
-            app:layout_constraintBottom_toBottomOf="@id/paddingBottom"
-            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
@@ -332,7 +27,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/paddingBottom" />
+            app:layout_constraintTop_toBottomOf="@id/inHeader" />
 
         <View
             android:id="@+id/vwBody"