[geary: 11/23] Restore code to set reply-to header

[Michael Gratton <mjog src gnome org>]

commit 132daf54cf27424b4f2e651ae25e8fd8f8cc98d5
Author: Torben <torben letorbi gmail com>
Date:   Wed Dec 11 23:40:00 2019 +0100

    Restore code to set reply-to header

 src/engine/rfc822/rfc822-message.vala | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/src/engine/rfc822/rfc822-message.vala b/src/engine/rfc822/rfc822-message.vala
index 863c6e19..4f56e270 100644
--- a/src/engine/rfc822/rfc822-message.vala
+++ b/src/engine/rfc822/rfc822-message.vala
@@ -142,10 +142,6 @@ public class Geary.RFC822.Message : BaseObject, EmailHeaderSet {
                 this.message.add_mailbox(FROM, mailbox.name, mailbox.address);
         }
 
-        if (email.sender != null) {
-            this.message.add_mailbox(SENDER, this.sender.name, this.sender.address);
-        }
-
         // Optional headers
         if (email.to != null) {
             this.to = email.to;
@@ -165,6 +161,16 @@ public class Geary.RFC822.Message : BaseObject, EmailHeaderSet {
                 this.message.add_mailbox(BCC, mailbox.name, mailbox.address);
         }
 
+        if (email.sender != null) {
+            this.message.add_mailbox(SENDER, this.sender.name, this.sender.address);
+        }
+
+        if (email.reply_to != null) {
+            this.reply_to = email.reply_to;
+            foreach (RFC822.MailboxAddress mailbox in email.reply_to)
+                this.message.add_mailbox(REPLY_TO, mailbox.name, mailbox.address);
+        }
+
         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