diff --git a/app/src/main/java/eu/faircode/email/WorkerFts.java b/app/src/main/java/eu/faircode/email/WorkerFts.java
index a5ee015a2c..0e6a5e086a 100644
--- a/app/src/main/java/eu/faircode/email/WorkerFts.java
+++ b/app/src/main/java/eu/faircode/email/WorkerFts.java
@@ -86,6 +86,8 @@ public class WorkerFts extends Worker {
                             if (ids.size() > INDEX_BATCH_SIZE)
                                 markIndexed(db, ids);
                         } catch (Throwable ex) {
+                            if (ex instanceof OutOfMemoryError)
+                                ids.add(id);
                             Log.e(ex);
                         }
                 }