diff --git a/app/src/main/java/eu/faircode/email/AdapterFolder.java b/app/src/main/java/eu/faircode/email/AdapterFolder.java
index 4512cc64dd..afa311e764 100644
--- a/app/src/main/java/eu/faircode/email/AdapterFolder.java
+++ b/app/src/main/java/eu/faircode/email/AdapterFolder.java
@@ -188,7 +188,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
             vwLevel.setLayoutParams(lp);
 
             ivExpander.setImageLevel(folder.collapsed ? 1 /* more */ : 0 /* less */);
-            ivExpander.setVisibility(account < 0
+            ivExpander.setVisibility(account < 0 || !folder.expander
                     ? View.GONE
                     : folder.child_refs != null && folder.child_refs.size() > 0
                     ? View.VISIBLE : View.INVISIBLE);
@@ -724,7 +724,16 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
                 }
             }
 
-            hierarchical = getHierarchical(parents, 0);
+            boolean anyChild = false;
+            for (TupleFolderEx parent : parents)
+                if (parent.child_refs != null && parent.child_refs.size() > 0) {
+                    anyChild = true;
+                    break;
+                }
+            for (TupleFolderEx parent : parents)
+                parent.expander = anyChild;
+
+            hierarchical = getHierarchical(parents, anyChild ? 0 : 1);
         }
 
         DiffUtil.DiffResult diff = DiffUtil.calculateDiff(new DiffCallback(items, hierarchical), false);
diff --git a/app/src/main/java/eu/faircode/email/TupleFolderEx.java b/app/src/main/java/eu/faircode/email/TupleFolderEx.java
index 038f857070..bed0973341 100644
--- a/app/src/main/java/eu/faircode/email/TupleFolderEx.java
+++ b/app/src/main/java/eu/faircode/email/TupleFolderEx.java
@@ -45,7 +45,10 @@ public class TupleFolderEx extends EntityFolder implements Serializable {
     public int executing;
 
     @Ignore
-    int indentation;
+    int indentation = 0;
+
+    @Ignore
+    boolean expander = true;
 
     @Ignore
     TupleFolderEx parent_ref;