Bug #240138 --> now that we don't show the email address in msg headers for people we know, expose

the email address in the context menu as a disabled menu item.

mail/base/content/messenger.xul

@@ -115,7 +115,10 @@
 <popup id="toolbar-context-menu"/>
 <tooltip id="attachmentListTooltip"/>
 
-<popup id="emailAddressPopup" popupanchor="bottomleft" onpopupshowing="goUpdateCommand('cmd_createFilterFromPopup')">
+<popup id="emailAddressPopup" popupanchor="bottomleft" onpopupshowing="fillEmailAddressPopup(document.popupNode); goUpdateCommand('cmd_createFilterFromPopup')">
+    <menuitem id="emailAddressPlaceHolder" label=""
+              disabled="true"/>
+    <menuseparator/>
     <menuitem label="&AddToAddressBook.label;"
               accesskey="&AddToAddressBook.accesskey;"
               oncommand="AddNodeToAddressBook(document.popupNode)"/>
@@ -124,7 +127,8 @@
               oncommand="SendMailToNode(document.popupNode)"/>
     <menuitem label="&CopyEmailAddress.label;"
               accesskey="&CopyEmailAddress.accesskey;"
-              oncommand="CopyEmailAddress(document.popupNode)"/>  
+              oncommand="CopyEmailAddress(document.popupNode)"/> 
+    <menuseparator/> 
     <menuitem label="&CreateFilter.label;"
               accesskey="&CreateFilter.accesskey;"
               oncommand="CreateFilter(document.popupNode)"

mail/base/content/msgHdrViewOverlay.js

@@ -849,6 +849,14 @@ function AddExtraAddressProcessing(emailAddress, addressNode)
     addressNode.setAttribute('label', displayName); 
 } 
 
+function fillEmailAddressPopup(emailAddressNode)
+{
+  var emailAddressPlaceHolder = document.getElementById('emailAddressPlaceHolder');
+  var emailAddress = emailAddressNode.getTextAttribute('emailAddress');
+
+  emailAddressPlaceHolder.setAttribute('label', emailAddress);
+}
+
 // returns true if we should use the display name for this address
 // otherwise returns false
 function useDisplayNameForAddress(emailAddress)