diff --git a/app/src/main/res/values-ar-rBH/strings.xml b/app/src/main/res/values-ar-rBH/strings.xml
index 897ad92a08..2feb524253 100644
--- a/app/src/main/res/values-ar-rBH/strings.xml
+++ b/app/src/main/res/values-ar-rBH/strings.xml
@@ -5,7 +5,6 @@
     <string name="app_welcome">FairEmail تطبيق مفتوح المصدر للبريد الإلكتروني يُركّز على الخصوصية والأمان. ولهذا السبب قد تعمل بعض الميزات بشكل مختلف مما كنت مُعتادًا عليه.</string>
     <string name="app_crash">فيرميل ليس مدعومًا على هذا الجهاز لأن أخطاء في نظام الأندرويد تسبب تعطّلات</string>
     <string name="app_exit">اذهب إلى \"الوراء\" مجددًا للإغلاق</string>
-    <string name="channel_service">الخدمة</string>
     <string name="channel_send">أرسل</string>
     <string name="channel_notification">الاشعارات</string>
     <string name="channel_update">التحديثات</string>
diff --git a/app/src/main/res/values-ar-rEG/strings.xml b/app/src/main/res/values-ar-rEG/strings.xml
index 897ad92a08..2feb524253 100644
--- a/app/src/main/res/values-ar-rEG/strings.xml
+++ b/app/src/main/res/values-ar-rEG/strings.xml
@@ -5,7 +5,6 @@
     <string name="app_welcome">FairEmail تطبيق مفتوح المصدر للبريد الإلكتروني يُركّز على الخصوصية والأمان. ولهذا السبب قد تعمل بعض الميزات بشكل مختلف مما كنت مُعتادًا عليه.</string>
     <string name="app_crash">فيرميل ليس مدعومًا على هذا الجهاز لأن أخطاء في نظام الأندرويد تسبب تعطّلات</string>
     <string name="app_exit">اذهب إلى \"الوراء\" مجددًا للإغلاق</string>
-    <string name="channel_service">الخدمة</string>
     <string name="channel_send">أرسل</string>
     <string name="channel_notification">الاشعارات</string>
     <string name="channel_update">التحديثات</string>
diff --git a/app/src/main/res/values-ar-rYE/strings.xml b/app/src/main/res/values-ar-rYE/strings.xml
index 2cebf8885d..6140dd73c1 100644
--- a/app/src/main/res/values-ar-rYE/strings.xml
+++ b/app/src/main/res/values-ar-rYE/strings.xml
@@ -6,7 +6,6 @@
     <string name="app_limitations">على سبيل المثال ، ستتم إعادة تنسيق الرسائل دائمًا لإزالة العناصر غير الآمنة ولتحسين قابلية القراءة ويجب تأكيد فتح الروابط من أجل الأمان.</string>
     <string name="app_crash">فيرميل غير متوافق مع هذا الجهاز وقد تتسبب الأخطاء في حدوث أعطال</string>
     <string name="app_exit">أنقر مرة أخرى للخروج من التطبيق</string>
-    <string name="channel_service">الخدمة</string>
     <string name="channel_send">أرسل</string>
     <string name="channel_notification">الاشعارات</string>
     <string name="channel_update">التحديثات</string>
diff --git a/app/src/main/res/values-az-rAZ/strings.xml b/app/src/main/res/values-az-rAZ/strings.xml
index f04eebc58f..f05b88a631 100644
--- a/app/src/main/res/values-az-rAZ/strings.xml
+++ b/app/src/main/res/values-az-rAZ/strings.xml
@@ -3,7 +3,6 @@
     <string name="app_search">FairEmail axtarışı</string>
     <string name="app_changelog">Dəyişiklik jurnalı</string>
     <string name="app_welcome">FairEmail, gizlilik və təhlükəsizliyə fokuslanmış bir açıq mənbə e-poçt tətbiqidir. Buna görə də bəzi xüsusiyyətlər, istifadə etdiyinizdən fərqli şəkildə işləyə bilər.</string>
-    <string name="channel_service">Xidmət</string>
     <string name="channel_send">Göndər</string>
     <string name="channel_notification">Bildirişlər</string>
     <string name="channel_update">Yenilənmələr</string>
diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
index 85898efd9f..5ed684f939 100644
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -6,7 +6,6 @@
     <string name="app_limitations">Например, съобщенията винаги ще се преформатират, за да се премахнат опасни елементи и да се подобри четенето, както и връзките за отваряне трябва да бъдат потвърдени за безопасност.</string>
     <string name="app_crash">FairEmail не се поддържа на това устройство поради срив, причинен от грешка в Android</string>
     <string name="app_exit">Натиснете отново \"назад\", за изход</string>
-    <string name="channel_service">Услуга</string>
     <string name="channel_send">Изпращане</string>
     <string name="channel_notification">Известия</string>
     <string name="channel_update">Обновявания</string>
@@ -258,7 +257,6 @@
     <string name="title_advanced_rlah">Роуминг като у дома</string>
     <string name="title_advanced_timeout">Време на изчакване на връзката (секунди)</string>
     <string name="title_advanced_ssl_harden">Твърди SSL връзки</string>
-    <string name="title_advanced_socks">Използване на SOCKS прокси</string>
     <string name="title_advanced_manage_connectivity">Управление на свързаност</string>
     <string name="title_advanced_caption_general">Общи</string>
     <string name="title_advanced_caption_list">Списък</string>
@@ -295,6 +293,7 @@
     <string name="title_advanced_subject_italic">Покажи темата наклонена</string>
     <string name="title_advanced_subject_elipsed">При нужда, съкрати темата</string>
     <string name="title_advanced_keywords">Показване на ключови думи в заглавката на съобщението</string>
+    <string name="title_advanced_labels">Показване на етикетите на Gmail в заглавката на съобщението</string>
     <string name="title_advanced_flags">Показване на звездите</string>
     <string name="title_advanced_flags_background">Покажи цветен фон вместо цветни звезди</string>
     <string name="title_advanced_preview">Покажи преглед на съобщението</string>
@@ -423,7 +422,6 @@
     <string name="title_advanced_rlah_hint">Ако не се допуска роуминг в рамките на ЕС</string>
     <string name="title_advanced_timeout_hint">Времето за четене/запис ще бъде зададено двойно на времето за изчакване на връзката. По-високите стойности ще доведат до по-голяма консумация на батерията.</string>
     <string name="title_advanced_ssl_harden_hint">Активирането на това ще деактивира слаби SSL протоколи и шифри, което може да доведе до проблеми с връзката</string>
-    <string name="title_advanced_socks_hint">Използването на отдалечен прокси сървър е несигурно, тъй като прокси връзките не са криптирани</string>
     <string name="title_advanced_roaming_hint">Заглавките на съобщенията винаги ще се получават при роуминг. Можете да използвате настройката за роуминг на устройството, за да деактивирате интернет по време на роуминг.</string>
     <string name="title_advanced_browse_hint">Вземете още съобщения, когато превъртате надолу</string>
     <string name="title_advanced_layout_hint">Преминаване към по-компактно оформление и промяната на размера на текста на съобщение може да се извърши в менюто на горния панел за действие в изглед на съобщението</string>
@@ -647,6 +645,7 @@
     <string name="title_raw_save">Запиши необработено съобщение</string>
     <string name="title_raw_send">Изпращане като прикачен файл</string>
     <string name="title_manage_keywords">Управление по ключови думи</string>
+    <string name="title_manage_labels">Управлявайте етикетите на Gmail</string>
     <string name="title_add_keyword">Добавяне на ключова дума</string>
     <string name="title_show_inline">Показване на вградените прикачени файлове</string>
     <string name="title_download_all">Изтегляне на всичко</string>
@@ -1109,7 +1108,6 @@
     <string name="title_dismiss">Отхвърли</string>
     <string name="title_snooze_now">Отложи</string>
     <string name="title_loading">Зареждане &#8230;</string>
-    <string name="title_set">Задай</string>
     <string name="title_fetching_again">Извличане на съобщението от сървъра отново</string>
     <string name="title_conversation_actions">Действия</string>
     <string name="title_conversation_action_reply">Отговорете с: \'%1$s\'</string>
diff --git a/app/src/main/res/values-bn-rBD/strings.xml b/app/src/main/res/values-bn-rBD/strings.xml
index e7a9d4418e..d9d977fca9 100644
--- a/app/src/main/res/values-bn-rBD/strings.xml
+++ b/app/src/main/res/values-bn-rBD/strings.xml
@@ -6,7 +6,6 @@
     <string name="app_limitations">উদাহরণস্বরূপ, অনিরাপদ অংশ অপসারণ করতে এবং পাঠযোগ্যতা উন্নত করতে এবং লিঙ্কগুলি নিশ্চিতকরণ করার বার্তাগুলি সর্বদা প্রদর্শিত হবে।</string>
     <string name="app_crash">ফেয়ার ইমেইল এই ডিভাইসে সমর্থিত নয় কারণ এই অ্যান্ড্রয়েডের বাগগুলি ক্রাশ হওয়ার কারণ</string>
     <string name="app_exit">বের হওয়ার জন্য \'ব্যাক\' করুন</string>
-    <string name="channel_service">সেবা</string>
     <string name="channel_send">পাঠান</string>
     <string name="channel_notification">বিজ্ঞপ্তি</string>
     <string name="channel_update">আপডেট</string>
diff --git a/app/src/main/res/values-bn-rIN/strings.xml b/app/src/main/res/values-bn-rIN/strings.xml
index e7a9d4418e..d9d977fca9 100644
--- a/app/src/main/res/values-bn-rIN/strings.xml
+++ b/app/src/main/res/values-bn-rIN/strings.xml
@@ -6,7 +6,6 @@
     <string name="app_limitations">উদাহরণস্বরূপ, অনিরাপদ অংশ অপসারণ করতে এবং পাঠযোগ্যতা উন্নত করতে এবং লিঙ্কগুলি নিশ্চিতকরণ করার বার্তাগুলি সর্বদা প্রদর্শিত হবে।</string>
     <string name="app_crash">ফেয়ার ইমেইল এই ডিভাইসে সমর্থিত নয় কারণ এই অ্যান্ড্রয়েডের বাগগুলি ক্রাশ হওয়ার কারণ</string>
     <string name="app_exit">বের হওয়ার জন্য \'ব্যাক\' করুন</string>
-    <string name="channel_service">সেবা</string>
     <string name="channel_send">পাঠান</string>
     <string name="channel_notification">বিজ্ঞপ্তি</string>
     <string name="channel_update">আপডেট</string>
diff --git a/app/src/main/res/values-ca-rES/strings.xml b/app/src/main/res/values-ca-rES/strings.xml
index cd17b84678..f3e023f89e 100644
--- a/app/src/main/res/values-ca-rES/strings.xml
+++ b/app/src/main/res/values-ca-rES/strings.xml
@@ -6,7 +6,6 @@
     <string name="app_limitations">Per exemple, els missatges sempre es reformataran per eliminar elements no segurs i per millorar la llegibilitat i s\'hauran de confirmar l’obertura d’enllaços per afegir seguretat.</string>
     <string name="app_crash">FairMail no és compatible en aquest dispositiu perquè els errors a Android causen bloqueigs</string>
     <string name="app_exit">Premeu «Enrere» novament per sortir</string>
-    <string name="channel_service">Servei</string>
     <string name="channel_send">Enviar</string>
     <string name="channel_notification">Notificacions</string>
     <string name="channel_update">Actualitzacions</string>
@@ -253,7 +252,6 @@ La creació i l\'ús de regles és una característica professional.    </string
     <string name="title_advanced_rlah">Itinerant com a casa</string>
     <string name="title_advanced_timeout">Temps d\'espera de la connexió (segons)</string>
     <string name="title_advanced_ssl_harden">Connexions SSL \"endurides\"</string>
-    <string name="title_advanced_socks">Utilitza el servidor intermediari com a SOCKS</string>
     <string name="title_advanced_manage_connectivity">Gestiona la connectivitat</string>
     <string name="title_advanced_caption_general">General</string>
     <string name="title_advanced_caption_list">Llista</string>
@@ -414,7 +412,6 @@ La creació i l\'ús de regles és una característica professional.    </string
     <string name="title_advanced_rlah_hint">Si no se suposa una itinerància a la UE</string>
     <string name="title_advanced_timeout_hint">El temps d\'espera de lectura/escriptura s\'establirà en el doble del temps d\'espera de la connexió. Valors més alts produiran un major ús de bateries.</string>
     <string name="title_advanced_ssl_harden_hint">Si activeu això, desactivareu els protocols i xifratges SSL febles, la qual cosa pot comportar problemes de connexió</string>
-    <string name="title_advanced_socks_hint">L\'ús del Servidor intermediari remot es insegur perquè les connexions del Servidor intermediari no son xifrades</string>
     <string name="title_advanced_roaming_hint">Les capçaleres de missatges sempre es recuperaran en itinerància. Podeu utilitzar la configuració d\'itinerància del dispositiu per desactivar Internet durant la itinerància de dades.</string>
     <string name="title_advanced_browse_hint">Obteniu més missatges en desplaçar-vos cap avall</string>
     <string name="title_advanced_layout_hint">Podeu canviar a un disseny més compacte i canviar la mida del text del missatge al menú de la barra d’acció superior de la vista de missatges</string>
@@ -1072,7 +1069,6 @@ La creació i l\'ús de regles és una característica professional.    </string
     <string name="title_dismiss">Descartar</string>
     <string name="title_snooze_now">Posposa</string>
     <string name="title_loading">S\'està carregant&#8230;</string>
-    <string name="title_set">Estableix</string>
     <string name="title_conversation_action_reply">Respon amb \'%1$s\'</string>
     <string name="title_conversation_action_copy">Copia: \'%1$s\'</string>
     <string name="title_icalendar_accept">Acceptar</string>
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index e0adefc9ad..7b122f2ed1 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -6,7 +6,6 @@
     <string name="app_limitations">Například, zprávy budou vždy přeformátovány pro odstranění prvků které nejsou bezpečné a zároveň pro zlepšení čitelnosti, a otevření odkazů je nutné z důvodu bezpečnosti potvrdit.</string>
     <string name="app_crash">FairEmail není na tomto zařízení podporován, protože chyby v Androidu způsobují jeho pády</string>
     <string name="app_exit">Znovu \"zpět\" pro ukončení</string>
-    <string name="channel_service">Služba</string>
     <string name="channel_send">Odesílání</string>
     <string name="channel_notification">Oznámení</string>
     <string name="channel_update">Aktualizace</string>
@@ -280,7 +279,6 @@
     <string name="title_advanced_rlah">Roaming jako doma (RLAH)</string>
     <string name="title_advanced_timeout">Časový limit připojení (sekundy)</string>
     <string name="title_advanced_ssl_harden">Obrnit SSL připojení</string>
-    <string name="title_advanced_socks">Použít SOCKS proxy</string>
     <string name="title_advanced_manage_connectivity">Spravovat připojení</string>
     <string name="title_advanced_caption_general">Obecné</string>
     <string name="title_advanced_caption_list">Seznam</string>
@@ -317,6 +315,7 @@
     <string name="title_advanced_subject_italic">Zobrazit předmět kurzívou</string>
     <string name="title_advanced_subject_elipsed">Zestručnit předmět v případě potřeby</string>
     <string name="title_advanced_keywords">Zobrazit klíčová slova v hlavičce zprávy</string>
+    <string name="title_advanced_labels">Zobrazit Gmail štítky v hlavičce zprávy</string>
     <string name="title_advanced_flags">Zobrazit hvězdičky</string>
     <string name="title_advanced_flags_background">Obarvit pozadí, namísto barevných hvězdiček</string>
     <string name="title_advanced_preview">Zobrazit náhled zprávy</string>
@@ -446,7 +445,6 @@
     <string name="title_advanced_rlah_hint">Nepředpokládat žádný roaming v rámci EU</string>
     <string name="title_advanced_timeout_hint">Časový limit čtení/zápisu bude nastaven na dvojnásobek časového limitu připojení. Vyšší hodnoty povedou k větší spotřebě baterie.</string>
     <string name="title_advanced_ssl_harden_hint">Povolení této volby zakáže slabé SSL protokoly a šifry, což může vést k problémům s připojením</string>
