diff --git a/app/src/main/java/eu/faircode/email/AdapterFolder.java b/app/src/main/java/eu/faircode/email/AdapterFolder.java
index 0cc70e1bec..ab900b7d19 100644
--- a/app/src/main/java/eu/faircode/email/AdapterFolder.java
+++ b/app/src/main/java/eu/faircode/email/AdapterFolder.java
@@ -617,7 +617,8 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
                                                 List<Long> ids = db.message().getMessageByFolder(folder);
                                                 for (Long id : ids) {
                                                     EntityMessage message = db.message().getMessage(id);
-                                                    EntityOperation.queue(context, message, EntityOperation.DELETE);
+                                                    if (message.msgid != null || message.uid != null)
+                                                        EntityOperation.queue(context, message, EntityOperation.DELETE);
                                                 }
 
                                                 db.setTransactionSuccessful();