diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index e0de19965a..dabaee497e 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -876,11 +876,13 @@ class Core {
                     Log.i("End sync folder");
                 }
 
-                nameFolder.put(folder.name, folder);
-                String parentName = folder.getParentName(separator);
-                if (!parentFolders.containsKey(parentName))
-                    parentFolders.put(parentName, new ArrayList<EntityFolder>());
-                parentFolders.get(parentName).add(folder);
+                if (!subscribed_only || subscribed) {
+                    nameFolder.put(folder.name, folder);
+                    String parentName = folder.getParentName(separator);
+                    if (!parentFolders.containsKey(parentName))
+                        parentFolders.put(parentName, new ArrayList<EntityFolder>());
+                    parentFolders.get(parentName).add(folder);
+                }
             }
         }