diff --git a/mozilla/mailnews/base/resources/content/mailWidgets.xml b/mozilla/mailnews/base/resources/content/mailWidgets.xml
index 4887b3aac64..cb301363c27 100644
--- a/mozilla/mailnews/base/resources/content/mailWidgets.xml
+++ b/mozilla/mailnews/base/resources/content/mailWidgets.xml
@@ -108,6 +108,16 @@
             aEmailNode.setTextAttribute("emailAddress", aAddress.emailAddress);
             aEmailNode.setTextAttribute("fullAddress", aAddress.fullAddress);  
             aEmailNode.setTextAttribute("displayName", aAddress.displayName);
+
+            try
+            {
+              if ("AddExtraAddressProcessing" in top)
+                AddExtraAddressProcessing(aAddress.emailAddress, aEmailNode);
+            }
+            catch(ex)
+            {
+              dump("AddExtraAddressProcessing failed: " + ex);
+            }
           ]]>
         </body>
       </method>
@@ -227,6 +237,12 @@
             {
               this.fillAddressesNode(this.longEmailAddresses, -1);
               this.mLongViewCreated = true;
+
+              // need to call UpdateMessageHeaders() because this is the first
+              // time the long view is being built.  This is required in order
+              // to update the addresses of the long view that might contain
+              // extra image info.
+              UpdateMessageHeaders();
             }
           ]]> 
         </body>
diff --git a/mozilla/themes/classic/messenger/messageHeader.css b/mozilla/themes/classic/messenger/messageHeader.css
index fbfe93cc74a..91b5c10271a 100644
--- a/mozilla/themes/classic/messenger/messageHeader.css
+++ b/mozilla/themes/classic/messenger/messageHeader.css
@@ -100,6 +100,11 @@
   color: #FF0000;
 }
 
+.emailDisplayImage {
+  padding-left: 2px;
+  -moz-box-pack: end;
+}
+ 
 /* ::::: email address twisty ::::: */
 
 .addresstwisty {
diff --git a/mozilla/themes/modern/messenger/messageHeader.css b/mozilla/themes/modern/messenger/messageHeader.css
index e7bf8968f82..99343600342 100644
--- a/mozilla/themes/modern/messenger/messageHeader.css
+++ b/mozilla/themes/modern/messenger/messageHeader.css
@@ -119,6 +119,7 @@
 }
 
 .emailDisplayImage {
+  padding-left: 2px;
   -moz-box-pack: end;
 }