fix for #23126.

add hidden pref to show Organization header in the message pane.
off by default.
thanks to neil@parkwaycc.co.uk for the patch.
r/sr=sspitzer

mailnews/base/resources/content/msgHdrViewOverlay.js

@@ -36,6 +36,7 @@ var abAddressCollectorContractID	 = "@mozilla.org/addressbook/services/addressCo
 
 var gViewAllHeaders = false;
 var gNumAddressesToShow = 3;
+var gShowOrganization = false;
 var gShowUserAgent = false;
 var gCollectIncoming = false;
 var gCollectOutgoing = false;
@@ -182,6 +183,12 @@ function initializeHeaderViewTables()
       gExpandedHeaderView[headerName] = new createHeaderEntry('expanded', gExpandedHeaderList[index]);
     }
     
+    if (gShowOrganization)
+    {
+      var organizationEntry = {name:"organization", outputFunction:updateHeaderValue};
+      gExpandedHeaderView[organizationEntry.name] = new createHeaderEntry('expanded', organizationEntry);
+    }
+    
     if (gShowUserAgent)
     {
       var userAgentEntry = {name:"user-agent", outputFunction:updateHeaderValue};
@@ -204,6 +211,7 @@ function OnLoadMsgHeaderPane()
   gCollectNewsgroup = pref.getBoolPref("mail.collect_email_address_newsgroup");
   gCollectOutgoing = pref.getBoolPref("mail.collect_email_address_outgoing");
   gShowUserAgent = pref.getBoolPref("mailnews.headers.showUserAgent");
+  gShowOrganization = pref.getBoolPref("mailnews.headers.showOrganization");
   initializeHeaderViewTables();
 
   var toggleHeaderView = document.getElementById("msgHeaderView");

mailnews/base/resources/content/msgHdrViewOverlay.xul

@@ -109,6 +109,7 @@ Rights Reserved.
     <mail-toggle-headerfield keywordrelated="true" id="expandedsubjectBox" class="subjectvalue" label="&subjectField.label;" ontwistyclick="ToggleHeaderView();" collapsed="true"/>
    
     <mail-emailheaderfield id="expandedfromBox" label="&fromField.label;" collapsed="true"/>
+    <mail-headerfield id="expandedorganizationBox" label="&organizationField.label;" collapsed="true"/>
     <mail-emailheaderfield id="expandedreply-toBox" label="&replyToField.label;" collapsed="true"/>
 
     <mail-headerfield keywordrelated="true" id="expandeddateBox" label="&dateField.label;" collapsed="true"/>

mailnews/base/resources/locale/en-US/msgHdrViewOverlay.dtd

@@ -20,6 +20,7 @@ Rights Reserved.
 
 <!ENTITY toField.label "To: ">
 <!ENTITY fromField.label "From: ">
+<!ENTITY organizationField.label "Organization: ">
 <!ENTITY replyToField.label "Reply-To: ">
 
 <!ENTITY subjectField.label "Subject: ">

mailnews/mailnews.js

@@ -67,6 +67,10 @@ pref("mailnews.auto_unzip_saved_attachments", false);
 // is displayed in the message pane or not...
 pref("mailnews.headers.showUserAgent",       false);
 
+// hidden pref for controlling if the organization string
+// is displayed in the message pane or not...
+pref("mailnews.headers.showOrganization",    false);
+
 // Mail server preferences, pop by default
 pref("mail.server_type",	0); 	// 0 pop, 1 imap,
 					// (Unix only:)

mailnews/mime/emitters/src/nsMimeHtmlEmitter.cpp

@@ -218,7 +218,7 @@ NS_IMETHODIMP nsMimeHtmlDisplayEmitter::WriteHTMLHeaders()
               nsCRT::strcasecmp("cc", headerInfo->name) && nsCRT::strcasecmp("newsgroups", headerInfo->name) &&
               nsCRT::strcasecmp("bcc", headerInfo->name) && nsCRT::strcasecmp("followup-to", headerInfo->name) &&
               nsCRT::strcasecmp("reply-to", headerInfo->name) && nsCRT::strcasecmp("subject", headerInfo->name) &&
-              nsCRT::strcasecmp("user-agent", headerInfo->name))
+              nsCRT::strcasecmp("organization", headerInfo->name) && nsCRT::strcasecmp("user-agent", headerInfo->name))
                 continue;
         }
 

modules/libpref/src/init/mailnews.js

@@ -67,6 +67,10 @@ pref("mailnews.auto_unzip_saved_attachments", false);
 // is displayed in the message pane or not...
 pref("mailnews.headers.showUserAgent",       false);
 
+// hidden pref for controlling if the organization string
+// is displayed in the message pane or not...
+pref("mailnews.headers.showOrganization",    false);
+
 // Mail server preferences, pop by default
 pref("mail.server_type",	0); 	// 0 pop, 1 imap,
 					// (Unix only:)