- Add Reply-to-List feature (#1484252)

- Add Mail-Followup-To/Mail-Reply-To support (#1485547)


git-svn-id: https://svn.roundcube.net/trunk@4032 208e9e7b-5314-0410-a742-e7e81cd9613c

2 files changed, 7 insertions, 2 deletions

diff --git a/roundcubemail/program/include/rcube_imap_generic.php b/roundcubemail/program/include/rcube_imap_generic.php
index 160c154c1..95e1180c5 100644
--- a/roundcubemail/program/include/rcube_imap_generic.php
+++ b/roundcubemail/program/include/rcube_imap_generic.php
@@ -1071,7 +1071,8 @@ class rcube_imap_generic
 	    $request .= "(DATE FROM TO SUBJECT REPLY-TO IN-REPLY-TO CC BCC ";
 	    $request .= "CONTENT-TRANSFER-ENCODING CONTENT-TYPE MESSAGE-ID ";
 	    $request .= "REFERENCES DISPOSITION-NOTIFICATION-TO X-PRIORITY ";
-	    $request .= "X-DRAFT-INFO".$add.")])";
+	    $request .= "X-DRAFT-INFO LIST-POST MAIL-FOLLOWUP-TO MAIL-REPLY-TO ";
+        $request .= "RETURN-PATH".$add.")])";
 
 	    if (!$this->putLine($request)) {
 		    return false;
diff --git a/roundcubemail/program/include/rcube_message.php b/roundcubemail/program/include/rcube_message.php
index 4351f17f5..6a6186d47 100644
--- a/roundcubemail/program/include/rcube_message.php
+++ b/roundcubemail/program/include/rcube_message.php
@@ -115,7 +115,11 @@ class rcube_message
      */
     public function get_header($name, $raw = false)
     {
-        $value = $this->headers->$name;
+        if ($this->headers->$name)
+            $value = $this->headers->$name;
+        else if ($this->headers->others[$name])
+            $value = $this->headers->others[$name];
+
         return $raw ? $value : $this->imap->decode_header($value);
     }