diff --git a/mozilla/mail/base/content/commandglue.js b/mozilla/mail/base/content/commandglue.js
index 1b4f9b0884f..043f1ae5b64 100644
--- a/mozilla/mail/base/content/commandglue.js
+++ b/mozilla/mail/base/content/commandglue.js
@@ -389,13 +389,7 @@ function SwitchView(command)
     break;
   }
 
-  // that should have initialized gDBView, now re-root the thread pane
-  var treeView = gDBView.QueryInterface(Components.interfaces.nsITreeView);
-  if (treeView)
-  {
-    var tree = GetThreadTree();
-    tree.boxObject.QueryInterface(Components.interfaces.nsITreeBoxObject).view = treeView;
-  }
+  RerootThreadPane();
 }
 
 function SetSentFolderColumns(isSentFolder)
diff --git a/mozilla/mailnews/base/resources/content/commandglue.js b/mozilla/mailnews/base/resources/content/commandglue.js
index b1531d0eac8..a7d80503783 100644
--- a/mozilla/mailnews/base/resources/content/commandglue.js
+++ b/mozilla/mailnews/base/resources/content/commandglue.js
@@ -395,13 +395,7 @@ function SwitchView(command)
     break;
   }
 
-  // that should have initialized gDBView, now re-root the thread pane
-  var treeView = gDBView.QueryInterface(Components.interfaces.nsITreeView);
-  if (treeView)
-  {
-    var tree = GetThreadTree();
-    tree.boxObject.QueryInterface(Components.interfaces.nsITreeBoxObject).view = treeView;
-  }
+  RerootThreadPane();
 }
 
 function SetSentFolderColumns(isSentFolder)