[evolution/gnome-3-24] Reply-To header value lost on Draft message reopen

[Milan Crha <mcrha src gnome org>]

commit 9abcf4affc61d963cbf2a5364086b96eccbff561
Author: Milan Crha <mcrha redhat com>
Date:   Thu Jul 27 12:19:45 2017 +0200

    Reply-To header value lost on Draft message reopen
    
    This had been reported downstream at:
    https://bugzilla.redhat.com/show_bug.cgi?id=1475369

 src/composer/e-msg-composer.c |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)
---
diff --git a/src/composer/e-msg-composer.c b/src/composer/e-msg-composer.c
index 304e0f4..97b775d 100644
--- a/src/composer/e-msg-composer.c
+++ b/src/composer/e-msg-composer.c
@@ -3608,6 +3608,17 @@ e_msg_composer_setup_with_message (EMsgComposer *composer,
                g_strfreev (flags);
        }
 
+       if (is_message_from_draft || (
+           camel_medium_get_header (CAMEL_MEDIUM (message), "X-Evolution-Identity") &&
+           camel_medium_get_header (CAMEL_MEDIUM (message), "X-Evolution-Transport"))) {
+               const gchar *reply_to;
+
+               reply_to = camel_medium_get_header (CAMEL_MEDIUM (message), "Reply-To");
+
+               if (reply_to)
+                       e_composer_header_table_set_reply_to (table, reply_to);
+       }
+
        /* Remove any other X-Evolution-* headers that may have been set */
        camel_name_value_array_free (mail_tool_remove_xevolution_headers (message));