- Fix Reply-To header displaying (#1485314)

2 files changed, 11 insertions, 3 deletions

diff --git a/CHANGELOG b/CHANGELOG
index b2f71e9e9..0e6d676cb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,7 @@ CHANGELOG RoundCube Webmail
 ----------
 - Add RFC2231 header value continuations support for attachment
   filenames + hack for servers that not support that feature
+- Fix Reply-To header displaying (#1485314)
 
 2008/09/02 (thomasb)
 ----------
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 7607cccd3..70cd2c45e 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -742,21 +742,28 @@ function rcmail_message_headers($attrib, $headers=NULL)
   $out = '<table' . $attrib_str . ">\n";
 
   // show these headers
-  $standard_headers = array('subject', 'from', 'organization', 'to', 'cc', 'bcc', 'reply-to', 'date');
+  $standard_headers = array('subject', 'from', 'organization', 'to', 'cc', 'bcc', 'replyto', 'date');
   
   foreach ($standard_headers as $hkey)
     {
     if (!$headers[$hkey])
       continue;
 
-    if ($hkey=='date' && !empty($headers[$hkey]))
+    if ($hkey == 'date')
       {
       if ($PRINT_MODE)
         $header_value = format_date($headers[$hkey], $CONFIG['date_long'] ? $CONFIG['date_long'] : 'x');
       else
         $header_value = format_date($headers[$hkey]);
       }
-    else if (in_array($hkey, array('from', 'to', 'cc', 'bcc', 'reply-to')))
+    else if ($hkey == 'replyto')
+      {
+      if ($headers['replyto'] != $headers['from'])
+        $header_value = Q(rcmail_address_string($headers['replyto'], null, true, $attrib['addicon']), 'show');
+      else
+        continue;
+      }
+    else if (in_array($hkey, array('from', 'to', 'cc', 'bcc')))
       $header_value = Q(rcmail_address_string($headers[$hkey], null, true, $attrib['addicon']), 'show');
     else
       $header_value = Q($IMAP->decode_header($headers[$hkey]));