From 9fc8dffd2d0f3e53e72e99bb02e20dc8e159922e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolf-Martell=20Montw=C3=A9?= <wolf@thunderbird.net>
Date: Fri, 22 Sep 2023 17:44:18 +0200
Subject: [PATCH 1/5] Remove AccountSetupNames

---
 app/k9mail/src/main/AndroidManifest.xml       |   5 -
 .../k9/activity/setup/AccountSetupBasics.kt   |   2 +-
 .../k9/activity/setup/AccountSetupNames.java  | 102 ------------------
 .../activity/setup/AccountSetupOptions.java   |   2 +-
 .../main/res/layout/account_setup_names.xml   |  59 ----------
 .../legacy/src/main/res/values-ar/strings.xml |   3 -
 .../legacy/src/main/res/values-be/strings.xml |   3 -
 .../legacy/src/main/res/values-bg/strings.xml |   3 -
 .../legacy/src/main/res/values-br/strings.xml |   3 -
 .../legacy/src/main/res/values-ca/strings.xml |   3 -
 .../legacy/src/main/res/values-cs/strings.xml |   3 -
 .../legacy/src/main/res/values-cy/strings.xml |   3 -
 .../legacy/src/main/res/values-da/strings.xml |   3 -
 .../legacy/src/main/res/values-de/strings.xml |   3 -
 .../legacy/src/main/res/values-el/strings.xml |   3 -
 .../legacy/src/main/res/values-eo/strings.xml |   3 -
 .../legacy/src/main/res/values-es/strings.xml |   3 -
 .../legacy/src/main/res/values-et/strings.xml |   3 -
 .../legacy/src/main/res/values-eu/strings.xml |   3 -
 .../legacy/src/main/res/values-fa/strings.xml |   3 -
 .../legacy/src/main/res/values-fi/strings.xml |   3 -
 .../legacy/src/main/res/values-fr/strings.xml |   3 -
 .../legacy/src/main/res/values-fy/strings.xml |   3 -
 .../legacy/src/main/res/values-gd/strings.xml |   3 -
 .../legacy/src/main/res/values-gl/strings.xml |   3 -
 .../legacy/src/main/res/values-hr/strings.xml |   3 -
 .../legacy/src/main/res/values-hu/strings.xml |   3 -
 .../legacy/src/main/res/values-in/strings.xml |   3 -
 .../legacy/src/main/res/values-is/strings.xml |   3 -
 .../legacy/src/main/res/values-it/strings.xml |   3 -
 .../legacy/src/main/res/values-iw/strings.xml |   3 -
 .../legacy/src/main/res/values-ja/strings.xml |   3 -
 .../legacy/src/main/res/values-ko/strings.xml |   3 -
 .../legacy/src/main/res/values-lt/strings.xml |   3 -
 .../legacy/src/main/res/values-lv/strings.xml |   3 -
 .../legacy/src/main/res/values-ml/strings.xml |   3 -
 .../legacy/src/main/res/values-nb/strings.xml |   3 -
 .../legacy/src/main/res/values-nl/strings.xml |   3 -
 .../legacy/src/main/res/values-pl/strings.xml |   3 -
 .../src/main/res/values-pt-rBR/strings.xml    |   3 -
 .../src/main/res/values-pt-rPT/strings.xml    |   3 -
 .../legacy/src/main/res/values-ro/strings.xml |   3 -
 .../legacy/src/main/res/values-ru/strings.xml |   3 -
 .../legacy/src/main/res/values-sk/strings.xml |   3 -
 .../legacy/src/main/res/values-sl/strings.xml |   3 -
 .../legacy/src/main/res/values-sq/strings.xml |   3 -
 .../legacy/src/main/res/values-sr/strings.xml |   3 -
 .../legacy/src/main/res/values-sv/strings.xml |   3 -
 .../legacy/src/main/res/values-tr/strings.xml |   3 -
 .../legacy/src/main/res/values-uk/strings.xml |   3 -
 .../src/main/res/values-zh-rCN/strings.xml    |   3 -
 .../src/main/res/values-zh-rTW/strings.xml    |   3 -
 app/ui/legacy/src/main/res/values/strings.xml |   4 -
 53 files changed, 2 insertions(+), 313 deletions(-)
 delete mode 100644 app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupNames.java
 delete mode 100644 app/ui/legacy/src/main/res/layout/account_setup_names.xml

diff --git a/app/k9mail/src/main/AndroidManifest.xml b/app/k9mail/src/main/AndroidManifest.xml
index 1d0d83d85..69b476f9a 100644
--- a/app/k9mail/src/main/AndroidManifest.xml
+++ b/app/k9mail/src/main/AndroidManifest.xml
@@ -100,11 +100,6 @@
             android:configChanges="locale"
             android:label="@string/account_setup_options_title"/>
 
