diff --git a/app/src/main/java/eu/faircode/email/AdapterAccount.java b/app/src/main/java/eu/faircode/email/AdapterAccount.java
index e57888a1a7..7130188fef 100644
--- a/app/src/main/java/eu/faircode/email/AdapterAccount.java
+++ b/app/src/main/java/eu/faircode/email/AdapterAccount.java
@@ -514,6 +514,8 @@ public class AdapterAccount extends RecyclerView.Adapter<AdapterAccount.ViewHold
                                 }
 
                                 db.account().setAccountSynchronize(id, sync);
+                                if (!sync)
+                                    db.message().resetFts(id);
 
                                 db.setTransactionSuccessful();
                             } finally {
diff --git a/app/src/main/java/eu/faircode/email/CloudSync.java b/app/src/main/java/eu/faircode/email/CloudSync.java
index c0350e71ac..fc329f7ea4 100644
--- a/app/src/main/java/eu/faircode/email/CloudSync.java
+++ b/app/src/main/java/eu/faircode/email/CloudSync.java
@@ -478,6 +478,8 @@ public class CloudSync {
                         }
                         raccount.move_to = laccount.move_to; // TODO
                         db.account().updateAccount(raccount);
+                        if (!raccount.synchronize)
+                            db.message().resetFts(raccount.id);
                     }
 
                     if (raccount.id != null) {
diff --git a/app/src/main/java/eu/faircode/email/DaoMessage.java b/app/src/main/java/eu/faircode/email/DaoMessage.java
index 89a9524d73..e4250a681e 100644
--- a/app/src/main/java/eu/faircode/email/DaoMessage.java
+++ b/app/src/main/java/eu/faircode/email/DaoMessage.java
@@ -944,8 +944,10 @@ public interface DaoMessage {
             " AND account IN (SELECT id FROM account WHERE pop = " + EntityAccount.TYPE_IMAP + ")")
     int clearRawMessages();
 
-    @Query("UPDATE message SET fts = 0 WHERE NOT (fts IS 0)")
-    int resetFts();
+    @Query("UPDATE message SET fts = 0" +
+            " WHERE NOT (fts IS 0)" +
+            " AND (:account IS NULL OR message.account = :account)")
+    int resetFts(Long account);
 
     @Query("DELETE FROM message WHERE id = :id")
     int deleteMessage(long id);
diff --git a/app/src/main/java/eu/faircode/email/FragmentAccount.java b/app/src/main/java/eu/faircode/email/FragmentAccount.java
index 2531b9dfdb..2bbabd786f 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAccount.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAccount.java
@@ -1329,9 +1329,11 @@ public class FragmentAccount extends FragmentBase {
                     if (account.primary)
                         db.account().resetPrimary();
 
-                    if (update)
+                    if (update) {
                         db.account().updateAccount(account);
-                    else
+                        if (!account.synchronize)
+                            db.message().resetFts(account.id);
+                    } else
                         account.id = db.account().insertAccount(account);
 
                     args.putLong("account", account.id);
@@ -1453,6 +1455,8 @@ public class FragmentAccount extends FragmentBase {
                     account.swipe_right = (right == null ? null : right.id);
                     account.move_to = (move == null ? null : move.id);
                     db.account().updateAccount(account);
+                    if (!account.synchronize)
+                        db.message().resetFts(account.id);
 
                     db.setTransactionSuccessful();
                 } finally {
diff --git a/app/src/main/java/eu/faircode/email/FragmentGmail.java b/app/src/main/java/eu/faircode/email/FragmentGmail.java
index 18c1f00f27..3000b4e5c3 100644
--- a/app/src/main/java/eu/faircode/email/FragmentGmail.java
+++ b/app/src/main/java/eu/faircode/email/FragmentGmail.java
@@ -571,6 +571,8 @@ public class FragmentGmail extends FragmentBase {
                             FragmentDialogSwipes.setDefaultFolderActions(context, account);
 
                         db.account().updateAccount(account);
+                        if (!account.synchronize)
+                            db.message().resetFts(account.id);
 
                         if (TextUtils.isEmpty(name))
                             name = user.split("@")[0];
diff --git a/app/src/main/java/eu/faircode/email/FragmentOAuth.java b/app/src/main/java/eu/faircode/email/FragmentOAuth.java
index add6530c1e..6d1bc56f23 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOAuth.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOAuth.java
@@ -995,6 +995,8 @@ public class FragmentOAuth extends FragmentBase {
                             FragmentDialogSwipes.setDefaultFolderActions(context, account);
 
                         db.account().updateAccount(account);
+                        if (!account.synchronize)
+                            db.message().resetFts(account.id);
 
                         // Create identities
                         if (!inbound_only)
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
index 7140bffee2..259823a832 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
@@ -588,7 +588,7 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
                             }
 
                             DB db = DB.getInstance(context);
-                            db.message().resetFts();
+                            db.message().resetFts(null);
 
                             return null;
                         }
diff --git a/app/src/main/java/eu/faircode/email/FragmentPop.java b/app/src/main/java/eu/faircode/email/FragmentPop.java
index dcafc8e8ce..d58dbc3b43 100644
--- a/app/src/main/java/eu/faircode/email/FragmentPop.java
+++ b/app/src/main/java/eu/faircode/email/FragmentPop.java
@@ -670,9 +670,11 @@ public class FragmentPop extends FragmentBase {
                     if (account.primary)
                         db.account().resetPrimary();
 
-                    if (update)
+                    if (update) {
                         db.account().updateAccount(account);
-                    else
+                        if (!account.synchronize)
+                            db.message().resetFts(account.id);
+                    } else
                         account.id = db.account().insertAccount(account);
 
                     args.putLong("account", account.id);
diff --git a/app/src/main/java/eu/faircode/email/Fts4DbHelper.java b/app/src/main/java/eu/faircode/email/Fts4DbHelper.java
index 0bf9a2f3f4..2fdb1fd1da 100644
--- a/app/src/main/java/eu/faircode/email/Fts4DbHelper.java
+++ b/app/src/main/java/eu/faircode/email/Fts4DbHelper.java
@@ -57,7 +57,7 @@ public class Fts4DbHelper extends SQLiteOpenHelper {
         boolean has = context.getDatabasePath(DATABASE_NAME).exists();
         if (instance == null || !has) {
             if (!has)
-                DB.getInstance(context).message().resetFts();
+                DB.getInstance(context).message().resetFts(null);
             instance = new Fts4DbHelper(context);
         }
         return instance.getWritableDatabase();
@@ -96,7 +96,7 @@ public class Fts4DbHelper extends SQLiteOpenHelper {
 
         onCreate(db);
 
-        DB.getInstance(context).message().resetFts();
+        DB.getInstance(context).message().resetFts(null);
     }
 
     static void insert(SQLiteDatabase db, EntityMessage message, List<EntityAttachment> attachments, String text) {
diff --git a/app/src/main/java/eu/faircode/email/Fts5DbHelper.java b/app/src/main/java/eu/faircode/email/Fts5DbHelper.java
index 9f62f82522..eac4f73a72 100644
--- a/app/src/main/java/eu/faircode/email/Fts5DbHelper.java
+++ b/app/src/main/java/eu/faircode/email/Fts5DbHelper.java
@@ -85,7 +85,7 @@ public class Fts5DbHelper extends SQLiteOpenHelper {
 
         onCreate(db);
 
-        DB.getInstance(context).message().resetFts();
+        DB.getInstance(context).message().resetFts(null);
     }
 
     static void insert(SQLiteDatabase db, EntityMessage message, String text) {