diff --git a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
index a7efca5597..bbc8ee647a 100644
--- a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
+++ b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
@@ -246,7 +246,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
 
                     TupleMatch match = state.matches.get(i);
 
-                    if (find == null || seen != null || flagged != null || snoozed != null || encrypted != null || attachments!=null)
+                    if (find == null || seen != null || flagged != null || snoozed != null || encrypted != null || attachments != null)
                         match.matched = true;
                     else {
                         if (match.matched == null || !match.matched)
@@ -292,7 +292,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
         final boolean debug = (prefs.getBoolean("debug", false) || BuildConfig.BETA_RELEASE);
 
         final EntityFolder browsable = db.folder().getBrowsableFolder(folder, query != null);
-        if (browsable == null)
+        if (browsable == null || !browsable.selectable)
             return 0;
 
         EntityAccount account = db.account().getAccount(browsable.account);
diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 3d35d8ad44..b6f1e81f2d 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -1225,7 +1225,7 @@ class Core {
                     Folder itarget = istore.getFolder(folder.rename);
                     ifolder.renameTo(itarget);
 
-                    if (subscribed)
+                    if (subscribed && folder.selectable)
                         try {
                             itarget.open(READ_WRITE);
                             itarget.setSubscribed(subscribed);