diff --git a/mailnews/base/resources/content/mailContextMenus.js b/mailnews/base/resources/content/mailContextMenus.js
index 3809ee99ff6c..84bc6a61b620 100644
--- a/mailnews/base/resources/content/mailContextMenus.js
+++ b/mailnews/base/resources/content/mailContextMenus.js
@@ -157,14 +157,10 @@ function SetupForwardAsAttachmentMenuItem(menuID, numSelected, forceHide)
 function SetupMoveMenuItem(menuID, numSelected, isNewsgroup, forceHide)
 {
   ShowMenuItem(menuID, !isNewsgroup && !forceHide);
-  var folderResource = GetSelectedFolderResource();
-  var enableMenuItem = numSelected > 0;
+
+  var msgFolder = GetLoadedMsgFolder();
   // disable move if we can't delete message(s) from this folder
-  if (folderResource)
-  {
-    var msgFolder = folderResource.QueryInterface(Components.interfaces.nsIMsgFolder);
-    enableMenuItem = enableMenuItem && msgFolder && msgFolder.canDeleteMessages;
-    }
+  var enableMenuItem = (numSelected > 0) && msgFolder && msgFolder.canDeleteMessages;
   EnableMenuItem(menuID, enableMenuItem);
 }