diff --git a/mailnews/base/resources/content/commandglue.js b/mailnews/base/resources/content/commandglue.js
index 47700f2fd4b7..ccc815be9528 100644
--- a/mailnews/base/resources/content/commandglue.js
+++ b/mailnews/base/resources/content/commandglue.js
@@ -55,7 +55,10 @@ function GetMsgFolderFromResource(folderResource)
      return null;
 
   var msgFolder = folderResource.QueryInterface(Components.interfaces.nsIMsgFolder);
-  return msgFolder;
+  if (msgFolder && (msgFolder.parent || msgFolder.isServer))
+    return msgFolder;
+  else
+    return null;
 }
 
 function GetMsgFolderFromURI(folderURI)
diff --git a/mailnews/base/resources/content/mailCommands.js b/mailnews/base/resources/content/mailCommands.js
index 0a21b48b5b0d..7694fce41d93 100644
--- a/mailnews/base/resources/content/mailCommands.js
+++ b/mailnews/base/resources/content/mailCommands.js
@@ -25,7 +25,8 @@ function GetMsgFolderFromUri(uri)
 	try {
 		var resource = GetResourceFromUri(uri);
 		var msgfolder = resource.QueryInterface(Components.interfaces.nsIMsgFolder);
-		return msgfolder;
+        if (msgfolder && (msgfolder.parent || msgfolder.isServer))
+		  return msgfolder;
 	}
 	catch (ex) {
 		//dump("failed to get the folder resource\n");
diff --git a/mailnews/compose/resources/content/MsgComposeCommands.js b/mailnews/compose/resources/content/MsgComposeCommands.js
index ea28b72ea47e..757030e8077a 100644
--- a/mailnews/compose/resources/content/MsgComposeCommands.js
+++ b/mailnews/compose/resources/content/MsgComposeCommands.js
@@ -2346,7 +2346,8 @@ function GetMsgFolderFromUri(uri)
   	RDF = RDF.QueryInterface(Components.interfaces.nsIRDFService);
     var resource = RDF.GetResource(uri);
 		var msgfolder = resource.QueryInterface(Components.interfaces.nsIMsgFolder);
-		return msgfolder;
+        if (msgfolder && ( msgfolder.parent || msgfolder.isServer))
+		  return msgfolder;
 	}//try
 	catch (ex) { }//catch
 	return null;