diff --git a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
index fb96ee4c44..f935052d63 100644
--- a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
+++ b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
@@ -169,6 +169,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
         Boolean seen = null;
         Boolean flagged = null;
         Boolean snoozed = null;
+        Boolean encrypted = null;
         String find = (TextUtils.isEmpty(query) ? null : query.toLowerCase(Locale.ROOT));
         if (find != null && find.startsWith(context.getString(R.string.title_search_special_prefix) + ":")) {
             String special = find.split(":")[1];
@@ -178,6 +179,8 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
                 flagged = true;
             else if (context.getString(R.string.title_search_special_snoozed).equals(special))
                 snoozed = true;
+            else if (context.getString(R.string.title_search_special_encrypted).equals(special))
+                encrypted = true;
         }
 
         int found = 0;
@@ -190,13 +193,14 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
                     state.matches = db.message().matchMessages(
                             folder,
                             "%" + find + "%",
-                            seen, flagged, snoozed,
+                            seen, flagged, snoozed, encrypted,
                             SEARCH_LIMIT, state.offset);
                     Log.i("Boundary device folder=" + folder +
                             " query=" + query +
                             " seen=" + seen +
                             " flagged=" + flagged +
                             " snoozed=" + snoozed +
+                            " encrypted=" + encrypted +
                             " offset=" + state.offset +
                             " size=" + state.matches.size());
                     state.offset += Math.min(state.matches.size(), SEARCH_LIMIT);
@@ -211,7 +215,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
 
                     TupleMatch match = state.matches.get(i);
 
-                    if (find == null || seen != null || flagged != null || snoozed != null)
+                    if (find == null || seen != null || flagged != null || snoozed != null || encrypted != null)
                         match.matched = true;
                     else {
                         if (match.matched == null || !match.matched)
diff --git a/app/src/main/java/eu/faircode/email/DaoMessage.java b/app/src/main/java/eu/faircode/email/DaoMessage.java
index 85ec30072d..2712620115 100644
--- a/app/src/main/java/eu/faircode/email/DaoMessage.java
+++ b/app/src/main/java/eu/faircode/email/DaoMessage.java
@@ -234,9 +234,13 @@ public interface DaoMessage {
             " AND (:seen IS NULL OR ui_seen = :seen)" +
             " AND (:flagged IS NULL OR ui_flagged = :flagged)" +
             " AND (:hidden IS NULL OR (CASE WHEN ui_snoozed IS NULL THEN 0 ELSE 1 END) = :hidden)" +
+            " AND (:encrypted IS NULL OR encrypt = 1)" +
             " ORDER BY received DESC" +
             " LIMIT :limit OFFSET :offset")
-    List<TupleMatch> matchMessages(Long folder, String find, Boolean seen, Boolean flagged, Boolean hidden, int limit, int offset);
+    List<TupleMatch> matchMessages(
+            Long folder, String find,
+            Boolean seen, Boolean flagged, Boolean hidden, Boolean encrypted,
+            int limit, int offset);
 
     @Query("SELECT id" +
             " FROM message" +
diff --git a/app/src/main/java/eu/faircode/email/SearchViewEx.java b/app/src/main/java/eu/faircode/email/SearchViewEx.java
index 805114dde4..542d9858db 100644
--- a/app/src/main/java/eu/faircode/email/SearchViewEx.java
+++ b/app/src/main/java/eu/faircode/email/SearchViewEx.java
@@ -63,6 +63,7 @@ public class SearchViewEx extends SearchView {
                     cursor.addRow(new Object[]{-2, prefix + ":" + getContext().getString(R.string.title_search_special_unseen)});
                     cursor.addRow(new Object[]{-3, prefix + ":" + getContext().getString(R.string.title_search_special_flagged)});
                     cursor.addRow(new Object[]{-4, prefix + ":" + getContext().getString(R.string.title_search_special_snoozed)});
+                    cursor.addRow(new Object[]{-5, prefix + ":" + getContext().getString(R.string.title_search_special_encrypted)});
                     SimpleCursorAdapter adapter = new SimpleCursorAdapter(
                             getContext(),
                             R.layout.search_suggestion,
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1b50e8c7c4..5acdd19470 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -967,6 +967,7 @@
     <string name="title_search_special_unseen">unread</string>
     <string name="title_search_special_flagged">starred</string>
     <string name="title_search_special_snoozed">hidden</string>
+    <string name="title_search_special_encrypted">encrypted</string>
 
     <string name="title_widget_title_count">New message count</string>
     <string name="title_widget_title_list">Message list</string>