diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java
index b6c7a93600..f4684e9412 100644
--- a/app/src/main/java/eu/faircode/email/ActivityView.java
+++ b/app/src/main/java/eu/faircode/email/ActivityView.java
@@ -195,6 +195,8 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
     private static final int ANNOUNCEMENT_TIMEOUT = 15 * 1000; // milliseconds
     private static final long ANNOUNCEMENT_INTERVAL = 4 * 3600 * 1000L; // milliseconds
 
+    static final int REQUEST_FLAG_COLOR = 1;
+
     private static final int REQUEST_RULES_ACCOUNT = 2001;
     private static final int REQUEST_RULES_FOLDER = 2002;
     private static final int REQUEST_DEBUG_INFO = 7000;
@@ -1272,6 +1274,10 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
 
         try {
             switch (requestCode) {
+                case REQUEST_FLAG_COLOR:
+                    if (resultCode == RESULT_OK && data != null)
+                        onSearchFlagColor(data.getBundleExtra("args"));
+                    break;
                 case REQUEST_RULES_ACCOUNT:
                     if (resultCode == RESULT_OK && data != null)
                         onMenuRulesFolder(data.getBundleExtra("args"));
@@ -2338,6 +2344,21 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
         }.execute(this, new Bundle(), "rules:account");
     }
 
+    private void onSearchFlagColor(Bundle args) {
+        BoundaryCallbackMessages.SearchCriteria criteria = new BoundaryCallbackMessages.SearchCriteria();
+        criteria.with_flagged = true;
+        criteria.with_flag_color = args.getInt("color");
+
+        final long account = args.getLong("account", -1);
+        final long folder = args.getLong("folder", -1);
+
+        FragmentMessages.search(
+                this, this, getSupportFragmentManager(),
+                account, folder,
+                false,
+                criteria);
+    }
+
     private void onMenuRulesFolder(Bundle args) {
         args.putInt("icon", R.drawable.twotone_filter_alt_24);
         args.putString("title", getString(R.string.title_select));
diff --git a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
index 1cbffba7ea..1ddb9d2841 100644
--- a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
+++ b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
@@ -387,6 +387,12 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
                         matched = matchMessage(context, message, criteria, true);
                 }
 
+                if (criteria.with_flag_color != null) {
+                    EntityMessage message = db.message().getMessage(match.id);
+                    if (message == null || !criteria.with_flag_color.equals(message.color))
+                        matched = false;
+                }
+
                 if (matched) {
                     found += db.message().setMessageFound(match.id, true);
                     Log.i("Boundary matched=" + match.id + " found=" + found);
@@ -1041,6 +1047,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
         boolean in_html = false;
         boolean with_unseen;
         boolean with_flagged;
+        Integer with_flag_color;
         boolean with_hidden;
         boolean with_encrypted;
         boolean with_attachments;
@@ -1333,6 +1340,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
                         this.in_html == other.in_html &&
                         this.with_unseen == other.with_unseen &&
                         this.with_flagged == other.with_flagged &&
+                        Objects.equals(this.with_flag_color, other.with_flag_color) &&
                         this.with_hidden == other.with_hidden &&
                         this.with_encrypted == other.with_encrypted &&
                         this.with_attachments == other.with_attachments &&
@@ -1363,6 +1371,8 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
             json.put("in_html", in_html);
             json.put("with_unseen", with_unseen);
             json.put("with_flagged", with_flagged);
+            if (with_flag_color != null)
+                json.put("with_flag_color", with_flag_color);
             json.put("with_hidden", with_hidden);
             json.put("with_encrypted", with_encrypted);
             json.put("with_attachments", with_attachments);
@@ -1415,6 +1425,8 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
             criteria.in_html = json.optBoolean("in_html");
             criteria.with_unseen = json.optBoolean("with_unseen");
             criteria.with_flagged = json.optBoolean("with_flagged");
+            if (json.has("with_flag_color"))
+                criteria.with_flag_color = json.getInt("with_flag_color");
             criteria.with_hidden = json.optBoolean("with_hidden");
             criteria.with_encrypted = json.optBoolean("with_encrypted");
             criteria.with_attachments = json.optBoolean("with_attachments");
@@ -1466,7 +1478,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
                     " headers=" + in_headers +
                     " html=" + in_html +
                     " unseen=" + with_unseen +
-                    " flagged=" + with_flagged +
+                    " flagged=" + with_flagged + ":" + with_flag_color +
                     " hidden=" + with_hidden +
                     " encrypted=" + with_encrypted +
                     " w/attachments=" + with_attachments +
diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogSearch.java b/app/src/main/java/eu/faircode/email/FragmentDialogSearch.java
index a0844d56be..c95e8873a4 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogSearch.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogSearch.java
@@ -614,6 +614,20 @@ public class FragmentDialogSearch extends FragmentDialogBase {
         ibUnseen.setOnClickListener(onClick);
         ibFlagged.setOnClickListener(onClick);
 
+        ibFlagged.setOnLongClickListener(new View.OnLongClickListener() {
+            @Override
+            public boolean onLongClick(View v) {
+                dialog.dismiss();
+
+                FragmentDialogColor fragment = new FragmentDialogColor();
+                fragment.setArguments(args);
+                fragment.setTargetActivity((ActivityBase) getActivity(), ActivityView.REQUEST_FLAG_COLOR);
+                fragment.show(getParentFragmentManager(), "search:color");
+
+                return true;
+            }
+        });
+
         ibHidden.setOnLongClickListener(new View.OnLongClickListener() {
             @Override
             public boolean onLongClick(View v) {