-        <activity
-            android:name=".activity.setup.AccountSetupNames"
-            android:configChanges="locale"
-            android:label="@string/account_setup_names_title"/>
-
         <activity
             android:name=".activity.ChooseAccount"
             android:configChanges="locale"
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupBasics.kt b/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupBasics.kt
index 3b877cf35..dbb53ee27 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupBasics.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupBasics.kt
@@ -343,7 +343,7 @@ class AccountSetupBasics : K9Activity() {
             preferences.saveAccount(account)
             Core.setServicesEnabled(applicationContext)
 
-            AccountSetupNames.actionSetNames(this, account)
+            // AccountSetupNames.actionSetNames(this, account)
         }
     }
 
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupNames.java b/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupNames.java
deleted file mode 100644
index 3c0d67279..000000000
--- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupNames.java
+++ /dev/null
@@ -1,102 +0,0 @@
-
-package com.fsck.k9.activity.setup;
-
-
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.text.Editable;
-import android.text.TextWatcher;
-import android.text.method.TextKeyListener;
-import android.text.method.TextKeyListener.Capitalize;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-import android.widget.EditText;
-
-import com.fsck.k9.Account;
-import com.fsck.k9.Preferences;
-import com.fsck.k9.ui.base.K9Activity;
-import com.fsck.k9.activity.MessageList;
-import com.fsck.k9.ui.R;
-import com.fsck.k9.helper.Utility;
-
-@Deprecated(since = "New account setup flow")
-public class AccountSetupNames extends K9Activity implements OnClickListener {
-    private static final String EXTRA_ACCOUNT = "account";
-
-    private EditText mDescription;
-
-    private EditText mName;
-
-    private Account mAccount;
-
-    private Button mDoneButton;
-
-    public static void actionSetNames(Context context, Account account) {
-        Intent i = new Intent(context, AccountSetupNames.class);
-        i.putExtra(EXTRA_ACCOUNT, account.getUuid());
-        context.startActivity(i);
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setLayout(R.layout.account_setup_names);
-        setTitle(R.string.account_setup_names_title);
-
-        mDescription = findViewById(R.id.account_description);
-        mName = findViewById(R.id.account_name);
-        mDoneButton = findViewById(R.id.done);
-        mDoneButton.setOnClickListener(this);
-
-        TextWatcher validationTextWatcher = new TextWatcher() {
-            public void afterTextChanged(Editable s) {
-                validateFields();
-            }
-
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-            }
-
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-            }
-        };
-        mName.addTextChangedListener(validationTextWatcher);
-
-        mName.setKeyListener(TextKeyListener.getInstance(false, Capitalize.WORDS));
-
-        String accountUuid = getIntent().getStringExtra(EXTRA_ACCOUNT);
-        mAccount = Preferences.getPreferences().getAccount(accountUuid);
-
-        String senderName = mAccount.getSenderName();
-        if (senderName != null) {
-            mName.setText(senderName);
-        }
-
-        if (!Utility.requiredFieldValid(mName)) {
-            mDoneButton.setEnabled(false);
-        }
-    }
-
-    private void validateFields() {
-        mDoneButton.setEnabled(Utility.requiredFieldValid(mName));
-        Utility.setCompoundDrawablesAlpha(mDoneButton, mDoneButton.isEnabled() ? 255 : 128);
-    }
-
-    protected void onNext() {
-        if (Utility.requiredFieldValid(mDescription)) {
-            mAccount.setName(mDescription.getText().toString());
-        }
-        mAccount.setSenderName(mName.getText().toString());
-        mAccount.markSetupFinished();
-        Preferences.getPreferences().saveAccount(mAccount);
-        finishAffinity();
-        MessageList.launch(this, mAccount);
-    }
-
-    public void onClick(View v) {
-        if (v.getId() == R.id.done) {
-            onNext();
-        }
-    }
-}
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupOptions.java b/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupOptions.java
index 42228af00..6be4aaa7d 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupOptions.java
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupOptions.java
@@ -114,7 +114,7 @@ public class AccountSetupOptions extends K9Activity implements OnClickListener {
 
         Preferences.getPreferences().saveAccount(mAccount);
         Core.setServicesEnabled(this);
-        AccountSetupNames.actionSetNames(this, mAccount);
+//        AccountSetupNames.actionSetNames(this, mAccount);
     }
 
     public void onClick(View v) {
diff --git a/app/ui/legacy/src/main/res/layout/account_setup_names.xml b/app/ui/legacy/src/main/res/layout/account_setup_names.xml
deleted file mode 100644
index 2a9f68c12..000000000
--- a/app/ui/legacy/src/main/res/layout/account_setup_names.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:orientation="vertical"
-        tools:context="com.fsck.k9.activity.setup.AccountSetupNames">
-
-    <include layout="@layout/toolbar"/>
-
-    <ScrollView
-            android:layout_width="fill_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1"
-            android:padding="6dip"
-            android:fadingEdge="none"
-            android:scrollbarStyle="outsideInset">
-
-        <LinearLayout
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal|center_vertical"
-                android:orientation="vertical">
-
-            <com.google.android.material.textfield.TextInputLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/account_description"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/account_setup_names_account_name_label"
-                    android:singleLine="true"/>
-            </com.google.android.material.textfield.TextInputLayout>
-
-            <com.google.android.material.textfield.TextInputLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/account_name"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/account_setup_names_user_name_label"
-                    android:singleLine="true"
-                    android:inputType="textPersonName"/>
-            </com.google.android.material.textfield.TextInputLayout>
-
-            <View
-                    android:layout_height="0dip"
-                    android:layout_width="fill_parent"
-                    android:layout_weight="1"/>
-        </LinearLayout>
-    </ScrollView>
-
-    <include layout="@layout/wizard_done"/>
-</LinearLayout>
diff --git a/app/ui/legacy/src/main/res/values-ar/strings.xml b/app/ui/legacy/src/main/res/values-ar/strings.xml
index b6402c336..9facad5b5 100644
--- a/app/ui/legacy/src/main/res/values-ar/strings.xml
+++ b/app/ui/legacy/src/main/res/values-ar/strings.xml
@@ -339,9 +339,6 @@
   <string name="account_setup_check_settings_authenticate">المصادقة \u2026</string>
   <string name="account_setup_check_settings_fetch">إحضار إعدادات الحساب ... </string>
   <string name="account_setup_check_settings_canceling_msg">جارٍ الإلغاء\u2026</string>
-  <string name="account_setup_names_title">لقد انتهيت تقريبًا</string>
-  <string name="account_setup_names_account_name_label">اَعطِ هذا الحساب اسمًا (اختياري):</string>
-  <string name="account_setup_names_user_name_label">اكتب اسمك (تظهر في الرسائل الصادرة):</string>
   <string name="account_setup_account_type_title">نوع الحساب</string>
   <string name="account_setup_account_type_instructions">ما نوع هذا الحساب؟</string>
   <string name="account_setup_account_type_pop_action">POP3</string>
diff --git a/app/ui/legacy/src/main/res/values-be/strings.xml b/app/ui/legacy/src/main/res/values-be/strings.xml
index d911c337b..926e686e8 100644
--- a/app/ui/legacy/src/main/res/values-be/strings.xml
+++ b/app/ui/legacy/src/main/res/values-be/strings.xml
@@ -334,9 +334,6 @@ K-9 Mail - шматфункцыянальны свабодны паштовы к
   <string name="account_setup_check_settings_authenticate">Аўтэнтыфікацыя\u2026</string>
   <string name="account_setup_check_settings_fetch">Атрыманне налад акаўнта\u2026</string>
   <string name="account_setup_check_settings_canceling_msg">Скасаванне\u2026</string>
-  <string name="account_setup_names_title">Амаль завершана!</string>
-  <string name="account_setup_names_account_name_label">Даць акаўнту назву (неабавязкова):</string>
-  <string name="account_setup_names_user_name_label">Ваша імя (бачна адрасату):</string>
   <string name="account_setup_account_type_title">Тып акаўнта</string>
   <string name="account_setup_account_type_instructions">Што гэта за акаўнт?</string>
   <string name="account_setup_account_type_pop_action">POP3</string>
diff --git a/app/ui/legacy/src/main/res/values-bg/strings.xml b/app/ui/legacy/src/main/res/values-bg/strings.xml
index 3ed5906e5..24d707fd2 100644
--- a/app/ui/legacy/src/main/res/values-bg/strings.xml
+++ b/app/ui/legacy/src/main/res/values-bg/strings.xml
@@ -299,9 +299,6 @@ K-9 Mail е мощен, безплатен имейл клиент за Андр
   <string name="account_setup_check_settings_authenticate">Идентифициране\u2026</string>
   <string name="account_setup_check_settings_fetch">Получава настройките на профила\u2026</string>
   <string name="account_setup_check_settings_canceling_msg">Отказва\u2026</string>
-  <string name="account_setup_names_title">Почти проключихте!</string>
-  <string name="account_setup_names_account_name_label">Дайте име на профила (незадължително):</string>
-  <string name="account_setup_names_user_name_label">Въведете вашето име (ще се показва в изходящите съобщения):</string>
   <string name="account_setup_account_type_title">Тип на профила</string>
   <string name="account_setup_account_type_instructions">Какъв тип профил е това?</string>
   <string name="account_setup_account_type_pop_action">POP3</string>
diff --git a/app/ui/legacy/src/main/res/values-br/strings.xml b/app/ui/legacy/src/main/res/values-br/strings.xml
index 870dbdc52..b60cc1a72 100644
--- a/app/ui/legacy/src/main/res/values-br/strings.xml
+++ b/app/ui/legacy/src/main/res/values-br/strings.xml
@@ -280,9 +280,6 @@ Danevellit beugoù, kenlabourit war keweriusterioù nevez ha savit goulennoù wa
   <string name="account_setup_check_settings_authenticate">Dilesa\u2026</string>
   <string name="account_setup_check_settings_fetch">O kerc’hat arventennoù ar gont\u2026</string>
   <string name="account_setup_check_settings_canceling_msg">O nullañ\u2026</string>
-  <string name="account_setup_names_title">Tost echu!</string>
-  <string name="account_setup_names_account_name_label">Roit un anv d’ar gont-mañ (diret):</string>
-  <string name="account_setup_names_user_name_label">Skrivit hoc’h anv (diskouezet e vo er c’hemennadennoù kaset):</string>
   <string name="account_setup_account_type_title">Doare kont</string>
   <string name="account_setup_account_type_instructions">Peseurt doare kont eo?</string>
   <string name="account_setup_account_type_pop_action">POP3</string>
diff --git a/app/ui/legacy/src/main/res/values-ca/strings.xml b/app/ui/legacy/src/main/res/values-ca/strings.xml
index a66df5e25..4ccf034fd 100644
--- a/app/ui/legacy/src/main/res/values-ca/strings.xml
+++ b/app/ui/legacy/src/main/res/values-ca/strings.xml
@@ -331,9 +331,6 @@ Si us plau, envieu informes d\'errors, contribuïu-hi amb noves millores i feu p
   <string name="account_setup_check_settings_authenticate">S\'està autenticant\u2026</string>
   <string name="account_setup_check_settings_fetch">S\'està recuperant la configuració del compte\u2026</string>
   <string name="account_setup_check_settings_canceling_msg">S\'està cancel·lant\u2026</string>
-  <string name="account_setup_names_title">Ja gairebé hem acabat!</string>
-  <string name="account_setup_names_account_name_label">Dóna un nom a aquest compte (opcional):</string>
-  <string name="account_setup_names_user_name_label">Escriviu el nom (és el que es mostrarà als missatges sortints):</string>
   <string name="account_setup_account_type_title">Tipus de compte</string>
   <string name="account_setup_account_type_instructions">Quin tipus de compte és?</string>
   <string name="account_setup_account_type_pop_action">POP3</string>
diff --git a/app/ui/legacy/src/main/res/values-cs/strings.xml b/app/ui/legacy/src/main/res/values-cs/strings.xml
index 74353d631..56148e310 100644
--- a/app/ui/legacy/src/main/res/values-cs/strings.xml
+++ b/app/ui/legacy/src/main/res/values-cs/strings.xml
@@ -335,9 +335,6 @@ Hlášení o chyb, úpravy pro nové funkce a dotazy zadávejte prostřednictví
   <string name="account_setup_check_settings_authenticate">Přihlašuji se\u2026</string>
   <string name="account_setup_check_settings_fetch">Stahuji nastavení účtu\u2026</string>
   <string name="account_setup_check_settings_canceling_msg">Rušení\u2026</string>
-  <string name="account_setup_names_title">Téměř hotovo!</string>
-  <string name="account_setup_names_account_name_label">Pojmenujte tento účet (volitelné):</string>
-  <string name="account_setup_names_user_name_label">Zadejte své jméno (zobrazuje se v odchozích zprávách):</string>
   <string name="account_setup_account_type_title">Typ účtu</string>
   <string name="account_setup_account_type_instructions">O jaký typ účtu jde?</string>
   <string name="account_setup_account_type_pop_action">POP3</string>
diff --git a/app/ui/legacy/src/main/res/values-cy/strings.xml b/app/ui/legacy/src/main/res/values-cy/strings.xml
index bef237358..78f231d9e 100644
--- a/app/ui/legacy/src/main/res/values-cy/strings.xml
+++ b/app/ui/legacy/src/main/res/values-cy/strings.xml
@@ -322,9 +322,6 @@ Plîs rho wybod am unrhyw wallau, syniadau am nodweddion newydd, neu ofyn cwesti
   <string name="account_setup_check_settings_authenticate">Yn dilysu\u2026</string>
   <string name="account_setup_check_settings_fetch">Yn nôl gosodiadau\'r cyfrif\u2026</string>
   <string name="account_setup_check_settings_canceling_msg">Yn diddymu\u2026</string>
-  <string name="account_setup_names_title">Bron a gorffen!</string>
-  <string name="account_setup_names_account_name_label">Rhoi enw i\'r cyfrif hwn (dim yn ofynnol):</string>
-  <string name="account_setup_names_user_name_label">Dy enw (i\'w weld ar negeseuon sy\'n cael eu hanfon):</string>
   <string name="account_setup_account_type_title">Math o gyfrif</string>
   <string name="account_setup_account_type_instructions">Pa fath o gyfrif ydy hwn?</string>
   <string name="account_setup_account_type_pop_action">POP3</string>
diff --git a/app/ui/legacy/src/main/res/values-da/strings.xml b/app/ui/legacy/src/main/res/values-da/strings.xml
index 4be83125b..0be62f47b 100644
--- a/app/ui/legacy/src/main/res/values-da/strings.xml
+++ b/app/ui/legacy/src/main/res/values-da/strings.xml
@@ -326,9 +326,6 @@ Rapporter venligst fejl, forslag til nye funktioner eller stil spørgsmål på:
   <string name="account_setup_check_settings_authenticate">Autentiserer\u2026</string>
   <string name="account_setup_check_settings_fetch">Henter kontoindstillinger\u2026</string>
   <string name="account_setup_check_settings_canceling_msg">Afbryder\u2026</string>
-  <string name="account_setup_names_title">Næsten færdig!</string>
-  <string name="account_setup_names_account_name_label">Giv denne konto et navn (frivilligt):</string>
-  <string name="account_setup_names_user_name_label">Indtast dit navn (vises på udgående mails):</string>
   <string name="account_setup_account_type_title">Kontotype</string>
   <string name="account_setup_account_type_instructions">Hvilken type konto er dette?</string>
   <string name="account_setup_account_type_pop_action">POP3</string>
diff --git a/app/ui/legacy/src/main/res/values-de/strings.xml b/app/ui/legacy/src/main/res/values-de/strings.xml
index d92749bb7..e77b07a07 100644
--- a/app/ui/legacy/src/main/res/values-de/strings.xml
+++ b/app/ui/legacy/src/main/res/values-de/strings.xml
@@ -330,9 +330,6 @@ Bitte sende Fehlerberichte, Ideen für neue Funktionen und stelle Fragen an
   <string name="account_setup_check_settings_authenticate">Authentifizierung\u2026</string>
   <string name="account_setup_check_settings_fetch">Kontoeinstellungen werden geladen\u2026</string>
   <string name="account_setup_check_settings_canceling_msg">Aktion wird abgebrochen\u2026</string>
-  <string name="account_setup_names_title">Fast fertig!</string>
-  <string name="account_setup_names_account_name_label">Kontoname (optional):</string>
-  <string name="account_setup_names_user_name_label">Dein Name (Anzeige bei ausgehenden Nachrichten):</string>
   <string name="account_setup_account_type_title">Kontotyp</string>
   <string name="account_setup_account_type_instructions">Art des Kontos?</string>
   <string name="account_setup_account_type_pop_action">POP3-Konto</string>
diff --git a/app/ui/legacy/src/main/res/values-el/strings.xml b/app/ui/legacy/src/main/res/values-el/strings.xml
index 6c00cd1fb..396b95a4a 100644
--- a/app/ui/legacy/src/main/res/values-el/strings.xml
+++ b/app/ui/legacy/src/main/res/values-el/strings.xml
@@ -329,9 +329,6 @@
   <string name="account_setup_check_settings_authenticate">Διακρίβωση στοιχείων\u2026</string>
   <string name="account_setup_check_settings_fetch">Μετάκληση πληροφοριών λογαριασμού\u2026</string>
   <string name="account_setup_check_settings_canceling_msg">Ακύρωση\u2026</string>
-  <string name="account_setup_names_title">Σχεδόν έτοιμο!</string>
-  <string name="account_setup_names_account_name_label">Ονομασία λογαριασμού (Προαιρετικό):</string>
-  <string name="account_setup_names_user_name_label">Όνομα αποστολέα (προβάλλεται στα εξερχόμενα μηνύματα):</string>
   <string name="account_setup_account_type_title">Τύπος λογαριασμού</string>
   <string name="account_setup_account_type_instructions">Τι λογαριασμός είναι αυτός;</string>
   <string name="account_setup_account_type_pop_action">POP3</string>
diff --git a/app/ui/legacy/src/main/res/values-eo/strings.xml b/app/ui/legacy/src/main/res/values-eo/strings.xml
index b6c8cb7a6..9fade1c8f 100644
--- a/app/ui/legacy/src/main/res/values-eo/strings.xml
+++ b/app/ui/legacy/src/main/res/values-eo/strings.xml
@@ -301,9 +301,6 @@ Bonvolu raporti erarojn, kontribui novajn eblojn kaj peti pri novaj funkcioj per
   <string name="account_setup_check_settings_authenticate">Aŭtentigado\u2026</string>
   <string name="account_setup_check_settings_fetch">Ŝargado de agordoj de konto\u2026</string>
   <string name="account_setup_check_settings_canceling_msg">Nuligado\u2026</string>
-  <string name="account_setup_names_title">Preskaŭ farite!</string>
-  <string name="account_setup_names_account_name_label">Nomi tiun ĉi konton (malnepre):</string>
-  <string name="account_setup_names_user_name_label">Entajpu vian nomon (montrata en eliraj mesaĝoj):</string>
   <string name="account_setup_account_type_title">Konta tipo</string>
   <string name="account_setup_account_type_instructions">De iu tipo tiu ĉi konto estas?</string>
   <string name="account_setup_account_type_pop_action">POP3</string>
diff --git a/app/ui/legacy/src/main/res/values-es/strings.xml b/app/ui/legacy/src/main/res/values-es/strings.xml
index fc404f6c3..c07f73da1 100644
--- a/app/ui/legacy/src/main/res/values-es/strings.xml
+++ b/app/ui/legacy/src/main/res/values-es/strings.xml
@@ -331,9 +331,6 @@ Puedes informar de fallos, contribuir con su desarrollo y hacer preguntas en <a
   <string name="account_setup_check_settings_authenticate">Autentificando\u2026</string>
   <string name="account_setup_check_settings_fetch">Obteniendo configuración de la cuenta\u2026</string>
   <string name="account_setup_check_settings_canceling_msg">Cancelando\u2026</string>
-  <string name="account_setup_names_title">¡Ya casi estás!</string>
-  <string name="account_setup_names_account_name_label">Elige un nombre para esta cuenta (opcional):</string>
-  <string name="account_setup_names_user_name_label">Pon tu nombre (aparecerá en los mensajes que envíes):</string>
   <string name="account_setup_account_type_title">Tipo de cuenta</string>
   <string name="account_setup_account_type_instructions">¿Qué tipo de cuenta es?</string>
   <string name="account_setup_account_type_pop_action">POP3</string>
diff --git a/app/ui/legacy/src/main/res/values-et/strings.xml b/app/ui/legacy/src/main/res/values-et/strings.xml
index 71907e244..abd5f91d8 100644
--- a/app/ui/legacy/src/main/res/values-et/strings.xml
+++ b/app/ui/legacy/src/main/res/values-et/strings.xml
@@ -332,9 +332,6 @@ Veateated saad saata, kaastööd teha ning küsida teavet järgmisel lehel:
   <string name="account_setup_check_settings_authenticate">Autentimine\u2026</string>
   <string name="account_setup_check_settings_fetch">Toob konto sätteid\u2026</string>
   <string name="account_setup_check_settings_canceling_msg">Tühistamine\u2026</string>
-  <string name="account_setup_names_title">Oled peaaegu valmis!</string>
-  <string name="account_setup_names_account_name_label">Anna sellele kontole nimi (valikuline):</string>
-  <string name="account_setup_names_user_name_label">Trüki oma nimi (näidatakse väljuvates kirjades):</string>
   <string name="account_setup_account_type_title">Konto liik</string>
   <string name="account_setup_account_type_instructions">Mis tüüpi konto see on?</string>
   <string name="account_setup_account_type_pop_action">POP3</string>
diff --git a/app/ui/legacy/src/main/res/values-eu/strings.xml b/app/ui/legacy/src/main/res/values-eu/strings.xml
index 233547149..90976b961 100644
--- a/app/ui/legacy/src/main/res/values-eu/strings.xml
+++ b/app/ui/legacy/src/main/res/values-eu/strings.xml
@@ -322,9 +322,6 @@ Mesedez akatsen berri emateko, ezaugarri berriak gehitzeko eta galderak egiteko
   <string name="account_setup_check_settings_authenticate">Autentifikatzen\u2026</string>
   <string name="account_setup_check_settings_fetch">Kontuaren ezarpenak eskuratzen\u2026</string>
   <string name="account_setup_check_settings_canceling_msg">Bertan behera uzten\u2026</string>
-  <string name="account_setup_names_title">Ia amaitu duzu!</string>
-  <string name="account_setup_names_account_name_label">Eman izen bat kontu honi (aukerakoa):</string>
-  <string name="account_setup_names_user_name_label">Idatzi zure izena (irteerako mezuetan bistaratuko da):</string>
   <string name="account_setup_account_type_title">Kontu mota</string>
   <string name="account_setup_account_type_instructions">Zein kontu mota da hau?</string>
   <string name="account_setup_account_type_pop_action">POP3</string>
diff --git a/app/ui/legacy/src/main/res/values-fa/strings.xml b/app/ui/legacy/src/main/res/values-fa/strings.xml
index 02254430a..6e2c8aba3 100644
--- a/app/ui/legacy/src/main/res/values-fa/strings.xml
+++ b/app/ui/legacy/src/main/res/values-fa/strings.xml
@@ -330,9 +330,6 @@
   <string name="account_setup_check_settings_authenticate">احراز هویت\u2026</string>
   <string name="account_setup_check_settings_fetch">واکشی تنظیمات حساب کاربری\u2026</string>
   <string name="account_setup_check_settings_canceling_msg">لغوکردن\u2026</string>
-  <string name="account_setup_names_title">تقریباً تمام شد!</string>
-  <string name="account_setup_names_account_name_label">نامی برای این حساب انتخاب کنید (اختیاری):</string>
-  <string name="account_setup_names_user_name_label">نام خود را بنویسید (در پیام‌های ارسالی نمایش داده می‌شود):</string>
   <string name="account_setup_account_type_title">نوع حساب کاربری</string>
   <string name="account_setup_account_type_instructions">نوع این حساب کاربری چیست؟</string>
   <string name="account_setup_account_type_pop_action">POP3</string>
diff --git a/app/ui/legacy/src/main/res/values-fi/strings.xml b/app/ui/legacy/src/main/res/values-fi/strings.xml
index a88313628..69da5ea1d 100644
--- a/app/ui/legacy/src/main/res/values-fi/strings.xml
+++ b/app/ui/legacy/src/main/res/values-fi/strings.xml
@@ -330,9 +330,6 @@ Ilmoita virheistä, ota osaa sovelluskehitykseen ja esitä kysymyksiä osoittees
   <string name="account_setup_check_settings_authenticate">Varmistetaan\u2026</string>
   <string name="account_setup_check_settings_fetch">Haetaan tilin asetuksia\u2026</string>
   <string name="account_setup_check_settings_canceling_msg">Peruutetaan\u2026</string>
-  <string name="account_setup_names_title">Melkein valmista!</string>
-  <string name="account_setup_names_account_name_label">Anna tilin nimi (ei pakollinen):</string>
-  <string name="account_setup_names_user_name_label">Anna nimesi (näkyy lähtevissä viesteissä):</string>
   <string name="account_setup_account_type_title">Tilin tyyppi</string>
   <string name="account_setup_account_type_instructions">Mikä tämän tilin tyyppi on?</string>
   <string name="account_setup_account_type_pop_action">POP3</string>
diff --git a/app/ui/legacy/src/main/res/values-fr/strings.xml b/app/ui/legacy/src/main/res/values-fr/strings.xml
index 04ddb9e9b..b545d374e 100644
--- a/app/ui/legacy/src/main/res/values-fr/strings.xml
+++ b/app/ui/legacy/src/main/res/values-fr/strings.xml
@@ -334,9 +334,6 @@ Rapportez les bogues, recommandez de nouvelles fonctions et posez vos questions
   <string name="account_setup_check_settings_authenticate">Authentification\u2026</string>
   <string name="account_setup_check_settings_fetch">Récupération des paramètres du compte\u2026</string>
   <string name="account_setup_check_settings_canceling_msg">Annulation\u2026</string>
-  <string name="account_setup_names_title">Vous avez presque terminé !</string>
-  <string name="account_setup_names_account_name_label">Donner un nom à ce compte (facultatif) :</string>
-  <string name="account_setup_names_user_name_label">Saisissez votre nom (s’affiche dans les courriels sortants) :</string>
   <string name="account_setup_account_type_title">Type de compte</string>
   <string name="account_setup_account_type_instructions">Quel type de compte est-ce ?</string>
   <string name="account_setup_account_type_pop_action">POP3</string>
diff --git a/app/ui/legacy/src/main/res/values-fy/strings.xml b/app/ui/legacy/src/main/res/values-fy/strings.xml
index e79df19ee..6b66c3e98 100644
--- a/app/ui/legacy/src/main/res/values-fy/strings.xml
+++ b/app/ui/legacy/src/main/res/values-fy/strings.xml
@@ -326,9 +326,6 @@ Graach flaterrapporten stjoere, bydragen foar nije funksjes en fragen stelle op
   <string name="account_setup_check_settings_authenticate">Autentikaasje\u2026</string>
   <string name="account_setup_check_settings_fetch">Accountynstellingen ophelje\u2026</string>
   <string name="account_setup_check_settings_canceling_msg">Annulearje\u2026</string>
-  <string name="account_setup_names_title">Hast klear!</string>
-  <string name="account_setup_names_account_name_label">Jou dit account in namme (opsjoneel):</string>
-  <string name="account_setup_names_user_name_label">Typ jo namme (sichtber by útgeande berjochten):</string>
   <string name="account_setup_account_type_title">Accounttype</string>
   <string name="account_setup_account_type_instructions">Hokker type account is dit?</string>
   <string name="account_setup_account_type_pop_action">POP3</string>
diff --git a/app/ui/legacy/src/main/res/values-gd/strings.xml b/app/ui/legacy/src/main/res/values-gd/strings.xml
index 94af99937..c8860fd7e 100644
--- a/app/ui/legacy/src/main/res/values-gd/strings.xml
+++ b/app/ui/legacy/src/main/res/values-gd/strings.xml
@@ -266,9 +266,6 @@
   <string name="account_setup_check_settings_authenticate">’Ga dhearbhadh…</string>
   <string name="account_setup_check_settings_fetch">A’ faighinn roghainnean a’ chunntais…</string>
   <string name="account_setup_check_settings_canceling_msg">A’ sgur dheth…</string>
-  <string name="account_setup_names_title">Cha mhòr deiseil!</string>
-  <string name="account_setup_names_account_name_label">Thoir ainm air a’ chunntas seo</string>
-  <string name="account_setup_names_user_name_label">Cuir a-steach d’ ainm (chithear seo ann an teachdaireachdan a thèid a-mach):</string>
   <string name="account_setup_account_type_title">Seòrsa a’ chunntais</string>
   <string name="account_setup_account_type_instructions">Dè seòrsa cunntas a tha seo\?</string>
   <string name="account_setup_account_type_pop_action">POP3</string>
diff --git a/app/ui/legacy/src/main/res/values-gl/strings.xml b/app/ui/legacy/src/main/res/values-gl/strings.xml
index 63577928a..0e4b3cc03 100644
--- a/app/ui/legacy/src/main/res/values-gl/strings.xml
+++ b/app/ui/legacy/src/main/res/values-gl/strings.xml
@@ -307,9 +307,6 @@ Por favor envíen informes de fallos, contribúa con novas características e co
   <string name="account_setup_check_settings_authenticate">Autentificando\u2026</string>
   <string name="account_setup_check_settings_fetch">Obtendo Configuración da conta\u2026</string>
   <string name="account_setup_check_settings_canceling_msg">Cancelando\u2026</string>
-  <string name="account_setup_names_title">Feito!</string>
-  <string name="account_setup_names_account_name_label">Dalle un nome a esta conta (opcional):</string>
-  <string name="account_setup_names_user_name_label">Introduce o teu nome (visualizarase na mensaxe de saída):</string>
   <string name="account_setup_account_type_title">Tipo de conta</string>
   <string name="account_setup_account_type_instructions">Qué tipo de conta é?</string>
   <string name="account_setup_account_type_pop_action">POP3</string>
diff --git a/app/ui/legacy/src/main/res/values-hr/strings.xml b/app/ui/legacy/src/main/res/values-hr/strings.xml
index b2f42a8cf..6ddd9ebd1 100644
--- a/app/ui/legacy/src/main/res/values-hr/strings.xml
+++ b/app/ui/legacy/src/main/res/values-hr/strings.xml
@@ -253,9 +253,6 @@
   <string name="account_setup_check_settings_authenticate">Identifikacija\u2026</string>
   <string name="account_setup_check_settings_fetch">Dohvaćam postavke računa\u2026</string>
   <string name="account_setup_check_settings_canceling_msg">Otkazujem\u2026</string>
-  <string name="account_setup_names_title">Uskoro ste gotovi!</string>
-  <string name="account_setup_names_account_name_label">Dajte naziv ovom računu (opcionalno):</string>
-  <string name="account_setup_names_user_name_label">Unesite vaše ime (prikazuje se na odlaznim porukama):</string>
   <string name="account_setup_account_type_title">Vrsta računa</string>
   <string name="account_setup_account_type_instructions">Kakav je to račun?</string>
   <string name="account_setup_account_type_pop_action">POP3</string>
diff --git a/app/ui/legacy/src/main/res/values-hu/strings.xml b/app/ui/legacy/src/main/res/values-hu/strings.xml
index 367e5a2ce..d085bfa20 100644
--- a/app/ui/legacy/src/main/res/values-hu/strings.xml
+++ b/app/ui/legacy/src/main/res/values-hu/strings.xml
@@ -329,9 +329,6 @@ Hibajelentések beküldésével közreműködhet az új funkciókban, és kérd
   <string name="account_setup_check_settings_authenticate">Hitelesítés\u2026</string>
   <string name="account_setup_check_settings_fetch">Fiókbeállítások beolvasása\u2026</string>
   <string name="account_setup_check_settings_canceling_msg">Megszakítás\u2026</string>
-  <string name="account_setup_names_title">Már majdnem kész.</string>
-  <string name="account_setup_names_account_name_label">Fiók elnevezése (nem kötelező):</string>
-  <string name="account_setup_names_user_name_label">Név megadása (kimenő üzeneteknél jelenik meg):</string>
   <string name="account_setup_account_type_title">Fióktípus</string>
   <string name="account_setup_account_type_instructions">Milyen fajta fiók ez?</string>
   <string name="account_setup_account_type_pop_action">POP3</string>
diff --git a/app/ui/legacy/src/main/res/values-in/strings.xml b/app/ui/legacy/src/main/res/values-in/strings.xml
index 187285d35..bda8ff0a1 100644
--- a/app/ui/legacy/src/main/res/values-in/strings.xml
+++ b/app/ui/legacy/src/main/res/values-in/strings.xml
@@ -291,9 +291,6 @@ Kirimkan laporan bug, kontribusikan fitur baru dan ajukan pertanyaan di
   <string name="account_setup_check_settings_authenticate">Otentikasi\u2026</string>
   <string name="account_setup_check_settings_fetch">Mengambil pengaturan akun\u2026</string>
   <string name="account_setup_check_settings_canceling_msg">Membatalkan\u2026</string>
-  <string name="account_setup_names_title">Anda hampir selesai!</string>
-  <string name="account_setup_names_account_name_label">Berikan akun ini sebuah nama (opsional):</string>
-  <string name="account_setup_names_user_name_label">Ketik nama Anda (ditampilkan pada pesan keluar):</string>
   <string name="account_setup_account_type_title">Tipe akun</string>
   <string name="account_setup_account_type_instructions">Akun apa ini?</string>
   <string name="account_setup_account_type_pop_action">POP3</string>
diff --git a/app/ui/legacy/src/main/res/values-is/strings.xml b/app/ui/legacy/src/main/res/values-is/strings.xml
index 5e3432223..d21af1126 100644
--- a/app/ui/legacy/src/main/res/values-is/strings.xml
+++ b/app/ui/legacy/src/main/res/values-is/strings.xml
@@ -331,9 +331,6 @@ Sendu inn villuskýrslur, leggðu fram nýja eiginleika og spurðu spurninga á
   <string name="account_setup_check_settings_authenticate">Auðkenni\u2026</string>
   <string name="account_setup_check_settings_fetch">Næ í stillingar aðgangs\u2026</string>
   <string name="account_setup_check_settings_canceling_msg">Hætti við\u2026</string>
-  <string name="account_setup_names_title">Þetta er næstum búið!</string>
-  <string name="account_setup_names_account_name_label">Gefðu þessum aðgangi nafn (valkvætt):</string>
-  <string name="account_setup_names_user_name_label">Skrifaðu nafnið þitt (er birt á útsendum skilaboðum):</string>
   <string name="account_setup_account_type_title">Gerð aðgangs</string>
   <string name="account_setup_account_type_instructions">Hvers konar aðgangur er þetta?</string>
   <string name="account_setup_account_type_pop_action">POP3</string>
diff --git a/app/ui/legacy/src/main/res/values-it/strings.xml b/app/ui/legacy/src/main/res/values-it/strings.xml
index c68e8f510..72c914d91 100644
--- a/app/ui/legacy/src/main/res/values-it/strings.xml
+++ b/app/ui/legacy/src/main/res/values-it/strings.xml
@@ -334,9 +334,6 @@ Invia segnalazioni di bug, contribuisci con nuove funzionalità e poni domande s
   <string name="account_setup_check_settings_authenticate">Autenticazione\u2026</string>
   <string name="account_setup_check_settings_fetch">Recupero delle impostazioni dell\'account in corso\u2026</string>
   <string name="account_setup_check_settings_canceling_msg">Annullamento in corso\u2026</string>
-  <string name="account_setup_names_title">Hai quasi fatto!</string>
-  <string name="account_setup_names_account_name_label">Assegna un nome all\'account (facoltativo):</string>
-  <string name="account_setup_names_user_name_label">Scrivi il tuo nome (visualizzato nei messaggi in uscita):</string>
   <string name="account_setup_account_type_title">Tipo di account</string>
   <string name="account_setup_account_type_instructions">Che tipo di account è questo?</string>
   <string name="account_setup_account_type_pop_action">POP3</string>
diff --git a/app/ui/legacy/src/main/res/values-iw/strings.xml b/app/ui/legacy/src/main/res/values-iw/strings.xml
index 7b0d79cd0..85538c861 100644
--- a/app/ui/legacy/src/main/res/values-iw/strings.xml
+++ b/app/ui/legacy/src/main/res/values-iw/strings.xml
@@ -254,9 +254,6 @@
   <string name="account_setup_check_settings_authenticate">מאמת …</string>
   <string name="account_setup_check_settings_fetch">מייבא הגדרות החשבון …</string>
   <string name="account_setup_check_settings_canceling_msg">מבטל…</string>
-  <string name="account_setup_names_title">כמעט מוכן!</string>
-  <string name="account_setup_names_account_name_label">תן שם לחשבון זה (לא חובה):</string>
-  <string name="account_setup_names_user_name_label">הקלד את שמך (מוצג בהודעות יוצאות):</string>
   <string name="account_setup_account_type_title">סוג חשבון</string>
   <string name="account_setup_account_type_instructions">איזה סוג חשבון זה?</string>
   <string name="account_setup_account_type_pop_action">POP3</string>
diff --git a/app/ui/legacy/src/main/res/values-ja/strings.xml b/app/ui/legacy/src/main/res/values-ja/strings.xml
index c98d4c804..6f63dbc06 100644
--- a/app/ui/legacy/src/main/res/values-ja/strings.xml
+++ b/app/ui/legacy/src/main/res/values-ja/strings.xml
@@ -328,9 +328,6 @@ K-9 は大多数のメールクライアントと同様に、ほとんどのフ
   <string name="account_setup_check_settings_authenticate">認証中\u2026</string>
   <string name="account_setup_check_settings_fetch">アカウント設定を取得中\u2026</string>
   <string name="account_setup_check_settings_canceling_msg">中断\u2026</string>
-  <string name="account_setup_names_title">電子メールセットアップ</string>
-  <string name="account_setup_names_account_name_label">アカウントの名前を付けます (オプション):</string>
-  <string name="account_setup_names_user_name_label">名前を入力します (送信メールの表示名):</string>
   <string name="account_setup_account_type_title">メールアカウント種類の選択</string>
   <string name="account_setup_account_type_instructions">受信メールサーバの種類を選択して下さい</string>
   <string name="account_setup_account_type_pop_action">POP3 サーバ</string>
diff --git a/app/ui/legacy/src/main/res/values-ko/strings.xml b/app/ui/legacy/src/main/res/values-ko/strings.xml
index 94c991d0e..6b2bf47ad 100644
--- a/app/ui/legacy/src/main/res/values-ko/strings.xml
+++ b/app/ui/legacy/src/main/res/values-ko/strings.xml
@@ -268,9 +268,6 @@
   <string name="account_setup_check_settings_authenticate">인증 중\u2026</string>
   <string name="account_setup_check_settings_fetch">계정 설정 가져 오기\u2026</string>
   <string name="account_setup_check_settings_canceling_msg">취소 중\u2026</string>
-  <string name="account_setup_names_title">설정이 거의 완료되었습니다!</string>
-  <string name="account_setup_names_account_name_label">이 계정의 이름을 입력 (옵션):</string>
-  <string name="account_setup_names_user_name_label">이름 입력 (보내는 메시지에 표시 될 이름):</string>
   <string name="account_setup_account_type_title">계정 종류</string>
   <string name="account_setup_account_type_instructions">계정 유형을 선택하시오.</string>
   <string name="account_setup_account_type_pop_action">POP3</string>
diff --git a/app/ui/legacy/src/main/res/values-lt/strings.xml b/app/ui/legacy/src/main/res/values-lt/strings.xml
index 27857cfcb..bb93a405b 100644
--- a/app/ui/legacy/src/main/res/values-lt/strings.xml
+++ b/app/ui/legacy/src/main/res/values-lt/strings.xml
@@ -327,9 +327,6 @@ Pateikite pranešimus apie klaidas, prisidėkite prie naujų funkcijų kūrimo i
   <string name="account_setup_check_settings_authenticate">Patvirtinama tapatybė\u2026</string>
   <string name="account_setup_check_settings_fetch">Gaunami paskyros nustatymai\u2026</string>
   <string name="account_setup_check_settings_canceling_msg">Atšaukiama\u2026</string>
-  <string name="account_setup_names_title">Beveik baigėte!</string>
-  <string name="account_setup_names_account_name_label">Pavadinkite šią paskyrą (nebūtina):</string>
-  <string name="account_setup_names_user_name_label">Įrašykite savo vardą (rodoma siunčiamuose pranešimuose):</string>
   <string name="account_setup_account_type_title">Paskyros tipas</string>
   <string name="account_setup_account_type_instructions">Kokios rūšies ši paskyra?</string>
   <string name="account_setup_account_type_pop_action">POP3</string>
diff --git a/app/ui/legacy/src/main/res/values-lv/strings.xml b/app/ui/legacy/src/main/res/values-lv/strings.xml
index 8a7856f35..d273e39ad 100644
--- a/app/ui/legacy/src/main/res/values-lv/strings.xml
+++ b/app/ui/legacy/src/main/res/values-lv/strings.xml
@@ -333,9 +333,6 @@ pat <xliff:g id="messages_to_load">%d</xliff:g> vairāk</string>
   <string name="account_setup_check_settings_authenticate">Pārbauda identifikāciju\u2026</string>
   <string name="account_setup_check_settings_fetch">Saņem konta iestatījumus\u2026</string>
   <string name="account_setup_check_settings_canceling_msg">Atceļ\u2026</string>
-  <string name="account_setup_names_title">Gandrīz viss pabeigts!</string>
-  <string name="account_setup_names_account_name_label">Nosaukt kontu (nav obligāti):</string>
-  <string name="account_setup_names_user_name_label">Ierakstiet savu vārdu (attēlošanai izejošajās vēstulēs):</string>
   <string name="account_setup_account_type_title">Konta veids</string>
   <string name="account_setup_account_type_instructions">Kāda veida konts tas ir?</string>
   <string name="account_setup_account_type_pop_action">POP3</string>
diff --git a/app/ui/legacy/src/main/res/values-ml/strings.xml b/app/ui/legacy/src/main/res/values-ml/strings.xml
index efcdc2110..bab7c9c7f 100644
--- a/app/ui/legacy/src/main/res/values-ml/strings.xml
+++ b/app/ui/legacy/src/main/res/values-ml/strings.xml
@@ -308,9 +308,6 @@
   <string name="account_setup_check_settings_authenticate">പ്രാമാണീകരിക്കുന്നു\u2026</string>
   <string name="account_setup_check_settings_fetch">അക്കൗണ്ട് ക്രമീകരണങ്ങൾ ലഭ്യമാക്കുന്നു\u2026</string>
   <string name="account_setup_check_settings_canceling_msg">റദ്ദാക്കുന്നു\u2026</string>
-  <string name="account_setup_names_title">നിങ്ങൾ ഏകദേശം പൂർത്തിയാക്കി!</string>
-  <string name="account_setup_names_account_name_label">ഈ അക്കൗണ്ടിന് ഒരു പേര് നൽകുക (ഐച്ഛികം):</string>
-  <string name="account_setup_names_user_name_label">നിങ്ങളുടെ പേര് ടൈപ്പുചെയ്യുക (ഔട്ട്‌ഗോയിംഗ് സന്ദേശങ്ങളിൽ പ്രദർശിപ്പിക്കുന്നു):</string>
   <string name="account_setup_account_type_title">അക്കൗണ്ട് തരം</string>
   <string name="account_setup_account_type_instructions">ഇത് ഏത് തരത്തിലുള്ള അക്കൗണ്ടാണ്?</string>
   <string name="account_setup_account_type_pop_action">POP3</string>
diff --git a/app/ui/legacy/src/main/res/values-nb/strings.xml b/app/ui/legacy/src/main/res/values-nb/strings.xml
index 27757c32e..fb61266d8 100644
--- a/app/ui/legacy/src/main/res/values-nb/strings.xml
+++ b/app/ui/legacy/src/main/res/values-nb/strings.xml
@@ -289,9 +289,6 @@ til <xliff:g id="messages_to_load">%d</xliff:g> flere</string>
   <string name="account_setup_check_settings_authenticate">Autentiserer\u2026</string>
   <string name="account_setup_check_settings_fetch">Henter kontoinnstillinger\u2026</string>
   <string name="account_setup_check_settings_canceling_msg">Avbryter\u2026</string>
-  <string name="account_setup_names_title">Du er nesten ferdig!</string>
-  <string name="account_setup_names_account_name_label">Gi denne kontoen et navn (valgfritt):</string>
-  <string name="account_setup_names_user_name_label">Skriv ditt navn (vises i utgående meldinger):</string>
   <string name="account_setup_account_type_title">Kontotype</string>
   <string name="account_setup_account_type_instructions">Hvilken type konto er dette?</string>
   <string name="account_setup_account_type_pop_action">POP3</string>
diff --git a/app/ui/legacy/src/main/res/values-nl/strings.xml b/app/ui/legacy/src/main/res/values-nl/strings.xml
index ba5cf61fc..ae0463012 100644
--- a/app/ui/legacy/src/main/res/values-nl/strings.xml
+++ b/app/ui/legacy/src/main/res/values-nl/strings.xml
@@ -326,9 +326,6 @@ Graag foutrapporten sturen, bijdragen voor nieuwe functies en vragen stellen op
   <string name="account_setup_check_settings_authenticate">Authenticatie\u2026</string>
   <string name="account_setup_check_settings_fetch">Accountinstellingen worden opgehaald\u2026</string>
   <string name="account_setup_check_settings_canceling_msg">Annuleren\u2026</string>
-  <string name="account_setup_names_title">Bijna klaar!</string>
-  <string name="account_setup_names_account_name_label">Geef dit account een naam (optioneel):</string>
-  <string name="account_setup_names_user_name_label">Typ je naam (zichtbaar bij uitgaande berichten):</string>
   <string name="account_setup_account_type_title">Accounttype</string>
   <string name="account_setup_account_type_instructions">Welk type account is dit?</string>
   <string name="account_setup_account_type_pop_action">POP3</string>
diff --git a/app/ui/legacy/src/main/res/values-pl/strings.xml b/app/ui/legacy/src/main/res/values-pl/strings.xml
index f1abf9231..4bcb6e21c 100644
--- a/app/ui/legacy/src/main/res/values-pl/strings.xml
+++ b/app/ui/legacy/src/main/res/values-pl/strings.xml
@@ -335,9 +335,6 @@ Wysłane z urządzenia Android za pomocą K-9 Mail. Proszę wybaczyć moją zwi
   <string name="account_setup_check_settings_authenticate">Uwierzytelnianie…</string>
   <string name="account_setup_check_settings_fetch">Pobieranie ustawień konta…</string>
   <string name="account_setup_check_settings_canceling_msg">Anulowanie…</string>
-  <string name="account_setup_names_title">Prawie gotowe!</string>
-  <string name="account_setup_names_account_name_label">Wpisz nazwę (opcjonalną) tego konta:</string>
-  <string name="account_setup_names_user_name_label">Twoje imię i nazwisko (pojawi się w wysyłanych wiadomościach):</string>
   <string name="account_setup_account_type_title">Rodzaj konta</string>
   <string name="account_setup_account_type_instructions">Jakiego typu serwer obsługuje to konto?</string>
   <string name="account_setup_account_type_pop_action">POP3</string>
diff --git a/app/ui/legacy/src/main/res/values-pt-rBR/strings.xml b/app/ui/legacy/src/main/res/values-pt-rBR/strings.xml
index 17710d20b..542e6552a 100644
--- a/app/ui/legacy/src/main/res/values-pt-rBR/strings.xml
+++ b/app/ui/legacy/src/main/res/values-pt-rBR/strings.xml
@@ -332,9 +332,6 @@ Por favor encaminhe relatórios de bugs, contribua com novos recursos e tire dú
   <string name="account_setup_check_settings_authenticate">Autenticando\u2026</string>
   <string name="account_setup_check_settings_fetch">Buscando as configurações da conta\u2026</string>
   <string name="account_setup_check_settings_canceling_msg">Cancelando\u2026</string>
-  <string name="account_setup_names_title">Quase terminado!</string>
-  <string name="account_setup_names_account_name_label">Dê um nome a esta conta (opcional):</string>
-  <string name="account_setup_names_user_name_label">Digite seu nome (será exibido nas mensagens enviadas):</string>
   <string name="account_setup_account_type_title">Tipo de conta</string>
   <string name="account_setup_account_type_instructions">Esta conta é de que tipo?</string>
   <string name="account_setup_account_type_pop_action">POP3</string>
diff --git a/app/ui/legacy/src/main/res/values-pt-rPT/strings.xml b/app/ui/legacy/src/main/res/values-pt-rPT/strings.xml
index c44788cc7..557226d06 100644
--- a/app/ui/legacy/src/main/res/values-pt-rPT/strings.xml
+++ b/app/ui/legacy/src/main/res/values-pt-rPT/strings.xml
@@ -334,9 +334,6 @@ Por favor envie relatórios de falhas, contribua com novas funcionalidades e col
   <string name="account_setup_check_settings_authenticate">A autenticar\u2026</string>
   <string name="account_setup_check_settings_fetch">A obter configurações da conta\u2026</string>
   <string name="account_setup_check_settings_canceling_msg">A cancelar\u2026</string>
-  <string name="account_setup_names_title">Está quase terminado!</string>
-  <string name="account_setup_names_account_name_label">Dê um nome a esta conta (opcional):</string>
-  <string name="account_setup_names_user_name_label">Introduza o seu nome (é exibido nas mensagens enviadas):</string>
   <string name="account_setup_account_type_title">Tipo de conta</string>
   <string name="account_setup_account_type_instructions">Que tipo de conta é esta?</string>
   <string name="account_setup_account_type_pop_action">POP3</string>
diff --git a/app/ui/legacy/src/main/res/values-ro/strings.xml b/app/ui/legacy/src/main/res/values-ro/strings.xml
index 7587d8de7..3a222f144 100644
--- a/app/ui/legacy/src/main/res/values-ro/strings.xml
+++ b/app/ui/legacy/src/main/res/values-ro/strings.xml
@@ -329,9 +329,6 @@ cel mult încă <xliff:g id="messages_to_load">%d</xliff:g></string>
   <string name="account_setup_check_settings_authenticate">Autentifică\u2026</string>
   <string name="account_setup_check_settings_fetch">Preluarea setărilor contului\u2026</string>
   <string name="account_setup_check_settings_canceling_msg">Se întrerupe\u2026</string>
-  <string name="account_setup_names_title">Ești aproape gata!</string>
-  <string name="account_setup_names_account_name_label">Dă acestui cont un nume (opțional):</string>
-  <string name="account_setup_names_user_name_label">Tastează numele tău (cum va fi afișat pe mesajele trimise):</string>
   <string name="account_setup_account_type_title">Tipul contului</string>
   <string name="account_setup_account_type_instructions">Ce fel de cont este acesta?</string>
   <string name="account_setup_account_type_pop_action">POP3</string>
diff --git a/app/ui/legacy/src/main/res/values-ru/strings.xml b/app/ui/legacy/src/main/res/values-ru/strings.xml
index 83e77a7f5..580e828fd 100644
--- a/app/ui/legacy/src/main/res/values-ru/strings.xml
+++ b/app/ui/legacy/src/main/res/values-ru/strings.xml
@@ -334,9 +334,6 @@ K-9 Mail — почтовик для Android.
   <string name="account_setup_check_settings_authenticate">Аутентификация\u2026</string>
   <string name="account_setup_check_settings_fetch">Получение настроек\u2026</string>
   <string name="account_setup_check_settings_canceling_msg">Отмена\u2026</string>
-  <string name="account_setup_names_title">Всё почти готово!</string>
-  <string name="account_setup_names_account_name_label">Название учётной записи (необязательно):</string>
-  <string name="account_setup_names_user_name_label">Ваше имя (видно адресату в сообщениях):</string>
   <string name="account_setup_account_type_title">Тип учётной записи</string>
   <string name="account_setup_account_type_instructions">Доступные протоколы</string>
   <string name="account_setup_account_type_pop_action">POP3</string>
diff --git a/app/ui/legacy/src/main/res/values-sk/strings.xml b/app/ui/legacy/src/main/res/values-sk/strings.xml
index 0ef6fb0bc..4e6fcde02 100644
--- a/app/ui/legacy/src/main/res/values-sk/strings.xml
+++ b/app/ui/legacy/src/main/res/values-sk/strings.xml
@@ -294,9 +294,6 @@ Prosím, nahlasujte prípadné chyby, prispievajte novými funkciami a pýtajte
   <string name="account_setup_check_settings_authenticate">Overovanie\u2026</string>
   <string name="account_setup_check_settings_fetch">Načítavanie nastavení účtu\u2026</string>
   <string name="account_setup_check_settings_canceling_msg">Rušenie\u2026</string>
-  <string name="account_setup_names_title">Takmer hotovo!</string>
-  <string name="account_setup_names_account_name_label">Pomenovať tento účet (voliteľné):</string>
-  <string name="account_setup_names_user_name_label">Zadajte vaše meno (zobrazí sa v odchádzajúcich správach):</string>
   <string name="account_setup_account_type_title">Typ účtu</string>
   <string name="account_setup_account_type_instructions">Typ účtu</string>
   <string name="account_setup_account_type_pop_action">POP3</string>
diff --git a/app/ui/legacy/src/main/res/values-sl/strings.xml b/app/ui/legacy/src/main/res/values-sl/strings.xml
index 1e3c06eeb..a14496444 100644
--- a/app/ui/legacy/src/main/res/values-sl/strings.xml
+++ b/app/ui/legacy/src/main/res/values-sl/strings.xml
@@ -331,9 +331,6 @@ dodatnih <xliff:g id="messages_to_load">%d</xliff:g> sporočil</string>
   <string name="account_setup_check_settings_authenticate">Overjanje \u2026</string>
   <string name="account_setup_check_settings_fetch">Pridobivanje nastavitev računa \u2026</string>
   <string name="account_setup_check_settings_canceling_msg">Poteka preklic \u2026</string>
-  <string name="account_setup_names_title">Račun je že skoraj pripravljen!</string>
-  <string name="account_setup_names_account_name_label">Prikazano ime računa (izbirno):</string>
-  <string name="account_setup_names_user_name_label">Ime pošiljatelja (prikazano v vseh odhodnih sporočilih):</string>
   <string name="account_setup_account_type_title">Vrsta računa</string>
   <string name="account_setup_account_type_instructions">Kakšne vrste je račun?</string>
   <string name="account_setup_account_type_pop_action">POP3</string>
diff --git a/app/ui/legacy/src/main/res/values-sq/strings.xml b/app/ui/legacy/src/main/res/values-sq/strings.xml
index 9fe3f394c..85b264e35 100644
--- a/app/ui/legacy/src/main/res/values-sq/strings.xml
+++ b/app/ui/legacy/src/main/res/values-sq/strings.xml
@@ -331,9 +331,6 @@ Ju lutemi, parashtrim njoftimesh për të meta, kontribute për veçori të reaj
   <string name="account_setup_check_settings_authenticate">Po kryhet mirëfilltësimi\u2026</string>
   <string name="account_setup_check_settings_fetch">Po sillen rregullime llogarie\u2026</string>
   <string name="account_setup_check_settings_canceling_msg">Po anulohet\u2026</string>
-  <string name="account_setup_names_title">Thuajse mbaruat!</string>
-  <string name="account_setup_names_account_name_label">Jepini një emër kësaj llogarie (në daçi):</string>
-  <string name="account_setup_names_user_name_label">Shtypni emrin tuaj (shfaqet në mesazhet e dërguara):</string>
   <string name="account_setup_account_type_title">Lloj llogarie</string>
   <string name="account_setup_account_type_instructions">Ç\’lloj llogarie është kjo?</string>
   <string name="account_setup_account_type_pop_action">POP3</string>
diff --git a/app/ui/legacy/src/main/res/values-sr/strings.xml b/app/ui/legacy/src/main/res/values-sr/strings.xml
index cc7dc4e64..621e7fc0e 100644
--- a/app/ui/legacy/src/main/res/values-sr/strings.xml
+++ b/app/ui/legacy/src/main/res/values-sr/strings.xml
@@ -292,9 +292,6 @@
   <string name="account_setup_check_settings_authenticate">Аутентификујем\u2026</string>
   <string name="account_setup_check_settings_fetch">Добављам поставке налога\u2026</string>
   <string name="account_setup_check_settings_canceling_msg">Одустајем\u2026</string>
-  <string name="account_setup_names_title">Скоро сте завршили!</string>
-  <string name="account_setup_names_account_name_label">Именујте овај налог (необавезно):</string>
-  <string name="account_setup_names_user_name_label">Унесите своје име (приказано на одлазним порукама):</string>
   <string name="account_setup_account_type_title">Тип налога</string>
   <string name="account_setup_account_type_instructions">Какав је ово налог?</string>
   <string name="account_setup_account_type_pop_action">ПОП3</string>
diff --git a/app/ui/legacy/src/main/res/values-sv/strings.xml b/app/ui/legacy/src/main/res/values-sv/strings.xml
index 3459cc945..b0d14cafa 100644
--- a/app/ui/legacy/src/main/res/values-sv/strings.xml
+++ b/app/ui/legacy/src/main/res/values-sv/strings.xml
@@ -331,9 +331,6 @@ Skicka in felrapporter, bidra med nya funktioner och ställ frågor på
   <string name="account_setup_check_settings_authenticate">Autentiserar\u2026</string>
   <string name="account_setup_check_settings_fetch">Hämtar kontoinställningar\u2026</string>
   <string name="account_setup_check_settings_canceling_msg">Avbryter\u2026</string>
-  <string name="account_setup_names_title">Du är nästan klar!</string>
-  <string name="account_setup_names_account_name_label">Ge kontot ett namn (valfritt):</string>
-  <string name="account_setup_names_user_name_label">Ange ditt namn (visas på utgående e-post):</string>
   <string name="account_setup_account_type_title">Kontotyp</string>
   <string name="account_setup_account_type_instructions">Vilken typ av konto är detta?</string>
   <string name="account_setup_account_type_pop_action">POP3</string>
diff --git a/app/ui/legacy/src/main/res/values-tr/strings.xml b/app/ui/legacy/src/main/res/values-tr/strings.xml
index 19e1dff3d..a0543ff7a 100644
--- a/app/ui/legacy/src/main/res/values-tr/strings.xml
+++ b/app/ui/legacy/src/main/res/values-tr/strings.xml
@@ -319,9 +319,6 @@ Microsoft Exchange ile konuşurken kimi tuhaflıklar yaşadığını lütfen akl
   <string name="account_setup_check_settings_authenticate">Kimlik Doğrulaması\u2026</string>
   <string name="account_setup_check_settings_fetch">Hesap ayarları alınıyor\u2026</string>
   <string name="account_setup_check_settings_canceling_msg">İptal ediliyor\u2026</string>
-  <string name="account_setup_names_title">Hemen hemen tamam!</string>
-  <string name="account_setup_names_account_name_label">Bu hesaba bir isim verin (isteğe bağlı):</string>
-  <string name="account_setup_names_user_name_label">İsminizi yazın (Giden mesajlarda görüntülenir):</string>
   <string name="account_setup_account_type_title">Hesap türü</string>
   <string name="account_setup_account_type_instructions">Bu ne tür bir hesaptır?</string>
   <string name="account_setup_account_type_pop_action">POP3</string>
diff --git a/app/ui/legacy/src/main/res/values-uk/strings.xml b/app/ui/legacy/src/main/res/values-uk/strings.xml
index a73b166bf..48ef66de6 100644
--- a/app/ui/legacy/src/main/res/values-uk/strings.xml
+++ b/app/ui/legacy/src/main/res/values-uk/strings.xml
@@ -336,9 +336,6 @@ K-9 Mail — це вільний клієнт електронної пошти
   <string name="account_setup_check_settings_authenticate">Автентифікація\u2026</string>
   <string name="account_setup_check_settings_fetch">Отримання налаштувань облікового запису\u2026</string>
   <string name="account_setup_check_settings_canceling_msg">Скасування\u2026</string>
-  <string name="account_setup_names_title">Майже готово!</string>
-  <string name="account_setup_names_account_name_label">Дайте ім’я цьому обліковому запису (необов’язково):</string>
-  <string name="account_setup_names_user_name_label">Введіть ваше ім’я (відображається у вихідних повідомленнях):</string>
   <string name="account_setup_account_type_title">Тип облікового запису</string>
   <string name="account_setup_account_type_instructions">Виберіть тип поштової скриньки</string>
   <string name="account_setup_account_type_pop_action">POP3</string>
diff --git a/app/ui/legacy/src/main/res/values-zh-rCN/strings.xml b/app/ui/legacy/src/main/res/values-zh-rCN/strings.xml
index 21c3f02c7..fb0c5c03e 100644
--- a/app/ui/legacy/src/main/res/values-zh-rCN/strings.xml
+++ b/app/ui/legacy/src/main/res/values-zh-rCN/strings.xml
@@ -329,9 +329,6 @@ K-9 Mail 是 Android 上一款功能强大的免费邮件客户端。
   <string name="account_setup_check_settings_authenticate">正在验证用户\u2026</string>
   <string name="account_setup_check_settings_fetch">正在获取账户设置\u2026</string>
   <string name="account_setup_check_settings_canceling_msg">正在取消\u2026</string>
-  <string name="account_setup_names_title">快要完成了！</string>
-  <string name="account_setup_names_account_name_label">为这个账户选择一个名称（可选项）：</string>
-  <string name="account_setup_names_user_name_label">输入你的名字（将显示在发出的邮件中）：</string>
   <string name="account_setup_account_type_title">账户类型</string>
   <string name="account_setup_account_type_instructions">这个账户是什么类型的？</string>
   <string name="account_setup_account_type_pop_action">POP3</string>
diff --git a/app/ui/legacy/src/main/res/values-zh-rTW/strings.xml b/app/ui/legacy/src/main/res/values-zh-rTW/strings.xml
index c52fe84de..406802a37 100644
--- a/app/ui/legacy/src/main/res/values-zh-rTW/strings.xml
+++ b/app/ui/legacy/src/main/res/values-zh-rTW/strings.xml
@@ -329,9 +329,6 @@ K-9 Mail 是 Android 上一款功能強大，免費的電子郵件用戶端。
   <string name="account_setup_check_settings_authenticate">驗證…</string>
   <string name="account_setup_check_settings_fetch">正在收取帳號設定…</string>
   <string name="account_setup_check_settings_canceling_msg">正在取消…</string>
-  <string name="account_setup_names_title">快要完成了！</string>
-  <string name="account_setup_names_account_name_label">為這個帳號選擇一個名稱（非必填）：</string>
-  <string name="account_setup_names_user_name_label">輸入你的名字（將顯示在發出的郵件中）：</string>
   <string name="account_setup_account_type_title">帳號類型</string>
   <string name="account_setup_account_type_instructions">這個帳號是什麼類型的？</string>
   <string name="account_setup_account_type_pop_action">POP3</string>
diff --git a/app/ui/legacy/src/main/res/values/strings.xml b/app/ui/legacy/src/main/res/values/strings.xml
index 097b1cead..ae8074c97 100644
--- a/app/ui/legacy/src/main/res/values/strings.xml
+++ b/app/ui/legacy/src/main/res/values/strings.xml
@@ -393,10 +393,6 @@ Please submit bug reports, contribute new features and ask questions at
     <string name="account_setup_check_settings_fetch">Fetching account settings\u2026</string>
     <string name="account_setup_check_settings_canceling_msg">Canceling\u2026</string>
 
-    <string name="account_setup_names_title">You\'re almost done!</string>
-    <string name="account_setup_names_account_name_label">Give this account a name (optional):</string>
-    <string name="account_setup_names_user_name_label">Type your name (displays on outgoing messages):</string>
-
     <string name="account_setup_account_type_title">Account type</string>
     <string name="account_setup_account_type_instructions">What kind of account is this?</string>
     <string name="account_setup_account_type_pop_action">POP3</string>

From 8244470a9ec712a490a805541b3a46ae0148287a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolf-Martell=20Montw=C3=A9?= <wolf@thunderbird.net>
Date: Fri, 22 Sep 2023 18:27:04 +0200
Subject: [PATCH 2/5] Remove AccountSetupOptions

---
 app/k9mail/src/main/AndroidManifest.xml       |   5 -
 .../activity/setup/AccountSetupOptions.java   | 125 ------------------
 .../activity/setup/AccountSetupOutgoing.java  |   2 +-
 .../main/res/layout/account_setup_options.xml |  68 ----------
 .../legacy/src/main/res/values-ar/strings.xml |   2 -
 .../legacy/src/main/res/values-be/strings.xml |   2 -
 .../legacy/src/main/res/values-bg/strings.xml |   2 -
 .../legacy/src/main/res/values-br/strings.xml |   2 -
 .../legacy/src/main/res/values-ca/strings.xml |   2 -
 .../legacy/src/main/res/values-cs/strings.xml |   2 -
 .../legacy/src/main/res/values-cy/strings.xml |   2 -
 .../legacy/src/main/res/values-da/strings.xml |   2 -
 .../legacy/src/main/res/values-de/strings.xml |   2 -
 .../legacy/src/main/res/values-el/strings.xml |   2 -
 .../legacy/src/main/res/values-eo/strings.xml |   2 -
 .../legacy/src/main/res/values-es/strings.xml |   2 -
 .../legacy/src/main/res/values-et/strings.xml |   2 -
 .../legacy/src/main/res/values-eu/strings.xml |   2 -
 .../legacy/src/main/res/values-fa/strings.xml |   2 -
 .../legacy/src/main/res/values-fi/strings.xml |   2 -
 .../legacy/src/main/res/values-fr/strings.xml |   2 -
 .../legacy/src/main/res/values-fy/strings.xml |   2 -
 .../legacy/src/main/res/values-gd/strings.xml |   2 -
 .../legacy/src/main/res/values-gl/strings.xml |   2 -
 .../legacy/src/main/res/values-hr/strings.xml |   2 -
 .../legacy/src/main/res/values-hu/strings.xml |   2 -
 .../legacy/src/main/res/values-in/strings.xml |   2 -
 .../legacy/src/main/res/values-is/strings.xml |   2 -
 .../legacy/src/main/res/values-it/strings.xml |   2 -
 .../legacy/src/main/res/values-iw/strings.xml |   2 -
 .../legacy/src/main/res/values-ja/strings.xml |   2 -
 .../legacy/src/main/res/values-ko/strings.xml |   2 -
 .../legacy/src/main/res/values-lt/strings.xml |   2 -
 .../legacy/src/main/res/values-lv/strings.xml |   2 -
 .../legacy/src/main/res/values-ml/strings.xml |   2 -
 .../legacy/src/main/res/values-nb/strings.xml |   2 -
 .../legacy/src/main/res/values-nl/strings.xml |   2 -
 .../legacy/src/main/res/values-pl/strings.xml |   2 -
 .../src/main/res/values-pt-rBR/strings.xml    |   2 -
 .../src/main/res/values-pt-rPT/strings.xml    |   2 -
 .../legacy/src/main/res/values-ro/strings.xml |   2 -
 .../legacy/src/main/res/values-ru/strings.xml |   2 -
 .../legacy/src/main/res/values-sk/strings.xml |   2 -
 .../legacy/src/main/res/values-sl/strings.xml |   2 -
 .../legacy/src/main/res/values-sq/strings.xml |   2 -
 .../legacy/src/main/res/values-sr/strings.xml |   2 -
 .../legacy/src/main/res/values-sv/strings.xml |   2 -
 .../legacy/src/main/res/values-tr/strings.xml |   2 -
 .../legacy/src/main/res/values-uk/strings.xml |   2 -
 .../src/main/res/values-zh-rCN/strings.xml    |   2 -
 .../src/main/res/values-zh-rTW/strings.xml    |   2 -
 app/ui/legacy/src/main/res/values/strings.xml |   2 -
 52 files changed, 1 insertion(+), 295 deletions(-)
 delete mode 100644 app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupOptions.java
 delete mode 100644 app/ui/legacy/src/main/res/layout/account_setup_options.xml

diff --git a/app/k9mail/src/main/AndroidManifest.xml b/app/k9mail/src/main/AndroidManifest.xml
index 69b476f9a..cad908a1b 100644
--- a/app/k9mail/src/main/AndroidManifest.xml
+++ b/app/k9mail/src/main/AndroidManifest.xml
@@ -95,11 +95,6 @@
             android:configChanges="locale"
             android:label="@string/account_setup_outgoing_title"/>
 
-        <activity
-            android:name=".activity.setup.AccountSetupOptions"
-            android:configChanges="locale"
-            android:label="@string/account_setup_options_title"/>
-
         <activity
             android:name=".activity.ChooseAccount"
             android:configChanges="locale"
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupOptions.java b/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupOptions.java
deleted file mode 100644
index 6be4aaa7d..000000000
--- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupOptions.java
+++ /dev/null
@@ -1,125 +0,0 @@
-
-package com.fsck.k9.activity.setup;
-
-
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.ArrayAdapter;
-import android.widget.CheckBox;
-import android.widget.Spinner;
-
-import com.fsck.k9.Account;
-import com.fsck.k9.Core;
-import com.fsck.k9.Preferences;
-import com.fsck.k9.ui.R;
-import com.fsck.k9.ui.base.K9Activity;
-
-
-@Deprecated(since = "New account setup flow")
-public class AccountSetupOptions extends K9Activity implements OnClickListener {
-    private static final String EXTRA_ACCOUNT = "account";
-
-    private Spinner mCheckFrequencyView;
-
-    private Spinner mDisplayCountView;
-
-
-    private CheckBox mNotifyView;
-
-    private Account mAccount;
-
-    public static void actionOptions(Context context, Account account) {
-        Intent i = new Intent(context, AccountSetupOptions.class);
-        i.putExtra(EXTRA_ACCOUNT, account.getUuid());
-        context.startActivity(i);
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setLayout(R.layout.account_setup_options);
-        setTitle(R.string.account_setup_options_title);
-
-        mCheckFrequencyView = findViewById(R.id.account_check_frequency);
-        mDisplayCountView = findViewById(R.id.account_display_count);
-        mNotifyView = findViewById(R.id.account_notify);
-
-        findViewById(R.id.next).setOnClickListener(this);
-
-        SpinnerOption checkFrequencies[] = {
-            new SpinnerOption(-1,
-            getString(R.string.account_setup_options_mail_check_frequency_never)),
-            new SpinnerOption(15,
-            getString(R.string.account_setup_options_mail_check_frequency_15min)),
-            new SpinnerOption(30,
-            getString(R.string.account_setup_options_mail_check_frequency_30min)),
-            new SpinnerOption(60,
-            getString(R.string.account_setup_options_mail_check_frequency_1hour)),
-            new SpinnerOption(120,
-            getString(R.string.account_setup_options_mail_check_frequency_2hour)),
-            new SpinnerOption(180,
-            getString(R.string.account_setup_options_mail_check_frequency_3hour)),
-            new SpinnerOption(360,
-            getString(R.string.account_setup_options_mail_check_frequency_6hour)),
-            new SpinnerOption(720,
-            getString(R.string.account_setup_options_mail_check_frequency_12hour)),
-            new SpinnerOption(1440,
-            getString(R.string.account_setup_options_mail_check_frequency_24hour)),
-
-        };
-
-        ArrayAdapter<SpinnerOption> checkFrequenciesAdapter = new ArrayAdapter<>(this,
-                android.R.layout.simple_spinner_item, checkFrequencies);
-        checkFrequenciesAdapter
-        .setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-        mCheckFrequencyView.setAdapter(checkFrequenciesAdapter);
-
-        SpinnerOption displayCounts[] = {
-            new SpinnerOption(10, getString(R.string.account_setup_options_mail_display_count_10)),
-            new SpinnerOption(25, getString(R.string.account_setup_options_mail_display_count_25)),
-            new SpinnerOption(50, getString(R.string.account_setup_options_mail_display_count_50)),
-            new SpinnerOption(100, getString(R.string.account_setup_options_mail_display_count_100)),
-            new SpinnerOption(250, getString(R.string.account_setup_options_mail_display_count_250)),
-            new SpinnerOption(500, getString(R.string.account_setup_options_mail_display_count_500)),
-            new SpinnerOption(1000, getString(R.string.account_setup_options_mail_display_count_1000)),
-        };
-
-        ArrayAdapter<SpinnerOption> displayCountsAdapter = new ArrayAdapter<>(this,
-                android.R.layout.simple_spinner_item, displayCounts);
-        displayCountsAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-        mDisplayCountView.setAdapter(displayCountsAdapter);
-
-        String accountUuid = getIntent().getStringExtra(EXTRA_ACCOUNT);
-        mAccount = Preferences.getPreferences().getAccount(accountUuid);
-
-        mNotifyView.setChecked(mAccount.isNotifyNewMail());
-        SpinnerOption.setSpinnerOptionValue(mCheckFrequencyView, mAccount
-                                            .getAutomaticCheckIntervalMinutes());
-        SpinnerOption.setSpinnerOptionValue(mDisplayCountView, mAccount
-                                            .getDisplayCount());
-    }
-
-    private void onDone() {
-        mAccount.setName(mAccount.getEmail());
-        mAccount.setNotifyNewMail(mNotifyView.isChecked());
-        mAccount.setAutomaticCheckIntervalMinutes((Integer)((SpinnerOption)mCheckFrequencyView
-                .getSelectedItem()).value);
-        mAccount.setDisplayCount((Integer)((SpinnerOption)mDisplayCountView
-                                           .getSelectedItem()).value);
-
-        mAccount.setFolderPushMode(Account.FolderMode.NONE);
-
-        Preferences.getPreferences().saveAccount(mAccount);
-        Core.setServicesEnabled(this);
-//        AccountSetupNames.actionSetNames(this, mAccount);
-    }
-
-    public void onClick(View v) {
-        if (v.getId() == R.id.next) {
-            onDone();
-        }
-    }
-}
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupOutgoing.java b/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupOutgoing.java
index d1c8d1732..e7281a6e1 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupOutgoing.java
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupOutgoing.java
@@ -496,7 +496,7 @@ public class AccountSetupOutgoing extends K9Activity implements OnClickListener,
                 Preferences.getPreferences().saveAccount(mAccount);
                 finish();
             } else {
-                AccountSetupOptions.actionOptions(this, mAccount);
+//                AccountSetupOptions.actionOptions(this, mAccount);
             }
         }
     }
