diff --git a/app/src/main/java/eu/faircode/email/DaoMessage.java b/app/src/main/java/eu/faircode/email/DaoMessage.java
index 151ea630ff..fbdd71599b 100644
--- a/app/src/main/java/eu/faircode/email/DaoMessage.java
+++ b/app/src/main/java/eu/faircode/email/DaoMessage.java
@@ -349,8 +349,9 @@ public interface DaoMessage {
             //" OR (:message AND `preview` LIKE :find COLLATE NOCASE)" + // no index
             //" OR (:notes AND `notes` LIKE :find COLLATE NOCASE)" + // no index
             //" OR (:headers AND `headers` LIKE :find COLLATE NOCASE)" + // no index
-            " OR (attachment.name LIKE :find COLLATE NOCASE)" + // no index
-            " OR (attachment.type LIKE :find COLLATE NOCASE)) AS matched" + // no index
+            //" OR (attachment.name LIKE :find COLLATE NOCASE)" + // no index
+            //" OR (attachment.type LIKE :find COLLATE NOCASE)" +
+            ") AS matched" + // no index
             " FROM message" +
             " LEFT JOIN attachment ON attachment.message = message.id" +
             " WHERE NOT ui_hide" +