diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 30461c6941..85a5f5ac13 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -8312,6 +8312,11 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     return null;
                 }
 
+                @Override
+                protected void onExecuted(Bundle args, Void data) {
+                    WorkerFts.init(context, false);
+                }
+
                 @Override
                 protected void onException(Bundle args, Throwable ex) {
                     Log.unexpectedError(getParentFragmentManager(), ex);
diff --git a/app/src/main/java/eu/faircode/email/DaoMessage.java b/app/src/main/java/eu/faircode/email/DaoMessage.java
index 09d6fa867b..f3e9f8e9d0 100644
--- a/app/src/main/java/eu/faircode/email/DaoMessage.java
+++ b/app/src/main/java/eu/faircode/email/DaoMessage.java
@@ -835,7 +835,7 @@ public interface DaoMessage {
     int setMessageContent(long id, boolean content, String language, Integer plain_only, String preview, String warning);
 
     @Query("UPDATE message" +
-            " SET notes = :notes, notes_color = :color" +
+            " SET notes = :notes, notes_color = :color, fts = 0" +
             " WHERE id = :id" +
             " AND NOT (notes IS :notes AND notes_color IS :color)")
     int setMessageNotes(long id, String notes, Integer color);