-    <string name="title_advanced_socks_hint">Použití vzdáleného proxy serveru není bezpečné, neboť proxy spojení nejsou šifrována</string>
     <string name="title_advanced_roaming_hint">Hlavičky zpráv budou během roamingu stahovány vždy. Použijte nastavení svého zařízení pro zakázání internetu při roamingu.</string>
     <string name="title_advanced_browse_hint">Načte další zprávy při posouvání dolů</string>
     <string name="title_advanced_layout_hint">Přepnutí na kompaktnější rozvržení a změnu velikosti textu lze provést v zobrazení zprávy skrze menu v horním panelu akcí</string>
@@ -670,6 +668,7 @@
     <string name="title_raw_save">Uložit zdrojovou zprávu</string>
     <string name="title_raw_send">Odeslat jako přílohu</string>
     <string name="title_manage_keywords">Spravovat klíčová slova</string>
+    <string name="title_manage_labels">Spravovat Gmail štítky</string>
     <string name="title_add_keyword">Přidat klíčové slovo</string>
     <string name="title_show_inline">Zobrazit vložené přílohy</string>
     <string name="title_download_all">Stáhnout vše</string>
@@ -1132,7 +1131,6 @@
     <string name="title_dismiss">Zavřít</string>
     <string name="title_snooze_now">Odložit</string>
     <string name="title_loading">Načítání &#8230;</string>
-    <string name="title_set">Nastavit</string>
     <string name="title_fetching_again">Opětovné získávání zprávy ze serveru</string>
     <string name="title_conversation_actions">Akce</string>
     <string name="title_conversation_action_reply">Odpovědět s: \'%1$s\'</string>
diff --git a/app/src/main/res/values-da-rDK/strings.xml b/app/src/main/res/values-da-rDK/strings.xml
index 86963d5dff..9553d8615c 100644
--- a/app/src/main/res/values-da-rDK/strings.xml
+++ b/app/src/main/res/values-da-rDK/strings.xml
@@ -6,7 +6,6 @@
     <string name="app_limitations">Eksempelvis vil beskeder altid blive omformateret for at fjerne usikre elementer samt for at øge læsbarheden, og åbning af links skal af sikkerhedsårsager bekræftes.</string>
     <string name="app_crash">FairEmail er ikke understøttet på denne enhed, da fejl i Android forårsager nedbrud</string>
     <string name="app_exit">Tryk \'Tilbage\' igen for at afslutte</string>
-    <string name="channel_service">Service</string>
     <string name="channel_send">Send</string>
     <string name="channel_notification">Notifikationer</string>
     <string name="channel_update">Opdateringer</string>
@@ -258,7 +257,6 @@
     <string name="title_advanced_rlah">Roam, som var du hjemme</string>
     <string name="title_advanced_timeout">Forbindelses-timeout (sekunder)</string>
     <string name="title_advanced_ssl_harden">Hærd SSL-forbindelser</string>
-    <string name="title_advanced_socks">Benyt SOCKS-proxy</string>
     <string name="title_advanced_manage_connectivity">Håndtér konnektivitet</string>
     <string name="title_advanced_caption_general">Generelt</string>
     <string name="title_advanced_caption_list">Liste</string>
@@ -295,6 +293,7 @@
     <string name="title_advanced_subject_italic">Vis emnet med kursiv</string>
     <string name="title_advanced_subject_elipsed">Når nødvendigt, afkort emnet</string>
     <string name="title_advanced_keywords">Vis nøgleord i beskedhovedet</string>
+    <string name="title_advanced_labels">Vis Gmail-etiketter i beskedhoved</string>
     <string name="title_advanced_flags">Vis stjernemarkeringer</string>
     <string name="title_advanced_flags_background">Vis farvet baggrund i stedet for farvede stjerner</string>
     <string name="title_advanced_preview">Forhåndsvisning af beskeder</string>
@@ -424,7 +423,6 @@
     <string name="title_advanced_rlah_hint">Antager ingen roaming inden for EU</string>
     <string name="title_advanced_timeout_hint">Læse-/skrive-timeout indstilles til det dobbelte af forbindelses-timeout. Højere værdier vil resultere i øget batteriforbrug.</string>
     <string name="title_advanced_ssl_harden_hint">Aktivering af dette vil deaktivere svage SSL-protokoller og algoritmer, hvilket kan føre til forbindelsesproblemer</string>
-    <string name="title_advanced_socks_hint">Brug af en ekstern proxyserver er usikkert, da proxyforbindelser er ukrypterede</string>
     <string name="title_advanced_roaming_hint">Beskedoverskrifter hentes altid under roaming. Du kan benytte enhedens roamingindstilling til at deaktivere mobilnetværk under roaming.</string>
     <string name="title_advanced_browse_hint">Hent flere beskeder, når du ruller nedad</string>
     <string name="title_advanced_layout_hint">Skift til et mere kompakt layout og ændring af beskedtekststørrelse kan ske via den øverste handlingsbjælkemenu fra beskedvisning</string>
@@ -648,6 +646,7 @@
     <string name="title_raw_save">Gem besked i råformat</string>
     <string name="title_raw_send">Send som vedhæftning</string>
     <string name="title_manage_keywords">Håndtér stikord</string>
+    <string name="title_manage_labels">Håndtér Gmail-etiketter</string>
     <string name="title_add_keyword">Tilføj stikord</string>
     <string name="title_show_inline">Vis indlejrede vedhæftninger</string>
     <string name="title_download_all">Download alle</string>
@@ -1110,7 +1109,6 @@
     <string name="title_dismiss">Afvis</string>
     <string name="title_snooze_now">Udsæt</string>
     <string name="title_loading">Indlæser &#8230;</string>
-    <string name="title_set">Indstil</string>
     <string name="title_fetching_again">Henter beskeder igen fra server</string>
     <string name="title_conversation_actions">Handlinger</string>
     <string name="title_conversation_action_reply">Svar med: \'%1$s\'</string>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 34b3ccb94d..27fd42d436 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -6,7 +6,6 @@
     <string name="app_limitations">Beispielsweise werden Nachrichten automatisch neu formatiert, um unsichere Elemente zu entfernen und die Lesbarkeit zu erhöhen. Um die Sicherheit zusätzlich zu erhöhen, muss das Öffnen von Links vorab bestätigt werden.</string>
     <string name="app_crash">FairEmail wird auf diesem Gerät nicht unterstützt, da Fehler in der benutzten Android-Version Abstürze verursachen</string>
     <string name="app_exit">Zum Beenden erneut „Zurück“ drücken</string>
-    <string name="channel_service">Dienst</string>
     <string name="channel_send">Senden</string>
     <string name="channel_notification">Benachrichtigungen</string>
     <string name="channel_update">Aktualisierungen</string>
@@ -78,6 +77,7 @@
     <string name="title_notification_idle">Leerlauf</string>
     <string name="title_notification_failed">\'%1$s\' fehlgeschlagen</string>
     <string name="title_notification_alert">Server-Warnung von \'%1$s\'</string>
+    <string name="title_notification_sending_failed">Senden an %1$s fehlgeschlagen</string>
     <string name="title_of">%1$s/%2$s</string>
     <string name="title_name_count">%1$s (%2$s)</string>
     <string name="title_name_plus">%1$s +%2$d</string>
@@ -259,7 +259,6 @@ Protokolle, die dem Standard nicht entsprechen, wie „Microsoft Exchange Web Se
     <string name="title_advanced_rlah">Roaming wie zu Hause</string>
     <string name="title_advanced_timeout">Zeitüberschreitung der Verbindung (Sekunden)</string>
     <string name="title_advanced_ssl_harden">SSL-Verbindungen stärken</string>
-    <string name="title_advanced_socks">SOCKS Proxy verwenden</string>
     <string name="title_advanced_manage_connectivity">Konnektivität verwalten</string>
     <string name="title_advanced_caption_general">Allgemein</string>
     <string name="title_advanced_caption_list">Liste</string>
@@ -426,7 +425,6 @@ Protokolle, die dem Standard nicht entsprechen, wie „Microsoft Exchange Web Se
     <string name="title_advanced_rlah_hint">Unter der Annahme, dass kein Roaming innerhalb der EU stattfindet</string>
     <string name="title_advanced_timeout_hint">Die Zeitüberschreitung beim Lesen oder Schreiben wird auf das Doppelte der Verbindungszeitüberschreitung festgelegt. Höhere Werte führen zu einem höheren Akkuverbrauch.</string>
     <string name="title_advanced_ssl_harden_hint">Wenn dies eingeschaltet ist, werden schwache SSL-Protokolle und Chiffren deaktiviert, was zu Verbindungsproblemen führen kann</string>
-    <string name="title_advanced_socks_hint">Die Benutzung eines Remote-Proxy-Servers ist unsicher, da Proxy-Verbindungen nicht verschlüsselt sind</string>
     <string name="title_advanced_roaming_hint">Die Kopfzeilen der Nachrichten werden beim Roaming immer abgeholt. Sie können die Roaming-Einstellung des Geräts verwenden, um das Internet während des Roaming zu deaktivieren.</string>
     <string name="title_advanced_browse_hint">Durch Herunterziehen weitere Nachrichten abholen</string>
     <string name="title_advanced_layout_hint">Das Wechseln zu einer kompakteren Darstellung und Ändern der Nachrichtentextgröße kann im oberen Aktionsleistenmenü in der Nachrichtenansicht vorgenommen werden.</string>
@@ -625,7 +623,6 @@ Protokolle, die dem Standard nicht entsprechen, wie „Microsoft Exchange Web Se
     <string name="title_duplicate_in">Doppelte Nachricht in %1$s</string>
     <string name="title_subject_reply">Re: %1$s</string>
     <string name="title_subject_forward">Fwd: %1$s</string>
-    <string name="title_extras">Zusätzliche Tasten</string>
     <string name="title_seen">Als gelesen kennzeichnen</string>
     <string name="title_unseen">Als ungelesen kennzeichnen</string>
     <string name="title_hide">Ausblenden</string>
@@ -1111,7 +1108,6 @@ Protokolle, die dem Standard nicht entsprechen, wie „Microsoft Exchange Web Se
     <string name="title_dismiss">Abbrechen</string>
     <string name="title_snooze_now">Schlummern</string>
     <string name="title_loading">wird geladen &#8230;</string>
-    <string name="title_set">Setzen</string>
     <string name="title_fetching_again">Nachricht wird erneut vom Server abgerufen</string>
     <string name="title_conversation_actions">Aktionen</string>
     <string name="title_conversation_action_reply">Antworten mit: \'%1$s\'</string>
diff --git a/app/src/main/res/values-el-rGR/strings.xml b/app/src/main/res/values-el-rGR/strings.xml
index 3633db9588..d0ad85b617 100644
--- a/app/src/main/res/values-el-rGR/strings.xml
+++ b/app/src/main/res/values-el-rGR/strings.xml
@@ -6,7 +6,6 @@
     <string name="app_limitations">Για παράδειγμα, τα μηνύματα θα πρέπει πάντα να επαναδιαμορφώνονται προκειμένου να αφαιρεθούν τυχόν μη ασφαλή στοιχεία και να κατασταθεί το περιεχόμενο πιο ευανάγνωστο. Ακόμη, το άνοιγμα συνδέσμων θα πρέπει να επιβεβαιώνεται για λόγους ασφαλείας.</string>
     <string name="app_crash">Το FairEmail δεν υποστηρίζεται σε αυτήν τη συσκευή επειδή κάποια σφάλματα στο Android το κάνουν να κολλάει</string>
     <string name="app_exit">Πατήστε \"πίσω\" ξανά για Έξοδο</string>
-    <string name="channel_service">Υπηρεσία</string>
     <string name="channel_send">Αποστολή</string>
     <string name="channel_notification">Ειδοποιήσεις</string>
     <string name="channel_update">Ενημερώσεις</string>
@@ -39,9 +38,11 @@
     <string name="title_notification_idle">Σε αδράνεια</string>
     <string name="title_notification_failed">\'%1$s\' απέτυχε</string>
     <string name="title_notification_alert">\'%1$s\' συναγερμός διακομιστή</string>
+    <string name="title_of">%1$s/%2$s</string>
     <string name="title_name_count">%1$s (%2$s)</string>
     <string name="title_name_plus">%1$s +%2$d</string>
     <string name="title_from_to">%1$s ➤ %2$s</string>
+    <string name="title_title_description">%1$s: %2$s</string>
     <string name="title_factor_minutes">%1$d λεπτά</string>
     <string name="menu_exit">Έξοδος</string>
     <string name="menu_answers">Πρότυπα</string>
@@ -83,11 +84,15 @@
     <string name="title_setup_gmail_rationale">Παρακαλώ δώστε ολα τα δικαιώματα για να επιλέξετε λογαριασμό και να διαβάσετε το όνομα σας</string>
     <string name="title_setup_gmail_permissions">Το Google θα σας ζητήσει για δικαιώματα να διαβάσετε, να συντάξετε, να στέλνετε και μόνιμη διαγραφή των μύνηματων. FairEmail δεν θα διαγράψει ποτέ τα μυνήματα σας χωρίς την εξουσιοδότηση σας.</string>
     <string name="title_setup_gmail_drafts">Αν ο φάκελλος με τα πρόχειρα δεν είναι διαθέσιμος μέσω IMAP, μπορείτε να το διορθώσετε στις ρυθμίσεις ετικετών του Gmail</string>
+    <string name="title_setup_office_auth">Το σφάλμα \'ΠΙΣΤΟΠΟΙΗΣΗ απέτυχε\' μπορεί να προκληθεί επειδή το IMAP/SMTP έχει απενεργοποιηθεί από το διαχειριστή του συστήματος</string>
     <string name="title_setup_oauth_rationale">Παραχωρήσετε πρόσβαση στο %1$s λογαριασμό</string>
     <string name="title_setup_oauth_authorize">Έγκριση</string>
     <string name="title_setup_select_account">Επιλογή λογαριασμού</string>
     <string name="title_setup_instructions">Διάταξη οδηγιών</string>
     <string name="title_setup_no_settings">Δεν βρέθηκαν ρυθμίσεις για τη διεύθυνση διαδικτύου \'%1$s\'</string>
+    <string name="title_setup_no_settings_hint">Δοκιμάστε να δημιουργήσετε ένα λογαριασμό και ταυτότητα στα βήματα εγκατάστασης 1 και 2, χρησιμοποιώντας τις ρυθμίσεις που παρέχονται από τον πάροχο email σας</string>
+    <string name="title_setup_no_auth_hint">Ελέγξτε τη διεύθυνση email και τον κωδικό σας και επιβεβαιώστε ότι η εξωτερική πρόσβαση (IMAP/SMTP) είναι ενεργοποιημένη για το λογαριασμό σας</string>
+    <string name="title_setup_app_password_hint">Ο πάροχος ζητά έναν κωδικό εφαρμογής αντί για τον κωδικό του λογαριασμού, ελέγξτε τις οδηγίες του παρόχου σας</string>
     <string name="title_setup_no_system_folders">Ο φάκελος εισερχόμενα η προσχεδίου δεν βρέθηκαν</string>
     <string name="title_setup_quick_success">Ένας λογαριασμός και μια ταυτότητα έχουν προστεθεί με επιτυχία</string>
     <string name="title_setup_quick_failed">Μπορείτε να διαμορφώσετε ένα λογαριασμό και μια ταυτότητα παρακάτω επίσης</string>
@@ -108,13 +113,16 @@
     <string name="title_setup_doze_battery">Η μπαταρία χρησιμοποιείται παραπάνω από το κανονικό;</string>
     <string name="title_setup_doze_stopped">Σταμάτησε ο συγχρονισμός;</string>
     <string name="title_setup_data">Η εξοικονόμηση δεδομένων είναι ενεργή</string>
+    <string name="title_setup_advanced_options">Εμφάνιση προηγμένων επιλογών</string>
     <string name="title_setup_inbox">Πηγαίνετε στα μυνήματα</string>
     <string name="title_setup_go">Ας ξεκινήσουμε</string>
     <string name="title_setup_to_do">Εργασίες</string>
     <string name="title_setup_done">Έγινε</string>
