From 17b446ade9bc25535f5ec38cdf77466118c7b2b9 Mon Sep 17 00:00:00 2001
From: Distopico Vegan <distopico@riseup.net>
Date: Mon, 24 Dec 2018 19:14:56 -0500
Subject: [PATCH] remove all hardcode strings

---
 .../main/res/layout/item_message_compact.xml  | 1064 ++++++++---------
 .../main/res/layout/item_message_normal.xml   |   39 +-
 app/src/main/res/values/default.xml           |   11 +
 3 files changed, 560 insertions(+), 554 deletions(-)

diff --git a/app/src/main/res/layout/item_message_compact.xml b/app/src/main/res/layout/item_message_compact.xml
index 5b924bd2..9f309d28 100644
--- a/app/src/main/res/layout/item_message_compact.xml
+++ b/app/src/main/res/layout/item_message_compact.xml
@@ -1,165 +1,161 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/clItem"
+             xmlns:app="http://schemas.android.com/apk/res-auto"
+             xmlns:tools="http://schemas.android.com/tools"
+             android:layout_width="match_parent"
+             android:layout_height="wrap_content">
+
+  <androidx.constraintlayout.widget.ConstraintLayout
+      android:id="@+id/clItem"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:background="?attr/drawableItemBackground">
+
+    <View
+        android:id="@+id/vwColor"
+        android:layout_width="6dp"
+        android:layout_height="0dp"
+        android:background="@color/colorAccent"
+        app:layout_constraintBottom_toTopOf="@id/vSeparator"
+        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="32dp"
+        android:layout_height="32dp"
+        android:layout_gravity="center_vertical|center_horizontal"
+        android:src="@drawable/baseline_expand_less_24"
+        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="@dimen/margin_sm"
+        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_toTopOf="@+id/tvFrom" />
+
+    <TextView
+        android:id="@+id/tvFrom"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/margin_sm"
+        android:layout_marginEnd="20dp"
+        android:fontFamily="sans-serif-light"
+        android:text="@string/default_from"
+        android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+        app:layout_constraintEnd_toStartOf="@id/tvTime"
+        app:layout_constraintStart_toEndOf="@id/ivAvatar"
+        app:layout_constraintTop_toBottomOf="@id/paddingTop" />
+
+    <TextView
+        android:id="@+id/tvTime"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:background="?attr/drawableItemBackground">
-
-        <View
-            android:id="@+id/vwColor"
-            android:layout_width="6dp"
-            android:layout_height="0dp"
-            android:background="@color/colorAccent"
-            app:layout_constraintBottom_toTopOf="@id/vSeparator"
-            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="32dp"
-            android:layout_height="32dp"
-            android:layout_gravity="center_vertical|center_horizontal"
-            android:src="@drawable/baseline_expand_less_24"
-            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="@dimen/margin_sm"
-            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_toTopOf="@+id/tvFrom" />
-
-        <TextView
-            android:id="@+id/tvFrom"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/margin_sm"
-            android:layout_marginEnd="20dp"
-            android:ellipsize="end"
-            android:fontFamily="sans-serif-light"
-            android:maxLines="1"
-            android:text="From"
-            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintEnd_toStartOf="@id/tvTime"
-            app:layout_constraintStart_toEndOf="@id/ivAvatar"
-            app:layout_constraintTop_toBottomOf="@id/paddingTop" />
-
-        <TextView
-            android:id="@+id/tvTime"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/margin_sm"
-            android:maxLines="1"
-            android:text="Time"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintEnd_toStartOf="@+id/ivFlagged"
-            app:layout_constraintTop_toTopOf="@id/tvFrom" />
-
-        <ImageView
-            android:id="@+id/ivFlagged"
-            android:layout_width="21dp"
-            android:layout_height="21dp"
-            android:layout_marginEnd="6dp"
-            android:src="@drawable/baseline_star_24"
-            android:visibility="visible"
-            app:layout_constraintBottom_toBottomOf="@id/tvTime"
-            app:layout_constraintEnd_toEndOf="@+id/paddingEnd"
-            app:layout_constraintTop_toTopOf="@id/tvTime" />
-
-        <ImageView
-            android:id="@+id/ivAttachments"
-            android:layout_width="21dp"
-            android:layout_height="21dp"
-            android:layout_marginStart="@dimen/margin_sm"
-            android:src="@drawable/baseline_attachment_24"
-            app:layout_constraintBottom_toBottomOf="@id/tvSubject"
-            app:layout_constraintStart_toEndOf="@id/paddingStart"
-            app:layout_constraintTop_toTopOf="@+id/tvSubject" />
-
-        <TextView
-            android:id="@+id/tvSubject"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/margin_sm"
-            android:layout_marginEnd="@dimen/margin_sm"
-            android:ellipsize="end"
-            android:fontFamily="sans-serif-light"
-            android:maxLines="1"
-            android:minLines="1"
-            android:text="Subject"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintEnd_toStartOf="@id/paddingEnd"
-            app:layout_constraintStart_toEndOf="@id/ivAttachments"
-            app:layout_constraintTop_toBottomOf="@id/tvFrom" />
-
-        <TextView
-            android:id="@+id/tvAccount"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/margin_sm"
-            android:maxLines="1"
-            android:text="account"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintStart_toEndOf="@id/paddingStart"
-            app:layout_constraintTop_toBottomOf="@id/tvSummary" />
-
-        <TextView
-            android:id="@+id/tvFolder"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/margin_sm"
-            android:background="@color/colorAccent"
-            android:maxLines="1"
-            android:paddingLeft="10dp"
-            android:paddingRight="10dp"
-            android:text="folder"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            android:textColor="@color/colorActionForeground"
-            app:layout_constraintStart_toEndOf="@id/tvAccount"
-            app:layout_constraintTop_toBottomOf="@id/tvSummary" />
-
-      <TextView
+        android:layout_marginEnd="@dimen/margin_sm"
+        android:maxLines="1"
+        android:text="@string/default_time"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        app:layout_constraintEnd_toStartOf="@+id/ivFlagged"
+        app:layout_constraintTop_toTopOf="@id/tvFrom" />
+
+    <ImageView
+        android:id="@+id/ivFlagged"
+        android:layout_width="21dp"
+        android:layout_height="21dp"
+        android:layout_marginEnd="6dp"
+        android:src="@drawable/baseline_star_24"
+        android:visibility="visible"
+        app:layout_constraintBottom_toBottomOf="@id/tvTime"
+        app:layout_constraintEnd_toEndOf="@+id/paddingEnd"
+        app:layout_constraintTop_toTopOf="@id/tvTime" />
+
+    <ImageView
+        android:id="@+id/ivAttachments"
+        android:layout_width="21dp"
+        android:layout_height="21dp"
+        android:layout_marginStart="@dimen/margin_sm"
+        android:src="@drawable/baseline_attachment_24"
+        app:layout_constraintBottom_toBottomOf="@id/tvSubject"
+        app:layout_constraintStart_toEndOf="@id/paddingStart"
+        app:layout_constraintTop_toTopOf="@+id/tvSubject" />
+
+    <TextView
+        android:id="@+id/tvSubject"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/margin_sm"
+        android:layout_marginEnd="@dimen/margin_sm"
+        android:fontFamily="sans-serif-light"
+        android:minLines="1"
+        android:text="@string/default_subject"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        app:layout_constraintEnd_toStartOf="@id/paddingEnd"
+        app:layout_constraintStart_toEndOf="@id/ivAttachments"
+        app:layout_constraintTop_toBottomOf="@id/tvFrom" />
+
+    <TextView
+        android:id="@+id/tvAccount"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/margin_sm"
+        android:maxLines="1"
+        android:text="@string/default_account"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        app:layout_constraintStart_toEndOf="@id/paddingStart"
+        app:layout_constraintTop_toBottomOf="@id/tvSummary" />
+
+    <TextView
+        android:id="@+id/tvFolder"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/margin_sm"
+        android:background="@color/colorAccent"
+        android:maxLines="1"
+        android:paddingLeft="10dp"
+        android:paddingRight="10dp"
+        android:text="@string/default_folder"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        android:textColor="@color/colorActionForeground"
+        app:layout_constraintStart_toEndOf="@id/tvAccount"
+        app:layout_constraintTop_toBottomOf="@id/tvSummary" />
+
+    <TextView
         android:id="@+id/tvCount"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/margin_sm"
         android:maxLines="1"
