diff --git a/mozilla/mail/base/content/messenger.css b/mozilla/mail/base/content/messenger.css
index 9b968dd11a3..cb815f13ca0 100644
--- a/mozilla/mail/base/content/messenger.css
+++ b/mozilla/mail/base/content/messenger.css
@@ -61,6 +61,10 @@ mail-headerfield {
   -moz-binding: url("chrome://messenger/content/mailWidgets.xml#mail-headerfield");
 }
 
+mail-urlfield {
+  -moz-binding: url("chrome://messenger/content/mailWidgets.xml#mail-urlfield");
+}
+
 searchattribute {
   -moz-binding: url("chrome://messenger/content/mailWidgets.xml#searchattribute");
 }
diff --git a/mozilla/mail/base/content/msgHdrViewOverlay.js b/mozilla/mail/base/content/msgHdrViewOverlay.js
index bad00edc5e6..7f29ccadeb4 100644
--- a/mozilla/mail/base/content/msgHdrViewOverlay.js
+++ b/mozilla/mail/base/content/msgHdrViewOverlay.js
@@ -110,7 +110,8 @@ var gExpandedHeaderList = [ {name:"subject"},
                             {name:"cc", useToggle:true, outputFunction:OutputEmailAddresses},
                             {name:"bcc", useToggle:true, outputFunction:OutputEmailAddresses},
                             {name:"newsgroups", outputFunction:OutputNewsgroups},
-                            {name:"followup-to", outputFunction:OutputNewsgroups} ];
+                            {name:"followup-to", outputFunction:OutputNewsgroups},
+                            {name:"content-base"} ];
 
 // Now, for each view the message pane can generate, we need a global table of headerEntries. These
 // header entry objects are generated dynamically based on the static date in the header lists (see above)
diff --git a/mozilla/mail/base/content/msgHdrViewOverlay.xul b/mozilla/mail/base/content/msgHdrViewOverlay.xul
index b457d0beaba..4b350cae612 100644
--- a/mozilla/mail/base/content/msgHdrViewOverlay.xul
+++ b/mozilla/mail/base/content/msgHdrViewOverlay.xul
@@ -120,6 +120,7 @@
         <mail-headerfield keywordrelated="true" id="expandednewsgroupsBox"  label="&newsgroupsField.label;" collapsed="true"/>
         <mail-headerfield keywordrelated="true" id="expandedfollowup-toBox" label="&followupToField.label;" collapsed="true"/>
         <mail-headerfield keywordrelated="true" id="expandeduser-agentBox"  label="&userAgentField.label;"  collapsed="true"/> 
+        <mail-urlfield    keywordrelated="true" id="expandedcontent-baseBox" label="&originalWebsite.label;" collapsed="true"/>
       </vbox>
 
       <vbox id="expandedKeywordBox">
diff --git a/mozilla/mail/base/skin/mac/messageHeader.css b/mozilla/mail/base/skin/mac/messageHeader.css
index 8e6f69dd614..1b157002576 100644
--- a/mozilla/mail/base/skin/mac/messageHeader.css
+++ b/mozilla/mail/base/skin/mac/messageHeader.css
@@ -151,6 +151,16 @@ description[selectable="true"]:focus > descriptionitem[selected="true"]
   padding: 0px;
 }
 
+.headerValueUrl {
+  cursor: pointer;
+  color: #0000FF;
+  text-decoration: underline;
+}
+
+.headerValueUrl:hover {
+  color: red;
+}
+
 .subjectvalue {
   font-weight: bold;
   background-color: transparent;
diff --git a/mozilla/mail/base/skin/messageHeader.css b/mozilla/mail/base/skin/messageHeader.css
index 09241eee384..6df9dbb4528 100644
--- a/mozilla/mail/base/skin/messageHeader.css
+++ b/mozilla/mail/base/skin/messageHeader.css
@@ -135,6 +135,12 @@ description[selectable="true"]:focus > descriptionitem[selected="true"]
   background-color: transparent;
 }
 