+    <string name="title_setup_still">Απομένουν να γίνουν</string>
     <string name="title_setup_error">Σφάλμα</string>
     <string name="title_setup_export">Εξαγωγή ρυθμίσεων</string>
     <string name="title_setup_import">Εισαγωγή ρυθμίσεων</string>
+    <string name="title_setup_export_do">Λογαριασμοί Gmail οι οποίοι είναι συνδεδεμένοι με λογαριασμούς Google στη συσκευή δεν μπορούν να εξαχθούν</string>
     <string name="title_setup_import_do">Οι εισαγωμενοι λογαριασμοί θα προστεθούν χωρίς να διαγραφεί κανένα υπάρχων</string>
     <string name="title_setup_password">Κωδικός πρόσβασης</string>
     <string name="title_setup_password_chars">Ο κωδικός πρόσβασης περιέχει τον έλεγχο η οι χαρακτήρες στο κενό διάστημα</string>
@@ -149,6 +157,7 @@
     <string name="title_setup_defaults">Επαναφορά προεπιλογών</string>
     <string name="title_setup_reset_questions">Επαναφορά ερωτήσεων</string>
     <string name="title_advanced_hint_title">Πιο προηγμένες επιλογές</string>
+    <string name="title_advanced_section_main">Κύριες</string>
     <string name="title_advanced_section_synchronize">Λήψη</string>
     <string name="title_advanced_section_send">Αποστολή</string>
     <string name="title_advanced_section_connection">Σύνδεση</string>
@@ -158,11 +167,26 @@
     <string name="title_advanced_section_encryption">Κρυπτογράφηση</string>
     <string name="title_advanced_section_notifications">Ειδοποιήσεις</string>
     <string name="title_advanced_section_misc">Διάφορα</string>
+    <string name="title_advanced_receive">Λήψη μηνυμάτων για όλους τους λογαριασμούς</string>
+    <string name="title_advanced_always">Να λαμβάνονται πάντα τα μηνύματα για αυτούς τους λογαριασμούς</string>
     <string name="title_advanced_schedule">Χρονοδιάγραμμα</string>
     <string name="title_advanced_advanced">Για προχωρημένους</string>
+    <string name="title_advanced_no_date">Μηνύματα χωρίς ημερομηνία</string>
+    <string name="title_advanced_unseen">Όλα τα μη αναγνωσμένα μηνύματα</string>
+    <string name="title_advanced_flagged">Όλα τα μηνύματα με αστέρι</string>
+    <string name="title_advanced_delete_unseen">Διαγραφή των παλιών μη-αναγνωσμένων μηνυμάτων</string>
+    <string name="title_advanced_kept_removed">Έλεγξε αν τα παλιά μηνύματα έχουν διαγραφεί από το διακομιστή</string>
+    <string name="title_advanced_gmail_thread">Ομαδοποίηση μηνυμάτων με το στυλ του Gmail για λογαριασμούς Google</string>
+    <string name="title_advanced_sync_folders">Συχγρονισμός της λίστας φακέλων</string>
+    <string name="title_advanced_sync_shared_folders">Συγχρονισμός της λίστας κοινών φακέλων</string>
+    <string name="title_advanced_subscriptions">Διαχείρηση συνδρομών σε φακέλους</string>
+    <string name="title_advanced_check_mx">Έλεγχος διεύθυνσεων email των αποστολέων κατά το συγχρονισμό μηνυμάτων</string>
+    <string name="title_advanced_check_reply">Έλεγχος διεθύνσεων email απάντησης κατά το συγχρονισμό μηνυμάτων</string>
+    <string name="title_advanced_keyboard">Εμφάνιση του πληκτρολογίου από προεπιλογή</string>
     <string name="title_advanced_send_reminders">Εμφάνιση υπενθυμίσεων</string>
     <string name="title_advanced_startup">Εμφάνιση στην oθόνη έναρξης</string>
     <string name="title_advanced_gravatars">Δείξε Gravatars</string>
+    <string name="title_advanced_authentication">Εμφάνιση ειδοποίησης αν ο διακομιστής λήψης δεν μπόρεσε να πιστοποιήσει το μήνυμα</string>
     <string name="title_advanced_pull_refresh">Σύρετε προς τα κάτω για ανανέωση</string>
     <string name="title_advanced_light">Χρήση φωτεινής ένδειξης ειδοποιήσεων</string>
     <string name="title_advanced_fts_indexed">%1$d / %2$d ευρετήριο μύνηματων (%3$s)</string>
@@ -186,13 +210,22 @@
     <string name="title_user">Όνομα χρήστη</string>
     <string name="title_password">Κωδικός πρόσβασης</string>
     <string name="title_realm">Realm</string>
+    <string name="title_leave_on_server">Άφησε τα μηνύματα στο διακομιστή</string>
+    <string name="title_leave_deleted">Άφησε διεγραμμένα μυνήματα στο διακομιστή</string>
     <string name="title_leave_on_device">Αφήστε μηνύματα στη συσκευή</string>
+    <string name="title_use_date">Χρησιμοποίησε την ώρα αποστολής από την κεφαλίδα ημερομηνίας αντί για την ώρα λήψης από το διακομιστή</string>
     <string name="title_check">Έλεγχος</string>
+    <string name="title_trust">Όρισε ως αξιόπιστο το πιστοποιητικό διακομιστή με αποτύπωμα %1$s</string>
     <string name="title_no_standard">Αυτός ο πάροχος χρησιμοποιεί ιδιόκτητο ηλεκτρονικό ταχυδρομείο και το πρωτόκολλο δεν επιτρέπει να χρησιμοποιήσετε ηλεκτρονικό ταχυδρομείο τρίτου μέρους</string>
+    <string name="title_storage_quota">Χρήση χωρητικότητας διακομιστή: %1$s/%2$s</string>
+    <string name="title_advanced_browse">Περιήγηση μηνυμάτων στο διακομιστή</string>
     <string name="title_synchronize_enabled">Συγχρονισμός</string>
     <string name="title_edit_properties">Επεξεργασία ιδιοτήτων</string>
     <string name="title_edit_rules">Επεξεργασία κανόνων</string>
+    <string name="title_keep_days_remark">Τα παλιά μηνύματα θα διαγράφονται από τη συσκευή, αλλά θα παραμένουν στο διακομιστή</string>
+    <string name="title_no_search">Η αναζήτηση στο διακομιστή δεν είναι διαθέσιμη για αυτόν το λογαριασμό</string>
     <string name="title_truncated">Το μύνημα είναι πολύ μεγάλο για να προβληθεί ολόκληρο</string>
+    <string name="title_ask_delete_local">Διαγραφή τοπικών μηνυμάτων; Τα μηνύματα θα παραμείνουν στο διακομιστή.</string>
     <string name="title_submitter">Στάλθηκε από:</string>
     <string name="title_delivered_to">Παραδόθηκε σε:</string>
     <string name="title_size">Μέγεθος:</string>
@@ -203,9 +236,16 @@
     <string name="title_send">Αποστολή</string>
     <string name="title_send_now">Αποστολή τώρα</string>
     <string name="title_send_via">Αποστολή μέσω</string>
+    <string name="title_no_server">Δε βρέθηκε διακομιστής στο \'%1$s\'</string>
     <string name="title_style_size">Μέγεθος</string>
     <string name="title_style_color">Χρώμα</string>
     <string name="title_signature_certificate_invalid">Η αλυσίδα πιστοποιητικών δεν είναι έγκυρη</string>
+    <string name="title_search_hint">        Η αναζήτηση αρχικά θα ψάξει μηνύματα που είναι αποθηκευμένα στη συσκευή.
+        Για να ψάξετε και μηνύματα στο διακομιστή, πατήστε το κουμπί \'επανάληψη αναζήτησης\'.
+    </string>
+    <string name="title_search_text_hint">Η αναζήτηση κειμένου μέσα σε μηνύματα μπορεί να μη λειτουργήσει σε κάποιους διακομιστές όταν υπάρχει μεγάλος αριθμός μηνυμάτων</string>
+    <string name="title_search_size_hint">Η αναζήτηση μηνυμάτων με βάση το μέγεθος μπορεί να μη λειτουργήσει σε κάποιους διακομιστές όταν υπάρχει μεγάλος αριθμός μηνυμάτων</string>
+    <string name="title_search_server">Αναζήτηση στο διακομιστή</string>
     <string name="title_sort_on_starred">Με αστέρι</string>
     <string name="title_sort_on_sender">Αποστολέας</string>
     <string name="title_sort_on_subject">Θέμα</string>
@@ -227,6 +267,8 @@
     <string name="title_rule_folder">Φάκελος</string>
     <string name="title_rule_template">Πρότυπο απάντησης</string>
     <string name="title_legend_found">Βρέθηκε</string>
+    <string name="title_fetching_again">Λήψη του μηνύματος ξανά από το διακομιστή</string>
+    <string name="title_boundary_error">Σφάλμα κατά τη λήψη μηνυμάτων από το διακομιστή</string>
     <!-- Thunderbird -->
     <!-- https://en.wikipedia.org/wiki/Display_resolution -->
     <!-- https://en.wikipedia.org/wiki/Comparison_of_high-definition_smartphone_displays -->
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 954b594e14..9098fcd3cd 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -6,7 +6,6 @@
     <string name="app_limitations">Por ejemplo, el formato de los mensajes siempre será alterado para quitar elementos no seguros y para mejorar la legibilidad, y abrir enlaces debe ser confirmado por seguridad.</string>
     <string name="app_crash">FairEmail no es compatible con este dispositivo porque existen errores en Android que provocan fallos</string>
     <string name="app_exit">Volver \'atrás\' para salir</string>
-    <string name="channel_service">Servicio</string>
     <string name="channel_send">Enviar</string>
     <string name="channel_notification">Notificaciones</string>
     <string name="channel_update">Actualizaciones</string>
@@ -259,7 +258,6 @@
     <string name="title_advanced_rlah">Itinerancia como en casa</string>
     <string name="title_advanced_timeout">Tiempo de espera de conexión (segundos)</string>
     <string name="title_advanced_ssl_harden">Endurecer conexiones SSL</string>
-    <string name="title_advanced_socks">Usar proxy SOCKS</string>
     <string name="title_advanced_manage_connectivity">Administrar conectividad</string>
     <string name="title_advanced_caption_general">General</string>
     <string name="title_advanced_caption_list">Lista</string>
@@ -296,6 +294,7 @@
     <string name="title_advanced_subject_italic">Mostrar asunto en cursiva</string>
     <string name="title_advanced_subject_elipsed">Acortar el asunto cuando sea necesario</string>
     <string name="title_advanced_keywords">Mostrar palabras clave en encabezado del mensaje</string>
+    <string name="title_advanced_labels">Mostrar etiquetas de Gmail en cabecera de mensaje</string>
     <string name="title_advanced_flags">Mostrar estrellas</string>
     <string name="title_advanced_flags_background">Mostrar fondo coloreado en lugar de estrellas de color</string>
     <string name="title_advanced_preview">Mostrar vista previa de mensajes</string>
@@ -425,7 +424,6 @@
     <string name="title_advanced_rlah_hint">Suponiendo que no hay itinerancia dentro de la UE</string>
     <string name="title_advanced_timeout_hint">El tiempo de espera de lectura/escritura se establecerá al doble del tiempo de espera de conexión. Valores más altos resultarán en un mayor uso de la batería.</string>
     <string name="title_advanced_ssl_harden_hint">Activar esto desactivará los protocolos SSL y cifrados débiles, lo que puede provocar problemas de conexión</string>
-    <string name="title_advanced_socks_hint">El uso de un servidor proxy remoto es inseguro porque las conexiones proxy no están cifradas</string>
     <string name="title_advanced_roaming_hint">Los encabezados de mensajes siempre se obtendrán cuando en itinerancia. Puede usar la configuración de itinerancia del dispositivo para desactivar internet mientras se está en itinerancia.</string>
     <string name="title_advanced_browse_hint">Buscar más mensajes al desplazarse hacia abajo</string>
     <string name="title_advanced_layout_hint">Cambiar a un diseño más compacto y cambiar el tamaño del texto del mensaje puede hacerse en el menú de la barra de acción superior en la vista de mensaje</string>
@@ -649,6 +647,7 @@
     <string name="title_raw_save">Guardar mensaje raw</string>
     <string name="title_raw_send">Enviar como adjunto</string>
     <string name="title_manage_keywords">Administrar palabras clave</string>
+    <string name="title_manage_labels">Administrar etiquetas de Gmail</string>
     <string name="title_add_keyword">Añadir palabra clave</string>
     <string name="title_show_inline">Mostrar adjuntos incrustados</string>
     <string name="title_download_all">Descargar todo</string>
@@ -1111,7 +1110,6 @@
     <string name="title_dismiss">Descartar</string>
     <string name="title_snooze_now">Posponer</string>
     <string name="title_loading">Cargando &#8230;</string>
-    <string name="title_set">Aplicar</string>
     <string name="title_fetching_again">Recuperando mensaje nuevamente del servidor</string>
     <string name="title_conversation_actions">Acciones</string>
     <string name="title_conversation_action_reply">Responder con: \'%1$s\'</string>
diff --git a/app/src/main/res/values-eu-rES/strings.xml b/app/src/main/res/values-eu-rES/strings.xml
index d8ea1fc248..6d0e93b77b 100644
--- a/app/src/main/res/values-eu-rES/strings.xml
+++ b/app/src/main/res/values-eu-rES/strings.xml
@@ -6,7 +6,6 @@
     <string name="app_limitations">Adibidez, mezuei beti aldatuko zaie formatua elementu ez seguruak kentzeko eta irakurterraztasuna hobetzeko, eta estekak irekitzea segurtasunagatik baieztatu egin behar da.</string>
     <string name="app_crash">FairEmail-ek ez du gailu honentzako euskarririk Android akatsek kraskatzea eragiten dutelako</string>
     <string name="app_exit">Jo \'atzera\' berriro irteteko</string>
-    <string name="channel_service">Zerbitzua</string>
     <string name="channel_send">Bidali</string>
     <string name="channel_notification">Jakinarazpenak</string>
     <string name="channel_update">Eguneraketak</string>
@@ -256,7 +255,6 @@
     <string name="title_advanced_rlah">Ibili etxean bezala</string>
     <string name="title_advanced_timeout">Konektatzeko itxarote muga (segundotan)</string>
     <string name="title_advanced_ssl_harden">Gogortu SSL konexioak</string>
-    <string name="title_advanced_socks">Erabili SOCKS proxya</string>
     <string name="title_advanced_manage_connectivity">Kudeatu konektibitatea</string>
     <string name="title_advanced_caption_general">Orokorra</string>
     <string name="title_advanced_caption_list">Zerrenda</string>
@@ -421,7 +419,6 @@
     <string name="title_advanced_rlah_hint">EBn ez da datuen ibiltaritza onartzen</string>
     <string name="title_advanced_timeout_hint">Irakurtzeko/idazteko itxarote-muga konexio-denboraren bikoitza ezarriko da. Balio altuagoak bateriaren erabileran gehiago eragingo lukete.</string>
     <string name="title_advanced_ssl_harden_hint">Hori aktibatuz gero, SSL protokolo ahulak eta zifratzeak desgaituko dira eta horrek konexio arazoak sor ditzake</string>
-    <string name="title_advanced_socks_hint">Urruneko proxy zerbitzari bat erabiltzea ez da segurua proxy-konexioak zifratuta ez daudelako</string>
     <string name="title_advanced_roaming_hint">Mezuen goiburuak beti jasoko dira datuen ibiltaritza dagoenean. Telefonoaren datuen ibiltaritza ezarpena erabil dezakezu internet desgaitzeko.</string>
     <string name="title_advanced_browse_hint">Bilatu mezu gehiago korritzerakoan</string>
     <string name="title_advanced_layout_hint">Diseinua trinkotzea eta mezuaren testuaren tamaina alda daiteke mezuen ikuspegiko goiko ekintza-barran</string>
