diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 5bf847f743..364f716f6f 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -2789,8 +2789,11 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                 name = Helper.localizeFolderType(getContext(), type);
         else {
             name = (folders.size() > 0 ? folders.get(0).getDisplayName(getContext()) : "");
-            if (folders.size() == 1)
-                name += "/" + folders.get(0).accountName;
+            if (folders.size() == 1) {
+                String accountName = folders.get(0).accountName;
+                if (accountName != null)
+                    name += "/" + accountName;
+            }
         }
 
         // Show name/unread