-        android:text="3"
+        android:text="@string/default_count_num"
         android:textAppearance="@style/TextAppearance.AppCompat.Small"
         app:layout_constraintTop_toBottomOf="@id/tvSummary"
         app:layout_constraintStart_toEndOf="@id/tvFolder" />
 
-      <ImageView
+    <ImageView
         android:id="@+id/ivThread"
         android:layout_width="@dimen/icon_xxs"
         android:layout_height="@dimen/icon_xxs"
@@ -169,389 +165,389 @@
         app:layout_constraintStart_toEndOf="@id/tvCount"
         app:layout_constraintTop_toTopOf="@id/tvCount" />
 
-        <TextView
-            android:id="@+id/tvSize"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/margin_sm"
-            android:maxLines="1"
-            android:text="123 KB"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintEnd_toEndOf="@id/paddingEnd"
-            app:layout_constraintEnd_toStartOf="@+id/paddingEnd"
-            app:layout_constraintTop_toBottomOf="@id/tvSummary" />
-
-        <TextView
-            android:id="@+id/tvSummary"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/margin_md"
-            android:layout_marginEnd="@dimen/margin_md"
-            android:fontFamily="sans-serif-light"
-            android:maxLines="1"
-            android:minLines="1"
-            android:ellipsize="end"
-            android:text="Summary"
-            android:textStyle="italic"
-            app:layout_constraintEnd_toEndOf="@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="@dimen/margin_sm"
-            android:layout_marginEnd="@dimen/margin_sm"
-            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/tvSize" />
-
-        <View
-            android:id="@+id/paddingEnd"
-            android:layout_width="6dp"
-            android:layout_height="0dp"
-            android:visibility="gone"
-            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" />
-
-        <ProgressBar
-            android:id="@+id/pbLoading"
-            style="@style/Base.Widget.AppCompat.ProgressBar"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:layout_marginStart="12dp"
-            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/vSeparatorAddress"
-            android:layout_width="0dp"
-            android:layout_height="1dp"
-            android:layout_marginTop="3dp"
-            android:background="?attr/colorSeparator"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/vwColor"
-            app:layout_constraintTop_toBottomOf="@id/paddingBottom" />
-
-        <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_toEndOf="@id/vwColor"
-            app:layout_constraintTop_toBottomOf="@id/vSeparatorAddress" />
-
-        <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/ivAddContact"
-            app:layout_constraintStart_toEndOf="@id/tvFromExTitle"
-            app:layout_constraintTop_toBottomOf="@id/vSeparatorAddress" />
-
-        <ImageView
-            android:id="@+id/ivAddContact"
-            android:layout_width="21dp"
-            android:layout_height="21dp"
-            android:layout_marginEnd="6dp"
-            android:src="@drawable/baseline_import_contacts_24"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/vSeparatorAddress" />
-
-        <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_toEndOf="@id/vwColor"
-            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_toEndOf="@id/vwColor"
-            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_toEndOf="@id/vwColor"
-            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_toEndOf="@id/vwColor"
-            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/tvTimeEx"
-            android:layout_width="wrap_content"
-            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_constraintStart_toEndOf="@id/vwColor"
-            app:layout_constraintTop_toBottomOf="@id/tvBcc" />
-
-        <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_toEndOf="@id/vwColor"
-            app:layout_constraintTop_toBottomOf="@id/tvTimeEx" />
-
-        <View
-            android:id="@+id/vSeparatorHeaders"
-            android:layout_width="0dp"
-            android:layout_height="1dp"
-            android:layout_marginTop="3dp"
-            android:background="?attr/colorSeparator"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/vwColor"
-            app:layout_constraintTop_toBottomOf="@id/tvSubjectEx" />
-
-        <TextView
-            android:id="@+id/tvHeaders"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:layout_marginTop="3dp"
-            android:layout_marginEnd="6dp"
-            android:fontFamily="monospace"
-            android:text="Headers"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            android:textIsSelectable="true"
-            android:textSize="12sp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/vwColor"
-            app:layout_constraintTop_toBottomOf="@id/vSeparatorHeaders" />
-
-        <ProgressBar
-            android:id="@+id/pbHeaders"
-            style="@style/Base.Widget.AppCompat.ProgressBar"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:indeterminate="true"
-            app:layout_constraintBottom_toTopOf="@+id/bnvActions"
-            app:layout_constraintEnd_toEndOf="@id/tvHeaders"
-            app:layout_constraintStart_toStartOf="@id/tvHeaders"
-            app:layout_constraintTop_toBottomOf="@id/vSeparatorHeaders" />
-
-        <com.google.android.material.bottomnavigation.BottomNavigationView
-            android:id="@+id/bnvActions"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
-            android:background="?attr/colorSeparator"
-            app:itemIconTint="@color/bottomnav_background"
-            app:itemTextColor="@color/bottomnav_background"
-            app:labelVisibilityMode="labeled"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/vwColor"
-            app:layout_constraintTop_toBottomOf="@id/tvHeaders"
-            app:menu="@menu/action_message" />
-
-        <View
-            android:id="@+id/vSeparatorBody"
-            android:layout_width="0dp"
-            android:layout_height="1dp"
-            android:layout_marginTop="3dp"
-            android:background="?attr/colorSeparator"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/vwColor"
-            app:layout_constraintTop_toBottomOf="@id/bnvActions" />
-
-        <Button
-            android:id="@+id/btnImages"
-            style="?android:attr/buttonStyleSmall"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
-            android:layout_marginEnd="6dp"
-            android:minWidth="0dp"
-            android:minHeight="0dp"
-            android:text="@string/title_show_images"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/vSeparatorBody" />
-
-        <TextView
-            android:id="@+id/tvBody"
-            android:layout_width="@dimen/no_size"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/margin_sm"
-            android:layout_marginStart="@dimen/content_margin"
-            android:layout_marginEnd="@dimen/content_margin"
-            android:minHeight="60dp"
-            android:text="Body"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            android:textIsSelectable="true"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/vwColor"
-            app:layout_constraintTop_toBottomOf="@id/btnImages" />
-
-        <ProgressBar
-            android:id="@+id/pbBody"
-            style="@style/Base.Widget.AppCompat.ProgressBar"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:indeterminate="true"
-            app:layout_constraintBottom_toTopOf="@+id/vSeparatorAttachments"
-            app:layout_constraintEnd_toEndOf="@id/tvBody"
-            app:layout_constraintStart_toStartOf="@id/tvBody"
-            app:layout_constraintTop_toBottomOf="@id/bnvActions" />
-
-        <View
-            android:id="@+id/vSeparatorAttachments"
-            android:layout_width="0dp"
-            android:layout_height="1dp"
-            android:layout_marginTop="3dp"
-            android:background="?attr/colorSeparator"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/vwColor"
-            app:layout_constraintTop_toBottomOf="@id/tvBody" />
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/rvAttachment"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:layout_marginTop="3dp"
-            android:layout_marginEnd="6dp"
-            android:scrollbarStyle="outsideOverlay"
-            android:scrollbars="vertical"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/vwColor"
-            app:layout_constraintTop_toBottomOf="@+id/vSeparatorAttachments" />
-
-        <View
-            android:id="@+id/vSeparator"
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_marginTop="3dp"
-            android:background="?attr/colorSeparator"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/rvAttachment" />
-
-        <androidx.constraintlayout.widget.Group
-            android:id="@+id/grpDetails"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            app:constraint_referenced_ids="vSeparatorAddress,tvFromExTitle,tvFromEx,tvToTitle,tvTo,tvReplyToTitle,tvReplyTo,tvCcTitle,tvCc,tvBccTitle,tvBcc,tvTimeEx,tvSubjectEx" />
-
-        <androidx.constraintlayout.widget.Group
-            android:id="@+id/grpHeaders"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            app:constraint_referenced_ids="vSeparatorHeaders,tvHeaders" />
-
-        <androidx.constraintlayout.widget.Group
-            android:id="@+id/grpAttachments"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            app:constraint_referenced_ids="vSeparatorAttachments,rvAttachment" />
-
-        <androidx.constraintlayout.widget.Group
-            android:id="@+id/grpExpanded"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            app:constraint_referenced_ids="tvBody" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
+    <TextView
+        android:id="@+id/tvSize"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="@dimen/margin_sm"
+        android:maxLines="1"
+        android:text="@string/default_attachment_size"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        app:layout_constraintEnd_toEndOf="@id/paddingEnd"
+        app:layout_constraintEnd_toStartOf="@+id/paddingEnd"
+        app:layout_constraintTop_toBottomOf="@id/tvSummary" />
+
+    <TextView
+        android:id="@+id/tvSummary"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/margin_md"
+        android:layout_marginEnd="@dimen/margin_md"
+        android:fontFamily="sans-serif-light"
+        android:maxLines="1"
+        android:minLines="1"
+        android:ellipsize="end"
+        android:text="@string/default_summary"
+        android:textStyle="italic"
+        app:layout_constraintEnd_toEndOf="@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="@dimen/margin_sm"
+        android:layout_marginEnd="@dimen/margin_sm"
+        android:text="@string/default_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/tvSize" />
+
+    <View
+        android:id="@+id/paddingEnd"
+        android:layout_width="6dp"
+        android:layout_height="0dp"
+        android:visibility="gone"
+        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" />
+
+    <ProgressBar
+        android:id="@+id/pbLoading"
+        style="@style/Base.Widget.AppCompat.ProgressBar"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_marginStart="12dp"
+        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/vSeparatorAddress"
+        android:layout_width="0dp"
+        android:layout_height="1dp"
+        android:layout_marginTop="3dp"
+        android:background="?attr/colorSeparator"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/vwColor"
+        app:layout_constraintTop_toBottomOf="@id/paddingBottom" />
+
+    <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_toEndOf="@id/vwColor"
+        app:layout_constraintTop_toBottomOf="@id/vSeparatorAddress" />
+
+    <TextView
+        android:id="@+id/tvFromEx"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="6dp"
+        android:layout_marginEnd="6dp"
+        android:text="@string/default_from"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        android:textIsSelectable="true"
+        app:layout_constraintEnd_toStartOf="@+id/ivAddContact"
+        app:layout_constraintStart_toEndOf="@id/tvFromExTitle"
+        app:layout_constraintTop_toBottomOf="@id/vSeparatorAddress" />
+
+    <ImageView
+        android:id="@+id/ivAddContact"
+        android:layout_width="21dp"
+        android:layout_height="21dp"
+        android:layout_marginEnd="6dp"
+        android:src="@drawable/baseline_import_contacts_24"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/vSeparatorAddress" />
+
+    <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_toEndOf="@id/vwColor"
+        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="@string/default_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_toEndOf="@id/vwColor"
+        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="@string/default_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_toEndOf="@id/vwColor"
+        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="@string/default_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_toEndOf="@id/vwColor"
+        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="@string/default_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/tvTimeEx"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="6dp"
+        android:text="@string/default_timelog"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        android:textIsSelectable="true"
+        app:layout_constraintStart_toEndOf="@id/vwColor"
+        app:layout_constraintTop_toBottomOf="@id/tvBcc" />
+
+    <TextView
+        android:id="@+id/tvSubjectEx"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="6dp"
+        android:layout_marginEnd="6dp"
+        android:text="@string/default_subject"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        android:textIsSelectable="true"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/vwColor"
+        app:layout_constraintTop_toBottomOf="@id/tvTimeEx" />
+
+    <View
+        android:id="@+id/vSeparatorHeaders"
+        android:layout_width="0dp"
+        android:layout_height="1dp"
+        android:layout_marginTop="3dp"
+        android:background="?attr/colorSeparator"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/vwColor"
+        app:layout_constraintTop_toBottomOf="@id/tvSubjectEx" />
+
+    <TextView
+        android:id="@+id/tvHeaders"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="6dp"
+        android:layout_marginTop="3dp"
+        android:layout_marginEnd="6dp"
+        android:fontFamily="monospace"
+        android:text="@string/default_headers"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        android:textIsSelectable="true"
+        android:textSize="12sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/vwColor"
+        app:layout_constraintTop_toBottomOf="@id/vSeparatorHeaders" />
+
+    <ProgressBar
+        android:id="@+id/pbHeaders"
+        style="@style/Base.Widget.AppCompat.ProgressBar"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:indeterminate="true"
+        app:layout_constraintBottom_toTopOf="@+id/bnvActions"
+        app:layout_constraintEnd_toEndOf="@id/tvHeaders"
+        app:layout_constraintStart_toStartOf="@id/tvHeaders"
+        app:layout_constraintTop_toBottomOf="@id/vSeparatorHeaders" />
+
+    <com.google.android.material.bottomnavigation.BottomNavigationView
+        android:id="@+id/bnvActions"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="3dp"
+        android:background="?attr/colorSeparator"
+        app:itemIconTint="@color/bottomnav_background"
+        app:itemTextColor="@color/bottomnav_background"
+        app:labelVisibilityMode="labeled"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/vwColor"
+        app:layout_constraintTop_toBottomOf="@id/tvHeaders"
+        app:menu="@menu/action_message" />
+
+    <View
+        android:id="@+id/vSeparatorBody"
+        android:layout_width="0dp"
+        android:layout_height="1dp"
+        android:layout_marginTop="3dp"
+        android:background="?attr/colorSeparator"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/vwColor"
+        app:layout_constraintTop_toBottomOf="@id/bnvActions" />
+
+    <Button
+        android:id="@+id/btnImages"
+        style="?android:attr/buttonStyleSmall"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="3dp"
+        android:layout_marginEnd="6dp"
+        android:minWidth="0dp"
+        android:minHeight="0dp"
+        android:text="@string/title_show_images"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/vSeparatorBody" />
+
+    <TextView
+        android:id="@+id/tvBody"
+        android:layout_width="@dimen/no_size"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/margin_sm"
+        android:layout_marginStart="@dimen/content_margin"
+        android:layout_marginEnd="@dimen/content_margin"
+        android:minHeight="60dp"
+        android:text="@string/default_body"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        android:textIsSelectable="true"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/vwColor"
+        app:layout_constraintTop_toBottomOf="@id/btnImages" />
+
+    <ProgressBar
+        android:id="@+id/pbBody"
+        style="@style/Base.Widget.AppCompat.ProgressBar"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:indeterminate="true"
+        app:layout_constraintBottom_toTopOf="@+id/vSeparatorAttachments"
+        app:layout_constraintEnd_toEndOf="@id/tvBody"
+        app:layout_constraintStart_toStartOf="@id/tvBody"
+        app:layout_constraintTop_toBottomOf="@id/bnvActions" />
+
+    <View
+        android:id="@+id/vSeparatorAttachments"
+        android:layout_width="0dp"
+        android:layout_height="1dp"
+        android:layout_marginTop="3dp"
+        android:background="?attr/colorSeparator"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/vwColor"
+        app:layout_constraintTop_toBottomOf="@id/tvBody" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rvAttachment"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="6dp"
+        android:layout_marginTop="3dp"
+        android:layout_marginEnd="6dp"
+        android:scrollbarStyle="outsideOverlay"
+        android:scrollbars="vertical"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/vwColor"
+        app:layout_constraintTop_toBottomOf="@+id/vSeparatorAttachments" />
+
+    <View
+        android:id="@+id/vSeparator"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_marginTop="3dp"
+        android:background="?attr/colorSeparator"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/rvAttachment" />
+
+    <androidx.constraintlayout.widget.Group
+        android:id="@+id/grpDetails"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:constraint_referenced_ids="vSeparatorAddress,tvFromExTitle,tvFromEx,tvToTitle,tvTo,tvReplyToTitle,tvReplyTo,tvCcTitle,tvCc,tvBccTitle,tvBcc,tvTimeEx,tvSubjectEx" />
+
+    <androidx.constraintlayout.widget.Group
+        android:id="@+id/grpHeaders"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:constraint_referenced_ids="vSeparatorHeaders,tvHeaders" />
+
+    <androidx.constraintlayout.widget.Group
+        android:id="@+id/grpAttachments"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:constraint_referenced_ids="vSeparatorAttachments,rvAttachment" />
+
+    <androidx.constraintlayout.widget.Group
+        android:id="@+id/grpExpanded"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:constraint_referenced_ids="tvBody" />
+  </androidx.constraintlayout.widget.ConstraintLayout>
 </FrameLayout>