@@ -1103,7 +1100,6 @@ Honekin aldeko eta kontrako botoen arteko oreka mantenduko da.
     <string name="title_dismiss">Baztertu</string>
     <string name="title_snooze_now">Atzeratu</string>
     <string name="title_loading">Kargatzen &#8230;</string>
-    <string name="title_set">Ezarri</string>
     <string name="title_fetching_again">Mezua berriro zerbitzaritik jasotzen</string>
     <string name="title_conversation_actions">Ekintzak</string>
     <string name="title_conversation_action_reply">Erantzun honekin: \'%1$s\'</string>
diff --git a/app/src/main/res/values-fa-rIR/strings.xml b/app/src/main/res/values-fa-rIR/strings.xml
index 042851efa5..d3d4dccfd7 100644
--- a/app/src/main/res/values-fa-rIR/strings.xml
+++ b/app/src/main/res/values-fa-rIR/strings.xml
@@ -6,7 +6,6 @@
     <string name="app_limitations">برای مثال پیام‌ها همواره برای حذف عناصر ناامن و بهبود خوانایی متن شکل‌ بندی خواهند شد و باز کردن لینک‌ها نیز برای ایمنی بیشتر نیاز به تایید دارد.</string>
     <string name="app_crash">FairEmail در دستگاه شما پشتیبانی نمی‌شود، چون به دلیل وجود اشکالاتی در اندروید موجب خرابی برنامه می‌شود</string>
     <string name="app_exit">برای خروج دوباره روی \'بازگشت\' کلیک کنید</string>
-    <string name="channel_service">سرویس</string>
     <string name="channel_send">ارسال</string>
     <string name="channel_notification">اعلان‌ها</string>
     <string name="channel_update">به‌روزرسانی‌ها</string>
@@ -244,7 +243,6 @@
     <string name="title_advanced_rlah">رومینگ مانند اینکه در خانه‌ای</string>
     <string name="title_advanced_timeout">اتصال برقرار نشد (ثانیه)</string>
     <string name="title_advanced_ssl_harden">اتصالات SSL را محکم کن</string>
-    <string name="title_advanced_socks">استفاده از پروکسی SOCKS</string>
     <string name="title_advanced_manage_connectivity">مدیریت اتصال</string>
     <string name="title_advanced_caption_general">عمومی</string>
     <string name="title_advanced_caption_list">فهرست</string>
@@ -956,7 +954,6 @@
     <string name="title_dismiss">رد</string>
     <string name="title_snooze_now">تعویق</string>
     <string name="title_loading">درحال بارگذاری &#8230;</string>
-    <string name="title_set">تنظیم</string>
     <string name="title_fetching_again">در حال واکشی دوباره پیام از سرور</string>
     <string name="title_conversation_actions">کنش‌ها</string>
     <string name="title_conversation_action_reply">پاسخ با: \'%1$s\'</string>
diff --git a/app/src/main/res/values-fi-rFI/strings.xml b/app/src/main/res/values-fi-rFI/strings.xml
index 37dfa12687..72ca78a034 100644
--- a/app/src/main/res/values-fi-rFI/strings.xml
+++ b/app/src/main/res/values-fi-rFI/strings.xml
@@ -6,7 +6,6 @@
     <string name="app_limitations">Esimerkiksi viestit muotoillaan aina uudelleen vaarallisten elementtien poistamiseksi ja luettavuuden parantamiseksi, ja linkkien avaaminen pitää turvallisuuden takia erikseen vahvistaa.</string>
     <string name="app_crash">FairEmailia ei tueta tässä laitteessa, koska bugit Androidissa aiheuttavat kaatumisia</string>
     <string name="app_exit">Mene \'takaisin\' uudelleen poistuaksesi</string>
-    <string name="channel_service">Palvelu</string>
     <string name="channel_send">Lähettäminen</string>
     <string name="channel_notification">Ilmoitukset</string>
     <string name="channel_update">Päivitykset</string>
@@ -256,7 +255,6 @@
     <string name="title_advanced_rlah">Kotimaanhintaiset verkkovierailut</string>
     <string name="title_advanced_timeout">Yhteyden aikakatkaisu (sekuntia)</string>
     <string name="title_advanced_ssl_harden">Koveta SSL-yhteydet</string>
-    <string name="title_advanced_socks">Käytä SOCKS-proxypalvelinta</string>
     <string name="title_advanced_manage_connectivity">Hallitse verkkoyhteyksiä</string>
     <string name="title_advanced_caption_general">Yleiset</string>
     <string name="title_advanced_caption_list">Lista</string>
@@ -293,6 +291,7 @@
     <string name="title_advanced_subject_italic">Näytä aihe kursiivilla</string>
     <string name="title_advanced_subject_elipsed">Lyhennä tarvittaessa viestin aihetta</string>
     <string name="title_advanced_keywords">Näytä avainsanat viestin tunnistetiedoissa</string>
+    <string name="title_advanced_labels">Näytä Gmail-tunnisteet viestin tunnistetiedoissa</string>
     <string name="title_advanced_flags">Näytä tähdet</string>
     <string name="title_advanced_flags_background">Näytä värillinen tausta värillisten tähtien sijaan</string>
     <string name="title_advanced_preview">Näytä viestin esikatselu</string>
@@ -422,7 +421,6 @@
     <string name="title_advanced_rlah_hint">Oletetaan, että EU:ssa on kotimaanhintaiset verkkovierailut</string>
     <string name="title_advanced_timeout_hint">Luku-/kirjoitusaikakatkaisu asetetaan kaksi kertaa niin pitkäksi kuin yhteyden aikakatkaisu. Korkeat arvot aiheuttavat enemmän akun käyttöä.</string>
     <string name="title_advanced_ssl_harden_hint">Tämän käyttöönotto kytkee heikot SSL-protokollat ja salakirjoitukset pois käytöstä, mikä voi aiheuttaa yhteysongelmia</string>
-    <string name="title_advanced_socks_hint">Välityspalvelimen käyttö ei ole turvallista, koska yhteys ei ole salattu</string>
     <string name="title_advanced_roaming_hint">Viestien tunnistetiedot haetaan aina myös verkkovierailun aikana. Laitteen asetuksista voi kytkeä verkkoyhteyden pois verkkovieraillessa.</string>
     <string name="title_advanced_browse_hint">Hae lisää viestejä alaspäin vieritettäessä</string>
     <string name="title_advanced_layout_hint">Tiiviimpään näkymään vaihtaminen ja viestin tekstin koon vaihtaminen voidaan tehdä viestinäkymän yläreunan toimintopalkista</string>
@@ -456,6 +454,7 @@
     <string name="title_advanced_move_hint">Kohdekansio voidaan asettaa tilin asetuksissa</string>
     <string name="title_advanced_notify_no_grouping">Tämä Android-versio ei tue ilmoitusten ryhmittelyä</string>
     <string name="title_advanced_notify_no_channels">Tämä Android-versio ei tue ilmoituskanavia</string>
+    <string name="title_advanced_queries_hint">Tämän käyttöönotto heikentää suorituskykyä, mutta on tarpeen joillakin laitteilla</string>
     <string name="title_advanced_fts_hint">Tämän käyttöönotto parantaa haun suorituskykyä, mutta myös lisää akun ja tallennustilan käyttöä</string>
     <string name="title_advanced_english_hint">Tämä käynnistää sovelluksen uudelleen</string>
     <string name="title_advanced_experiments_hint">Lista kokeellisista ominaisuuksista</string>
@@ -645,6 +644,7 @@
     <string name="title_raw_save">Tallenna raakaviesti</string>
     <string name="title_raw_send">Lähetä liitteenä</string>
     <string name="title_manage_keywords">Hallitse avainsanoja</string>
+    <string name="title_manage_labels">Hallitse Gmail-tunnisteita</string>
     <string name="title_add_keyword">Lisää avainsana</string>
     <string name="title_show_inline">Näytä tekstiin upotetut liitteet</string>
     <string name="title_download_all">Lataa kaikki</string>
@@ -672,6 +672,7 @@
     <string name="title_reply_list">Vastaa listalle</string>
     <string name="title_reply_receipt">Lähetä vastaanottokuittaus</string>
     <string name="title_reply_template">Vastaa viestipohjalla</string>
+    <string name="title_move_undo">Siirretään kansioon %1$s (%2$d)</string>
     <string name="title_open_with">Avaa sovelluksessa</string>
     <string name="title_authentication_failed">%1$s tunnistautuminen epäonnistui</string>
     <string name="title_receipt_subject">Vastaanottokuittaus: %1$s</string>
@@ -1026,6 +1027,7 @@
     <string name="title_legend_avatar">Hahmo</string>
     <string name="title_legend_show_quotes">Näytä lainaukset</string>
     <string name="title_legend_show_junk">Käsittele roskapostina</string>
+    <string name="title_legend_create_rule">Luo sääntö</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ä alkuperäinen viesti</string>
@@ -1105,7 +1107,6 @@
     <string name="title_dismiss">Hylkää</string>
     <string name="title_snooze_now">Torkuta</string>
     <string name="title_loading">Ladataan &#8230;</string>
-    <string name="title_set">Aseta</string>
     <string name="title_fetching_again">Haetaan viesti uudestaan palvelimelta</string>
     <string name="title_conversation_actions">Toiminnot</string>
     <string name="title_conversation_action_reply">Vastaa tekstillä: \'%1$s\'</string>
diff --git a/app/src/main/res/values-fr-rCA/strings.xml b/app/src/main/res/values-fr-rCA/strings.xml
index cb94f1538f..24aca7a3d7 100644
--- a/app/src/main/res/values-fr-rCA/strings.xml
+++ b/app/src/main/res/values-fr-rCA/strings.xml
@@ -6,7 +6,6 @@
     <string name="app_limitations">Par exemple, les messages seront toujours reformatés afin d’en retirer les éléments non sûrs tout en améliorant leur lisibilité et l’ouverture des liens devra être confirmée par sécurité.</string>
     <string name="app_crash">FairEmail n\'est pas pris en charge sur cet appareil parce que des bogues dans Android provoquent des plantages</string>
     <string name="app_exit">Faites de nouveau « Retour » pour quitter</string>
-    <string name="channel_service">Service</string>
     <string name="channel_send">Envoyer</string>
     <string name="channel_notification">Notifications</string>
     <string name="channel_update">Mises à jour</string>
@@ -77,6 +76,7 @@
     <string name="title_notification_idle">Inactif</string>
     <string name="title_notification_failed">\'%1$s\' a échoué</string>
     <string name="title_notification_alert">Alerte serveur \'%1$s\'</string>
+    <string name="title_notification_sending_failed">L\'envoi à %1$s a échoué</string>
     <string name="title_of">%1$s/%2$s</string>
     <string name="title_name_count">%1$s (%2$s)</string>
     <string name="title_name_plus">%1$s +%2$d</string>
@@ -258,7 +258,6 @@
     <string name="title_advanced_rlah">Ignorer l’itinérance chez soi</string>
     <string name="title_advanced_timeout">Délai d’expiration de la connexion (secondes)</string>
     <string name="title_advanced_ssl_harden">Renforcer les connexions SSL</string>
-    <string name="title_advanced_socks">Utiliser un serveur mandataire SOCKS</string>
     <string name="title_advanced_manage_connectivity">Gérer la connectivité</string>
     <string name="title_advanced_caption_general">Général</string>
     <string name="title_advanced_caption_list">Liste</string>
@@ -425,7 +424,6 @@
     <string name="title_advanced_rlah_hint">Considérer qu’il n’y a pas d’itinérance au sein de l’UE</string>
     <string name="title_advanced_timeout_hint">Le délai d’expiration de la connexion sera doublé s’il reste encore des opérations de lecture/écriture. Des valeurs plus élevées entraîneront une utilisation acrue de la pile.</string>
     <string name="title_advanced_ssl_harden_hint">Activer ceci désactivera les protocoles et algorithmes SSL faibles, ce qui peut entraîner des problèmes de connexion</string>
-    <string name="title_advanced_socks_hint">L’utilisation d’un serveur mandataire distant n’est pas sécurisée car les connexions mandataires ne sont pas chiffrées</string>
     <string name="title_advanced_roaming_hint">Les en-têtes des messages seront toujours récupérés en itinérance. Vous pouvez utiliser les paramètres d’itinérance de l’appareil pour désactiver l’accès Internet en itinérance.</string>
     <string name="title_advanced_browse_hint">Récupérer davantage de messages en faisant défiler vers le bas</string>
     <string name="title_advanced_layout_hint">Le passage à une présentation plus compacte et la modification de la taille du texte du message peuvent être effectués dans le menu de la barre d\'action supérieure en vue message</string>
@@ -625,7 +623,7 @@
     <string name="title_duplicate_in">Message en double dans %1$s</string>
     <string name="title_subject_reply">Re: %1$s</string>
     <string name="title_subject_forward">Tr: %1$s</string>
-    <string name="title_extras">Boutons supplémentaires</string>
+    <string name="title_buttons">Boutons</string>
     <string name="title_seen">Marquer comme lu</string>
     <string name="title_unseen">Marquer comme non lu</string>
     <string name="title_hide">Masquer</string>
@@ -1113,7 +1111,6 @@
     <string name="title_dismiss">Rejeter</string>
     <string name="title_snooze_now">Reporter</string>
     <string name="title_loading">Chargement&#8230;</string>
-    <string name="title_set">Appliquer</string>
     <string name="title_fetching_again">Nouvelle récupération du message depuis le serveur</string>
     <string name="title_conversation_actions">Actions</string>
     <string name="title_conversation_action_reply">Répondre avec : \'%1$s\'</string>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index f53f9cd058..4d3c594c94 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -6,7 +6,6 @@
     <string name="app_limitations">Par exemple, les messages seront toujours reformatés afin d’en retirer les éléments non sûrs tout en améliorant leur lisibilité et l’ouverture des liens devra être confirmée par sécurité.</string>
     <string name="app_crash">FairEmail n\'est pas pris en charge sur cet appareil parce que des bogues dans Android provoquent des plantages</string>
     <string name="app_exit">Faire de nouveau « Retour » pour quitter</string>
-    <string name="channel_service">Service</string>
     <string name="channel_send">Envoi</string>
     <string name="channel_notification">Notifications</string>
     <string name="channel_update">Mises à jour</string>
@@ -77,6 +76,7 @@
     <string name="title_notification_idle">Inactif</string>
     <string name="title_notification_failed">\'%1$s\' a échoué</string>
     <string name="title_notification_alert">Alerte serveur \'%1$s\'</string>
+    <string name="title_notification_sending_failed">L\'envoi à %1$s a échoué</string>
     <string name="title_of">%1$s/%2$s</string>
     <string name="title_name_count">%1$s (%2$s)</string>
     <string name="title_name_plus">%1$s +%2$d</string>
@@ -258,7 +258,6 @@
     <string name="title_advanced_rlah">Ignorer l\'itinérance en Europe</string>
     <string name="title_advanced_timeout">Délai d’expiration de la connexion (secondes)</string>
     <string name="title_advanced_ssl_harden">Renforcer les connexions SSL</string>
-    <string name="title_advanced_socks">Utiliser un proxy SOCKS</string>
     <string name="title_advanced_manage_connectivity">Gérer la connectivité</string>
     <string name="title_advanced_caption_general">Général</string>
     <string name="title_advanced_caption_list">Liste</string>
@@ -425,7 +424,6 @@
     <string name="title_advanced_rlah_hint">Considérer qu’il n’y a pas d’itinérance au sein de l’Union Européenne (Roam Like at Home)</string>
     <string name="title_advanced_timeout_hint">Le délai d’expiration de la connexion sera doublé s’il reste encore des opérations de lecture/écriture. Des valeurs plus élevées entraîneront une utilisation accrue de la batterie.</string>
     <string name="title_advanced_ssl_harden_hint">Activer ceci désactivera les protocoles et algorithmes SSL faibles, ce qui peut entraîner des problèmes de connexion</string>
