diff --git a/mailnews/base/resources/content/messageWindow.xul b/mailnews/base/resources/content/messageWindow.xul
index 9f64d14eec..e0ac97fcbf 100644
--- a/mailnews/base/resources/content/messageWindow.xul
+++ b/mailnews/base/resources/content/messageWindow.xul
@@ -120,6 +120,8 @@
 
   <popup id="attachmentListContext"/>
 
+  <popup id="copyUrlPopup"/>
+
   <toolbox id="mail-toolbox">
     <menubar id="mail-menubar"/>
   </toolbox>
diff --git a/mailnews/base/resources/content/messenger.xul b/mailnews/base/resources/content/messenger.xul
index fc9e0f64c7..f8b7f9fddd 100644
--- a/mailnews/base/resources/content/messenger.xul
+++ b/mailnews/base/resources/content/messenger.xul
@@ -128,6 +128,8 @@
 <popup id="attachmentListContext"/>
 <tooltip id="attachmentListTooltip"/>
 
+<popup id="copyUrlPopup"/>
+
 <popup id="messageIdContext"/>
 
 <popup id="emailAddressPopup"/>
diff --git a/mailnews/base/resources/content/msgHdrViewOverlay.js b/mailnews/base/resources/content/msgHdrViewOverlay.js
index 17e463c060..ab26ec22ea 100644
--- a/mailnews/base/resources/content/msgHdrViewOverlay.js
+++ b/mailnews/base/resources/content/msgHdrViewOverlay.js
@@ -1568,6 +1568,20 @@ function ClearEditMessageButton()
     editBox.collapsed = true;
 }
 
+// CopyWebsiteAddress takes the website address title button, extracts
+// the website address we stored in there and copies it to the clipboard
+function CopyWebsiteAddress(websiteAddressNode)
+{
+  if (websiteAddressNode)
+  {
+    var websiteAddress = websiteAddressNode.getAttribute("value");
+
+    var contractid = "@mozilla.org/widget/clipboardhelper;1";
+    var iid = Components.interfaces.nsIClipboardHelper;
+    var clipboard = Components.classes[contractid].getService(iid);
+    clipboard.copyString(websiteAddress);
+  }
+}
 
 var attachmentAreaDNDObserver = {
   onDragStart: function (aEvent, aAttachmentData, aDragAction)
diff --git a/mailnews/base/resources/content/msgHdrViewOverlay.xul b/mailnews/base/resources/content/msgHdrViewOverlay.xul
index edede2ad5e..3cb27c3938 100644
--- a/mailnews/base/resources/content/msgHdrViewOverlay.xul
+++ b/mailnews/base/resources/content/msgHdrViewOverlay.xul
@@ -126,6 +126,10 @@
     accesskey="&deleteAllAttachmentsCmd.accesskey;" oncommand="HandleMultipleAttachments('deleteAttachment', currentAttachments);" />
 </popup>
 
+<popup id="copyUrlPopup">
+  <menuitem label="&copyLinkCmd.label;" accesskey="&copyLinkCmd.accesskey;" oncommand="CopyWebsiteAddress(document.popupNode)"/>
+</popup>
+
 <hbox id="msgHeaderView" keywordrelated="true" originalclass="none" persist="state">
 
 <grid id="collapsedHeaderView" class="header-part1" keywordrelated="true" originalclass="header-part1" flex="1" collapsed="true">
diff --git a/suite/locales/en-US/chrome/mailnews/msgHdrViewPopup.dtd b/suite/locales/en-US/chrome/mailnews/msgHdrViewPopup.dtd
index c7dc8b3e1b..00ebcd3ecb 100644
--- a/suite/locales/en-US/chrome/mailnews/msgHdrViewPopup.dtd
+++ b/suite/locales/en-US/chrome/mailnews/msgHdrViewPopup.dtd
@@ -46,6 +46,8 @@
 <!ENTITY CreateFilterFrom.accesskey        "F">
 <!ENTITY BlockAddress.label                "Block Address">
 <!ENTITY BlockAddress.accesskey            "A">
+<!ENTITY copyLinkCmd.label                 "Copy Link Location">
+<!ENTITY copyLinkCmd.accesskey             "C">
 <!ENTITY CopyMessageId.label               "Copy Message-ID">
 <!ENTITY OpenMessageForMsgId.label         "Open Message For ID">
 <!ENTITY OpenBrowserWithMsgId.label        "Open Browser With Message-ID">