diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 9f2d955bc9..ebfc33ed97 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -1327,7 +1327,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
             cowner.recreate();
 
-            boolean show_addresses = !properties.getValue("addresses", message.id);
+            boolean show_addresses = properties.getValue("addresses", message.id);
             boolean show_headers = properties.getValue("headers", message.id);
 
             boolean hasFrom = (message.from != null && message.from.length > 0);
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 0c1c4e70fb..831fb73fbf 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -1415,8 +1415,10 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
         public boolean getValue(String name, long id) {
             if (values.containsKey(name))
                 return values.get(name).contains(id);
-            else if ("addresses".equals(name))
-                return !addresses;
+            else {
+                if ("addresses".equals(name))
+                    return addresses;
+            }
             return false;
         }