- Fix lack of Cc and Reply-To headers on messages list, add them to default headers list (#1487989)

2 files changed, 2 insertions, 4 deletions

diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php
index c2a4a0dc2..411be5202 100644
--- a/program/include/rcube_imap.php
+++ b/program/include/rcube_imap.php
@@ -83,16 +83,14 @@ class rcube_imap
 
     /**
      * All (additional) headers used (in any way) by Roundcube
-     * Not listed here: DATE, FROM, TO, SUBJECT, CONTENT-TYPE, LIST-POST
+     * Not listed here: DATE, FROM, TO, CC, REPLY-TO, SUBJECT, CONTENT-TYPE, LIST-POST
      * (used for messages listing) are hardcoded in rcube_imap_generic::fetchHeaders()
      *
      * @var array
      * @see rcube_imap::fetch_add_headers
      */
     private $all_headers = array(
-        'REPLY-TO',
         'IN-REPLY-TO',
-        'CC',
         'BCC',
         'MESSAGE-ID',
         'CONTENT-TRANSFER-ENCODING',
diff --git a/program/include/rcube_imap_generic.php b/program/include/rcube_imap_generic.php
index 02211aa79..a30fbc0fd 100644
--- a/program/include/rcube_imap_generic.php
+++ b/program/include/rcube_imap_generic.php
@@ -1537,7 +1537,7 @@ class rcube_imap_generic
         if ($bodystr)
             $request .= "BODYSTRUCTURE ";
         $request .= "BODY.PEEK[HEADER.FIELDS (DATE FROM TO SUBJECT CONTENT-TYPE ";
-        $request .= "LIST-POST DISPOSITION-NOTIFICATION-TO".$add.")])";
+        $request .= "CC REPLY-TO LIST-POST DISPOSITION-NOTIFICATION-TO".$add.")])";
 
         if (!$this->putLine($request)) {
             $this->setError(self::ERROR_COMMAND, "Unable to send command: $request");