diff --git a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
index 8a9a03ad6f..0606f13a7e 100644
--- a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
+++ b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
@@ -225,7 +225,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
                 " matches=" + (state.matches == null ? null : state.matches.size()));
 
         long[] exclude = new long[0];
-        if (account == null) {
+        if (folder == null) {
             List<Long> folders = new ArrayList<>();
             if (!criteria.in_trash) {
                 List<EntityFolder> trash = db.folder().getFoldersByType(EntityFolder.TRASH);
diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogSearch.java b/app/src/main/java/eu/faircode/email/FragmentDialogSearch.java
index 51424ba0d5..3a8a4cdeb3 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogSearch.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogSearch.java
@@ -227,7 +227,7 @@ public class FragmentDialogSearch extends FragmentDialogBase {
                         cbHeaders.setVisibility(View.VISIBLE);
                         cbHtml.setVisibility(View.VISIBLE);
                     }
-                    if (account < 0) {
+                    if (folder < 0) {
                         cbSearchTrash.setVisibility(View.VISIBLE);
                         cbSearchJunk.setVisibility(View.VISIBLE);
                     }