[geary/cherry-pick-9bf73077] Merge branch 'mjog/1079-mesage-id-from' into 'mainline'

[Michael Gratton <mjog src gnome org>]

commit 29c734ff68c1ce0a95634167e46cdafe4fe8f9f7
Author: Michael Gratton <mike vee net>
Date:   Wed Jan 27 13:14:38 2021 +0000

    Merge branch 'mjog/1079-mesage-id-from' into 'mainline'
    
    Geary.Smtp.ClientService: Get default Message-Id domain from From
    
    Closes #1079
    
    See merge request GNOME/geary!644
    
    (cherry picked from commit 9bf730778b2c80d54febd0fb08283dfc5339f9b7)
    
    bc7ec8dd Geary.Smtp.ClientService: Get default Message-Id domain from From

 src/engine/smtp/smtp-client-service.vala | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/src/engine/smtp/smtp-client-service.vala b/src/engine/smtp/smtp-client-service.vala
index fa86226c8..49c09cfa1 100644
--- a/src/engine/smtp/smtp-client-service.vala
+++ b/src/engine/smtp/smtp-client-service.vala
@@ -121,9 +121,10 @@ public class Geary.Smtp.ClientService : Geary.ClientService {
         debug("Saving composed email: %s", email_subject(composed));
 
         // XXX work out what our public IP address is somehow and use
-        // that in preference to the sender's domain
-        string domain = composed.sender != null
-            ? composed.sender.domain
+        // that in preference to the originator's domain
+        var from = composed.from;
+        var domain = from != null && !from.is_empty
+            ? from[0].domain
             : this.account.primary_mailbox.domain;
         Geary.RFC822.Message rfc822 =
             yield new Geary.RFC822.Message.from_composed_email(