diff --git a/mozilla/mailnews/base/resources/content/commandglue.js b/mozilla/mailnews/base/resources/content/commandglue.js
index f1162aef6d2..58121affe22 100644
--- a/mozilla/mailnews/base/resources/content/commandglue.js
+++ b/mozilla/mailnews/base/resources/content/commandglue.js
@@ -867,9 +867,12 @@ function FolderPaneSelectionChange()
                 var msgDatabase = msgFolder.getMsgDatabase(msgWindow);
                 if (msgDatabase)
                 {
+                  gSearchSession = null;
                   var dbFolderInfo = msgDatabase.dBFolderInfo;
                   sortType = dbFolderInfo.sortType;
                   sortOrder = dbFolderInfo.sortOrder;
+                  viewType = dbFolderInfo.viewType;
+                  viewFlags = dbFolderInfo.viewFlags;
                   if (folderFlags & MSG_FOLDER_FLAG_VIRTUAL)
                   {
                     viewType = nsMsgViewType.eShowQuickSearchResults;
@@ -894,7 +897,6 @@ function FolderPaneSelectionChange()
                     }
                     else
                     {
-                      gSearchSession = null;
                       uriToLoad = srchFolderUri;
                       // we need to load the db for the actual folder so that many hdrs to download
                       // will return false...
@@ -907,12 +909,6 @@ function FolderPaneSelectionChange()
 //                      gSearchInput.showingSearchCriteria = false;
                     }
                   }
-                  else
-                  {
-                    gSearchSession = null;
-                    viewFlags = dbFolderInfo.viewFlags;
-                    viewType = dbFolderInfo.viewType;
-                  }
                   msgDatabase = null;
                   dbFolderInfo = null;
                 }
diff --git a/mozilla/mailnews/base/resources/content/searchBar.js b/mozilla/mailnews/base/resources/content/searchBar.js
index 5c5615bfdd8..3e895c9e8fe 100644
--- a/mozilla/mailnews/base/resources/content/searchBar.js
+++ b/mozilla/mailnews/base/resources/content/searchBar.js
@@ -157,7 +157,7 @@ function createQuickSearchView()
       var saveViewSearchListener = gDBView.QueryInterface(Components.interfaces.nsIMsgSearchNotify);
       gSearchSession.unregisterListener(saveViewSearchListener);
     }
-    CreateDBView(gDBView.msgFolder, (gXFVirtualFolderTerms) ? nsMsgViewType.eShowVirtualFolderResults : nsMsgViewType.eShowQuickSearchResults, nsMsgViewFlagsType.kNone, gDBView.sortType, gDBView.sortOrder);
+    CreateDBView(gDBView.msgFolder, (gXFVirtualFolderTerms) ? nsMsgViewType.eShowVirtualFolderResults : nsMsgViewType.eShowQuickSearchResults, gDBView.viewFlags, gDBView.sortType, gDBView.sortOrder);
   }
 }