diff --git a/app/ui/legacy/src/main/res/layout/account_setup_options.xml b/app/ui/legacy/src/main/res/layout/account_setup_options.xml
deleted file mode 100644
index d15bc14c9..000000000
--- a/app/ui/legacy/src/main/res/layout/account_setup_options.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical"
-    tools:context="com.fsck.k9.activity.setup.AccountSetupOptions">
-
-    <include layout="@layout/toolbar" />
-
-    <ScrollView
-        android:layout_width="fill_parent"
-        android:layout_height="0dp"
-        android:layout_marginBottom="54dip"
-        android:layout_weight="1"
-        android:fadingEdge="none"
-        android:padding="6dip"
-        android:scrollbarStyle="outsideInset">
-
-        <LinearLayout
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/account_setup_options_mail_check_frequency_label"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textColor="?android:attr/textColorPrimary"
-                />
-
-            <Spinner
-                android:id="@+id/account_check_frequency"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:contentDescription="@string/account_setup_options_mail_check_frequency_label" />
-
-            <TextView
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/account_setup_options_mail_display_count_label"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textColor="?android:attr/textColorPrimary" />
-
-            <Spinner
-                android:id="@+id/account_display_count"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:contentDescription="@string/account_setup_options_mail_display_count_label" />
-
-            <CheckBox
-                android:id="@+id/account_notify"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/account_setup_options_notify_label"
-                android:textColor="?android:attr/textColorPrimary" />
-
-            <View
-                android:layout_width="fill_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1" />
-        </LinearLayout>
-    </ScrollView>
-
-    <include layout="@layout/wizard_next" />
-</LinearLayout>
diff --git a/app/ui/legacy/src/main/res/values-ar/strings.xml b/app/ui/legacy/src/main/res/values-ar/strings.xml
index 9facad5b5..4e5c0ec37 100644
--- a/app/ui/legacy/src/main/res/values-ar/strings.xml
+++ b/app/ui/legacy/src/main/res/values-ar/strings.xml
@@ -388,7 +388,6 @@
   <string name="account_setup_outgoing_password_label">كلمة السِّر</string>
   <string name="account_setup_outgoing_authentication_label">المصادقة</string>
   <string name="account_setup_bad_uri">إعداد غير صالح: <xliff:g id="err_mess">%s</xliff:g></string>
-  <string name="account_setup_options_title">خيارات الحساب</string>
   <string name="account_setup_options_mail_check_frequency_label">تردد استطلاع المجلد </string>
   <string name="account_setup_options_mail_check_frequency_never">أبدًا</string>
   <string name="account_setup_options_mail_check_frequency_15min">كل 15 دقيقة</string>
@@ -408,7 +407,6 @@
   <string name="idle_refresh_period_36min">كل 36 دقيقة</string>
   <string name="idle_refresh_period_48min">كل 48 دقيقة</string>
   <string name="idle_refresh_period_60min">كل 60 دقيقة</string>
-  <string name="account_setup_options_notify_label">نبهني عند وصول رسالة</string>
   <string name="account_setup_options_mail_display_count_label">عدد الرسائل التي ستظهر</string>
   <string name="account_setup_options_mail_display_count_10">10 رسائل</string>
   <string name="account_setup_options_mail_display_count_25">25 رسالة</string>
diff --git a/app/ui/legacy/src/main/res/values-be/strings.xml b/app/ui/legacy/src/main/res/values-be/strings.xml
index 926e686e8..939a83551 100644
--- a/app/ui/legacy/src/main/res/values-be/strings.xml
+++ b/app/ui/legacy/src/main/res/values-be/strings.xml
@@ -385,7 +385,6 @@ K-9 Mail - шматфункцыянальны свабодны паштовы к
   <string name="account_setup_outgoing_authentication_label">Аўтэнтыфікацыя</string>
   <string name="account_setup_outgoing_invalid_setting_combo_notice">\"<xliff:g id="setting_1_label">%1$s</xliff:g> = <xliff:g id="setting_1_value">%2$s</xliff:g>\" непрыдатны для \"<xliff:g id="setting_2_label">%3$s</xliff:g> = <xliff:g id="setting_2_value">%4$s</xliff:g>\"</string>
   <string name="account_setup_bad_uri">Хібнае наладжванне: <xliff:g id="err_mess">%s</xliff:g></string>
-  <string name="account_setup_options_title">Параметры акаўнта</string>
   <string name="account_setup_options_mail_check_frequency_label">Частата апытання</string>
   <string name="account_setup_options_mail_check_frequency_never">Ніколі</string>
   <string name="account_setup_options_mail_check_frequency_15min">Кожныя 15 хвілін</string>
@@ -405,7 +404,6 @@ K-9 Mail - шматфункцыянальны свабодны паштовы к
   <string name="idle_refresh_period_36min">Кожныя 36 хвілін</string>
   <string name="idle_refresh_period_48min">Кожныя 48 хвілін</string>
   <string name="idle_refresh_period_60min">Кожныя 60 хвілін</string>
-  <string name="account_setup_options_notify_label">Апавяшчаць пра новую пошту</string>
   <string name="account_setup_options_mail_display_count_label">Колькасць лістоў для паказу</string>
   <string name="account_setup_options_mail_display_count_10">10 лістоў</string>
   <string name="account_setup_options_mail_display_count_25">25 лістоў</string>
diff --git a/app/ui/legacy/src/main/res/values-bg/strings.xml b/app/ui/legacy/src/main/res/values-bg/strings.xml
index 24d707fd2..ddcef0e60 100644
--- a/app/ui/legacy/src/main/res/values-bg/strings.xml
+++ b/app/ui/legacy/src/main/res/values-bg/strings.xml
@@ -347,7 +347,6 @@ K-9 Mail е мощен, безплатен имейл клиент за Андр
   <string name="account_setup_outgoing_authentication_label">Идентификация</string>
   <string name="account_setup_outgoing_invalid_setting_combo_notice">\"<xliff:g id="setting_1_label">%1$s</xliff:g> = <xliff:g id="setting_1_value">%2$s</xliff:g>\" не е валидно с \"<xliff:g id="setting_2_label">%3$s</xliff:g> = <xliff:g id="setting_2_value">%4$s</xliff:g>\"</string>
   <string name="account_setup_bad_uri">Невалидни настройки: <xliff:g id="err_mess">%s</xliff:g></string>
-  <string name="account_setup_options_title">Настройки на профила</string>
   <string name="account_setup_options_mail_check_frequency_label">Честота на проверка на папката</string>
   <string name="account_setup_options_mail_check_frequency_never">Никога</string>
   <string name="account_setup_options_mail_check_frequency_15min">На всеки 15 минути</string>
@@ -367,7 +366,6 @@ K-9 Mail е мощен, безплатен имейл клиент за Андр
   <string name="idle_refresh_period_36min">На всеки 36 минути</string>
   <string name="idle_refresh_period_48min">На всеки 48 минути</string>
   <string name="idle_refresh_period_60min">На всеки 60 минути</string>
-  <string name="account_setup_options_notify_label">Уведоми ме когато пристигне поща</string>
   <string name="account_setup_options_mail_display_count_label">Брой съобщения за показване</string>
   <string name="account_setup_options_mail_display_count_10">10 съобщения</string>
   <string name="account_setup_options_mail_display_count_25">25 съобщения</string>
diff --git a/app/ui/legacy/src/main/res/values-br/strings.xml b/app/ui/legacy/src/main/res/values-br/strings.xml
index b60cc1a72..6cb15c4dd 100644
--- a/app/ui/legacy/src/main/res/values-br/strings.xml
+++ b/app/ui/legacy/src/main/res/values-br/strings.xml
@@ -328,7 +328,6 @@ Danevellit beugoù, kenlabourit war keweriusterioù nevez ha savit goulennoù wa
   <string name="account_setup_outgoing_authentication_label">Dilesa</string>
   <string name="account_setup_outgoing_invalid_setting_combo_notice"><xliff:g id="setting_1_label">%1$s</xliff:g> = <xliff:g id="setting_1_value">%2$s</xliff:g>\" n’eo ket talvoudek gant \"<xliff:g id="setting_2_label">%3$s</xliff:g> = <xliff:g id="setting_2_value">%4$s</xliff:g></string>
   <string name="account_setup_bad_uri">Arventennoù didalvoudek: <xliff:g id="err_mess">%s</xliff:g></string>
-  <string name="account_setup_options_title">Dibarzhioù ar gont</string>
   <string name="account_setup_options_mail_check_frequency_label">Aliested kerc’hat ar posteloù</string>
   <string name="account_setup_options_mail_check_frequency_never">Morse</string>
   <string name="account_setup_options_mail_check_frequency_15min">Bep 15 munutenn</string>
@@ -348,7 +347,6 @@ Danevellit beugoù, kenlabourit war keweriusterioù nevez ha savit goulennoù wa
   <string name="idle_refresh_period_36min">Bep 36 munutenn</string>
   <string name="idle_refresh_period_48min">Bep 48 munutenn</string>
   <string name="idle_refresh_period_60min">Bep 60 munutenn</string>
-  <string name="account_setup_options_notify_label">Ma rebuziñ pa zegouezh ar posteloù</string>
   <string name="account_setup_options_mail_display_count_label">Niver a gemennadennoù da ziskouez</string>
   <string name="account_setup_options_mail_display_count_10">10 kemennadenn</string>
   <string name="account_setup_options_mail_display_count_25">25 kemennadenn</string>
diff --git a/app/ui/legacy/src/main/res/values-ca/strings.xml b/app/ui/legacy/src/main/res/values-ca/strings.xml
index 4ccf034fd..e1a02b2a8 100644
--- a/app/ui/legacy/src/main/res/values-ca/strings.xml
+++ b/app/ui/legacy/src/main/res/values-ca/strings.xml
@@ -382,7 +382,6 @@ Si us plau, envieu informes d\'errors, contribuïu-hi amb noves millores i feu p
   <string name="account_setup_outgoing_authentication_label">Tipus d\'autenticació</string>
   <string name="account_setup_outgoing_invalid_setting_combo_notice">\"<xliff:g id="setting_1_label">%1$s</xliff:g> = <xliff:g id="setting_1_value">%2$s</xliff:g>\" no és vàlid amb \"<xliff:g id="setting_2_label">%3$s</xliff:g> = <xliff:g id="setting_2_value">%4$s</xliff:g>\"</string>
   <string name="account_setup_bad_uri">Configuració no vàlida: <xliff:g id="err_mess">%s</xliff:g></string>
-  <string name="account_setup_options_title">Opcions del compte</string>
   <string name="account_setup_options_mail_check_frequency_label">Freqüència de comprovació</string>
   <string name="account_setup_options_mail_check_frequency_never">Mai</string>
   <string name="account_setup_options_mail_check_frequency_15min">Cada 15 minuts</string>
@@ -402,7 +401,6 @@ Si us plau, envieu informes d\'errors, contribuïu-hi amb noves millores i feu p
   <string name="idle_refresh_period_36min">Cada 36 minuts</string>
   <string name="idle_refresh_period_48min">Cada 48 minuts</string>
   <string name="idle_refresh_period_60min">Cada 60 minuts</string>
-  <string name="account_setup_options_notify_label">Avisa\'m quan arribi correu</string>
   <string name="account_setup_options_mail_display_count_label">Nombre de missatges a mostrar</string>
   <string name="account_setup_options_mail_display_count_10">10 missatges</string>
   <string name="account_setup_options_mail_display_count_25">25 missatges</string>
diff --git a/app/ui/legacy/src/main/res/values-cs/strings.xml b/app/ui/legacy/src/main/res/values-cs/strings.xml
index 56148e310..e001863a9 100644
--- a/app/ui/legacy/src/main/res/values-cs/strings.xml
+++ b/app/ui/legacy/src/main/res/values-cs/strings.xml
@@ -386,7 +386,6 @@ Hlášení o chyb, úpravy pro nové funkce a dotazy zadávejte prostřednictví
   <string name="account_setup_outgoing_authentication_label">Typ ověření</string>
   <string name="account_setup_outgoing_invalid_setting_combo_notice">„<xliff:g id="setting_1_label">%1$s</xliff:g> = <xliff:g id="setting_1_value">%2$s</xliff:g>“ není platný s „<xliff:g id="setting_2_label">%3$s</xliff:g> = <xliff:g id="setting_2_value">%4$s</xliff:g>“</string>
   <string name="account_setup_bad_uri">Neplatné nastavení: <xliff:g id="err_mess">%s</xliff:g></string>
-  <string name="account_setup_options_title">Možnosti účtu</string>
   <string name="account_setup_options_mail_check_frequency_label">Frekvence dotazování složky</string>
   <string name="account_setup_options_mail_check_frequency_never">Nikdy</string>
   <string name="account_setup_options_mail_check_frequency_15min">Každých 15 minut</string>
@@ -406,7 +405,6 @@ Hlášení o chyb, úpravy pro nové funkce a dotazy zadávejte prostřednictví
   <string name="idle_refresh_period_36min">Každých 36 minut</string>
   <string name="idle_refresh_period_48min">Každých 48 minut</string>
   <string name="idle_refresh_period_60min">Každých 60 minut</string>
-  <string name="account_setup_options_notify_label">Oznamuj mi příchod nové pošty</string>
   <string name="account_setup_options_mail_display_count_label">Počet zobrazených zpráv</string>
   <string name="account_setup_options_mail_display_count_10">10 zpráv</string>
   <string name="account_setup_options_mail_display_count_25">25 zpráv</string>
diff --git a/app/ui/legacy/src/main/res/values-cy/strings.xml b/app/ui/legacy/src/main/res/values-cy/strings.xml
index 78f231d9e..d05442af5 100644
--- a/app/ui/legacy/src/main/res/values-cy/strings.xml
+++ b/app/ui/legacy/src/main/res/values-cy/strings.xml
@@ -372,7 +372,6 @@ Plîs rho wybod am unrhyw wallau, syniadau am nodweddion newydd, neu ofyn cwesti
   <string name="account_setup_outgoing_authentication_label">Dilysiad</string>
   <string name="account_setup_outgoing_invalid_setting_combo_notice">Dyw \"<xliff:g id="setting_1_label">%1$s</xliff:g> = <xliff:g id="setting_1_value">%2$s</xliff:g>\" ddim yn dilys gyda \"<xliff:g id="setting_2_label">%3$s</xliff:g> = <xliff:g id="setting_2_value">%4$s</xliff:g>\"</string>
   <string name="account_setup_bad_uri">Gosodiad annilys: <xliff:g id="err_mess">%s</xliff:g></string>
-  <string name="account_setup_options_title">Dewisiadau cyfrif</string>
   <string name="account_setup_options_mail_check_frequency_label">Pa mor aml i wirio\'r ffolder</string>
   <string name="account_setup_options_mail_check_frequency_never">Byth</string>
   <string name="account_setup_options_mail_check_frequency_15min">Pob 15 munud</string>
@@ -392,7 +391,6 @@ Plîs rho wybod am unrhyw wallau, syniadau am nodweddion newydd, neu ofyn cwesti
   <string name="idle_refresh_period_36min">Pob 36 munud</string>
   <string name="idle_refresh_period_48min">Pob 48 munud</string>
   <string name="idle_refresh_period_60min">Pob 60 munud</string>
-  <string name="account_setup_options_notify_label">Hysbysu pan ddaw neges newydd</string>
   <string name="account_setup_options_mail_display_count_label">Nifer o negeseuon i\'w dangos</string>
   <string name="account_setup_options_mail_display_count_10">10 neges</string>
   <string name="account_setup_options_mail_display_count_25">25 neges</string>
diff --git a/app/ui/legacy/src/main/res/values-da/strings.xml b/app/ui/legacy/src/main/res/values-da/strings.xml
index 0be62f47b..3ba2aa0aa 100644
--- a/app/ui/legacy/src/main/res/values-da/strings.xml
+++ b/app/ui/legacy/src/main/res/values-da/strings.xml
@@ -376,7 +376,6 @@ Rapporter venligst fejl, forslag til nye funktioner eller stil spørgsmål på:
   <string name="account_setup_outgoing_authentication_label">Autentifikationstype</string>
   <string name="account_setup_outgoing_invalid_setting_combo_notice">\"<xliff:g id="setting_1_label">%1$s</xliff:g> = <xliff:g id="setting_1_value">%2$s</xliff:g>\" er ikke gyldig med \"<xliff:g id="setting_2_label">%3$s</xliff:g> = <xliff:g id="setting_2_value">%4$s</xliff:g>\"</string>
   <string name="account_setup_bad_uri">Ugyldig opsætning: <xliff:g id="err_mess">%s</xliff:g></string>
-  <string name="account_setup_options_title">Kontoindstillinger</string>
   <string name="account_setup_options_mail_check_frequency_label">Frekvens for hentning af mail</string>
   <string name="account_setup_options_mail_check_frequency_never">Aldrig</string>
   <string name="account_setup_options_mail_check_frequency_15min">Hver 15 minut</string>
@@ -396,7 +395,6 @@ Rapporter venligst fejl, forslag til nye funktioner eller stil spørgsmål på:
   <string name="idle_refresh_period_36min">Hver 36 minut</string>
   <string name="idle_refresh_period_48min">Hver 48 minut</string>
   <string name="idle_refresh_period_60min">Hver 60 minut</string>
-  <string name="account_setup_options_notify_label">Vis besked når mails ankommer</string>
   <string name="account_setup_options_mail_display_count_label">Antal viste mails</string>
   <string name="account_setup_options_mail_display_count_10">10 mails</string>
   <string name="account_setup_options_mail_display_count_25">25 mails</string>
diff --git a/app/ui/legacy/src/main/res/values-de/strings.xml b/app/ui/legacy/src/main/res/values-de/strings.xml
index e77b07a07..036cdc8dc 100644
--- a/app/ui/legacy/src/main/res/values-de/strings.xml
+++ b/app/ui/legacy/src/main/res/values-de/strings.xml
@@ -381,7 +381,6 @@ Bitte sende Fehlerberichte, Ideen für neue Funktionen und stelle Fragen an
   <string name="account_setup_outgoing_authentication_label">Authentifizierungsmethode</string>
   <string name="account_setup_outgoing_invalid_setting_combo_notice">\"<xliff:g id="setting_1_label">%1$s</xliff:g> = <xliff:g id="setting_1_value">%2$s</xliff:g>\" ist nicht gültig mit \"<xliff:g id="setting_2_label">%3$s</xliff:g> = <xliff:g id="setting_2_value">%4$s</xliff:g>\"</string>
   <string name="account_setup_bad_uri">Ungültige Einstellung: <xliff:g id="err_mess">%s</xliff:g></string>
-  <string name="account_setup_options_title">Kontooptionen</string>
   <string name="account_setup_options_mail_check_frequency_label">E-Mail-Abfrage</string>
   <string name="account_setup_options_mail_check_frequency_never">Nie (nur manuell)</string>
   <string name="account_setup_options_mail_check_frequency_15min">Alle 15 Minuten</string>
@@ -401,7 +400,6 @@ Bitte sende Fehlerberichte, Ideen für neue Funktionen und stelle Fragen an
   <string name="idle_refresh_period_36min">Alle 36 Minuten</string>
   <string name="idle_refresh_period_48min">Alle 48 Minuten</string>
   <string name="idle_refresh_period_60min">Jede Stunde</string>
-  <string name="account_setup_options_notify_label">Benachrichtigen, wenn Nachrichten eingehen</string>
   <string name="account_setup_options_mail_display_count_label">Anzahl sichtbarer Nachrichten</string>
   <string name="account_setup_options_mail_display_count_10">10 Nachrichten</string>
   <string name="account_setup_options_mail_display_count_25">25 Nachrichten</string>
diff --git a/app/ui/legacy/src/main/res/values-el/strings.xml b/app/ui/legacy/src/main/res/values-el/strings.xml
index 396b95a4a..8af04d0cc 100644
--- a/app/ui/legacy/src/main/res/values-el/strings.xml
+++ b/app/ui/legacy/src/main/res/values-el/strings.xml
@@ -379,7 +379,6 @@
   <string name="account_setup_outgoing_authentication_label">Πιστοποίηση</string>
   <string name="account_setup_outgoing_invalid_setting_combo_notice">Το «<xliff:g id="setting_1_label">%1$s</xliff:g> = <xliff:g id="setting_1_value">%2$s</xliff:g>» δεν είναι έγκυρο με «<xliff:g id="setting_2_label">%3$s</xliff:g> = <xliff:g id="setting_2_value">%4$s</xliff:g>»</string>
   <string name="account_setup_bad_uri">Άκυρη ρύθμιση: <xliff:g id="err_mess">%s</xliff:g></string>
-  <string name="account_setup_options_title">Επιλογές λογαριασμού</string>
   <string name="account_setup_options_mail_check_frequency_label">Συχνότητα ενημέρωσης φακέλων</string>
   <string name="account_setup_options_mail_check_frequency_never">Ποτέ</string>
   <string name="account_setup_options_mail_check_frequency_15min">Κάθε 15 λεπτά</string>
@@ -399,7 +398,6 @@
   <string name="idle_refresh_period_36min">Κάθε 36 λεπτά</string>
   <string name="idle_refresh_period_48min">Κάθε 48 λεπτά</string>
   <string name="idle_refresh_period_60min">Κάθε 60 λεπτά</string>
-  <string name="account_setup_options_notify_label">Ειδοποίηση κατά την άφιξη μηνύματος</string>
   <string name="account_setup_options_mail_display_count_label">Πλήθος μηνυμάτων που προβάλλονται</string>
   <string name="account_setup_options_mail_display_count_10">10 μηνύματα</string>
   <string name="account_setup_options_mail_display_count_25">25 μηνύματα</string>
diff --git a/app/ui/legacy/src/main/res/values-eo/strings.xml b/app/ui/legacy/src/main/res/values-eo/strings.xml
index 9fade1c8f..a6d24a115 100644
--- a/app/ui/legacy/src/main/res/values-eo/strings.xml
+++ b/app/ui/legacy/src/main/res/values-eo/strings.xml
@@ -349,7 +349,6 @@ Bonvolu raporti erarojn, kontribui novajn eblojn kaj peti pri novaj funkcioj per
   <string name="account_setup_outgoing_authentication_label">Aŭtentigo</string>
   <string name="account_setup_outgoing_invalid_setting_combo_notice">\"<xliff:g id="setting_1_label">%1$s</xliff:g> = <xliff:g id="setting_1_value">%2$s</xliff:g>\" ne estas ĝusta kun \"<xliff:g id="setting_2_label">%3$s</xliff:g> = <xliff:g id="setting_2_value">%4$s</xliff:g>\"</string>
   <string name="account_setup_bad_uri">Erara agordaro: <xliff:g id="err_mess">%s</xliff:g></string>
-  <string name="account_setup_options_title">Kontaj agordoj</string>
   <string name="account_setup_options_mail_check_frequency_label">Ofteco de mesaĝuj-elŝuto</string>
   <string name="account_setup_options_mail_check_frequency_never">Neniam</string>
   <string name="account_setup_options_mail_check_frequency_15min">Je ĉiuj 15 minutoj</string>
@@ -369,7 +368,6 @@ Bonvolu raporti erarojn, kontribui novajn eblojn kaj peti pri novaj funkcioj per
   <string name="idle_refresh_period_36min">Je ĉiuj 36 minutoj</string>
   <string name="idle_refresh_period_48min">Je ĉiuj 48 minutoj</string>
   <string name="idle_refresh_period_60min">Je ĉiuj 60 minutoj</string>
-  <string name="account_setup_options_notify_label">Sciigi kiam retletero alvenas</string>
   <string name="account_setup_options_mail_display_count_label">Kiom da mesaĝoj montri</string>
   <string name="account_setup_options_mail_display_count_10">10 mesaĝoj</string>
   <string name="account_setup_options_mail_display_count_25">25 mesaĝoj</string>
diff --git a/app/ui/legacy/src/main/res/values-es/strings.xml b/app/ui/legacy/src/main/res/values-es/strings.xml
index c07f73da1..0b0212437 100644
--- a/app/ui/legacy/src/main/res/values-es/strings.xml
+++ b/app/ui/legacy/src/main/res/values-es/strings.xml
@@ -382,7 +382,6 @@ Puedes informar de fallos, contribuir con su desarrollo y hacer preguntas en <a
   <string name="account_setup_outgoing_authentication_label">Tipo de autentificación</string>
   <string name="account_setup_outgoing_invalid_setting_combo_notice">La opción «<xliff:g id="setting_1_label">%1$s</xliff:g> = <xliff:g id="setting_1_value">%2$s</xliff:g>» no es compatible con «<xliff:g id="setting_2_label">%3$s</xliff:g> = <xliff:g id="setting_2_value">%4$s</xliff:g>»</string>
   <string name="account_setup_bad_uri">Configuración incorrecta: <xliff:g id="err_mess">%s</xliff:g></string>
-  <string name="account_setup_options_title">Opciones de cuenta</string>
   <string name="account_setup_options_mail_check_frequency_label">Frecuencia de comprobación de correo nuevo</string>
   <string name="account_setup_options_mail_check_frequency_never">Nunca</string>
   <string name="account_setup_options_mail_check_frequency_15min">Cada 15 minutos</string>
@@ -402,7 +401,6 @@ Puedes informar de fallos, contribuir con su desarrollo y hacer preguntas en <a
   <string name="idle_refresh_period_36min">Cada 36 minutos</string>
   <string name="idle_refresh_period_48min">Cada 48 minutos</string>
   <string name="idle_refresh_period_60min">Cada 60 minutos</string>
-  <string name="account_setup_options_notify_label">Avisarme cuando lleguen nuevos mensajes</string>
   <string name="account_setup_options_mail_display_count_label">Número de mensajes a mostrar</string>
   <string name="account_setup_options_mail_display_count_10">10 mensajes</string>
   <string name="account_setup_options_mail_display_count_25">25 mensajes</string>
diff --git a/app/ui/legacy/src/main/res/values-et/strings.xml b/app/ui/legacy/src/main/res/values-et/strings.xml
index abd5f91d8..2c616af7d 100644
--- a/app/ui/legacy/src/main/res/values-et/strings.xml
+++ b/app/ui/legacy/src/main/res/values-et/strings.xml
@@ -383,7 +383,6 @@ Veateated saad saata, kaastööd teha ning küsida teavet järgmisel lehel:
   <string name="account_setup_outgoing_authentication_label">Autentimine</string>
   <string name="account_setup_outgoing_invalid_setting_combo_notice">\"<xliff:g id="setting_1_label">%1$s</xliff:g> = <xliff:g id="setting_1_value">%2$s</xliff:g>\" ei valideeru seadega \"<xliff:g id="setting_2_label">%3$s</xliff:g> = <xliff:g id="setting_2_value">%4$s</xliff:g>\"</string>
   <string name="account_setup_bad_uri">Vigased sätted: <xliff:g id="err_mess">%s</xliff:g></string>
-  <string name="account_setup_options_title">Konto valikud</string>
   <string name="account_setup_options_mail_check_frequency_label">Kausta pollimise sagedus</string>
   <string name="account_setup_options_mail_check_frequency_never">Mitte kunagi</string>
   <string name="account_setup_options_mail_check_frequency_15min">Iga 15 minuti tagant</string>
@@ -403,7 +402,6 @@ Veateated saad saata, kaastööd teha ning küsida teavet järgmisel lehel:
   <string name="idle_refresh_period_36min">Iga 36 minuti tagant</string>
   <string name="idle_refresh_period_48min">Iga 48 minuti tagant</string>
   <string name="idle_refresh_period_60min">Iga 60 minuti tagant</string>
-  <string name="account_setup_options_notify_label">Teavita uue e-kirja saabumisest</string>
   <string name="account_setup_options_mail_display_count_label">Kuvatavate kirjade arv</string>
   <string name="account_setup_options_mail_display_count_10">10 kirja</string>
   <string name="account_setup_options_mail_display_count_25">25 kirja</string>
diff --git a/app/ui/legacy/src/main/res/values-eu/strings.xml b/app/ui/legacy/src/main/res/values-eu/strings.xml
index 90976b961..12a302871 100644
--- a/app/ui/legacy/src/main/res/values-eu/strings.xml
+++ b/app/ui/legacy/src/main/res/values-eu/strings.xml
@@ -372,7 +372,6 @@ Mesedez akatsen berri emateko, ezaugarri berriak gehitzeko eta galderak egiteko
   <string name="account_setup_outgoing_authentication_label">Autentifikazioa</string>
   <string name="account_setup_outgoing_invalid_setting_combo_notice">\"<xliff:g id="setting_1_label">%1$s</xliff:g> = <xliff:g id="setting_1_value">%2$s</xliff:g>\" ez da baliozkoa \"<xliff:g id="setting_2_label">%3$s</xliff:g> = <xliff:g id="setting_2_value">%4$s</xliff:g>\"-(r)ekin</string>
   <string name="account_setup_bad_uri">Konfigurazio baliogabea: <xliff:g id="err_mess">%s</xliff:g></string>
-  <string name="account_setup_options_title">Kontu aukerak</string>
   <string name="account_setup_options_mail_check_frequency_label">Karpeta atzitzeko maiztasuna</string>
   <string name="account_setup_options_mail_check_frequency_never">Inoiz ez</string>
   <string name="account_setup_options_mail_check_frequency_15min">15 minutuero</string>
@@ -392,7 +391,6 @@ Mesedez akatsen berri emateko, ezaugarri berriak gehitzeko eta galderak egiteko
   <string name="idle_refresh_period_36min">36 minutuero</string>
   <string name="idle_refresh_period_48min">48 minutuero</string>
   <string name="idle_refresh_period_60min">60 minutuero</string>
-  <string name="account_setup_options_notify_label">Jakinarazi niri posta iristean</string>
   <string name="account_setup_options_mail_display_count_label">Bistaratuko den mezu kopurua</string>
   <string name="account_setup_options_mail_display_count_10">10 mezu</string>
   <string name="account_setup_options_mail_display_count_25">25 mezu</string>
diff --git a/app/ui/legacy/src/main/res/values-fa/strings.xml b/app/ui/legacy/src/main/res/values-fa/strings.xml
index 6e2c8aba3..bad5f0e6d 100644
--- a/app/ui/legacy/src/main/res/values-fa/strings.xml
+++ b/app/ui/legacy/src/main/res/values-fa/strings.xml
@@ -381,7 +381,6 @@
   <string name="account_setup_outgoing_authentication_label">احراز هویت</string>
   <string name="account_setup_outgoing_invalid_setting_combo_notice">«<xliff:g id="setting_1_label">%1$s</xliff:g> = <xliff:g id="setting_1_value">%2$s</xliff:g>» با «<xliff:g id="setting_2_label">%3$s</xliff:g> = <xliff:g id="setting_2_value">%4$s</xliff:g>» معتبر نیست</string>
   <string name="account_setup_bad_uri">پیکربندی نادرست: <xliff:g id="err_mess">%s</xliff:g></string>
-  <string name="account_setup_options_title">گزینه‌های حساب کاربری</string>
   <string name="account_setup_options_mail_check_frequency_label">تکرار سرکشی به پوشه</string>
   <string name="account_setup_options_mail_check_frequency_never">هرگز</string>
   <string name="account_setup_options_mail_check_frequency_15min">هر ۱۵ دقیقه</string>
@@ -401,7 +400,6 @@
   <string name="idle_refresh_period_36min">هر ۳۶ دقیقه</string>
   <string name="idle_refresh_period_48min">هر ۴۸ دقیقه</string>
   <string name="idle_refresh_period_60min">هر ۶۰ دقیقه</string>
-  <string name="account_setup_options_notify_label">هر زمان رایانامه رسید به من خبر بده</string>
   <string name="account_setup_options_mail_display_count_label">تعداد پیام‌ها برای نمایش</string>
   <string name="account_setup_options_mail_display_count_10">۱۰ پیام</string>
   <string name="account_setup_options_mail_display_count_25">۲۵ پیام</string>
diff --git a/app/ui/legacy/src/main/res/values-fi/strings.xml b/app/ui/legacy/src/main/res/values-fi/strings.xml
index 69da5ea1d..2818bf24d 100644
--- a/app/ui/legacy/src/main/res/values-fi/strings.xml
+++ b/app/ui/legacy/src/main/res/values-fi/strings.xml
@@ -381,7 +381,6 @@ Ilmoita virheistä, ota osaa sovelluskehitykseen ja esitä kysymyksiä osoittees
   <string name="account_setup_outgoing_authentication_label">Todennustapa</string>
   <string name="account_setup_outgoing_invalid_setting_combo_notice">\"<xliff:g id="setting_1_label">%1$s</xliff:g> = <xliff:g id="setting_1_value">%2$s</xliff:g>\" ei ole kelvollinen asetuksen \"<xliff:g id="setting_2_label">%3$s</xliff:g> = <xliff:g id="setting_2_value">%4$s</xliff:g>\" kanssa</string>
   <string name="account_setup_bad_uri">Virheellinen asetus: <xliff:g id="err_mess">%s</xliff:g></string>
-  <string name="account_setup_options_title">Tilin asetukset</string>
   <string name="account_setup_options_mail_check_frequency_label">Viestien tarkistus</string>
   <string name="account_setup_options_mail_check_frequency_never">Ei koskaan</string>
   <string name="account_setup_options_mail_check_frequency_15min">Joka 15 minuutti</string>
@@ -401,7 +400,6 @@ Ilmoita virheistä, ota osaa sovelluskehitykseen ja esitä kysymyksiä osoittees
   <string name="idle_refresh_period_36min">Joka 36 minuutti</string>
   <string name="idle_refresh_period_48min">Joka 48 minuutti</string>
   <string name="idle_refresh_period_60min">Joka 60 minuutti</string>
-  <string name="account_setup_options_notify_label">Ilmoitus postin saapumisesta</string>
   <string name="account_setup_options_mail_display_count_label">Näytettävien viestien lukumäärä</string>
   <string name="account_setup_options_mail_display_count_10">10 kansiota</string>
   <string name="account_setup_options_mail_display_count_25">25 kansiota</string>
diff --git a/app/ui/legacy/src/main/res/values-fr/strings.xml b/app/ui/legacy/src/main/res/values-fr/strings.xml
index b545d374e..f5ab6c8a5 100644
--- a/app/ui/legacy/src/main/res/values-fr/strings.xml
+++ b/app/ui/legacy/src/main/res/values-fr/strings.xml
@@ -385,7 +385,6 @@ Rapportez les bogues, recommandez de nouvelles fonctions et posez vos questions
   <string name="account_setup_outgoing_authentication_label">Authentification</string>
   <string name="account_setup_outgoing_invalid_setting_combo_notice">« <xliff:g id="setting_1_label">%1$s</xliff:g> = <xliff:g id="setting_1_value">%2$s</xliff:g> » n’est pas valide avec « <xliff:g id="setting_2_label">%3$s</xliff:g> = <xliff:g id="setting_2_value">%4$s</xliff:g> »</string>
   <string name="account_setup_bad_uri">Paramétrage invalide : <xliff:g id="err_mess">%s</xliff:g></string>
-  <string name="account_setup_options_title">Options du compte</string>
   <string name="account_setup_options_mail_check_frequency_label">Fréquence de scrutation des dossiers</string>
   <string name="account_setup_options_mail_check_frequency_never">Jamais</string>
   <string name="account_setup_options_mail_check_frequency_15min">Toutes les 15 minutes</string>
@@ -405,7 +404,6 @@ Rapportez les bogues, recommandez de nouvelles fonctions et posez vos questions
   <string name="idle_refresh_period_36min">Toutes les 36 minutes</string>
   <string name="idle_refresh_period_48min">Toutes les 48 minutes</string>
   <string name="idle_refresh_period_60min">Toutes les 60 minutes</string>
-  <string name="account_setup_options_notify_label">M’avertir lors de l’arrivée de courriels</string>
   <string name="account_setup_options_mail_display_count_label">Nombre de courriels à afficher</string>
   <string name="account_setup_options_mail_display_count_10">10 courriels</string>
   <string name="account_setup_options_mail_display_count_25">25 courriels</string>
diff --git a/app/ui/legacy/src/main/res/values-fy/strings.xml b/app/ui/legacy/src/main/res/values-fy/strings.xml
index 6b66c3e98..f6909e781 100644
--- a/app/ui/legacy/src/main/res/values-fy/strings.xml
+++ b/app/ui/legacy/src/main/res/values-fy/strings.xml
@@ -377,7 +377,6 @@ Graach flaterrapporten stjoere, bydragen foar nije funksjes en fragen stelle op
   <string name="account_setup_outgoing_authentication_label">Autentikaasjetype</string>
   <string name="account_setup_outgoing_invalid_setting_combo_notice">‘<xliff:g id="setting_1_label">%1$s</xliff:g> = <xliff:g id="setting_1_value">%2$s</xliff:g>’ is net jildich mei ‘<xliff:g id="setting_2_label">%3$s</xliff:g> = <xliff:g id="setting_2_value">%4$s</xliff:g>’</string>
   <string name="account_setup_bad_uri">Unjildige ynstellingen: <xliff:g id="err_mess">%s</xliff:g></string>
-  <string name="account_setup_options_title">Accountopsjes</string>
   <string name="account_setup_options_mail_check_frequency_label">Frekwinsje mapkontrôle</string>
   <string name="account_setup_options_mail_check_frequency_never">Nea</string>
   <string name="account_setup_options_mail_check_frequency_15min">Elke 15 minuten</string>
@@ -397,7 +396,6 @@ Graach flaterrapporten stjoere, bydragen foar nije funksjes en fragen stelle op
   <string name="idle_refresh_period_36min">Elke 36 minuten</string>
   <string name="idle_refresh_period_48min">Elke 48 minuten</string>
   <string name="idle_refresh_period_60min">Elke 60 minuten</string>
-  <string name="account_setup_options_notify_label">Melding jaan by nij e-mailberjocht</string>
   <string name="account_setup_options_mail_display_count_label">Tal berjochten om te toanen</string>
   <string name="account_setup_options_mail_display_count_10">10 berjochten</string>
   <string name="account_setup_options_mail_display_count_25">25 berjochten</string>
diff --git a/app/ui/legacy/src/main/res/values-gd/strings.xml b/app/ui/legacy/src/main/res/values-gd/strings.xml
index c8860fd7e..4694ffd1a 100644
--- a/app/ui/legacy/src/main/res/values-gd/strings.xml
+++ b/app/ui/legacy/src/main/res/values-gd/strings.xml
@@ -314,7 +314,6 @@
   <string name="account_setup_outgoing_authentication_label">Dearbhadh</string>
   <string name="account_setup_outgoing_invalid_setting_combo_notice">Chan eil “<xliff:g id="setting_1_label">%1$s</xliff:g> = <xliff:g id="setting_1_value">%2$s</xliff:g>” dligheach mu choinneamh “<xliff:g id="setting_2_label">%3$s</xliff:g> = <xliff:g id="setting_2_value">%4$s</xliff:g>”</string>
   <string name="account_setup_bad_uri">Suidheachadh mì-dhligheach: <xliff:g id="err_mess">%s</xliff:g></string>
-  <string name="account_setup_options_title">Roghainnean a’ chunntais</string>
   <string name="account_setup_options_mail_check_frequency_label">Dè cho tric ’s a dh’iarras sinn am post\?</string>
   <string name="account_setup_options_mail_check_frequency_never">Chan ann idir</string>
   <string name="account_setup_options_mail_check_frequency_15min">Gach cairteal na h-uarach</string>
@@ -334,7 +333,6 @@
   <string name="idle_refresh_period_36min">Gach 36 mionaid</string>
   <string name="idle_refresh_period_48min">Gach 48 mionaid</string>
   <string name="idle_refresh_period_60min">Gach uair a thìde</string>