diff --git a/app/src/main/res/layout/item_message_normal.xml b/app/src/main/res/layout/item_message_normal.xml
index 66ac1f8c..85b70d8f 100644
--- a/app/src/main/res/layout/item_message_normal.xml
+++ b/app/src/main/res/layout/item_message_normal.xml
@@ -62,9 +62,9 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="6dp"
-            android:ellipsize="end"
             android:fontFamily="sans-serif-light"
-            android:text="Subject"
+            android:minLines="1"
+            android:text="@string/default_subject"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             app:layout_constraintEnd_toStartOf="@id/paddingEnd"
             app:layout_constraintStart_toEndOf="@id/ivAttachments"
@@ -76,9 +76,8 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="6dp"
             android:layout_marginEnd="6dp"
-            android:ellipsize="end"
             android:fontFamily="sans-serif-light"
-            android:text="From"
+            android:text="@string/default_from"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             app:layout_constraintEnd_toStartOf="@+id/tvTime"
             app:layout_constraintStart_toEndOf="@id/ivAvatar"
@@ -90,7 +89,7 @@
             android:layout_height="wrap_content"
             android:layout_marginEnd="6dp"
             android:maxLines="1"
-            android:text="Time"
+            android:text="@string/default_time"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             app:layout_constraintBottom_toBottomOf="@id/tvFrom"
             app:layout_constraintEnd_toStartOf="@+id/ivFlagged"
