From 83370e5ff14f55f6af435807713956160f91abfa Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 18 Dec 2012 12:54:38 +0100
Subject: Display 'Sender' header in message preview

---
 program/lib/Roundcube/rcube_storage.php |  1 +
 program/localization/en_US/labels.inc   |  1 +
 program/steps/mail/func.inc             | 10 +++++++++-
 3 files changed, 11 insertions(+), 1 deletion(-)

(limited to 'program')

diff --git a/program/lib/Roundcube/rcube_storage.php b/program/lib/Roundcube/rcube_storage.php
index 65de2660c..8a36f1f9d 100644
--- a/program/lib/Roundcube/rcube_storage.php
+++ b/program/lib/Roundcube/rcube_storage.php
@@ -53,6 +53,7 @@ abstract class rcube_storage
     protected $all_headers = array(
         'IN-REPLY-TO',
         'BCC',
+        'SENDER',
         'MESSAGE-ID',
         'CONTENT-TRANSFER-ENCODING',
         'REFERENCES',
diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc
index abb0dca5d..730e6af09 100644
--- a/program/localization/en_US/labels.inc
+++ b/program/localization/en_US/labels.inc
@@ -41,6 +41,7 @@ $labels['junk']   = 'Junk';
 // message listing
 $labels['subject'] = 'Subject';
 $labels['from']    = 'From';
+$labels['sender']  = 'Sender';
 $labels['to']      = 'To';
 $labels['cc']      = 'Cc';
 $labels['bcc']     = 'Bcc';
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;
-- 
cgit v1.2.3