diff --git a/FAQ.md b/FAQ.md
index d56a68cbb3..d1c86616a5 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -1140,7 +1140,7 @@ Since version 1.1315 it is possible to use search expressions like this:
 apple +banana -cherry ?nuts
 ```
 
-This will result in searching like this:
+This will result in searching in the subject or text (only) like this:
 
 ```
 ("apple" AND "banana" AND NOT "cherry") OR "nuts"
diff --git a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
index 2bcb966dcb..6cea669543 100644
--- a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
+++ b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
@@ -986,9 +986,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
                 }
 
                 if (plus.size() + minus.size() + opt.size() +
-                        andFrom.size() +
-                        andTo.size() + andCc.size() + andBcc.size() +
-                        andKeyword.size() > 0)
+                        andFrom.size() + andTo.size() + andCc.size() + andBcc.size() + andKeyword.size() > 0)
                     search = all.toString();
 
                 // Yahoo! does not support keyword search, but uses the flags $Forwarded $Junk $NotJunk
@@ -1003,7 +1001,8 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
                     for (String term : andFrom)
                         and.add(new FromStringTerm(term));
                 } else {
-                    if (in_senders && !TextUtils.isEmpty(search))
+                    if (in_senders && !TextUtils.isEmpty(search) &&
+                            plus.size() + minus.size() + opt.size() == 0)
                         or.add(new FromStringTerm(search));
                 }
 
@@ -1015,7 +1014,8 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
                     for (String term : andBcc)
                         and.add(new RecipientStringTerm(Message.RecipientType.BCC, term));
                 } else {
-                    if (in_recipients && !TextUtils.isEmpty(search)) {
+                    if (in_recipients && !TextUtils.isEmpty(search) &&
+                            plus.size() + minus.size() + opt.size() == 0) {
                         or.add(new RecipientStringTerm(Message.RecipientType.TO, search));
                         or.add(new RecipientStringTerm(Message.RecipientType.CC, search));
                         or.add(new RecipientStringTerm(Message.RecipientType.BCC, search));
@@ -1038,7 +1038,8 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
                         for (String term : andKeyword)
                             and.add(new FlagTerm(new Flags(term), true));
                     } else {
-                        if (in_keywords && !TextUtils.isEmpty(search)) {
+                        if (in_keywords && !TextUtils.isEmpty(search) &&
+                                plus.size() + minus.size() + opt.size() == 0) {
                             String keyword = MessageHelper.sanitizeKeyword(search);
                             if (TextUtils.isEmpty(keyword))
                                 Log.w("Keyword empty=" + search);