Restored compose logic

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

@@ -872,9 +872,14 @@ public class FragmentCompose extends FragmentEx {
             String subject = args.getString("subject");
             String body = args.getString("body");
 
-            // Get draft & selected identity
+            EntityMessage draft;
+
             DB db = DB.getInstance(context);
-            EntityMessage draft = db.message().getMessage(id);
+            try {
+                db.beginTransaction();
+
+                // Get draft & selected identity
+                draft = db.message().getMessage(id);
                 EntityIdentity identity = db.identity().getIdentity(iid);
 
                 // Draft deleted by server
@@ -900,9 +905,6 @@ public class FragmentCompose extends FragmentEx {
 
                 String pbody = "<pre>" + body.replaceAll("\\r?\\n", "<br />") + "</pre>";
 
-            try {
-                db.beginTransaction();
-
                 // Execute action
                 if (action == R.id.action_trash) {
                     draft.ui_seen = true;
@@ -932,13 +934,11 @@ public class FragmentCompose extends FragmentEx {
                     draft.write(context, pbody);
 
                     // Check data
-                    if (action == R.id.action_send) {
                     if (draft.identity == null)
                         throw new IllegalArgumentException(context.getString(R.string.title_from_missing));
 
                     if (draft.to == null && draft.cc == null && draft.bcc == null)
                         throw new IllegalArgumentException(context.getString(R.string.title_to_missing));
-                    }
 
                     // Save message ID
                     String msgid = draft.msgid;