@@ -124,7 +123,7 @@
             android:layout_marginTop="@dimen/margin_xs"
             android:layout_marginStart="@dimen/margin_sm"
             android:maxLines="1"
-            android:text="account"
+            android:text="@string/default_account"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             app:layout_constraintStart_toEndOf="@id/paddingStart"
             app:layout_constraintTop_toBottomOf="@id/tvSummary" />
@@ -139,7 +138,7 @@
             android:maxLines="1"
             android:paddingLeft="10dp"
             android:paddingRight="10dp"
-            android:text="folder"
+            android:text="@string/default_folder"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             android:textColor="@color/colorActionForeground"
             app:layout_constraintStart_toEndOf="@id/tvAccount"
@@ -152,7 +151,7 @@
             android:layout_marginTop="@dimen/margin_xs"
             android:layout_marginStart="@dimen/margin_sm"
             android:maxLines="1"
-            android:text="3"
+            android:text="@string/default_count_num"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             app:layout_constraintTop_toBottomOf="@id/tvSummary"
             app:layout_constraintStart_toEndOf="@id/tvFolder" />
@@ -173,7 +172,7 @@
             android:layout_height="wrap_content"
             android:layout_marginEnd="@dimen/margin_sm"
             android:maxLines="1"
-            android:text="123 KB"
+            android:text="@string/default_attachment_size"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             app:layout_constraintEnd_toEndOf="@+id/paddingEnd"
             app:layout_constraintTop_toBottomOf="@id/tvSummary" />