-    <string name="title_advanced_socks_hint">L\'utilisation d\'un serveur proxy distant n\'est pas sécurisée car les connexions proxy ne sont pas chiffrées</string>
     <string name="title_advanced_roaming_hint">Les en-têtes des messages seront toujours récupérés en itinérance. Vous pouvez utiliser les paramètres d’itinérance de l’appareil pour désactiver l’accès Internet en itinérance.</string>
     <string name="title_advanced_browse_hint">Récupérer davantage de messages en faisant défiler vers le bas</string>
     <string name="title_advanced_layout_hint">Le passage à une présentation plus compacte et la modification de la taille du texte du message peuvent être effectués dans le menu de la barre d’action supérieure en vue message</string>
@@ -625,7 +623,7 @@
     <string name="title_duplicate_in">Message en double dans %1$s</string>
     <string name="title_subject_reply">Re: %1$s</string>
     <string name="title_subject_forward">Tr: %1$s</string>
-    <string name="title_extras">Boutons supplémentaires</string>
+    <string name="title_buttons">Boutons</string>
     <string name="title_seen">Marquer comme lu</string>
     <string name="title_unseen">Marquer comme non lu</string>
     <string name="title_hide">Masquer</string>
@@ -1113,7 +1111,6 @@
     <string name="title_dismiss">Rejeter</string>
     <string name="title_snooze_now">Reporter</string>
     <string name="title_loading">Chargement&#8230;</string>
-    <string name="title_set">Appliquer</string>
     <string name="title_fetching_again">Nouvelle récupération du message depuis le serveur</string>
     <string name="title_conversation_actions">Actions</string>
     <string name="title_conversation_action_reply">Répondre avec : \'%1$s\'</string>
diff --git a/app/src/main/res/values-fy-rNL/strings.xml b/app/src/main/res/values-fy-rNL/strings.xml
index 7c08541d0f..86246095b2 100644
--- a/app/src/main/res/values-fy-rNL/strings.xml
+++ b/app/src/main/res/values-fy-rNL/strings.xml
@@ -6,7 +6,6 @@
     <string name="app_limitations">Berjochten wurde bygelyks altyd herformateare om ûnfeilige eleminten te ferwiderjen en lêsberens te ferbetterjen, en iepeningslinks moatte wurde befestige foar feiligens.</string>
     <string name="app_crash">FailEmail wurdt net stipe op dit apparaat om\'t bugs yn Android crashes feroarsaakje</string>
     <string name="app_exit">Gean \'werom\' opnij om út te gean</string>
-    <string name="channel_service">Tsjinst</string>
     <string name="channel_send">Stjoere</string>
     <string name="channel_notification">Notifikaasjes</string>
     <string name="channel_update">Bywurken</string>
@@ -77,8 +76,11 @@
     <string name="title_notification_idle">Ynaktyf</string>
     <string name="title_notification_failed">\'%1$s\' mislearre</string>
     <string name="title_notification_alert">\'%1$s\' tsjinner warskôging</string>
+    <string name="title_of">%1$s/%2$s</string>
     <string name="title_name_count">%1$s (%2$s)</string>
     <string name="title_name_plus">%1$s +%2$d</string>
+    <string name="title_from_to">%1$s ➤ %2$s</string>
+    <string name="title_title_description">%1$s: %2$s</string>
     <string name="title_factor_minutes">%1$d minuten</string>
     <string name="menu_exit">Útgong</string>
     <string name="menu_answers">Sjabloanen</string>
@@ -170,6 +172,7 @@
     <string name="title_advanced_section_privacy">Privacy</string>
     <string name="title_advanced_section_encryption">Fersifering</string>
     <string name="title_advanced_section_notifications">Notifikaasjes</string>
+    <string name="title_advanced_section_misc">Ferskate</string>
     <string name="title_advanced_when">Wannear</string>
     <string name="title_advanced_schedule">Skema</string>
     <string name="title_advanced_advanced">Avansearre</string>
@@ -428,6 +431,7 @@
     <string name="title_legend_draft">Hat konsept</string>
     <string name="title_legend_signed">Is tekene</string>
     <string name="title_legend_encrypted">Is fersifere</string>
+    <string name="title_legend_auth">Ferifikaasje mislearre</string>
     <string name="title_legend_found">Is fûn</string>
     <string name="title_legend_snoozed">Is snoozed</string>
     <string name="title_legend_flagged">Heakje bestân ta</string>
@@ -483,7 +487,6 @@
     <string name="title_minutes">Minuten</string>
     <string name="title_dismiss">Wegerje</string>
     <string name="title_snooze_now">Snooze</string>
-    <string name="title_set">Ynstelle</string>
     <string name="title_conversation_action_copy">Kopiearje: %1$s</string>
     <string name="title_icalendar_accept">Akseptearje</string>
     <string name="title_icalendar_decline">Efterútgong</string>
@@ -618,4 +621,15 @@
         <item>S/MIME sign-only</item>
         <item>S/MIME sign+encrypt</item>
     </string-array>
+    <string-array name="sizeNames">
+        <item>0 B</item>
+        <item>256 KB</item>
+        <item>512 KB</item>
+        <item>1 MB</item>
+        <item>2 MB</item>
+        <item>5 MB</item>
+        <item>10 MB</item>
+        <item>20 MB</item>
+        <item>50 MB</item>
+    </string-array>
 </resources>
diff --git a/app/src/main/res/values-gl-rES/strings.xml b/app/src/main/res/values-gl-rES/strings.xml
index 73a1ae7a4e..5a4d3654a9 100644
--- a/app/src/main/res/values-gl-rES/strings.xml
+++ b/app/src/main/res/values-gl-rES/strings.xml
@@ -3,7 +3,6 @@
     <string name="app_changelog">Rexistro de cambios</string>
     <string name="app_welcome">FairEmail é unha aplicación de correo de código aberto centrada na privacidade e a seguridade. For este motivo algunhas características poderían ser algo distintas do habitual.</string>
     <string name="app_exit">\"Dalle a \'saír\' outra vez pra saír\"</string>
-    <string name="channel_service">Servizo</string>
     <string name="channel_send">Enviar</string>
     <string name="channel_notification">Notificacións</string>
     <string name="channel_update">Actualizar</string>
diff --git a/app/src/main/res/values-hr-rHR/strings.xml b/app/src/main/res/values-hr-rHR/strings.xml
index c180be11ae..23b5831d2d 100644
--- a/app/src/main/res/values-hr-rHR/strings.xml
+++ b/app/src/main/res/values-hr-rHR/strings.xml
@@ -6,7 +6,6 @@
     <string name="app_limitations">Na primjer, poruke će uvijek biti preoblikovane kako bi se uklonili nesigurni elementi i poboljšana čitljivost, a otvaranje veza mora biti potvrđeno radi sigurnosti.</string>
     <string name="app_crash">FairEmail nije podržan na ovom uređaju jer greške u Androidu uzrokuju probleme i padove</string>
     <string name="app_exit">Ponovo pritisnite \'natrag\' za izlazak</string>
-    <string name="channel_service">Usluga</string>
     <string name="channel_send">Pošalji</string>
     <string name="channel_notification">Obavijesti</string>
     <string name="channel_update">Ažuriranja</string>
@@ -242,7 +241,6 @@
     <string name="title_advanced_rlah">Roaming kao kod kuće</string>
     <string name="title_advanced_timeout">Vrijeme do prekida veze (u sekundama)</string>
     <string name="title_advanced_ssl_harden">Otvrdni SSL veze</string>
-    <string name="title_advanced_socks">Koristi SOCKS proxy</string>
     <string name="title_advanced_manage_connectivity">Upravljanje povezivanjem</string>
     <string name="title_advanced_caption_general">Općenito</string>
     <string name="title_advanced_caption_conversation">Konverzacija</string>
@@ -378,7 +376,6 @@
     <string name="title_advanced_rlah_hint">Ne pretpostavljajući roaming unutar EU</string>
     <string name="title_advanced_timeout_hint">Vremensko ograničenje čitanja / pisanja postavit će se u dvostruko vrijeme do prekida veze. Veće vrijednosti rezultirat će većom potrošnjom baterije.</string>
     <string name="title_advanced_ssl_harden_hint">Ako se to omogući, onemogućit će se slabi SSL protokoli i šifre, što može dovesti do problema s vezom</string>
-    <string name="title_advanced_socks_hint">Upotreba udaljenog proxy poslužitelja nije sigurna jer proxy veze nisu šifrirane</string>
     <string name="title_advanced_roaming_hint">Zaglavlja poruka uvijek će se prikazivane prilikom roaminga. Postavku roaminga uređaja možete koristiti da biste onemogućili internet tijekom roaminga.</string>
     <string name="title_advanced_browse_hint">Dohvatite više poruka prilikom pomicanja prema dolje</string>
     <string name="title_advanced_layout_hint">Prebacivanje na kompaktniji izgled i promjena veličine teksta poruke može se izvršiti u izborniku gornje radne trake u prikazu poruka</string>
@@ -958,7 +955,6 @@
     <string name="title_dismiss">Odbaci</string>
     <string name="title_snooze_now">Odgodi</string>
     <string name="title_loading">Učitava &#8230;</string>
-    <string name="title_set">Postavi</string>
     <string name="title_fetching_again">Dohvaćanje poruke opet s poslužitelja</string>
     <string name="title_icalendar_accept">Prihvati</string>
     <string name="title_icalendar_decline">Odbij</string>
diff --git a/app/src/main/res/values-hu-rHU/strings.xml b/app/src/main/res/values-hu-rHU/strings.xml
index 61c08d527b..a61ff4b117 100644
--- a/app/src/main/res/values-hu-rHU/strings.xml
+++ b/app/src/main/res/values-hu-rHU/strings.xml
@@ -6,7 +6,6 @@
     <string name="app_limitations">Többek között: formázással mindig eltávolítja az üzenetkből a nem biztonságos elemeket és javítja az olvashatóságot, valamint a hivatkozások megnyitása megerősítést fog igényelni.</string>
     <string name="app_crash">FairEmail nem támogatott ezen az eszközön, az Android hibái miatt</string>
     <string name="app_exit">A kilépéshez használja újra a \'vissza\' opciót</string>
-    <string name="channel_service">Szolgáltatás</string>
     <string name="channel_send">Küldés</string>
     <string name="channel_notification">Értesítések</string>
     <string name="channel_update">Frissítések</string>
@@ -256,7 +255,6 @@ A szabályokkal kapcsolatos funkciók csak pro verzióban érhetők el.
     <string name="title_advanced_rlah">Roaming mint otthon</string>
     <string name="title_advanced_timeout">Kapcsolat időtúllépés (másodpercben)</string>
     <string name="title_advanced_ssl_harden">SSL kapcsolatok megerősítése</string>
-    <string name="title_advanced_socks">SOCKS proxy használata</string>
     <string name="title_advanced_manage_connectivity">Adatkapcsolat kezelése</string>
     <string name="title_advanced_caption_general">Általános</string>
     <string name="title_advanced_caption_list">Lista</string>
@@ -418,7 +416,6 @@ A szabályokkal kapcsolatos funkciók csak pro verzióban érhetők el.
     <string name="title_advanced_rlah_hint">Roaming figyelmen kívül hagyása az EU-n belül</string>
     <string name="title_advanced_timeout_hint">Az olvasás/írás időtúllépés be lesz állítva a kapcsolat időtúllépés duplájára. Nagyobb értékek több akkumulátor használatot eredményezhetnek.</string>
     <string name="title_advanced_ssl_harden_hint">Ennek a bekapcsolása kikapcsolja a gyenge SSL protokollokat és ciphereket ami csatlakozási problémákat okozhat</string>
-    <string name="title_advanced_socks_hint">Távoli proxy szerver használata nem biztonságos, mert a proxy kapcsolatok nem titkosítottak</string>
     <string name="title_advanced_roaming_hint">Az üzenetek fejléce roamingoláskor minden esetben letöltésre kerül. A készülék beállításai között kikapcsolhatja a roaming internet használatot.</string>
     <string name="title_advanced_browse_hint">Több üzenet letöltése lefelé görgetéssel</string>
     <string name="title_advanced_layout_hint">Váltás egy kompaktabb elrendezésre és az üzenet szövegméret módosítása elvégezhető a felső műveletsáv menüjében az üzenet nézetben</string>
@@ -613,7 +610,6 @@ A szabályokkal kapcsolatos funkciók csak pro verzióban érhetők el.
     <string name="title_duplicate_in">Üzenet duplikálása a(z) %1$s mappában</string>
     <string name="title_subject_reply">Re: %1$s</string>
     <string name="title_subject_forward">Fwd: %1$s</string>
-    <string name="title_extras">Extra gombok</string>
     <string name="title_seen">Megjelölés olvasottként</string>
     <string name="title_unseen">Megjelölés olvasatlanként</string>
     <string name="title_hide">Elrejtés</string>
@@ -1095,7 +1091,6 @@ A szabályokkal kapcsolatos funkciók csak pro verzióban érhetők el.
     <string name="title_dismiss">Elvetés</string>
     <string name="title_snooze_now">Szundi</string>
     <string name="title_loading">Betöltés &#8230;</string>
-    <string name="title_set">Beállíítás</string>
     <string name="title_fetching_again">Üzenet letöltése újra a szerverről</string>
     <string name="title_conversation_actions">Műveletek</string>
     <string name="title_conversation_action_reply">Válaszolás ezzel: \'%1$s\'</string>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index a2608b8193..4a41d9f8f6 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -6,7 +6,6 @@
     <string name="app_limitations">Ad esempio, i messaggi verranno sempre riformattati per rimuovere elementi non sicuri e per migliorare la leggibilità e l\'apertura dei collegamenti deve essere confermata per sicurezza.</string>
     <string name="app_crash">FairEmail non è supportata su questo dispositivo a causa di bug in Android che causano crash</string>
     <string name="app_exit">Premi di nuovo \'indietro\' per uscire</string>
-    <string name="channel_service">Servizio</string>
     <string name="channel_send">Invia</string>
     <string name="channel_notification">Notifiche</string>
     <string name="channel_update">Aggiornamenti</string>
@@ -258,7 +257,6 @@
     <string name="title_advanced_rlah">Roaming come a casa</string>
     <string name="title_advanced_timeout">Timeout di connessione (secondi)</string>
     <string name="title_advanced_ssl_harden">Connessioni SSL Harden</string>
-    <string name="title_advanced_socks">Usa SOCKS proxy</string>
     <string name="title_advanced_manage_connectivity">Gestisci connettività</string>
     <string name="title_advanced_caption_general">Generale</string>
     <string name="title_advanced_caption_list">Elenco</string>
@@ -424,7 +422,6 @@
     <string name="title_advanced_rlah_hint">Presumi nessun roaming all\'interno dell\'UE</string>
     <string name="title_advanced_timeout_hint">Il timeout di lettura/scrittura verrà impostato sul doppio del timeout di connessione. Valori più alti comporteranno più utilizzo della batteria.</string>
     <string name="title_advanced_ssl_harden_hint">Abilitando questa opzione disabiliterai i protocolli SSL e i cifrari deboli, che possono causare problemi di connessione</string>
-    <string name="title_advanced_socks_hint">L\'utilizzo di un server proxy remoto non è sicuro perché le connessioni proxy non sono cifrate</string>
     <string name="title_advanced_roaming_hint">Le intestazioni dei messaggi saranno sempre recuperate quando in roaming. Puoi utilizzare le impostazioni di roaming del dispositivo per disabilitare internet durante il roaming.</string>
     <string name="title_advanced_browse_hint">Scarica più messaggi quando scorri verso il basso</string>
     <string name="title_advanced_layout_hint">Puoi passare ad un layout più compatto e modificare la dimensione del testo del messaggio nel menu della barra di azione in alto nella vista dei messaggi</string>
@@ -1109,7 +1106,6 @@
     <string name="title_dismiss">Rimuovi</string>
     <string name="title_snooze_now">Posticipa</string>
     <string name="title_loading">Caricamento &#8230;</string>
-    <string name="title_set">Imposta</string>
     <string name="title_fetching_again">Nuovo recupero messaggio dal server</string>
     <string name="title_conversation_actions">Azioni</string>
     <string name="title_conversation_action_reply">Rispondi con: \'%1$s\'</string>
