diff --git a/app/src/main/java/eu/faircode/email/ActivityBase.java b/app/src/main/java/eu/faircode/email/ActivityBase.java
index c9adc12a6d..d6bff49abe 100644
--- a/app/src/main/java/eu/faircode/email/ActivityBase.java
+++ b/app/src/main/java/eu/faircode/email/ActivityBase.java
@@ -41,7 +41,7 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc
     private boolean contacts;
 
     private static String[] SETTINGS_RESTART = new String[]{
-            "unified", "threading", "avatars", "identicons", "preview",
+            "unified", "threading", "avatars", "identicons", "preview", "addresses",
             "pull", "actionbar", "autoclose", "autonext", "confirm", "debug"
     };
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 7095b95138..ee2e850aa3 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -111,6 +111,7 @@ public class FragmentMessages extends FragmentBase {
     private boolean actionbar;
     private boolean autoclose;
     private boolean autonext;
+    private boolean addresses;
 
     private long primary = -1;
     private boolean outbox = false;
@@ -171,6 +172,7 @@ public class FragmentMessages extends FragmentBase {
         actionbar = prefs.getBoolean("actionbar", true);
         autoclose = prefs.getBoolean("autoclose", true);
         autonext = prefs.getBoolean("autonext", false);
+        addresses = prefs.getBoolean("addresses", true);
     }
 
     @Override
@@ -334,7 +336,7 @@ public class FragmentMessages extends FragmentBase {
                         if (values.containsKey(name))
                             return values.get(name).contains(id);
                         else if ("addresses".equals(name))
-                            return !prefs.getBoolean("addresses", true);
+                            return !addresses;
                         return false;
                     }