From 2827e8abebf492ed212f53c0ee14a452c0b26a78 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 9 Jun 2019 18:45:33 +0200
Subject: [PATCH] Small fix

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

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index e3ab3cafda..a092a88816 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -1037,7 +1037,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
                     ActionData data = new ActionData();
                     data.hasJunk = hasJunk;
-                    data.delete = (inTrash || !hasTrash);
+                    data.delete = (inTrash || !hasTrash || inOutbox);
                     data.message = message;
                     bnvActions.setTag(data);
 
@@ -2902,6 +2902,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                                                 return null;
 
                                             EntityFolder folder = db.folder().getFolder(message.folder);
+                                            if (folder == null)
+                                                return null;
 
                                             if (EntityFolder.OUTBOX.equals(folder.type)) {
                                                 db.message().deleteMessage(id);