diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 7c9383a6b7..cfb54a9471 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -234,7 +234,8 @@ class Core {
                         if (message != null)
                             db.message().setMessageError(message.id, Helper.formatThrowable(ex, true));
 
-                        if (ex instanceof MessageRemovedException ||
+                        if (ex instanceof OutOfMemoryError ||
+                                ex instanceof MessageRemovedException ||
                                 ex instanceof FolderNotFoundException ||
                                 ex instanceof IllegalArgumentException) {
                             Log.w("Unrecoverable");
diff --git a/app/src/main/java/eu/faircode/email/ServiceSend.java b/app/src/main/java/eu/faircode/email/ServiceSend.java
index c2c217a6ab..a2a8e66ee6 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSend.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSend.java
@@ -213,7 +213,8 @@ public class ServiceSend extends LifecycleService {
                                     if (message != null)
                                         db.message().setMessageError(message.id, Helper.formatThrowable(ex));
 
-                                    if (ex instanceof MessageRemovedException ||
+                                    if (ex instanceof OutOfMemoryError ||
+                                            ex instanceof MessageRemovedException ||
                                             ex instanceof SendFailedException ||
                                             ex instanceof IllegalArgumentException) {
                                         Log.w("Unrecoverable");