diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 1a5c88e235..b85ea97867 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -265,6 +265,7 @@ public class FragmentMessages extends FragmentBase
     private ImageButton ibUp;
     private ImageButton ibOutbox;
     private TextView tvOutboxCount;
+    private ImageButton ibSearch;
     private ImageButton ibSeen;
     private ImageButton ibUnflagged;
     private ImageButton ibSnoozed;
@@ -575,6 +576,7 @@ public class FragmentMessages extends FragmentBase
         ibOutbox = view.findViewById(R.id.ibOutbox);
         tvOutboxCount = view.findViewById(R.id.tvOutboxCount);
         tvDebug = view.findViewById(R.id.tvDebug);
+        ibSearch = view.findViewById(R.id.ibSearch);
         ibSeen = view.findViewById(R.id.ibSeen);
         ibUnflagged = view.findViewById(R.id.ibUnflagged);
         ibSnoozed = view.findViewById(R.id.ibSnoozed);
@@ -1275,6 +1277,13 @@ public class FragmentMessages extends FragmentBase
             }
         });
 
+        ibSearch.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                onMenuSearch();
+            }
+        });
+
         ibSeen.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -1874,6 +1883,7 @@ public class FragmentMessages extends FragmentBase
         tvDebug.setVisibility(
                 BuildConfig.DEBUG && viewType != AdapterMessage.ViewType.THREAD
                         ? View.VISIBLE : View.GONE);
+        ibSearch.setVisibility(View.GONE);
         ibSeen.setVisibility(View.GONE);
         ibUnflagged.setVisibility(View.GONE);
         ibSnoozed.setVisibility(View.GONE);
@@ -5756,6 +5766,8 @@ public class FragmentMessages extends FragmentBase
             menu.findItem(R.id.menu_edit_properties).setVisible(viewType == AdapterMessage.ViewType.FOLDER && !outbox);
 
             // In some cases onPrepareOptionsMenu can be called before onCreateView
+            if (ibSearch == null)
+                ibSearch = view.findViewById(R.id.ibSearch);
             if (ibSeen == null)
                 ibSeen = view.findViewById(R.id.ibSeen);
             if (ibUnflagged == null)
@@ -5767,6 +5779,7 @@ public class FragmentMessages extends FragmentBase
             ibUnflagged.setImageResource(filter_unflagged ? R.drawable.twotone_star_border_24 : R.drawable.baseline_star_24);
             ibSnoozed.setImageResource(filter_snoozed ? R.drawable.twotone_visibility_off_24 : R.drawable.twotone_visibility_24);
 
+            ibSearch.setVisibility(quick_filter && folder && BuildConfig.DEBUG ? View.VISIBLE : View.GONE);
             ibSeen.setVisibility(quick_filter && folder ? View.VISIBLE : View.GONE);
             ibUnflagged.setVisibility(quick_filter && folder ? View.VISIBLE : View.GONE);
             ibSnoozed.setVisibility(quick_filter && folder && !drafts ? View.VISIBLE : View.GONE);
diff --git a/app/src/main/res/layout/fragment_messages.xml b/app/src/main/res/layout/fragment_messages.xml
index a2b97ce4c7..0e4a11b696 100644
--- a/app/src/main/res/layout/fragment_messages.xml
+++ b/app/src/main/res/layout/fragment_messages.xml
@@ -398,6 +398,21 @@
                 app:layout_constraintBottom_toTopOf="@+id/etSearch"
                 app:layout_constraintStart_toEndOf="@+id/tvOutboxCount" />
 
+            <ImageButton
+                android:id="@+id/ibSearch"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:alpha="0.4"
+                android:background="?attr/selectableItemBackgroundBorderless"
+                android:contentDescription="@string/title_search"
+                android:padding="12dp"
+                app:layout_constraintBottom_toTopOf="@+id/etSearch"
+                app:layout_constraintEnd_toStartOf="@id/ibSeen"
+                app:layout_constraintHorizontal_chainStyle="packed"
+                app:layout_constraintStart_toStartOf="parent"
+                app:srcCompat="@drawable/twotone_search_24"
+                app:tint="?attr/colorAccent" />
+
             <ImageButton
                 android:id="@+id/ibSeen"
                 android:layout_width="wrap_content"
@@ -409,7 +424,7 @@
                 app:layout_constraintBottom_toTopOf="@+id/etSearch"
                 app:layout_constraintEnd_toStartOf="@id/ibUnflagged"
                 app:layout_constraintHorizontal_chainStyle="packed"
-                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintStart_toEndOf="@+id/ibSearch"
                 app:srcCompat="@drawable/twotone_drafts_24"
                 app:tint="?attr/colorAccent" />