@@ -188,7 +187,7 @@
             android:maxLines="2"
             android:minLines="1"
             android:ellipsize="end"
-            android:text="Summary"
+            android:text="@string/default_summary"
             android:textStyle="italic"
             app:layout_constraintEnd_toStartOf="@id/paddingEnd"
             app:layout_constraintStart_toStartOf="@id/paddingStart"
@@ -200,7 +199,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/margin_sm"
             android:layout_marginTop="6dp"
-            android:text="error"
+            android:text="@string/default_error"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             android:textColor="?attr/colorWarning"
             android:textIsSelectable="true"
@@ -261,7 +260,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="6dp"
             android:layout_marginEnd="6dp"
-            android:text="From"
+            android:text="@string/default_from"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             android:textIsSelectable="true"
             app:layout_constraintEnd_toStartOf="@+id/ivAddContact"
@@ -293,7 +292,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="6dp"
             android:layout_marginEnd="6dp"
-            android:text="To"
+            android:text="@string/default_to"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             android:textIsSelectable="true"
             app:layout_constraintEnd_toEndOf="parent"
@@ -316,7 +315,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="6dp"
             android:layout_marginEnd="6dp"
-            android:text="Reply to"
+            android:text="@string/default_reply_to"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             android:textIsSelectable="true"
             app:layout_constraintEnd_toEndOf="parent"