diff --git a/app/src/main/res/values-iw-rIL/strings.xml b/app/src/main/res/values-iw-rIL/strings.xml
index 2390fb4aec..c805072828 100644
--- a/app/src/main/res/values-iw-rIL/strings.xml
+++ b/app/src/main/res/values-iw-rIL/strings.xml
@@ -6,7 +6,6 @@
     <string name="app_limitations">לדוגמה; חלקים המוגדרים \'לא בטוחים\' יוסרו מהודעות ובכך תשופר חווית הקריאה. כהגנה נוספת, ידרש אישור המשתמש לפתיחה של קישורים המצורפים להודעה.</string>
     <string name="app_crash">אפליקצית fairmail אינה נתמכת במכשיר זה בגלל בעיות במערכת ההפעלה של אנדרואיד הגורמת לאפליקציה לקרוס</string>
     <string name="app_exit">לחץ \'חזור\' שוב כדי לצאת</string>
-    <string name="channel_service">שירות</string>
     <string name="channel_send">שלח</string>
     <string name="channel_notification">התראות</string>
     <string name="channel_update">עדכונים</string>
diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml
index ce86ec583b..bbd0d90e5e 100644
--- a/app/src/main/res/values-ja-rJP/strings.xml
+++ b/app/src/main/res/values-ja-rJP/strings.xml
@@ -6,7 +6,6 @@
     <string name="app_limitations">例えば常に安全でない要素を削除し読みやすさを向上させるために再フォーマットされ、リンクを開くには安全の為に確認する必要があります</string>
     <string name="app_crash">Androidのバグによりクラッシュが発生する為、このデバイスではFairEmailはサポートされていません</string>
     <string name="app_exit">もう一度押すと終了します</string>
-    <string name="channel_service">サービス</string>
     <string name="channel_send">送信</string>
     <string name="channel_notification">通知</string>
     <string name="channel_update">更新</string>
@@ -235,7 +234,6 @@ Microsoft Exchange WebサービスやMicrosoft ActiveSyncなどの非標準プ
     <string name="title_advanced_rlah">EU内無制限ローミング(EUのみ)</string>
     <string name="title_advanced_timeout">接続タイムアウト(秒)</string>
     <string name="title_advanced_ssl_harden">SSL接続を有効</string>
-    <string name="title_advanced_socks">SOCKS proxyを使用</string>
     <string name="title_advanced_manage_connectivity">接続の管理</string>
     <string name="title_advanced_caption_general">全般</string>
     <string name="title_advanced_caption_list">リスト</string>
@@ -393,7 +391,6 @@ Microsoft Exchange WebサービスやMicrosoft ActiveSyncなどの非標準プ
     <string name="title_advanced_rlah_hint">EU内でのローミングのみ</string>
     <string name="title_advanced_timeout_hint">読み取り/書き込みタイムアウトは接続タイムアウトの2倍に設定されます。値を大きくするとバッテリーの使用量が増えます</string>
     <string name="title_advanced_ssl_harden_hint">有効にすると弱いSSLプロトコルと暗号が無効になり接続の問題が発生する可能性が有ります</string>
-    <string name="title_advanced_socks_hint">プロキシ接続は暗号化されていない為、リモートプロキシサーバ使用は安全ではありません</string>
     <string name="title_advanced_roaming_hint">ローミング時メッセージヘッダーが常に取得されます。 デバイスのローミング設定を使用して、ローミング中にインターネットを無効にする事が出来ます</string>
     <string name="title_advanced_browse_hint">下にスクロール時に、更にメッセージを取得</string>
     <string name="title_advanced_layout_hint">よりコンパクトなレイアウトへの切り替えとメッセージのテキストサイズの変更はメッセージビューの上部アクションバーメニューで行えます</string>
@@ -1066,7 +1063,6 @@ PlayストアでFairEmailを評価できれば幸いです。
     <string name="title_dismiss">却下する</string>
     <string name="title_snooze_now">スヌーズ</string>
     <string name="title_loading">&#8230; を読み込んでいます</string>
-    <string name="title_set">設定</string>
     <string name="title_fetching_again">サーバーからメッセージの再取得</string>
     <string name="title_conversation_actions">アクション</string>
     <string name="title_conversation_action_reply">返信: \'%1$s\'</string>
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index 0fb7b0e507..0f76d8d29e 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -6,7 +6,7 @@
     <string name="app_limitations">Berichten worden bijvoorbeeld altijd opnieuw geformatteerd om onveilige elementen te verwijderen en de leesbaarheid te verbeteren en het openen van koppelingen moet voor de veiligheid worden bevestigd.</string>
     <string name="app_crash">FairEmail wordt niet ondersteund op dit apparaat omdat bugs in Android crashes veroorzaken</string>
     <string name="app_exit">Ga nogmaals \'terug\' om af te sluiten</string>
-    <string name="channel_service">Service</string>
+    <string name="channel_service">Ontvangen</string>
     <string name="channel_send">Verzenden</string>
     <string name="channel_notification">Meldingen</string>
     <string name="channel_update">Updates</string>
@@ -77,6 +77,7 @@
     <string name="title_notification_idle">Inactief</string>
     <string name="title_notification_failed">\'%1$s\' is mislukt</string>
     <string name="title_notification_alert">\'%1$s\' servermelding</string>
+    <string name="title_notification_sending_failed">Verzenden naar %1$s mislukt</string>
     <string name="title_of">%1$s/%2$s</string>
     <string name="title_name_count">%1$s (%2$s)</string>
     <string name="title_name_plus">%1$s +%2$d</string>
@@ -257,7 +258,6 @@
     <string name="title_advanced_rlah">Roam zoals thuis</string>
     <string name="title_advanced_timeout">Verbinding timeout (seconden)</string>
     <string name="title_advanced_ssl_harden">Verhard SSL-verbindingen</string>
-    <string name="title_advanced_socks">Gebruik SOCKS proxy</string>
     <string name="title_advanced_manage_connectivity">Beheer connectiviteit</string>
     <string name="title_advanced_caption_general">Algemeen</string>
     <string name="title_advanced_caption_list">Lijst</string>
@@ -424,7 +424,6 @@
     <string name="title_advanced_rlah_hint">Veronderstel geen roaming binnen de EU</string>
     <string name="title_advanced_timeout_hint">De lees/schrijf time-out wordt ingesteld op de dubbele waarde van de verbinding time-out. Hogere waarden zullen leiden tot meer batterijgebruik.</string>
     <string name="title_advanced_ssl_harden_hint">Door dit in te schakelen, worden zwakke SSL-protocollen en -coderingen uitgeschakeld, wat kan leiden tot verbindingsproblemen</string>
-    <string name="title_advanced_socks_hint">Een externe proxy server gebruiken is onveilig omdat proxy verbindingen niet worden versleuteld</string>
     <string name="title_advanced_roaming_hint">Berichtkoppen zullen altijd worden opgehaald bij roaming. Je kunt de roaming-instelling van het apparaat gebruiken om internet uit te schakelen tijdens roaming.</string>
     <string name="title_advanced_browse_hint">Meer berichten ophalen bij het naar beneden scrollen</string>
     <string name="title_advanced_layout_hint">Overschakelen naar een compactere layout en het wijzigen van de berichttekst grootte kan worden gedaan in het menu van de top actiebalk in het berichtweergave</string>
@@ -624,7 +623,7 @@
     <string name="title_duplicate_in">Dubbel bericht in %1$s</string>
     <string name="title_subject_reply">Re: %1$s</string>
     <string name="title_subject_forward">Fwd: %1$s</string>
-    <string name="title_extras">Extra knoppen</string>
+    <string name="title_buttons">Knoppen</string>
     <string name="title_seen">Markeer als gelezen</string>
     <string name="title_unseen">Markeer als ongelezen</string>
     <string name="title_hide">Verbergen</string>
@@ -1112,7 +1111,6 @@
     <string name="title_dismiss">Negeren</string>
     <string name="title_snooze_now">Sluimeren</string>
     <string name="title_loading">Laden &#8230;</string>
-    <string name="title_set">Instellen</string>
     <string name="title_fetching_again">Bericht opnieuw van de server ophalen</string>
     <string name="title_conversation_actions">Acties</string>
     <string name="title_conversation_action_reply">Antwoord met: \'%1$s\'</string>
diff --git a/app/src/main/res/values-nn-rNO/strings.xml b/app/src/main/res/values-nn-rNO/strings.xml
index bca30e2020..2885ece7d5 100644
--- a/app/src/main/res/values-nn-rNO/strings.xml
+++ b/app/src/main/res/values-nn-rNO/strings.xml
@@ -6,7 +6,6 @@
     <string name="app_limitations">For eksempel vil meldinger alltid bli formatert for å fjerne usikre elementer, og for å forbedre lesbarheten og åpning av linker må bekreftes for sikkerhet.</string>
     <string name="app_crash">FairEmail støttes ikke på denne enheten fordi feil i Android forårsaker krasjer</string>
     <string name="app_exit">Gå \'tilbake\' igjen for å avslutte</string>
-    <string name="channel_service">Service</string>
     <string name="channel_send">Send</string>
     <string name="channel_notification">Varsler</string>
     <string name="channel_update">Oppdateringer</string>
@@ -240,7 +239,6 @@
     <string name="title_advanced_rlah">Roam som hjemme</string>
     <string name="title_advanced_timeout">Tilkoblingsavbrudd (sekunder)</string>
     <string name="title_advanced_ssl_harden">Styrke SSL-tilkoblinger</string>
-    <string name="title_advanced_socks">Bruk SOCKS-proxy</string>
     <string name="title_advanced_manage_connectivity">Administrer tilkobling</string>
     <string name="title_advanced_caption_general">Generelt</string>
     <string name="title_advanced_caption_list">Liste</string>
@@ -384,7 +382,6 @@
     <string name="title_advanced_rlah_hint">Forutsatt ingen roaming i EU</string>
     <string name="title_advanced_timeout_hint">Tidsavbrudd for lese/skriving blir satt til den doble av tilkoblings avbruddstiden. Høyere verdier vil føre til mer batteribruk.</string>
     <string name="title_advanced_ssl_harden_hint">Aktivering av dette vil deaktivere svake SSL-protokoller og chiffer, noe som kan føre til tilkoblingsproblemer</string>
-    <string name="title_advanced_socks_hint">Å bruke en ekstern proxy-server er usikker fordi proxy-tilkoblinger ikke er kryptert</string>
     <string name="title_advanced_roaming_hint">Meldingsoverskrifter vil alltid bli hentet når du roamer. Du kan bruke enhetens roaming-innstilling for å deaktivere Internett mens du roamer.</string>
     <string name="title_advanced_browse_hint">Hent flere meldinger når du ruller ned</string>
     <string name="title_advanced_layout_hint">Å bytte til en mer kompakt layout og endre meldingens tekststørrelse kan gjøres i den øverste handlingslinje menyen i meldingsvisningen</string>
@@ -987,7 +984,6 @@ Dette vil bidra til å opprettholde en balanse mellom ugunstige og gunstige anme
     <string name="title_dismiss">Avvis</string>
     <string name="title_snooze_now">Utsett</string>
     <string name="title_loading">Laster &#8230;</string>
-    <string name="title_set">Bruk</string>
     <string name="title_fetching_again">Henter melding igjen fra serveren</string>
     <string name="title_conversation_actions">Handlinger</string>
     <string name="title_conversation_action_reply">Svar med: \'%1$s\'</string>
diff --git a/app/src/main/res/values-no-rNO/strings.xml b/app/src/main/res/values-no-rNO/strings.xml
index bca30e2020..2885ece7d5 100644
--- a/app/src/main/res/values-no-rNO/strings.xml
+++ b/app/src/main/res/values-no-rNO/strings.xml
@@ -6,7 +6,6 @@
     <string name="app_limitations">For eksempel vil meldinger alltid bli formatert for å fjerne usikre elementer, og for å forbedre lesbarheten og åpning av linker må bekreftes for sikkerhet.</string>
     <string name="app_crash">FairEmail støttes ikke på denne enheten fordi feil i Android forårsaker krasjer</string>
     <string name="app_exit">Gå \'tilbake\' igjen for å avslutte</string>
-    <string name="channel_service">Service</string>
     <string name="channel_send">Send</string>
     <string name="channel_notification">Varsler</string>
     <string name="channel_update">Oppdateringer</string>
@@ -240,7 +239,6 @@
     <string name="title_advanced_rlah">Roam som hjemme</string>
     <string name="title_advanced_timeout">Tilkoblingsavbrudd (sekunder)</string>
     <string name="title_advanced_ssl_harden">Styrke SSL-tilkoblinger</string>
-    <string name="title_advanced_socks">Bruk SOCKS-proxy</string>
     <string name="title_advanced_manage_connectivity">Administrer tilkobling</string>
     <string name="title_advanced_caption_general">Generelt</string>
     <string name="title_advanced_caption_list">Liste</string>
@@ -384,7 +382,6 @@
     <string name="title_advanced_rlah_hint">Forutsatt ingen roaming i EU</string>
     <string name="title_advanced_timeout_hint">Tidsavbrudd for lese/skriving blir satt til den doble av tilkoblings avbruddstiden. Høyere verdier vil føre til mer batteribruk.</string>
     <string name="title_advanced_ssl_harden_hint">Aktivering av dette vil deaktivere svake SSL-protokoller og chiffer, noe som kan føre til tilkoblingsproblemer</string>
-    <string name="title_advanced_socks_hint">Å bruke en ekstern proxy-server er usikker fordi proxy-tilkoblinger ikke er kryptert</string>
     <string name="title_advanced_roaming_hint">Meldingsoverskrifter vil alltid bli hentet når du roamer. Du kan bruke enhetens roaming-innstilling for å deaktivere Internett mens du roamer.</string>
     <string name="title_advanced_browse_hint">Hent flere meldinger når du ruller ned</string>
     <string name="title_advanced_layout_hint">Å bytte til en mer kompakt layout og endre meldingens tekststørrelse kan gjøres i den øverste handlingslinje menyen i meldingsvisningen</string>
@@ -987,7 +984,6 @@ Dette vil bidra til å opprettholde en balanse mellom ugunstige og gunstige anme
     <string name="title_dismiss">Avvis</string>
     <string name="title_snooze_now">Utsett</string>
     <string name="title_loading">Laster &#8230;</string>
-    <string name="title_set">Bruk</string>
     <string name="title_fetching_again">Henter melding igjen fra serveren</string>
     <string name="title_conversation_actions">Handlinger</string>
     <string name="title_conversation_action_reply">Svar med: \'%1$s\'</string>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index ba7c450d58..c5e5b27d0a 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -6,7 +6,6 @@
     <string name="app_limitations">Przykładowo, wiadomości będą zawsze przeformatowane, aby usunąć niebezpieczne elementy i zwiększyć czytelność, a otwieranie linków musi być potwierdzane dla zachowania bezpieczeństwa.</string>
     <string name="app_crash">FairEmail nie jest obsługiwany na tym urządzeniu, ponieważ błędy w Androidzie powodują awarie</string>
     <string name="app_exit">Ponownie \'wstecz\', aby wyjść</string>
-    <string name="channel_service">Usługa</string>
     <string name="channel_send">Wyślij</string>
     <string name="channel_notification">Powiadomienia</string>
     <string name="channel_update">Aktualizacje</string>
@@ -98,6 +97,7 @@
     <string name="title_notification_idle">Bezczynny</string>
     <string name="title_notification_failed">%1$s nie powiodło się</string>
     <string name="title_notification_alert">Alert serwera \'%1$s\'</string>
+    <string name="title_notification_sending_failed">Wysyłanie do %1$s nie powiodło się</string>
     <string name="title_of">%1$s/%2$s</string>
     <string name="title_name_count">%1$s (%2$s)</string>
     <string name="title_name_plus">%1$s +%2$d</string>
@@ -279,7 +279,6 @@
     <string name="title_advanced_rlah">Roaming jak w domu</string>
     <string name="title_advanced_timeout">Limit czasu połączenia (sekundy)</string>
     <string name="title_advanced_ssl_harden">Wzmocnij połączenia SSL</string>
