diff --git a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
index 2faa63d63b..17a72b7a68 100644
--- a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
+++ b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
@@ -404,6 +404,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
                                         if (criteria.in_receipients) {
                                             or.add(new RecipientStringTerm(Message.RecipientType.TO, search));
                                             or.add(new RecipientStringTerm(Message.RecipientType.CC, search));
+                                            or.add(new RecipientStringTerm(Message.RecipientType.BCC, search));
                                         }
                                         if (criteria.in_subject)
                                             or.add(new SubjectTerm(search));
diff --git a/app/src/main/java/eu/faircode/email/DaoMessage.java b/app/src/main/java/eu/faircode/email/DaoMessage.java
index 10ea7165a2..9574c386d2 100644
--- a/app/src/main/java/eu/faircode/email/DaoMessage.java
+++ b/app/src/main/java/eu/faircode/email/DaoMessage.java
@@ -283,6 +283,7 @@ public interface DaoMessage {
             " OR `from` LIKE :find COLLATE NOCASE" +
             " OR `to` LIKE :find COLLATE NOCASE" +
             " OR `cc` LIKE :find COLLATE NOCASE" +
+            " OR `bcc` LIKE :find COLLATE NOCASE" +
             " OR `subject` LIKE :find COLLATE NOCASE" +
             " OR `keywords` LIKE :find COLLATE NOCASE" +
             " OR `preview` LIKE :find COLLATE NOCASE) AS matched" +
diff --git a/app/src/main/java/eu/faircode/email/FtsDbHelper.java b/app/src/main/java/eu/faircode/email/FtsDbHelper.java
index 8ba130d8c7..c3b64f05fe 100644
--- a/app/src/main/java/eu/faircode/email/FtsDbHelper.java
+++ b/app/src/main/java/eu/faircode/email/FtsDbHelper.java
@@ -82,6 +82,8 @@ public class FtsDbHelper extends SQLiteOpenHelper {
             address.addAll(Arrays.asList(message.to));
         if (message.cc != null)
             address.addAll(Arrays.asList(message.cc));
+        if (message.bcc != null)
+            address.addAll(Arrays.asList(message.bcc));
 
         delete(db, message.id);