@@ -339,7 +338,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="6dp"
             android:layout_marginEnd="6dp"
-            android:text="Cc"
+            android:text="@string/default_cc"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             android:textIsSelectable="true"
             app:layout_constraintEnd_toEndOf="parent"
@@ -362,7 +361,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="6dp"
             android:layout_marginEnd="6dp"
-            android:text="Bcc"
+            android:text="@string/default_bcc"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             android:textIsSelectable="true"
             app:layout_constraintEnd_toEndOf="parent"
@@ -374,7 +373,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="6dp"
-            android:text="12:34:56"
+            android:text="@string/default_timelog"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             android:textIsSelectable="true"
             app:layout_constraintStart_toEndOf="@id/vwColor"
@@ -386,7 +385,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="6dp"
             android:layout_marginEnd="6dp"
-            android:text="Subject"
+            android:text="@string/default_subject"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             android:textIsSelectable="true"
             app:layout_constraintEnd_toEndOf="parent"
@@ -411,7 +410,7 @@
             android:layout_marginTop="3dp"
             android:layout_marginEnd="6dp"
             android:fontFamily="monospace"
-            android:text="Headers"
+            android:text="@string/default_headers"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             android:textIsSelectable="true"
             android:textSize="12sp"
@@ -475,7 +474,7 @@
             android:layout_marginStart="@dimen/content_margin"
             android:layout_marginEnd="@dimen/content_margin"
             android:minHeight="60dp"
