diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogSearch.java b/app/src/main/java/eu/faircode/email/FragmentDialogSearch.java
index 2c5b43e881..8b4398624e 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogSearch.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogSearch.java
@@ -56,6 +56,8 @@ public class FragmentDialogSearch extends FragmentDialogBase {
         View dview = LayoutInflater.from(getContext()).inflate(R.layout.dialog_search, null);
 
         final AutoCompleteTextView etQuery = dview.findViewById(R.id.etQuery);
+        final ImageButton ibUnseen = dview.findViewById(R.id.ibUnseen);
+        final ImageButton ibFlagged = dview.findViewById(R.id.ibFlagged);
         final ImageButton ibInfo = dview.findViewById(R.id.ibInfo);
         final ImageButton ibMore = dview.findViewById(R.id.ibMore);
         final TextView tvMore = dview.findViewById(R.id.tvMore);
@@ -283,6 +285,30 @@ public class FragmentDialogSearch extends FragmentDialogBase {
                 })
                 .create();
 
+        View.OnClickListener onClick = new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                dialog.dismiss();
+
+                BoundaryCallbackMessages.SearchCriteria criteria = new BoundaryCallbackMessages.SearchCriteria();
+                switch (v.getId()) {
+                    case R.id.ibUnseen:
+                        criteria.with_unseen = true;
+                        break;
+                    case R.id.ibFlagged:
+                        criteria.with_flagged = true;
+                        break;
+                }
+
+                FragmentMessages.search(
+                        getContext(), getViewLifecycleOwner(), getParentFragmentManager(),
+                        account, folder, false, criteria);
+            }
+        };
+
+        ibUnseen.setOnClickListener(onClick);
+        ibFlagged.setOnClickListener(onClick);
+
         etQuery.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
                 if (actionId == EditorInfo.IME_ACTION_GO) {
diff --git a/app/src/main/res/layout/dialog_search.xml b/app/src/main/res/layout/dialog_search.xml
index b53bc89771..c7da34f3aa 100644
--- a/app/src/main/res/layout/dialog_search.xml
+++ b/app/src/main/res/layout/dialog_search.xml
@@ -15,10 +15,38 @@
             android:layout_height="wrap_content"
             android:text="@string/title_search"
             android:textAppearance="@style/TextAppearance.AppCompat.Large"
-            app:layout_constraintEnd_toStartOf="@id/ibInfo"
+            app:layout_constraintEnd_toStartOf="@id/ibUnseen"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
+        <ImageButton
+            android:id="@+id/ibUnseen"
+            android:layout_width="36dp"
+            android:layout_height="36dp"
+            android:layout_marginEnd="12dp"
+            android:background="?android:attr/selectableItemBackgroundBorderless"
+            android:contentDescription="@string/title_info"
+            android:padding="6dp"
+            android:scaleType="fitCenter"
+            android:tooltipText="@string/title_info"
+            app:layout_constraintEnd_toStartOf="@+id/ibFlagged"
+            app:layout_constraintTop_toTopOf="parent"
+            app:srcCompat="@drawable/baseline_mail_24" />
+
+        <ImageButton
+            android:id="@+id/ibFlagged"
+            android:layout_width="36dp"
+            android:layout_height="36dp"
+            android:layout_marginEnd="12dp"
+            android:background="?android:attr/selectableItemBackgroundBorderless"
+            android:contentDescription="@string/title_accessibility_flagged"
+            android:padding="6dp"
+            android:scaleType="fitCenter"
+            android:tooltipText="@string/title_info"
+            app:layout_constraintEnd_toStartOf="@+id/ibInfo"
+            app:layout_constraintTop_toTopOf="parent"
+            app:srcCompat="@drawable/baseline_star_24" />
+
         <ImageButton
             android:id="@+id/ibInfo"
             android:layout_width="36dp"