diff --git a/app/src/main/java/eu/faircode/email/FragmentMessage.java b/app/src/main/java/eu/faircode/email/FragmentMessage.java
index 3ddf88eb7d..d2a46879a7 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessage.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessage.java
@@ -70,9 +70,10 @@ public class FragmentMessage extends FragmentEx {
     private ViewGroup view;
     private TextView tvFrom;
     private TextView tvTime;
+    private TextView tvTo;
     private TextView tvSubject;
     private TextView tvCount;
-    private TextView tvTo;
+    private TextView tvReplyTo;
     private TextView tvCc;
     private TextView tvBcc;
     private RecyclerView rvAttachment;
@@ -103,9 +104,10 @@ public class FragmentMessage extends FragmentEx {
         // Get controls
         tvFrom = view.findViewById(R.id.tvFrom);
         tvTime = view.findViewById(R.id.tvTime);
+        tvTo = view.findViewById(R.id.tvTo);
         tvSubject = view.findViewById(R.id.tvSubject);
         tvCount = view.findViewById(R.id.tvCount);
-        tvTo = view.findViewById(R.id.tvTo);
+        tvReplyTo = view.findViewById(R.id.tvReplyTo);
         tvCc = view.findViewById(R.id.tvCc);
         tvBcc = view.findViewById(R.id.tvBcc);
         rvAttachment = view.findViewById(R.id.rvAttachment);
@@ -218,6 +220,7 @@ public class FragmentMessage extends FragmentEx {
         // Initialize
         grpAddresses.setVisibility(View.GONE);
         grpAttachments.setVisibility(View.GONE);
+        tvError.setVisibility(View.GONE);
         top_navigation.setVisibility(View.GONE);
         bottom_navigation.setVisibility(View.GONE);
         grpReady.setVisibility(View.GONE);
@@ -256,12 +259,13 @@ public class FragmentMessage extends FragmentEx {
 
                     tvFrom.setText(message.from == null ? null : MessageHelper.getFormattedAddresses(message.from, true));
                     tvTime.setText(message.sent == null ? null : df.format(new Date(message.sent)));
+                    tvTo.setText(message.to == null ? null : MessageHelper.getFormattedAddresses(message.to, true));
                     tvSubject.setText(message.subject);
 
                     tvCount.setText(Integer.toString(message.count));
                     tvCount.setVisibility(message.count > 1 ? View.VISIBLE : View.GONE);
 
-                    tvTo.setText(message.to == null ? null : MessageHelper.getFormattedAddresses(message.to, true));
+                    tvReplyTo.setText(message.reply == null ? null : MessageHelper.getFormattedAddresses(message.reply, true));
                     tvCc.setText(message.cc == null ? null : MessageHelper.getFormattedAddresses(message.cc, true));
                     tvBcc.setText(message.bcc == null ? null : MessageHelper.getFormattedAddresses(message.bcc, true));
 
diff --git a/app/src/main/res/layout/fragment_identity.xml b/app/src/main/res/layout/fragment_identity.xml
index bc477822ad..72fb7b27b2 100644
--- a/app/src/main/res/layout/fragment_identity.xml
+++ b/app/src/main/res/layout/fragment_identity.xml
@@ -18,7 +18,7 @@
             android:id="@+id/tvName"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/title_name"
+            android:text="@string/title_identity_name"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -39,7 +39,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
-            android:text="@string/title_email"
+            android:text="@string/title_identity_email"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/etName" />
@@ -60,7 +60,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
-            android:text="@string/title_reply_to"
+            android:text="@string/title_identity_reply_to"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/etEmail" />
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index a854f2c6f0..a09f53890c 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -33,6 +33,31 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@id/tvFrom" />
 
+    <TextView
+        android:id="@+id/tvToTitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="6dp"
+        android:layout_marginTop="3dp"
+        android:text="@string/title_to"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tvFrom" />
+
+    <TextView
+        android:id="@+id/tvTo"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="6dp"
+        android:layout_marginStart="6dp"
+        android:layout_marginTop="3dp"
+        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/tvFrom" />
+
     <TextView
         android:id="@+id/tvSubject"
         android:layout_width="0dp"
@@ -40,11 +65,11 @@
         android:layout_marginEnd="6dp"
         android:layout_marginStart="6dp"
         android:text="Subject"
-        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        android:textAppearance="@style/TextAppearance.AppCompat.Medium"
         android:textIsSelectable="true"
         app:layout_constraintEnd_toStartOf="@+id/tvCount"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tvFrom" />
+        app:layout_constraintTop_toBottomOf="@id/tvTo" />
 
     <TextView
         android:id="@+id/tvCount"
@@ -67,28 +92,26 @@
         app:layout_constraintTop_toBottomOf="@id/tvSubject" />
 
     <TextView
-        android:id="@+id/tvToTitle"
+        android:id="@+id/tvReplyToTitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="6dp"
-        android:layout_marginTop="3dp"
-        android:text="@string/title_to"
+        android:text="@string/title_reply_to"
         android:textAppearance="@style/TextAppearance.AppCompat.Small"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/vSeparatorAddress" />
 
     <TextView
-        android:id="@+id/tvTo"
+        android:id="@+id/tvReplyTo"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginEnd="6dp"
         android:layout_marginStart="6dp"
-        android:layout_marginTop="3dp"
-        android:text="To"
+        android:text="Reply to"
         android:textAppearance="@style/TextAppearance.AppCompat.Small"
         android:textIsSelectable="true"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/tvToTitle"
+        app:layout_constraintStart_toEndOf="@id/tvReplyToTitle"
         app:layout_constraintTop_toBottomOf="@id/vSeparatorAddress" />
 
     <TextView
@@ -99,7 +122,7 @@
         android:text="@string/title_cc"
         android:textAppearance="@style/TextAppearance.AppCompat.Small"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tvTo" />
+        app:layout_constraintTop_toBottomOf="@id/tvReplyTo" />
 
     <TextView
         android:id="@+id/tvCc"
@@ -112,7 +135,7 @@
         android:textIsSelectable="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/tvCcTitle"
-        app:layout_constraintTop_toBottomOf="@id/tvTo" />
+        app:layout_constraintTop_toBottomOf="@id/tvReplyTo" />
 
     <TextView
         android:id="@+id/tvBccTitle"
@@ -239,7 +262,7 @@
         android:id="@+id/grpAddresses"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        app:constraint_referenced_ids="vSeparatorAddress,tvToTitle,tvTo,tvCcTitle,tvCc,tvBccTitle,tvBcc" />
+        app:constraint_referenced_ids="vSeparatorAddress,tvReplyToTitle,tvReplyTo,tvCcTitle,tvCc,tvBccTitle,tvBcc" />
 
     <androidx.constraintlayout.widget.Group
         android:id="@+id/grpAttachments"
@@ -251,5 +274,5 @@
         android:id="@+id/grpReady"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        app:constraint_referenced_ids="tvFrom,tvTime,tvSubject,tvCount,tvError,scroll" />
+        app:constraint_referenced_ids="tvFrom,tvToTitle,tvTo,tvTime,tvSubject,tvCount,scroll" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml
index 583dc30792..245e2dc36d 100644
--- a/app/src/main/res/values-af/strings.xml
+++ b/app/src/main/res/values-af/strings.xml
@@ -47,9 +47,9 @@
   <string name="title_setup_granted">Granted</string>
   <string name="title_setup_dark_theme">Dark theme</string>
   <string name="title_setup_debug">Debug</string>
-  <string name="title_name">Your name</string>
-  <string name="title_email">Your email address</string>
-  <string name="title_reply_to">Reply to address</string>
+  <string name="title_identity_name">Your name</string>
+  <string name="title_identity_email">Your email address</string>
+  <string name="title_identity_reply_to">Reply to address</string>
   <string name="title_optional">Optional</string>
   <string name="title_account_linked">Linked account</string>
   <string name="title_account_name">Account name</string>
@@ -115,6 +115,7 @@
   <string name="title_compose">Compose</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
+  <string name="title_reply_to">Reply to:</string>
   <string name="title_cc">CC:</string>
   <string name="title_bcc">BCC:</string>
   <string name="title_subject">Subject:</string>
diff --git a/app/src/main/res/values-ar-rBH/strings.xml b/app/src/main/res/values-ar-rBH/strings.xml
index 5601a40e4e..7e7a64f7ce 100644
--- a/app/src/main/res/values-ar-rBH/strings.xml
+++ b/app/src/main/res/values-ar-rBH/strings.xml
@@ -63,9 +63,9 @@
   <string name="title_setup_granted">Granted</string>
   <string name="title_setup_dark_theme">Dark theme</string>
   <string name="title_setup_debug">Debug</string>
-  <string name="title_name">Your name</string>
-  <string name="title_email">Your email address</string>
-  <string name="title_reply_to">Reply to address</string>
+  <string name="title_identity_name">Your name</string>
+  <string name="title_identity_email">Your email address</string>
+  <string name="title_identity_reply_to">Reply to address</string>
   <string name="title_optional">Optional</string>
   <string name="title_account_linked">Linked account</string>
   <string name="title_account_name">Account name</string>
@@ -131,6 +131,7 @@
   <string name="title_compose">Compose</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
+  <string name="title_reply_to">Reply to:</string>
   <string name="title_cc">CC:</string>
   <string name="title_bcc">BCC:</string>
   <string name="title_subject">Subject:</string>
diff --git a/app/src/main/res/values-ar-rEG/strings.xml b/app/src/main/res/values-ar-rEG/strings.xml
index 5601a40e4e..7e7a64f7ce 100644
--- a/app/src/main/res/values-ar-rEG/strings.xml
+++ b/app/src/main/res/values-ar-rEG/strings.xml
@@ -63,9 +63,9 @@
   <string name="title_setup_granted">Granted</string>
   <string name="title_setup_dark_theme">Dark theme</string>
   <string name="title_setup_debug">Debug</string>
-  <string name="title_name">Your name</string>
-  <string name="title_email">Your email address</string>
-  <string name="title_reply_to">Reply to address</string>
+  <string name="title_identity_name">Your name</string>
+  <string name="title_identity_email">Your email address</string>
+  <string name="title_identity_reply_to">Reply to address</string>
   <string name="title_optional">Optional</string>
   <string name="title_account_linked">Linked account</string>
   <string name="title_account_name">Account name</string>
@@ -131,6 +131,7 @@
   <string name="title_compose">Compose</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
+  <string name="title_reply_to">Reply to:</string>
   <string name="title_cc">CC:</string>
   <string name="title_bcc">BCC:</string>
   <string name="title_subject">Subject:</string>
diff --git a/app/src/main/res/values-ar-rSA/strings.xml b/app/src/main/res/values-ar-rSA/strings.xml
index 5601a40e4e..7e7a64f7ce 100644
--- a/app/src/main/res/values-ar-rSA/strings.xml
+++ b/app/src/main/res/values-ar-rSA/strings.xml
@@ -63,9 +63,9 @@
   <string name="title_setup_granted">Granted</string>
   <string name="title_setup_dark_theme">Dark theme</string>
   <string name="title_setup_debug">Debug</string>
-  <string name="title_name">Your name</string>
-  <string name="title_email">Your email address</string>
-  <string name="title_reply_to">Reply to address</string>
+  <string name="title_identity_name">Your name</string>
+  <string name="title_identity_email">Your email address</string>
+  <string name="title_identity_reply_to">Reply to address</string>
   <string name="title_optional">Optional</string>
   <string name="title_account_linked">Linked account</string>
   <string name="title_account_name">Account name</string>
@@ -131,6 +131,7 @@
   <string name="title_compose">Compose</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
+  <string name="title_reply_to">Reply to:</string>
   <string name="title_cc">CC:</string>
   <string name="title_bcc">BCC:</string>
   <string name="title_subject">Subject:</string>
diff --git a/app/src/main/res/values-ar-rYE/strings.xml b/app/src/main/res/values-ar-rYE/strings.xml
index 5601a40e4e..7e7a64f7ce 100644
--- a/app/src/main/res/values-ar-rYE/strings.xml
+++ b/app/src/main/res/values-ar-rYE/strings.xml
@@ -63,9 +63,9 @@
   <string name="title_setup_granted">Granted</string>
   <string name="title_setup_dark_theme">Dark theme</string>
   <string name="title_setup_debug">Debug</string>
-  <string name="title_name">Your name</string>
-  <string name="title_email">Your email address</string>
-  <string name="title_reply_to">Reply to address</string>
+  <string name="title_identity_name">Your name</string>
+  <string name="title_identity_email">Your email address</string>
+  <string name="title_identity_reply_to">Reply to address</string>
   <string name="title_optional">Optional</string>
   <string name="title_account_linked">Linked account</string>
   <string name="title_account_name">Account name</string>
@@ -131,6 +131,7 @@
   <string name="title_compose">Compose</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
+  <string name="title_reply_to">Reply to:</string>
   <string name="title_cc">CC:</string>
   <string name="title_bcc">BCC:</string>
   <string name="title_subject">Subject:</string>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 5601a40e4e..7e7a64f7ce 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -63,9 +63,9 @@
   <string name="title_setup_granted">Granted</string>
   <string name="title_setup_dark_theme">Dark theme</string>
   <string name="title_setup_debug">Debug</string>
-  <string name="title_name">Your name</string>
-  <string name="title_email">Your email address</string>
-  <string name="title_reply_to">Reply to address</string>
+  <string name="title_identity_name">Your name</string>
+  <string name="title_identity_email">Your email address</string>
+  <string name="title_identity_reply_to">Reply to address</string>
   <string name="title_optional">Optional</string>
   <string name="title_account_linked">Linked account</string>
   <string name="title_account_name">Account name</string>
@@ -131,6 +131,7 @@
   <string name="title_compose">Compose</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
+  <string name="title_reply_to">Reply to:</string>
   <string name="title_cc">CC:</string>
   <string name="title_bcc">BCC:</string>
   <string name="title_subject">Subject:</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 583dc30792..245e2dc36d 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -47,9 +47,9 @@
   <string name="title_setup_granted">Granted</string>
   <string name="title_setup_dark_theme">Dark theme</string>
   <string name="title_setup_debug">Debug</string>
-  <string name="title_name">Your name</string>
-  <string name="title_email">Your email address</string>
-  <string name="title_reply_to">Reply to address</string>
+  <string name="title_identity_name">Your name</string>
+  <string name="title_identity_email">Your email address</string>
+  <string name="title_identity_reply_to">Reply to address</string>
   <string name="title_optional">Optional</string>
   <string name="title_account_linked">Linked account</string>
   <string name="title_account_name">Account name</string>
@@ -115,6 +115,7 @@
   <string name="title_compose">Compose</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
+  <string name="title_reply_to">Reply to:</string>
   <string name="title_cc">CC:</string>
   <string name="title_bcc">BCC:</string>
   <string name="title_subject">Subject:</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index d0e8318633..3d18e67d8c 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -55,9 +55,9 @@
   <string name="title_setup_granted">Granted</string>
   <string name="title_setup_dark_theme">Dark theme</string>
   <string name="title_setup_debug">Debug</string>
-  <string name="title_name">Your name</string>
-  <string name="title_email">Your email address</string>
-  <string name="title_reply_to">Reply to address</string>
+  <string name="title_identity_name">Your name</string>
+  <string name="title_identity_email">Your email address</string>
+  <string name="title_identity_reply_to">Reply to address</string>
   <string name="title_optional">Optional</string>
   <string name="title_account_linked">Linked account</string>
   <string name="title_account_name">Account name</string>
@@ -123,6 +123,7 @@
   <string name="title_compose">Compose</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
+  <string name="title_reply_to">Reply to:</string>
   <string name="title_cc">CC:</string>
   <string name="title_bcc">BCC:</string>
   <string name="title_subject">Subject:</string>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 583dc30792..245e2dc36d 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -47,9 +47,9 @@
   <string name="title_setup_granted">Granted</string>
   <string name="title_setup_dark_theme">Dark theme</string>
   <string name="title_setup_debug">Debug</string>
-  <string name="title_name">Your name</string>
-  <string name="title_email">Your email address</string>
-  <string name="title_reply_to">Reply to address</string>
+  <string name="title_identity_name">Your name</string>
+  <string name="title_identity_email">Your email address</string>
+  <string name="title_identity_reply_to">Reply to address</string>
   <string name="title_optional">Optional</string>
   <string name="title_account_linked">Linked account</string>
   <string name="title_account_name">Account name</string>
@@ -115,6 +115,7 @@
   <string name="title_compose">Compose</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
+  <string name="title_reply_to">Reply to:</string>
   <string name="title_cc">CC:</string>
   <string name="title_bcc">BCC:</string>
   <string name="title_subject">Subject:</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 1bd51391da..0904060d05 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -47,9 +47,9 @@
   <string name="title_setup_granted">Gewährt</string>
   <string name="title_setup_dark_theme">Dunkles Thema</string>
   <string name="title_setup_debug">Debug</string>
-  <string name="title_name">Ihr Name</string>
-  <string name="title_email">Ihre E-Mail Adresse</string>
-  <string name="title_reply_to">Antwortadresse</string>
+  <string name="title_identity_name">Your name</string>
+  <string name="title_identity_email">Your email address</string>
+  <string name="title_identity_reply_to">Reply to address</string>
   <string name="title_optional">Optional</string>
   <string name="title_account_linked">Verknüpftes Konto</string>
   <string name="title_account_name">Kontobezeichnung</string>
@@ -115,6 +115,7 @@
   <string name="title_compose">Verfassen</string>
   <string name="title_from">Von:</string>
   <string name="title_to">An:</string>
+  <string name="title_reply_to">Reply to:</string>
   <string name="title_cc">CC:</string>
   <string name="title_bcc">BCC:</string>
   <string name="title_subject">Betreff:</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 583dc30792..245e2dc36d 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -47,9 +47,9 @@
   <string name="title_setup_granted">Granted</string>
   <string name="title_setup_dark_theme">Dark theme</string>
   <string name="title_setup_debug">Debug</string>
-  <string name="title_name">Your name</string>
-  <string name="title_email">Your email address</string>
-  <string name="title_reply_to">Reply to address</string>
+  <string name="title_identity_name">Your name</string>
+  <string name="title_identity_email">Your email address</string>
+  <string name="title_identity_reply_to">Reply to address</string>
   <string name="title_optional">Optional</string>
   <string name="title_account_linked">Linked account</string>
   <string name="title_account_name">Account name</string>
@@ -115,6 +115,7 @@
   <string name="title_compose">Compose</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
+  <string name="title_reply_to">Reply to:</string>
   <string name="title_cc">CC:</string>
   <string name="title_bcc">BCC:</string>
   <string name="title_subject">Subject:</string>
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 583dc30792..245e2dc36d 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -47,9 +47,9 @@
   <string name="title_setup_granted">Granted</string>
   <string name="title_setup_dark_theme">Dark theme</string>
   <string name="title_setup_debug">Debug</string>
-  <string name="title_name">Your name</string>
-  <string name="title_email">Your email address</string>
-  <string name="title_reply_to">Reply to address</string>
+  <string name="title_identity_name">Your name</string>
+  <string name="title_identity_email">Your email address</string>
+  <string name="title_identity_reply_to">Reply to address</string>
   <string name="title_optional">Optional</string>
   <string name="title_account_linked">Linked account</string>
   <string name="title_account_name">Account name</string>
@@ -115,6 +115,7 @@
   <string name="title_compose">Compose</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
+  <string name="title_reply_to">Reply to:</string>
   <string name="title_cc">CC:</string>
   <string name="title_bcc">BCC:</string>
   <string name="title_subject">Subject:</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 583dc30792..245e2dc36d 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -47,9 +47,9 @@
   <string name="title_setup_granted">Granted</string>
   <string name="title_setup_dark_theme">Dark theme</string>
   <string name="title_setup_debug">Debug</string>
-  <string name="title_name">Your name</string>
-  <string name="title_email">Your email address</string>
-  <string name="title_reply_to">Reply to address</string>
+  <string name="title_identity_name">Your name</string>
+  <string name="title_identity_email">Your email address</string>
+  <string name="title_identity_reply_to">Reply to address</string>
   <string name="title_optional">Optional</string>
   <string name="title_account_linked">Linked account</string>
   <string name="title_account_name">Account name</string>
@@ -115,6 +115,7 @@
   <string name="title_compose">Compose</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
+  <string name="title_reply_to">Reply to:</string>
   <string name="title_cc">CC:</string>
   <string name="title_bcc">BCC:</string>
   <string name="title_subject">Subject:</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 583dc30792..245e2dc36d 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -47,9 +47,9 @@
   <string name="title_setup_granted">Granted</string>
   <string name="title_setup_dark_theme">Dark theme</string>
   <string name="title_setup_debug">Debug</string>
-  <string name="title_name">Your name</string>
-  <string name="title_email">Your email address</string>
-  <string name="title_reply_to">Reply to address</string>
+  <string name="title_identity_name">Your name</string>
+  <string name="title_identity_email">Your email address</string>
+  <string name="title_identity_reply_to">Reply to address</string>
   <string name="title_optional">Optional</string>
   <string name="title_account_linked">Linked account</string>
   <string name="title_account_name">Account name</string>
@@ -115,6 +115,7 @@
   <string name="title_compose">Compose</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
+  <string name="title_reply_to">Reply to:</string>
   <string name="title_cc">CC:</string>
   <string name="title_bcc">BCC:</string>
   <string name="title_subject">Subject:</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 583dc30792..245e2dc36d 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -47,9 +47,9 @@
   <string name="title_setup_granted">Granted</string>
   <string name="title_setup_dark_theme">Dark theme</string>
   <string name="title_setup_debug">Debug</string>
-  <string name="title_name">Your name</string>
-  <string name="title_email">Your email address</string>
-  <string name="title_reply_to">Reply to address</string>
+  <string name="title_identity_name">Your name</string>
+  <string name="title_identity_email">Your email address</string>
+  <string name="title_identity_reply_to">Reply to address</string>
   <string name="title_optional">Optional</string>
   <string name="title_account_linked">Linked account</string>
   <string name="title_account_name">Account name</string>
@@ -115,6 +115,7 @@
   <string name="title_compose">Compose</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
+  <string name="title_reply_to">Reply to:</string>
   <string name="title_cc">CC:</string>
   <string name="title_bcc">BCC:</string>
   <string name="title_subject">Subject:</string>
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index 70e6a6f933..145912d301 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -55,9 +55,9 @@
   <string name="title_setup_granted">Granted</string>
   <string name="title_setup_dark_theme">Dark theme</string>
   <string name="title_setup_debug">Debug</string>
-  <string name="title_name">Your name</string>
-  <string name="title_email">Your email address</string>
-  <string name="title_reply_to">Reply to address</string>
+  <string name="title_identity_name">Your name</string>
+  <string name="title_identity_email">Your email address</string>
+  <string name="title_identity_reply_to">Reply to address</string>
   <string name="title_optional">Optional</string>
   <string name="title_account_linked">Linked account</string>
   <string name="title_account_name">Account name</string>
@@ -123,6 +123,7 @@
   <string name="title_compose">Compose</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
+  <string name="title_reply_to">Reply to:</string>
   <string name="title_cc">CC:</string>
   <string name="title_bcc">BCC:</string>
   <string name="title_subject">Subject:</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 583dc30792..245e2dc36d 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -47,9 +47,9 @@
   <string name="title_setup_granted">Granted</string>
   <string name="title_setup_dark_theme">Dark theme</string>
   <string name="title_setup_debug">Debug</string>
-  <string name="title_name">Your name</string>
-  <string name="title_email">Your email address</string>
-  <string name="title_reply_to">Reply to address</string>
+  <string name="title_identity_name">Your name</string>
+  <string name="title_identity_email">Your email address</string>
+  <string name="title_identity_reply_to">Reply to address</string>
   <string name="title_optional">Optional</string>
   <string name="title_account_linked">Linked account</string>
   <string name="title_account_name">Account name</string>
@@ -115,6 +115,7 @@
   <string name="title_compose">Compose</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
+  <string name="title_reply_to">Reply to:</string>
   <string name="title_cc">CC:</string>
   <string name="title_bcc">BCC:</string>
   <string name="title_subject">Subject:</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 583dc30792..245e2dc36d 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -47,9 +47,9 @@
   <string name="title_setup_granted">Granted</string>
   <string name="title_setup_dark_theme">Dark theme</string>
   <string name="title_setup_debug">Debug</string>
-  <string name="title_name">Your name</string>
-  <string name="title_email">Your email address</string>
-  <string name="title_reply_to">Reply to address</string>
+  <string name="title_identity_name">Your name</string>
+  <string name="title_identity_email">Your email address</string>
+  <string name="title_identity_reply_to">Reply to address</string>
   <string name="title_optional">Optional</string>
   <string name="title_account_linked">Linked account</string>
   <string name="title_account_name">Account name</string>
@@ -115,6 +115,7 @@
   <string name="title_compose">Compose</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
+  <string name="title_reply_to">Reply to:</string>
   <string name="title_cc">CC:</string>
   <string name="title_bcc">BCC:</string>
   <string name="title_subject">Subject:</string>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 70e6a6f933..145912d301 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -55,9 +55,9 @@
   <string name="title_setup_granted">Granted</string>
   <string name="title_setup_dark_theme">Dark theme</string>
   <string name="title_setup_debug">Debug</string>
-  <string name="title_name">Your name</string>
-  <string name="title_email">Your email address</string>
-  <string name="title_reply_to">Reply to address</string>
+  <string name="title_identity_name">Your name</string>
+  <string name="title_identity_email">Your email address</string>
+  <string name="title_identity_reply_to">Reply to address</string>
   <string name="title_optional">Optional</string>
   <string name="title_account_linked">Linked account</string>
   <string name="title_account_name">Account name</string>
@@ -123,6 +123,7 @@
   <string name="title_compose">Compose</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
+  <string name="title_reply_to">Reply to:</string>
   <string name="title_cc">CC:</string>
   <string name="title_bcc">BCC:</string>
   <string name="title_subject">Subject:</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index af976748d8..54fc20a1a6 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -43,9 +43,9 @@
   <string name="title_setup_granted">Granted</string>
   <string name="title_setup_dark_theme">Dark theme</string>
   <string name="title_setup_debug">Debug</string>
-  <string name="title_name">Your name</string>
-  <string name="title_email">Your email address</string>
-  <string name="title_reply_to">Reply to address</string>
+  <string name="title_identity_name">Your name</string>
+  <string name="title_identity_email">Your email address</string>
+  <string name="title_identity_reply_to">Reply to address</string>
   <string name="title_optional">Optional</string>
   <string name="title_account_linked">Linked account</string>
   <string name="title_account_name">Account name</string>
@@ -111,6 +111,7 @@
   <string name="title_compose">Compose</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
+  <string name="title_reply_to">Reply to:</string>
   <string name="title_cc">CC:</string>
   <string name="title_bcc">BCC:</string>
   <string name="title_subject">Subject:</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index af976748d8..54fc20a1a6 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -43,9 +43,9 @@
   <string name="title_setup_granted">Granted</string>
   <string name="title_setup_dark_theme">Dark theme</string>
   <string name="title_setup_debug">Debug</string>
-  <string name="title_name">Your name</string>
-  <string name="title_email">Your email address</string>
-  <string name="title_reply_to">Reply to address</string>
+  <string name="title_identity_name">Your name</string>
+  <string name="title_identity_email">Your email address</string>
+  <string name="title_identity_reply_to">Reply to address</string>
   <string name="title_optional">Optional</string>
   <string name="title_account_linked">Linked account</string>
   <string name="title_account_name">Account name</string>
@@ -111,6 +111,7 @@
   <string name="title_compose">Compose</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
+  <string name="title_reply_to">Reply to:</string>
   <string name="title_cc">CC:</string>
   <string name="title_bcc">BCC:</string>
   <string name="title_subject">Subject:</string>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index 583dc30792..245e2dc36d 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -47,9 +47,9 @@
   <string name="title_setup_granted">Granted</string>
   <string name="title_setup_dark_theme">Dark theme</string>
   <string name="title_setup_debug">Debug</string>
-  <string name="title_name">Your name</string>
-  <string name="title_email">Your email address</string>
-  <string name="title_reply_to">Reply to address</string>
+  <string name="title_identity_name">Your name</string>
+  <string name="title_identity_email">Your email address</string>
+  <string name="title_identity_reply_to">Reply to address</string>
   <string name="title_optional">Optional</string>
   <string name="title_account_linked">Linked account</string>
   <string name="title_account_name">Account name</string>
@@ -115,6 +115,7 @@
   <string name="title_compose">Compose</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
+  <string name="title_reply_to">Reply to:</string>
   <string name="title_cc">CC:</string>
   <string name="title_bcc">BCC:</string>
   <string name="title_subject">Subject:</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 583dc30792..245e2dc36d 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -47,9 +47,9 @@
   <string name="title_setup_granted">Granted</string>
   <string name="title_setup_dark_theme">Dark theme</string>
   <string name="title_setup_debug">Debug</string>
-  <string name="title_name">Your name</string>
-  <string name="title_email">Your email address</string>
-  <string name="title_reply_to">Reply to address</string>
+  <string name="title_identity_name">Your name</string>
+  <string name="title_identity_email">Your email address</string>
+  <string name="title_identity_reply_to">Reply to address</string>
   <string name="title_optional">Optional</string>
   <string name="title_account_linked">Linked account</string>
   <string name="title_account_name">Account name</string>
@@ -115,6 +115,7 @@
   <string name="title_compose">Compose</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
+  <string name="title_reply_to">Reply to:</string>
   <string name="title_cc">CC:</string>
   <string name="title_bcc">BCC:</string>
   <string name="title_subject">Subject:</string>
diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml
index 583dc30792..245e2dc36d 100644
--- a/app/src/main/res/values-no/strings.xml
+++ b/app/src/main/res/values-no/strings.xml
@@ -47,9 +47,9 @@
   <string name="title_setup_granted">Granted</string>
   <string name="title_setup_dark_theme">Dark theme</string>
   <string name="title_setup_debug">Debug</string>
-  <string name="title_name">Your name</string>
-  <string name="title_email">Your email address</string>
-  <string name="title_reply_to">Reply to address</string>
+  <string name="title_identity_name">Your name</string>
+  <string name="title_identity_email">Your email address</string>
+  <string name="title_identity_reply_to">Reply to address</string>
   <string name="title_optional">Optional</string>
   <string name="title_account_linked">Linked account</string>
   <string name="title_account_name">Account name</string>
@@ -115,6 +115,7 @@
   <string name="title_compose">Compose</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
+  <string name="title_reply_to">Reply to:</string>
   <string name="title_cc">CC:</string>
   <string name="title_bcc">BCC:</string>
   <string name="title_subject">Subject:</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index d0e8318633..3d18e67d8c 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -55,9 +55,9 @@
   <string name="title_setup_granted">Granted</string>
   <string name="title_setup_dark_theme">Dark theme</string>
   <string name="title_setup_debug">Debug</string>
-  <string name="title_name">Your name</string>
-  <string name="title_email">Your email address</string>
-  <string name="title_reply_to">Reply to address</string>
+  <string name="title_identity_name">Your name</string>
+  <string name="title_identity_email">Your email address</string>
+  <string name="title_identity_reply_to">Reply to address</string>
   <string name="title_optional">Optional</string>
   <string name="title_account_linked">Linked account</string>
   <string name="title_account_name">Account name</string>
@@ -123,6 +123,7 @@
   <string name="title_compose">Compose</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
+  <string name="title_reply_to">Reply to:</string>
   <string name="title_cc">CC:</string>
   <string name="title_bcc">BCC:</string>
   <string name="title_subject">Subject:</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 3786297695..28f120a568 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -47,9 +47,9 @@
   <string name="title_setup_granted">Granted</string>
   <string name="title_setup_dark_theme">Tema escuro</string>
   <string name="title_setup_debug">Depurar</string>
-  <string name="title_name">Seu nome</string>
-  <string name="title_email">Seu endereço de e-mail</string>
-  <string name="title_reply_to">Resposta para o endereço</string>
+  <string name="title_identity_name">Your name</string>
+  <string name="title_identity_email">Your email address</string>
+  <string name="title_identity_reply_to">Reply to address</string>
   <string name="title_optional">Opcional</string>
   <string name="title_account_linked">Linked account</string>
   <string name="title_account_name">Nome da conta</string>
@@ -115,6 +115,7 @@
   <string name="title_compose">Escrever</string>
   <string name="title_from">De:</string>
   <string name="title_to">Para:</string>
+  <string name="title_reply_to">Reply to:</string>
   <string name="title_cc">CC:</string>
   <string name="title_bcc">BCC:</string>
   <string name="title_subject">Assunto:</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 583dc30792..245e2dc36d 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -47,9 +47,9 @@
   <string name="title_setup_granted">Granted</string>
   <string name="title_setup_dark_theme">Dark theme</string>
   <string name="title_setup_debug">Debug</string>
-  <string name="title_name">Your name</string>
-  <string name="title_email">Your email address</string>
-  <string name="title_reply_to">Reply to address</string>
+  <string name="title_identity_name">Your name</string>
+  <string name="title_identity_email">Your email address</string>
+  <string name="title_identity_reply_to">Reply to address</string>
   <string name="title_optional">Optional</string>
   <string name="title_account_linked">Linked account</string>
   <string name="title_account_name">Account name</string>
@@ -115,6 +115,7 @@
   <string name="title_compose">Compose</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
+  <string name="title_reply_to">Reply to:</string>
   <string name="title_cc">CC:</string>
   <string name="title_bcc">BCC:</string>
   <string name="title_subject">Subject:</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 45d1e79ed1..23a4b8282c 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -51,9 +51,9 @@
   <string name="title_setup_granted">Granted</string>
   <string name="title_setup_dark_theme">Temă întunecată</string>
   <string name="title_setup_debug">Depanare</string>
-  <string name="title_name">Numele dumneavoastră</string>
-  <string name="title_email">Adresa dvs. de e-mail</string>
-  <string name="title_reply_to">Răspuns la adresa</string>
+  <string name="title_identity_name">Your name</string>
+  <string name="title_identity_email">Your email address</string>
+  <string name="title_identity_reply_to">Reply to address</string>
   <string name="title_optional">Opțional</string>
   <string name="title_account_linked">Cont asociat</string>
   <string name="title_account_name">Nume cont</string>
@@ -119,6 +119,7 @@
   <string name="title_compose">Compune</string>
   <string name="title_from">De la:</string>
   <string name="title_to">Către:</string>
+  <string name="title_reply_to">Reply to:</string>
   <string name="title_cc">CC:</string>
   <string name="title_bcc">BCC:</string>
   <string name="title_subject">Subiect:</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index d0e8318633..3d18e67d8c 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -55,9 +55,9 @@
   <string name="title_setup_granted">Granted</string>
   <string name="title_setup_dark_theme">Dark theme</string>
   <string name="title_setup_debug">Debug</string>
-  <string name="title_name">Your name</string>
-  <string name="title_email">Your email address</string>
-  <string name="title_reply_to">Reply to address</string>
+  <string name="title_identity_name">Your name</string>
+  <string name="title_identity_email">Your email address</string>
+  <string name="title_identity_reply_to">Reply to address</string>
   <string name="title_optional">Optional</string>
   <string name="title_account_linked">Linked account</string>
   <string name="title_account_name">Account name</string>
@@ -123,6 +123,7 @@
   <string name="title_compose">Compose</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
+  <string name="title_reply_to">Reply to:</string>
   <string name="title_cc">CC:</string>
   <string name="title_bcc">BCC:</string>
   <string name="title_subject">Subject:</string>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index c04f946926..610fc51fc6 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -51,9 +51,9 @@
   <string name="title_setup_granted">Granted</string>
   <string name="title_setup_dark_theme">Dark theme</string>
   <string name="title_setup_debug">Debug</string>
-  <string name="title_name">Your name</string>
-  <string name="title_email">Your email address</string>
-  <string name="title_reply_to">Reply to address</string>
+  <string name="title_identity_name">Your name</string>
+  <string name="title_identity_email">Your email address</string>
+  <string name="title_identity_reply_to">Reply to address</string>
   <string name="title_optional">Optional</string>
   <string name="title_account_linked">Linked account</string>
   <string name="title_account_name">Account name</string>
@@ -119,6 +119,7 @@
   <string name="title_compose">Compose</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
+  <string name="title_reply_to">Reply to:</string>
   <string name="title_cc">CC:</string>
   <string name="title_bcc">BCC:</string>
   <string name="title_subject">Subject:</string>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index 583dc30792..245e2dc36d 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -47,9 +47,9 @@
   <string name="title_setup_granted">Granted</string>
   <string name="title_setup_dark_theme">Dark theme</string>
   <string name="title_setup_debug">Debug</string>
-  <string name="title_name">Your name</string>
-  <string name="title_email">Your email address</string>
-  <string name="title_reply_to">Reply to address</string>
+  <string name="title_identity_name">Your name</string>
+  <string name="title_identity_email">Your email address</string>
+  <string name="title_identity_reply_to">Reply to address</string>
   <string name="title_optional">Optional</string>
   <string name="title_account_linked">Linked account</string>
   <string name="title_account_name">Account name</string>
@@ -115,6 +115,7 @@
   <string name="title_compose">Compose</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
+  <string name="title_reply_to">Reply to:</string>
   <string name="title_cc">CC:</string>
   <string name="title_bcc">BCC:</string>
   <string name="title_subject">Subject:</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 583dc30792..245e2dc36d 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -47,9 +47,9 @@
   <string name="title_setup_granted">Granted</string>
   <string name="title_setup_dark_theme">Dark theme</string>
   <string name="title_setup_debug">Debug</string>
-  <string name="title_name">Your name</string>
-  <string name="title_email">Your email address</string>
-  <string name="title_reply_to">Reply to address</string>
+  <string name="title_identity_name">Your name</string>
+  <string name="title_identity_email">Your email address</string>
+  <string name="title_identity_reply_to">Reply to address</string>
   <string name="title_optional">Optional</string>
   <string name="title_account_linked">Linked account</string>
   <string name="title_account_name">Account name</string>
@@ -115,6 +115,7 @@
   <string name="title_compose">Compose</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
+  <string name="title_reply_to">Reply to:</string>
   <string name="title_cc">CC:</string>
   <string name="title_bcc">BCC:</string>
   <string name="title_subject">Subject:</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index d0e8318633..3d18e67d8c 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -55,9 +55,9 @@
   <string name="title_setup_granted">Granted</string>
   <string name="title_setup_dark_theme">Dark theme</string>
   <string name="title_setup_debug">Debug</string>
-  <string name="title_name">Your name</string>
-  <string name="title_email">Your email address</string>
-  <string name="title_reply_to">Reply to address</string>
+  <string name="title_identity_name">Your name</string>
+  <string name="title_identity_email">Your email address</string>
+  <string name="title_identity_reply_to">Reply to address</string>
   <string name="title_optional">Optional</string>
   <string name="title_account_linked">Linked account</string>
   <string name="title_account_name">Account name</string>
@@ -123,6 +123,7 @@
   <string name="title_compose">Compose</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
+  <string name="title_reply_to">Reply to:</string>
   <string name="title_cc">CC:</string>
   <string name="title_bcc">BCC:</string>
   <string name="title_subject">Subject:</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index af976748d8..54fc20a1a6 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -43,9 +43,9 @@
   <string name="title_setup_granted">Granted</string>
   <string name="title_setup_dark_theme">Dark theme</string>
   <string name="title_setup_debug">Debug</string>
-  <string name="title_name">Your name</string>
-  <string name="title_email">Your email address</string>
-  <string name="title_reply_to">Reply to address</string>
+  <string name="title_identity_name">Your name</string>
+  <string name="title_identity_email">Your email address</string>
+  <string name="title_identity_reply_to">Reply to address</string>
   <string name="title_optional">Optional</string>
   <string name="title_account_linked">Linked account</string>
   <string name="title_account_name">Account name</string>
@@ -111,6 +111,7 @@
   <string name="title_compose">Compose</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
+  <string name="title_reply_to">Reply to:</string>
   <string name="title_cc">CC:</string>
   <string name="title_bcc">BCC:</string>
   <string name="title_subject">Subject:</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index af976748d8..54fc20a1a6 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -43,9 +43,9 @@
   <string name="title_setup_granted">Granted</string>
   <string name="title_setup_dark_theme">Dark theme</string>
   <string name="title_setup_debug">Debug</string>
-  <string name="title_name">Your name</string>
-  <string name="title_email">Your email address</string>
-  <string name="title_reply_to">Reply to address</string>
+  <string name="title_identity_name">Your name</string>
+  <string name="title_identity_email">Your email address</string>
+  <string name="title_identity_reply_to">Reply to address</string>
   <string name="title_optional">Optional</string>
   <string name="title_account_linked">Linked account</string>
   <string name="title_account_name">Account name</string>
@@ -111,6 +111,7 @@
   <string name="title_compose">Compose</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
+  <string name="title_reply_to">Reply to:</string>
   <string name="title_cc">CC:</string>
   <string name="title_bcc">BCC:</string>
   <string name="title_subject">Subject:</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index af976748d8..54fc20a1a6 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -43,9 +43,9 @@
   <string name="title_setup_granted">Granted</string>
   <string name="title_setup_dark_theme">Dark theme</string>
   <string name="title_setup_debug">Debug</string>
-  <string name="title_name">Your name</string>
-  <string name="title_email">Your email address</string>
-  <string name="title_reply_to">Reply to address</string>
+  <string name="title_identity_name">Your name</string>
+  <string name="title_identity_email">Your email address</string>
+  <string name="title_identity_reply_to">Reply to address</string>
   <string name="title_optional">Optional</string>
   <string name="title_account_linked">Linked account</string>
   <string name="title_account_name">Account name</string>
@@ -111,6 +111,7 @@
   <string name="title_compose">Compose</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
+  <string name="title_reply_to">Reply to:</string>
   <string name="title_cc">CC:</string>
   <string name="title_bcc">BCC:</string>
   <string name="title_subject">Subject:</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f3ebe63761..4f7ab61e15 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -62,9 +62,9 @@
     <string name="title_setup_dark_theme">Dark theme</string>
     <string name="title_setup_debug">Debug</string>
 
-    <string name="title_name">Your name</string>
-    <string name="title_email">Your email address</string>
-    <string name="title_reply_to">Reply to address</string>
+    <string name="title_identity_name">Your name</string>
+    <string name="title_identity_email">Your email address</string>
+    <string name="title_identity_reply_to">Reply to address</string>
     <string name="title_optional">Optional</string>
     <string name="title_account_linked">Linked account</string>
     <string name="title_account_name">Account name</string>
@@ -138,6 +138,7 @@
     <string name="title_compose">Compose</string>
     <string name="title_from">From:</string>
     <string name="title_to">To:</string>
+    <string name="title_reply_to">Reply to:</string>
     <string name="title_cc">CC:</string>
     <string name="title_bcc">BCC:</string>
     <string name="title_subject">Subject:</string>