Display 'Sender' header in message preview

1 files changed, 9 insertions, 1 deletions

diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 88391b102..f5165399b 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -967,7 +967,7 @@ function rcmail_message_headers($attrib, $headers=null)
   }
 
   // show these headers
-  $standard_headers = array('subject', 'from', 'to', 'cc', 'bcc', 'replyto',
+  $standard_headers = array('subject', 'from', 'sender', 'to', 'cc', 'bcc', 'replyto',
     'mail-reply-to', 'mail-followup-to', 'date', 'priority');
   $exclude_headers = $attrib['exclude'] ? explode(',', $attrib['exclude']) : array();
   $output_headers = array();
@@ -1018,6 +1018,14 @@ function rcmail_message_headers($attrib, $headers=null)
       else
         continue;
     }
+    else if ($hkey == 'sender') {
+      if ($headers['sender'] != $headers['from']) {
+        $header_value = rcmail_address_string($value, $attrib['max'], true, $attrib['addicon'], $headers['charset'], $header_title);
+        $ishtml = true;
+      }
+      else
+        continue;
+    }
     else if ($hkey == 'mail-followup-to') {
       $header_value = rcmail_address_string($value, $attrib['max'], true, $attrib['addicon'], $headers['charset'], $header_title);
       $ishtml = true;