diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 61eb1ba1d5..07a31448cf 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -3416,9 +3416,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                         (viewType == AdapterMessage.ViewType.FOLDER && !outbox));
 
         MenuItem menuSearch = menu.findItem(R.id.menu_search);
-        menuSearch.setVisible(
-                (viewType == AdapterMessage.ViewType.UNIFIED && type == null)
-                        || viewType == AdapterMessage.ViewType.FOLDER);
+        menuSearch.setVisible(folder);
 
         menu.findItem(R.id.menu_folders).setVisible(viewType == AdapterMessage.ViewType.UNIFIED && primary >= 0);
         ImageButton ib = (ImageButton) menu.findItem(R.id.menu_folders).getActionView();