Fixed cross account move without msgid

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

@@ -953,17 +953,9 @@ class Core {
 
             Log.i(folder.name + " reading " + file);
             try (InputStream is = new BufferedInputStream(new FileInputStream(file))) {
-                imessage = new MimeMessage(isession, is);
-            }
-
-            // Check message ID to check raw message file content
-            MessageHelper helper = new MessageHelper(imessage, context);
-            String msgid = helper.getMessageID();
-            if (TextUtils.isEmpty(message.msgid) || !Objects.equals(message.msgid, msgid)) {
-                String msg = "Inconsistent msgid=" + message.msgid + "/" + msgid;
-                Log.e(msg);
-                throw new IllegalArgumentException(msg);
+                imessage = new MimeMessageEx(isession, is, message.msgid);
             }
+            imessage.saveChanges();
         }
 
         db.message().setMessageRaw(message.id, true);

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

@@ -35,6 +35,11 @@ public class MimeMessageEx extends MimeMessage {
         this.msgid = msgid;
     }
 
+    MimeMessageEx(Session session, InputStream is, String msgid) throws MessagingException {
+        super(session, is);
+        this.msgid = msgid;
+    }
+
     MimeMessageEx(Session session, InputStream is, MimeMessage original) throws MessagingException {
         super(session, is);
         this.original = original;