-            android:text="Body"
+            android:text="@string/default_body"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             android:textIsSelectable="true"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/values/default.xml b/app/src/main/res/values/default.xml
index 472b332c..2199921a 100644
--- a/app/src/main/res/values/default.xml
+++ b/app/src/main/res/values/default.xml
@@ -1,7 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="default_count" translatable="false">--</string>
+  <string name="default_count_num" translatable="false">3</string>
   <string name="default_email" translatable="false">Email</string>
+  <string name="default_from" translatable="false">From</string>
+  <string name="default_to" translatable="false">To</string>
+  <string name="default_reply_to" translatable="false">Reply to</string>
+  <string name="default_cc" translatable="false">Cc</string>
+  <string name="default_bcc" translatable="false">Bcc</string>
+  <string name="default_subject" translatable="false">Subject</string>
+  <string name="default_summary" translatable="false">Summary</string>
+  <string name="default_headers" translatable="false">Headers</string>
+  <string name="default_body" translatable="false">Body</string>
   <string name="default_name" translatable="false">Name</string>
   <string name="default_title" translatable="false">Title</string>
   <string name="default_version" translatable="false">Version 1.0</string>
@@ -13,6 +23,7 @@
   <string name="default_host" translatable="false">Host</string>
   <string name="default_type" translatable="false">Type</string>
   <string name="default_account" translatable="false">Account</string>
+  <string name="default_folder" translatable="false">Folder</string>
   <string name="default_error" translatable="false">Error</string>
   <string name="default_interval" translatable="false">19</string>
   <string name="default_hint_domain" translatable="false">domain.tld</string>