diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index ebfc33ed97..90bf372d7e 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -243,6 +243,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
     private boolean inline;
     private boolean collapse_quotes;
     private boolean authentication;
+    private boolean language_detection;
     private static boolean debug;
 
     private boolean gotoTop = false;
@@ -1423,8 +1424,12 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     .append(message.total == null ? "-" : Helper.humanReadableByteCount(message.total, true));
             tvSizeEx.setText(size.toString());
 
-            tvLanguageTitle.setVisibility(show_addresses && message.language != null ? View.VISIBLE : View.GONE);
-            tvLanguage.setVisibility(show_addresses && message.language != null ? View.VISIBLE : View.GONE);
+            tvLanguageTitle.setVisibility(
+                    show_addresses && language_detection && message.language != null
+                            ? View.VISIBLE : View.GONE);
+            tvLanguage.setVisibility(
+                    show_addresses && language_detection && message.language != null
+                            ? View.VISIBLE : View.GONE);
             tvLanguage.setText(message.language == null ? null : new Locale(message.language).getDisplayLanguage());
 
             tvSubjectEx.setVisibility(show_addresses ? View.VISIBLE : View.GONE);
@@ -4580,6 +4585,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         this.inline = prefs.getBoolean("inline_images", false);
         this.collapse_quotes = prefs.getBoolean("collapse_quotes", false);
         this.authentication = prefs.getBoolean("authentication", true);
+        this.language_detection = prefs.getBoolean("language_detection", false);
 
         debug = prefs.getBoolean("debug", false);