-  <string name="account_setup_options_notify_label">Thoir brath dhomh nuair a ruigeas post</string>
   <string name="account_setup_options_mail_display_count_label">Co mheud teachdaireachd a thèid a shealltainn</string>
   <string name="account_setup_options_mail_display_count_10">10 teachdaireachdan</string>
   <string name="account_setup_options_mail_display_count_25">25 teachdaireachd</string>
diff --git a/app/ui/legacy/src/main/res/values-gl/strings.xml b/app/ui/legacy/src/main/res/values-gl/strings.xml
index 0e4b3cc03..fb388f6c6 100644
--- a/app/ui/legacy/src/main/res/values-gl/strings.xml
+++ b/app/ui/legacy/src/main/res/values-gl/strings.xml
@@ -355,7 +355,6 @@ Por favor envíen informes de fallos, contribúa con novas características e co
   <string name="account_setup_outgoing_authentication_label">Tipo de autentificación</string>
   <string name="account_setup_outgoing_invalid_setting_combo_notice">\"<xliff:g id="setting_1_label">%1$s</xliff:g> = <xliff:g id="setting_1_value">%2$s</xliff:g>\" non é válido con \"<xliff:g id="setting_2_label">%3$s</xliff:g> = <xliff:g id="setting_2_value">%4$s</xliff:g>\"</string>
   <string name="account_setup_bad_uri">Configuración inválida: <xliff:g id="err_mess">%s</xliff:g></string>
-  <string name="account_setup_options_title">Opcións de conta</string>
   <string name="account_setup_options_mail_check_frequency_label">Frecuencia de comprobación de correo</string>
   <string name="account_setup_options_mail_check_frequency_never">Nunca</string>
   <string name="account_setup_options_mail_check_frequency_15min">Cada 15 minutos</string>
@@ -375,7 +374,6 @@ Por favor envíen informes de fallos, contribúa con novas características e co
   <string name="idle_refresh_period_36min">Cada 36 minutos</string>
   <string name="idle_refresh_period_48min">Cada 48 minutos</string>
   <string name="idle_refresh_period_60min">Cada 60 minutos</string>
-  <string name="account_setup_options_notify_label">Avisarme cando chegue correo</string>
   <string name="account_setup_options_mail_display_count_label">Número de mensaxes a visualizar</string>
   <string name="account_setup_options_mail_display_count_10">10 mensaxes</string>
   <string name="account_setup_options_mail_display_count_25">25 mensaxes</string>
diff --git a/app/ui/legacy/src/main/res/values-hr/strings.xml b/app/ui/legacy/src/main/res/values-hr/strings.xml
index 6ddd9ebd1..bb51fee3a 100644
--- a/app/ui/legacy/src/main/res/values-hr/strings.xml
+++ b/app/ui/legacy/src/main/res/values-hr/strings.xml
@@ -301,7 +301,6 @@
   <string name="account_setup_outgoing_authentication_label">Identifikacija</string>
   <string name="account_setup_outgoing_invalid_setting_combo_notice">\"<xliff:g id="setting_1_label">%1$s</xliff:g> = <xliff:g id="setting_1_value">%2$s</xliff:g>\" nije važeća sa \"<xliff:g id="setting_2_label">%3$s</xliff:g> = <xliff:g id="setting_2_value">%4$s</xliff:g>\"</string>
   <string name="account_setup_bad_uri">Nevažeće postavljanje: <xliff:g id="err_mess">%s</xliff:g></string>
-  <string name="account_setup_options_title">Opcije računa</string>
   <string name="account_setup_options_mail_check_frequency_label">Učestalost provjera mapa</string>
   <string name="account_setup_options_mail_check_frequency_never">Nikad</string>
   <string name="account_setup_options_mail_check_frequency_15min">Svakih 15 minuta</string>
@@ -321,7 +320,6 @@
   <string name="idle_refresh_period_36min">Svakih 36 minuta</string>
   <string name="idle_refresh_period_48min">Svakih 48 minuta</string>
   <string name="idle_refresh_period_60min">Svakih 60 minuta</string>
-  <string name="account_setup_options_notify_label">Obavijesti me kod primitka pošte</string>
   <string name="account_setup_options_mail_display_count_label">Broj poruka za prikaz</string>
   <string name="account_setup_options_mail_display_count_10">10 poruka</string>
   <string name="account_setup_options_mail_display_count_25">25 poruka</string>
diff --git a/app/ui/legacy/src/main/res/values-hu/strings.xml b/app/ui/legacy/src/main/res/values-hu/strings.xml
index d085bfa20..a6b27f578 100644
--- a/app/ui/legacy/src/main/res/values-hu/strings.xml
+++ b/app/ui/legacy/src/main/res/values-hu/strings.xml
@@ -380,7 +380,6 @@ Hibajelentések beküldésével közreműködhet az új funkciókban, és kérd
   <string name="account_setup_outgoing_authentication_label">Hitelesítés</string>
   <string name="account_setup_outgoing_invalid_setting_combo_notice">„<xliff:g id="setting_1_label">%1$s</xliff:g> = <xliff:g id="setting_1_value">%2$s</xliff:g>” nem érvényes ezzel: „<xliff:g id="setting_2_label">%3$s</xliff:g> = <xliff:g id="setting_2_value">%4$s</xliff:g>”</string>
   <string name="account_setup_bad_uri">Érvénytelen beállítás: <xliff:g id="err_mess">%s</xliff:g></string>
-  <string name="account_setup_options_title">Fiók beállításai</string>
   <string name="account_setup_options_mail_check_frequency_label">Mappa lekérdezésének gyakorisága</string>
   <string name="account_setup_options_mail_check_frequency_never">Soha</string>
   <string name="account_setup_options_mail_check_frequency_15min">15 percenként</string>
@@ -400,7 +399,6 @@ Hibajelentések beküldésével közreműködhet az új funkciókban, és kérd
   <string name="idle_refresh_period_36min">36 percenként</string>
   <string name="idle_refresh_period_48min">48 percenként</string>
   <string name="idle_refresh_period_60min">60 percenként</string>
-  <string name="account_setup_options_notify_label">Értesítés, amikor levél érkezik</string>
   <string name="account_setup_options_mail_display_count_label">Megjelenítendő üzenetek száma</string>
   <string name="account_setup_options_mail_display_count_10">10 üzenet</string>
   <string name="account_setup_options_mail_display_count_25">25 üzenet</string>
diff --git a/app/ui/legacy/src/main/res/values-in/strings.xml b/app/ui/legacy/src/main/res/values-in/strings.xml
index bda8ff0a1..1a28e41c9 100644
--- a/app/ui/legacy/src/main/res/values-in/strings.xml
+++ b/app/ui/legacy/src/main/res/values-in/strings.xml
@@ -339,7 +339,6 @@ Kirimkan laporan bug, kontribusikan fitur baru dan ajukan pertanyaan di
   <string name="account_setup_outgoing_authentication_label">Otentikasi</string>
   <string name="account_setup_outgoing_invalid_setting_combo_notice">\"<xliff:g id="setting_1_label">%1$s</xliff:g> = <xliff:g id="setting_1_value">%2$s</xliff:g>\" tidak valid dengan \"<xliff:g id="setting_2_label">%3$s</xliff:g> = <xliff:g id="setting_2_value">%4$s</xliff:g>\"</string>
   <string name="account_setup_bad_uri">Salah pengaturan: <xliff:g id="err_mess">%s</xliff:g></string>
-  <string name="account_setup_options_title">Opsi akun</string>
   <string name="account_setup_options_mail_check_frequency_label">Frekuensi penarikan folder</string>
   <string name="account_setup_options_mail_check_frequency_never">Tidak pernah</string>
   <string name="account_setup_options_mail_check_frequency_15min">Setiap 15 menit</string>
@@ -359,7 +358,6 @@ Kirimkan laporan bug, kontribusikan fitur baru dan ajukan pertanyaan di
   <string name="idle_refresh_period_36min">Setiap 36 Menit</string>
   <string name="idle_refresh_period_48min">Setiap 48 Menit</string>
   <string name="idle_refresh_period_60min">Setiap 60 Menit</string>
-  <string name="account_setup_options_notify_label">Beritahu saya bila surat masuk</string>
   <string name="account_setup_options_mail_display_count_label">Jumlah pesan yang akan ditampilkan</string>
   <string name="account_setup_options_mail_display_count_10">10 pesan</string>
   <string name="account_setup_options_mail_display_count_25">25 pesan</string>
diff --git a/app/ui/legacy/src/main/res/values-is/strings.xml b/app/ui/legacy/src/main/res/values-is/strings.xml
index d21af1126..dd2c9eac7 100644
--- a/app/ui/legacy/src/main/res/values-is/strings.xml
+++ b/app/ui/legacy/src/main/res/values-is/strings.xml
@@ -382,7 +382,6 @@ Sendu inn villuskýrslur, leggðu fram nýja eiginleika og spurðu spurninga á
   <string name="account_setup_outgoing_authentication_label">Auðkenning</string>
   <string name="account_setup_outgoing_invalid_setting_combo_notice">\"<xliff:g id="setting_1_label">%1$s</xliff:g> = <xliff:g id="setting_1_value">%2$s</xliff:g>\" er ekki gilt með \"<xliff:g id="setting_2_label">%3$s</xliff:g> = <xliff:g id="setting_2_value">%4$s</xliff:g>\"</string>
   <string name="account_setup_bad_uri">Ógild uppsetning: <xliff:g id="err_mess">%s</xliff:g></string>
-  <string name="account_setup_options_title">Valkostir aðgangs</string>
   <string name="account_setup_options_mail_check_frequency_label">Tíðni athugana á möppu</string>
   <string name="account_setup_options_mail_check_frequency_never">Aldrei</string>
   <string name="account_setup_options_mail_check_frequency_15min">Á 15 mínútna fresti</string>
@@ -402,7 +401,6 @@ Sendu inn villuskýrslur, leggðu fram nýja eiginleika og spurðu spurninga á
   <string name="idle_refresh_period_36min">Á 36 mínútna fresti</string>
   <string name="idle_refresh_period_48min">Á 48 mínútna fresti</string>
   <string name="idle_refresh_period_60min">Á 60 mínútna fresti</string>
-  <string name="account_setup_options_notify_label">Láta mig vita þegar nýr póstur berst</string>
   <string name="account_setup_options_mail_display_count_label">Fjöldi skilaboða sem á að birta</string>
   <string name="account_setup_options_mail_display_count_10">10 skilaboð</string>
   <string name="account_setup_options_mail_display_count_25">25 skilaboð</string>
diff --git a/app/ui/legacy/src/main/res/values-it/strings.xml b/app/ui/legacy/src/main/res/values-it/strings.xml
index 72c914d91..a60ab4bae 100644
--- a/app/ui/legacy/src/main/res/values-it/strings.xml
+++ b/app/ui/legacy/src/main/res/values-it/strings.xml
@@ -385,7 +385,6 @@ Invia segnalazioni di bug, contribuisci con nuove funzionalità e poni domande s
   <string name="account_setup_outgoing_authentication_label">Autenticazione</string>
   <string name="account_setup_outgoing_invalid_setting_combo_notice">\"<xliff:g id="setting_1_label">%1$s</xliff:g> = <xliff:g id="setting_1_value">%2$s</xliff:g>\" non è valido con \"<xliff:g id="setting_2_label">%3$s</xliff:g> = <xliff:g id="setting_2_value">%4$s</xliff:g>\"</string>
   <string name="account_setup_bad_uri">Configurazione non valida: <xliff:g id="err_mess">%s</xliff:g></string>
-  <string name="account_setup_options_title">Opzioni account</string>
   <string name="account_setup_options_mail_check_frequency_label">Frequenza verifica cartella</string>
   <string name="account_setup_options_mail_check_frequency_never">Mai</string>
   <string name="account_setup_options_mail_check_frequency_15min">Ogni 15 minuti</string>
@@ -405,7 +404,6 @@ Invia segnalazioni di bug, contribuisci con nuove funzionalità e poni domande s
   <string name="idle_refresh_period_36min">Ogni 36 minuti</string>
   <string name="idle_refresh_period_48min">Ogni 48 minuti</string>
   <string name="idle_refresh_period_60min">Ogni 60 minuti</string>
-  <string name="account_setup_options_notify_label">Notifica l\'arrivo di nuovi messaggi</string>
   <string name="account_setup_options_mail_display_count_label">Numero di messaggi da visualizzare</string>
   <string name="account_setup_options_mail_display_count_10">10 messaggi</string>
   <string name="account_setup_options_mail_display_count_25">25 messaggi</string>
diff --git a/app/ui/legacy/src/main/res/values-iw/strings.xml b/app/ui/legacy/src/main/res/values-iw/strings.xml
index 85538c861..329c60830 100644
--- a/app/ui/legacy/src/main/res/values-iw/strings.xml
+++ b/app/ui/legacy/src/main/res/values-iw/strings.xml
@@ -293,7 +293,6 @@
   <string name="account_setup_outgoing_password_label">סיסמא</string>
   <string name="account_setup_outgoing_authentication_label">סו אימות</string>
   <string name="account_setup_bad_uri">הגדרה לא חוקית: <xliff:g id="err_mess">%s</xliff:g></string>
-  <string name="account_setup_options_title">אפשרויות חשבון</string>
   <string name="account_setup_options_mail_check_frequency_never">אפ פעם</string>
   <string name="account_setup_options_mail_check_frequency_15min">כל רבע שעה</string>
   <string name="account_setup_options_mail_check_frequency_30min">כל 30 דקות</string>
@@ -312,7 +311,6 @@
   <string name="idle_refresh_period_36min">כל 36 דקות</string>
   <string name="idle_refresh_period_48min">כל 48 דקות</string>
   <string name="idle_refresh_period_60min">כל 60 דקות</string>
-  <string name="account_setup_options_notify_label">הודע לי כאשר מגיע דואר</string>
   <string name="account_setup_options_mail_display_count_label">מספר הודעות להצגה</string>
   <string name="account_setup_options_mail_display_count_10">10 הודעות</string>
   <string name="account_setup_options_mail_display_count_25">25 הודעות</string>
diff --git a/app/ui/legacy/src/main/res/values-ja/strings.xml b/app/ui/legacy/src/main/res/values-ja/strings.xml
index 6f63dbc06..f2c2ed28d 100644
--- a/app/ui/legacy/src/main/res/values-ja/strings.xml
+++ b/app/ui/legacy/src/main/res/values-ja/strings.xml
@@ -379,7 +379,6 @@ K-9 は大多数のメールクライアントと同様に、ほとんどのフ
   <string name="account_setup_outgoing_authentication_label">セキュリティ設定</string>
   <string name="account_setup_outgoing_invalid_setting_combo_notice">\"<xliff:g id="setting_1_label">%1$s</xliff:g> = <xliff:g id="setting_1_value">%2$s</xliff:g>\" は \"<xliff:g id="setting_2_label">%3$s</xliff:g> = <xliff:g id="setting_2_value">%4$s</xliff:g>\" で無効です</string>
   <string name="account_setup_bad_uri">無効な設定: <xliff:g id="err_mess">%s</xliff:g></string>
-  <string name="account_setup_options_title">アカウントオプション</string>
   <string name="account_setup_options_mail_check_frequency_label">同期フォルダの同期間隔</string>
   <string name="account_setup_options_mail_check_frequency_never">しない</string>
   <string name="account_setup_options_mail_check_frequency_15min">15分毎</string>
@@ -399,7 +398,6 @@ K-9 は大多数のメールクライアントと同様に、ほとんどのフ
   <string name="idle_refresh_period_36min">36分毎</string>
   <string name="idle_refresh_period_48min">48分毎</string>
   <string name="idle_refresh_period_60min">60分毎</string>
-  <string name="account_setup_options_notify_label">メール到着時に通知</string>
   <string name="account_setup_options_mail_display_count_label">受信メールを表示する件数</string>
   <string name="account_setup_options_mail_display_count_10">10件</string>
   <string name="account_setup_options_mail_display_count_25">25件</string>
diff --git a/app/ui/legacy/src/main/res/values-ko/strings.xml b/app/ui/legacy/src/main/res/values-ko/strings.xml
index 6b2bf47ad..764ff07df 100644
--- a/app/ui/legacy/src/main/res/values-ko/strings.xml
+++ b/app/ui/legacy/src/main/res/values-ko/strings.xml
@@ -314,7 +314,6 @@
   <string name="account_setup_outgoing_password_label">비밀번호</string>
   <string name="account_setup_outgoing_authentication_label">인증 유형</string>
   <string name="account_setup_bad_uri">잘못된 설정: <xliff:g id="err_mess">%s</xliff:g></string>
-  <string name="account_setup_options_title">계정 옵션</string>
   <string name="account_setup_options_mail_check_frequency_label">폴더 수신 빈도</string>
   <string name="account_setup_options_mail_check_frequency_never">하지 않음</string>
   <string name="account_setup_options_mail_check_frequency_15min">15분마다</string>
@@ -334,7 +333,6 @@
   <string name="idle_refresh_period_36min">36분마다</string>
   <string name="idle_refresh_period_48min">48분마다</string>
   <string name="idle_refresh_period_60min">60분마다</string>
-  <string name="account_setup_options_notify_label">메일 도착시 알림</string>
   <string name="account_setup_options_mail_display_count_label">화면에 보여질 메시지 수</string>
   <string name="account_setup_options_mail_display_count_10">10 메시지</string>
   <string name="account_setup_options_mail_display_count_25">25 메시지</string>
diff --git a/app/ui/legacy/src/main/res/values-lt/strings.xml b/app/ui/legacy/src/main/res/values-lt/strings.xml
index bb93a405b..61d5cd860 100644
--- a/app/ui/legacy/src/main/res/values-lt/strings.xml
+++ b/app/ui/legacy/src/main/res/values-lt/strings.xml
@@ -377,7 +377,6 @@ Pateikite pranešimus apie klaidas, prisidėkite prie naujų funkcijų kūrimo i
   <string name="account_setup_outgoing_authentication_label">Tapatumo nustatymas</string>
   <string name="account_setup_outgoing_invalid_setting_combo_notice">\"<xliff:g id="setting_1_label">%1$s</xliff:g> = <xliff:g id="setting_1_value">%2$s</xliff:g>\" netinka su \"<xliff:g id="setting_2_label">%3$s</xliff:g> = <xliff:g id="setting_2_value">%4$s</xliff:g>\"</string>
   <string name="account_setup_bad_uri">Netinkamai nustatyta: <xliff:g id="err_mess">%s</xliff:g></string>
-  <string name="account_setup_options_title">Paskyros parinktys</string>
   <string name="account_setup_options_mail_check_frequency_label">Aplanko tikrinimo dažnis</string>
   <string name="account_setup_options_mail_check_frequency_never">Niekada</string>
   <string name="account_setup_options_mail_check_frequency_15min">Kas 15 minučių</string>
@@ -397,7 +396,6 @@ Pateikite pranešimus apie klaidas, prisidėkite prie naujų funkcijų kūrimo i
   <string name="idle_refresh_period_36min">Kas 36 minutes</string>
   <string name="idle_refresh_period_48min">Kas 48 minutes</string>
   <string name="idle_refresh_period_60min">Kas 60 minučių</string>
-  <string name="account_setup_options_notify_label">Pranešti apie naujus laiškus</string>
   <string name="account_setup_options_mail_display_count_label">Rodyti laiškų</string>
   <string name="account_setup_options_mail_display_count_10">10 laiškų</string>
   <string name="account_setup_options_mail_display_count_25">25 laiškai</string>
diff --git a/app/ui/legacy/src/main/res/values-lv/strings.xml b/app/ui/legacy/src/main/res/values-lv/strings.xml
index d273e39ad..b43ddac74 100644
--- a/app/ui/legacy/src/main/res/values-lv/strings.xml
+++ b/app/ui/legacy/src/main/res/values-lv/strings.xml
@@ -384,7 +384,6 @@ pat <xliff:g id="messages_to_load">%d</xliff:g> vairāk</string>
   <string name="account_setup_outgoing_authentication_label">Identitātes pārbaude</string>
   <string name="account_setup_outgoing_invalid_setting_combo_notice">\"<xliff:g id="setting_1_label">%1$s</xliff:g> = <xliff:g id="setting_1_value">%2$s</xliff:g>\" nav derīgs ar \"<xliff:g id="setting_2_label">%3$s</xliff:g> = <xliff:g id="setting_2_value">%4$s</xliff:g>\"</string>
   <string name="account_setup_bad_uri">Nederīgi iestatījumi: <xliff:g id="err_mess">%s</xliff:g></string>
-  <string name="account_setup_options_title">Konta iespējas</string>
   <string name="account_setup_options_mail_check_frequency_label">Mapes pārbaudes biežums</string>
   <string name="account_setup_options_mail_check_frequency_never">Nekad</string>
   <string name="account_setup_options_mail_check_frequency_15min">Katras 15 minūtes</string>
@@ -404,7 +403,6 @@ pat <xliff:g id="messages_to_load">%d</xliff:g> vairāk</string>
   <string name="idle_refresh_period_36min">Katras 36 minūtes</string>
   <string name="idle_refresh_period_48min">Katras 48 minūtes</string>
   <string name="idle_refresh_period_60min">Katras 60 minūtes</string>
-  <string name="account_setup_options_notify_label">Paziņot, kad saņemts jauns pasts</string>
   <string name="account_setup_options_mail_display_count_label">Vēstuļu skaits, ko parādīt</string>
   <string name="account_setup_options_mail_display_count_10">10 vēstules</string>
   <string name="account_setup_options_mail_display_count_25">25 vēstules</string>
diff --git a/app/ui/legacy/src/main/res/values-ml/strings.xml b/app/ui/legacy/src/main/res/values-ml/strings.xml
index bab7c9c7f..d769f91ba 100644
--- a/app/ui/legacy/src/main/res/values-ml/strings.xml
+++ b/app/ui/legacy/src/main/res/values-ml/strings.xml
@@ -356,7 +356,6 @@
   <string name="account_setup_outgoing_authentication_label">പ്രമാണീകരണം</string>
   <string name="account_setup_outgoing_invalid_setting_combo_notice">\"<xliff:g id="setting_1_label">%1$s</xliff:g> = <xliff:g id="setting_1_value">%2$s</xliff:g>\" \"<xliff:g id="setting_2_label">%3$s</xliff:g> = <xliff:g id="setting_2_value">%4$s</xliff:g>\" ഉപയോഗിച്ച് സാധുവല്ല</string>
   <string name="account_setup_bad_uri">അസാധുവായ സജ്ജീകരണം: <xliff:g id="err_mess">%s</xliff:g></string>
-  <string name="account_setup_options_title">അക്കൗണ്ട് ഓപ്ഷനുകൾ</string>
   <string name="account_setup_options_mail_check_frequency_label">ഫോൾഡർ വോട്ടെടുപ്പ് ആവൃത്തി</string>
   <string name="account_setup_options_mail_check_frequency_never">ഒരിക്കലും</string>
   <string name="account_setup_options_mail_check_frequency_15min">ഓരോ 15 മിനിറ്റിലും</string>
@@ -376,7 +375,6 @@
   <string name="idle_refresh_period_36min">ഓരോ 36 മിനിറ്റിലും</string>
   <string name="idle_refresh_period_48min">ഓരോ 48 മിനിറ്റിലും</string>
   <string name="idle_refresh_period_60min">ഓരോ 60 മിനിറ്റിലും</string>
-  <string name="account_setup_options_notify_label">മെയിൽ വരുമ്പോൾ എന്നെ അറിയിക്കുക</string>
   <string name="account_setup_options_mail_display_count_label">പ്രദർശിപ്പിക്കേണ്ട സന്ദേശങ്ങളുടെ എണ്ണം</string>
   <string name="account_setup_options_mail_display_count_10">10 സന്ദേശങ്ങൾ</string>
   <string name="account_setup_options_mail_display_count_25">25 സന്ദേശങ്ങൾ</string>
diff --git a/app/ui/legacy/src/main/res/values-nb/strings.xml b/app/ui/legacy/src/main/res/values-nb/strings.xml
index fb61266d8..3fdf1b871 100644
--- a/app/ui/legacy/src/main/res/values-nb/strings.xml
+++ b/app/ui/legacy/src/main/res/values-nb/strings.xml
@@ -337,7 +337,6 @@ til <xliff:g id="messages_to_load">%d</xliff:g> flere</string>
   <string name="account_setup_outgoing_authentication_label">Autentisering </string>
   <string name="account_setup_outgoing_invalid_setting_combo_notice">\"<xliff:g id="setting_1_label">%1$s</xliff:g> = <xliff:g id="setting_1_value">%2$s</xliff:g>\" er ikke gyldig med \"<xliff:g id="setting_2_label">%3$s</xliff:g> = <xliff:g id="setting_2_value">%4$s</xliff:g>\"</string>
   <string name="account_setup_bad_uri">Ugyldig oppsett: <xliff:g id="err_mess">%s</xliff:g></string>
-  <string name="account_setup_options_title">Kontoinnstillinger</string>
   <string name="account_setup_options_mail_check_frequency_label">Oppdateringsfrekvens for mappen</string>
   <string name="account_setup_options_mail_check_frequency_never">Aldri</string>
   <string name="account_setup_options_mail_check_frequency_15min">Hvert kvarter</string>
@@ -357,7 +356,6 @@ til <xliff:g id="messages_to_load">%d</xliff:g> flere</string>
   <string name="idle_refresh_period_36min">Hvert 36. minutt</string>
   <string name="idle_refresh_period_48min">Hvert 48. minutt</string>
   <string name="idle_refresh_period_60min">Hver time</string>
-  <string name="account_setup_options_notify_label">Varsle meg når e-post ankommer</string>
   <string name="account_setup_options_mail_display_count_label">Antall meldinger som skal vises</string>
   <string name="account_setup_options_mail_display_count_10">10 meldinger</string>
   <string name="account_setup_options_mail_display_count_25">25 meldinger</string>
diff --git a/app/ui/legacy/src/main/res/values-nl/strings.xml b/app/ui/legacy/src/main/res/values-nl/strings.xml
index ae0463012..9891d6127 100644
--- a/app/ui/legacy/src/main/res/values-nl/strings.xml
+++ b/app/ui/legacy/src/main/res/values-nl/strings.xml
@@ -377,7 +377,6 @@ Graag foutrapporten sturen, bijdragen voor nieuwe functies en vragen stellen op
   <string name="account_setup_outgoing_authentication_label">Authenticatietype</string>
   <string name="account_setup_outgoing_invalid_setting_combo_notice">‘<xliff:g id="setting_1_label">%1$s</xliff:g> = <xliff:g id="setting_1_value">%2$s</xliff:g>’ is niet geldig met ‘<xliff:g id="setting_2_label">%3$s</xliff:g> = <xliff:g id="setting_2_value">%4$s</xliff:g>’</string>
   <string name="account_setup_bad_uri">Ongeldige instelling: <xliff:g id="err_mess">%s</xliff:g></string>
-  <string name="account_setup_options_title">Accountopties</string>
   <string name="account_setup_options_mail_check_frequency_label">Map-peiling-frequentie</string>
   <string name="account_setup_options_mail_check_frequency_never">Nooit</string>
   <string name="account_setup_options_mail_check_frequency_15min">Elke 15 minuten</string>
@@ -397,7 +396,6 @@ Graag foutrapporten sturen, bijdragen voor nieuwe functies en vragen stellen op
   <string name="idle_refresh_period_36min">Elke 36 minuten</string>
   <string name="idle_refresh_period_48min">Elke 48 minuten</string>
   <string name="idle_refresh_period_60min">Elke 60 minuten</string>
-  <string name="account_setup_options_notify_label">Waarschuw wanneer nieuw e-mailbericht binnenkomt</string>
   <string name="account_setup_options_mail_display_count_label">Aantal berichten om te tonen</string>
   <string name="account_setup_options_mail_display_count_10">10 berichten</string>
   <string name="account_setup_options_mail_display_count_25">25 berichten</string>
diff --git a/app/ui/legacy/src/main/res/values-pl/strings.xml b/app/ui/legacy/src/main/res/values-pl/strings.xml
index 4bcb6e21c..22b388691 100644
--- a/app/ui/legacy/src/main/res/values-pl/strings.xml
+++ b/app/ui/legacy/src/main/res/values-pl/strings.xml
@@ -386,7 +386,6 @@ Wysłane z urządzenia Android za pomocą K-9 Mail. Proszę wybaczyć moją zwi
   <string name="account_setup_outgoing_authentication_label">Rodzaj uwierzytelnienia</string>
   <string name="account_setup_outgoing_invalid_setting_combo_notice">\"<xliff:g id="setting_1_label">%1$s</xliff:g> = <xliff:g id="setting_1_value">%2$s</xliff:g>\" nie jest ważny z \"<xliff:g id="setting_2_label">%3$s</xliff:g> = <xliff:g id="setting_2_value">%4$s</xliff:g>\"</string>
   <string name="account_setup_bad_uri">Nieprawidłowe ustawienia: <xliff:g id="err_mess">%s</xliff:g></string>
-  <string name="account_setup_options_title">Opcje konta</string>
   <string name="account_setup_options_mail_check_frequency_label">Pobieranie wiadomości</string>
   <string name="account_setup_options_mail_check_frequency_never">Nigdy</string>
   <string name="account_setup_options_mail_check_frequency_15min">Co 15 minut</string>
@@ -406,7 +405,6 @@ Wysłane z urządzenia Android za pomocą K-9 Mail. Proszę wybaczyć moją zwi
   <string name="idle_refresh_period_36min">Co 36 minut</string>
   <string name="idle_refresh_period_48min">Co 48 minut</string>
   <string name="idle_refresh_period_60min">Co 60 minut</string>
-  <string name="account_setup_options_notify_label">Powiadamiaj o nowej poczcie</string>
   <string name="account_setup_options_mail_display_count_label">Wyświetlaj</string>
   <string name="account_setup_options_mail_display_count_10">10 wiadomości</string>
   <string name="account_setup_options_mail_display_count_25">25 wiadomości</string>
diff --git a/app/ui/legacy/src/main/res/values-pt-rBR/strings.xml b/app/ui/legacy/src/main/res/values-pt-rBR/strings.xml
index 542e6552a..00283726f 100644
--- a/app/ui/legacy/src/main/res/values-pt-rBR/strings.xml
+++ b/app/ui/legacy/src/main/res/values-pt-rBR/strings.xml
@@ -383,7 +383,6 @@ Por favor encaminhe relatórios de bugs, contribua com novos recursos e tire dú
   <string name="account_setup_outgoing_authentication_label">Autenticação</string>
   <string name="account_setup_outgoing_invalid_setting_combo_notice">\"<xliff:g id="setting_1_label">%1$s</xliff:g> = <xliff:g id="setting_1_value">%2$s</xliff:g>\" não é válido com \"<xliff:g id="setting_2_label">%3$s</xliff:g> = <xliff:g id="setting_2_value">%4$s</xliff:g>\"</string>
   <string name="account_setup_bad_uri">Configuração inválida: <xliff:g id="err_mess">%s</xliff:g></string>
-  <string name="account_setup_options_title">Opções da conta</string>
   <string name="account_setup_options_mail_check_frequency_label">Frequência de verificação da pasta</string>
   <string name="account_setup_options_mail_check_frequency_never">Nunca</string>
   <string name="account_setup_options_mail_check_frequency_15min">A cada 15 minutos</string>
@@ -403,7 +402,6 @@ Por favor encaminhe relatórios de bugs, contribua com novos recursos e tire dú
   <string name="idle_refresh_period_36min">A cada 36 minutos</string>
   <string name="idle_refresh_period_48min">A cada 48 minutos</string>
   <string name="idle_refresh_period_60min">A cada 60 minutos</string>
-  <string name="account_setup_options_notify_label">Notificar quando chegarem novas mensagens</string>
   <string name="account_setup_options_mail_display_count_label">Número de mensagens a serem exibidas</string>
   <string name="account_setup_options_mail_display_count_10">10 mensagens</string>
   <string name="account_setup_options_mail_display_count_25">25 mensagens</string>
diff --git a/app/ui/legacy/src/main/res/values-pt-rPT/strings.xml b/app/ui/legacy/src/main/res/values-pt-rPT/strings.xml
index 557226d06..213db22f8 100644
--- a/app/ui/legacy/src/main/res/values-pt-rPT/strings.xml
+++ b/app/ui/legacy/src/main/res/values-pt-rPT/strings.xml
@@ -385,7 +385,6 @@ Por favor envie relatórios de falhas, contribua com novas funcionalidades e col
   <string name="account_setup_outgoing_authentication_label">Autenticação</string>
   <string name="account_setup_outgoing_invalid_setting_combo_notice">\"<xliff:g id="setting_1_label">%1$s</xliff:g> = <xliff:g id="setting_1_value">%2$s</xliff:g>\" não é válido com \"<xliff:g id="setting_2_label">%3$s</xliff:g> = <xliff:g id="setting_2_value">%4$s</xliff:g>\"</string>
   <string name="account_setup_bad_uri">Configuração inválida: <xliff:g id="err_mess">%s</xliff:g></string>
-  <string name="account_setup_options_title">Opções da conta</string>
   <string name="account_setup_options_mail_check_frequency_label">Frequência de verificação de pastas</string>
   <string name="account_setup_options_mail_check_frequency_never">Nunca</string>
   <string name="account_setup_options_mail_check_frequency_15min">A cada 15 minutos</string>
@@ -405,7 +404,6 @@ Por favor envie relatórios de falhas, contribua com novas funcionalidades e col
   <string name="idle_refresh_period_36min">A cada 36 minutos</string>
   <string name="idle_refresh_period_48min">A cada 48 minutos</string>
   <string name="idle_refresh_period_60min">A cada 60 minutos</string>
-  <string name="account_setup_options_notify_label">Notificar-me na chegada de email</string>
   <string name="account_setup_options_mail_display_count_label">Número de mensagens para exibição</string>
   <string name="account_setup_options_mail_display_count_10">10 mensagens</string>
   <string name="account_setup_options_mail_display_count_25">25 mensagens</string>
diff --git a/app/ui/legacy/src/main/res/values-ro/strings.xml b/app/ui/legacy/src/main/res/values-ro/strings.xml
index 3a222f144..046c1038a 100644
--- a/app/ui/legacy/src/main/res/values-ro/strings.xml
+++ b/app/ui/legacy/src/main/res/values-ro/strings.xml
@@ -379,7 +379,6 @@ cel mult încă <xliff:g id="messages_to_load">%d</xliff:g></string>
   <string name="account_setup_outgoing_authentication_label">Autentificare</string>
   <string name="account_setup_outgoing_invalid_setting_combo_notice">\"<xliff:g id="setting_1_label">%1$s</xliff:g> = <xliff:g id="setting_1_value">%2$s</xliff:g>\" nu este valabil cu \"<xliff:g id="setting_2_label">%3$s</xliff:g> = <xliff:g id="setting_2_value">%4$s</xliff:g></string>
   <string name="account_setup_bad_uri">Configurare greşită : <xliff:g id="err_mess">%s</xliff:g></string>
-  <string name="account_setup_options_title">Opţiuni cont</string>
   <string name="account_setup_options_mail_check_frequency_label">Frecvență interogare dosar</string>
   <string name="account_setup_options_mail_check_frequency_never">Niciodată</string>
   <string name="account_setup_options_mail_check_frequency_15min">La fiecare 15 minute</string>
@@ -399,7 +398,6 @@ cel mult încă <xliff:g id="messages_to_load">%d</xliff:g></string>
   <string name="idle_refresh_period_36min">La fiecare 36 de minute</string>
   <string name="idle_refresh_period_48min">La fiecare 48 de minute</string>
   <string name="idle_refresh_period_60min">La fiecare 60 de minute</string>
-  <string name="account_setup_options_notify_label">Notifică-mă când a venit mail</string>
   <string name="account_setup_options_mail_display_count_label">Număr de mesaje afișate</string>
   <string name="account_setup_options_mail_display_count_10">10 mesaje</string>
   <string name="account_setup_options_mail_display_count_25">25 mesaje</string>
diff --git a/app/ui/legacy/src/main/res/values-ru/strings.xml b/app/ui/legacy/src/main/res/values-ru/strings.xml
index 580e828fd..7ad655b5b 100644
--- a/app/ui/legacy/src/main/res/values-ru/strings.xml
+++ b/app/ui/legacy/src/main/res/values-ru/strings.xml
@@ -385,7 +385,6 @@ K-9 Mail — почтовик для Android.
   <string name="account_setup_outgoing_authentication_label">Аутентификация</string>
   <string name="account_setup_outgoing_invalid_setting_combo_notice">«<xliff:g id="setting_1_label">%1$s</xliff:g> = <xliff:g id="setting_1_value">%2$s</xliff:g>» недействителен для «<xliff:g id="setting_2_label">%3$s</xliff:g> = <xliff:g id="setting_2_value">%4$s</xliff:g>»</string>
   <string name="account_setup_bad_uri">Неверная настройка: <xliff:g id="err_mess">%s</xliff:g></string>
-  <string name="account_setup_options_title">Настройки учётной записи</string>
   <string name="account_setup_options_mail_check_frequency_label">Промежуток проверки</string>
   <string name="account_setup_options_mail_check_frequency_never">Вручную</string>
   <string name="account_setup_options_mail_check_frequency_15min">15 минут</string>
@@ -405,7 +404,6 @@ K-9 Mail — почтовик для Android.
   <string name="idle_refresh_period_36min">36 минут</string>
   <string name="idle_refresh_period_48min">48 минут</string>
   <string name="idle_refresh_period_60min">1 час</string>
-  <string name="account_setup_options_notify_label">Уведомлять о новой почте</string>
   <string name="account_setup_options_mail_display_count_label">Загружать сообщений</string>
   <string name="account_setup_options_mail_display_count_10">10 сообщений</string>
   <string name="account_setup_options_mail_display_count_25">25 сообщений</string>
diff --git a/app/ui/legacy/src/main/res/values-sk/strings.xml b/app/ui/legacy/src/main/res/values-sk/strings.xml
index 4e6fcde02..78c865ef0 100644
--- a/app/ui/legacy/src/main/res/values-sk/strings.xml
+++ b/app/ui/legacy/src/main/res/values-sk/strings.xml
@@ -342,7 +342,6 @@ Prosím, nahlasujte prípadné chyby, prispievajte novými funkciami a pýtajte
   <string name="account_setup_outgoing_authentication_label">Overenie</string>
   <string name="account_setup_outgoing_invalid_setting_combo_notice">\"<xliff:g id="setting_1_label">%1$s</xliff:g> = <xliff:g id="setting_1_value">%2$s</xliff:g>\" nie je platné s \"<xliff:g id="setting_2_label">%3$s</xliff:g> = <xliff:g id="setting_2_value">%4$s</xliff:g>\"</string>
   <string name="account_setup_bad_uri">Neplatné nastavenie: <xliff:g id="err_mess">%s</xliff:g></string>
-  <string name="account_setup_options_title">Možnosti účtu</string>
   <string name="account_setup_options_mail_check_frequency_label">Frekvencia synchronizácie priečinkov</string>
   <string name="account_setup_options_mail_check_frequency_never">Nikdy</string>
   <string name="account_setup_options_mail_check_frequency_15min">Každých 15 minút</string>
@@ -362,7 +361,6 @@ Prosím, nahlasujte prípadné chyby, prispievajte novými funkciami a pýtajte
   <string name="idle_refresh_period_36min">Každých 36 minút</string>
   <string name="idle_refresh_period_48min">Každých 48 minút</string>
   <string name="idle_refresh_period_60min">Každých 60 minút</string>
-  <string name="account_setup_options_notify_label">Upozorniť ma, keď príde nová správa</string>
   <string name="account_setup_options_mail_display_count_label">Počet správ na zobrazenie</string>
   <string name="account_setup_options_mail_display_count_10">10 správ</string>
   <string name="account_setup_options_mail_display_count_25">25 správ</string>
