diff --git a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
index ecae091049..a7efca5597 100644
--- a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
+++ b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
@@ -171,6 +171,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
         Boolean flagged = null;
         Boolean snoozed = null;
         Boolean encrypted = null;
+        Boolean attachments = null;
         String find = (TextUtils.isEmpty(query) ? null : query.toLowerCase());
         if (find != null && find.startsWith(context.getString(R.string.title_search_special_prefix) + ":")) {
             String special = find.split(":")[1];
@@ -182,6 +183,8 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
                 snoozed = true;
             else if (context.getString(R.string.title_search_special_encrypted).equals(special))
                 encrypted = true;
+            else if (context.getString(R.string.title_search_special_attachments).equals(special))
+                attachments = true;
         }
 
         int found = 0;
@@ -189,7 +192,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
         boolean fts = prefs.getBoolean("fts", false);
         boolean pro = ActivityBilling.isPro(context);
-        if (fts && pro && seen == null && flagged == null && snoozed == null && encrypted == null) {
+        if (fts && pro && seen == null && flagged == null && snoozed == null && encrypted == null && attachments == null) {
             if (state.ids == null) {
                 SQLiteDatabase sdb = FtsDbHelper.getInstance(context);
                 state.ids = FtsDbHelper.match(sdb, account, folder, query);
@@ -220,7 +223,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
                     state.matches = db.message().matchMessages(
                             account, folder,
                             "%" + find + "%",
-                            seen, flagged, snoozed, encrypted,
+                            seen, flagged, snoozed, encrypted, attachments,
                             SEARCH_LIMIT, state.offset);
                     Log.i("Boundary device folder=" + folder +
                             " query=" + query +
@@ -228,6 +231,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
                             " flagged=" + flagged +
                             " snoozed=" + snoozed +
                             " encrypted=" + encrypted +
+                            " attachments=" + attachments +
                             " offset=" + state.offset +
                             " size=" + state.matches.size());
                     state.offset += Math.min(state.matches.size(), SEARCH_LIMIT);
@@ -242,7 +246,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
 
                     TupleMatch match = state.matches.get(i);
 
-                    if (find == null || seen != null || flagged != null || snoozed != null || encrypted != null)
+                    if (find == null || seen != null || flagged != null || snoozed != null || encrypted != null || attachments!=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 8a7ee5e6a9..d3c74e33a9 100644
--- a/app/src/main/java/eu/faircode/email/DaoMessage.java
+++ b/app/src/main/java/eu/faircode/email/DaoMessage.java
@@ -274,11 +274,12 @@ public interface DaoMessage {
             " 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 ui_encrypt > 0)" +
+            " AND (:attachments IS NULL OR attachments > 0)" +
             " ORDER BY received DESC" +
             " LIMIT :limit OFFSET :offset")
     List<TupleMatch> matchMessages(
             Long account, Long folder, String find,
-            Boolean seen, Boolean flagged, Boolean hidden, Boolean encrypted,
+            Boolean seen, Boolean flagged, Boolean hidden, Boolean encrypted, Boolean attachments,
             int limit, int offset);
 
     @Query("SELECT id" +
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 2b4b3b47f4..a61a7e9051 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -1115,7 +1115,8 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
             if (query != null && query.startsWith(getString(R.string.title_search_special_prefix) + ":")) {
                 String special = query.split(":")[1];
                 if (getString(R.string.title_search_special_snoozed).equals(special) ||
-                        getString(R.string.title_search_special_encrypted).equals(special))
+                        getString(R.string.title_search_special_encrypted).equals(special) ||
+                        getString(R.string.title_search_special_attachments).equals(special))
                     fabSearch.hide();
                 else
                     fabSearch.show();
diff --git a/app/src/main/java/eu/faircode/email/SearchViewEx.java b/app/src/main/java/eu/faircode/email/SearchViewEx.java
index 68cd779098..e2ef42f0f0 100644
--- a/app/src/main/java/eu/faircode/email/SearchViewEx.java
+++ b/app/src/main/java/eu/faircode/email/SearchViewEx.java
@@ -64,6 +64,7 @@ public class SearchViewEx extends SearchView {
                     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)});
+                    cursor.addRow(new Object[]{-6, prefix + ":" + getContext().getString(R.string.title_search_special_attachments)});
                     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 3f17a9bec2..5f75850cff 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1127,6 +1127,7 @@
     <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_search_special_attachments">attachments</string>
 
     <string name="title_widget_title_count">New message count</string>
     <string name="title_widget_title_list">Message list</string>