diff --git a/app/src/main/java/eu/faircode/email/EntityFolder.java b/app/src/main/java/eu/faircode/email/EntityFolder.java
index 8b0f92a794..c6de796a8c 100644
--- a/app/src/main/java/eu/faircode/email/EntityFolder.java
+++ b/app/src/main/java/eu/faircode/email/EntityFolder.java
@@ -837,11 +837,8 @@ public int compare(Object o1, Object o2) {
                 if (c != 0)
                     return c;
 
-                if (context == null)
-                    return collator.compare(f1.name, f2.name);
-
-                String name1 = f1.getDisplayName(context);
-                String name2 = f2.getDisplayName(context);
+                String name1 = (context == null ? f1.name : f1.getDisplayName(context));
+                String name2 = (context == null ? f2.name : f2.getDisplayName(context));
                 return Normalizer.normalize(name1, Normalizer.Form.NFD).compareToIgnoreCase(
                         Normalizer.normalize(name2, Normalizer.Form.NFD));
             }