diff --git a/app/ui/legacy/src/main/res/values-sl/strings.xml b/app/ui/legacy/src/main/res/values-sl/strings.xml
index a14496444..bae7cc923 100644
--- a/app/ui/legacy/src/main/res/values-sl/strings.xml
+++ b/app/ui/legacy/src/main/res/values-sl/strings.xml
@@ -381,7 +381,6 @@ dodatnih <xliff:g id="messages_to_load">%d</xliff:g> sporočil</string>
   <string name="account_setup_outgoing_authentication_label">Overjanje</string>
   <string name="account_setup_outgoing_invalid_setting_combo_notice">\"<xliff:g id="setting_1_label">%1$s</xliff:g> = <xliff:g id="setting_1_value">%2$s</xliff:g>\" *ni veljavno* z \"<xliff:g id="setting_2_label">%3$s</xliff:g> = <xliff:g id="setting_2_value">%4$s</xliff:g>\"</string>
   <string name="account_setup_bad_uri">Neveljavna nastavitev: <xliff:g id="err_mess">%s</xliff:g></string>
-  <string name="account_setup_options_title">Možnosti računa</string>
   <string name="account_setup_options_mail_check_frequency_label">Pogostost izpraševanja map</string>
   <string name="account_setup_options_mail_check_frequency_never">Ročno preverjanje</string>
   <string name="account_setup_options_mail_check_frequency_15min">Vsakih 15 minut</string>
@@ -401,7 +400,6 @@ dodatnih <xliff:g id="messages_to_load">%d</xliff:g> sporočil</string>
   <string name="idle_refresh_period_36min">Vsakih 36 minut</string>
   <string name="idle_refresh_period_48min">Vsakih 48 minut</string>
   <string name="idle_refresh_period_60min">Vsakih 60 minut</string>
-  <string name="account_setup_options_notify_label">Obveščaj ob prispetju nove pošte</string>
   <string name="account_setup_options_mail_display_count_label">Število prikazanih sporočil</string>
   <string name="account_setup_options_mail_display_count_10">10 sporočil</string>
   <string name="account_setup_options_mail_display_count_25">25 sporočil</string>
diff --git a/app/ui/legacy/src/main/res/values-sq/strings.xml b/app/ui/legacy/src/main/res/values-sq/strings.xml
index 85b264e35..5604c3c31 100644
--- a/app/ui/legacy/src/main/res/values-sq/strings.xml
+++ b/app/ui/legacy/src/main/res/values-sq/strings.xml
@@ -382,7 +382,6 @@ Ju lutemi, parashtrim njoftimesh për të meta, kontribute për veçori të reaj
   <string name="account_setup_outgoing_authentication_label">Mirëfilltësim</string>
   <string name="account_setup_outgoing_invalid_setting_combo_notice">\“<xliff:g id="setting_1_label">%1$s</xliff:g> = <xliff:g id="setting_1_value">%2$s</xliff:g>\” s\’është i vlefshëm me \“<xliff:g id="setting_2_label">%3$s</xliff:g> = <xliff:g id="setting_2_value">%4$s</xliff:g>\”</string>
   <string name="account_setup_bad_uri">Rregullim i pavefshëm: <xliff:g id="err_mess">%s</xliff:g></string>
-  <string name="account_setup_options_title">Mundësi llogarie</string>
   <string name="account_setup_options_mail_check_frequency_label">Shpeshti vjeljeje dosjeje</string>
   <string name="account_setup_options_mail_check_frequency_never">Kurrë</string>
   <string name="account_setup_options_mail_check_frequency_15min">Çdo 15 minuta</string>
@@ -402,7 +401,6 @@ Ju lutemi, parashtrim njoftimesh për të meta, kontribute për veçori të reaj
   <string name="idle_refresh_period_36min">Çdo 36 minuta</string>
   <string name="idle_refresh_period_48min">Çdo 48 minuta</string>
   <string name="idle_refresh_period_60min">Çdo 60 minuta</string>
-  <string name="account_setup_options_notify_label">Njoftomë kur mbërrin postë</string>
   <string name="account_setup_options_mail_display_count_label">Numër mesazhesh për shfaqje</string>
   <string name="account_setup_options_mail_display_count_10">10 mesazhe</string>
   <string name="account_setup_options_mail_display_count_25">25 mesazhe</string>
diff --git a/app/ui/legacy/src/main/res/values-sr/strings.xml b/app/ui/legacy/src/main/res/values-sr/strings.xml
index 621e7fc0e..5e324d40e 100644
--- a/app/ui/legacy/src/main/res/values-sr/strings.xml
+++ b/app/ui/legacy/src/main/res/values-sr/strings.xml
@@ -340,7 +340,6 @@
   <string name="account_setup_outgoing_authentication_label">Аутентификација</string>
   <string name="account_setup_outgoing_invalid_setting_combo_notice">„<xliff:g id="setting_1_label">%1$s</xliff:g> = <xliff:g id="setting_1_value">%2$s</xliff:g>“ није исправно са „<xliff:g id="setting_2_label">%3$s</xliff:g> = <xliff:g id="setting_2_value">%4$s</xliff:g>“</string>
   <string name="account_setup_bad_uri">Неисправна постава: <xliff:g id="err_mess">%s</xliff:g></string>
-  <string name="account_setup_options_title">Опције налога</string>
   <string name="account_setup_options_mail_check_frequency_label">Проверавање фасцикли</string>
   <string name="account_setup_options_mail_check_frequency_never">никад</string>
   <string name="account_setup_options_mail_check_frequency_15min">на 15 минута</string>
@@ -360,7 +359,6 @@
   <string name="idle_refresh_period_36min">на 36 минута</string>
   <string name="idle_refresh_period_48min">на 48 минута</string>
   <string name="idle_refresh_period_60min">на 60 минута</string>
-  <string name="account_setup_options_notify_label">Обавести ме кад стигне пошта</string>
   <string name="account_setup_options_mail_display_count_label">Број порука за приказ</string>
   <string name="account_setup_options_mail_display_count_10">10 порука</string>
   <string name="account_setup_options_mail_display_count_25">25 порука</string>
diff --git a/app/ui/legacy/src/main/res/values-sv/strings.xml b/app/ui/legacy/src/main/res/values-sv/strings.xml
index b0d14cafa..ddc9edbde 100644
--- a/app/ui/legacy/src/main/res/values-sv/strings.xml
+++ b/app/ui/legacy/src/main/res/values-sv/strings.xml
@@ -382,7 +382,6 @@ Skicka in felrapporter, bidra med nya funktioner och ställ frågor på
   <string name="account_setup_outgoing_authentication_label">Autentiseringstyp</string>
   <string name="account_setup_outgoing_invalid_setting_combo_notice">\"<xliff:g id="setting_1_label">%1$s</xliff:g> = <xliff:g id="setting_1_value">%2$s</xliff:g>\" är inte giltigt med \"<xliff:g id="setting_2_label">%3$s</xliff:g> = <xliff:g id="setting_2_value">%4$s</xliff:g>\"</string>
   <string name="account_setup_bad_uri">Ogiltig konfiguration: <xliff:g id="err_mess">%s</xliff:g></string>
-  <string name="account_setup_options_title">Kontoinställningar</string>
   <string name="account_setup_options_mail_check_frequency_label">Frekvens för mappkontroll</string>
   <string name="account_setup_options_mail_check_frequency_never">Aldrig</string>
   <string name="account_setup_options_mail_check_frequency_15min">Var 15:e minut</string>
@@ -402,7 +401,6 @@ Skicka in felrapporter, bidra med nya funktioner och ställ frågor på
   <string name="idle_refresh_period_36min">Var 36:e minut</string>
   <string name="idle_refresh_period_48min">Var 48:e minut</string>
   <string name="idle_refresh_period_60min">Var 60:e minut</string>
-  <string name="account_setup_options_notify_label">Meddela mig vid ankomst av e-post</string>
   <string name="account_setup_options_mail_display_count_label">Antal meddelanden att visa</string>
   <string name="account_setup_options_mail_display_count_10">10 meddelanden</string>
   <string name="account_setup_options_mail_display_count_25">25 meddelanden</string>
diff --git a/app/ui/legacy/src/main/res/values-tr/strings.xml b/app/ui/legacy/src/main/res/values-tr/strings.xml
index a0543ff7a..1909bfd3b 100644
--- a/app/ui/legacy/src/main/res/values-tr/strings.xml
+++ b/app/ui/legacy/src/main/res/values-tr/strings.xml
@@ -368,7 +368,6 @@ Microsoft Exchange ile konuşurken kimi tuhaflıklar yaşadığını lütfen akl
   <string name="account_setup_outgoing_authentication_label">Kimlik Doğrulama </string>
   <string name="account_setup_outgoing_invalid_setting_combo_notice">\"<xliff:g id="setting_1_label">%1$s</xliff:g> = <xliff:g id="setting_1_value">%2$s</xliff:g>\" bununla uyuşmuyor \"<xliff:g id="setting_2_label">%3$s</xliff:g> = <xliff:g id="setting_2_value">%4$s</xliff:g>\"</string>
   <string name="account_setup_bad_uri">Geçersiz kurulum: <xliff:g id="err_mess">%s</xliff:g></string>
-  <string name="account_setup_options_title">Hesap seçenekleri</string>
   <string name="account_setup_options_mail_check_frequency_label">Klasör bilgi toplama sıklığı</string>
   <string name="account_setup_options_mail_check_frequency_never">Asla</string>
   <string name="account_setup_options_mail_check_frequency_15min">Her 15 dakikada bir</string>
@@ -388,7 +387,6 @@ Microsoft Exchange ile konuşurken kimi tuhaflıklar yaşadığını lütfen akl
   <string name="idle_refresh_period_36min">Her 36 dakikada bir</string>
   <string name="idle_refresh_period_48min">Her 48 dakikada bir</string>
   <string name="idle_refresh_period_60min">Her 60 dakikada bir</string>
-  <string name="account_setup_options_notify_label">Posta ulaştığında beni uyar</string>
   <string name="account_setup_options_mail_display_count_label">Görüntülenecek ileti sayısı</string>
   <string name="account_setup_options_mail_display_count_10">10 ileti</string>
   <string name="account_setup_options_mail_display_count_25">25 ileti</string>
diff --git a/app/ui/legacy/src/main/res/values-uk/strings.xml b/app/ui/legacy/src/main/res/values-uk/strings.xml
index 48ef66de6..2fa202093 100644
--- a/app/ui/legacy/src/main/res/values-uk/strings.xml
+++ b/app/ui/legacy/src/main/res/values-uk/strings.xml
@@ -387,7 +387,6 @@ K-9 Mail — це вільний клієнт електронної пошти
   <string name="account_setup_outgoing_authentication_label">Метод автентифікації</string>
   <string name="account_setup_outgoing_invalid_setting_combo_notice">\"<xliff:g id="setting_1_label">%1$s</xliff:g> = <xliff:g id="setting_1_value">%2$s</xliff:g>\" недійсне з \"<xliff:g id="setting_2_label">%3$s</xliff:g> = <xliff:g id="setting_2_value">%4$s</xliff:g>\"</string>
   <string name="account_setup_bad_uri">Неправильне налаштування: <xliff:g id="err_mess">%s</xliff:g></string>
-  <string name="account_setup_options_title">Параметри облікового запису</string>
   <string name="account_setup_options_mail_check_frequency_label">Частота опитування тек</string>
   <string name="account_setup_options_mail_check_frequency_never">Ніколи</string>
   <string name="account_setup_options_mail_check_frequency_15min">Кожні 15 хвилин</string>
@@ -407,7 +406,6 @@ K-9 Mail — це вільний клієнт електронної пошти
   <string name="idle_refresh_period_36min">Кожні 36 хвилин</string>
   <string name="idle_refresh_period_48min">Кожні 48 хвилин</string>
   <string name="idle_refresh_period_60min">Кожні 60 хвилин</string>
-  <string name="account_setup_options_notify_label">Сповіщати мене про отримання нової пошти</string>
   <string name="account_setup_options_mail_display_count_label">Кількість відображуваних повідомлень</string>
   <string name="account_setup_options_mail_display_count_10">10 повідомлень</string>
   <string name="account_setup_options_mail_display_count_25">25 повідомлень</string>
diff --git a/app/ui/legacy/src/main/res/values-zh-rCN/strings.xml b/app/ui/legacy/src/main/res/values-zh-rCN/strings.xml
index fb0c5c03e..086f61bd0 100644
--- a/app/ui/legacy/src/main/res/values-zh-rCN/strings.xml
+++ b/app/ui/legacy/src/main/res/values-zh-rCN/strings.xml
@@ -380,7 +380,6 @@ K-9 Mail 是 Android 上一款功能强大的免费邮件客户端。
   <string name="account_setup_outgoing_authentication_label">身份验证方法</string>
   <string name="account_setup_outgoing_invalid_setting_combo_notice">\"<xliff:g id="setting_1_label">%1$s</xliff:g> = <xliff:g id="setting_1_value">%2$s</xliff:g>\" 对于 \"<xliff:g id="setting_2_label">%3$s</xliff:g> = <xliff:g id="setting_2_value">%4$s</xliff:g>\" 无效</string>
   <string name="account_setup_bad_uri">无效的设置：<xliff:g id="err_mess">%s</xliff:g></string>
-  <string name="account_setup_options_title">账户选项</string>
   <string name="account_setup_options_mail_check_frequency_label">文件夹检查频率</string>
   <string name="account_setup_options_mail_check_frequency_never">从不</string>
   <string name="account_setup_options_mail_check_frequency_15min">15 分钟一次</string>
@@ -400,7 +399,6 @@ K-9 Mail 是 Android 上一款功能强大的免费邮件客户端。
   <string name="idle_refresh_period_36min">36 分钟一次</string>
   <string name="idle_refresh_period_48min">48 分钟一次</string>
   <string name="idle_refresh_period_60min">60 分钟一次</string>
-  <string name="account_setup_options_notify_label">有新邮件时通知我</string>
   <string name="account_setup_options_mail_display_count_label">邮件显示数量</string>
   <string name="account_setup_options_mail_display_count_10">10 封</string>
   <string name="account_setup_options_mail_display_count_25">25 封</string>
diff --git a/app/ui/legacy/src/main/res/values-zh-rTW/strings.xml b/app/ui/legacy/src/main/res/values-zh-rTW/strings.xml
index 406802a37..b81fb7c36 100644
--- a/app/ui/legacy/src/main/res/values-zh-rTW/strings.xml
+++ b/app/ui/legacy/src/main/res/values-zh-rTW/strings.xml
@@ -380,7 +380,6 @@ K-9 Mail 是 Android 上一款功能強大，免費的電子郵件用戶端。
   <string name="account_setup_outgoing_authentication_label">身份驗證方法</string>
   <string name="account_setup_outgoing_invalid_setting_combo_notice">「<xliff:g id="setting_1_label">%1$s</xliff:g> = <xliff:g id="setting_1_value">%2$s</xliff:g>」對於「<xliff:g id="setting_2_label">%3$s</xliff:g> = <xliff:g id="setting_2_value">%4$s</xliff:g>」無效</string>
   <string name="account_setup_bad_uri">無效的設定：<xliff:g id="err_mess">%s</xliff:g></string>
-  <string name="account_setup_options_title">帳號選項</string>
   <string name="account_setup_options_mail_check_frequency_label">信件匣檢查頻率</string>
   <string name="account_setup_options_mail_check_frequency_never">不要</string>
   <string name="account_setup_options_mail_check_frequency_15min">15 分鐘一次</string>
@@ -400,7 +399,6 @@ K-9 Mail 是 Android 上一款功能強大，免費的電子郵件用戶端。
   <string name="idle_refresh_period_36min">36 分鐘一次</string>
   <string name="idle_refresh_period_48min">48 分鐘一次</string>
   <string name="idle_refresh_period_60min">60 分鐘一次</string>
-  <string name="account_setup_options_notify_label">有新郵件時通知我</string>
   <string name="account_setup_options_mail_display_count_label">郵件顯示數量</string>
   <string name="account_setup_options_mail_display_count_10">10 封</string>
   <string name="account_setup_options_mail_display_count_25">25 封</string>
diff --git a/app/ui/legacy/src/main/res/values/strings.xml b/app/ui/legacy/src/main/res/values/strings.xml
index ae8074c97..55a1e161e 100644
--- a/app/ui/legacy/src/main/res/values/strings.xml
+++ b/app/ui/legacy/src/main/res/values/strings.xml
@@ -455,7 +455,6 @@ Please submit bug reports, contribute new features and ask questions at
 
     <string name="account_setup_bad_uri">Invalid setup: <xliff:g id="err_mess">%s</xliff:g></string>
 
-    <string name="account_setup_options_title">Account options</string>
 
     <string name="account_setup_options_mail_check_frequency_label">Folder poll frequency</string>
     <string name="account_setup_options_mail_check_frequency_never">Never</string>
@@ -478,7 +477,6 @@ Please submit bug reports, contribute new features and ask questions at
     <string name="idle_refresh_period_48min">Every 48 minutes</string>
     <string name="idle_refresh_period_60min">Every 60 minutes</string>
 
-    <string name="account_setup_options_notify_label">Notify me when mail arrives</string>
 
     <string name="account_setup_options_mail_display_count_label">Number of messages to display</string>
     <string name="account_setup_options_mail_display_count_10">10 messages</string>

From e454ac837a5b05ec24f17999093aba739f39aca5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolf-Martell=20Montw=C3=A9?= <wolf@thunderbird.net>
Date: Fri, 22 Sep 2023 18:33:03 +0200
Subject: [PATCH 3/5] Remove feature flag for new_onboarding

---
 .../featureflag/InMemoryFeatureFlagFactory.kt |  3 +-
 .../java/com/fsck/k9/activity/MessageList.kt  | 13 +-------
 .../fsck/k9/activity/setup/SpinnerOption.java | 33 -------------------
 .../k9/ui/settings/SettingsListFragment.kt    | 26 ++-------------
 4 files changed, 5 insertions(+), 70 deletions(-)
 delete mode 100644 app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/SpinnerOption.java

diff --git a/app/k9mail/src/main/java/com/fsck/k9/featureflag/InMemoryFeatureFlagFactory.kt b/app/k9mail/src/main/java/com/fsck/k9/featureflag/InMemoryFeatureFlagFactory.kt
index 92d040a96..4d1a923cb 100644
--- a/app/k9mail/src/main/java/com/fsck/k9/featureflag/InMemoryFeatureFlagFactory.kt
+++ b/app/k9mail/src/main/java/com/fsck/k9/featureflag/InMemoryFeatureFlagFactory.kt
@@ -2,12 +2,11 @@ package com.fsck.k9.featureflag
 
 import app.k9mail.core.featureflag.FeatureFlag
 import app.k9mail.core.featureflag.FeatureFlagFactory
-import app.k9mail.core.featureflag.FeatureFlagKey
 
 class InMemoryFeatureFlagFactory : FeatureFlagFactory {
     override fun createFeatureCatalog(): List<FeatureFlag> {
         return listOf(
-            FeatureFlag(FeatureFlagKey("new_onboarding"), true),
+            // empty
         )
     }
 }
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt b/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt
index 84e6d5135..8f98f9b64 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt
@@ -28,8 +28,6 @@ import androidx.fragment.app.commit
 import androidx.fragment.app.commitNow
 import app.k9mail.core.android.common.contact.CachingRepository
 import app.k9mail.core.android.common.contact.ContactRepository
-import app.k9mail.core.featureflag.FeatureFlagKey
-import app.k9mail.core.featureflag.FeatureFlagProvider
 import app.k9mail.feature.launcher.FeatureLauncherActivity
 import com.fsck.k9.Account
 import com.fsck.k9.K9
@@ -61,7 +59,6 @@ import com.fsck.k9.ui.messageview.MessageViewContainerFragment
 import com.fsck.k9.ui.messageview.MessageViewContainerFragment.MessageViewContainerListener
 import com.fsck.k9.ui.messageview.MessageViewFragment.MessageViewFragmentListener
 import com.fsck.k9.ui.messageview.PlaceholderFragment
-import com.fsck.k9.ui.onboarding.OnboardingActivity
 import com.fsck.k9.ui.permissions.K9PermissionUiHelper
 import com.fsck.k9.ui.permissions.Permission
 import com.fsck.k9.ui.permissions.PermissionUiHelper
@@ -94,7 +91,6 @@ open class MessageList :
     private val generalSettingsManager: GeneralSettingsManager by inject()
     private val messagingController: MessagingController by inject()
     private val contactRepository: ContactRepository by inject()
-    private val featureFlagProvider: FeatureFlagProvider by inject()
 
     private val permissionUiHelper: PermissionUiHelper = K9PermissionUiHelper(this)
 
@@ -157,14 +153,7 @@ open class MessageList :
         deleteIncompleteAccounts(accounts)
         val hasAccountSetup = accounts.any { it.isFinishedSetup }
         if (!hasAccountSetup) {
-            featureFlagProvider.provide(FeatureFlagKey("new_onboarding")).onEnabled {
-                FeatureLauncherActivity.launchOnboarding(this)
-            }.onDisabled {
-                OnboardingActivity.launch(this)
-            }.onUnavailable {
-                Timber.d("Feature flag 'new_onboarding' is unavailable, falling back to old onboarding")
-                OnboardingActivity.launch(this)
-            }
+            FeatureLauncherActivity.launchOnboarding(this)
             finish()
             return
         }
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/SpinnerOption.java b/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/SpinnerOption.java
deleted file mode 100644
index 89275b974..000000000
--- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/SpinnerOption.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- *
- */
-
-package com.fsck.k9.activity.setup;
-
-import android.widget.Spinner;
-
-public class SpinnerOption {
-    public Object value;
-
-    public String label;
-
-    public static void setSpinnerOptionValue(Spinner spinner, Object value) {
-        for (int i = 0, count = spinner.getCount(); i < count; i++) {
-            SpinnerOption so = (SpinnerOption)spinner.getItemAtPosition(i);
-            if (so.value.equals(value)) {
-                spinner.setSelection(i, true);
-                return;
-            }
-        }
-    }
-
-    public SpinnerOption(Object value, String label) {
-        this.value = value;
-        this.label = label;
-    }
-
-    @Override
-    public String toString() {
-        return label;
-    }
-}
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/SettingsListFragment.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/SettingsListFragment.kt
index 1dffceea9..fdbaaaa53 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/SettingsListFragment.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/SettingsListFragment.kt
@@ -11,13 +11,9 @@ import android.widget.Toast
 import androidx.annotation.AttrRes
 import androidx.annotation.IdRes
 import androidx.fragment.app.Fragment
-import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import app.k9mail.core.featureflag.FeatureFlagKey
-import app.k9mail.core.featureflag.FeatureFlagProvider
-import app.k9mail.core.featureflag.FeatureFlagResult
 import app.k9mail.feature.launcher.FeatureLauncherActivity
 import com.fsck.k9.Account
 import com.fsck.k9.ui.R
@@ -32,13 +28,10 @@ import com.mikepenz.fastadapter.adapters.ItemAdapter
 import com.mikepenz.fastadapter.drag.ItemTouchCallback
 import com.mikepenz.fastadapter.drag.SimpleDragCallback
 import com.mikepenz.fastadapter.utils.DragDropUtil
-import org.koin.android.ext.android.inject
 import org.koin.androidx.viewmodel.ext.android.viewModel
-import timber.log.Timber
 
 class SettingsListFragment : Fragment(), ItemTouchCallback {
     private val viewModel: SettingsViewModel by viewModel()
-    private val featureFlagProvider: FeatureFlagProvider by inject()
 
     private lateinit var itemAdapter: ItemAdapter<GenericItem>
 
@@ -157,12 +150,9 @@ class SettingsListFragment : Fragment(), ItemTouchCallback {
             is UrlActionItem -> openUrl(item.url)
             is SettingsActionItem -> {
                 if (
-                    item.navigationAction == R.id.action_settingsListScreen_to_addAccountScreen &&
-                    featureFlagProvider.provide(FeatureFlagKey("new_onboarding")) is FeatureFlagResult.Enabled
+                    item.navigationAction == R.id.action_settingsListScreen_to_addAccountScreen
                 ) {
                     FeatureLauncherActivity.launchSetupAccount(requireActivity())
-                } else {
-                    findNavController().navigate(item.navigationAction)
                 }
             }
         }
@@ -182,19 +172,9 @@ class SettingsListFragment : Fragment(), ItemTouchCallback {
     }
 
     private fun launchOnboarding() {
-        featureFlagProvider.provide(FeatureFlagKey("new_onboarding")).onEnabled {
-            FeatureLauncherActivity.launchOnboarding(requireActivity())
-        }.onDisabled {
-            launchOldOnboarding()
-        }.onUnavailable {
-            Timber.d("Feature flag 'new_onboarding' is unavailable, falling back to old onboarding")
-            launchOldOnboarding()
-        }
-        requireActivity().finishAffinity()
-    }
+        FeatureLauncherActivity.launchOnboarding(requireActivity())
 
-    private fun launchOldOnboarding() {
-        findNavController().navigate(R.id.action_settingsListScreen_to_onboardingScreen)
+        requireActivity().finishAffinity()
     }
 
     private fun buildSettingsList(block: SettingsListBuilder.() -> Unit): List<GenericItem> {

From 7b189afa6e311d3bd11ff5f0c22d6119bf2370f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolf-Martell=20Montw=C3=A9?= <wolf@thunderbird.net>
Date: Fri, 22 Sep 2023 18:39:24 +0200
Subject: [PATCH 4/5] Remove OnboardingActivity

---
 app/k9mail/src/main/AndroidManifest.xml       |  4 --
 .../k9/ui/onboarding/OnboardingActivity.kt    | 44 ------------------
 .../main/res/layout/activity_onboarding.xml   | 22 ---------
 .../res/navigation/navigation_onboarding.xml  | 45 -------------------
 .../res/navigation/navigation_settings.xml    | 10 -----
 5 files changed, 125 deletions(-)
 delete mode 100644 app/ui/legacy/src/main/java/com/fsck/k9/ui/onboarding/OnboardingActivity.kt
 delete mode 100644 app/ui/legacy/src/main/res/layout/activity_onboarding.xml
 delete mode 100644 app/ui/legacy/src/main/res/navigation/navigation_onboarding.xml

diff --git a/app/k9mail/src/main/AndroidManifest.xml b/app/k9mail/src/main/AndroidManifest.xml
index cad908a1b..a10fba49e 100644
--- a/app/k9mail/src/main/AndroidManifest.xml
+++ b/app/k9mail/src/main/AndroidManifest.xml
@@ -60,10 +60,6 @@
         <meta-data android:name="android.webkit.WebView.MetricsOptOut"
             android:value="true" />
 
-        <activity
-            android:name=".ui.onboarding.OnboardingActivity"
-            android:label="@string/welcome_message_title" />
-
         <activity
             android:name=".ui.settings.account.OpenPgpAppSelectDialog"
             android:configChanges="locale"
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/onboarding/OnboardingActivity.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/onboarding/OnboardingActivity.kt
deleted file mode 100644
index a2c7f650b..000000000
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/onboarding/OnboardingActivity.kt
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.fsck.k9.ui.onboarding
-
-import android.app.Activity
-import android.content.Intent
-import android.os.Bundle
-import androidx.navigation.NavController
-import androidx.navigation.ui.AppBarConfiguration
-import androidx.navigation.ui.setupActionBarWithNavController
-import com.fsck.k9.ui.R
-import com.fsck.k9.ui.base.K9Activity
-import com.fsck.k9.ui.base.extensions.findNavController
-
-class OnboardingActivity : K9Activity() {
-    private lateinit var navController: NavController
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setLayout(R.layout.activity_onboarding)
-        setTitle(R.string.account_setup_basics_title)
-
-        initializeActionBar()
-    }
-
-    private fun initializeActionBar() {
-        val appBarConfiguration = AppBarConfiguration(topLevelDestinationIds = setOf(R.id.welcomeScreen))
-
-        navController = findNavController(R.id.nav_host_fragment)
-        setupActionBarWithNavController(navController, appBarConfiguration)
-    }
-
-    override fun onSupportNavigateUp(): Boolean {
-        return navController.navigateUp() || super.onSupportNavigateUp()
-    }
-
-    companion object {
-        @JvmStatic
-        fun launch(activity: Activity) {
-            val intent = Intent(activity, OnboardingActivity::class.java).apply {
-                flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
-            }
-            activity.startActivity(intent)
-        }
-    }
-}
diff --git a/app/ui/legacy/src/main/res/layout/activity_onboarding.xml b/app/ui/legacy/src/main/res/layout/activity_onboarding.xml
deleted file mode 100644
index fc665332b..000000000
--- a/app/ui/legacy/src/main/res/layout/activity_onboarding.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    tools:context=".onboarding.OnboardingActivity">
-
-    <include layout="@layout/toolbar" />
-
-    <androidx.fragment.app.FragmentContainerView
-        android:id="@+id/nav_host_fragment"
-        android:name="androidx.navigation.fragment.NavHostFragment"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        app:defaultNavHost="true"
-        app:navGraph="@navigation/navigation_onboarding" />
-
-</LinearLayout>
diff --git a/app/ui/legacy/src/main/res/navigation/navigation_onboarding.xml b/app/ui/legacy/src/main/res/navigation/navigation_onboarding.xml
deleted file mode 100644
index dcddab158..000000000
--- a/app/ui/legacy/src/main/res/navigation/navigation_onboarding.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<navigation xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/navigation_onboarding"
-    app:startDestination="@id/welcomeScreen">
-
-    <fragment
-        android:id="@+id/welcomeScreen"
-        android:name="com.fsck.k9.ui.onboarding.WelcomeFragment"
-        android:label="@string/welcome_message_title"
-        tools:layout="@layout/fragment_welcome_message">
-
-        <action
-            android:id="@+id/action_welcomeScreen_to_settingsImportScreen"
-            app:destination="@id/settingsImportScreen" />
-
-        <action
-            android:id="@+id/action_welcomeScreen_to_addAccountScreen"
-            app:destination="@id/addAccountScreen" />
-
-        <action
-            android:id="@+id/action_welcomeScreen_to_messageListScreen"
-            app:destination="@id/messageListScreen" />
-
-    </fragment>
-
-    <fragment
-        android:id="@+id/settingsImportScreen"
-        android:name="com.fsck.k9.ui.settings.import.SettingsImportFragment"
-        android:label="@string/settings_import_title"
-        tools:layout="@layout/fragment_settings_import"/>
-
-    <activity
-        android:id="@+id/addAccountScreen"
-        android:name="com.fsck.k9.activity.setup.AccountSetupBasics"
-        android:label="@string/account_setup_basics_title"
-        tools:layout="@layout/account_setup_basics"/>
-
-    <activity
-        android:id="@+id/messageListScreen"
-        android:name="com.fsck.k9.activity.MessageList"
-        tools:layout="@layout/message_list"/>
-
-</navigation>
diff --git a/app/ui/legacy/src/main/res/navigation/navigation_settings.xml b/app/ui/legacy/src/main/res/navigation/navigation_settings.xml
index a7ffc1220..f4d2c2a2e 100644
--- a/app/ui/legacy/src/main/res/navigation/navigation_settings.xml
+++ b/app/ui/legacy/src/main/res/navigation/navigation_settings.xml
@@ -11,10 +11,6 @@
         android:label="@string/prefs_title"
         tools:layout="@layout/fragment_settings_list">
 
-        <action
-            android:id="@+id/action_settingsListScreen_to_onboardingScreen"
-            app:destination="@id/onboardingScreen" />
-
         <action
             android:id="@+id/action_settingsListScreen_to_aboutScreen"
             app:destination="@id/aboutScreen" />
@@ -36,12 +32,6 @@
             app:destination="@id/settingsImportScreen" />
     </fragment>
 
-    <activity
-        android:id="@+id/onboardingScreen"
-        android:name="com.fsck.k9.ui.onboarding.OnboardingActivity"
-        android:label="@string/welcome_message_title"
-        tools:layout="@layout/activity_onboarding"/>
-
     <fragment
         android:id="@+id/aboutScreen"
         android:name="com.fsck.k9.ui.settings.AboutFragment"

From e1384de9d365f9a787530f7e56ac663c2c949b8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolf-Martell=20Montw=C3=A9?= <wolf@thunderbird.net>
Date: Fri, 22 Sep 2023 18:45:57 +0200
Subject: [PATCH 5/5] Remove WelcomeFragment

---
 .../fsck/k9/ui/onboarding/WelcomeFragment.kt  | 57 -------------------
 .../res/layout/fragment_welcome_message.xml   | 38 -------------
 .../legacy/src/main/res/values-ar/strings.xml | 33 +----------
 .../legacy/src/main/res/values-be/strings.xml | 32 +----------
 .../legacy/src/main/res/values-bg/strings.xml | 33 +----------
 .../legacy/src/main/res/values-br/strings.xml | 33 +----------
 .../legacy/src/main/res/values-ca/strings.xml | 33 +----------
 .../legacy/src/main/res/values-cs/strings.xml | 33 +----------
 .../legacy/src/main/res/values-cy/strings.xml | 34 +----------
 .../legacy/src/main/res/values-da/strings.xml | 33 +----------
 .../legacy/src/main/res/values-de/strings.xml | 33 +----------
 .../legacy/src/main/res/values-el/strings.xml | 34 +----------
 .../src/main/res/values-en-rGB/strings.xml    |  1 -
 .../legacy/src/main/res/values-eo/strings.xml | 32 +----------
 .../legacy/src/main/res/values-es/strings.xml | 32 +----------
 .../legacy/src/main/res/values-et/strings.xml | 34 +----------
 .../legacy/src/main/res/values-eu/strings.xml | 33 +----------
 .../legacy/src/main/res/values-fa/strings.xml | 33 +----------
 .../legacy/src/main/res/values-fi/strings.xml | 33 +----------
 .../legacy/src/main/res/values-fr/strings.xml | 33 +----------
 .../legacy/src/main/res/values-fy/strings.xml | 29 +---------
 .../legacy/src/main/res/values-gd/strings.xml |  5 +-
 .../legacy/src/main/res/values-gl/strings.xml | 34 +----------
 .../legacy/src/main/res/values-hr/strings.xml |  2 -
 .../legacy/src/main/res/values-hu/strings.xml | 32 +----------
 .../legacy/src/main/res/values-in/strings.xml | 33 +----------
 .../legacy/src/main/res/values-is/strings.xml | 33 +----------
 .../legacy/src/main/res/values-it/strings.xml | 34 +----------
 .../legacy/src/main/res/values-iw/strings.xml |  4 +-
 .../legacy/src/main/res/values-ja/strings.xml | 34 +----------
 .../legacy/src/main/res/values-ko/strings.xml |  2 -
 .../legacy/src/main/res/values-lt/strings.xml | 34 +----------
 .../legacy/src/main/res/values-lv/strings.xml | 33 +----------
 .../legacy/src/main/res/values-ml/strings.xml | 33 +----------
 .../legacy/src/main/res/values-nb/strings.xml | 34 +----------
 .../legacy/src/main/res/values-nl/strings.xml | 29 +---------
 .../legacy/src/main/res/values-pl/strings.xml | 33 +----------
 .../src/main/res/values-pt-rBR/strings.xml    | 33 +----------
 .../src/main/res/values-pt-rPT/strings.xml    | 34 +----------
 .../legacy/src/main/res/values-ro/strings.xml | 33 +----------
 .../legacy/src/main/res/values-ru/strings.xml | 33 +----------
 .../legacy/src/main/res/values-sk/strings.xml | 34 +----------
 .../legacy/src/main/res/values-sl/strings.xml | 33 +----------
 .../legacy/src/main/res/values-sq/strings.xml | 34 +----------
 .../legacy/src/main/res/values-sr/strings.xml | 33 +----------
 .../legacy/src/main/res/values-sv/strings.xml | 33 +----------
 .../legacy/src/main/res/values-tr/strings.xml | 33 +----------
 .../legacy/src/main/res/values-uk/strings.xml | 34 +----------
 .../src/main/res/values-zh-rCN/strings.xml    | 34 +----------
 .../src/main/res/values-zh-rTW/strings.xml    | 34 +----------
 app/ui/legacy/src/main/res/values/strings.xml | 34 -----------
 51 files changed, 45 insertions(+), 1519 deletions(-)
 delete mode 100644 app/ui/legacy/src/main/java/com/fsck/k9/ui/onboarding/WelcomeFragment.kt
 delete mode 100644 app/ui/legacy/src/main/res/layout/fragment_welcome_message.xml

diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/onboarding/WelcomeFragment.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/onboarding/WelcomeFragment.kt
deleted file mode 100644
index 3ce504375..000000000
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/onboarding/WelcomeFragment.kt
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.fsck.k9.ui.onboarding
-
-import android.os.Bundle
-import android.text.method.LinkMovementMethod
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.TextView
-import androidx.fragment.app.Fragment
-import androidx.navigation.fragment.findNavController
-import com.fsck.k9.ui.R
-import com.fsck.k9.ui.helper.HtmlToSpanned
-import com.fsck.k9.ui.observeNotNull
-import com.fsck.k9.ui.settings.import.SettingsImportResultViewModel
-import com.fsck.k9.ui.settings.import.SettingsImportSuccess
-import org.koin.android.ext.android.inject
-import org.koin.androidx.viewmodel.ext.android.activityViewModel
-
-class WelcomeFragment : Fragment() {
-    private val htmlToSpanned: HtmlToSpanned by inject()
-    private val importResultViewModel: SettingsImportResultViewModel by activityViewModel()
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_welcome_message, container, false)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        val welcome: TextView = view.findViewById(R.id.welcome_message)
-        welcome.text = htmlToSpanned.convert(getString(R.string.accounts_welcome))
-        welcome.movementMethod = LinkMovementMethod.getInstance()
-
-        view.findViewById<View>(R.id.next).setOnClickListener { launchAccountSetup() }
-        view.findViewById<View>(R.id.import_settings).setOnClickListener { launchImportSettings() }
-
-        importResultViewModel.settingsImportResult.observeNotNull(this) {
-            if (it == SettingsImportSuccess) {
-                launchMessageList()
-            }
-        }
-    }
-
-    private fun launchAccountSetup() {
-        findNavController().navigate(R.id.action_welcomeScreen_to_addAccountScreen)
-        requireActivity().finish()
-    }
-
-    private fun launchImportSettings() {
-        findNavController().navigate(R.id.action_welcomeScreen_to_settingsImportScreen)
-    }
-
-    private fun launchMessageList() {
-        findNavController().navigate(R.id.action_welcomeScreen_to_messageListScreen)
-        requireActivity().finish()
-    }
-}
diff --git a/app/ui/legacy/src/main/res/layout/fragment_welcome_message.xml b/app/ui/legacy/src/main/res/layout/fragment_welcome_message.xml
deleted file mode 100644
index 07dacc29a..000000000
--- a/app/ui/legacy/src/main/res/layout/fragment_welcome_message.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    tools:context=".onboarding.WelcomeFragment" >
-
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:fadingEdge="none" >
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical" >
-
-            <TextView
-                android:id="@+id/welcome_message"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:padding="8dp"
-                android:textColor="?android:attr/textColorPrimary"
-                android:textSize="14sp"
-                tools:text="[Welcome message]" />
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1" />
-        </LinearLayout>
-    </ScrollView>
-
-    <include layout="@layout/wizard_welcome" />
-
-</LinearLayout>
diff --git a/app/ui/legacy/src/main/res/values-ar/strings.xml b/app/ui/legacy/src/main/res/values-ar/strings.xml
index 4e5c0ec37..c9bfb99d0 100644
--- a/app/ui/legacy/src/main/res/values-ar/strings.xml
+++ b/app/ui/legacy/src/main/res/values-ar/strings.xml
@@ -28,38 +28,7 @@
   <string name="changelog_snackbar_text">اكتشف الجديد في هذا الإصدار</string>
   <!--Button text of the "snack bar" that is displayed when the app was updated.-->
   <string name="changelog_snackbar_button_text">عرض</string>
