diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentity.java b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
index 063e52776d..e9bf84f201 100644
--- a/app/src/main/java/eu/faircode/email/FragmentIdentity.java
+++ b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
@@ -595,7 +595,7 @@ public class FragmentIdentity extends FragmentBase {
                 if (!should && TextUtils.isEmpty(email))
                     throw new IllegalArgumentException(context.getString(R.string.title_no_email));
                 if (!should && !Patterns.EMAIL_ADDRESS.matcher(email).matches())
-                    throw new IllegalArgumentException(context.getString(R.string.title_email_invalid));
+                    throw new IllegalArgumentException(context.getString(R.string.title_email_invalid, email));
                 if (!should && TextUtils.isEmpty(host))
                     throw new IllegalArgumentException(context.getString(R.string.title_no_host));
                 if (TextUtils.isEmpty(port))
@@ -605,6 +605,11 @@ public class FragmentIdentity extends FragmentBase {
                 if (!should && synchronize && TextUtils.isEmpty(password) && !insecure)
                     throw new IllegalArgumentException(context.getString(R.string.title_no_password));
 
+                if (!should && !TextUtils.isEmpty(replyto) && !Patterns.EMAIL_ADDRESS.matcher(replyto).matches())
+                    throw new IllegalArgumentException(context.getString(R.string.title_email_invalid, replyto));
+                if (!should && !TextUtils.isEmpty(bcc) && !Patterns.EMAIL_ADDRESS.matcher(bcc).matches())
+                    throw new IllegalArgumentException(context.getString(R.string.title_email_invalid, bcc));
+
                 if (TextUtils.isEmpty(display))
                     display = null;
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java b/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
index e3468af3c1..6a212408ce 100644
--- a/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
+++ b/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
@@ -232,7 +232,7 @@ public class FragmentQuickSetup extends FragmentBase {
                 if (TextUtils.isEmpty(email))
                     throw new IllegalArgumentException(context.getString(R.string.title_no_email));
                 if (!Patterns.EMAIL_ADDRESS.matcher(email).matches())
-                    throw new IllegalArgumentException(context.getString(R.string.title_email_invalid));
+                    throw new IllegalArgumentException(context.getString(R.string.title_email_invalid, email));
 
                 String[] dparts = email.split("@");
                 EmailProvider provider = EmailProvider.fromDomain(context, dparts[1], EmailProvider.Discover.ALL);
diff --git a/app/src/main/res/values-ar-rBH/strings.xml b/app/src/main/res/values-ar-rBH/strings.xml
index 3994e27b98..490b7ff7d5 100644
--- a/app/src/main/res/values-ar-rBH/strings.xml
+++ b/app/src/main/res/values-ar-rBH/strings.xml
@@ -157,7 +157,6 @@
     <string name="title_check">تحقق</string>
     <string name="title_no_name">الاسم مفقود</string>
     <string name="title_no_email">عنوان البريد الإلكتروني مفقود</string>
-    <string name="title_email_invalid">عنوان البريد الإلكتروني غير صالح</string>
     <string name="title_no_account">الحساب مفقود</string>
     <string name="title_no_host">اسم المضيف مفقود</string>
     <string name="title_no_user">اسم المستخدم مفقود</string>
diff --git a/app/src/main/res/values-ar-rEG/strings.xml b/app/src/main/res/values-ar-rEG/strings.xml
index 3994e27b98..490b7ff7d5 100644
--- a/app/src/main/res/values-ar-rEG/strings.xml
+++ b/app/src/main/res/values-ar-rEG/strings.xml
@@ -157,7 +157,6 @@
     <string name="title_check">تحقق</string>
     <string name="title_no_name">الاسم مفقود</string>
     <string name="title_no_email">عنوان البريد الإلكتروني مفقود</string>
-    <string name="title_email_invalid">عنوان البريد الإلكتروني غير صالح</string>
     <string name="title_no_account">الحساب مفقود</string>
     <string name="title_no_host">اسم المضيف مفقود</string>
     <string name="title_no_user">اسم المستخدم مفقود</string>
diff --git a/app/src/main/res/values-ar-rSA/strings.xml b/app/src/main/res/values-ar-rSA/strings.xml
index 3994e27b98..490b7ff7d5 100644
--- a/app/src/main/res/values-ar-rSA/strings.xml
+++ b/app/src/main/res/values-ar-rSA/strings.xml
@@ -157,7 +157,6 @@
     <string name="title_check">تحقق</string>
     <string name="title_no_name">الاسم مفقود</string>
     <string name="title_no_email">عنوان البريد الإلكتروني مفقود</string>
-    <string name="title_email_invalid">عنوان البريد الإلكتروني غير صالح</string>
     <string name="title_no_account">الحساب مفقود</string>
     <string name="title_no_host">اسم المضيف مفقود</string>
     <string name="title_no_user">اسم المستخدم مفقود</string>
diff --git a/app/src/main/res/values-ar-rYE/strings.xml b/app/src/main/res/values-ar-rYE/strings.xml
index 3994e27b98..490b7ff7d5 100644
--- a/app/src/main/res/values-ar-rYE/strings.xml
+++ b/app/src/main/res/values-ar-rYE/strings.xml
@@ -157,7 +157,6 @@
     <string name="title_check">تحقق</string>
     <string name="title_no_name">الاسم مفقود</string>
     <string name="title_no_email">عنوان البريد الإلكتروني مفقود</string>
-    <string name="title_email_invalid">عنوان البريد الإلكتروني غير صالح</string>
     <string name="title_no_account">الحساب مفقود</string>
     <string name="title_no_host">اسم المضيف مفقود</string>
     <string name="title_no_user">اسم المستخدم مفقود</string>
diff --git a/app/src/main/res/values-az-rAZ/strings.xml b/app/src/main/res/values-az-rAZ/strings.xml
index cdbfd66c2e..1865a7c3de 100644
--- a/app/src/main/res/values-az-rAZ/strings.xml
+++ b/app/src/main/res/values-az-rAZ/strings.xml
@@ -208,7 +208,6 @@
     <string name="title_check">Yoxla</string>
     <string name="title_no_name">Ad əskikdir</string>
     <string name="title_no_email">E-poçt ünvanı əskikdir</string>
-    <string name="title_email_invalid">E-poçt ünvanı yalnışdır</string>
     <string name="title_no_account">Hesab əskikdir</string>
     <string name="title_no_host">Host adı əskikdir</string>
     <string name="title_no_user">İstifadəçi adı əskikdir</string>
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index 194eb1ac7a..28020c5759 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -174,6 +174,7 @@
     <string name="title_setup_light_theme">Světlý motiv</string>
     <string name="title_setup_dark_theme">Tmavý motiv</string>
     <string name="title_setup_black_theme">Černý motiv</string>
+    <string name="title_setup_grey_theme">Šedý motiv</string>
     <string name="title_setup_system_theme">Motiv systému</string>
     <string name="title_setup_advanced">Pokročilé</string>
     <string name="title_setup_options">Možnosti</string>
@@ -347,7 +348,6 @@
     <string name="title_check">Ověřit</string>
     <string name="title_no_name">Chybí jméno</string>
     <string name="title_no_email">Chybí e-mailová adresa</string>
-    <string name="title_email_invalid">E-mailová adresa je neplatná</string>
     <string name="title_address_parse_error">Adresa \"%1$s\" neplatná: %2$s</string>
     <string name="title_no_account">Chybí účet</string>
     <string name="title_no_host">Chybí název hostitele</string>
@@ -674,6 +674,7 @@
     <string name="title_legend_expander">Rozbalit</string>
     <string name="title_legend_avatar">Avatar</string>
     <string name="title_legend_show_quotes">Zobraz citace</string>
+    <string name="title_legend_show_unsubscribe">Ukončit odebírání kanálu</string>
     <string name="title_legend_show_images">Zobraz obrázky</string>
     <string name="title_legend_show_full">Zobraz na celou obrazovku</string>
     <string name="title_legend_edit">Upravit</string>
diff --git a/app/src/main/res/values-da-rDK/strings.xml b/app/src/main/res/values-da-rDK/strings.xml
index c99d98e5be..d552e3db67 100644
--- a/app/src/main/res/values-da-rDK/strings.xml
+++ b/app/src/main/res/values-da-rDK/strings.xml
@@ -324,7 +324,6 @@
     <string name="title_check">Tjek</string>
     <string name="title_no_name">Navn mangler</string>
     <string name="title_no_email">E-mailadresse mangler</string>
-    <string name="title_email_invalid">Ugyldig e-mailadresse</string>
     <string name="title_address_parse_error">Ugyldig \'%1$s\'-adresse: %2$s</string>
     <string name="title_no_account">Konto mangler</string>
     <string name="title_no_host">Værtsnavn mangler</string>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index ffb2c2ae57..0572e3fb94 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -151,6 +151,7 @@ Konten und Identitäten (Aliase) können bei Bedarf auch manuell eingerichtet we
     <string name="title_setup_light_theme">Helles Design</string>
     <string name="title_setup_dark_theme">Dunkles Design</string>
     <string name="title_setup_black_theme">Schwarzes Design</string>
+    <string name="title_setup_grey_theme">Graues Thema</string>
     <string name="title_setup_system_theme">System Design</string>
     <string name="title_setup_advanced">Erweitert</string>
     <string name="title_setup_options">Optionen</string>
@@ -324,7 +325,6 @@ Konten und Identitäten (Aliase) können bei Bedarf auch manuell eingerichtet we
     <string name="title_check">Prüfen</string>
     <string name="title_no_name">Name fehlt</string>
     <string name="title_no_email">E-Mail-Adresse fehlt</string>
-    <string name="title_email_invalid">E-Mail-Adresse ungültig</string>
     <string name="title_address_parse_error">Adresse \'%1$s\' ungültig: %2$s</string>
     <string name="title_no_account">Konto fehlt</string>
     <string name="title_no_host">Hostname fehlt</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index ed9ed73cc0..a9483cb6a7 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -325,7 +325,6 @@
     <string name="title_check">Verificar</string>
     <string name="title_no_name">Falta nombre</string>
     <string name="title_no_email">Falta dirección de correo electrónico</string>
-    <string name="title_email_invalid">Dirección de correo electrónico inválida</string>
     <string name="title_address_parse_error">Dirección \'%1$s\' inválida: %2$s</string>
     <string name="title_no_account">Falta cuenta</string>
     <string name="title_no_host">Falta nombre de host</string>
diff --git a/app/src/main/res/values-fa-rIR/strings.xml b/app/src/main/res/values-fa-rIR/strings.xml
index b3ddc84168..b3f93f9eb6 100644
--- a/app/src/main/res/values-fa-rIR/strings.xml
+++ b/app/src/main/res/values-fa-rIR/strings.xml
@@ -138,7 +138,6 @@
     <string name="title_check">بررسی</string>
     <string name="title_no_name">نام وجود ندارد</string>
     <string name="title_no_email">ایمیل آدرس وجود ندارد</string>
-    <string name="title_email_invalid">آدرس ایمیل نامعتبر است</string>
     <string name="title_no_account">حساب وجود ندارد</string>
     <string name="title_no_host">نام میزبان وجود ندارد</string>
     <string name="title_no_user">نام کاربری وجود ندارد</string>
diff --git a/app/src/main/res/values-fi-rFI/strings.xml b/app/src/main/res/values-fi-rFI/strings.xml
index a7ca08780a..7a777ff90e 100644
--- a/app/src/main/res/values-fi-rFI/strings.xml
+++ b/app/src/main/res/values-fi-rFI/strings.xml
@@ -152,6 +152,7 @@
     <string name="title_setup_light_theme">Vaalea teema</string>
     <string name="title_setup_dark_theme">Tumma teema</string>
     <string name="title_setup_black_theme">Musta teema</string>
+    <string name="title_setup_grey_theme">Harmaa teema</string>
     <string name="title_setup_system_theme">Järjestelmän teema</string>
     <string name="title_setup_advanced">Lisäasetukset</string>
     <string name="title_setup_options">Asetukset</string>
@@ -325,7 +326,6 @@
     <string name="title_check">Tarkista</string>
     <string name="title_no_name">Nimi puuttuu</string>
     <string name="title_no_email">Sähköpostiosoite puuttuu</string>
-    <string name="title_email_invalid">Virheellinen sähköpostiosoite</string>
     <string name="title_address_parse_error">Osoite \'%1$s\' virheellinen: %2$s</string>
     <string name="title_no_account">Tili puuttuu</string>
     <string name="title_no_host">Verkko-osoite puuttuu</string>
@@ -652,6 +652,7 @@
     <string name="title_legend_expander">Laajennin</string>
     <string name="title_legend_avatar">Hahmo</string>
     <string name="title_legend_show_quotes">Näytä lainaukset</string>
+    <string name="title_legend_show_unsubscribe">Peruuta listan tilaus</string>
     <string name="title_legend_show_images">Näytä kuvat</string>
     <string name="title_legend_show_full">Näytä koko näytöllä</string>
     <string name="title_legend_edit">Muokkaa</string>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index 1a4e547733..ad3dfc40ad 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -152,6 +152,7 @@
     <string name="title_setup_light_theme">Thème clair</string>
     <string name="title_setup_dark_theme">Thème sombre</string>
     <string name="title_setup_black_theme">Thème noir</string>
+    <string name="title_setup_grey_theme">Thème gris</string>
     <string name="title_setup_system_theme">Thème système</string>
     <string name="title_setup_advanced">Avancé</string>
     <string name="title_setup_options">Options</string>
@@ -325,7 +326,6 @@
     <string name="title_check">Vérifier</string>
     <string name="title_no_name">Nom manquant</string>
     <string name="title_no_email">Adresse e-mail manquante</string>
-    <string name="title_email_invalid">Adresse e-mail invalide</string>
     <string name="title_address_parse_error">Adresse \'%1$s\' invalide : %2$s</string>
     <string name="title_no_account">Compte manquant</string>
     <string name="title_no_host">Nom d\'hôte manquant</string>
diff --git a/app/src/main/res/values-hr-rHR/strings.xml b/app/src/main/res/values-hr-rHR/strings.xml
index 0a47ea1de6..2f9c931fbd 100644
--- a/app/src/main/res/values-hr-rHR/strings.xml
+++ b/app/src/main/res/values-hr-rHR/strings.xml
@@ -335,7 +335,6 @@ Ako je potrebno, računi i identiteti (aliasi) mogu se postaviti i ručno.    </
     <string name="title_check">Provjeri</string>
     <string name="title_no_name">Nedostaje ime</string>
     <string name="title_no_email">Adresa e-pošte nedostaje</string>
-    <string name="title_email_invalid">Adresa e-pošte nije valjana</string>
     <string name="title_address_parse_error">Adresa \'%1$s\' je nevažeća: %2$s</string>
     <string name="title_no_account">Nedostaje račun</string>
     <string name="title_no_host">Nedostaje naziv hosta</string>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index 0dd242d732..6fc02427bd 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -151,6 +151,7 @@
     <string name="title_setup_light_theme">Tema chiaro</string>
     <string name="title_setup_dark_theme">Tema scuro</string>
     <string name="title_setup_black_theme">Tema nero</string>
+    <string name="title_setup_grey_theme">Tema grigio</string>
     <string name="title_setup_system_theme">Tema di sistema</string>
     <string name="title_setup_advanced">Avanzate</string>
     <string name="title_setup_options">Opzioni</string>
@@ -324,7 +325,6 @@
     <string name="title_check">Controlla</string>
     <string name="title_no_name">Nome mancante</string>
     <string name="title_no_email">Indirizzo email mancante</string>
-    <string name="title_email_invalid">Indirizzo email non valido</string>
     <string name="title_address_parse_error">Indirizzo \'%1$s\' non valido: %2$s</string>
     <string name="title_no_account">Account mancante</string>
     <string name="title_no_host">Nome dell\'host mancante</string>
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index d54e37605e..d18c19e427 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -152,6 +152,7 @@
     <string name="title_setup_light_theme">Licht thema</string>
     <string name="title_setup_dark_theme">Donker thema</string>
     <string name="title_setup_black_theme">Zwart thema</string>
+    <string name="title_setup_grey_theme">Grijs thema</string>
     <string name="title_setup_system_theme">Systeem thema</string>
     <string name="title_setup_advanced">Geavanceerd</string>
     <string name="title_setup_options">Opties</string>
@@ -325,7 +326,7 @@
     <string name="title_check">Controleer</string>
     <string name="title_no_name">Naam ontbreekt</string>
     <string name="title_no_email">Email adres ontbreekt</string>
-    <string name="title_email_invalid">E-mail adres ongeldig</string>
+    <string name="title_email_invalid">E-mailadres ongeldig: \'%1$s\'</string>
     <string name="title_address_parse_error">Adres \'%1$s\' ongeldig: %2$s</string>
     <string name="title_no_account">Account ontbreekt</string>
     <string name="title_no_host">Hostnaam ontbreekt</string>
diff --git a/app/src/main/res/values-nn-rNO/strings.xml b/app/src/main/res/values-nn-rNO/strings.xml
index d8b1fa41ba..43777e2cfb 100644
--- a/app/src/main/res/values-nn-rNO/strings.xml
+++ b/app/src/main/res/values-nn-rNO/strings.xml
@@ -152,6 +152,7 @@
     <string name="title_setup_light_theme">Lyst tema</string>
     <string name="title_setup_dark_theme">Mørkt tema</string>
     <string name="title_setup_black_theme">Svart tema</string>
+    <string name="title_setup_grey_theme">Grått tema</string>
     <string name="title_setup_system_theme">System tema</string>
     <string name="title_setup_advanced">Avansert</string>
     <string name="title_setup_options">Alternativer</string>
@@ -325,7 +326,6 @@
     <string name="title_check">Sjekk</string>
     <string name="title_no_name">Navn mangler</string>
     <string name="title_no_email">E-post adressen mangler</string>
-    <string name="title_email_invalid">E-post adressen er ugyldig</string>
     <string name="title_address_parse_error">Adresse \'%1$s\' ugyldig: %2$s</string>
     <string name="title_no_account">Konto mangler</string>
     <string name="title_no_host">Vertsnavn mangler</string>
diff --git a/app/src/main/res/values-no-rNO/strings.xml b/app/src/main/res/values-no-rNO/strings.xml
index d8b1fa41ba..43777e2cfb 100644
--- a/app/src/main/res/values-no-rNO/strings.xml
+++ b/app/src/main/res/values-no-rNO/strings.xml
@@ -152,6 +152,7 @@
     <string name="title_setup_light_theme">Lyst tema</string>
     <string name="title_setup_dark_theme">Mørkt tema</string>
     <string name="title_setup_black_theme">Svart tema</string>
+    <string name="title_setup_grey_theme">Grått tema</string>
     <string name="title_setup_system_theme">System tema</string>
     <string name="title_setup_advanced">Avansert</string>
     <string name="title_setup_options">Alternativer</string>
@@ -325,7 +326,6 @@
     <string name="title_check">Sjekk</string>
     <string name="title_no_name">Navn mangler</string>
     <string name="title_no_email">E-post adressen mangler</string>
-    <string name="title_email_invalid">E-post adressen er ugyldig</string>
     <string name="title_address_parse_error">Adresse \'%1$s\' ugyldig: %2$s</string>
     <string name="title_no_account">Konto mangler</string>
     <string name="title_no_host">Vertsnavn mangler</string>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index a4831d799c..a7f880fd70 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -347,7 +347,6 @@
     <string name="title_check">Sprawdź</string>
     <string name="title_no_name">Brak nazwy</string>
     <string name="title_no_email">Brak adresu e-mail</string>
-    <string name="title_email_invalid">Błędny adres e-mail</string>
     <string name="title_address_parse_error">Adres \'%1$s\' nieprawidłowy: %2$s</string>
     <string name="title_no_account">Brak konta</string>
     <string name="title_no_host">Brak nazwy hosta</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index eea8c23e03..d248c9bc1b 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -320,7 +320,6 @@
     <string name="title_check">Verificar</string>
     <string name="title_no_name">Nome ausente</string>
     <string name="title_no_email">Endereço de e-mail ausente</string>
-    <string name="title_email_invalid">Endereço de e-mail inválido</string>
     <string name="title_address_parse_error">Endereço \'%1$s\' inválido: %2$s</string>
     <string name="title_no_account">Conta ausente</string>
     <string name="title_no_host">Nome do servidor faltante</string>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index 02fcc62329..2d91f7aead 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -336,7 +336,6 @@
     <string name="title_check">Verificare</string>
     <string name="title_no_name">Lipsește numele</string>
     <string name="title_no_email">Lipsește adresa de e-mail</string>
-    <string name="title_email_invalid">Adresa de e-mail nu este validă</string>
     <string name="title_address_parse_error">Adresa \'%1$s\' este invalidă: %2$s</string>
     <string name="title_no_account">Lipsește contul</string>
     <string name="title_no_host">Lipsește numele serverului</string>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 1114fccb31..9e1f78f517 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -347,7 +347,6 @@
     <string name="title_check">Проверить</string>
     <string name="title_no_name">Отсутствует имя</string>
     <string name="title_no_email">Адрес электронной почты отсутствует</string>
-    <string name="title_email_invalid">Некорректный адрес электронной почты</string>
     <string name="title_address_parse_error">Адрес \'%1$s\' неверный: %2$s</string>
     <string name="title_no_account">Учетная запись отсутствует</string>
     <string name="title_no_host">Отсутствует имя хоста</string>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index 5da1031893..bceaa7068e 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -325,7 +325,6 @@
     <string name="title_check">Kontrollera</string>
     <string name="title_no_name">Namn saknas</string>
     <string name="title_no_email">E-postadressen saknas</string>
-    <string name="title_email_invalid">Ogiltig e-postadress</string>
     <string name="title_address_parse_error">Adress \"%1$s\" ogiltig: %2$s</string>
     <string name="title_no_account">Konto saknas</string>
     <string name="title_no_host">Värdnamn saknas</string>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index bddfa1f785..873fbe3e83 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -315,7 +315,6 @@
     <string name="title_check">Kontrol et</string>
     <string name="title_no_name">İsim eksik</string>
     <string name="title_no_email">E-posta adresi eksik</string>
-    <string name="title_email_invalid">E-posta adresi geçersiz</string>
     <string name="title_address_parse_error">%1$s adresi geçersiz: %2$s</string>
     <string name="title_no_account">Hesap bilgisi eksik</string>
     <string name="title_no_host">Sunucu adı eksik</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index ce7de6e089..bdd34fbf04 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -140,6 +140,7 @@
     <string name="title_setup_light_theme">亮色主题</string>
     <string name="title_setup_dark_theme">暗色主题</string>
     <string name="title_setup_black_theme">黑色主题</string>
+    <string name="title_setup_grey_theme">灰色主题</string>
     <string name="title_setup_system_theme">系统主题</string>
     <string name="title_setup_advanced">高级选项</string>
     <string name="title_setup_options">选项</string>
@@ -313,7 +314,6 @@
     <string name="title_check">检查</string>
     <string name="title_no_name">缺少名称</string>
     <string name="title_no_email">缺少邮箱地址</string>
-    <string name="title_email_invalid">邮件地址无效</string>
     <string name="title_address_parse_error">地址 \'%1$s\' 无效: %2$s</string>
     <string name="title_no_account">缺少账户</string>
     <string name="title_no_host">缺少主机名称</string>
@@ -640,6 +640,7 @@
     <string name="title_legend_expander">已展开</string>
     <string name="title_legend_avatar">头像</string>
     <string name="title_legend_show_quotes">显示引用内容</string>
+    <string name="title_legend_show_unsubscribe">取消订阅</string>
     <string name="title_legend_show_images">显示图片</string>
     <string name="title_legend_show_full">全屏显示</string>
     <string name="title_legend_edit">编辑</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bf937ef053..02acf62cd2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -384,7 +384,7 @@
     <string name="title_check">Check</string>
     <string name="title_no_name">Name missing</string>
     <string name="title_no_email">Email address missing</string>
-    <string name="title_email_invalid">Email address invalid</string>
+    <string name="title_email_invalid">Email address invalid: \'%1$s\'</string>
     <string name="title_address_parse_error">Address \'%1$s\' invalid: %2$s</string>
     <string name="title_no_account">Account missing</string>
     <string name="title_no_host">Host name missing</string>