-    <string name="title_advanced_socks">Użyj serwera proxy SOCKS</string>
     <string name="title_advanced_manage_connectivity">Zarządzaj połączeniami</string>
     <string name="title_advanced_caption_general">Ogólne</string>
     <string name="title_advanced_caption_list">Lista</string>
@@ -316,6 +315,7 @@
     <string name="title_advanced_subject_italic">Temat wyświetlaj kursywą</string>
     <string name="title_advanced_subject_elipsed">W razie potrzeby skróć temat</string>
     <string name="title_advanced_keywords">Pokaż słowa kluczowe w nagłówku wiadomości</string>
+    <string name="title_advanced_labels">Pokaż etykiety Gmail w nagłówku wiadomości</string>
     <string name="title_advanced_flags">Pokaż gwiazdki</string>
     <string name="title_advanced_flags_background">Pokazuj kolorowe tło zamiast kolorowych gwiazdek</string>
     <string name="title_advanced_preview">Pokaż podgląd wiadomości</string>
@@ -445,7 +445,6 @@
     <string name="title_advanced_rlah_hint">Zakładając brak roamingu w UE</string>
     <string name="title_advanced_timeout_hint">Limit czasu odczytu/zapisu zostanie ustawiony na dwukrotność limitu czasu połączenia. Wyższe wartości spowodują większe zużycie baterii.</string>
     <string name="title_advanced_ssl_harden_hint">Włączenie tego spowoduje wyłączenie słabych protokołów SSL i szyfrowania, co może prowadzić do problemów z połączeniem</string>
-    <string name="title_advanced_socks_hint">Korzystanie ze zdalnego serwera proxy jest niezabezpieczone, ponieważ połączenia proxy nie są szyfrowane</string>
     <string name="title_advanced_roaming_hint">Nagłówki wiadomości będą zawsze pobierane podczas roamingu. Możesz użyć ustawienia roamingu urządzenia, aby wyłączyć Internet podczas roamingu.</string>
     <string name="title_advanced_browse_hint">Pobierz więcej wiadomości podczas przewijania w dół</string>
     <string name="title_advanced_layout_hint">Przełączanie do bardziej zwartego układu i zmianę rozmiaru tekstu wiadomości można wykonać w menu górnego paska działań w widoku wiadomości</string>
@@ -645,6 +644,7 @@
     <string name="title_duplicate_in">Duplikat wiadomości w %1$s</string>
     <string name="title_subject_reply">Odp: %1$s</string>
     <string name="title_subject_forward">Pd: %1$s</string>
+    <string name="title_buttons">Przyciski</string>
     <string name="title_seen">Oznacz jako przeczytane</string>
     <string name="title_unseen">Oznacz jako nieprzeczytane</string>
     <string name="title_hide">Ukryj</string>
@@ -669,6 +669,7 @@
     <string name="title_raw_save">Zapisz nieprzetworzoną wiadomość</string>
     <string name="title_raw_send">Wyślij jako załącznik</string>
     <string name="title_manage_keywords">Zarządzaj słowami kluczowymi</string>
+    <string name="title_manage_labels">Zarządzaj etykietami Gmail</string>
     <string name="title_add_keyword">Dodaj słowo kluczowe</string>
     <string name="title_show_inline">Pokaż wstawione załączniki</string>
     <string name="title_download_all">Pobierz wszystkie</string>
@@ -1131,7 +1132,6 @@
     <string name="title_dismiss">Odrzuć</string>
     <string name="title_snooze_now">Odłóż</string>
     <string name="title_loading">Ładowanie &#8230;</string>
-    <string name="title_set">Ustaw</string>
     <string name="title_fetching_again">Ponowne pobieranie wiadomości z serwera</string>
     <string name="title_conversation_actions">Akcje</string>
     <string name="title_conversation_action_reply">Odpowiedz z \'%1$s\'</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 54bedbe7be..61aa716dda 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -6,7 +6,6 @@
     <string name="app_limitations">Por exemplo, as mensagens serão sempre reformatadas para remover elementos inseguros e para melhorar a legibilidade, e a abertura de links devem ser confirmadas por questão de segurança.</string>
     <string name="app_crash">O FairEmail não é suportado neste dispositivo porque bugs do Android causam tais falhas</string>
     <string name="app_exit">Pressione \'voltar\' novamente para sair</string>
-    <string name="channel_service">Serviço</string>
     <string name="channel_send">Enviar</string>
     <string name="channel_notification">Notificações</string>
     <string name="channel_update">Atualizações</string>
@@ -248,7 +247,6 @@
     <string name="title_advanced_rlah">Roam like at home</string>
     <string name="title_advanced_timeout">Conexão expira em (segundos)</string>
     <string name="title_advanced_ssl_harden">Reforçar conexões SSL</string>
-    <string name="title_advanced_socks">Usar proxy SOCKS</string>
     <string name="title_advanced_manage_connectivity">Gerenciar conectividade</string>
     <string name="title_advanced_caption_general">Geral</string>
     <string name="title_advanced_caption_list">Lista</string>
@@ -406,7 +404,6 @@
     <string name="title_advanced_rlah_hint">Não assumindo roaming na UE</string>
     <string name="title_advanced_timeout_hint">O tempo limite de leitura/escrita será definido para o dobro do tempo limite de conexão. Valores mais altos resultarão em mais uso da bateria.</string>
     <string name="title_advanced_ssl_harden_hint">Habilitar isso irá desabilitar protocolos SSL fracos e cifras, o que pode levar a problemas de conexão</string>
-    <string name="title_advanced_socks_hint">Usar um servidor proxy remoto é inseguro porque as conexões de proxy não estão criptografadas</string>
     <string name="title_advanced_roaming_hint">Os cabeçalhos de mensagens serão sempre buscados quando estiver em roaming. Você pode usar a configuração de roaming do dispositivo para desativar a internet enquanto estiver em roaming.</string>
     <string name="title_advanced_browse_hint">Obter mais mensagens ao rolar para baixo</string>
     <string name="title_advanced_layout_hint">Mudar para um layout mais compacto e alterar o tamanho do texto da mensagem pode ser feito no menu da barra de ação superior na exibição de mensagem</string>
@@ -1030,7 +1027,6 @@
     <string name="title_dismiss">Descartar</string>
     <string name="title_snooze_now">Adiar</string>
     <string name="title_loading">Carregando &#8230;</string>
-    <string name="title_set">Set</string>
     <string name="title_conversation_action_reply">Resposta com: \'%1$s\'</string>
     <string name="title_conversation_action_copy">Copiar: \'%1$s\'</string>
     <string name="title_icalendar_accept">Aceitar</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 478de733b7..8cb67eb11d 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -6,7 +6,6 @@
     <string name="app_limitations">Por exemplo, as mensagens serão sempre reformatadas para remover elementos não seguros e para melhorar a legibilidade bem como a abertura de links terá de ser confirmada por razões de segurança.</string>
     <string name="app_crash">O FairEmail não é suportado neste dispositivo porque bugs no Android causam falhas</string>
     <string name="app_exit"> Clique novamente em \'voltar\' para sair</string>
-    <string name="channel_service">Serviço</string>
     <string name="channel_send">Enviar</string>
     <string name="channel_notification">Notificações</string>
     <string name="channel_update">Actualizações</string>
@@ -212,7 +211,6 @@
     <string name="title_advanced_rlah">Faça roaming como no país de origem</string>
     <string name="title_advanced_timeout">Conexão expira em (segundos)</string>
     <string name="title_advanced_ssl_harden">Fortificar conexões SSL</string>
-    <string name="title_advanced_socks">Usar proxy SOCKS</string>
     <string name="title_advanced_manage_connectivity">Gerir conectividade</string>
     <string name="title_advanced_caption_general">Geral</string>
     <string name="title_advanced_caption_list">Lista</string>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index 1f35e55aef..812955db0d 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -6,7 +6,6 @@
     <string name="app_limitations">De exemplu, mesajele vor fi mereu rescrise pentru a înlătura elementele nesigure și a îmbunătății lizibilitatea iar deschiderea legăturilor trebuie, pentru siguranță, confirmată.</string>
     <string name="app_crash">FairEmail nu suportă acest dispozitiv din cauza erorilor din Android ce duc la blocaje</string>
     <string name="app_exit">Apăsați din nou \'Înapoi\' pentru a ieși</string>
-    <string name="channel_service">Serviciu</string>
     <string name="channel_send">Trimite</string>
     <string name="channel_notification">Notificări</string>
     <string name="channel_update">Actualizări</string>
@@ -267,7 +266,6 @@
     <string name="title_advanced_rlah">Consideră roamingul ca național</string>
     <string name="title_advanced_timeout">Expirarea conexiunii (secunde)</string>
     <string name="title_advanced_ssl_harden">Întârire conexiuni SSL</string>
-    <string name="title_advanced_socks">Utilizați proxy SOCKS</string>
     <string name="title_advanced_manage_connectivity">Gestionare conexiuni</string>
     <string name="title_advanced_caption_general">Generale</string>
     <string name="title_advanced_caption_list">Listă</string>
@@ -433,7 +431,6 @@
     <string name="title_advanced_rlah_hint">În zona UE nu se tratează ca roaming</string>
     <string name="title_advanced_timeout_hint">Timpul de expirare a citirii/scrierii va fi setat la dublul intervalului de expirare a conexiunii. Valori mai mari au ca rezultat o utilizare mai mare a bateriei.</string>
     <string name="title_advanced_ssl_harden_hint">Activând această setare se vor dezactiva protocoalele și cifrările SSL slabe, putând duce la probleme de conectare</string>
-    <string name="title_advanced_socks_hint">Este nesigură folosirea unui server proxy pentru că aceste conexiuni nu sunt criptate</string>
     <string name="title_advanced_roaming_hint">Antetele mesajelor vor fi mereu descărcate și în roaming. Puteți folosi setările roaming ale dispozitivului pentru a dezactiva internetul atunci când sunteți în roaming.</string>
     <string name="title_advanced_browse_hint">Descarcă mai multe mesaje când se derulează în jos</string>
     <string name="title_advanced_layout_hint">Selectarea unui aspect mai compact și mărimea textului se poate face din meniul paginii de mesaje</string>
@@ -1119,7 +1116,6 @@
     <string name="title_dismiss">Renunță</string>
     <string name="title_snooze_now">Amână</string>
     <string name="title_loading">Se încarcă &#8230;</string>
-    <string name="title_set">Setează</string>
     <string name="title_fetching_again">Se descarcă iar mesajele de pe server</string>
     <string name="title_conversation_actions">Acțiuni</string>
     <string name="title_conversation_action_reply">Răspunde cu: \'%1$s\'</string>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 9e75e04bdd..24f6a5c7f0 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -6,7 +6,6 @@
     <string name="app_limitations">Например, сообщения всегда будут переформатированы, чтобы удалить небезопасные элементы и улучшить читабельность, а также открытие ссылок требует подтверждения в целях безопасности.</string>
     <string name="app_crash">FairEmail не поддерживается на этом устройстве, так как ошибки в Android вызывают сбои</string>
     <string name="app_exit">Для выхода снова перейдите \"назад\"</string>
-    <string name="channel_service">Служба</string>
     <string name="channel_send">Отправка</string>
     <string name="channel_notification">Уведомления</string>
     <string name="channel_update">Обновления</string>
@@ -280,7 +279,6 @@
     <string name="title_advanced_rlah">В роуминге как дома</string>
     <string name="title_advanced_timeout">Время ожидания соединения (сек.)</string>
     <string name="title_advanced_ssl_harden">Усиленные SSL-соединения</string>
-    <string name="title_advanced_socks">Использовать SOCKS-прокси</string>
     <string name="title_advanced_manage_connectivity">Управление подключением</string>
     <string name="title_advanced_caption_general">По умолчанию</string>
     <string name="title_advanced_caption_list">Список</string>
@@ -317,6 +315,7 @@
     <string name="title_advanced_subject_italic">Показывать тему сообщения курсивом</string>
     <string name="title_advanced_subject_elipsed">При необходимости сокращать тему сообщения</string>
     <string name="title_advanced_keywords">Показывать ключевые слова в заголовке сообщения</string>
+    <string name="title_advanced_labels">Показывать метки Gmail в заголовке сообщения</string>
     <string name="title_advanced_flags">Показывать метки избранного</string>
     <string name="title_advanced_flags_background">Цветной фон вместо цветных меток избранного</string>
     <string name="title_advanced_preview">Показывать предпросмотр сообщения</string>
@@ -446,7 +445,6 @@
     <string name="title_advanced_rlah_hint">Предполагать отсутствие роуминга внутри ЕС</string>
     <string name="title_advanced_timeout_hint">Время ожидания для чтения/записи будет установлено в два раза больше времени ожидания соединения. Ещё большие значения могут увеличить расход аккумулятора.</string>
     <string name="title_advanced_ssl_harden_hint">Включение этой функции отключит слабые протоколы и алгоритмы SSL, что может привести к проблемам с соединением</string>
-    <string name="title_advanced_socks_hint">Использование удалённого прокси-сервера небезопасно, потому что прокси-соединения не зашифрованы</string>
     <string name="title_advanced_roaming_hint">Заголовки сообщений всегда будут загружаться в роуминге. Вы можете использовать настройки устройства для отключения интернета в роуминге.</string>
     <string name="title_advanced_browse_hint">Получать больше сообщений при прокрутке вниз</string>
     <string name="title_advanced_layout_hint">Переключиться на компактный вид и изменить размера текста сообщения можно через верхнее меню панели действий при просмотре сообщения</string>
@@ -646,6 +644,7 @@
     <string name="title_duplicate_in">Дубликат сообщения в %1$s</string>
     <string name="title_subject_reply">Re: %1$s</string>
     <string name="title_subject_forward">Fwd: %1$s</string>
+    <string name="title_buttons">Кнопки</string>
     <string name="title_seen">Отметить как прочитанное</string>
     <string name="title_unseen">Отметить как непрочитанное</string>
     <string name="title_hide">Скрыть</string>
@@ -670,6 +669,7 @@
     <string name="title_raw_save">Сохранить оригинал сообщения</string>
     <string name="title_raw_send">Отправить как вложение</string>
     <string name="title_manage_keywords">Управление ключами (словами)</string>
+    <string name="title_manage_labels">Управление метками Gmail</string>
     <string name="title_add_keyword">Добавить ключ (слово)</string>
     <string name="title_show_inline">Показывать встроенные вложения</string>
     <string name="title_download_all">Загрузить все</string>
@@ -1132,7 +1132,6 @@
     <string name="title_dismiss">Отклонить</string>
     <string name="title_snooze_now">Отложить</string>
     <string name="title_loading">Загрузка&#8230;</string>
-    <string name="title_set">Применить</string>
     <string name="title_fetching_again">Заново загружаем сообщения с сервера</string>
     <string name="title_conversation_actions">Действия</string>
     <string name="title_conversation_action_reply">Ответить на: \'%1$s\'</string>
diff --git a/app/src/main/res/values-sl-rSI/strings.xml b/app/src/main/res/values-sl-rSI/strings.xml
index 90a8c2c9db..57e5cd3773 100644
--- a/app/src/main/res/values-sl-rSI/strings.xml
+++ b/app/src/main/res/values-sl-rSI/strings.xml
@@ -6,7 +6,6 @@
     <string name="app_limitations">Na primer sporočila bodo vedno preoblikovana, da se odstranijo nevarni elementi in izboljša berljivost, odpiranje povezav pa je treba potrditi.</string>
     <string name="app_crash">FairEmail na tej napravi ni podprt, ker hrošči v Androidu povzročajo sesutja.</string>
     <string name="app_exit">Za izhod še enkrat pritisnite \'Nazaj\'.</string>
-    <string name="channel_service">Storitev</string>
     <string name="channel_send">Pošlji</string>
     <string name="channel_notification">Obvestila</string>
     <string name="channel_update">Posodobitve</string>
@@ -267,7 +266,6 @@
     <string name="title_advanced_rlah">Gostuj kot doma</string>
     <string name="title_advanced_timeout">Časovna omejitev povezave (v sekundah)</string>
     <string name="title_advanced_ssl_harden">Utrdi povezave SSL</string>
