[geary/cherry-pick-3951f6e4] Merge branch 'mjog/message-id-critical-saving-draft' into 'mainline'

[Michael Gratton <mjog src gnome org>]

commit a85265178a485f40c6fda45f73f0b422b0671f4a
Author: Michael Gratton <mike vee net>
Date:   Wed Mar 25 21:55:33 2020 +0000

    Merge branch 'mjog/message-id-critical-saving-draft' into 'mainline'
    
    Geary.RFC822.Message: Fix critical when saving draft
    
    See merge request GNOME/geary!465
    
    (cherry picked from commit 3951f6e43a55a68c3cef374d10968840459af973)
    
    5aef5125 Geary.RFC822.Message: Fix critical when saving draft

 src/engine/rfc822/rfc822-message.vala | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/src/engine/rfc822/rfc822-message.vala b/src/engine/rfc822/rfc822-message.vala
index 1ee7b698..b7df6725 100644
--- a/src/engine/rfc822/rfc822-message.vala
+++ b/src/engine/rfc822/rfc822-message.vala
@@ -139,11 +139,6 @@ public class Geary.RFC822.Message : BaseObject, EmailHeaderSet {
         this.date = email.date;
         this.message.set_date(this.date.value);
 
-        // Not actually required, but effectively required since
-        // otherwise mail servers will treat email as spam
-        this.message_id = new MessageID(message_id);
-        this.message.set_message_id(message_id);
-
         // Optional headers
 
         if (email.to != null) {
@@ -175,6 +170,11 @@ public class Geary.RFC822.Message : BaseObject, EmailHeaderSet {
                 this.message.add_mailbox(REPLY_TO, mailbox.name, mailbox.address);
         }
 
+        if (message_id != null) {
+            this.message_id = new MessageID(message_id);
+            this.message.set_message_id(message_id);
+        }
+
         if (email.in_reply_to != null) {
             this.in_reply_to = email.in_reply_to;
             // We could use `this.message.add_mailbox()` in a similar way like