diff --git a/mail/base/content/widgetglue.js b/mail/base/content/widgetglue.js
index d1366995bb2a..9779948e2306 100644
--- a/mail/base/content/widgetglue.js
+++ b/mail/base/content/widgetglue.js
@@ -208,11 +208,15 @@ function MsgVirtualFolderProperties(aEditExistingVFolder)
                                   msgWindow:msgWindow});
 }
 
-function onEditVirtualFolderPropertiesCallback(aVirtualFolder)
+function onEditVirtualFolderPropertiesCallback(aVirtualFolderURI)
 {
   // we need to reload the folder if it is the currently loaded folder...
+  if (gMsgFolderSelected && aVirtualFolderURI == gMsgFolderSelected.URI)
+  {
+    gMsgFolderSelected = null; // force the folder pane to reload the virtual folder
   FolderPaneSelectionChange();
 }
+}
 
 function MsgFolderProperties() 
 {
diff --git a/mailnews/base/resources/content/virtualFolderProperties.js b/mailnews/base/resources/content/virtualFolderProperties.js
index fc6fe0fcebe2..3f06e25eb619 100644
--- a/mailnews/base/resources/content/virtualFolderProperties.js
+++ b/mailnews/base/resources/content/virtualFolderProperties.js
@@ -194,7 +194,7 @@ function onOK()
     accountManager.saveVirtualFolders();
 
     if (window.arguments[0].onOKCallback)
-      window.arguments[0].onOKCallback(msgFolder);
+      window.arguments[0].onOKCallback(msgFolder.URI);
       
   } 
   else if (name && uri) // create a new virtual folder
diff --git a/mailnews/base/resources/content/widgetglue.js b/mailnews/base/resources/content/widgetglue.js
index 654d6e8cde0a..d3660e87e596 100644
--- a/mailnews/base/resources/content/widgetglue.js
+++ b/mailnews/base/resources/content/widgetglue.js
@@ -226,10 +226,14 @@ function MsgVirtualFolderProperties(aEditExistingVFolder)
                                   msgWindow:msgWindow});
 }
 
-function onEditVirtualFolderPropertiesCallback(aVirtualFolder)
+function onEditVirtualFolderPropertiesCallback(aVirtualFolderURI)
 {
   // we need to reload the folder if it is the currently loaded folder...
-  FolderPaneSelectionChange();
+  if (gMsgFolderSelected && aVirtualFolderURI == gMsgFolderSelected.URI)
+  {
+    gMsgFolderSelected = null; // force the folder pane to reload the virtual folder
+    FolderPaneSelectionChange();
+  }
 }