diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 09bdd66683..08865760a5 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -634,7 +634,10 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                         bnvActions.setTag(data);
 
                         bnvActions.getMenu().findItem(R.id.action_more).setVisible(!inOutbox);
-                        bnvActions.getMenu().findItem(R.id.action_delete).setVisible((message.uid != null && hasTrash) || (inOutbox && !TextUtils.isEmpty(message.error)));
+                        bnvActions.getMenu().findItem(R.id.action_delete).setVisible(
+                                (inTrash && message.msgid != null) ||
+                                        (!inTrash && hasTrash && message.uid != null) ||
+                                        (inOutbox && !TextUtils.isEmpty(message.error)));
                         bnvActions.getMenu().findItem(R.id.action_delete).setTitle(inTrash ? R.string.title_delete : R.string.title_trash);
                         bnvActions.getMenu().findItem(R.id.action_move).setVisible(message.uid != null);
                         bnvActions.getMenu().findItem(R.id.action_archive).setVisible(message.uid != null && !inArchive && hasArchive);