Allow trashing drafts

app/src/main/java/eu/faircode/email/FragmentMessages.java

@@ -806,7 +806,7 @@ public class FragmentMessages extends FragmentEx {
                         if (result[4] && !result[6] && !result[9]) // has archive and not is archive
                             popupMenu.getMenu().add(Menu.NONE, action_archive, 5, R.string.title_archive);
 
-                        if (result[7] || result[9]) // is trash/drafts
+                        if (result[7]) // is trash
                             popupMenu.getMenu().add(Menu.NONE, action_delete, 6, R.string.title_delete);
                         else if (result[5]) // has trash
                             popupMenu.getMenu().add(Menu.NONE, action_trash, 6, R.string.title_trash);

app/src/main/java/eu/faircode/email/ServiceSynchronize.java

@@ -1704,7 +1704,7 @@ public class ServiceSynchronize extends LifecycleService {
         if (prefs.getBoolean("autoread", false) && !imessage.isSet(Flags.Flag.SEEN))
             imessage.setFlag(Flags.Flag.SEEN, true);
 
-        if (istore.hasCapability("MOVE")) {
+        if (istore.hasCapability("MOVE") && !EntityFolder.DRAFTS.equals(folder.type)) {
             Folder itarget = istore.getFolder(target.name);
             ifolder.moveMessages(new Message[]{imessage}, itarget);
         } else {