From aa192ef3a7f9310243d3902a2192263a50c87ec6 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 3 May 2020 11:01:50 +0200
Subject: [PATCH] Make sure drafts is added before moving

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

diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 206af29990..bf823c258b 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -3786,8 +3786,10 @@ public class FragmentCompose extends FragmentBase {
                     EntityFolder trash = db.folder().getFolderByType(draft.account, EntityFolder.TRASH);
                     if (empty || trash == null || discard_delete)
                         EntityOperation.queue(context, draft, EntityOperation.DELETE);
-                    else
+                    else {
+                        EntityOperation.queue(context, draft, EntityOperation.ADD);
                         EntityOperation.queue(context, draft, EntityOperation.MOVE, trash.id);
+                    }
 
                     Handler handler = new Handler(context.getMainLooper());
                     handler.post(new Runnable() {