From c9dcd2a9003c1f1f34e15698903149946994cd84 Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Thu, 15 Oct 2009 21:18:49 +0200
Subject: Bug #597473 - Reply-all composes reply to wrong address

---
 mail/em-composer-utils.c | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'mail/em-composer-utils.c')

diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index 81055d1ab0..b3bb7e6b59 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -2005,6 +2005,12 @@ get_reply_all (CamelMimeMessage *message, CamelInternetAddress *to, CamelInterne
 	concat_unique_addrs (cc, to_addrs, rcpt_hash);
 	concat_unique_addrs (cc, cc_addrs, rcpt_hash);
 
+	/* use reply_to for an empty To: */
+	if (reply_to && camel_address_length ((CamelAddress *) to) == 0) {
+		camel_internet_address_get (reply_to, 0, &name, &addr);
+		camel_internet_address_add (to, name, addr);
+	}
+	
 	/* promote the first Cc: address to To: if To: is empty */
 	if (camel_address_length ((CamelAddress *) to) == 0 && camel_address_length ((CamelAddress *)cc) > 0) {
 		camel_internet_address_get (cc, 0, &name, &addr);
-- 
cgit