diff --git a/app/src/main/java/com/sun/mail/imap/IMAPFolder.java b/app/src/main/java/com/sun/mail/imap/IMAPFolder.java
index 67492c55ae..2131ce6ba1 100644
--- a/app/src/main/java/com/sun/mail/imap/IMAPFolder.java
+++ b/app/src/main/java/com/sun/mail/imap/IMAPFolder.java
@@ -2378,6 +2378,9 @@ public class IMAPFolder extends Folder implements UIDFolder, ResponseHandler {
 
 	} catch (CommandFailedException cfx) {
 	    // unsupported charset or search criterion
+		eu.faircode.email.Log.e(cfx);
+		if (term instanceof MessageIDTerm)
+			throw new MessagingException(cfx.getMessage(), cfx);
 	    return super.search(term);
 	} catch (SearchException sex) {
 	    // too complex for IMAP