From 7ba052ef181e9975f5721a52bba743c1cd45277c Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 2 Mar 2020 08:42:49 +0100
Subject: [PATCH] Delete when no archive/junk

---
 app/src/main/java/eu/faircode/email/AdapterMessage.java | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index f7e57f6167..e33d47cfe9 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -3042,6 +3042,14 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     boolean inJunk = EntityFolder.JUNK.equals(message.folderType);
                     final boolean delete = (inTrash || !hasTrash);
 
+                    if (!hasArchive && !hasJunk) {
+                        if (delete)
+                            onActionDelete(message);
+                        else
+                            properties.move(message.id, EntityFolder.TRASH);
+                        return;
+                    }
+
                     PopupMenuLifecycle popupMenu = new PopupMenuLifecycle(context, powner, ibMore);
                     popupMenu.inflate(R.menu.popup_message_move);
                     popupMenu.getMenu().findItem(R.id.menu_archive).setEnabled(message.uid != null && (hasArchive && !inArchive));
@@ -3069,6 +3077,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                             }
                         }
                     });
+
                     popupMenu.show();
                 }