-  <!--Welcome message-->
-  <string name="welcome_message_title">أهلا بكم في بريد K-9</string>
-  <string name="accounts_welcome"><![CDATA[
-<p>
-تطبيق K-9 عبارة عن تطبيق بريد متقدم لنظام أندرويد
-</p><p>
-حصائصة المُحسّنة تشمل:
-</p>
-<ul>
-<li>دفع البريد من خلال IMAP IDLE</li>
-<li>أداء أفضل</li>
-<li>إعادة تعبئة الرسائل</li>
-<li>توقيع البريد</li>
-<li>نسخة مخفية لنفسك</li>
-<li>الإشتراك في المجلدات</li>
-<li>مزامنة جميع المجلدات</li>
-<li>إعدادات عنوان الرد</li>
-<li>اختصارات لوحة المفاتيح</li>
-<li>دعم أفضل لبروتوكول IMAP</li>
-<li>حفظ المرفقات الى بطاقة الذاكرة</li>
-<li>تفريغ المحذوفات</li>
-<li>تصنيف الرسائل</li>
-<li>… والمزيد</li>
-</ul>
-<p>
-يرجى الملاحظة أن K-9 لا يدعم معظم حسابات Hotmail المجانية وكما هو الحال في معظم برامج البريد، هذا البرنامج يعاني من مشاكل غريبة مع Microsoft Exchange.
-</p><p>
-يرجى التبليغ عن الأخطاء، المساهمة في الكود، أو طرح الأسئلة على الرابط:
-<a href="https://github.com/k9mail/k-9/">https://github.com/k9mail/k-9/</a>
-</p>
- ]]></string>
-  <!--Default signature-->
+    <!--Default signature-->
   <string name="default_signature">-- \nتم الإرسال من هاتفي الأندرويد بواسطة برنامج K-9. أعتذر عن الإيجاز.</string>
   <!--General strings that include the app name-->
   <string name="account_delete_dlg_instructions_fmt">سيُحذف الحساب \"<xliff:g id="account">%s</xliff:g>\" من الحسابات في K-9.</string>
diff --git a/app/ui/legacy/src/main/res/values-be/strings.xml b/app/ui/legacy/src/main/res/values-be/strings.xml
index 939a83551..1aeb5545a 100644
--- a/app/ui/legacy/src/main/res/values-be/strings.xml
+++ b/app/ui/legacy/src/main/res/values-be/strings.xml
@@ -28,37 +28,7 @@
   <string name="changelog_snackbar_text">Даведайцеся, што новага ў гэтым выпуску</string>
   <!--Button text of the "snack bar" that is displayed when the app was updated.-->
   <string name="changelog_snackbar_button_text">Праглядзець</string>
-  <!--Welcome message-->
-  <string name="welcome_message_title">Вітаем у K-9</string>
-  <string name="accounts_welcome"><![CDATA[<p>
-K-9 Mail - шматфункцыянальны свабодны паштовы кліент для Android.
-</p><p>
-Магчымасці:
-</p>
-<ul>
-  <li>рush-апавяшчэнні</li>
-  <li>хуткая праца</li>
-  <li>перасылка лістоў</li>
-  <li>подпісы</li>
-  <li>схаваная копія для сябе</li>
-  <li>падпіска на каталогі</li>
-  <li>сінхранізацыя ўсіх каталогаў</li>
-  <li>адрас для адказу</li>
-  <li>гарачыя клавішы</li>
-  <li>палепшаная падтрымка IMAP</li>
-  <li>захаванне ўкладзеных файлаў</li>
-  <li>ачыстка сметніцы</li>
-  <li>сартаванне лістоў</li>
-  <li>…і іншае</li>
-</ul>
-<p>
-Калі ласка, звярніце ўвагу, што K-9 не падтрымлівае бясплатныя акаўнты Hotmail і не цалкам падтрымлівае Microsoft Exchange.
-</p><p>
-Пляцоўка распрацоўвання:
-<a href="https://github.com/k9mail/k-9/">https://github.com/k9mail/k-9/</a>.
-</p>
-    ]]></string>
-  <!--Default signature-->
+    <!--Default signature-->
   <string name="default_signature">-- \nАдпраўлена з маёй прылады праз K-9 Mail. Выбачайце за сцісласць.</string>
   <!--General strings that include the app name-->
   <string name="account_delete_dlg_instructions_fmt">Акаўнт \"<xliff:g id="account">%s</xliff:g>\" будзе выдалены з K-9 Mail.</string>
diff --git a/app/ui/legacy/src/main/res/values-bg/strings.xml b/app/ui/legacy/src/main/res/values-bg/strings.xml
index ddcef0e60..b178cd08b 100644
--- a/app/ui/legacy/src/main/res/values-bg/strings.xml
+++ b/app/ui/legacy/src/main/res/values-bg/strings.xml
@@ -24,38 +24,7 @@
   <!--Displayed in a "snack bar" at the bottom of the screen when the app was updated.-->
   <string name="changelog_snackbar_text">Разбери какво ново в тази варсия</string>
   <!--Button text of the "snack bar" that is displayed when the app was updated.-->
-  <!--Welcome message-->
-  <string name="welcome_message_title">Добре дошли в K-9 Mail</string>
-  <string name="accounts_welcome"><![CDATA[
-<p>
-K-9 Mail е мощен, безплатен имейл клиент за Андроид.
-</p><p>
-Подобрените функции включват:
-</p>
-<ul>
-  <li>Push mail използвайки IMAP IDLE</li>
-  <li>По-добра производителност</li>
-  <li>Преместване на съобщения</li>
-  <li>Имейл подписи</li>
-  <li>Bcc до себе си</li>
-  <li>Абонамент за папки</li>
-  <li>Синхронизиране на всички папки</li>
-  <li>Конфигурация на адреса за връщане</li>
-  <li>Кратки клавишни комбинации</li>
-  <li>По-добра подръжка на IMAP</li>
-  <li>Запазване на прикачени файлове на SD</li>
-  <li>Изпразване на кошчето</li>
-  <li>Сортиране на съобщения</li>
-  <li>…и още</li>
-</ul>
-<p>
-Моля знайте, че K-9 не подържа повечето безплатни Hotmail профили и, че както повечето имейл приложения има няколко странности, когато говори с Microsoft Exchange.
-</p><p>
-Моля изпращайте доклади за бъгове, допринасяйте за нови функции и задавайте въпроси на
-<a href="https://github.com/k9mail/k-9/">https://github.com/k9mail/k-9/</a>.
-</p>
-    ]]></string>
-  <!--Default signature-->
+    <!--Default signature-->
   <string name="default_signature">-- \nИзпратено от моето Андроид у-во чрез K-9 Mail. Моля да ме извините за краткия ми изказ.</string>
   <!--General strings that include the app name-->
   <string name="account_delete_dlg_instructions_fmt">Акаунтът \"<xliff:g id="account">%s</xliff:g>\" ще бъде премахнат от K-9 Mail.</string>
diff --git a/app/ui/legacy/src/main/res/values-br/strings.xml b/app/ui/legacy/src/main/res/values-br/strings.xml
index 6cb15c4dd..8bf9211b6 100644
--- a/app/ui/legacy/src/main/res/values-br/strings.xml
+++ b/app/ui/legacy/src/main/res/values-br/strings.xml
@@ -13,38 +13,7 @@
   <string name="license">Lañvaz</string>
   <!--Displayed in a "snack bar" at the bottom of the screen when the app was updated.-->
   <!--Button text of the "snack bar" that is displayed when the app was updated.-->
-  <!--Welcome message-->
-  <string name="welcome_message_title">Donemat war K-9 Mail</string>
-  <string name="accounts_welcome"><![CDATA[
-<p>
-K-9 Mail a zo un arval posteloù digoust galloudus evit Android
-</p><p>
-Kavet e vez e-touez e geweriusterioù:
-</p>
-<ul>
-  <li>Bountañ posteloù gant IMAP IDLE</li>
-  <li>Digonusted gwelloc’h</li>
-  <li>Adleuniadenn kemennadennoù</li>
-  <li>Sinadurioù postel</li>
-  <li>Bcc-to-self</li>
-  <li>Koumanant da deuliadoù</li>
-  <li>Goubredañ d’an holl deuliadoù</li>
-  <li>Kefluniadur ar chomlec’h daskor</li>
-  <li>Berradennoù klavier</li>
-  <li>Skor IMAP gwelloc’h</li>
-  <li>Enrollañ kenstagadennoù d’ar gartenn SD</li>
-  <li>Goullonderiñ ar c’hest</li>
-  <li>Urzhiañ ar c’hemennadennoù</li>
-  <li>…ha muioc’h c’hoazh</li>
-</ul>
-<p>
-K- ne skor ket lodenn vrasañ ar c’hontoù Hotmail digoust hag evel loden vrasañ an arvaloù postel eo diaes dezhañ eskemm gant Microsoft Exchange.
-</p><p>
-Danevellit beugoù, kenlabourit war keweriusterioù nevez ha savit goulennoù war
-<a href="https://github.com/k9mail/k-9/">https://github.com/k9mail/k-9/</a>.
-</p>
-    ]]></string>
-  <!--Default signature-->
+    <!--Default signature-->
   <string name="default_signature">-- \nKaset eus ma fellgomzer Android gant K-9 Mail.</string>
   <!--General strings that include the app name-->
   <string name="account_delete_dlg_instructions_fmt">Dilamet e vo ar gont \"<xliff:g id="account">%s</xliff:g>\" eus K-9 Mail.</string>
diff --git a/app/ui/legacy/src/main/res/values-ca/strings.xml b/app/ui/legacy/src/main/res/values-ca/strings.xml
index e1a02b2a8..8fe917346 100644
--- a/app/ui/legacy/src/main/res/values-ca/strings.xml
+++ b/app/ui/legacy/src/main/res/values-ca/strings.xml
@@ -28,38 +28,7 @@
   <string name="changelog_snackbar_text">Esbrineu les novetats d’aquesta versió.</string>
   <!--Button text of the "snack bar" that is displayed when the app was updated.-->
   <string name="changelog_snackbar_button_text">Vista</string>
-  <!--Welcome message-->
-  <string name="welcome_message_title">Us donem la benvinguda al K-9 Mail</string>
-  <string name="accounts_welcome"><![CDATA[
-<p>
-El K-9 Mail és un potent client de correu de codi lliure per a Android.
-</p><p>
-Les característiques més destacables són les següents:
-</p>
-<ul>
-<li>Tramet correu fent servir IMAP IDLE</li>
-<li>Millor rendiment</li>
-<li>Rearxivament de missatges</li>
-<li>Signatures de correu</li>
-<li>Còpia oculta a un mateix</li>
-<li>Subscripció a carpetes</li>
-<li>Sincronització de totes les carpetes</li>
-<li>Configuració de l\'adreça de resposta</li>
-<li>Dreceres de teclat</li>
-<li>Millor suport per a IMAP</li>
-<li>Possibilitat de desar els adjunts a la SD</li>
-<li>Buidatge de la paperera</li>
-<li>Ordenació de missatges</li>
-<li>… i molt més</li>
-</ul>
-<p>
-Si us plau, tingueu en compte que el K-9 no admet la majoria de comptes gratuïts de Hotmail i que, com la majoria d\'altres clients de correu, té alguns problemes per interactuar amb el Microsoft Exchange.
-</p><p>
-Si us plau, envieu informes d\'errors, contribuïu-hi amb noves millores i feu preguntes a
-<a href="https://github.com/k9mail/k-9/">https://github.com/k9mail/k-9/</a>.
-</p>
-]]></string>
-  <!--Default signature-->
+    <!--Default signature-->
   <string name="default_signature">-- \nEnviat des del meu dispositiu Android amb el K-9 Mail. Disculpeu la brevetat.</string>
   <!--General strings that include the app name-->
   <string name="account_delete_dlg_instructions_fmt">El compte \"<xliff:g id="account">%s</xliff:g>\" s\'eliminarà del K-9 Mail.</string>
diff --git a/app/ui/legacy/src/main/res/values-cs/strings.xml b/app/ui/legacy/src/main/res/values-cs/strings.xml
index e001863a9..07e9d33b5 100644
--- a/app/ui/legacy/src/main/res/values-cs/strings.xml
+++ b/app/ui/legacy/src/main/res/values-cs/strings.xml
@@ -28,38 +28,7 @@
   <string name="changelog_snackbar_text">Zjistěte, co je v tomto vydání nového</string>
   <!--Button text of the "snack bar" that is displayed when the app was updated.-->
   <string name="changelog_snackbar_button_text">Zobrazit</string>
-  <!--Welcome message-->
-  <string name="welcome_message_title">Vítejte v K-9 Mail</string>
-  <string name="accounts_welcome"><![CDATA[
-<p>
-K-9 Mail je všestranný e-mailový klient pro Android.
-</p><p>
-Vylepšené funkce zahrnují:
-</p>
-<ul>
-  <li>Push mail pomocí IMAP IDLE</li>
-  <li>Lepší výkon</li>
-  <li>Vyplňování zpráv</li>
-  <li>Podpisy zpráv</li>
-  <li>Skryté kopie sobě</li>
-  <li>Odebírané složky</li>
-  <li>Synchronizace všech složek</li>
-  <li>Nastavení zpáteční adresy</li>
-  <li>Klávesové zkratky</li>
-  <li>Lepší podpora IMAP</li>
-  <li>Ukládání příloh na SD kartu</li>
-  <li>Vysypání koše</li>
-  <li>Řazení zpráv</li>
-  <li>…a další</li>
-</ul>
-<p>
-K-9 nepodporuje většinu bezplatných účtů u Hotmail a jako mnoho poštovních klientů vykazuje zvláštnosti při komunikaci s Microsoft Exchange.
-</p><p>
-Hlášení o chyb, úpravy pro nové funkce a dotazy zadávejte prostřednictvím
-<a href="https://github.com/k9mail/k-9/">https://github.com/k9mail/k-9/</a>.
-</p>
-    ]]></string>
-  <!--Default signature-->
+    <!--Default signature-->
   <string name="default_signature">-- \nOdesláno aplikací K-9 Mail ze systému Android. Omluvte prosím moji stručnost.</string>
   <!--General strings that include the app name-->
   <string name="account_delete_dlg_instructions_fmt">Účet \"<xliff:g id="account">%s</xliff:g>\" bude odstraněn z K-9 Mail.</string>
diff --git a/app/ui/legacy/src/main/res/values-cy/strings.xml b/app/ui/legacy/src/main/res/values-cy/strings.xml
index d05442af5..e232399e1 100644
--- a/app/ui/legacy/src/main/res/values-cy/strings.xml
+++ b/app/ui/legacy/src/main/res/values-cy/strings.xml
@@ -27,39 +27,7 @@
   <!--Displayed in a "snack bar" at the bottom of the screen when the app was updated.-->
   <string name="changelog_snackbar_text">Darganfod beth sy\'n newydd yn y diweddariad hwn</string>
   <!--Button text of the "snack bar" that is displayed when the app was updated.-->
-  <!--Welcome message-->
-  <string name="welcome_message_title">Croeso i K-9 Mail</string>
-  <string name="accounts_welcome"><![CDATA[
-<p>
-Mae K-9 Mail yn gleient e-bost pwerus ar gyfer Android.
-</p><p>
-Mae ei nodweddion gwell yn cynnwys:
-</p><ul>
-  <li>Gwthio negeseuon gydag IMAP IDLE</li>
-  <li>Gwell perfformiad</li>
-  <li>Ail-drefnu negeseuon</li>
-  <li>Llofnodion e-bost</li>
-  <li>BCC i dy hun</li>
-  <li>Tanysgrifio fesul ffolder</li>
-  <li>Cysoni pob ffolder</li>
-  <li>Ffufweddu cyfeiriad ateb</li>
-  <li>Bysellau brys</li>
-  <li>Gwell cefnogaeth IMAP</li>
-  <li>Cadw atodiadau i SD</li>
-  <li>Gwagio\'r sbwriel</li>
-  <li>Trefnu negeseuon</li>
-  <li>…a mwy</li>
-</ul>
-<p>
-Noder nad yw K-9 yn cyd-fynd a mwyafrif cyfrifon am ddim Hotmail ac, fel nifer o gleientiaid e-bost, mae rhai pethau\'n gweithio\'n od wrth drafod â Microsoft Exchange.
-
-Mae\'r ap yn dibynnu ar Android ei hun ar gyfer peth cynnwys. Yn anffodus, nid yw fersiynau swyddogol o Android yn cefnogi\'r Gymraeg ac felly fe weli rywfaint o Saesneg yn yr ap, e.e. \"5 minutes ago\" yn lle \"5 munud yn ôl\", \"Dec\" yn lle \"Rhag\".
-</p><p>
-Plîs rho wybod am unrhyw wallau, syniadau am nodweddion newydd, neu ofyn cwestiynnau yma:
-<a href="https://github.com/k9mail/k-9/">https://github.com/k9mail/k-9/</a>.
-</p>
-    ]]></string>
-  <!--Default signature-->
+    <!--Default signature-->
   <string name="default_signature">-- \nAnfonwyd gyda K-9 Mail ar Android\n - yr ap ebost cyntaf yn y Gymraeg.</string>
   <!--General strings that include the app name-->
   <string name="account_delete_dlg_instructions_fmt">Caiff y cyfrif \"<xliff:g id="account">%s</xliff:g>\" ei dynnu o K-9 Mail.</string>
diff --git a/app/ui/legacy/src/main/res/values-da/strings.xml b/app/ui/legacy/src/main/res/values-da/strings.xml
index 3ba2aa0aa..bbf10a7ff 100644
--- a/app/ui/legacy/src/main/res/values-da/strings.xml
+++ b/app/ui/legacy/src/main/res/values-da/strings.xml
@@ -28,38 +28,7 @@
   <string name="changelog_snackbar_text">Find ud af hvad der er nyt i denne version</string>
   <!--Button text of the "snack bar" that is displayed when the app was updated.-->
   <string name="changelog_snackbar_button_text">Vis</string>
-  <!--Welcome message-->
-  <string name="welcome_message_title">Velkommen til K-9 Mail</string>
-  <string name="accounts_welcome"><![CDATA[
-<p>
-K-9 Mail er en slagkraftig gratis mail-klient til Android.
-</p><p>
-Dens forbedrede funktioner omfatter:
-</p>
-<ul>
-  <li>\"Push mail\" ved hjælp af IMAP IDLE</li>
-  <li>Bedre ydeevne</li>
-  <li>Genarkivering af meddelelser</li>
-  <li>Signaturer</li>
-  <li>Bcc-til-dig-selv</li>
-  <li>Mappeabonnementer</li>
-  <li>Synkronisering af alle mapper</li>
-  <li>Konfiguration af Retur-adresse</li>
-  <li>Tastaturgenveje</li>
-  <li>Bedre IMAP-understøttelse</li>
-  <li>Gemning af vedhæftninger på SD-kort</li>
-  <li>Tømning af papirkurv</li>
-  <li>Sortering af meddelelser</li>
-  <li>…og mere</li>
-</ul>
-<p>
-Bemærk, at K-9 ikke understøtter de fleste gratis Hotmail-konti, og ligesom mange mail-klienter, har nogle uhensigtsmæssigheder, når den kommunikerer med Microsoft Exchange.
-</p><p>
-Rapporter venligst fejl, forslag til nye funktioner eller stil spørgsmål på:
-<a href="https://github.com/k9mail/k-9/">https://github.com/k9mail/k-9/</a>.
-</p>
-    ]]></string>
-  <!--Default signature-->
+    <!--Default signature-->
   <string name="default_signature">-- \nDette er sendt fra min mobiltelefon. Undskyld at jeg fatter mig i korthed.</string>
   <!--General strings that include the app name-->
   <string name="account_delete_dlg_instructions_fmt">Kontoen  \"<xliff:g id="account">%s</xliff:g>\" vil blive fjernet fra K-9 Mail.</string>
diff --git a/app/ui/legacy/src/main/res/values-de/strings.xml b/app/ui/legacy/src/main/res/values-de/strings.xml
index 036cdc8dc..30ddb82a8 100644
--- a/app/ui/legacy/src/main/res/values-de/strings.xml
+++ b/app/ui/legacy/src/main/res/values-de/strings.xml
@@ -28,38 +28,7 @@
   <string name="changelog_snackbar_text">Finde heraus, was es Neues in diesem Release gibt</string>
   <!--Button text of the "snack bar" that is displayed when the app was updated.-->
   <string name="changelog_snackbar_button_text">Ansehen</string>
-  <!--Welcome message-->
-  <string name="welcome_message_title">Willkommen bei K-9 Mail</string>
-  <string name="accounts_welcome"><![CDATA[
-<p>
-K-9 Mail ist ein leistungsstarker, freier E-Mail-Client für Android.
-</p><p>
-Seine verbesserten Funktionen beinhalten:
-</p>
-<ul>
-  <li>Push-Mail unter Verwendung von IMAP IDLE</li>
-  <li>Bessere Leistung</li>
-  <li>Nachrichtenneuordnung</li>
-  <li>E-Mail-Signaturen</li>
-  <li>BCC an sich selbst</li>
-  <li>Ordnerabonnements</li>
-  <li>Synchronisation aller Ordner</li>
-  <li>Rücksendeadresskonfiguration</li>
-  <li>Tastaturkürzel</li>
-  <li>Bessere IMAP-Unterstützung</li>
-  <li>Speichern von Anhängen auf SD</li>
-  <li>Papierkorb leeren</li>
-  <li>Nachrichtensortierung</li>
-  <li>…und weitere</li>
-</ul>
-<p>
-Bitte beachte, dass K-9 die meisten kostenlosen Hotmail-Konten nicht unterstützt und, wie viele andere E-Mail-Clients, einige Macken bei der Kommunikation mit Microsoft Exchange hat.
-</p><p>
-Bitte sende Fehlerberichte, Ideen für neue Funktionen und stelle Fragen an
-<a href="https://github.com/k9mail/k-9/">https://github.com/k9mail/k-9/</a>.
-</p>
-    ]]></string>
-  <!--Default signature-->
+    <!--Default signature-->
   <string name="default_signature">-- \nDiese Nachricht wurde von meinem Android-Gerät mit K-9 Mail gesendet.</string>
   <!--General strings that include the app name-->
   <string name="account_delete_dlg_instructions_fmt">Das Konto \"<xliff:g id="account">%s</xliff:g>\" wird aus K-9 Mail entfernt.</string>
diff --git a/app/ui/legacy/src/main/res/values-el/strings.xml b/app/ui/legacy/src/main/res/values-el/strings.xml
index 8af04d0cc..4a02f4a12 100644
--- a/app/ui/legacy/src/main/res/values-el/strings.xml
+++ b/app/ui/legacy/src/main/res/values-el/strings.xml
@@ -28,39 +28,7 @@
   <string name="changelog_snackbar_text">Δείτε τι έχει αλλάξει σε αυτή την έκδοση</string>
   <!--Button text of the "snack bar" that is displayed when the app was updated.-->
   <string name="changelog_snackbar_button_text">Προβολή</string>
-  <!--Welcome message-->
-  <string name="welcome_message_title">Καλώς ορίσατε στο K-9 Mail</string>
-  <string name="accounts_welcome"><![CDATA[
-<p>
-Το K-9 Mail είναι μία ισχυρή δωρεάν εφαρμογή ηλεκτρονικού ταχυδρομείου για το Android.
-</p><p>
-Τα βελτιωμένα χαρακτηριστικά του περιλαμβάνουν:
-</p>
-<ul>
-  <li>Ταχυδρομείο με σπρώξιμο (push mail) με χρήση IMAP IDLE</li>
-  <li>Καλύτερες επιδόσεις</li>
-  <li>Επαναταξινόμηση μηνύματος</li>
-  <li>Υπογραφές ηλεκτρονικού ταχυδρομείου</li>
-  <li>Ιδιωτική κοινοποίηση (bcc) προς εαυτό</li>
-  <li>Συνδρομές σε φακέλους</li>
-  <li>Συγχρονισμός όλων των φακέλων</li>
-  <li>Ρύθμιση διεύθυνσης επιστροφής</li>
-  <li>Συντομεύσεις πληκτρολογίου</li>
-  <li>Καλύτερη υποστήριξη IMAP</li>
-  <li>Αποθήκευση συνημμένων στην κάρτα αποθήκευσης</li>
-  <li>Άδειασμα απορριμάτων</li>
-  <li>Ταξινόμηση μηνυμάτων</li>
-  <li>…και άλλα</li>
-</ul>
-<p>
-Να σημειωθεί ότι το K-9 δεν υποστηρίζει τους περισσότερους δωρεάν λογαριασμούς Hotmail και,
-όπως οι περισσότερες εφαρμογές ηλεκτρονικού ταχυδρομείου, έχει θεματάκια με το Microsoft Exchange.
-</p><p>
-Παρακαλώ υποβάλετε αναφορές σφαλμάτων, συμβάλλετε νέα χαρακτηριστικά και θέστε ερωτήσεις στο
-<a href="https://github.com/k9mail/k-9/">https://github.com/k9mail/k-9/</a>.
-</p>
-    ]]></string>
-  <!--Default signature-->
+    <!--Default signature-->
   <string name="default_signature">-- \nΣταλμένο από τη συσκευή μου Android με το K-9 Mail. Παρακαλώ συγχωρήστε την ολιγολογία μου.</string>
   <!--General strings that include the app name-->
   <string name="account_delete_dlg_instructions_fmt">Ο λογαριασμός \'<xliff:g id="account">%s</xliff:g>\' θα διαγραφεί από το K-9 Mail.</string>
diff --git a/app/ui/legacy/src/main/res/values-en-rGB/strings.xml b/app/ui/legacy/src/main/res/values-en-rGB/strings.xml
index 8069bd74d..e392f87d1 100644
--- a/app/ui/legacy/src/main/res/values-en-rGB/strings.xml
+++ b/app/ui/legacy/src/main/res/values-en-rGB/strings.xml
@@ -9,7 +9,6 @@
   <!--Used in the about dialog-->
   <!--Displayed in a "snack bar" at the bottom of the screen when the app was updated.-->
   <!--Button text of the "snack bar" that is displayed when the app was updated.-->
-  <!--Welcome message-->
   <!--Default signature-->
   <!--General strings that include the app name-->
   <!--=== General strings ==================================================================-->
diff --git a/app/ui/legacy/src/main/res/values-eo/strings.xml b/app/ui/legacy/src/main/res/values-eo/strings.xml
index a6d24a115..40ff007c9 100644
--- a/app/ui/legacy/src/main/res/values-eo/strings.xml
+++ b/app/ui/legacy/src/main/res/values-eo/strings.xml
@@ -25,37 +25,7 @@
   <!--Displayed in a "snack bar" at the bottom of the screen when the app was updated.-->
   <string name="changelog_snackbar_text">Kio estas nova en tiu ĉi versio</string>
   <!--Button text of the "snack bar" that is displayed when the app was updated.-->
-  <!--Welcome message-->
-  <string name="welcome_message_title">Bonvenon al K-9 Retpoŝtilo</string>
-  <string name="accounts_welcome"><![CDATA[
-<p>
-K-9 Retpoŝtilo estas potenca libera retpoŝtilo por Android.
-</p><p>
-Jen kelkaj distingaj ebloj de ĝi:
-</p>
-<ul>
-<li>Puŝ-retleteroj per IMAP IDLE</li>
-<li>Pli bona rendimento</li>
-<li>Rearanĝado de mesaĝoj</li>
-<li>Subskriboj de retleteroj</li>
-<li>Kaŝkopio al si mem</li>
-<li>Aboni mesaĝujojn</li>
-<li>Samtempigi ĉiujn mesaĝujojn</li>
-<li>Agordebla responda adreso</li>
-<li>Fulmoklavoj</li>
-<li>Pli bona subteno por IMAP</li>
-<li>Konservi kunsendaĵojn al SD-karto</li>
-<li>Malplenigi rubujon</li>
-<li>Ordigi mesaĝojn</li>
-<li>…kaj pli</li>
-</ul>
-<p>
-Bonvolu rimarki, ke K-9 Retpoŝtilo ne subtenas plejparton da senpagaj Hotmail-kontoj kaj simile al aliaj retpoŝtiloj, ĝi povas esti kapricema dum komunikado kun Microsoft Exchange.
-</p><p>
-Bonvolu raporti erarojn, kontribui novajn eblojn kaj peti pri novaj funkcioj per nia retpaĝo <a href="https://github.com/k9mail/k-9/">https://github.com/k9mail/k-9/</a>.
-</p>
-]]></string>
-  <!--Default signature-->
+    <!--Default signature-->
   <string name="default_signature">-- \nSendita per K-9 Retpoŝtilo. Bonvolu pardoni min por skribi mallonge.</string>
   <!--General strings that include the app name-->
   <string name="account_delete_dlg_instructions_fmt">La konto \"<xliff:g id="account">%s</xliff:g>\" estos forigita el K-9 Retpoŝtilo.</string>
diff --git a/app/ui/legacy/src/main/res/values-es/strings.xml b/app/ui/legacy/src/main/res/values-es/strings.xml
index 0b0212437..8d55dc98b 100644
--- a/app/ui/legacy/src/main/res/values-es/strings.xml
+++ b/app/ui/legacy/src/main/res/values-es/strings.xml
@@ -28,37 +28,7 @@
   <string name="changelog_snackbar_text">Descubre las novedades de esta versión</string>
   <!--Button text of the "snack bar" that is displayed when the app was updated.-->
   <string name="changelog_snackbar_button_text">Leer</string>
-  <!--Welcome message-->
-  <string name="welcome_message_title">Te damos la bienvenida a K-9 Mail</string>
-  <string name="accounts_welcome"><![CDATA[
-<p>
-K-9 Mail es un cliente de correo rápido, libre y potente para Android.
-</p><p>
-Sus características más destacadas son:
-</p>
-<ul>
-  <li>Notificaciones rápidas («push») usando IMAP IDLE</li>
-  <li>Un rendimiento superior</li>
-  <li>Archivado de mensajes</li>
-  <li>Firmas de correo</li>
-  <li>Cco-a-sí-mismo</li>
-  <li>Suscripciones a carpetas</li>
-  <li>Sincronización de todas las carpetas</li>
-  <li>Configuración de la dirección de respuesta</li>
-  <li>Atajos del teclado</li>
-  <li>Características avanzadas para IMAP</li>
-  <li>Guardar adjuntos a la tarjeta SD</li>
-  <li>Vaciar la papelera</li>
-  <li>Ordenación de mensajes</li>
-  <li>…y mucho más</li>
-</ul>
-<p>
-Ten en cuenta que K-9 no funciona bien con la mayor parte de las cuentas gratuitas de Hotmail, y (como tantos otros clientes de correo) puede tener alguna dificultad al comunicarse con servidores de Microsoft Exchange.
-</p><p>
-Puedes informar de fallos, contribuir con su desarrollo y hacer preguntas en <a href="https://github.com/k9mail/k-9/">https://github.com/k9mail/k-9/</a>.
-</p>
-    ]]></string>
-  <!--Default signature-->
+    <!--Default signature-->
   <string name="default_signature">-- \nEnviado desde mi dispositivo Android con K-9 Mail. Por favor, disculpa mi brevedad.</string>
   <!--General strings that include the app name-->
   <string name="account_delete_dlg_instructions_fmt">La cuenta \"<xliff:g id="account">%s</xliff:g>\" será eliminada de K-9 Mail.</string>
diff --git a/app/ui/legacy/src/main/res/values-et/strings.xml b/app/ui/legacy/src/main/res/values-et/strings.xml
index 2c616af7d..f28e76432 100644
--- a/app/ui/legacy/src/main/res/values-et/strings.xml
+++ b/app/ui/legacy/src/main/res/values-et/strings.xml
@@ -28,39 +28,7 @@
   <string name="changelog_snackbar_text">Vaata mis on selles versioonis muutunud</string>
   <!--Button text of the "snack bar" that is displayed when the app was updated.-->
   <string name="changelog_snackbar_button_text">Vaata</string>
-  <!--Welcome message-->
-  <string name="welcome_message_title">Tere tulemast K-9 Maili</string>
-  <string name="accounts_welcome"><![CDATA[
-<p>
-K-9 Mail on tõhus tasuta e-posti klient Androidile.
-</p><p>
-Rakendus pakub muu hulgas selliseid uuenenud võimalusi:
-</p>
-<ul>
-  <li>tõuketeenus, mille aluseks on IMAP IDLE</li>
-  <li>parem jõudlus</li>
-  <li>kirjade ümberpaigutamine</li>
-  <li>kirjade allkirjad</li>
-  <li>pimekoopia ehk bcc iseendale</li>
-  <li>IMAP\'i kaustade tellimine</li>
-  <li>kõikide kaustade sünkroniserimine</li>
-  <li>saatja-aadresside seadistamine</li>
-  <li>kiirklahvid</li>
-  <li>parandatud IMAP\'i tugi</li>
-  <li>manuste salvestamine SD-kaardile</li>
-  <li>prügikasti tühjendamine</li>
-  <li>kirjade sortimine</li>
-  <li>…ja palju muud</li>
-</ul>
-<p>
-Palun arvesta, et K-9 Mail ei toeta enamusi tasuta Hotmail\'i kontosid ning sarnaselt muude e-posti klientidega
-on mõningaid kiikse Microsoft Exchange\'i kasutamisel.
-</p><p>
-Veateated saad saata, kaastööd teha ning küsida teavet järgmisel lehel:
-<a href="https://github.com/k9mail/k-9/">https://github.com/k9mail/k-9/</a>.
-</p>
-    ]]></string>
-  <!--Default signature-->
+    <!--Default signature-->
   <string name="default_signature">-- \nSaadetud Androidi seadmelt K-9 meiliga. Vabanda, et nii lühdalt.</string>
   <!--General strings that include the app name-->
   <string name="account_delete_dlg_instructions_fmt">Konto \"<xliff:g id="account">%s</xliff:g>\" eemaldatakse K-9 Mailist.</string>
diff --git a/app/ui/legacy/src/main/res/values-eu/strings.xml b/app/ui/legacy/src/main/res/values-eu/strings.xml
index 12a302871..021d3049a 100644
--- a/app/ui/legacy/src/main/res/values-eu/strings.xml
+++ b/app/ui/legacy/src/main/res/values-eu/strings.xml
@@ -27,38 +27,7 @@
   <!--Displayed in a "snack bar" at the bottom of the screen when the app was updated.-->
   <string name="changelog_snackbar_text">Ikusi zer den berria bertsio honetan</string>
   <!--Button text of the "snack bar" that is displayed when the app was updated.-->
-  <!--Welcome message-->
-  <string name="welcome_message_title">Ongi etorri K-9 Mail-era</string>
-  <string name="accounts_welcome"><![CDATA[
-<p>
-K-9 Mail Androiderako posta elektroniko bezero libre ahaltsu bat da.
-</p><p>
-Ondorengo eginbide hobetuak ditu:
-</p>
-<ul>
-  <li>\"Push\" posta IMAP IDLE erabiliz</li>
-  <li>Errendimendu hobea</li>
-  <li>Mezu artxibatzea</li>
-  <li>Posta elektronikoen sinadurak</li>
-  <li>Bcc-bere-buruari</li>
-  <li>Harpidetza karpetetara</li>
-  <li>Karpeta guztien sinkronizazioa</li>
-  <li>Erantzuteko helbidearen konfigurazioa</li>
-  <li>Laster-teklak</li>
-  <li>Bateragarritasun hobea IMAPekin</li>
-  <li>Eranskinak SD txartelean gordetzea</li>
-  <li>Hustu Zakarrontzia</li>
-  <li>Mezuen ordenatzea</li>
-  <li>…eta gehiago</li>
-</ul>
-<p>
-Mesedez kontuan hartu K-9 Mail ez dela bateragarria Hotmail-en doako kontu gehienekin eta, posta bezero askok bezala, bitxikeria batzuk ditu Microsoft Exchange-rekin komunikatzerakoan.
-</p><p>
-Mesedez akatsen berri emateko, ezaugarri berriak gehitzeko eta galderak egiteko
-<a href="https://github.com/k9mail/k-9/">https://github.com/k9mail/k-9/</a> erabili.
-</p>
-    ]]></string>
-  <!--Default signature-->
+    <!--Default signature-->
   <string name="default_signature">-- \nAndroid gailutik bidalia K-9 Mail erabiliz. Barka laburtasuna.</string>
   <!--General strings that include the app name-->
   <string name="account_delete_dlg_instructions_fmt">\"<xliff:g id="account">%s</xliff:g>\" kontua K-9 Mail-etik kenduko da.</string>
diff --git a/app/ui/legacy/src/main/res/values-fa/strings.xml b/app/ui/legacy/src/main/res/values-fa/strings.xml
index bad5f0e6d..e2c152970 100644
--- a/app/ui/legacy/src/main/res/values-fa/strings.xml
+++ b/app/ui/legacy/src/main/res/values-fa/strings.xml
@@ -28,38 +28,7 @@
   <string name="changelog_snackbar_text">از تازه‌های این نسخه باخبر شوید</string>
   <!--Button text of the "snack bar" that is displayed when the app was updated.-->
   <string name="changelog_snackbar_button_text">نما</string>
-  <!--Welcome message-->
-  <string name="welcome_message_title">به «K-9 Mail» خوش آمدید</string>
-  <string name="accounts_welcome"><![CDATA[
-<p>
-‏K-9 Mail برنامه‌ای رایگان برای مدیریت رایانامه در اندروید است.
-</p><p>
-برخی از قابلیت‌های بهبودیافتهٔ آن:
-</p>
-<ul>
-  <li>پیشرانی رایانامه (Push Mail) با استفاده از IMAP IDLE</li>
-  <li>عملکرد بهتر</li>
-  <li>سامان‌دهی پیام‌ها</li>
-  <li>امضاهای رایانامه</li>
-  <li>ارسال مخفیانه به خود (Bcc-to-self)</li>
-  <li>اشتراک به پوشه‌های خاص با IMAP</li>
-  <li>همگام‌سازی همهٔ پوشه‌ها</li>
-  <li>تنظیماتی برای نشانی «پاسخ به»</li>
-  <li>میانبرهای صفحه‌کلید</li>
-  <li>پشتیبانی بهتر از IMAP</li>
-  <li>ذخیرهٔ پیوست‌ها در کارت SD</li>
-  <li>خالی‌کردن زباله‌دان</li>
-  <li>مرتب‌سازی پیام‌ها</li>
-  <li>و خیلی قابلیت‌های دیگر…</li>
-</ul>
-<p>
-لطفاً توجه کنید که K-9، مانند بسیاری از برنامه‌های مدیریت رایانامه، از بیشتر حساب‌های رایگان Hotmail پشتیبانی نمی‌کند و هنگام برقراری ارتباط‌ با Microsoft Exchange مشکلاتی وجود دارد.
-</p><p>
-لطفاً گزارش‌های خطا، همکاری برای قابلیت جدید و پرسش‌هایتان را در اینجا مطرح کنید:
-<a href="https://github.com/k9mail/k-9/">https://github.com/k9mail/k-9/</a>.
-</p>
-    ]]></string>
-  <!--Default signature-->
+    <!--Default signature-->
   <string name="default_signature">-- \nاز دستگاه اندرویدی‌ام و به‌وسیلهٔ K-9 Mail ارسال شد.</string>
   <!--General strings that include the app name-->
   <string name="account_delete_dlg_instructions_fmt">حساب «<xliff:g id="account">%s</xliff:g>» از K-9 Mail حذف خواهد شد.</string>
