diff --git a/k9mail/src/main/java/com/fsck/k9/K9.java b/k9mail/src/main/java/com/fsck/k9/K9.java
index 6f9c5a9eb..0815a2dde 100644
--- a/k9mail/src/main/java/com/fsck/k9/K9.java
+++ b/k9mail/src/main/java/com/fsck/k9/K9.java
@@ -106,7 +106,6 @@ public class K9 extends Application {
         ALWAYS, NEVER, WHEN_CHECKED_AUTO_SYNC
     }
 
-    private static String language = "";
     private static Theme theme = Theme.LIGHT;
     private static Theme messageViewTheme = Theme.USE_GLOBAL;
     private static Theme composerTheme = Theme.USE_GLOBAL;
@@ -473,7 +472,6 @@ public class K9 extends Application {
         editor.putString("openPgpProvider", sOpenPgpProvider);
         editor.putBoolean("openPgpSupportSignOnly", sOpenPgpSupportSignOnly);
 
-        editor.putString("language", language);
         editor.putInt("theme", theme.ordinal());
         editor.putInt("messageViewTheme", messageViewTheme.ordinal());
         editor.putInt("messageComposeTheme", composerTheme.ordinal());
@@ -777,8 +775,6 @@ public class K9 extends Application {
         sPgpInlineDialogCounter = storage.getInt("pgpInlineDialogCounter", 0);
         sPgpSignOnlyDialogCounter = storage.getInt("pgpSignOnlyDialogCounter", 0);
 
-        K9.setK9Language(storage.getString("language", ""));
-
         int themeValue = storage.getInt("theme", Theme.LIGHT.ordinal());
         // We used to save the resource ID of the theme. So convert that to the new format if
         // necessary.
@@ -834,14 +830,6 @@ public class K9 extends Application {
         }
     }
 
-    public static String getK9Language() {
-        return language;
-    }
-
-    public static void setK9Language(String nlanguage) {
-        language = nlanguage;
-    }
-
     /**
      * Possible values for the different theme settings.
      *
diff --git a/k9mail/src/main/java/com/fsck/k9/activity/K9ActivityCommon.java b/k9mail/src/main/java/com/fsck/k9/activity/K9ActivityCommon.java
index 7698983a8..f87bd0e9f 100644
--- a/k9mail/src/main/java/com/fsck/k9/activity/K9ActivityCommon.java
+++ b/k9mail/src/main/java/com/fsck/k9/activity/K9ActivityCommon.java
@@ -1,13 +1,8 @@
 package com.fsck.k9.activity;
 
-import java.util.Locale;
 
 import android.app.Activity;
-import android.content.Context;
-import android.content.res.Configuration;
-import android.content.res.Resources;
 import android.content.res.TypedArray;
-import android.text.TextUtils;
 import android.view.GestureDetector;
 import android.view.MotionEvent;
 
@@ -36,23 +31,6 @@ public class K9ActivityCommon {
         return new K9ActivityCommon(activity);
     }
 
-    public static void setLanguage(Context context, String language) {
-        Locale locale;
-        if (TextUtils.isEmpty(language)) {
-            locale = Locale.getDefault();
-        } else if (language.length() == 5 && language.charAt(2) == '_') {
-            // language is in the form: en_US
-            locale = new Locale(language.substring(0, 2), language.substring(3));
-        } else {
-            locale = new Locale(language);
-        }
-
-        Resources resources = context.getResources();
-        Configuration config = resources.getConfiguration();
-        config.locale = locale;
-        resources.updateConfiguration(config, resources.getDisplayMetrics());
-    }
-
 
     /**
      * Base activities need to implement this interface.
@@ -71,7 +49,6 @@ public class K9ActivityCommon {
 
     private K9ActivityCommon(Activity activity) {
         mActivity = activity;
-        setLanguage(mActivity, K9.getK9Language());
         mActivity.setTheme(K9.getK9ThemeResourceId());
     }
 
diff --git a/k9mail/src/main/java/com/fsck/k9/activity/K9PreferenceActivity.java b/k9mail/src/main/java/com/fsck/k9/activity/K9PreferenceActivity.java
index 24f854038..e6e7b8bd4 100644
--- a/k9mail/src/main/java/com/fsck/k9/activity/K9PreferenceActivity.java
+++ b/k9mail/src/main/java/com/fsck/k9/activity/K9PreferenceActivity.java
@@ -11,7 +11,6 @@ import com.fsck.k9.K9;
 public abstract class K9PreferenceActivity extends PreferenceActivity {
     @Override
     public void onCreate(Bundle icicle) {
-        K9ActivityCommon.setLanguage(this, K9.getK9Language());
         setTheme(K9.getK9ThemeResourceId());
         super.onCreate(icicle);
     }
diff --git a/k9mail/src/main/java/com/fsck/k9/activity/setup/Prefs.java b/k9mail/src/main/java/com/fsck/k9/activity/setup/Prefs.java
index 75cbcad8c..0f082e0c4 100644
--- a/k9mail/src/main/java/com/fsck/k9/activity/setup/Prefs.java
+++ b/k9mail/src/main/java/com/fsck/k9/activity/setup/Prefs.java
@@ -2,11 +2,6 @@ package com.fsck.k9.activity.setup;
 
 
 import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
 
 import android.app.Dialog;
 import android.content.Context;
@@ -53,7 +48,6 @@ public class Prefs extends K9PreferenceActivity {
     /*
      * Keys of the preferences defined in res/xml/global_preferences.xml
      */
-    private static final String PREFERENCE_LANGUAGE = "language";
     private static final String PREFERENCE_THEME = "theme";
     private static final String PREFERENCE_MESSAGE_VIEW_THEME = "messageViewTheme";
     private static final String PREFERENCE_FIXED_MESSAGE_THEME = "fixed_message_view_theme";
@@ -120,7 +114,6 @@ public class Prefs extends K9PreferenceActivity {
     private static final int VISIBLE_REFILE_ACTIONS_COPY = 3;
     private static final int VISIBLE_REFILE_ACTIONS_SPAM = 4;
 
-    private ListPreference mLanguage;
     private ListPreference mTheme;
     private CheckBoxPreference mFixedMessageTheme;
     private ListPreference mMessageTheme;
@@ -182,21 +175,6 @@ public class Prefs extends K9PreferenceActivity {
 
         addPreferencesFromResource(R.xml.global_preferences);
 
-        mLanguage = (ListPreference) findPreference(PREFERENCE_LANGUAGE);
-        List<CharSequence> entryVector = new ArrayList<CharSequence>(Arrays.asList(mLanguage.getEntries()));
-        List<CharSequence> entryValueVector = new ArrayList<CharSequence>(Arrays.asList(mLanguage.getEntryValues()));
-        String supportedLanguages[] = getResources().getStringArray(R.array.supported_languages);
-        Set<String> supportedLanguageSet = new HashSet<String>(Arrays.asList(supportedLanguages));
-        for (int i = entryVector.size() - 1; i > -1; --i) {
-            if (!supportedLanguageSet.contains(entryValueVector.get(i))) {
-                entryVector.remove(i);
-                entryValueVector.remove(i);
-            }
-        }
-        initListPreference(mLanguage, K9.getK9Language(),
-                           entryVector.toArray(EMPTY_CHAR_SEQUENCE_ARRAY),
-                           entryValueVector.toArray(EMPTY_CHAR_SEQUENCE_ARRAY));
-
         mTheme = setupListPreference(PREFERENCE_THEME, themeIdToName(K9.getK9Theme()));
         mFixedMessageTheme = (CheckBoxPreference) findPreference(PREFERENCE_FIXED_MESSAGE_THEME);
         mFixedMessageTheme.setChecked(K9.useFixedMessageViewTheme());
@@ -483,8 +461,6 @@ public class Prefs extends K9PreferenceActivity {
     private void saveSettings() {
         Storage storage = Preferences.getPreferences(this).getStorage();
 
-        K9.setK9Language(mLanguage.getValue());
-
         K9.setK9Theme(themeNameToId(mTheme.getValue()));
         K9.setUseFixedMessageViewTheme(mFixedMessageTheme.isChecked());
         K9.setK9MessageViewThemeSetting(themeNameToId(mMessageTheme.getValue()));
diff --git a/k9mail/src/main/java/com/fsck/k9/preferences/GlobalSettings.java b/k9mail/src/main/java/com/fsck/k9/preferences/GlobalSettings.java
index e691f2768..14c77e63e 100644
--- a/k9mail/src/main/java/com/fsck/k9/preferences/GlobalSettings.java
+++ b/k9mail/src/main/java/com/fsck/k9/preferences/GlobalSettings.java
@@ -20,14 +20,12 @@ import com.fsck.k9.K9.NotificationHideSubject;
 import com.fsck.k9.K9.NotificationQuickDelete;
 import com.fsck.k9.K9.SplitViewMode;
 import com.fsck.k9.K9.Theme;
-import com.fsck.k9.R;
 import com.fsck.k9.preferences.Settings.BooleanSetting;
 import com.fsck.k9.preferences.Settings.ColorSetting;
 import com.fsck.k9.preferences.Settings.EnumSetting;
 import com.fsck.k9.preferences.Settings.FontSizeSetting;
 import com.fsck.k9.preferences.Settings.IntegerRangeSetting;
 import com.fsck.k9.preferences.Settings.InvalidSettingValueException;
-import com.fsck.k9.preferences.Settings.PseudoEnumSetting;
 import com.fsck.k9.preferences.Settings.SettingsDescription;
 import com.fsck.k9.preferences.Settings.SettingsUpgrader;
 import com.fsck.k9.preferences.Settings.StringSetting;
@@ -147,9 +145,6 @@ public class GlobalSettings {
                 new V(1, new BooleanSetting(false)),
                 new V(12, null)
         ));
-        s.put("language", Settings.versions(
-                new V(1, new LanguageSetting())
-        ));
         s.put("measureAccounts", Settings.versions(
                 new V(1, new BooleanSetting(true))
         ));
@@ -416,39 +411,6 @@ public class GlobalSettings {
         }
     }
 
-    private static class LanguageSetting extends PseudoEnumSetting<String> {
-        private final Map<String, String> mapping;
-
-        LanguageSetting() {
-            super("");
-
-            Map<String, String> mapping = new HashMap<>();
-            String[] values = K9.app.getResources().getStringArray(R.array.settings_language_values);
-            for (String value : values) {
-                if (value.length() == 0) {
-                    mapping.put("", "default");
-                } else {
-                    mapping.put(value, value);
-                }
-            }
-            this.mapping = Collections.unmodifiableMap(mapping);
-        }
-
-        @Override
-        protected Map<String, String> getMapping() {
-            return mapping;
-        }
-
-        @Override
-        public String fromString(String value) throws InvalidSettingValueException {
-            if (mapping.containsKey(value)) {
-                return value;
-            }
-
-            throw new InvalidSettingValueException();
-        }
-    }
-
     static class ThemeSetting extends SettingsDescription<K9.Theme> {
         private static final String THEME_LIGHT = "light";
         private static final String THEME_DARK = "dark";
diff --git a/k9mail/src/main/res/values-bg/strings.xml b/k9mail/src/main/res/values-bg/strings.xml
index bd72daef0..e8e650881 100644
--- a/k9mail/src/main/res/values-bg/strings.xml
+++ b/k9mail/src/main/res/values-bg/strings.xml
@@ -667,11 +667,9 @@ K-9 Mail е мощен, безплатен имейл клиент за Андр
   <string name="settings_theme_label">Тема</string>
   <string name="settings_message_theme_label">Тема при преглед на съобщенията</string>
   <string name="settings_compose_theme_label">Тема на композитора</string>
-  <string name="settings_language_label">Език</string>
   <string name="settings_message_theme_selection_label">Тема на фиксирани съобщения</string>
   <string name="settings_message_theme_selection_summary_off">Задава тема за изглед на съобщенията, в режим преглед</string>
   <string name="settings_message_theme_selection_summary_on">Използване на тема с фиксиран размр на съобщението</string>
-  <string name="setting_language_system">Системни настройки</string>
   <string name="background_ops_label">Синхронизиране на заден план</string>
   <string name="background_ops_never">Никога</string>
   <string name="background_ops_always">Винаги</string>
diff --git a/k9mail/src/main/res/values-ca/strings.xml b/k9mail/src/main/res/values-ca/strings.xml
index 4f8ce48ea..93542819b 100644
--- a/k9mail/src/main/res/values-ca/strings.xml
+++ b/k9mail/src/main/res/values-ca/strings.xml
@@ -578,11 +578,9 @@
   <string name="settings_theme_label">Tema</string>
   <string name="settings_message_theme_label">Tema de vista de missatge</string>
   <string name="settings_compose_theme_label">Tema de vista del redactor</string>
-  <string name="settings_language_label">Llengua</string>
   <string name="settings_message_theme_selection_label">Tema de missatge fix</string>
   <string name="settings_message_theme_selection_summary_off">Selecciona el tema de la vista de missatge al mostrar-lo.</string>
   <string name="settings_message_theme_selection_summary_on">Utilitza un tema fix per a tots els missatges.</string>
-  <string name="setting_language_system">Per defecte del sistema</string>
   <string name="background_ops_label">Sincronització 2n pla</string>
   <string name="background_ops_never">Mai</string>
   <string name="background_ops_always">Sempre</string>
diff --git a/k9mail/src/main/res/values-cs/strings.xml b/k9mail/src/main/res/values-cs/strings.xml
index 7f8941c19..6f30d68ab 100644
--- a/k9mail/src/main/res/values-cs/strings.xml
+++ b/k9mail/src/main/res/values-cs/strings.xml
@@ -670,11 +670,9 @@ Chybová hlášení prosím posílejte, přispívejte novými funkcemi a ptejte
   <string name="settings_theme_label">Vzhled</string>
   <string name="settings_message_theme_label">Vzhled náhledu zprávy</string>
   <string name="settings_compose_theme_label">Vzhled psaní zprávy</string>
-  <string name="settings_language_label">Jazyk</string>
   <string name="settings_message_theme_selection_label">Neměnný vzhled zpráv</string>
   <string name="settings_message_theme_selection_summary_off">Lze vybrat vzhled při prohlížení zprávy</string>
   <string name="settings_message_theme_selection_summary_on">Použít neměnný vzhled při prohlížení zprávy</string>
-  <string name="setting_language_system">Výchozí nastavení systému</string>
   <string name="background_ops_label">Synchronizace na pozadí</string>
   <string name="background_ops_never">Nikdy</string>
   <string name="background_ops_always">Vždy</string>
diff --git a/k9mail/src/main/res/values-da/strings.xml b/k9mail/src/main/res/values-da/strings.xml
index ca502b156..bb249b87d 100644
--- a/k9mail/src/main/res/values-da/strings.xml
+++ b/k9mail/src/main/res/values-da/strings.xml
@@ -649,11 +649,9 @@ Send venligst fejlrapporter, forslag til nye funktioner samt spørgsmål på:
   <string name="settings_theme_label">Tema</string>
   <string name="settings_message_theme_label">Meddelelsesvisnings theme</string>
   <string name="settings_compose_theme_label">Editor theme</string>
-  <string name="settings_language_label">Sprog</string>
   <string name="settings_message_theme_selection_label">Fixed meddelelses theme</string>
   <string name="settings_message_theme_selection_summary_off">Benyt meddelelsesvisnings theme når meddelelser læses</string>
   <string name="settings_message_theme_selection_summary_on">Benyt et fixed meddelelsesvisnings theme</string>
-  <string name="setting_language_system">System standard</string>
   <string name="background_ops_label">Baggrundssynkronisering</string>
   <string name="background_ops_never">Aldrig</string>
   <string name="background_ops_always">Altid</string>
diff --git a/k9mail/src/main/res/values-de/strings.xml b/k9mail/src/main/res/values-de/strings.xml
index 57856f640..5c41693fe 100644
--- a/k9mail/src/main/res/values-de/strings.xml
+++ b/k9mail/src/main/res/values-de/strings.xml
@@ -668,11 +668,9 @@ Bitte senden Sie Fehlerberichte, Ideen für neue Funktionen und stellen Sie Frag
   <string name="settings_theme_label">Design</string>
   <string name="settings_message_theme_label">Nachrichten-Design</string>
   <string name="settings_compose_theme_label">Editor-Design</string>
-  <string name="settings_language_label">Sprache</string>
   <string name="settings_message_theme_selection_label">Festes Nachrichten-Design</string>
   <string name="settings_message_theme_selection_summary_off">Nachrichten-Design während des Ansehens der Nachricht auswählen</string>
   <string name="settings_message_theme_selection_summary_on">Immer das ausgewählte Nachrichten-Design verwenden</string>
-  <string name="setting_language_system">Systemvorgabe</string>
   <string name="background_ops_label">Hintergrund-Synchronisierung</string>
   <string name="background_ops_never">Nie</string>
   <string name="background_ops_always">Immer</string>
diff --git a/k9mail/src/main/res/values-el/strings.xml b/k9mail/src/main/res/values-el/strings.xml
index ea46044f5..7f6769730 100644
--- a/k9mail/src/main/res/values-el/strings.xml
+++ b/k9mail/src/main/res/values-el/strings.xml
@@ -669,11 +669,9 @@
   <string name="settings_theme_label">Θέμα</string>
   <string name="settings_message_theme_label">Θέμα προβολής μηνύματος</string>
   <string name="settings_compose_theme_label">Θέμα σύνθεσης</string>
-  <string name="settings_language_label">Γλώσσα</string>
   <string name="settings_message_theme_selection_label">Θέμα σταθερού μηνύματος</string>
   <string name="settings_message_theme_selection_summary_off">Επιλογή του θέματος προβολής μηνύματος κατά την προβολή του μηνύματος</string>
   <string name="settings_message_theme_selection_summary_on">Χρήση θέματος σταθερού μηνύματος</string>
-  <string name="setting_language_system">Εξ ορισμού του συστήματος</string>
   <string name="background_ops_label">Συγχρονισμός στο παρασκήνιο</string>
   <string name="background_ops_never">Ποτέ</string>
   <string name="background_ops_always">Πάντοτε</string>
diff --git a/k9mail/src/main/res/values-es/strings.xml b/k9mail/src/main/res/values-es/strings.xml
index 87e707b76..2eb2d1a10 100644
--- a/k9mail/src/main/res/values-es/strings.xml
+++ b/k9mail/src/main/res/values-es/strings.xml
@@ -667,11 +667,9 @@ Por favor informe de fallos, aporte nueva funcionalidad o envíe sus preguntas a
   <string name="settings_theme_label">Tema</string>
   <string name="settings_message_theme_label">Tema de vista de mensaje</string>
   <string name="settings_compose_theme_label">Tema de redacción</string>
-  <string name="settings_language_label">Idioma</string>
   <string name="settings_message_theme_selection_label">Tema de mensaje fijo</string>
   <string name="settings_message_theme_selection_summary_off">Seleccionar el tema de vista de mensaje mientras se muestra el mensaje</string>
   <string name="settings_message_theme_selection_summary_on">Usar un tema de vista de mensaje fijo</string>
-  <string name="setting_language_system">Configurado en el sistema</string>
   <string name="background_ops_label">Sincronizar en segundo plano</string>
   <string name="background_ops_never">Nunca</string>
   <string name="background_ops_always">Siempre</string>
diff --git a/k9mail/src/main/res/values-et/strings.xml b/k9mail/src/main/res/values-et/strings.xml
index 9b2b3323e..2725417b1 100644
--- a/k9mail/src/main/res/values-et/strings.xml
+++ b/k9mail/src/main/res/values-et/strings.xml
@@ -598,10 +598,8 @@
   <string name="settings_theme_label">Teema</string>
   <string name="settings_message_theme_label">Sõnumite vaate teema</string>
   <string name="settings_compose_theme_label">Koostaja teema</string>
-  <string name="settings_language_label">Keel</string>
   <string name="settings_message_theme_selection_label">Fikseeritud sõnumi teema</string>
   <string name="settings_message_theme_selection_summary_off">Vali sõnumivaate teema sõnumit vaadates</string>
-  <string name="setting_language_system">Süsteemi vaikeseäte</string>
   <string name="background_ops_label">Taustal sünkimine</string>
   <string name="background_ops_never">Mitte kunagi</string>
   <string name="background_ops_always">Alati</string>
diff --git a/k9mail/src/main/res/values-eu/strings.xml b/k9mail/src/main/res/values-eu/strings.xml
index c69a7406f..fe7fcaf48 100644
--- a/k9mail/src/main/res/values-eu/strings.xml
+++ b/k9mail/src/main/res/values-eu/strings.xml
@@ -589,11 +589,9 @@
   <string name="settings_theme_label">Itxura</string>
   <string name="settings_message_theme_label">Mezua ikusteko itxura</string>
   <string name="settings_compose_theme_label">Mezua idazteko itxura</string>
-  <string name="settings_language_label">Hizkuntza</string>
   <string name="settings_message_theme_selection_label">Mezu finkoaren itxura</string>
   <string name="settings_message_theme_selection_summary_off">Mezua ikusten deneran itxura hautatu</string>
   <string name="settings_message_theme_selection_summary_on">Mezua ikusteko itxura finkoa erabili</string>
-  <string name="setting_language_system">Sistemako defektuzkoa</string>
   <string name="background_ops_label">Atzeko planoko sinkronizazioa</string>
   <string name="background_ops_never">Inoiz ez</string>
   <string name="background_ops_always">Beti</string>
diff --git a/k9mail/src/main/res/values-fa/strings.xml b/k9mail/src/main/res/values-fa/strings.xml
index 923b82b62..87e294d34 100644
--- a/k9mail/src/main/res/values-fa/strings.xml
+++ b/k9mail/src/main/res/values-fa/strings.xml
@@ -570,11 +570,9 @@
   <string name="settings_theme_label">زمینه</string>
   <string name="settings_message_theme_label">دید موضوعی زمینه</string>
   <string name="settings_compose_theme_label">ساخت زمینه</string>
-  <string name="settings_language_label">زبان</string>
   <string name="settings_message_theme_selection_label">نصب زمینه پیام</string>
   <string name="settings_message_theme_selection_summary_off">با انتخاب پیام زمینه در حین دیدن پیام دیده شود</string>
   <string name="settings_message_theme_selection_summary_on">استفاده از دید زمینه پیام نصب شده</string>
-  <string name="setting_language_system">پیش فرض سیستم</string>
   <string name="background_ops_label">همگام سازی پس زمینه</string>
   <string name="background_ops_never">هیچوقت</string>
   <string name="background_ops_always">همیشه</string>
diff --git a/k9mail/src/main/res/values-fi/strings.xml b/k9mail/src/main/res/values-fi/strings.xml
index f4ea5bf95..611236408 100644
--- a/k9mail/src/main/res/values-fi/strings.xml
+++ b/k9mail/src/main/res/values-fi/strings.xml
@@ -667,11 +667,9 @@ Ilmoita virheistä, ota osaa sovelluskehitykseen ja esitä kysymyksiä osoittees
   <string name="settings_theme_label">Teema</string>
   <string name="settings_message_theme_label">Viestinäkymän teema</string>
   <string name="settings_compose_theme_label">Viestimuokkaimen teema</string>
-  <string name="settings_language_label">Kieli</string>
   <string name="settings_message_theme_selection_label">Kiinteä viestiteema</string>
   <string name="settings_message_theme_selection_summary_off">Valitse viestinäkymän teema viestiä luettaessa</string>
   <string name="settings_message_theme_selection_summary_on">Käytä kiinteää viestinäkymän teemaa</string>
-  <string name="setting_language_system">Järjestelmän oletus</string>
   <string name="background_ops_label">Synkronointi taustalla</string>
   <string name="background_ops_never">Ei koskaan</string>
   <string name="background_ops_always">Aina</string>
diff --git a/k9mail/src/main/res/values-fr/strings.xml b/k9mail/src/main/res/values-fr/strings.xml
index 90a51fc05..482f9077d 100644
--- a/k9mail/src/main/res/values-fr/strings.xml
+++ b/k9mail/src/main/res/values-fr/strings.xml
@@ -669,11 +669,9 @@ jusqu\'à <xliff:g id="messages_to_load">%d</xliff:g> de plus</string>
   <string name="settings_theme_label">Thème</string>
   <string name="settings_message_theme_label">Thème de vue des messages</string>
   <string name="settings_compose_theme_label">Thème de composition</string>
-  <string name="settings_language_label">Langue</string>
   <string name="settings_message_theme_selection_label">Thème de message fixe</string>
   <string name="settings_message_theme_selection_summary_off">Choisir le thème de vue du message en regardant le message</string>
   <string name="settings_message_theme_selection_summary_on">Utiliser un thème de vue de message fixe</string>
-  <string name="setting_language_system">Langue par défaut du système</string>
   <string name="background_ops_label">Synchronisation en arrière-plan</string>
   <string name="background_ops_never">Jamais</string>
   <string name="background_ops_always">Toujours</string>
diff --git a/k9mail/src/main/res/values-gl-rES/strings.xml b/k9mail/src/main/res/values-gl-rES/strings.xml
index 13b3ec731..d02c8a05d 100644
--- a/k9mail/src/main/res/values-gl-rES/strings.xml
+++ b/k9mail/src/main/res/values-gl-rES/strings.xml
@@ -614,11 +614,9 @@
   <string name="settings_theme_label">Tema</string>
   <string name="settings_message_theme_label">Tema de vista de mensaxe</string>
   <string name="settings_compose_theme_label">Tema de redacción</string>
-  <string name="settings_language_label">Idioma</string>
   <string name="settings_message_theme_selection_label">Tema de mensaxe fixo</string>
   <string name="settings_message_theme_selection_summary_off">Seleccionar o tema de vista de mensaxe mentres se mostra a mensaxe</string>
   <string name="settings_message_theme_selection_summary_on">Utilizar un tema de vista de mensaxe fixo</string>
-  <string name="setting_language_system">Sistema predefinido</string>
   <string name="background_ops_label">Sincronizar en segundo plano</string>
   <string name="background_ops_never">Nunca</string>
   <string name="background_ops_always">Sempre</string>
diff --git a/k9mail/src/main/res/values-gl/strings.xml b/k9mail/src/main/res/values-gl/strings.xml
index 85bf30063..5831b7cb4 100644
--- a/k9mail/src/main/res/values-gl/strings.xml
+++ b/k9mail/src/main/res/values-gl/strings.xml
@@ -522,8 +522,6 @@
   <string name="messagelist_preferences">Lista de mensaxes</string>
   <string name="messageview_preferences">mensaxes</string>
   <string name="settings_theme_label">Tema</string>
-  <string name="settings_language_label">Idioma</string>
-  <string name="setting_language_system">Configurado no sistema</string>
   <string name="background_ops_label">Sincronizar en segundo plano</string>
   <string name="background_ops_never">Nunca</string>
   <string name="background_ops_always">Sempre</string>
diff --git a/k9mail/src/main/res/values-hr/strings.xml b/k9mail/src/main/res/values-hr/strings.xml
index d1bfd562b..7aedca817 100644
--- a/k9mail/src/main/res/values-hr/strings.xml
+++ b/k9mail/src/main/res/values-hr/strings.xml
@@ -625,11 +625,9 @@
   <string name="settings_theme_label">Tema</string>
   <string name="settings_message_theme_label">Tema pregleda poruke</string>
   <string name="settings_compose_theme_label">Tema sastavljanja poruke</string>
-  <string name="settings_language_label">Jezik</string>
   <string name="settings_message_theme_selection_label">Popravljena tema poruke</string>
   <string name="settings_message_theme_selection_summary_off">Pdaberite temu poruke prilikom pregledavanja poruke</string>
   <string name="settings_message_theme_selection_summary_on">Koristi popravljenu temu pregleda poruke</string>
-  <string name="setting_language_system">Sistemski zadano</string>
   <string name="background_ops_label">Pozadinska sinhronizacija</string>
   <string name="background_ops_never">Nikada</string>
   <string name="background_ops_always">Uvijek</string>
diff --git a/k9mail/src/main/res/values-hu/strings.xml b/k9mail/src/main/res/values-hu/strings.xml
index 8a2304dab..0a8616a4b 100644
--- a/k9mail/src/main/res/values-hu/strings.xml
+++ b/k9mail/src/main/res/values-hu/strings.xml
@@ -656,11 +656,9 @@ Kérünk küldj hibajelentést, hozzájárulva az új verziókhoz, és tegyél f
   <string name="settings_theme_label">Téma</string>
   <string name="settings_message_theme_label">Üzenetmegjelenítés témája</string>
   <string name="settings_compose_theme_label">Író témája</string>
-  <string name="settings_language_label">Nyelv</string>
   <string name="settings_message_theme_selection_label">Rögzített üzenet téma</string>
   <string name="settings_message_theme_selection_summary_off">Válassza az üzenetmegtekintési témát amikor az üzenetet nézi</string>
   <string name="settings_message_theme_selection_summary_on">Rögzített üzenetmegtekintési téma használata</string>
-  <string name="setting_language_system">Alapértelmezett</string>
   <string name="background_ops_label">Háttérszinkronizálás</string>
   <string name="background_ops_never">Soha</string>
   <string name="background_ops_always">Mindig</string>
diff --git a/k9mail/src/main/res/values-it/strings.xml b/k9mail/src/main/res/values-it/strings.xml
index 148e19a18..661bde049 100644
--- a/k9mail/src/main/res/values-it/strings.xml
+++ b/k9mail/src/main/res/values-it/strings.xml
@@ -669,11 +669,9 @@ Invia segnalazioni di bug, contribuisci con nuove funzionalità e poni domande s
   <string name="settings_theme_label">Tema</string>
   <string name="settings_message_theme_label">Tema della vista dei messaggi</string>
   <string name="settings_compose_theme_label">Tema del compositore</string>
-  <string name="settings_language_label">Lingua</string>
   <string name="settings_message_theme_selection_label">Tema fisso del messaggio</string>
   <string name="settings_message_theme_selection_summary_off">Seleziona il tema della vista dei messaggi durante la visualizzazione del messaggio</string>
   <string name="settings_message_theme_selection_summary_on">Usa un tema fisso nella vista dei messaggi</string>
-  <string name="setting_language_system">Impostazioni predefinite di sistema</string>
   <string name="background_ops_label">Sincronizzazione in background</string>
   <string name="background_ops_never">Mai</string>
   <string name="background_ops_always">Sempre</string>
diff --git a/k9mail/src/main/res/values-iw/strings.xml b/k9mail/src/main/res/values-iw/strings.xml
index 669603cf2..054431a3a 100644
--- a/k9mail/src/main/res/values-iw/strings.xml
+++ b/k9mail/src/main/res/values-iw/strings.xml
@@ -529,8 +529,6 @@
   <string name="messagelist_preferences">רשימת הודעות</string>
   <string name="messageview_preferences">הודעות</string>
   <string name="settings_theme_label">ערכת נושא</string>
-  <string name="settings_language_label">שפה</string>
-  <string name="setting_language_system">ברירות מחדל מערכת</string>
   <string name="background_ops_label">סנכרון ברקע</string>
   <string name="background_ops_never">אף פעם</string>
   <string name="background_ops_always">תמיד</string>
diff --git a/k9mail/src/main/res/values-ja/strings.xml b/k9mail/src/main/res/values-ja/strings.xml
index fa6e2ecd8..7f4de1108 100644
--- a/k9mail/src/main/res/values-ja/strings.xml
+++ b/k9mail/src/main/res/values-ja/strings.xml
@@ -666,11 +666,9 @@ K-9 は大多数のメールクライアントと同様に、ほとんどのフ
   <string name="settings_theme_label">テーマ</string>
   <string name="settings_message_theme_label">メッセージ表示画面のテーマ</string>
   <string name="settings_compose_theme_label">メッセージ作成画面のテーマ</string>
-  <string name="settings_language_label">言語</string>
   <string name="settings_message_theme_selection_label">メッセージ表示画面のテーマを固定する</string>
   <string name="settings_message_theme_selection_summary_off">メッセージを表示するテーマを選択する</string>
   <string name="settings_message_theme_selection_summary_on">メッセージを表示するテーマを固定する</string>
-  <string name="setting_language_system">システム設定</string>
   <string name="background_ops_label">バックグラウンド同期</string>
   <string name="background_ops_never">使用しない</string>
   <string name="background_ops_always">常時利用</string>
diff --git a/k9mail/src/main/res/values-ko/strings.xml b/k9mail/src/main/res/values-ko/strings.xml
index 79a0a6cb1..04bac021e 100644
--- a/k9mail/src/main/res/values-ko/strings.xml
+++ b/k9mail/src/main/res/values-ko/strings.xml
@@ -629,11 +629,9 @@
   <string name="settings_theme_label">테마</string>
   <string name="settings_message_theme_label">메시지 보기 테마</string>
   <string name="settings_compose_theme_label">메시지 쓰기 테마</string>
-  <string name="settings_language_label">언어</string>
   <string name="settings_message_theme_selection_label">별도의 메시지 보기 테마</string>
   <string name="settings_message_theme_selection_summary_off">메시지 보기에 별도의 테마를 사용</string>
   <string name="settings_message_theme_selection_summary_on">고정 테마 사용</string>
-  <string name="setting_language_system">시스템 기본값</string>
   <string name="background_ops_label">백그라운드 동기화</string>
   <string name="background_ops_never">하지 않음</string>
   <string name="background_ops_always">항상</string>
diff --git a/k9mail/src/main/res/values-lt/strings.xml b/k9mail/src/main/res/values-lt/strings.xml
index 19a8d546f..71b42d0bc 100644
--- a/k9mail/src/main/res/values-lt/strings.xml
+++ b/k9mail/src/main/res/values-lt/strings.xml
@@ -571,11 +571,9 @@
   <string name="settings_theme_label">Tema</string>
   <string name="settings_message_theme_label">Laiško peržiūros tema</string>
   <string name="settings_compose_theme_label">Kūrimo tema</string>
-  <string name="settings_language_label">Kalba</string>
   <string name="settings_message_theme_selection_label">Numatyta laiško tema</string>
   <string name="settings_message_theme_selection_summary_off">Peržiūrint laišką, pasirinkti laiško peržiūros temą</string>
   <string name="settings_message_theme_selection_summary_on">Naudoti numatytą laiškų peržiūros temą</string>
-  <string name="setting_language_system">Sistemos numatyta</string>
   <string name="background_ops_label">Sinchronizuoti fone</string>
   <string name="background_ops_never">Niekada</string>
   <string name="background_ops_always">Visada</string>
diff --git a/k9mail/src/main/res/values-lv/strings.xml b/k9mail/src/main/res/values-lv/strings.xml
index 958217a4a..8a9d2b8ed 100644
--- a/k9mail/src/main/res/values-lv/strings.xml
+++ b/k9mail/src/main/res/values-lv/strings.xml
@@ -670,11 +670,9 @@ pat <xliff:g id="messages_to_load">%d</xliff:g> vairāk</string>
   <string name="settings_theme_label">Motīvs</string>
   <string name="settings_message_theme_label">Vēstules skata motīvs</string>
   <string name="settings_compose_theme_label">Vēstules rakstīšanas motīvs</string>
-  <string name="settings_language_label">Valoda</string>
   <string name="settings_message_theme_selection_label">Nemainīgs vēstules motīvs</string>
   <string name="settings_message_theme_selection_summary_off">Izvēlieties vēstules skata motīvu, kad aplūkojat vēstuli</string>
   <string name="settings_message_theme_selection_summary_on">Izmantot nemainīgu vēstules skata motīvu</string>
-  <string name="setting_language_system">Sistēmas noklusējums</string>
   <string name="background_ops_label">Fona sinhronizēšana</string>
   <string name="background_ops_never">Nekad</string>
   <string name="background_ops_always">Vienmēr</string>
diff --git a/k9mail/src/main/res/values-nb/strings.xml b/k9mail/src/main/res/values-nb/strings.xml
index abd42e3aa..132c692ed 100644
--- a/k9mail/src/main/res/values-nb/strings.xml
+++ b/k9mail/src/main/res/values-nb/strings.xml
@@ -669,11 +669,9 @@ til <xliff:g id="messages_to_load">%d</xliff:g> flere</string>
   <string name="settings_theme_label">Tema</string>
   <string name="settings_message_theme_label">Tema for meldingsvisning</string>
   <string name="settings_compose_theme_label">Tema for skriving</string>
-  <string name="settings_language_label">Språk</string>
   <string name="settings_message_theme_selection_label">Fast meldingstema</string>
   <string name="settings_message_theme_selection_summary_off">Velg meldingsvisningstema for visning av meldinger.</string>
   <string name="settings_message_theme_selection_summary_on">Bruk fast melding visningstema</string>
-  <string name="setting_language_system">Systemstandard</string>
   <string name="background_ops_label">Bakgrunnssynkronisering</string>
   <string name="background_ops_never">Aldri</string>
   <string name="background_ops_always">Alltid</string>
diff --git a/k9mail/src/main/res/values-nl/strings.xml b/k9mail/src/main/res/values-nl/strings.xml
index c0735e9cc..30e043d32 100644
--- a/k9mail/src/main/res/values-nl/strings.xml
+++ b/k9mail/src/main/res/values-nl/strings.xml
@@ -663,11 +663,9 @@ Graag foutrapporten sturen, bijdragen voor nieuwe functies en vragen stellen op
   <string name="settings_theme_label">Thema</string>
   <string name="settings_message_theme_label">Thema om berichten te zien</string>
   <string name="settings_compose_theme_label">Thema om berichten te schrijven</string>
-  <string name="settings_language_label">Taal</string>
   <string name="settings_message_theme_selection_label">Vast berichten thema</string>
   <string name="settings_message_theme_selection_summary_off">Kies het thema tijdens het bekijken van het bericht</string>
   <string name="settings_message_theme_selection_summary_on">Gebruik een vast thema om het bericht te bekijken</string>
-  <string name="setting_language_system">Volgens systeem</string>
   <string name="background_ops_label">Achtergrond sync</string>
   <string name="background_ops_never">Nooit</string>
   <string name="background_ops_always">Altijd</string>
diff --git a/k9mail/src/main/res/values-pl/strings.xml b/k9mail/src/main/res/values-pl/strings.xml
index 3803689f0..811466543 100644
--- a/k9mail/src/main/res/values-pl/strings.xml
+++ b/k9mail/src/main/res/values-pl/strings.xml
@@ -633,11 +633,9 @@ Wysłane za pomocą K-9 Mail.</string>
   <string name="settings_theme_label">Kolorystyka</string>
   <string name="settings_message_theme_label">Kolorystyka widoku wiadomości</string>
   <string name="settings_compose_theme_label">Kolorystyka widoku tworzenia wiadomości</string>
-  <string name="settings_language_label">Język</string>
   <string name="settings_message_theme_selection_label">Stała kolorystyka widoku wiadomości</string>
   <string name="settings_message_theme_selection_summary_off">Wybierz kolorystykę z poziomu widoku wiadomości</string>
   <string name="settings_message_theme_selection_summary_on">Użyj kolorystyki wskazanej w konfiguracji</string>
-  <string name="setting_language_system">Domyślny systemowy</string>
   <string name="background_ops_label">Synchronizacja w tle</string>
   <string name="background_ops_never">Nigdy</string>
   <string name="background_ops_always">Zawsze</string>
diff --git a/k9mail/src/main/res/values-pt-rBR/strings.xml b/k9mail/src/main/res/values-pt-rBR/strings.xml
index 191d8abd5..3b5599711 100644
--- a/k9mail/src/main/res/values-pt-rBR/strings.xml
+++ b/k9mail/src/main/res/values-pt-rBR/strings.xml
@@ -663,11 +663,9 @@ Por favor encaminhe relatórios de bugs, contribua com novos recursos e tire dú
   <string name="settings_theme_label">Tema</string>
   <string name="settings_message_theme_label">Tema da visualização de mensagens</string>
   <string name="settings_compose_theme_label">Tema do editor</string>
-  <string name="settings_language_label">Idioma</string>
   <string name="settings_message_theme_selection_label">Tema fixo de mensagens</string>
   <string name="settings_message_theme_selection_summary_off">Selecionar o tema de visualização ao visualizar a mensagem</string>
   <string name="settings_message_theme_selection_summary_on">Usar um tema fixo para visualizar mensagens</string>
-  <string name="setting_language_system">Padrão do sistema</string>
   <string name="background_ops_label">Sincronização em segundo plano</string>
   <string name="background_ops_never">Nunca</string>
   <string name="background_ops_always">Sempre</string>
diff --git a/k9mail/src/main/res/values-pt-rPT/strings.xml b/k9mail/src/main/res/values-pt-rPT/strings.xml
index ed0e1c8da..34c1bc9d9 100644
--- a/k9mail/src/main/res/values-pt-rPT/strings.xml
+++ b/k9mail/src/main/res/values-pt-rPT/strings.xml
@@ -668,11 +668,9 @@ Por favor envie relatórios de falhas, contribua com novas funcionalidades e col
   <string name="settings_theme_label">Tema</string>
   <string name="settings_message_theme_label">Tema da vista de mensagem</string>
   <string name="settings_compose_theme_label">Tema da composição</string>
-  <string name="settings_language_label">Linguagem</string>
   <string name="settings_message_theme_selection_label">Tema de mensagem fixo</string>
   <string name="settings_message_theme_selection_summary_off">Selecionar o tema da vista de mensagem quando visualizar a mensagem</string>
   <string name="settings_message_theme_selection_summary_on">Usar um tema da vista de mensagem fixo</string>
-  <string name="setting_language_system">Predefinições do sistema</string>
   <string name="background_ops_label">Sincronização em segundo plano</string>
   <string name="background_ops_never">Nunca</string>
   <string name="background_ops_always">Sempre</string>
diff --git a/k9mail/src/main/res/values-ru/strings.xml b/k9mail/src/main/res/values-ru/strings.xml
index abd0a19e4..b98b3d66b 100644
--- a/k9mail/src/main/res/values-ru/strings.xml
+++ b/k9mail/src/main/res/values-ru/strings.xml
@@ -671,11 +671,9 @@ K-9 Mail — почтовый клиент для Android.
   <string name="settings_theme_label">Тема приложения</string>
   <string name="settings_message_theme_label">Тема просмотра</string>
   <string name="settings_compose_theme_label">Тема редактора</string>
-  <string name="settings_language_label">Язык</string>
   <string name="settings_message_theme_selection_label">Фиксированный просмотр</string>
   <string name="settings_message_theme_selection_summary_off">Разрешить выбор темы при чтении сообщения</string>
   <string name="settings_message_theme_selection_summary_on">Отключить выбор темы при чтении сообщения</string>
-  <string name="setting_language_system">По умолчанию</string>
   <string name="background_ops_label">Фоновая синхронизация</string>
   <string name="background_ops_never">Никогда</string>
   <string name="background_ops_always">Всегда</string>
diff --git a/k9mail/src/main/res/values-sk/strings.xml b/k9mail/src/main/res/values-sk/strings.xml
index 137e6ac74..2af268cb2 100644
--- a/k9mail/src/main/res/values-sk/strings.xml
+++ b/k9mail/src/main/res/values-sk/strings.xml
@@ -670,11 +670,9 @@ Prosím, nahlasujte prípadné chyby, prispievajte novými funkciami a pýtajte
   <string name="settings_theme_label">Téma</string>
   <string name="settings_message_theme_label">Téma zobrazenia správy</string>
   <string name="settings_compose_theme_label">Téma pri písaní správy</string>
-  <string name="settings_language_label">Jazyk</string>
   <string name="settings_message_theme_selection_label">Pevná téma správ</string>
   <string name="settings_message_theme_selection_summary_off">Vybrať tému pri prehliadaní správ</string>
   <string name="settings_message_theme_selection_summary_on">Použiť pevnú tému pri prehliadaní správ</string>
-  <string name="setting_language_system">Predvolený systémom</string>
   <string name="background_ops_label">Synchronizácia na pozadí</string>
   <string name="background_ops_never">Nikdy</string>
   <string name="background_ops_always">Vždy</string>
diff --git a/k9mail/src/main/res/values-sl/strings.xml b/k9mail/src/main/res/values-sl/strings.xml
index f48fb2f81..3e2b890eb 100644
--- a/k9mail/src/main/res/values-sl/strings.xml
+++ b/k9mail/src/main/res/values-sl/strings.xml
@@ -673,11 +673,9 @@ Prosimo pošljite poročila o napakah, predloge za nove funkcije in vprašanja n
   <string name="settings_theme_label">Tema</string>
   <string name="settings_message_theme_label">Tema pogleda sporočila</string>
   <string name="settings_compose_theme_label">Tema pisanja sporočila</string>
-  <string name="settings_language_label">Jezik</string>
   <string name="settings_message_theme_selection_label">Tema fiksnega sporočila</string>
   <string name="settings_message_theme_selection_summary_off">Izberite tema pogleda sporočilo za gledanje sporočila</string>
   <string name="settings_message_theme_selection_summary_on">Uporaba tema pogleda fiksnega sporočila</string>
-  <string name="setting_language_system">Sistemsko privzeto</string>
   <string name="background_ops_label">SInhronizaciaj v ozadju</string>
   <string name="background_ops_never">Nikoli</string>
   <string name="background_ops_always">Vedno</string>
diff --git a/k9mail/src/main/res/values-sr/strings.xml b/k9mail/src/main/res/values-sr/strings.xml
index 32f81ed21..88164afcc 100644
--- a/k9mail/src/main/res/values-sr/strings.xml
+++ b/k9mail/src/main/res/values-sr/strings.xml
@@ -670,11 +670,9 @@
   <string name="settings_theme_label">Тема</string>
   <string name="settings_message_theme_label">Тема приказа порука</string>
   <string name="settings_compose_theme_label">Тема састављача</string>
-  <string name="settings_language_label">Језик</string>
   <string name="settings_message_theme_selection_label">Фиксна тема поруке</string>
   <string name="settings_message_theme_selection_summary_off">Изаберите тему приказа поруке док је гледате</string>
   <string name="settings_message_theme_selection_summary_on">Користи фиксну тему приказа поруке</string>
-  <string name="setting_language_system">Системски подразумеван</string>
   <string name="background_ops_label">Синхронизација у позадини</string>
   <string name="background_ops_never">Никад</string>
   <string name="background_ops_always">Увек</string>
diff --git a/k9mail/src/main/res/values-sv/strings.xml b/k9mail/src/main/res/values-sv/strings.xml
index 121a0de7a..dec5dca6d 100644
--- a/k9mail/src/main/res/values-sv/strings.xml
+++ b/k9mail/src/main/res/values-sv/strings.xml
@@ -668,11 +668,9 @@ Skicka gärna in rapporter om buggar, eller bidra med nya funktioner eller stäl
   <string name="settings_theme_label">Tema</string>
   <string name="settings_message_theme_label">Tema för meddelandelista</string>
   <string name="settings_compose_theme_label">Tema för skriv-vy</string>
-  <string name="settings_language_label">Språk</string>
   <string name="settings_message_theme_selection_label">Fast meddelandetema</string>
   <string name="settings_message_theme_selection_summary_off">Välj tema för meddelandevyn medan meddelandet visas</string>
   <string name="settings_message_theme_selection_summary_on">Använd ett fast tema för meddelandevyn</string>
-  <string name="setting_language_system">Systemstandard</string>
   <string name="background_ops_label">Bakgrundssynkronisering</string>
   <string name="background_ops_never">Aldrig</string>
   <string name="background_ops_always">Alltid</string>
diff --git a/k9mail/src/main/res/values-tr/strings.xml b/k9mail/src/main/res/values-tr/strings.xml
index 4823877eb..fa0c52622 100644
--- a/k9mail/src/main/res/values-tr/strings.xml
+++ b/k9mail/src/main/res/values-tr/strings.xml
@@ -638,11 +638,9 @@
   <string name="settings_theme_label">Tema</string>
   <string name="settings_message_theme_label">Mesaj teması</string>
   <string name="settings_compose_theme_label">Composer teması</string>
-  <string name="settings_language_label">Dil</string>
   <string name="settings_message_theme_selection_label">Sabit mesaj teması</string>
   <string name="settings_message_theme_selection_summary_off">Mesaj izlerken mesaj görünüm temasını seçin</string>
   <string name="settings_message_theme_selection_summary_on">Sabit mesaj için bir tema kullanın</string>
-  <string name="setting_language_system">Sistem Varsayılanları</string>
   <string name="background_ops_label">Arkaplan senkronizasyonu</string>
   <string name="background_ops_never">Hiçbir zaman</string>
   <string name="background_ops_always">Her zaman</string>
diff --git a/k9mail/src/main/res/values-uk/strings.xml b/k9mail/src/main/res/values-uk/strings.xml
index 4731ccb17..35abbd5e3 100644
--- a/k9mail/src/main/res/values-uk/strings.xml
+++ b/k9mail/src/main/res/values-uk/strings.xml
@@ -670,11 +670,9 @@ K-9 Mail — це вільний клієнт електронної пошти
   <string name="settings_theme_label">Тема</string>
   <string name="settings_message_theme_label">Перегляд теми повідомлень</string>
   <string name="settings_compose_theme_label">Написати тему</string>
-  <string name="settings_language_label">Мова</string>
   <string name="settings_message_theme_selection_label">Встановити тему повідомлення</string>
   <string name="settings_message_theme_selection_summary_off">Виберіть перегляд теми повідомлення під час перегляду повідомлення</string>
   <string name="settings_message_theme_selection_summary_on">Використовувати тему з фіксованою шириною повідомлення</string>
-  <string name="setting_language_system">Системна по замовчуванню</string>
   <string name="background_ops_label">Фонова синхронізація</string>
   <string name="background_ops_never">Ніколи</string>
   <string name="background_ops_always">Завжди</string>
diff --git a/k9mail/src/main/res/values-zh-rCN/strings.xml b/k9mail/src/main/res/values-zh-rCN/strings.xml
index 3d70c77aa..89b7effe6 100644
--- a/k9mail/src/main/res/values-zh-rCN/strings.xml
+++ b/k9mail/src/main/res/values-zh-rCN/strings.xml
@@ -624,11 +624,9 @@
   <string name="settings_theme_label">主题</string>
   <string name="settings_message_theme_label">消息查看主题</string>
   <string name="settings_compose_theme_label">编辑器主题</string>
-  <string name="settings_language_label">语言</string>
   <string name="settings_message_theme_selection_label">固定消息主题</string>
   <string name="settings_message_theme_selection_summary_off">在查看消息时选择消息查看主题</string>
   <string name="settings_message_theme_selection_summary_on">使用固定消息查看主题</string>
-  <string name="setting_language_system">系统默认值</string>
   <string name="background_ops_label">后台同步</string>
   <string name="background_ops_never">从不</string>
   <string name="background_ops_always">总是</string>
diff --git a/k9mail/src/main/res/values-zh-rTW/strings.xml b/k9mail/src/main/res/values-zh-rTW/strings.xml
index 99962547a..598d3975a 100644
--- a/k9mail/src/main/res/values-zh-rTW/strings.xml
+++ b/k9mail/src/main/res/values-zh-rTW/strings.xml
@@ -569,11 +569,9 @@
   <string name="settings_theme_label">主題</string>
   <string name="settings_message_theme_label">訊息檢視主題</string>
   <string name="settings_compose_theme_label">新郵件主題</string>
-  <string name="settings_language_label">語系</string>
   <string name="settings_message_theme_selection_label">固定訊息主題</string>
   <string name="settings_message_theme_selection_summary_off">讀取訊息內容時顯示訊息檢視主題</string>
   <string name="settings_message_theme_selection_summary_on">使用固定訊息檢視主題</string>
-  <string name="setting_language_system">系統預設值</string>
   <string name="background_ops_label">背景同步</string>
   <string name="background_ops_never">不要</string>
   <string name="background_ops_always">預設</string>
diff --git a/k9mail/src/main/res/values/arrays.xml b/k9mail/src/main/res/values/arrays.xml
index 63eb2eeac..cc1fb222c 100644
--- a/k9mail/src/main/res/values/arrays.xml
+++ b/k9mail/src/main/res/values/arrays.xml
@@ -339,197 +339,6 @@
         <item>EXPUNGE_MANUALLY</item>
     </string-array>
 
-    <string-array name="settings_language_entries">
-        <item>@string/setting_language_system</item>
-        <item>Afrikaans</item>
-        <item>Bahasa indonesia</item>
-        <item>Bahasa melayu</item>
-        <item>Bamanankan</item>
-        <item>Català</item>
-        <item>Cymraeg</item>
-        <item>Dansk</item>
-        <item>Deutsch</item>
-        <item>Dholuo</item>
-        <item>Eesti</item>
-        <item>English</item>
-        <item>Español</item>
-        <item>Fulfulde, Pulaar, Pular</item>
-        <item>Gaeilge</item>
-        <item>Galego</item>
-        <item>Hausa</item>
-        <item>Hrvatski</item>
-        <item>Kinyarwanda</item>
-        <item>Kirundi</item>
-        <item>Kiswahili</item>
-        <item>Latviešu</item>
-        <item>Lietuvių</item>
-        <item>Magyar</item>
-        <item>Malti</item>
-        <item>Nederlands</item>
-        <item>Norsk</item>
-        <item>Pyccĸий</item>
-        <item>Română</item>
-        <item>Slovenčina</item>
-        <item>Slovenščina</item>
-        <item>Somali</item>
-        <item>Српски</item>
-        <item>Tiếng Việt</item>
-        <item>Tϋrkçe</item>
-        <item>Wolof</item>
-        <item>Yorùbá</item>
-        <item>Azərbaycan</item>
-        <item>Euskera</item>
-        <item>Français</item>
-        <item>Français (Canada)</item>
-        <item>isiXhosa</item>
-        <item>isiZulu</item>
-        <item>Italiano</item>
-        <item>O\'zbek</item>
-        <item>Polski</item>
-        <item>Português</item>
-        <item>Português (Brasil)</item>
-        <item>Shqip</item>
-        <item>Suomi</item>
-        <item>Svenska</item>
-        <item>Íslenska</item>
-        <item>Čeština</item>
-        <item>Ɛʋɛ</item>
-        <item>Ελληνικά</item>
-        <item>Беларуская</item>
-        <item>Български</item>
-        <item>Кыргыз</item>
-        <item>Македонски</item>
-        <item>Українська</item>
-        <item>аҧсуа бызшәа</item>
-        <item>Қазақ</item>
-        <item>Հայերեն</item>
-        <item>עברית</item>
-        <item>اردو</item>
-        <item>العربية</item>
-        <item>فارسی</item>
-        <item>پښتو</item>
-        <item>हिंदी</item>
-        <item>తెలుగు</item>
-        <item>ಕನ್ನಡ</item>
-        <item>ภาษาไทย</item>
-        <item>አማርኛ</item>
-        <item>中文(繁體)</item>
-        <item>中文(简体)</item>
-        <item>日本語</item>
-        <item>한국어</item>
-    </string-array>
-
-    <string-array name="settings_language_values" translatable="false">
-        <item></item>
-        <item>af</item>
-        <item>id</item>
-        <item>ms</item>
-        <item>bm</item>
-        <item>ca</item>
-        <item>cy</item>
-        <item>da</item>
-        <item>de</item>
-        <item>luo</item>
-        <item>et</item>
-        <item>en</item>
-        <item>es</item>
-        <item>ff</item>
-        <item>ga</item>
-        <item>gl</item>
-        <item>ha</item>
-        <item>hr</item>
-        <item>rw</item>
-        <item>rn</item>
-        <item>sw</item>
-        <item>lv</item>
-        <item>lt</item>
-        <item>hu</item>
-        <item>mt</item>
-        <item>nl</item>
-        <item>no</item>
-        <item>ru</item>
-        <item>ro</item>
-        <item>sk</item>
-        <item>sl</item>
-        <item>so</item>
-        <item>sr</item>
-        <item>vi</item>
-        <item>tr</item>
-        <item>wo</item>
-        <item>yo</item>
-        <item>az</item>
-        <item>eu</item>
-        <item>fr</item>
-        <item>fr_CA</item>
-        <item>xs</item>
-        <item>zu</item>
-        <item>it</item>
-        <item>uz</item>
-        <item>pl</item>
-        <item>pt</item>
-        <item>pt_BR</item>
-        <item>sq</item>
-        <item>fi</item>
-        <item>sv</item>
-        <item>is</item>
-        <item>cs</item>
-        <item>ee</item>
-        <item>el</item>
-        <item>be</item>
-        <item>bg</item>
-        <item>ky</item>
-        <item>mk</item>
-        <item>uk</item>
-        <item>ab</item>
-        <item>kk</item>
-        <item>hy</item>
-        <item>he</item>
-        <item>ur</item>
-        <item>ar</item>
-        <item>fa</item>
-        <item>ps</item>
-        <item>hi</item>
-        <item>te</item>
-        <item>kn</item>
-        <item>th</item>
-        <item>am</item>
-        <item>zh_TW</item>
-        <item>zh_CN</item>
-        <item>ja</item>
-        <item>ko</item>
-    </string-array>
-
-    <string-array name="supported_languages" translatable="false">
-        <item></item>
-        <item>ca</item>
-        <item>da</item>
-        <item>de</item>
-        <item>en</item>
-        <item>es</item>
-        <item>gl</item>
-        <item>hu</item>
-        <item>nl</item>
-        <item>ru</item>
-        <item>tr</item>
-        <item>fr</item>
-        <item>fr_CA</item>
-        <item>it</item>
-        <item>pl</item>
-        <item>pt_BR</item>
-        <item>fi</item>
-        <item>sv</item>
-        <item>cs</item>
-        <item>el</item>
-        <item>uk</item>
-        <item>he</item>
-        <item>zh_TW</item>
-        <item>zh_CN</item>
-        <item>ja</item>
-        <item>ko</item>
-        <item>sk</item>
-        <item>lt</item>
-    </string-array>
-
     <string-array name="settings_theme_entries">
         <item>@string/setting_theme_light</item>
         <item>@string/setting_theme_dark</item>
diff --git a/k9mail/src/main/res/values/strings.xml b/k9mail/src/main/res/values/strings.xml
index b6193ea60..052485cd6 100644
--- a/k9mail/src/main/res/values/strings.xml
+++ b/k9mail/src/main/res/values/strings.xml
@@ -818,15 +818,11 @@ Please submit bug reports, contribute new features and ask questions at
     <string name="settings_theme_label">Theme</string>
     <string name="settings_message_theme_label">Message view theme</string>
     <string name="settings_compose_theme_label">Composer theme</string>
-    <string name="settings_language_label">Language</string>
 
     <string name="settings_message_theme_selection_label">Fixed message theme</string>
     <string name="settings_message_theme_selection_summary_off">Select the message view theme while viewing the message</string>
     <string name="settings_message_theme_selection_summary_on">Use a fixed message view theme</string>
 
-
-    <string name="setting_language_system">System default</string>
-
     <string name="background_ops_label">Background sync</string>
     <string name="background_ops_never">Never</string>
     <string name="background_ops_always">Always</string>
diff --git a/k9mail/src/main/res/xml/global_preferences.xml b/k9mail/src/main/res/xml/global_preferences.xml
index 856fb2ab5..63b23a157 100644
--- a/k9mail/src/main/res/xml/global_preferences.xml
+++ b/k9mail/src/main/res/xml/global_preferences.xml
@@ -33,14 +33,6 @@
             android:title="@string/global_preferences"
             android:key="global_preferences">
 
-            <ListPreference
-                android:persistent="false"
-                android:key="language"
-                android:title="@string/settings_language_label"
-                android:entries="@array/settings_language_entries"
-                android:entryValues="@array/settings_language_values"
-                android:dialogTitle="@string/settings_language_label" />
-
             <ListPreference
                 android:persistent="false"
                 android:key="theme"
diff --git a/k9mail/src/test/java/com/fsck/k9/mailstore/MessageViewInfoExtractorTest.java b/k9mail/src/test/java/com/fsck/k9/mailstore/MessageViewInfoExtractorTest.java
index 6c22c7997..fd9fee679 100644
--- a/k9mail/src/test/java/com/fsck/k9/mailstore/MessageViewInfoExtractorTest.java
+++ b/k9mail/src/test/java/com/fsck/k9/mailstore/MessageViewInfoExtractorTest.java
@@ -12,7 +12,6 @@ import android.app.Application;
 
 import com.fsck.k9.GlobalsHelper;
 import com.fsck.k9.K9RobolectricTestRunner;
-import com.fsck.k9.activity.K9ActivityCommon;
 import com.fsck.k9.message.html.HtmlSanitizer;
 import com.fsck.k9.message.html.HtmlSanitizerHelper;
 import com.fsck.k9.mail.Address;
@@ -217,7 +216,6 @@ public class MessageViewInfoExtractorTest {
 
     @Test
     public void testTextPlusRfc822Message() throws MessagingException {
-        K9ActivityCommon.setLanguage(context, "en");
         Locale.setDefault(Locale.US);
         TimeZone.setDefault(TimeZone.getTimeZone("GMT+01:00"));