diff --git a/mozilla/mail/base/content/mailContextMenus.js b/mozilla/mail/base/content/mailContextMenus.js
index 5d968c5a9b9..b5bf556dccb 100644
--- a/mozilla/mail/base/content/mailContextMenus.js
+++ b/mozilla/mail/base/content/mailContextMenus.js
@@ -548,7 +548,6 @@ function fillFolderPaneContextMenu()
   SetupCompactMenuItem(folderResource, numSelected);
   SetupFavoritesMenuItem(folderResource, numSelected, isServer, 'folderPaneContext-favoriteFolder');
 
-  ShowMenuItem("folderPaneContext-copy-location", !isServer && !isVirtualFolder);
   ShowMenuItem("folderPaneContext-emptyTrash", (numSelected <= 1) && (specialFolder == 'Trash'));
   EnableMenuItem("folderPaneContext-emptyTrash", true);
   ShowMenuItem("folderPaneContext-emptyJunk", (numSelected <= 1) && (specialFolder == 'Junk'));
diff --git a/mozilla/mailnews/base/resources/content/folderProps.xul b/mozilla/mailnews/base/resources/content/folderProps.xul
index df7f1b2b597..aa3672d7242 100644
--- a/mozilla/mailnews/base/resources/content/folderProps.xul
+++ b/mozilla/mailnews/base/resources/content/folderProps.xul
@@ -78,7 +78,11 @@
                accesskey="&folderProps.name.accesskey;"/>
         <textbox id="name" readonly="true" oninput="doEnabling();" flex="1"/>
       </hbox>
-
+      <hbox align="center">
+        <label value="&folderProps.location.label;" control="location"
+               accesskey="&folderProps.location.accesskey;"/>
+        <textbox id="location" readonly="true" flex="1"/>
+      </hbox>
       <vbox>
         <hbox align="center" valign="middle">
           <label value="&folderCharsetTab.label;" control="folderCharsetList"
@@ -163,11 +167,6 @@
         <label value="&folderType.label;" id="folderTypeLabel"/>
         <label value="" id="folderType.text"/>
       </hbox>
-      <hbox align="center">
-        <label value="&folderProps.location.label;" control="location"
-               accesskey="&folderProps.location.accesskey;"/>
-        <textbox id="location" readonly="true" flex="1"/>
-      </hbox>
       <vbox align="start">
         <label value="" id="folderDescription.text"/>
         <label value=" "/>
diff --git a/mozilla/mailnews/base/resources/content/mailContextMenus.js b/mozilla/mailnews/base/resources/content/mailContextMenus.js
index d556c75d0e4..3ad4e797fd9 100644
--- a/mozilla/mailnews/base/resources/content/mailContextMenus.js
+++ b/mozilla/mailnews/base/resources/content/mailContextMenus.js
@@ -307,7 +307,6 @@ function fillFolderPaneContextMenu()
   SetupRemoveMenuItem(folderResource, numSelected, isServer, serverType, specialFolder);
   SetupCompactMenuItem(folderResource, numSelected);
 
-  ShowMenuItem("folderPaneContext-copy-location", !isServer && !isVirtualFolder);
   ShowMenuItem("folderPaneContext-emptyTrash", (numSelected <= 1) && (specialFolder == 'Trash'));
   EnableMenuItem("folderPaneContext-emptyTrash", true);
   ShowMenuItem("folderPaneContext-emptyJunk", (numSelected <= 1) && (specialFolder == 'Junk'));