diff --git a/app/src/main/java/eu/faircode/email/Fts4DbHelper.java b/app/src/main/java/eu/faircode/email/Fts4DbHelper.java
index 2dfecac079..eab05a1eaa 100644
--- a/app/src/main/java/eu/faircode/email/Fts4DbHelper.java
+++ b/app/src/main/java/eu/faircode/email/Fts4DbHelper.java
@@ -31,6 +31,7 @@ import android.text.TextUtils;
 
 import androidx.preference.PreferenceManager;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -272,6 +273,11 @@ public class Fts4DbHelper extends SQLiteOpenHelper {
     }
 
     static void delete(Context context) {
-        context.getDatabasePath(DATABASE_NAME).delete();
+        File db = context.getDatabasePath(DATABASE_NAME);
+        for (File file : db.getParentFile().listFiles())
+            if (file.getName().startsWith(DATABASE_NAME)) {
+                Log.i("FTS delete=" + file);
+                file.delete();
+            }
     }
 }
diff --git a/app/src/main/java/eu/faircode/email/Fts5DbHelper.java b/app/src/main/java/eu/faircode/email/Fts5DbHelper.java
index 7b13e9ed9b..a7bc02c064 100644
--- a/app/src/main/java/eu/faircode/email/Fts5DbHelper.java
+++ b/app/src/main/java/eu/faircode/email/Fts5DbHelper.java
@@ -27,6 +27,7 @@ import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 import android.text.TextUtils;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -252,6 +253,11 @@ public class Fts5DbHelper extends SQLiteOpenHelper {
     }
 
     static void delete(Context context) {
-        context.getDatabasePath(DATABASE_NAME).delete();
+        File db = context.getDatabasePath(DATABASE_NAME);
+        for (File file : db.getParentFile().listFiles())
+            if (file.getName().startsWith(DATABASE_NAME)) {
+                Log.i("FTS delete=" + file);
+                file.delete();
+            }
     }
 }