From 9b82062f5a5e439edd0a7a3b352ce8159b3aa797 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Wed, 01 May 2013 04:41:18 -0400
Subject: [PATCH] Fix so Sender: address is added to Cc: field on reply to all (#1489011)

---
 CHANGELOG                      |    1 +
 program/steps/mail/compose.inc |    2 ++
 2 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 3056955..b1248ea 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Fix so Sender: address is added to Cc: field on reply to all (#1489011)
 - Fix so addressbook_search_mode works also for group search (#1489079)
 - Fix removal of a contact from a group in LDAP addressbook (#1489081)
 - Inlcude SQL query in the log on SQL error (#1489064)
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 415ddeb..b0591d0 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -318,6 +318,8 @@
         $fvalue .= $v;
       if ($v = $MESSAGE->headers->cc)
         $fvalue .= (!empty($fvalue) ? $separator : '') . $v;
+      if ($v = $MESSAGE->headers->get('Sender', false))
+        $fvalue .= (!empty($fvalue) ? $separator : '') . $v;
     }
   }
   else if (in_array($compose_mode, array(RCUBE_COMPOSE_DRAFT, RCUBE_COMPOSE_EDIT))) {

--
Gitblit v1.9.1