diff --git a/app/src/main/java/eu/faircode/email/SearchViewEx.java b/app/src/main/java/eu/faircode/email/SearchViewEx.java
index 788677f081..805114dde4 100644
--- a/app/src/main/java/eu/faircode/email/SearchViewEx.java
+++ b/app/src/main/java/eu/faircode/email/SearchViewEx.java
@@ -115,7 +115,10 @@ public class SearchViewEx extends SearchView {
                 intf.onSave(query);
                 menuSearch.collapseActionView();
                 intf.onSearch(query);
-                prefs.edit().putString("last_search", query).apply();
+
+                String prefix = getContext().getString(R.string.title_search_special_prefix);
+                if (query != null && !query.startsWith(prefix + ":"))
+                    prefs.edit().putString("last_search", query).apply();
                 return true;
             }
         });