diff --git a/app/ui/legacy/src/main/res/values-fi/strings.xml b/app/ui/legacy/src/main/res/values-fi/strings.xml
index 2818bf24d..e0457e688 100644
--- a/app/ui/legacy/src/main/res/values-fi/strings.xml
+++ b/app/ui/legacy/src/main/res/values-fi/strings.xml
@@ -28,38 +28,7 @@
   <string name="changelog_snackbar_text">Selvitä mitä uutta tämä julkaisu sisältää</string>
   <!--Button text of the "snack bar" that is displayed when the app was updated.-->
   <string name="changelog_snackbar_button_text">Näytä</string>
-  <!--Welcome message-->
-  <string name="welcome_message_title">Tervetuloa K-9 Mailiin</string>
-  <string name="accounts_welcome"><![CDATA[
-<p>
-K-9 Mail on monipuolinen ilmainen sähköpostisovellus Androidille.
-</p><p>
-Sen ominaisuuksiin kuuluu muun muassa:
-</p>
-<ul>
-  <li>Push-viestit käyttäen IMAP IDLE -toteutusta</li>
-  <li>Aiempaa parempi suorituskyky</li>
-  <li>Viestien arkistointi</li>
-  <li>Sähköpostin allekirjoitukset</li>
-  <li>Piilokopioiden lähetys itselle</li>
-  <li>Kansiotilaukset</li>
-  <li>Kaikkien kansioiden synkronointi</li>
-  <li>Vastausosoitteen määritys</li>
-  <li>Pikanäppäimet</li>
-  <li>Aiempaa parempi IMAP-tuki</li>
-  <li>Liitteiden tallennus muistikortille</li>
-  <li>Roskakorin tyhjennys</li>
-  <li>Viestien järjestely</li>
-  <li>…ja paljon muuta</li>
-</ul>
-<p>
-Huomioithan, että K-9 ei tue useimpia ilmaisia Hotmail-tilejä, ja kuten monet muut sovellukset, saattaa kärsiä pienistä ongelmista Microsoft Exchange -ympäristössä.
-</p><p>
-Ilmoita virheistä, ota osaa sovelluskehitykseen ja esitä kysymyksiä osoitteessa
-<a href="https://github.com/k9mail/k-9/">https://github.com/k9mail/k-9/</a>.
-</p>
-    ]]></string>
-  <!--Default signature-->
+    <!--Default signature-->
   <string name="default_signature">-- \nLähetetty Android-laitteestani K-9 Maililla. Pahoittelut vähäsanaisuudestani.</string>
   <!--General strings that include the app name-->
   <string name="account_delete_dlg_instructions_fmt">Tili \"<xliff:g id="account">%s</xliff:g>\" poistetaan K-9 Mailista.</string>
diff --git a/app/ui/legacy/src/main/res/values-fr/strings.xml b/app/ui/legacy/src/main/res/values-fr/strings.xml
index f5ab6c8a5..813bf879f 100644
--- a/app/ui/legacy/src/main/res/values-fr/strings.xml
+++ b/app/ui/legacy/src/main/res/values-fr/strings.xml
@@ -28,38 +28,7 @@
   <string name="changelog_snackbar_text">Découvrez les nouveautés de cette version</string>
   <!--Button text of the "snack bar" that is displayed when the app was updated.-->
   <string name="changelog_snackbar_button_text">Afficher</string>
-  <!--Welcome message-->
-  <string name="welcome_message_title">Bienvenue sur Courriel K-9 Mail</string>
-  <string name="accounts_welcome"><![CDATA[
-<p>
-Courriel K-9 Mail est un client de courriel puissant et ouvert pour Android.
-</p><p>
-Ses fonctions améliorées incluent :
-</p>
-<ul>
-  <li>Courriel poussé utilisant IMAP IDLE</li>
-  <li>Meilleures performances</li>
-  <li>Réarchivage des courriels</li>
-  <li>Signatures des courriels</li>
-  <li>Cci-à-soi</li>
-  <li>Abonnement aux dossiers</li>
-  <li>Synchronisation de tous les dossiers </li>
-  <li>Configuration de l’adresse de retour</li>
-  <li>Raccourcis-clavier</li>
-  <li>Meilleure prise en charge IMAP</li>
-  <li>Enregistrement des fichiers joints sur la carte SD</li>
-  <li>Vidage de la corbeille</li>
-  <li>Tri des courriels</li>
-  <li>et plus…</li>
-</ul>
-<p>
-Veuillez noter que K-9 ne prend pas en charge la plupart des comptes Hotmail gratuits et que, comme pour beaucoup de clients de courriel, la communication avec Microsoft Exchange est capricieuse.
-</p><p>
-Rapportez les bogues, recommandez de nouvelles fonctions et posez vos questions sur
-<a href="https://github.com/k9mail/k-9/">https://github.com/k9mail/k-9/</a>.
-</p>
-]]></string>
-  <!--Default signature-->
+    <!--Default signature-->
   <string name="default_signature">-- \nEnvoyé de mon appareil Android avec Courriel K-9 Mail. Veuillez excuser ma brièveté.</string>
   <!--General strings that include the app name-->
   <string name="account_delete_dlg_instructions_fmt">Le compte « <xliff:g id="account">%s</xliff:g> » sera supprimé de Courriel K-9 Mail.</string>
diff --git a/app/ui/legacy/src/main/res/values-fy/strings.xml b/app/ui/legacy/src/main/res/values-fy/strings.xml
index f6909e781..c295f776b 100644
--- a/app/ui/legacy/src/main/res/values-fy/strings.xml
+++ b/app/ui/legacy/src/main/res/values-fy/strings.xml
@@ -28,34 +28,7 @@
   <string name="changelog_snackbar_text">Untdek wat der nij is yn dizze ferzje</string>
   <!--Button text of the "snack bar" that is displayed when the app was updated.-->
   <string name="changelog_snackbar_button_text">Besjen</string>
-  <!--Welcome message-->
-  <string name="welcome_message_title">Wolkom by K-9 Mail</string>
-  <string name="accounts_welcome"><![CDATA[ <p> K-9 Mail is in fergees krêftige e-mailclient foar Android. </p><p> De ferbettere mooglikheden bestean ûnder oare út:
-</p>
-<ul>
-<li>Pushmail middels IMAP IDLE</li> 
-<li>Bettere prestaasjes</li> 
-<li>Berjocht werklassifikaasje</li> 
-<li>E-mailhantekeningen</li> 
-<li>Bcc nei josels</li> 
-<li>Mapabonneminten</li> 
-<li>Syngronisaasje fan alle mappen</li> 
-<li>Antwurdadres ynstelle</li> 
-<li>Toetseboerd fluchkeppelingen</li> 
-<li>Bettere stipe IMAP</li> 
-<li>Bylage bewarje nei SD</li> 
-<li>Jiskefet leegje</li> 
-<li>Berjochten sortearje</li> 
-<li>en mear…</li> 
-</ul> 
-<p> 
-Hâld der rekkening mei dat K-9 de measte fergeze Hotmail-accounts net stipet, en krekt as in protte e-mailclients, problemen hawwe kin om te ferbinen mei Microsoft Exchange. 
-</p><p> 
-Graach flaterrapporten stjoere, bydragen foar nije funksjes en fragen stelle op 
-<a href="https://github.com/k9mail/k-9/">https://github.com/k9mail/k-9/</a>. 
-</p> 
-]]></string>
-  <!--Default signature-->
+    <!--Default signature-->
   <string name="default_signature">-- \nFerstjoerd fan myn Android-apparaat ôf mei K-9 Mail.</string>
   <!--General strings that include the app name-->
   <string name="account_delete_dlg_instructions_fmt">De account ‘<xliff:g id="account">%s</xliff:g>’ wurdt út K-9 Mail fuortsmiten.</string>
diff --git a/app/ui/legacy/src/main/res/values-gd/strings.xml b/app/ui/legacy/src/main/res/values-gd/strings.xml
index 4694ffd1a..9bf039085 100644
--- a/app/ui/legacy/src/main/res/values-gd/strings.xml
+++ b/app/ui/legacy/src/main/res/values-gd/strings.xml
@@ -23,10 +23,7 @@
   <string name="changelog_recent_changes_title">Na tha ùr</string>
   <!--Displayed in a "snack bar" at the bottom of the screen when the app was updated.-->
   <!--Button text of the "snack bar" that is displayed when the app was updated.-->
-  <!--Welcome message-->
-  <string name="welcome_message_title">Fàilte gu aplacaid a’ phuist</string>
-  <string name="accounts_welcome">&lt;p&gt; Tha aplacaid a’ phuist ’na aplacaid shaor agus chumhachdach airson post-d air Android. &lt;/p&gt;&lt;p&gt; Tha na gleusan leasaichte aige a’ gabhail a-staigh: &lt;/p&gt; &lt;ul&gt; &lt;li&gt;Put post slighe IMAP IDLE&lt;/li&gt; &lt;li&gt;Dèanadas nas fheàrr&lt;/li&gt; &lt;li&gt;Ath-fhaidhleadh theachdaireachdan&lt;/li&gt; &lt;li&gt;Eàrr-sgrìobhaidhean puist-d&lt;/li&gt; &lt;li&gt;Bcc dhut fhèin&lt;/li&gt; &lt;li&gt;Fo-sgrìobhaidhean phasganan&lt;/li&gt; &lt;li&gt;Sioncronachadh nam pasgan air fad&lt;/li&gt; &lt;li&gt;Rèiteachadh seòladh nam freagairt&lt;/li&gt; &lt;li&gt;Ath-ghoiridean a’ mheur-chlàir&lt;/li&gt; &lt;li&gt;Taic nas fheàrr airson IMAP&lt;/li&gt; &lt;li&gt;Sàbhaladh de cheanglachain air SD&lt;/li&gt; &lt;li&gt;Falamhachadh an sgudail&lt;/li&gt; &lt;li&gt;Seòrsachadh theachdaireachdan&lt;/li&gt; &lt;li&gt;…is mòran a bharrachd&lt;/li&gt; &lt;/ul&gt; &lt;p&gt; Thoir an aire nach cuir aplacaid a’ phuist taic ri cuid mhòr de chunntasan saora Hotmail agus mar iomadh prògram puist-d eile, tachraidh rudan neònach nuair a bhruidhneas e ri Microsoft Exchange. &lt;/p&gt;&lt;p&gt; Fàilte air bugaichean, com-pàirteachas, iarrtasan airson gleusan ùra is ceistean aig &lt;a href=https://github.com/k9mail/k-9/&gt;https://github.com/k9mail/k-9/&lt;/a&gt;. &lt;/p&gt;</string>
-  <!--Default signature-->
+    <!--Default signature-->
   <string name="default_signature">-- Chaidh a chur le post /e/.</string>
   <!--General strings that include the app name-->
   <string name="account_delete_dlg_instructions_fmt">Thèid an cunntas “<xliff:g id="account">%s</xliff:g>” a thoirt air falbh on phost.</string>
diff --git a/app/ui/legacy/src/main/res/values-gl/strings.xml b/app/ui/legacy/src/main/res/values-gl/strings.xml
index fb388f6c6..1dabc2a17 100644
--- a/app/ui/legacy/src/main/res/values-gl/strings.xml
+++ b/app/ui/legacy/src/main/res/values-gl/strings.xml
@@ -25,39 +25,7 @@
   <!--Displayed in a "snack bar" at the bottom of the screen when the app was updated.-->
   <string name="changelog_snackbar_text">Mira as novidades deste lanzamento</string>
   <!--Button text of the "snack bar" that is displayed when the app was updated.-->
-  <!--Welcome message-->
-  <string name="welcome_message_title">Benvido/a a K-9 Mail</string>
-  <string name="accounts_welcome"><![CDATA[
-<p>
-K-9 Mail é un potente cliente de correo para Android.
-</p><p>
-As características melloradas inclúen:
-</p>
-<ul>
-  <li>Push mail utilizando IMAP IDLE</li>
-  <li>Mellor rendemento</li>
-  <li>Autocompletado de mensaxe</li>
-  <li>Firmas de correo</li>
-  <li>Bcc ao remitente</li>
-  <li>Suscrición de cartafoles</li>
-  <li>Sincronización de todos os cartafoles</li>
-  <li>Configuración da conta de resposta</li>
-  <li>Atallos de teclado</li>
-  <li>Melloras no xestión IMAP</li>
-  <li>Gardar anexos en tarxeta SD</li>
-  <li>Baldeirar o lixo</li>
-  <li>Ordenar mensaxes</li>
-  <li>…e máis</li>
-</ul>
-<p>
-Por favor teña en conta que K-9 non soporta a maioría das contas gratuítas Hotmail e, como moitos clientes, ten
-problemiñas ao utilizar Microsoft Exchange.
-</p><p>
-Por favor envíen informes de fallos, contribúa con novas características e consulte dúbidas en
-<a href="https://github.com/k9mail/k-9/">https://github.com/k9mail/k-9/</a>.
-</p>
-    ]]></string>
-  <!--Default signature-->
+    <!--Default signature-->
   <string name="default_signature">-- \nEnviado dende o meu teléfono Android con K-9 Mail. Desculpa a miña brevedade</string>
   <!--General strings that include the app name-->
   <string name="account_delete_dlg_instructions_fmt">A conta \"<xliff:g id="account">%s</xliff:g>\" será eliminada de K-9 Mail.</string>
diff --git a/app/ui/legacy/src/main/res/values-hr/strings.xml b/app/ui/legacy/src/main/res/values-hr/strings.xml
index bb51fee3a..7eb496c9b 100644
--- a/app/ui/legacy/src/main/res/values-hr/strings.xml
+++ b/app/ui/legacy/src/main/res/values-hr/strings.xml
@@ -13,8 +13,6 @@
   <string name="license">Licenca</string>
   <!--Displayed in a "snack bar" at the bottom of the screen when the app was updated.-->
   <!--Button text of the "snack bar" that is displayed when the app was updated.-->
-  <!--Welcome message-->
-  <string name="welcome_message_title">Dobrodošli u K-9 Mail</string>
   <!--Default signature-->
   <string name="default_signature">-- \nPoslano sa mog Android uređaja sa K-9 Mail. Molim vas oprostite na mojoj sažetosti.</string>
   <!--General strings that include the app name-->
diff --git a/app/ui/legacy/src/main/res/values-hu/strings.xml b/app/ui/legacy/src/main/res/values-hu/strings.xml
index a6b27f578..e43608b29 100644
--- a/app/ui/legacy/src/main/res/values-hu/strings.xml
+++ b/app/ui/legacy/src/main/res/values-hu/strings.xml
@@ -28,37 +28,7 @@
   <string name="changelog_snackbar_text">Tudja meg, hogy mik az újdonságok ebben a kiadásban</string>
   <!--Button text of the "snack bar" that is displayed when the app was updated.-->
   <string name="changelog_snackbar_button_text">Megtekintés</string>
-  <!--Welcome message-->
-  <string name="welcome_message_title">Üdvözli a K-9 Mail</string>
-  <string name="accounts_welcome"><![CDATA[
-<p>
-A K-9 Mail egy hatékony, ingyenes e-mail alkalmazás Androidra.
-</p><p>
-Továbbfejlesztett funkciók:
-</p>
-<ul>
-  <li>E-mail küldés IMAP IDLE segítségével</li>
-  <li>Jobb működés</li>
-  <li>Üzenet iktatás</li>
-  <li>E-mail aláírások</li>
-  <li>Titkos másolat saját részre</li>
-  <li>Mappa váltogatások</li>
-  <li>Összes mappa szinkronizálása</li>
-  <li>Visszatérési cím konfiguráció</li>
-  <li>Gyorsbillentyűk</li>
-  <li>Jobb IMAP-támogatás</li>
-  <li>Mellékletek mentése SD-kártyára</li>
-  <li>Lomtár ürítése</li>
-  <li>Üzenetek rendezése</li>
-  <li>…és egyebek</li>
-</ul>
-<p>A K-9 nem támogatja a legtöbb Hotmail-fiókot, és sok e-mail alkalmazáshoz hasonlóan, vannak furcsaságok a Microsoft Exchange kezelésében.
-</p><p>
-Hibajelentések beküldésével közreműködhet az új funkciókban, és kérdéseket tehet fel a
-<a href="https://github.com/k9mail/k-9/">https://github.com/k9mail/k-9/</a> webcímen.
-</p>
-    ]]></string>
-  <!--Default signature-->
+    <!--Default signature-->
   <string name="default_signature">-- \nAndroidos készülékről küldve K-9 Mail használatával. Elnézést a rövidségért.</string>
   <!--General strings that include the app name-->
   <string name="account_delete_dlg_instructions_fmt">A(z) „<xliff:g id="account">%s</xliff:g>” fiók eltávolításra kerül a K-9 Mail alkalmazásból.</string>
diff --git a/app/ui/legacy/src/main/res/values-in/strings.xml b/app/ui/legacy/src/main/res/values-in/strings.xml
index 1a28e41c9..116acc70e 100644
--- a/app/ui/legacy/src/main/res/values-in/strings.xml
+++ b/app/ui/legacy/src/main/res/values-in/strings.xml
@@ -25,38 +25,7 @@
   <string name="changelog_recent_changes_title">Apa yang baru</string>
   <!--Displayed in a "snack bar" at the bottom of the screen when the app was updated.-->
   <!--Button text of the "snack bar" that is displayed when the app was updated.-->
-  <!--Welcome message-->
-  <string name="welcome_message_title">Selamat datang di K-9 Mail</string>
-  <string name="accounts_welcome"><![CDATA[
-<p>
-K-9 Mail adalah klien email gratis yang hebat untuk Android.
-</p><p>
-Fitur yang disempurnakan meliputi:
-</p>
-<ul>
-<li>Push mail menggunakan IMAP IDLE</li>
-<li>Kinerja yang lebih baik</li>
-<li>Penyempurnaan pesan</li>
-<li>Tanda tangan email</li>
-<li>Bcc-untuk-diri</li>
-<li>Langganan folder</li>
-<li>Semua sinkronisasi folder</li>
-<li>Konfigurasi alamat kembali</li>
-<li>Pintasan keyboard</li>
-<li>Dukungan IMAP lebih baik</li>
-<li>Menyimpan lampiran ke SD</li>
-<li>Sampah kosong</li>
-<li>Penyortiran pesan</li>
-<li>… dan banyak lagi</li>
-</ul>
-<p>
-Harap dicatat bahwa K-9 tidak mendukung sebagian besar akun Hotmail gratis dan, seperti banyak klien email lainnya
-beberapa kebiasaan saat berbicara dengan Microsoft Exchange.
-</p><p>
-Kirimkan laporan bug, kontribusikan fitur baru dan ajukan pertanyaan di
-<a href="https://github.com/k9mail/k-9/">https:/github.com/k9mail/k-9/</a>.</p>
-]]></string>
-  <!--Default signature-->
+    <!--Default signature-->
   <string name="default_signature">-- \nDikirim dari perangkat Android saya menggunakan K-9 Mail.</string>
   <!--General strings that include the app name-->
   <string name="account_delete_dlg_instructions_fmt">Akun \"<xliff:g id="account">%s</xliff:g>\" akan dibuang dari K-9 Mail.</string>
diff --git a/app/ui/legacy/src/main/res/values-is/strings.xml b/app/ui/legacy/src/main/res/values-is/strings.xml
index dd2c9eac7..ea764e065 100644
--- a/app/ui/legacy/src/main/res/values-is/strings.xml
+++ b/app/ui/legacy/src/main/res/values-is/strings.xml
@@ -28,38 +28,7 @@
   <string name="changelog_snackbar_text">Skoðaðu hvað sé nýtt við þessa útgáfu</string>
   <!--Button text of the "snack bar" that is displayed when the app was updated.-->
   <string name="changelog_snackbar_button_text">Skoða</string>
-  <!--Welcome message-->
-  <string name="welcome_message_title">Velkomin í K-9 póstinn</string>
-  <string name="accounts_welcome"><![CDATA[
-<p>
-K-9 Mail er öflugt, frjálst tölvupóstforrit fyrir Android.
-</p><p>
-Meðal bættra eiginleika þess eru:
-</p>
-<ul>
-  <li>Ýtipóstur með IMAP IDLE</li>
-  <li>Betri afköst</li>
-  <li>Endurflokkun skilaboða</li>
-  <li>Meðhöndlun undirskrifta</li>
-  <li>Bcc-til-sjálfs</li>
-  <li>Áskriftir að möppum</li>
-  <li>Samstilling allra mappa</li>
-  <li>Uppsetning svarpóstfangs</li>
-  <li>Flýtilyklar</li>
-  <li>Betri IMAP-stuðningur</li>
-  <li>Vistun viðhengja á SD</li>
-  <li>Tæming á rusli</li>
-  <li>Röðun skilaboða</li>
-  <li>…og margt fleira</li>
-</ul>
-<p>
-Taktu eftir því að K-9 gengur ekki með flestum Hotmail aðgöngum og, rétt eins og mörg önnur tölvupóstforrit, á í nokkrum erfiðleikum með að hafa samskipti við Microsoft Exchange.
-</p><p>
-Sendu inn villuskýrslur, leggðu fram nýja eiginleika og spurðu spurninga á
-<a href="https://github.com/k9mail/k-9/">https://github.com/k9mail/k-9/</a>.
-</p>
-    ]]></string>
-  <!--Default signature-->
+    <!--Default signature-->
   <string name="default_signature">-- \nSent úr Android tækinu mínu með K-9 póstforritinu. Afsakaðu hvað ég stytti mál mitt mikið.</string>
   <!--General strings that include the app name-->
   <string name="account_delete_dlg_instructions_fmt">Aðgangurinn \"<xliff:g id="account">%s</xliff:g>\" verður fjarlægður úr K-9 póstinum.</string>
diff --git a/app/ui/legacy/src/main/res/values-it/strings.xml b/app/ui/legacy/src/main/res/values-it/strings.xml
index a60ab4bae..5c7a6ecaa 100644
--- a/app/ui/legacy/src/main/res/values-it/strings.xml
+++ b/app/ui/legacy/src/main/res/values-it/strings.xml
@@ -28,39 +28,7 @@
   <string name="changelog_snackbar_text">Scopri le novità di questa versione </string>
   <!--Button text of the "snack bar" that is displayed when the app was updated.-->
   <string name="changelog_snackbar_button_text">Vedi</string>
-  <!--Welcome message-->
-  <string name="welcome_message_title">Benvenuto in K-9 Mail</string>
-  <string name="accounts_welcome"><![CDATA[
-<p>
-K-9 Mail è un potente client di posta libero e gratuito per Android.
-</p><p>
-Le sue funzioni migliorate includono:
-</p>
-<ul>
-  <li>Ricezione email push utilizzando IMAP IDLE</li>
-  <li>Migliori prestazioni</li>
-  <li>Ri-archiviazione dei messaggi</li>
-  <li>Firme dei messaggi</li>
-  <li>Auto CCN</li>
-  <li>Sottoscrizioni delle cartelle</li>
-  <li>Sincronizzazione di tutte le cartelle</li>
-  <li>Configurazione dell\'indirizzo di risposta</li>
-  <li>Scorciatoie da tastiera</li>
-  <li>Migliore supporto IMAP</li>
-  <li>Salvataggio degli allegati su SD</li>
-  <li>Svuotamento cestino</li>
-  <li>Ordinamento dei messaggi</li>
-  <li>…e altro</li>
-</ul>
-<p>
-Nota che K-9 non supporta la maggior parte degli account gratuiti Hotmail e, come molti altri client di posta, ha
-qualche problema quando dialoga con Microsoft Exchange.
-</p><p>
-Invia segnalazioni di bug, contribuisci con nuove funzionalità e poni domande su
-<a href="https://github.com/k9mail/k-9/">https://github.com/k9mail/k-9/</a>.
-</p>
-    ]]></string>
-  <!--Default signature-->
+    <!--Default signature-->
   <string name="default_signature">-- \nInviato dal mio dispositivo Android con K-9 Mail. Perdonate la brevità.</string>
   <!--General strings that include the app name-->
   <string name="account_delete_dlg_instructions_fmt">L\'account \"<xliff:g id="account">%s</xliff:g>\" sarà rimosso da K-9 Mail.</string>
diff --git a/app/ui/legacy/src/main/res/values-iw/strings.xml b/app/ui/legacy/src/main/res/values-iw/strings.xml
index 329c60830..c925655ec 100644
--- a/app/ui/legacy/src/main/res/values-iw/strings.xml
+++ b/app/ui/legacy/src/main/res/values-iw/strings.xml
@@ -20,9 +20,7 @@
   <!--Displayed in a "snack bar" at the bottom of the screen when the app was updated.-->
   <string name="changelog_snackbar_text">גלה מה חדש בגירסא זו</string>
   <!--Button text of the "snack bar" that is displayed when the app was updated.-->
-  <!--Welcome message-->
-  <string name="welcome_message_title">ברוך הבא אל דואר K-9</string>
-  <!--Default signature-->
+    <!--Default signature-->
   <string name="default_signature">-- \nנשלח ממכשיר האנדרואיד שלי בעזרת אפליקציית הדואר K-9. סלח לי על הקצרנות.</string>
   <!--General strings that include the app name-->
   <string name="account_delete_dlg_instructions_fmt">החשבון \"<xliff:g id="account">%s</xliff:g>\" יימחק מדואר K-9 .</string>
diff --git a/app/ui/legacy/src/main/res/values-ja/strings.xml b/app/ui/legacy/src/main/res/values-ja/strings.xml
index f2c2ed28d..b672816ab 100644
--- a/app/ui/legacy/src/main/res/values-ja/strings.xml
+++ b/app/ui/legacy/src/main/res/values-ja/strings.xml
@@ -28,39 +28,7 @@
   <string name="changelog_snackbar_text">このリリースは何が新しいのかを知る</string>
   <!--Button text of the "snack bar" that is displayed when the app was updated.-->
   <string name="changelog_snackbar_button_text">表示</string>
-  <!--Welcome message-->
-  <string name="welcome_message_title">K-9 Mailへようこそ</string>
-  <string name="accounts_welcome"><![CDATA[
-<p>
-K-9 Mail は Android 向けの強力なフリーのメールクライアントです。
-</p><p>
-改良された機能:
-</p>
-<ul>
-  <li>IMAP IDLE を利用したプッシュメール</li>
-  <li>パフォーマンス改善</li>
-  <li>メッセージ整理</li>
-  <li>電子メール署名</li>
-  <li>Bcc-to-self</li>
-  <li>フォルダ購読</li>
-  <li>全フォルダ同期</li>
-  <li>返信先の設定</li>
-  <li>キーボードショートカット</li>
-  <li>IMAP サポート改善</li>
-  <li>添付ファイルをSDカードに保存</li>
-  <li>ゴミ箱を空にする機能</li>
-  <li>メッセージのソート</li>
-  <li>…他にもたくさんあります</li>
-</ul>
-<p>
-K-9 は大多数のメールクライアントと同様に、ほとんどのフリー Hotmail アカウントをサポートしていません。
-また、 Microsoft Exchange との通信において少し癖があることに注意してください。 
-</p><p>
-バグレポートや新機能の貢献、質問は <a href="https://github.com/k9mail/k-9/">https://github.com/k9mail/k-9/</a> にお願いします。
-日本語で質問などがある場合は <a href="http://groups.google.co.jp/group/k9mail_ja/">https://groups.google.co.jp/group/k9mail_ja/</a> を参照してください。
-</p>
-]]></string>
-  <!--Default signature-->
+    <!--Default signature-->
   <string name="default_signature">-- \nK-9 Mail で Android デバイスから送信しました。簡単で申し訳ありません。</string>
   <!--General strings that include the app name-->
   <string name="account_delete_dlg_instructions_fmt">アカウント \"<xliff:g id="account">%s</xliff:g>\" はK-9 Mailから削除されます。</string>
diff --git a/app/ui/legacy/src/main/res/values-ko/strings.xml b/app/ui/legacy/src/main/res/values-ko/strings.xml
index 764ff07df..7e1317b05 100644
--- a/app/ui/legacy/src/main/res/values-ko/strings.xml
+++ b/app/ui/legacy/src/main/res/values-ko/strings.xml
@@ -26,8 +26,6 @@
   <!--Displayed in a "snack bar" at the bottom of the screen when the app was updated.-->
   <string name="changelog_snackbar_text">이 릴리즈의 새로운 기능 알아보기</string>
   <!--Button text of the "snack bar" that is displayed when the app was updated.-->
-  <!--Welcome message-->
-  <string name="welcome_message_title">K-9 메일을 사용하시게 된 것을 환영합니다</string>
   <!--Default signature-->
   <string name="default_signature">-- \n안드로이드 기기에서 K-9 메일을 사용해 보낸 메일입니다.</string>
   <!--General strings that include the app name-->
diff --git a/app/ui/legacy/src/main/res/values-lt/strings.xml b/app/ui/legacy/src/main/res/values-lt/strings.xml
index 61d5cd860..66f2fe196 100644
--- a/app/ui/legacy/src/main/res/values-lt/strings.xml
+++ b/app/ui/legacy/src/main/res/values-lt/strings.xml
@@ -27,39 +27,7 @@
   <!--Displayed in a "snack bar" at the bottom of the screen when the app was updated.-->
   <string name="changelog_snackbar_text">Sužinokite, kas naujo šioje versijoje</string>
   <!--Button text of the "snack bar" that is displayed when the app was updated.-->
-  <!--Welcome message-->
-  <string name="welcome_message_title">Sveiki atvykę į K-9 paštą</string>
-  <string name="accounts_welcome"><![CDATA[
-<p>
-K-9 Paštas yra galingas nemokamas Android el. pašto klientas.
-</p><p>
-Patobulintos šios funkcijos:
-</p>
-<ul>
-  <li>Push laiškai naudojant IMAP IDLE</li>
-  <li>Geresnis našumas</li>
-  <li>Laiško pildymas iš naujo</li>
-  <li>Laiškų parašai</li>
-  <li>Bcc-sau</li>
-  <li>Aplankų prenumeratos</li>
-  <li>Visų aplankų sinchronizacija</li>
-  <li>Atgalinio adreso konfigūracija</li>
-  <li>Spartieji klaviatūros klavišai</li>
-  <li>Geresnis IMAP palaikymas</li>
-  <li>Priedų įrašymas į SD</li>
-  <li>Šiukšlinės tuštinimas</li>
-  <li>Laiškų rūšiavimas</li>
-  <li>…ir daugiau</li>
-</ul>
-<p>
-Atkreipkite dėmesį, kad K-9 nepalaiko daugumos nemokamų Hotmail paskyrų ir, kaip ir daugelis pašto klientų, turi
-kai kurių keistenybių bendraujant su Microsoft Exchange.
-</p><p>
-Pateikite pranešimus apie klaidas, prisidėkite prie naujų funkcijų kūrimo ir užduokite klausimus adresu
-<a href="https://github.com/k9mail/k-9/">https://github.com/k9mail/k-9/</a>.
-</p>
-    ]]></string>
-  <!--Default signature-->
+    <!--Default signature-->
   <string name="default_signature">- \nIšsiųsta iš mano Android įrenginio naudojant K-9 Mail. Atleiskite už trumpumą.</string>
   <!--General strings that include the app name-->
   <string name="account_delete_dlg_instructions_fmt">Paskyra \"<xliff:g id="account">%s</xliff:g>\" bus pašalinta iš „K-9 Mail“.</string>
diff --git a/app/ui/legacy/src/main/res/values-lv/strings.xml b/app/ui/legacy/src/main/res/values-lv/strings.xml
index b43ddac74..acec7983a 100644
--- a/app/ui/legacy/src/main/res/values-lv/strings.xml
+++ b/app/ui/legacy/src/main/res/values-lv/strings.xml
@@ -28,38 +28,7 @@
   <string name="changelog_snackbar_text">Uzzināt, kas jauns šajā versijā</string>
   <!--Button text of the "snack bar" that is displayed when the app was updated.-->
   <string name="changelog_snackbar_button_text">Skatīt</string>
-  <!--Welcome message-->
-  <string name="welcome_message_title">Laipni lūdzam K-9 Pastā</string>
-  <string name="accounts_welcome"><![CDATA[
-<p>
-K-9 Mail ir spēcīga bezmaksas e-pasta programma Android operētājsistēmai.
-</p><p>
-Tās uzlaboto iespēju skaitā ir:
-</p>
-<ul>
-  <li>Pasta lejupielādēšana, izmantojot IMAP IDLE</li>
-  <li>Labāka veiktspēja</li>
-  <li>Vēstuļu arhivēšana</li>
-  <li>E-pasta paraksti</li>
-  <li>Bcc-pašam sev</li>
-  <li>Pieteikšanās mapēm</li>
-  <li>Visu mapju sinhronizēšana</li>
-  <li>Atpakaļsūtīšanas adreses iestatīšana</li>
-  <li>Tastatūras īsceļi</li>
-  <li>Labāks IMAP atbalsts</li>
-  <li>Pielikumu saglabāšana uz SD kartes</li>
-  <li>Miskastes iztukšošana</li>
-  <li>Vēstuļu kārtošana</li>
-  <li>…un daudz kas cits</li>
-</ul>
-<p>
-Lūdzu, ņemiet vērā, kā K-9 neatbalsta lielāko daļu bezmaksas Hotmail kontu, un tāpat kā daudzām citām e-pasta programmām tai mēdz būt problēmas ar Microsoft Exchange.
-</p><p>
-Lūdzu, iesniedziet kļūdu ziņojumus, ierosiniet jaunas iespējas un uzdodiet jautājumus
-<a href="https://github.com/k9mail/k-9/">https://github.com/k9mail/k-9/</a>.
-</p>
-    ]]></string>
-  <!--Default signature-->
+    <!--Default signature-->
   <string name="default_signature">-- \nNosūtīts ar K-9 Pastu no manas Android ierīces. Atvainojiet, ka esmu tik kodolīgs.</string>
   <!--General strings that include the app name-->
   <string name="account_delete_dlg_instructions_fmt">Konts \"<xliff:g id="account">%s</xliff:g>\" tiks noņemts no K-9 Pasta.</string>
diff --git a/app/ui/legacy/src/main/res/values-ml/strings.xml b/app/ui/legacy/src/main/res/values-ml/strings.xml
index d769f91ba..9d9a2398c 100644
--- a/app/ui/legacy/src/main/res/values-ml/strings.xml
+++ b/app/ui/legacy/src/main/res/values-ml/strings.xml
@@ -25,38 +25,7 @@
   <!--Displayed in a "snack bar" at the bottom of the screen when the app was updated.-->
   <string name="changelog_snackbar_text">ഈ റിലീസിൽ പുതിയത് എന്താണെന്ന് കണ്ടെത്തുക</string>
   <!--Button text of the "snack bar" that is displayed when the app was updated.-->
-  <!--Welcome message-->
-  <string name="welcome_message_title">കെ-9 മെയിലിലേക്ക് സ്വാഗതം</string>
-  <string name="accounts_welcome"><![CDATA[
-<p>
-കെ-9 മെയിൽ എന്നത് ആൻഡ്രോയിഡിനായുള്ള ഒരു സൗജന്യവും ശക്തവുമായ ഇ-മെയിൽ ക്ലയന്റ് ആണ്.
-</p><p>
-ഇതിന്റെ മെച്ചപ്പെടുത്തിയ സവിശേഷതകളിൽ ഇവ ഉൾപ്പെടുന്നു:
-</p>
-<ul>
-  <li>IMAP IDLE ഉപയോഗിച്ച് മെയിൽ പുഷ് ചെയ്യുക</li>
-  <li>മികച്ച പ്രകടനം</li>
-  <li>സന്ദേശം വീണ്ടും നിറയ്ക്കുന്നു</li>
-  <li>ഇ-മെയിൽ ഒപ്പുകൾ</li>
-  <li>Bcc-to-self</li>
-  <li>ഫോൾഡർ സബ്‌സ്‌ക്രിപ്‌ഷനുകൾ</li>
-  <li>സംയുക്ത ഫോൾഡർ സമന്വയം</li>
-  <li>റിട്ടേൺ-അഡ്രസ് കോൺഫിഗറേഷൻ</li>
-  <li>കീബോർഡ് കുറുക്കുവഴികൾ</li>
-  <li>മികച്ച IMAP പിന്തുണ</li>
-  <li>SD-ലേക്ക് അറ്റാച്ചുമെന്റുകൾ സംരക്ഷിക്കുന്നു</li>
-  <li>ചവറ്റുകുട്ട ശൂന്യമാക്കൽ</li>
-  <li>സന്ദേശം തരംതിരിക്കൽ</li>
-  <li>…കൂടാതെ വേറെയും</li>
-</ul>
-<p>
-മിക്ക സൗജന്യ ഹോട്ട്‌മെയിൽ അക്കൗണ്ടുകളെയും കെ-9 പിന്തുണയ്ക്കുന്നില്ലെന്നും മൈക്രോസോഫ്റ്റ് എക്സ്ചേഞ്ചുമായി ബന്ധപ്പെടുമ്പോൾ പല ഇമെയിൽ ക്ലയന്റുകളെയും പോലെ ചില ബുദ്ധിമുട്ടുകളുണ്ടെന്നും ദയവായി ശ്രദ്ധിക്കുക. 
-</p><p>
-ബഗ് റിപ്പോർട്ടുകൾ സമർപ്പിക്കുക, പുതിയ സവിശേഷതകൾ സംഭാവന ചെയ്യുക, കൂടാതെ ചോദ്യങ്ങൾ ചോദിക്കുക 
-<a href="https://github.com/k9mail/k-9/">https://github.com/k9mail/k-9/</a>.
-</p>
-    ]]></string>
-  <!--Default signature-->
+    <!--Default signature-->
   <string name="default_signature">-- \nകെ-9 മെയിൽ ഉപയോഗിച്ച് എന്റെ ആൻഡ്രോയിഡിൽ നിന്നും അയച്ചത്. ദയവായി എന്റെ പദപ്രയോഗമിതത്വം ക്ഷമിക്കുക.</string>
   <!--General strings that include the app name-->
   <string name="account_delete_dlg_instructions_fmt">കെ-9 മെയിലിൽ നിന്ന്  \"<xliff:g id="account">%s</xliff:g>\" അക്കൗണ്ട് നീക്കംചെയ്യും. </string>
diff --git a/app/ui/legacy/src/main/res/values-nb/strings.xml b/app/ui/legacy/src/main/res/values-nb/strings.xml
index 3fdf1b871..0210019d6 100644
--- a/app/ui/legacy/src/main/res/values-nb/strings.xml
+++ b/app/ui/legacy/src/main/res/values-nb/strings.xml
@@ -20,39 +20,7 @@
   <string name="changelog_recent_changes_title">Hva er nytt?</string>
   <!--Displayed in a "snack bar" at the bottom of the screen when the app was updated.-->
   <!--Button text of the "snack bar" that is displayed when the app was updated.-->