+.headerValueUrl {
+  cursor: pointer;
+  color: #0000FF;
+  text-decoration: underline;
+}
+
 .subjectvalue {
   font-weight: bold;
   background-color: transparent;
@@ -150,6 +156,7 @@ description[selectable="true"]:focus > descriptionitem[selected="true"]
   background-color: transparent;
 }
 
+.headerValueUrl:hover,
 .emailDisplayButton:hover {
   color: #FF0000;
 }
diff --git a/mozilla/mailnews/base/resources/content/mailWidgets.xml b/mozilla/mailnews/base/resources/content/mailWidgets.xml
index d9a661cf1e0..2411539cfcd 100644
--- a/mozilla/mailnews/base/resources/content/mailWidgets.xml
+++ b/mozilla/mailnews/base/resources/content/mailWidgets.xml
@@ -612,6 +612,17 @@
     </implementation>
   </binding>
 
+  <binding id="mail-urlfield" extends="chrome://messenger/content/mailWidgets.xml#mail-headerfield">
+    <content>
+      <xul:hbox class="headerNameBox" align="start">
+        <xul:label class="headerName" xbl:inherits="value=label" flex="1"/>
+      </xul:hbox>
+      <xul:label originalclass="headerValue plain headerValueUrl" onclick="if (!event.button) messenger.launchExternalURL(event.target.value);" 
+                 appendoriginalclass="true" keywordrelated="true" class="headerValue plain headerValueUrl" 
+                 anonid="headerValue" flex="1" readonly="true"/> 
+    </content>
+  </binding>
+
   <binding id="mail-emailheaderfield">
     <content>
       <xul:hbox class="headerNameBox" align="start">
diff --git a/mozilla/mailnews/base/resources/locale/en-US/msgHdrViewOverlay.dtd b/mozilla/mailnews/base/resources/locale/en-US/msgHdrViewOverlay.dtd
index 85de62a6379..904b88d2217 100644
--- a/mozilla/mailnews/base/resources/locale/en-US/msgHdrViewOverlay.dtd
+++ b/mozilla/mailnews/base/resources/locale/en-US/msgHdrViewOverlay.dtd
@@ -32,6 +32,7 @@ Rights Reserved.
 
 <!ENTITY dateField.label "Date: ">
 <!ENTITY userAgentField.label "User-Agent: ">
+<!ENTITY originalWebsite.label "Website: ">
 <!ENTITY saveAll.label "Save All..">
 
 <!ENTITY editMessage.label "Edit Draft...">
diff --git a/mozilla/mailnews/mime/emitters/src/nsMimeHtmlEmitter.cpp b/mozilla/mailnews/mime/emitters/src/nsMimeHtmlEmitter.cpp
index d0937b13d9a..469a0d637dd 100644
--- a/mozilla/mailnews/mime/emitters/src/nsMimeHtmlEmitter.cpp
+++ b/mozilla/mailnews/mime/emitters/src/nsMimeHtmlEmitter.cpp
@@ -189,6 +189,7 @@ nsresult nsMimeHtmlDisplayEmitter::BroadcastHeaders(nsIMsgHeaderSink * aHeaderSi
           nsCRT::strcasecmp("bcc", headerInfo->name) && nsCRT::strcasecmp("followup-to", headerInfo->name) &&
           nsCRT::strcasecmp("reply-to", headerInfo->name) && nsCRT::strcasecmp("subject", headerInfo->name) &&
           nsCRT::strcasecmp("organization", headerInfo->name) && nsCRT::strcasecmp("user-agent", headerInfo->name) &&
+          nsCRT::strcasecmp("content-base", headerInfo->name) && 
           nsCRT::strcasecmp("date", headerInfo->name) && nsCRT::strcasecmp("x-mailer", headerInfo->name))
             continue;
     }