-    <string name="title_advanced_socks">Uporabi posr. strežnik SOCKS</string>
     <string name="title_advanced_manage_connectivity">Upravljaj s povezljivostjo</string>
     <string name="title_advanced_caption_general">Splošno</string>
     <string name="title_advanced_caption_list">Seznam</string>
@@ -417,7 +415,6 @@
     <string name="title_advanced_rlah_hint">Program predvideva, da v EU-ju ni gostovanja.</string>
     <string name="title_advanced_timeout_hint">Časovna omejitev za branje/pisanje bo nastavljena na dvakratno vrednost časovne omejitve povezave.  Višje vrednosti bodo povzročile večjo porabo energije.</string>
     <string name="title_advanced_ssl_harden_hint">Omogočanje tega bo onemogočilo šibke protokole SSL in šifre, kar lahko povzroči težave pri povezavi.</string>
-    <string name="title_advanced_socks_hint">Uporaba oddaljenega posredniškega strežnika ni varna, ker posredniške povezave niso šifrirane.</string>
     <string name="title_advanced_roaming_hint">Med gostovanjem bodo glave sporočil vedno prenesene.  Za onemogočanje interneta med gostovanjem lahko uporabite nastavitve naprave za gostovanje.</string>
     <string name="title_advanced_browse_hint">Ob pomikanju navzdol prenesi več sporočil</string>
     <string name="title_advanced_layout_hint">Preklop na bolj strnjeno razporeditev in spremembo velikosti pisave sporočila lahko opravite v meniju zgornje vrstice z dejanji v pogledu sporočil.</string>
@@ -1080,7 +1077,6 @@
     <string name="title_dismiss">Opusti</string>
     <string name="title_snooze_now">Dremež</string>
     <string name="title_loading">Nalaganje &#8230;</string>
-    <string name="title_set">Nastavi</string>
     <string name="title_fetching_again">Ponovno pridobivanje sporočil s strežnika</string>
     <string name="title_conversation_actions">Dejanja</string>
     <string name="title_conversation_action_reply">Odgovori s/z: \'%1$s\'</string>
diff --git a/app/src/main/res/values-sr-rSP/strings.xml b/app/src/main/res/values-sr-rSP/strings.xml
index ba6fcbd322..64a669178c 100644
--- a/app/src/main/res/values-sr-rSP/strings.xml
+++ b/app/src/main/res/values-sr-rSP/strings.xml
@@ -6,7 +6,6 @@
     <string name="app_limitations">Нпр. поруке ће увек бити форматиране тако да се уклоне небезбедни елементи и да се побољша читљивост, а отварање веза мора да се, ради безбедности, потврди.</string>
     <string name="app_crash">FairEmail није подржан на овом уређају пошто Андроид грешке изазивају рушења апликације</string>
     <string name="app_exit">За излаз још једном притисните „назад“</string>
-    <string name="channel_service">Сервис</string>
     <string name="channel_send">Пошаљи</string>
     <string name="channel_notification">Обавештења</string>
     <string name="channel_update">Ажурирања</string>
@@ -213,7 +212,6 @@
     <string name="title_advanced_download">Аутоматски преузимај поруке и прилоге на конекцијама које мере потрошњу података до</string>
     <string name="title_advanced_roaming">Преузимај поруке и прилоге у ромингу</string>
     <string name="title_advanced_rlah">Роминг као да сте кући</string>
-    <string name="title_advanced_socks">Користи SOCKS прокси</string>
     <string name="title_advanced_manage_connectivity">Управљање конекцијама</string>
     <string name="title_advanced_caption_general">Генерално</string>
     <string name="title_advanced_caption_list">Списак</string>
@@ -324,7 +322,6 @@
     <string name="title_advanced_metered_hint">Конекције које мере потрошњу података су обично мобилне конекције или плаћени Wi-Fi хотспотови</string>
     <string name="title_advanced_metered_warning">Искључивањем ове опције ћете онемогућити примање и слање порука са мобилних конекција</string>
     <string name="title_advanced_rlah_hint">Претпостави да нема роминга унутар Европске Уније</string>
-    <string name="title_advanced_socks_hint">Коришћење удаљеног прокси сервера је небезбедно пошто прокси везе нису шифроване</string>
     <string name="title_advanced_roaming_hint">Заглавља порука ће се увек скидати у ромингу. Користите поставке роминга Вашег уређаја да тамо искључите интернет у ромингу.</string>
     <string name="title_advanced_browse_hint">Дохвати још порука при превлачењу на доле</string>
     <string name="title_advanced_layout_hint">Пребацивање на компактнији приказ и промена величина текста поруке може да се уради из горње акционе траке у порукама</string>
@@ -901,7 +898,6 @@
     <string name="title_dismiss">Одбаци</string>
     <string name="title_snooze_now">Одложи</string>
     <string name="title_loading">Учитавам &#8230;</string>
-    <string name="title_set">Постави</string>
     <string name="title_conversation_actions">Акције</string>
     <string name="title_icalendar_accept">Прихвати</string>
     <string name="title_icalendar_decline">Одбиј</string>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index 473cdc780f..fd39dd03aa 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -6,7 +6,6 @@
     <string name="app_limitations">Meddelanden kommer till exempel alltid att omformateras för att avlägsna osäkra element och för att förbättra läsbarheten och öppna länkar måste bekräftas för säkerheten.</string>
     <string name="app_crash">FairEmail stöds inte på den här enheten eftersom buggar i Android orsakar kraschar</string>
     <string name="app_exit">Tryck \"tillbaka\" igen för att avsluta</string>
-    <string name="channel_service">Tjänst</string>
     <string name="channel_send">Skicka</string>
     <string name="channel_notification">Aviseringar</string>
     <string name="channel_update">Uppdateringar</string>
@@ -257,7 +256,6 @@
     <string name="title_advanced_rlah">Roaming som hemma</string>
     <string name="title_advanced_timeout">Timeout för anslutning (sekunder)</string>
     <string name="title_advanced_ssl_harden">Strikta SSL-anslutningar</string>
-    <string name="title_advanced_socks">Använd SOCKS-proxy</string>
     <string name="title_advanced_manage_connectivity">Hantera anslutning</string>
     <string name="title_advanced_caption_general">Allmänt</string>
     <string name="title_advanced_caption_list">Lista</string>
@@ -424,7 +422,6 @@
     <string name="title_advanced_rlah_hint">Förutsatt ingen roaming inom EU</string>
     <string name="title_advanced_timeout_hint">Tidsgräns för läs/skriva kommer att ställas in på den dubbla av anslutningens tidsgräns. Högre värden kommer att resultera i mer batterianvändning.</string>
     <string name="title_advanced_ssl_harden_hint">Aktivering av detta kommer att inaktivera svaga SSL-protokoll och chiffer, vilket kan leda till anslutningsproblem</string>
-    <string name="title_advanced_socks_hint">Användning av en proxyserver är osäker eftersom proxyanslutningar inte är krypterade</string>
     <string name="title_advanced_roaming_hint">Meddelanderubriker kommer alltid att hämtas vid roaming. Du kan använda enhetens roaminginställning för att inaktivera internet vid roaming.</string>
     <string name="title_advanced_browse_hint">Hämta fler meddelanden när du rullar ner</string>
     <string name="title_advanced_layout_hint">Växla till en mer kompakt layout och ändra meddelandetextstorleken kan göras i menyn högst upp i meddelandevyn</string>
@@ -624,7 +621,6 @@
     <string name="title_duplicate_in">Duplicerade meddelande i %1$s</string>
     <string name="title_subject_reply">Sv: %1$s</string>
     <string name="title_subject_forward">Vb: %1$s</string>
-    <string name="title_extras">Extra knappar</string>
     <string name="title_seen">Märk som läst</string>
     <string name="title_unseen">Märk som oläst</string>
     <string name="title_hide">Dölj</string>
@@ -1112,7 +1108,6 @@
     <string name="title_dismiss">Avfärda</string>
     <string name="title_snooze_now">Slumra</string>
     <string name="title_loading">Läser in &#8230;</string>
-    <string name="title_set">Ställ in</string>
     <string name="title_fetching_again">Hämtar meddelande igen från servern</string>
     <string name="title_conversation_actions">Åtgärder</string>
     <string name="title_conversation_action_reply">Svara med: \'%1$s\'</string>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index 242d581639..84fe49de51 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -6,7 +6,6 @@
     <string name="app_limitations">Örneğin, güvenli olmayan öğeleri çıkarmak ve okunabilirliği arttırmak için, iletiler daima tekrardan düzenlenecektir ve bağlantıları açmak güvenlik açısından doğrulama gerektirecektir.</string>
     <string name="app_crash">FairEmail bu aygıtı desteklemiyor. Çünkü Androiddeki hatalar çökmelere neden oluyor</string>
     <string name="app_exit">Çıkmak için tekrar \'Geri\'yi tıklayın</string>
-    <string name="channel_service">Hizmet</string>
     <string name="channel_send">Gönder</string>
     <string name="channel_notification">Bildirimler</string>
     <string name="channel_update">Güncellemeler</string>
@@ -234,7 +233,6 @@
     <string name="title_advanced_roaming">Gezeleme yaparken iletileri ve ekleri indir</string>
     <string name="title_advanced_rlah">Evde gibi dolaşmak</string>
     <string name="title_advanced_ssl_harden">SSL bağlantılarını sağlamlaştır</string>
-    <string name="title_advanced_socks">SOCKS proxy kullan</string>
     <string name="title_advanced_manage_connectivity">Bağlanabilirliği yönet</string>
     <string name="title_advanced_caption_general">Genel</string>
     <string name="title_advanced_caption_list">Liste</string>
@@ -371,7 +369,6 @@
     <string name="title_advanced_metered_hint">Ölçülü bağlantılar genellikle mobil bağlantılar veya ücretli Wi-Fi noktalarıdır</string>
     <string name="title_advanced_metered_warning">Bu seçeneğin devre dışı bırakılması mobil internet bağlantısında ileti almayı ve göndermeyi devre dışı bırakacaktır</string>
     <string name="title_advanced_rlah_hint">AB içinde dolaşımda olmadığını varsayma</string>
-    <string name="title_advanced_socks_hint">Proxy bağlantıları şifreli olmadığından uzak bir proxy sunucusu kullanmak güvensizdir</string>
     <string name="title_advanced_roaming_hint">Dolaşım halindeyken mesaj başlıkları her zaman alınacaktır. Cihazın dolaşım ayarlarından dolaşım halindeyken interneti devre dışı bırakabilirsiniz.</string>
     <string name="title_advanced_browse_hint">Aşağı doğru kaydırdığında daha çok ileti getirir</string>
     <string name="title_advanced_layout_hint">Daha kompakt bir yerleşime geçmek ve mesaj metin boyutunu değiştirmek, mesaj görünümündeki üst eylem çubuğu menüsünden yapılabilir</string>
@@ -997,7 +994,6 @@
     <string name="title_dismiss">Reddet</string>
     <string name="title_snooze_now">Ertele</string>
     <string name="title_loading">Yükleniyor &#8230;</string>
-    <string name="title_set">Ayarla</string>
     <string name="title_fetching_again">Mesaj sunucudan tekrar alınıyor</string>
     <string name="title_conversation_actions">Eylemler</string>
     <string name="title_conversation_action_reply">\'%1$s\' ile yanıtla</string>
diff --git a/app/src/main/res/values-uk-rUA/strings.xml b/app/src/main/res/values-uk-rUA/strings.xml
index fd4b93dacf..905aa1cd39 100644
--- a/app/src/main/res/values-uk-rUA/strings.xml
+++ b/app/src/main/res/values-uk-rUA/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_exit">Натисніть \"Назад\" знову, щоб вийти</string>
-    <string name="channel_service">Послуга</string>
     <string name="channel_send">Надіслати</string>
     <string name="channel_notification">Сповіщення</string>
     <string name="channel_update">Оновлення</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 20d4591ba2..d187cea2c1 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -6,7 +6,6 @@
     <string name="app_limitations">例如，为了去除不安全元素并提高阅读性，邮件将总被重建格式；出于安全考虑，打开邮件内链接时需经用户确认</string>
     <string name="app_crash">FairEmail不支持该设备，因为 android 中的bug会导致崩溃</string>
     <string name="app_exit">再按一次返回键退出</string>
-    <string name="channel_service">服务</string>
     <string name="channel_send">发送</string>
     <string name="channel_notification">通知</string>
     <string name="channel_update">更新</string>
@@ -65,6 +64,7 @@
     <string name="title_notification_idle">空闲</string>
     <string name="title_notification_failed">\'%1$s\' 失败</string>
     <string name="title_notification_alert">\'%1$s\' 服务器警告</string>
+    <string name="title_notification_sending_failed">发送至 %1$s 失败</string>
     <string name="title_of">%1$s/%2$s</string>
     <string name="title_name_count">%1$s (%2$s)</string>
     <string name="title_name_plus">%1$s +%2$d</string>
@@ -246,7 +246,6 @@
     <string name="title_advanced_rlah">国内漫游</string>
     <string name="title_advanced_timeout">连接超时 (秒)</string>
     <string name="title_advanced_ssl_harden">加强 SSL 连接</string>
-    <string name="title_advanced_socks">使用 SOCKS 代理</string>
     <string name="title_advanced_manage_connectivity">管理连接</string>
     <string name="title_advanced_caption_general">常规​​​​​</string>
     <string name="title_advanced_caption_list">列表</string>
@@ -413,7 +412,6 @@
     <string name="title_advanced_rlah_hint">假定欧盟境内不漫游</string>
     <string name="title_advanced_timeout_hint">读/写超时时间将翻倍，值越高将越耗电</string>
     <string name="title_advanced_ssl_harden_hint">启用此选项将禁用较弱的SSL协议和密码，这可能导致连接问题</string>
-    <string name="title_advanced_socks_hint">使用远程代理服务器不安全，因为代理连接未加密</string>
     <string name="title_advanced_roaming_hint">当漫游时，将始终获取消息头。您可以使用设备的漫游设置在漫游时禁用互联网。</string>
     <string name="title_advanced_browse_hint">向下滚动时拉取更多邮件</string>
     <string name="title_advanced_layout_hint">切换到更为紧凑的布局，改变消息文本大小可以在邮件视图中的顶部动作栏菜单中完成</string>
@@ -613,7 +611,7 @@
     <string name="title_duplicate_in">%1$s 中的重复消息</string>
     <string name="title_subject_reply">回复：%1$s</string>
     <string name="title_subject_forward">转发：%1$s</string>
-    <string name="title_extras">额外按钮</string>
+    <string name="title_buttons">按钮</string>
     <string name="title_seen">标记为已读</string>
     <string name="title_unseen">标记为未读</string>
     <string name="title_hide">隐藏</string>
@@ -1101,7 +1099,6 @@
     <string name="title_dismiss">忽略</string>
     <string name="title_snooze_now">打盹</string>
     <string name="title_loading">&#8230;加载中</string>
-    <string name="title_set">设定</string>
     <string name="title_fetching_again">再次从服务器获取消息</string>
     <string name="title_conversation_actions">操作</string>
     <string name="title_conversation_action_reply">回复：\'%1$s\'</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 73e88e9db9..1762a1c72c 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -6,7 +6,6 @@
     <string name="app_limitations">舉例來說，郵件的內容會因為移除不安全的元素及改進閱讀體驗而重新排版，而且打開所有超連結都會需要您的確認。</string>
     <string name="app_crash">預設頻道</string>
     <string name="app_exit">再次「返回」離開程式</string>
-    <string name="channel_service">服務</string>
     <string name="channel_send">寄送</string>
     <string name="channel_notification">通知</string>
     <string name="channel_update">更新</string>
@@ -222,7 +221,6 @@
     <string name="title_advanced_roaming">漫遊時下載訊息及附件</string>
     <string name="title_advanced_timeout">連線超時（秒）</string>
     <string name="title_advanced_ssl_harden">嚴格的 SSL 連線</string>
-    <string name="title_advanced_socks">使用 SOCKS 代理</string>
     <string name="title_advanced_manage_connectivity">管理連線方式</string>
     <string name="title_advanced_caption_general">一般</string>
     <string name="title_advanced_caption_list">清單</string>