-  <!--Welcome message-->
-  <string name="welcome_message_title">Velkommen til K-9 e-post</string>
-  <string name="accounts_welcome"><![CDATA[
-<p>
-K-9 E-post er en kraftig og fri e-postklient for Android.
-</p><p>
-Dets forbedrede funksjoner inkluderer:
-</p>
-<ul>
-  <li>Push-mail ved bruk av IMAP IDLE</li>
-  <li>Bedre ytelse</li>
-  <li>Rearkivering av meldinger</li>
-  <li>E-postsignaturer</li>
-  <li>Blindkopi ti deg selv</li>
-  <li>Mappeabonnement</li>
-  <li>Synkronisering av alle mapper</li>
-  <li>Returadressekonfigurasjon</li>
-  <li>Tastatursnarveier</li>
-  <li>Bedre IMAP-støtte</li>
-  <li>Lagre vedlegg til SD-kort</li>
-  <li>Tøm søppel</li>
-  <li>Meldingssortering</li>
-  <li>…med mer</li>
-</ul>
-<p>
-Merk at K-9 ikke støtter de fleste gratis Hotmail-kontoer, og har, som mange andre
-e-postklienter, noen problemer med å snakke med Microsoft Exchange.
-</p><p>
-Send feilmeldinger, bidra med nye funksjoner og still spørsmål her:
-<a href="https://github.com/k9mail/k-9/">https://github.com/k9mail/k-9/</a>.
-</p>
-    ]]></string>
-  <!--Default signature-->
+    <!--Default signature-->
   <string name="default_signature">-- \nSendt fra min Android-enhet med K-9 e-post. Unnskyld min kortfattethet.</string>
   <!--General strings that include the app name-->
   <string name="account_delete_dlg_instructions_fmt">Kontoen \"<xliff:g id="account">%s</xliff:g>\" vil bli fjernet fra K-9 e-post</string>
diff --git a/app/ui/legacy/src/main/res/values-nl/strings.xml b/app/ui/legacy/src/main/res/values-nl/strings.xml
index 9891d6127..5afc5fce0 100644
--- a/app/ui/legacy/src/main/res/values-nl/strings.xml
+++ b/app/ui/legacy/src/main/res/values-nl/strings.xml
@@ -28,34 +28,7 @@
   <string name="changelog_snackbar_text">Ontdek wat er nieuw is in deze versie</string>
   <!--Button text of the "snack bar" that is displayed when the app was updated.-->
   <string name="changelog_snackbar_button_text">Bekijken</string>
-  <!--Welcome message-->
-  <string name="welcome_message_title">Welkom bij K-9 Mail</string>
-  <string name="accounts_welcome"><![CDATA[ <p> K-9 Mail is een gratis krachtige e-mailclient voor Android. </p><p> De verbeterde mogelijkheden bestaan ondermeer uit:
-</p>
-<ul>
-<li>Pushmail middels IMAP IDLE</li> 
-<li>Betere prestaties</li> 
-<li>Berichtherclassificatie</li> 
-<li>E-mailhandtekeningen</li> 
-<li>Bcc naar jezelf</li> 
-<li>Mapabonnementen</li> 
-<li>Synchronisatie van alle mappen</li> 
-<li>Antwoordadres instellen</li> 
-<li>Toetsenbordsnelkoppelingen</li> 
-<li>Betere IMAP-ondersteuning</li> 
-<li>Bijlage opslaan naar SD</li> 
-<li>Prullenbak legen</li> 
-<li>Berichten sorteren</li> 
-<li>en meer…</li> 
-</ul> 
-<p> 
-Houd er rekening mee dat K-9 de meeste gratis Hotmail-accounts niet ondersteund, en net als veel e-mailclients, problemen kan hebben om te verbinden met Microsoft Exchange. 
-</p><p> 
-Graag foutrapporten sturen, bijdragen voor nieuwe functies en vragen stellen op 
-<a href="https://github.com/k9mail/k-9/">https://github.com/k9mail/k-9/</a>. 
-</p> 
-]]></string>
-  <!--Default signature-->
+    <!--Default signature-->
   <string name="default_signature">-- \nVerstuurd vanaf mijn Android-apparaat met K-9 Mail.</string>
   <!--General strings that include the app name-->
   <string name="account_delete_dlg_instructions_fmt">De account ‘<xliff:g id="account">%s</xliff:g>’ wordt uit K-9 Mail verwijderd.</string>
diff --git a/app/ui/legacy/src/main/res/values-pl/strings.xml b/app/ui/legacy/src/main/res/values-pl/strings.xml
index 22b388691..b7a9fcc65 100644
--- a/app/ui/legacy/src/main/res/values-pl/strings.xml
+++ b/app/ui/legacy/src/main/res/values-pl/strings.xml
@@ -28,38 +28,7 @@
   <string name="changelog_snackbar_text">Dowiedz się, co nowego w tej wersji</string>
   <!--Button text of the "snack bar" that is displayed when the app was updated.-->
   <string name="changelog_snackbar_button_text">Wyświetl</string>
-  <!--Welcome message-->
-  <string name="welcome_message_title">Witaj w K-9 Mail</string>
-  <string name="accounts_welcome"><![CDATA[
-<p>
-K-9 Mail to darmowy zaawansowany program pocztowy dla systemu Android.
-</p><p>
-Oto niektóre z jego istotnych funkcji:
-</p>
-<ul>
-  <li>Obsługa Push mail z użyciem IMAP IDLE</li>
-  <li>Lepsza wydajność</li>
-  <li>Reorganizowanie wiadomości</li>
-  <li>Podpisy wiadomości e-mail</li>
-  <li>Kopia UDW-do-siebie</li>
-  <li>Subskrybowanie folderów</li>
-  <li>Synchronizowanie wszystkich folderów</li>
-  <li>Konfigurowanie adresu zwrotnego</li>
-  <li>Skróty klawiszowe</li>
-  <li>Lepsza obsługa protokołu IMAP</li>
-  <li>Zapisywanie załączników na karcie SD</li>
-  <li>Opróżnianie kosza</li>
-  <li>Sortowanie wiadomości</li>
-  <li>…i wiele innych</li>
-</ul>
-<p>
-K-9 nie obsługuje większości darmowych kont Hotmail oraz, jak wiele innych programów pocztowych, może być kapryśny przy połączeniach z serwerami Microsoft Exchange.
-</p><p>
-Wszelkie zgłoszenia usterek, zapytania oraz pomysły na nowe funkcje prosimy przesyłać za pośrednictwem strony projektu
-<a href="https://github.com/k9mail/k-9/">https://github.com/k9mail/k-9/</a>.
-</p>
-    ]]></string>
-  <!--Default signature-->
+    <!--Default signature-->
   <string name="default_signature">-- 
 Wysłane z urządzenia Android za pomocą K-9 Mail. Proszę wybaczyć moją zwięzłość.</string>
   <!--General strings that include the app name-->
diff --git a/app/ui/legacy/src/main/res/values-pt-rBR/strings.xml b/app/ui/legacy/src/main/res/values-pt-rBR/strings.xml
index 00283726f..c1ebb3f3b 100644
--- a/app/ui/legacy/src/main/res/values-pt-rBR/strings.xml
+++ b/app/ui/legacy/src/main/res/values-pt-rBR/strings.xml
@@ -28,38 +28,7 @@
   <string name="changelog_snackbar_text">Descubra as novidades dessa versão</string>
   <!--Button text of the "snack bar" that is displayed when the app was updated.-->
   <string name="changelog_snackbar_button_text">Ver</string>
-  <!--Welcome message-->
-  <string name="welcome_message_title">Bem-vindo ao K-9 Mail</string>
-  <string name="accounts_welcome"><![CDATA[
-<p>
-K-9 Mail é um poderoso cliente de e-mails gratuito para Android.
-</p><p>
-Suas funcionalidades incluem:
-</p>
-<ul>
-  <li>Sincronização de e-mail usando IMAP IDLE</li>
-  <li>Performance aprimorada</li>
-  <li>Realocação de mensagens</li>
-  <li>Assinatura de e-mails</li>
-  <li>Cópia oculta para si mesmo</li>
-  <li>Assinatura de pastas</li>
-  <li>Sincronização completa de pastas</li>
-  <li>Configuração de endereço de retorno</li>
-  <li>Atalhos de teclado</li>
-  <li>Suporte aprimorado ao IMAP</li>
-  <li>Salvamento de anexos para o cartão SD</li>
-  <li>Esvaziamento de lixeira</li>
-  <li>Ordenação de mensagens</li>
-  <li>… e mais</li>
-</ul>
-<p>
-Saiba que o K-9 não suporta a maioria das contas gratuitas de Hotmail e, assim como vários outros clientes de e-mail, tem alguns problemas ao conversar com o Microsoft Exchange.
-</p><p>
-Por favor encaminhe relatórios de bugs, contribua com novos recursos e tire dúvidas no
-<a href="https://github.com/k9mail/k-9/">https://github.com/k9mail/k-9/</a>.
-</p>
-]]></string>
-  <!--Default signature-->
+    <!--Default signature-->
   <string name="default_signature">-- \nEnviado de meu dispositivo Android com K-9 mail. Desculpe-me pela brevidade.</string>
   <!--General strings that include the app name-->
   <string name="account_delete_dlg_instructions_fmt">A conta \"<xliff:g id="account">%s</xliff:g>\" será removida do K-9 Mail.</string>
diff --git a/app/ui/legacy/src/main/res/values-pt-rPT/strings.xml b/app/ui/legacy/src/main/res/values-pt-rPT/strings.xml
index 213db22f8..90aa9ae51 100644
--- a/app/ui/legacy/src/main/res/values-pt-rPT/strings.xml
+++ b/app/ui/legacy/src/main/res/values-pt-rPT/strings.xml
@@ -28,39 +28,7 @@
   <string name="changelog_snackbar_text">Descubra o que há de novo nesta versão</string>
   <!--Button text of the "snack bar" that is displayed when the app was updated.-->
   <string name="changelog_snackbar_button_text">Ver</string>
-  <!--Welcome message-->
-  <string name="welcome_message_title">Bem-vindo ao K-9 Mail</string>
-  <string name="accounts_welcome"><![CDATA[
-<p>
-O K-9 Mail é um poderoso cliente de email grátis para o Android.
-</p><p>
-As suas funcionalidades melhoradas incluem:
-</p>
-<ul>
-<li>Push de email usando IMAP IDLE</li>
-<li>Melhor performance</li>
-<li>Relocação de mensagens</li>
-<li>Assinaturas de email</li>
-<li>Bcc para o próprio</li>
-<li>Subscrição de pastas</li>
-<li>Sincronização de todas as pastas</li>
-<li>Configuração de endereço de retorno</li>
-<li>Atalhos de teclado</li>
-<li>Melhor suporte IMAP</li>
-<li>Guardar anexos para o cartão SD</li>
-<li>Esvaziar lixo</li>
-<li>Ordenação de mensagens</li>
-<li>…e mais</li>
-</ul>
-<p>
-Por favor note que o K-9 não suporta a maioria das contas gratuitas do Hotmail e, como muitos clientes de email 
-tem alguns problemas ao comunicar com o Microsoft Exchange.
-</p><p>
-Por favor envie relatórios de falhas, contribua com novas funcionalidades e coloque as suas dúvidas em
-<a href="https://github.com/k9mail/k-9/">https://github.com/k9mail/k-9/</a>.
-</p>
-]]></string>
-  <!--Default signature-->
+    <!--Default signature-->
   <string name="default_signature">-- \nEnviado a partir do meu dispositivo Android com o K-9 Mail. Peço desculpa pela brevidade.</string>
   <!--General strings that include the app name-->
   <string name="account_delete_dlg_instructions_fmt">A conta \"<xliff:g id="account">%s</xliff:g>\" será removida do K-9 Mail.</string>
diff --git a/app/ui/legacy/src/main/res/values-ro/strings.xml b/app/ui/legacy/src/main/res/values-ro/strings.xml
index 046c1038a..6abddbd7d 100644
--- a/app/ui/legacy/src/main/res/values-ro/strings.xml
+++ b/app/ui/legacy/src/main/res/values-ro/strings.xml
@@ -27,38 +27,7 @@
   <!--Displayed in a "snack bar" at the bottom of the screen when the app was updated.-->
   <string name="changelog_snackbar_text">Aflați ce este nou în această versiune</string>
   <!--Button text of the "snack bar" that is displayed when the app was updated.-->
-  <!--Welcome message-->
-  <string name="welcome_message_title">Bun venit la K-9 Mail</string>
-  <string name="accounts_welcome"><![CDATA[
-<p>
-K-9 Mail este un client puternic și gratuit de email pentru Android.
-</p><p>
-Facilitățile sale îmbunătățite includ:
-</p>
-<ul>
-<li>Push mail folosind IMAP IDLE</li>
-<li>Performanță mai bună</li>
-<li>Reciclare mesaje</li>
-<li>Semnături email</li>
-<li>Bcc-către-sine</li>
-<li>Abonare dosare</li>
-<li>Sincronizarea tuturor dosarelor</li>
-<li>Adrese de răspuns configurabile</li>
-<li>Scurtături tastatură</li>
-<li>Suport IMAP mai bun</li>
-<li>Salvare atașamente pe cardul SD</li>
-<li>Golire Coș de gunoi</li>
-<li>Sortare mesaje</li>
-<li>…și multe altele</li>
-</ul>
-<p>
-Rețineți, K-9 nu oferă suport pentru mare parte din conturile gratuite de Hotmail și, precum alți clienți de email, poate avea dificultăți cînd se conectează la Microsoft Exchange.
-</p><p>
-Vă rugăm să ne raportați defecte, să contribuiți cu funcționalități noi sau să puneți întrebări la
-<a href="https://github.com/k9mail/k-9/">https://github.com/k9mail/k-9/</a>.
-</p>
-]]></string>
-  <!--Default signature-->
+    <!--Default signature-->
   <string name="default_signature">-- \nTrimis de pe dispozitivul meu Android cu K-9 Mail. Rog scuzați mesajul scurt.</string>
   <!--General strings that include the app name-->
   <string name="account_delete_dlg_instructions_fmt">Contul \"<xliff:g id="account">%s</xliff:g>\" va fi șters din K-9 Mail.</string>
diff --git a/app/ui/legacy/src/main/res/values-ru/strings.xml b/app/ui/legacy/src/main/res/values-ru/strings.xml
index 7ad655b5b..debdc15a8 100644
--- a/app/ui/legacy/src/main/res/values-ru/strings.xml
+++ b/app/ui/legacy/src/main/res/values-ru/strings.xml
@@ -28,38 +28,7 @@
   <string name="changelog_snackbar_text">Узнайте, что нового в этом выпуске</string>
   <!--Button text of the "snack bar" that is displayed when the app was updated.-->
   <string name="changelog_snackbar_button_text">Показать</string>
-  <!--Welcome message-->
-  <string name="welcome_message_title">Добро пожаловать!</string>
-  <string name="accounts_welcome"><![CDATA[
-<p>
-K-9 Mail — почтовик для Android.
-</p><p>
-Возможности:
-</p>
-<ul>
-  <li>всплывающие уведомления,</li>
-  <li>быстрая работа,</li>
-  <li>перемещение сообщений,</li>
-  <li>несколько подписей,</li>
-  <li>скрытая копия себе,</li>
-  <li>подписка на папки,</li>
-  <li>синхронизация всех папок,</li>
-  <li>адрес для ответа,</li>
-  <li>горячие клавиши,</li>
-  <li>улучшенная поддержка IMAP,</li>
-  <li>сохранение вложений,</li>
-  <li>очистка корзины,</li>
-  <li>упорядочивание сообщений,</li>
-  <li>…и многие другие!</li>
-</ul>
-<p>
-Пожалуйста, обратите внимание, что K-9 Mail не поддерживает большинство бесплатных учётных записей Hotmail также, как и большинство почтовиков, и имеет некоторые ограничения при работе с MS Exchange .
-</p><p>
-Вопросы, сообщения об ошибках и участие в разработке:
-<a href="https://github.com/k9mail/k-9/">https://github.com/k9mail/k-9/</a>.
-</p>
-    ]]></string>
-  <!--Default signature-->
+    <!--Default signature-->
   <string name="default_signature">-- \nПростите за краткость, создано в K-9 Mail.</string>
   <!--General strings that include the app name-->
   <string name="account_delete_dlg_instructions_fmt">Учётная запись «<xliff:g id="account">%s</xliff:g>» будет удалена из приложения K-9 Mail.</string>
diff --git a/app/ui/legacy/src/main/res/values-sk/strings.xml b/app/ui/legacy/src/main/res/values-sk/strings.xml
index 78c865ef0..b86f8dd65 100644
--- a/app/ui/legacy/src/main/res/values-sk/strings.xml
+++ b/app/ui/legacy/src/main/res/values-sk/strings.xml
@@ -22,39 +22,7 @@
   <string name="changelog_version_title">Verzia %s</string>
   <!--Displayed in a "snack bar" at the bottom of the screen when the app was updated.-->
   <!--Button text of the "snack bar" that is displayed when the app was updated.-->
-  <!--Welcome message-->
-  <string name="welcome_message_title">Vitajte v K-9 Mail</string>
-  <string name="accounts_welcome"><![CDATA[
-<p>
-K-9 Mail je výkonný a slobodný e-mailový klient pre Android.
-</p><p>
-Medzi jeho vylepšené funkcie patria:
-</p>
-<ul>
-<li>Push pošta pri použití IMAP IDLE</li>
-<li>Lepší výkon</li>
-<li>Doplňovanie správ</li>
-<li>Podpisy správ</li>
-<li>Skrytá kópia sebe</li>
-<li>Odbery priečinkov</li>
-<li>Synchronizácia všetkých priečinkov</li>
-<li>Nastavenie spiatočnej adresy</li>
-<li>Klávesové skratky</li>
-<li>Lepšia podpora IMAP protokolu</li>
-<li>Ukladanie príloh na SD kartu</li>
-<li>Vyprázdňovanie koša</li>
-<li>Zoraďovanie správ</li>
-<li>…a ďalšie</li>
-</ul>
-<p>
-Prosím, vezmite na vedomie, že K-9 Mail nepodporuje väčšinu bezplatných účtov služby Hotmail a ako mnoho ďalších e-mailových klientov
-vykazuje isté zvláštnosti pri komunikácii s Microsoft Exchange.
-</p><p>
-Prosím, nahlasujte prípadné chyby, prispievajte novými funkciami a pýtajte sa na
-<a href="https://github.com/k9mail/k-9/">https://github.com/k9mail/k-9/</a>.
-</p>
-]]></string>
-  <!--Default signature-->
+    <!--Default signature-->
   <string name="default_signature">-- \nOdoslané z môjho Android zariadenia prostredníctvom K-9 Mail. Prosím, ospravedlňte moju stručnosť.</string>
   <!--General strings that include the app name-->
   <string name="account_delete_dlg_instructions_fmt">Účet \"<xliff:g id="account">%s</xliff:g>\" bude odstránený z K-9 Mail.</string>
diff --git a/app/ui/legacy/src/main/res/values-sl/strings.xml b/app/ui/legacy/src/main/res/values-sl/strings.xml
index bae7cc923..3a2a05e0d 100644
--- a/app/ui/legacy/src/main/res/values-sl/strings.xml
+++ b/app/ui/legacy/src/main/res/values-sl/strings.xml
@@ -27,38 +27,7 @@
   <!--Displayed in a "snack bar" at the bottom of the screen when the app was updated.-->
   <string name="changelog_snackbar_text">Kaj je novega v tej izdaji</string>
   <!--Button text of the "snack bar" that is displayed when the app was updated.-->
-  <!--Welcome message-->
-  <string name="welcome_message_title">Dobrodošli v K-9 Mail</string>
-  <string name="accounts_welcome"><![CDATA[
-<p>
-K-9 Mail je zmogljiv brezplačni odjemalec elektronske pošte za okolje Android.
-</p><p>
-Podpira različne storitve, kot so:
-</p>
-<ul>
-  <li>potisno pošiljanje pošte z uporabo IMAP IDLE</li>
-  <li>hitro in odzivno delovanje</li>
-  <li>prerazporejanje sporočil</li>
-  <li>podpora različnim podpisom sporočila</li>
-  <li>slepa povratnica poslanega sporočila</li>
-  <li>prilagajanje prikazovanja map</li>
-  <li>izbirno usklajevanje</li>
-  <li>nastavljanje poljubnega povratnega naslova</li>
-  <li>tipkovne bližnjice</li>
-  <li>izboljšana podpora protokolu IMAP</li>
-  <li>podpora shranjevanja prilog na kartico SD</li>
-  <li>prilagojeno praznjenje smeti</li>
-  <li>različne možnosti razvrščanja sporočil</li>
-  <li>… in še mnogo več.</li>
-</ul>
-<p>
-Program K-9 Mail ne podpira brezplačnih računov Hotmail in ima (kot tudi mnogo drugih odjemalcev) nekaj težav s podporo Microsoft Exchange.
-</p><p>
-Poročila o napakah, predloge za nove funkcije in vprašanja lahko pošljete na
-<a href="https://github.com/k9mail/k-9/">https://github.com/k9mail/k-9/</a>.
-</p>
-    ]]></string>
-  <!--Default signature-->
+    <!--Default signature-->
   <string name="default_signature">-- \nPoslano s programom K-9 Mail.</string>
   <!--General strings that include the app name-->
   <string name="account_delete_dlg_instructions_fmt">Račun »<xliff:g id="account">%s</xliff:g>« bo odstranjen iz programa.</string>
diff --git a/app/ui/legacy/src/main/res/values-sq/strings.xml b/app/ui/legacy/src/main/res/values-sq/strings.xml
index 5604c3c31..38a052ce1 100644
--- a/app/ui/legacy/src/main/res/values-sq/strings.xml
+++ b/app/ui/legacy/src/main/res/values-sq/strings.xml
@@ -28,39 +28,7 @@
   <string name="changelog_snackbar_text">Mësoni ç\’ka të re në këtë hedhje në qarkullim</string>
   <!--Button text of the "snack bar" that is displayed when the app was updated.-->
   <string name="changelog_snackbar_button_text">Shiheni</string>
-  <!--Welcome message-->
-  <string name="welcome_message_title">Mirë se vini te K-9 Mail</string>
-  <string name="accounts_welcome"><![CDATA[
-<p>
-K-9 Mail është një klient email-esh i lirë, për Android.
-</p><p>
-Në veçoritë e tij të përmirësuara përfshihen:
-</p>
-<ul>
-  <li>Dërgim push duke përdorur IMAP IDLE</li>
-  <li>Punim më i mirë</li>
-  <li>Riskedarizim mesazhesh</li>
-  <li>Nënshkrime email-esh</li>
-  <li>Bcc-për vetveten</li>
-  <li>Pajtime në dosje</li>
-  <li>Njëkohësim për krejt dosjet</li>
-  <li>Formësim adrese për kthime</li>
-  <li>Shkurtore tastiere</li>
-  <li>Mbulim më të mirë të IMAP-it</li>
-  <li>Ruajtje bashkëngjitjesh në SD</li>
-  <li>Zbrazje Hedhurinash</li>
-  <li>Renditje mesazhesh</li>
-  <li>…dhe të tjera</li>
-</ul>
-<p>
-Ju lutemi, mbani parasysh që K-9 nuk mbulon shumicën e llogarive falas Hotmail dhe, ashtu si mjaft klientë email-i, ka disa yçkla
-kur komunikon me një shërbyes Microsoft Exchange.
-</p><p>
-Ju lutemi, parashtrim njoftimesh për të meta, kontribute për veçori të reaj dhe pyetjet bëjini te
-<a href="https://github.com/k9mail/k-9/">https://github.com/k9mail/k-9/</a>.
-</p>
-    ]]></string>
-  <!--Default signature-->
+    <!--Default signature-->
   <string name="default_signature">-- \nDërguar nga pajisja ime Android, me K-9 Mail. Ju lutem, më ndjeni për shkurtësinë.</string>
   <!--General strings that include the app name-->
   <string name="account_delete_dlg_instructions_fmt">Llogaria \“<xliff:g id="account">%s</xliff:g>\” do të hiqet që nga K-9 Mail.</string>
diff --git a/app/ui/legacy/src/main/res/values-sr/strings.xml b/app/ui/legacy/src/main/res/values-sr/strings.xml
index 5e324d40e..eae894f48 100644
--- a/app/ui/legacy/src/main/res/values-sr/strings.xml
+++ b/app/ui/legacy/src/main/res/values-sr/strings.xml
@@ -22,38 +22,7 @@
   <string name="changelog_version_title">Верзија %s</string>
   <!--Displayed in a "snack bar" at the bottom of the screen when the app was updated.-->
   <!--Button text of the "snack bar" that is displayed when the app was updated.-->
-  <!--Welcome message-->
-  <string name="welcome_message_title">Добро дошли у К-9 Пошту</string>
-  <string name="accounts_welcome"><![CDATA[
-<p>
-К-9 Пошта је моћан слободни клијент е-поште за Андроид.
-</p><p>
-Побољшане могућности укључују:
-</p>
-<ul>
-  <li>Прослеђивање поште користећи IMAP IDLE</li>
-  <li>Боље преформансе</li>
-  <li>Реархивисање порука</li>
-  <li>Потписи е-порука</li>
-  <li>Бцц себи</li>
-  <li>Претплате на фасцикле</li>
-  <li>Синхронизација свих фасцикли</li>
-  <li>Подешавање повратне адресе</li>
-  <li>Пречице тастатуре</li>
-  <li>Боља подршка за IMAP</li>
-  <li>Упис прилога на СД картицу</li>
-  <li>Пражњење отпада</li>
-  <li>Ређање порука</li>
-  <li>…и још тога</li>
-</ul>
-<p>
-Имајте на уму да К-9 не подржава већину бесплатних Хотмејл налога и, као и многи клијенти, има проблема при контакту са Мајкрософтовом Разменом.
-</p><p>
-Пријављујте грешке, доприносите нове могућности и постављајте питања на
-<a href="https://github.com/k9mail/k-9/">https://github.com/k9mail/k-9/</a>.
-</p>
-]]></string>
-  <!--Default signature-->
+    <!--Default signature-->
   <string name="default_signature">-- \nПослато К-9 Поштом са мог Андроид уређаја. Извините због сажетости.</string>
   <!--General strings that include the app name-->
   <string name="account_delete_dlg_instructions_fmt">Налог „<xliff:g id="account">%s</xliff:g>“ ће бити уклоњен из К-9 Поште.</string>
diff --git a/app/ui/legacy/src/main/res/values-sv/strings.xml b/app/ui/legacy/src/main/res/values-sv/strings.xml
index ddc9edbde..1ce3aaec9 100644
--- a/app/ui/legacy/src/main/res/values-sv/strings.xml
+++ b/app/ui/legacy/src/main/res/values-sv/strings.xml
@@ -28,38 +28,7 @@
   <string name="changelog_snackbar_text">Ta reda på vad som är nytt i denna utgåva</string>
   <!--Button text of the "snack bar" that is displayed when the app was updated.-->
   <string name="changelog_snackbar_button_text">Visa</string>
-  <!--Welcome message-->
-  <string name="welcome_message_title">Välkommen till K-9 Mail</string>
-  <string name="accounts_welcome"><![CDATA[
-<p>
-K-9 Mail är en kraftfull fri e-postklient för Android.
-</p><p>
-Några av funktionerna som förbättrats är:
-</p>
-<ul>
-  <li>Push-e-post med IMAP IDLE</li>
-  <li>Bättre prestanda</li>
-  <li>Meddelandelagring</li>
-  <li>E-postsignaturer</li>
-  <li>Blindkopia-till-dig-själv</li>
-  <li>Mapprenumerationer</li>
-  <li>Synkronisera alla mappar</li>
-  <li>Inställning av svarsadress</li>
-  <li>Tangentbordsgenvägar</li>
-  <li>Bättre stöd för IMAP</li>
-  <li>Spara bilagor till minneskort</li>
-  <li>Tömma papperskorgen</li>
-  <li>Meddelandesortering</li>
-  <li>…och mycket annat</li>
-</ul>
-<p>
-Observera att K-9 inte stöder gratiskonton på Hotmail och har, som så många andra e-postklienter, några svårigheter att prata med Microsoft Exchange.
-</p><p>
-Skicka in felrapporter, bidra med nya funktioner och ställ frågor på 
-<a href="https://github.com/k9mail/k-9/">https://github.com/k9mail/k-9/</a>.
-</p>
-    ]]></string>
-  <!--Default signature-->
+    <!--Default signature-->
   <string name="default_signature">-- \nSkickat från min Android-enhet med K-9 Mail. Ursäkta min korthet.</string>
   <!--General strings that include the app name-->
   <string name="account_delete_dlg_instructions_fmt">Kontot \"<xliff:g id="account">%s</xliff:g>\" kommer att tas bort från K-9 Mail.</string>
diff --git a/app/ui/legacy/src/main/res/values-tr/strings.xml b/app/ui/legacy/src/main/res/values-tr/strings.xml
index 1909bfd3b..537b09060 100644
--- a/app/ui/legacy/src/main/res/values-tr/strings.xml
+++ b/app/ui/legacy/src/main/res/values-tr/strings.xml
@@ -27,38 +27,7 @@
   <!--Displayed in a "snack bar" at the bottom of the screen when the app was updated.-->
   <string name="changelog_snackbar_text">Bu sürümdeki yenilikleri öğrenin </string>
   <!--Button text of the "snack bar" that is displayed when the app was updated.-->
-  <!--Welcome message-->
-  <string name="welcome_message_title">K-9 Posta\'ya Hoşgeldiniz</string>
-  <string name="accounts_welcome"><![CDATA[
-<p>
-K-9 Posta, Android için güçlü ve özgür bir e-posta istemcisidir.
-</p><p>
-Geliştirilmiş özellikler içerir:
-</p>
-<ul>
-<li>IMAP IDLE kullanılarak gelen posta anında gösteriliyor</li>
-<li>Daha iyi başarım</li>
-<li>İletiye tekrar işlem</li>
-<li>E-posta imzaları</li>
-<li>Bcc-to-self</li>
-<li>Klasör kayıtları</li>
-<li>Tüm klasörler eşzamanlanır</li>
-<li>Yanıt adresi yapılandırması</li>
-<li>Klavye kısayolları</li>
-<li>Daha iyi IMAP desteği</li>
-<li>Eklentileri SD karta kaydetme</li>
-<li>Çöpü Boşalt</li>
-<li>İleti sıralama</li>
-<li>…ve daha fazlası</li>
-</ul>
-<p>
-K-9\'un çoğu ücretsiz Hotmail hesabını desteklemediğini ve pek çok e-posta istemcisi gibi
-Microsoft Exchange ile konuşurken kimi tuhaflıklar yaşadığını lütfen aklınızın bir köşesine yazın.
-</p><p>Lütfen yeni özelliklere katkıda bulunmak ve soru sormak için hata raporu bildiriniz
-<a href="https://github.com/k9mail/k-9/">https://github.com/k9mail/k-9/</a>.
-</p>
- ]]></string>
-  <!--Default signature-->
+    <!--Default signature-->
   <string name="default_signature">-- \nAndroid için K-9 Posta\'dan gönderildi. Lütfen bu kısa notumu mazur görün.</string>
   <!--General strings that include the app name-->
   <string name="account_delete_dlg_instructions_fmt">Hesap \"<xliff:g id="account">%s</xliff:g>\" K-9 Mail\'den kaldırılacak.</string>
diff --git a/app/ui/legacy/src/main/res/values-uk/strings.xml b/app/ui/legacy/src/main/res/values-uk/strings.xml
index 2fa202093..b9059c4b2 100644
--- a/app/ui/legacy/src/main/res/values-uk/strings.xml
+++ b/app/ui/legacy/src/main/res/values-uk/strings.xml
@@ -28,39 +28,7 @@
   <string name="changelog_snackbar_text">Дізнатися, що нового у цьому релізі</string>
   <!--Button text of the "snack bar" that is displayed when the app was updated.-->
   <string name="changelog_snackbar_button_text">Показати</string>
-  <!--Welcome message-->
-  <string name="welcome_message_title">Ласкаво просимо до K-9 Mail</string>
-  <string name="accounts_welcome"><![CDATA[
-<p>
-K-9 Mail — це вільний клієнт електронної пошти для Android з багатьма можливостями.
-</p><p>
-Його найкращі можливості:
-</p>
-<ul>
-  <li>Миттєва пошта з використанням IMAP IDLE</li>
-  <li>Краща продуктивність</li>
-  <li>Відповіді і пересилання повідомлень</li>
-  <li>Підписи у електронних листах</li>
-  <li>Прихована копія собі</li>
-  <li>Підписка на певні теки</li>
-  <li>Синхронізація всіх тек</li>
-  <li>Налаштування адреси для відповіді</li>
-  <li>Клавіатурні скорочення</li>
-  <li>Покращена підтримка IMAP</li>
-  <li>Збереження вкладень на SD-карту</li>
-  <li>Очищення кошика</li>
-  <li>Сортування повідомлень</li>
-  <li>…і більше</li>
-</ul>
-<p>
-Зверніть увагу, що K-9 не підтримує більшість безкоштовних облікових записів Hotmail, а також, як і багато поштових програм, виявляє
-деякі дивацтва при роботі з Microsoft Exchange.
-</p><p>
-Будь ласка, звітуйте про недоліки, пропонуйте нові можливості та задавайте запитання на
-<a href="https://github.com/k9mail/k-9/">https://github.com/k9mail/k-9/</a>.
-</p>
-    ]]></string>
-  <!--Default signature-->
+    <!--Default signature-->
   <string name="default_signature">-- \nВідправлено з мого Android-пристрою за допомогою додатка K-9 Mail. Вибачте за стислість.</string>
   <!--General strings that include the app name-->
   <string name="account_delete_dlg_instructions_fmt">Обліковий запис \"<xliff:g id="account">%s</xliff:g>\" буде вилучено з K-9 Mail.</string>
diff --git a/app/ui/legacy/src/main/res/values-zh-rCN/strings.xml b/app/ui/legacy/src/main/res/values-zh-rCN/strings.xml
index 086f61bd0..432862fd2 100644
--- a/app/ui/legacy/src/main/res/values-zh-rCN/strings.xml
+++ b/app/ui/legacy/src/main/res/values-zh-rCN/strings.xml
@@ -28,39 +28,7 @@
   <string name="changelog_snackbar_text">了解此版本的新增功能</string>
   <!--Button text of the "snack bar" that is displayed when the app was updated.-->
   <string name="changelog_snackbar_button_text">查看</string>
-  <!--Welcome message-->
-  <string name="welcome_message_title">欢迎使用 K-9 Mail</string>
-  <string name="accounts_welcome"><![CDATA[
-<p>
-K-9 Mail 是 Android 上一款功能强大的免费邮件客户端。
-</p><p>
-其改进的功能包括：
-</p>
-<ul>
-  <li>支持通过 IMAP IDLE 推送邮件</li>
-  <li>更好的性能</li>
-  <li>消息归档</li>
-  <li>邮件签名</li>
-  <li>密送自己</li>
-  <li>邮件夹订阅</li>
-  <li>同步所有邮件夹</li>
-  <li>回复地址配置</li>
-  <li>快捷键</li>
-  <li>更好的 IMAP 支持</li>
-  <li>保存附件到 SD 卡</li>
-  <li>清空回收站</li>
-  <li>消息排序</li>
-  <li>以及更多…</li>
-</ul>
-<p>
-请注意 K-9 不支持大部分免费 Hotmail 账户，而且和其他大部分邮件客户端一样，
-在使用 Microsoft Exchange 协议时会有一些问题。
-</p><p>
-请到下述网址提交问题报告，新功能建议或者提问：
-<a href="https://github.com/k9mail/k-9/">https://github.com/k9mail/k-9/</a>。
-</p>
-    ]]></string>
-  <!--Default signature-->
+    <!--Default signature-->
   <string name="default_signature">-- \n使用 K-9 Mail 发送自我的Android设备。</string>
   <!--General strings that include the app name-->
   <string name="account_delete_dlg_instructions_fmt">即将从 K-9 Mail 中移除账户“<xliff:g id="account">%s</xliff:g>”。</string>
diff --git a/app/ui/legacy/src/main/res/values-zh-rTW/strings.xml b/app/ui/legacy/src/main/res/values-zh-rTW/strings.xml
index b81fb7c36..d864c41e3 100644
--- a/app/ui/legacy/src/main/res/values-zh-rTW/strings.xml
+++ b/app/ui/legacy/src/main/res/values-zh-rTW/strings.xml
@@ -28,39 +28,7 @@
   <string name="changelog_snackbar_text">了解此版本的新增功能</string>
   <!--Button text of the "snack bar" that is displayed when the app was updated.-->
   <string name="changelog_snackbar_button_text">檢視</string>
-  <!--Welcome message-->
-  <string name="welcome_message_title">歡迎使用 K-9 Mail</string>
-  <string name="accounts_welcome"><![CDATA[
-<p>
-K-9 Mail 是 Android 上一款功能強大，免費的電子郵件用戶端。
-</p><p>
-其改進的功能包括：
-</p>
-<ul>
-  <li>支援 IMAP IDLE 指令推送郵件</li>
-  <li>更好的性能</li>
-  <li>訊息重新轉寄封存</li>
-  <li>郵件簽名</li>
-  <li>密件副本寄送給自己</li>
-  <li>信件匣訂閱</li>
-  <li>同步所有信件匣</li>
-  <li>回覆地址設定</li>
-  <li>快速鍵</li>
-  <li>更好的 IMAP 支援</li>
-  <li>儲存附件至 SD 卡</li>
-  <li>清空垃圾桶</li>
-  <li>訊息排序</li>
-  <li>…以及更多</li>
-</ul>
-<p>
-請注意 K-9 不支援大部分免費 Hotmail 帳號，而且和其他大部分郵件客戶端一樣，
-在使用 Microsoft Exchange 協定時會有一些問題。
-</p><p>
-請到下述網址提交問題報告，新功能建議或者提問：
-<a href="https://github.com/k9mail/k-9/">https://github.com/k9mail/k-9/</a>.
-</p>
-    ]]></string>
-  <!--Default signature-->
+    <!--Default signature-->
   <string name="default_signature">-- \n使用 K-9 Mail 寄送。來自我的 Android 裝置。</string>
   <!--General strings that include the app name-->
   <string name="account_delete_dlg_instructions_fmt">帳號「<xliff:g id="account">%s</xliff:g>」將從 K-9 Mail 中刪除。</string>
diff --git a/app/ui/legacy/src/main/res/values/strings.xml b/app/ui/legacy/src/main/res/values/strings.xml
index 55a1e161e..8e1e5b943 100644
--- a/app/ui/legacy/src/main/res/values/strings.xml
+++ b/app/ui/legacy/src/main/res/values/strings.xml
@@ -35,40 +35,6 @@
     <string name="changelog_snackbar_button_text">View</string>
 
 
-    <!-- Welcome message -->
-    <string name="welcome_message_title">Welcome to K-9 Mail</string>
-    <string name="accounts_welcome"><![CDATA[
-<p>
-K-9 Mail is a powerful free email client for Android.
-</p><p>
-Its improved features include:
-</p>
-<ul>
-  <li>Push mail using IMAP IDLE</li>
-  <li>Better performance</li>
-  <li>Message refiling</li>
-  <li>Email signatures</li>
-  <li>Bcc-to-self</li>
-  <li>Folder subscriptions</li>
-  <li>All folder synchronization</li>
-  <li>Return-address configuration</li>
-  <li>Keyboard shortcuts</li>
-  <li>Better IMAP support</li>
-  <li>Saving attachments to SD</li>
-  <li>Empty Trash</li>
-  <li>Message sorting</li>
-  <li>…and more</li>
-</ul>
-<p>
-Please note that K-9 does not support most free Hotmail accounts and, like many mail clients, has
-some quirks when talking to Microsoft Exchange.
-</p><p>
-Please submit bug reports, contribute new features and ask questions at
-<a href="https://github.com/k9mail/k-9/">https://github.com/k9mail/k-9/</a>.
-</p>
-    ]]></string>
-
-
     <!-- Default signature -->
     <string name="default_signature">-- \nSent from my Android device with K-9 Mail. Please excuse my brevity.</string>