diff --git a/app/src/main/java/eu/faircode/email/SearchDataSource.java b/app/src/main/java/eu/faircode/email/SearchDataSource.java
index f2cc10a551..fe52e55fb1 100644
--- a/app/src/main/java/eu/faircode/email/SearchDataSource.java
+++ b/app/src/main/java/eu/faircode/email/SearchDataSource.java
@@ -124,6 +124,7 @@ public class SearchDataSource extends PositionalDataSource<TupleMessageEx> imple
             }
 
             Properties props = MessageHelper.getSessionProperties(account.auth_type);
+            props.setProperty("mail.imap.throwsearchexception", "true");
             Session isession = Session.getInstance(props, null);
 
             Log.i(Helper.TAG, "SDS connecting account=" + account.name);