diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index ee2f2488e2..08e4b6f1de 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -238,7 +238,7 @@ public class FragmentMessages extends FragmentBase {
         autoexpand = prefs.getBoolean("autoexpand", true);
         autoclose = prefs.getBoolean("autoclose", true);
         autonext = (!autoclose && prefs.getBoolean("autonext", false));
-        addresses = prefs.getBoolean("addresses", true);
+        addresses = prefs.getBoolean("addresses", false);
     }
 
     @Override
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptions.java b/app/src/main/java/eu/faircode/email/FragmentOptions.java
index b7934ba6eb..c2b29e684b 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptions.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptions.java
@@ -641,7 +641,7 @@ public class FragmentOptions extends FragmentBase implements SharedPreferences.O
         swSubjectItalic.setChecked(prefs.getBoolean("subject_italic", true));
         swFlags.setChecked(prefs.getBoolean("flags", true));
         swPreview.setChecked(prefs.getBoolean("preview", false));
-        swAddresses.setChecked(prefs.getBoolean("addresses", true));
+        swAddresses.setChecked(prefs.getBoolean("addresses", false));
         swMonospaced.setChecked(prefs.getBoolean("monospaced", false));
         swHtml.setChecked(prefs.getBoolean("autohtml", false));
         swImages.setChecked(prefs.getBoolean("autoimages", false));