# HG changeset patch
# User Ian Neal <iann_cvs@blueyonder.co.uk>
# Date 1613770414 0
# Parent  81744ea0b2891bd38faf7945877ea6ad909152fa
Bug 1693962 - Remove use of widgetglue.js from SeaMonkey's mailnews code. r=frg a=frg

Ports to SeaMonkey:
* Bug 889022 - try to remove mail/base/content/widgetglue.js

diff --git a/suite/mailnews/components/addrbook/content/addressbook.xul b/suite/mailnews/components/addrbook/content/addressbook.xul
--- a/suite/mailnews/components/addrbook/content/addressbook.xul
+++ b/suite/mailnews/components/addrbook/content/addressbook.xul
@@ -46,17 +46,16 @@
     <stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
     <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
     <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
   </stringbundleset>
 
 <script src="chrome://messenger/content/jsTreeView.js"/>
 <script src="chrome://messenger/content/addressbook/abTrees.js"/>
 <script src="chrome://messenger/content/accountUtils.js"/>
-<script src="chrome://messenger/content/widgetglue.js"/>
 <script src="chrome://messenger/content/addressbook/addressbook.js"/>
 <script src="chrome://messenger/content/addressbook/abCommon.js"/>
 <script src="chrome://communicator/content/contentAreaClick.js"/>
 <script src="chrome://global/content/printUtils.js"/>
 <script src="chrome://messenger/content/msgPrintEngine.js"/>
 <script src="chrome://messenger/content/addressbook/abCardViewOverlay.js"/>
 
   <commandset id="addressBook">
diff --git a/suite/mailnews/components/compose/content/MsgComposeCommands.js b/suite/mailnews/components/compose/content/MsgComposeCommands.js
--- a/suite/mailnews/components/compose/content/MsgComposeCommands.js
+++ b/suite/mailnews/components/compose/content/MsgComposeCommands.js
@@ -5,16 +5,17 @@
 
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
 ChromeUtils.import("resource://gre/modules/PluralForm.jsm");
 ChromeUtils.import("resource://gre/modules/InlineSpellChecker.jsm");
 ChromeUtils.import("resource:///modules/folderUtils.jsm");
 ChromeUtils.import("resource:///modules/iteratorUtils.jsm");
 ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailUtils.js");
 
 /**
  * interfaces
  */
 var nsIMsgCompDeliverMode = Ci.nsIMsgCompDeliverMode;
 var nsIMsgCompSendFormat = Ci.nsIMsgCompSendFormat;
 var nsIMsgCompConvertible = Ci.nsIMsgCompConvertible;
 var nsIMsgCompType = Ci.nsIMsgCompType;
@@ -3052,17 +3053,17 @@ function DisplaySaveFolderDlg(folderURI)
     var showDialog = gCurrentIdentity.showSaveMsgDlg;
   }
   catch (e)
   {
     return;
   }
 
   if (showDialog){
-    var msgfolder = GetMsgFolderFromUri(folderURI, true);
+    let msgfolder = MailUtils.getFolderForURI(folderURI, true);
     if (!msgfolder)
       return;
     var checkbox = {value:0};
     var SaveDlgTitle = sComposeMsgsBundle.getString("SaveDialogTitle");
     var dlgMsg = sComposeMsgsBundle.getFormattedString("SaveDialogMsg",
                                                        [msgfolder.name,
                                                         msgfolder.server.prettyName]);
 
diff --git a/suite/mailnews/components/compose/content/messengercompose.xul b/suite/mailnews/components/compose/content/messengercompose.xul
--- a/suite/mailnews/components/compose/content/messengercompose.xul
+++ b/suite/mailnews/components/compose/content/messengercompose.xul
@@ -58,17 +58,16 @@
     <stringbundle id="languageBundle" src="chrome://global/locale/languageNames.properties"/>
     <stringbundle id="brandBundle" src="chrome://branding/locale/brand.properties"/>
     <stringbundle id="bundle_comp_smime" src="chrome://messenger-smime/locale/msgCompSMIMEOverlay.properties"/>
   </stringbundleset>
 
   <script src="chrome://communicator/content/contentAreaClick.js"/>
   <script src="chrome://global/content/printUtils.js"/>
   <script src="chrome://messenger/content/accountUtils.js"/>
-  <script src="chrome://messenger/content/widgetglue.js"/>
   <script src="chrome://messenger/content/mail-offline.js"/>
   <script src="chrome://editor/content/editor.js"/>
   <script src="chrome://messenger/content/messengercompose/MsgComposeCommands.js"/>
   <script src="chrome://messenger/content/messengercompose/addressingWidgetOverlay.js"/>
   <script src="chrome://global/content/nsDragAndDrop.js"/>
   <script src="chrome://messenger/content/addressbook/abDragDrop.js"/>
   <script src="chrome://messenger-smime/content/msgCompSMIMEOverlay.js"/>
 
diff --git a/suite/mailnews/content/SearchDialog.js b/suite/mailnews/content/SearchDialog.js
--- a/suite/mailnews/content/SearchDialog.js
+++ b/suite/mailnews/content/SearchDialog.js
@@ -1,14 +1,15 @@
 /* -*- Mode: javascript; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 ChromeUtils.import("resource://gre/modules/PluralForm.jsm");
+ChromeUtils.import("resource:///modules/MailUtils.js");
 
 var searchSessionContractID = "@mozilla.org/messenger/searchSession;1";
 var gDBView;
 var gSearchSession;
 var gMsgFolderSelected;
 
 var nsIMsgFolder = Ci.nsIMsgFolder;
 var nsIMsgWindow = Ci.nsIMsgWindow;
@@ -331,17 +332,17 @@ function selectFolder(folder)
     updateSearchFolderPicker(folderURI);
 }
 
 function updateSearchFolderPicker(folderURI)
 {
     SetFolderPicker(folderURI, gFolderPicker.id);
 
     // use the URI to get the real folder
-    gMsgFolderSelected = GetMsgFolderFromUri(folderURI);
+    gMsgFolderSelected = MailUtils.getFolderForURI(folderURI);
 
     var searchSubFolders = document.getElementById("checkSearchSubFolders");
     if (searchSubFolders)
       searchSubFolders.disabled = !gMsgFolderSelected.hasSubFolders;
     var searchLocalSystem = document.getElementById("menuSearchLocalSystem");
     if (searchLocalSystem)
         searchLocalSystem.disabled = gMsgFolderSelected.server.searchScope == nsMsgSearchScope.offlineMail;
     setSearchScope(GetScopeForFolder(gMsgFolderSelected));
diff --git a/suite/mailnews/content/SearchDialog.xul b/suite/mailnews/content/SearchDialog.xul
--- a/suite/mailnews/content/SearchDialog.xul
+++ b/suite/mailnews/content/SearchDialog.xul
@@ -33,17 +33,16 @@
   <script src="chrome://messenger/content/mailWindow.js"/>
   <script src="chrome://messenger/content/msgMail3PaneWindow.js"/>
   <script src="chrome://global/content/globalOverlay.js"/>
   <script src="chrome://messenger/content/mailCommands.js"/>
   <script src="chrome://messenger/content/mailWindowOverlay.js"/>
   <script src="chrome://messenger/content/commandglue.js"/>
   <script src="chrome://messenger/content/SearchDialog.js"/>
   <script src="chrome://messenger/content/msgFolderPickerOverlay.js"/>
-  <script src="chrome://messenger/content/widgetglue.js"/>
   <script src="chrome://messenger/content/messengerdnd.js"/>
   <script src="chrome://messenger/content/tabmail.js"/>
   <script src="chrome://messenger/content/folderDisplay.js"/>
   <script src="chrome://global/content/contentAreaUtils.js"/>
   <script src="chrome://messenger-newsblog/content/newsblogOverlay.js"/>
 
   <commands id="commands">
     <commandset id="mailSearchItems"
diff --git a/suite/mailnews/content/commandglue.js b/suite/mailnews/content/commandglue.js
--- a/suite/mailnews/content/commandglue.js
+++ b/suite/mailnews/content/commandglue.js
@@ -3,18 +3,19 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 
 /*
  * Command-specific code. This stuff should be called by the widgets
  */
 
+ChromeUtils.import("resource://gre/modules/Services.jsm");
 ChromeUtils.import("resource:///modules/iteratorUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+ChromeUtils.import("resource:///modules/MailUtils.js");
 
 //NOTE: gMessengerBundle and gBrandBundle must be defined and set
 //      for this Overlay to work properly
 
 var gFolderJustSwitched = false;
 var gBeforeFolderLoadTime;
 var gVirtualFolderTerms;
 var gXFVirtualFolderTerms;
@@ -22,17 +23,17 @@ var gCurrentVirtualFolderUri;
 var gPrevFolderFlags;
 var gPrevSelectedFolder;
 var gMsgFolderSelected;
 
 function GetServer(uri)
 {
     if (!uri) return null;
     try {
-        var folder = GetMsgFolderFromUri(uri, true);
+        var folder = MailUtils.getFolderForURI(uri, true);
         return folder.server;
     }
     catch (ex) {
         dump("GetServer("+uri+") failed, ex="+ex+"\n");
     }
     return null;
 }
 
@@ -732,17 +733,17 @@ function FolderPaneSelectionChange()
                       setupXFVirtualFolderSearch(srchFolderUriArray, gXFVirtualFolderTerms, searchOnline);
                       // need to set things up so that reroot folder issues the search
                     }
                     else
                     {
                       uriToLoad = srchFolderUri;
                       // we need to load the db for the actual folder so that many hdrs to download
                       // will return false...
-                      realFolder = GetMsgFolderFromUri(uriToLoad);
+                      realFolder = MailUtils.getFolderForURI(uriToLoad);
                       msgDatabase = realFolder.msgDatabase;
 //                      dump("search term string = " + searchTermString + "\n");
 
                       gVirtualFolderTerms = CreateGroupedSearchTerms(tempFilter.searchTerms);
                     }
                   }
                   msgDatabase = null;
                   dbFolderInfo = null;
@@ -916,17 +917,17 @@ function setupXFVirtualFolderSearch(fold
 {
     var count = new Object;
   var i;
 
     gSearchSession = Cc[searchSessionContractID].createInstance(Ci.nsIMsgSearchSession);
 
   for (i in folderUrisToSearch)
     {
-      let realFolder = GetMsgFolderFromUri(folderUrisToSearch[i]);
+      let realFolder = MailUtils.getFolderForURI(folderUrisToSearch[i]);
       if (!realFolder.isServer)
         gSearchSession.addScopeTerm(!searchOnline ? nsMsgSearchScope.offlineMail : GetScopeForFolder(realFolder), realFolder);
     }
 
     const nsIMsgSearchTerm = Ci.nsIMsgSearchTerm;
     for (let term of fixIterator(searchTerms, nsIMsgSearchTerm)) {
       gSearchSession.appendTerm(term);
     }
diff --git a/suite/mailnews/content/mailCommands.js b/suite/mailnews/content/mailCommands.js
--- a/suite/mailnews/content/mailCommands.js
+++ b/suite/mailnews/content/mailCommands.js
@@ -1,14 +1,15 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 ChromeUtils.import("resource://gre/modules/Services.jsm");
+ChromeUtils.import("resource:///modules/MailUtils.js");
 
 /**
  * Get the identity that most likely is the best one to use, given the hint.
  * @param identities nsIArray<nsIMsgIdentity> of identities
  * @param optionalHint string containing comma separated mailboxes
  */
 function getBestIdentity(identities, optionalHint)
 {
@@ -252,17 +253,17 @@ function Subscribe(preselectedMsgFolder)
                     "subscribe", "chrome,modal,titlebar,resizable=yes",
                     {folder:preselectedMsgFolder,
                       okCallback:SubscribeOKCallback});
 }
 
 function SubscribeOKCallback(changeTable)
 {
   for (var serverURI in changeTable) {
-    var folder = GetMsgFolderFromUri(serverURI, true);
+    var folder = MailUtils.getFolderForURI(serverURI, true);
     var server = folder.server;
     var subscribableServer =
           server.QueryInterface(Ci.nsISubscribableServer);
 
     for (var name in changeTable[serverURI]) {
       if (changeTable[serverURI][name] == true) {
         try {
           subscribableServer.subscribe(name);
diff --git a/suite/mailnews/content/mailWindowOverlay.js b/suite/mailnews/content/mailWindowOverlay.js
--- a/suite/mailnews/content/mailWindowOverlay.js
+++ b/suite/mailnews/content/mailWindowOverlay.js
@@ -4,16 +4,17 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 ChromeUtils.import("resource://gre/modules/PluralForm.jsm");
 ChromeUtils.import("resource:///modules/FeedUtils.jsm");
 ChromeUtils.import("resource:///modules/folderUtils.jsm");
 ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailUtils.js");
 
 const kClassicMailLayout  = 0;
 const kWideMailLayout     = 1;
 const kVerticalMailLayout = 2;
 
 const kMouseButtonLeft   = 0;
 const kMouseButtonMiddle = 1;
 const kMouseButtonRight  = 2;
@@ -733,17 +734,17 @@ function PopulateHistoryMenu(menuPopup, 
 
   // starting from the current entry, march through history until we reach
   // the array border or our menuitem limit
   for (var i = startPos, itemCount = 0;
        (i >= 0) && (i < maxPos) && (itemCount < 25);
        i += navOffset, ++itemCount)
   {
     var menuText = "";
-    let folder = GetMsgFolderFromUri(historyArray[i * 2 + 1]);
+    let folder = MailUtils.getFolderForURI(historyArray[i * 2 + 1]);
     if (!IsCurrentLoadedFolder(folder))
       menuText += folder.prettyName + ": ";
 
     var msgHdr = messenger.msgHdrFromURI(historyArray[i * 2]);
     var subject = "";
     if (msgHdr.flags & Ci.nsMsgMessageFlags.HasRe)
       subject = "Re: ";
     if (msgHdr.mime2DecodedSubject)
@@ -1119,17 +1120,17 @@ BatchMessageMover.prototype =
       }
       else {
         let identity = GetIdentityForHeader(msgHdr,
           Ci.nsIMsgCompType.ReplyAll);
         archiveFolderUri = identity.archiveFolder;
         archiveGranularity = identity.archiveGranularity;
         archiveKeepFolderStructure = identity.archiveKeepFolderStructure;
       }
-      let archiveFolder = GetMsgFolderFromUri(archiveFolderUri, false);
+      let archiveFolder = MailUtils.getFolderForURI(archiveFolderUri, false);
 
       let copyBatchKey = msgHdr.folder.URI + '\000' + monthFolderName;
       if (!(copyBatchKey in this._batches))
         this._batches[copyBatchKey] = [msgHdr.folder,
                                        archiveFolderUri,
                                        archiveGranularity,
                                        archiveKeepFolderStructure,
                                        msgYear,
@@ -1212,17 +1213,17 @@ BatchMessageMover.prototype =
             Ci.nsMsgProcessingFlags.FilterToMove)) {
         moveArray.appendElement(item);
       }
     }
 
     if (moveArray.length == 0)
       return this.processNextBatch(); // continue processing
 
-    let archiveFolder = GetMsgFolderFromUri(archiveFolderUri, false);
+    let archiveFolder = MailUtils.getFolderForURI(archiveFolderUri, false);
     let dstFolder = archiveFolder;
     // For folders on some servers (e.g. IMAP), we need to create the
     // sub-folders asynchronously, so we chain the urls using the listener
     // called back from createStorageIfMissing. For local,
     // createStorageIfMissing is synchronous.
     let isAsync = archiveFolder.server.protocolInfo.foldersCreatedAsync;
     if (!archiveFolder.parent)
     {
@@ -1231,28 +1232,28 @@ BatchMessageMover.prototype =
       if (isAsync)
         return; // continues with OnStopRunningUrl
     }
     if (!archiveFolder.canCreateSubfolders)
       granularity = Ci.nsIMsgIdentity.singleArchiveFolder;
     if (granularity >= Ci.nsIMsgIdentity.perYearArchiveFolders)
     {
       archiveFolderUri += "/" + msgYear;
-      dstFolder = GetMsgFolderFromUri(archiveFolderUri, false);
+      dstFolder = MailUtils.getFolderForURI(archiveFolderUri, false);
       if (!dstFolder.parent)
       {
         dstFolder.createStorageIfMissing(this);
         if (isAsync)
           return; // continues with OnStopRunningUrl
       }
     }
     if (granularity >= Ci.nsIMsgIdentity.perMonthArchiveFolders)
     {
       archiveFolderUri += "/" + msgMonth;
-      dstFolder = GetMsgFolderFromUri(archiveFolderUri, false);
+      dstFolder = MailUtils.getFolderForURI(archiveFolderUri, false);
       if (!dstFolder.parent)
       {
         dstFolder.createStorageIfMissing(this);
         if (isAsync)
           return; // continues with OnStopRunningUrl
       }
     }
 
diff --git a/suite/mailnews/content/messageWindow.js b/suite/mailnews/content/messageWindow.js
--- a/suite/mailnews/content/messageWindow.js
+++ b/suite/mailnews/content/messageWindow.js
@@ -1,13 +1,15 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+ChromeUtils.import("resource:///modules/MailUtils.js");
+
 /* This is where functions related to the standalone message window are kept */
 
 // from MailNewsTypes.h
 const nsMsgKey_None = 0xFFFFFFFF;
 const nsMsgViewIndex_None = 0xFFFFFFFF;
 
 /* globals for a particular window */
 
@@ -431,17 +433,18 @@ function GetSelectedIndices(dbView)
   catch (ex) {
     dump("ex = " + ex + "\n");
     return null;
   }
 }
 
 function GetLoadedMsgFolder()
 {
-  return gCurrentFolderUri ? GetMsgFolderFromUri(gCurrentFolderUri) : null;
+  return gCurrentFolderUri ? MailUtils.getFolderForURI(gCurrentFolderUri)
+                           : null;
 }
 
 function GetLoadedMessage()
 {
   return gCurrentMessageUri;
 }
 
 //Clear everything related to the current message. called after load start page.
@@ -457,17 +460,17 @@ function SetNextMessageAfterDelete()
   gNextMessageViewIndexAfterDelete = gDBView.msgToSelectAfterDelete;
 }
 
 function SelectFolder(folderUri)
 {
   if (folderUri == gCurrentFolderUri)
     return;
 
-  let msgfolder = GetMsgFolderFromUri(folderUri);
+  let msgfolder = MailUtils.getFolderForURI(folderUri);
   if (!msgfolder || msgfolder.isServer)
     return;
 
   // close old folder view
   var dbview = GetDBView();
   if (dbview)
     dbview.close();
 
diff --git a/suite/mailnews/content/messageWindow.xul b/suite/mailnews/content/messageWindow.xul
--- a/suite/mailnews/content/messageWindow.xul
+++ b/suite/mailnews/content/messageWindow.xul
@@ -41,17 +41,16 @@
   <script src="chrome://messenger/content/mailWindow.js"/>
   <script src="chrome://messenger/content/messageWindow.js"/>
   <script src="chrome://messenger/content/accountUtils.js"/>
   <script src="chrome://messenger/content/mailContextMenus.js"/>
   <script src="chrome://messenger/content/phishingDetector.js"/>
   <script src="chrome://communicator/content/contentAreaClick.js"/>
   <script src="chrome://global/content/nsDragAndDrop.js"/>
   <script src="chrome://messenger/content/msgViewNavigation.js"/>
-  <script src="chrome://messenger/content/widgetglue.js"/>
   <script src="chrome://messenger/content/tabmail.js"/>
 
   <commandset id="mailCommands">
     <commandset id="mailFileMenuItems"/>
     <commandset id="mailDownloadCommands"/>
     <commandset id="mailViewMenuItems"/>
     <commandset id="mailEditMenuItems"/>
     <commandset id="mailSearchMenuItems"/>
diff --git a/suite/mailnews/content/messenger.xul b/suite/mailnews/content/messenger.xul
--- a/suite/mailnews/content/messenger.xul
+++ b/suite/mailnews/content/messenger.xul
@@ -34,17 +34,16 @@
         windowtype="mail:3pane">
 
 <stringbundleset id="stringbundleset">
   <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
   <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
   <stringbundle id="bundle_search" src="chrome://messenger/locale/search.properties"/>
 </stringbundleset>
 
-<script src="chrome://messenger/content/widgetglue.js"/>
 <script src="chrome://messenger/content/commandglue.js"/>
 <script src="chrome://messenger/content/msgViewNavigation.js"/>
 <script src="chrome://messenger/content/mailWindow.js"/>
 <script src="chrome://messenger/content/msgMail3PaneWindow.js"/>
 <script src="chrome://messenger/content/mail3PaneWindowCommands.js"/>
 <script src="chrome://messenger/content/mailContextMenus.js"/>
 <script src="chrome://messenger/content/messengerdnd.js"/>
 <script src="chrome://messenger/content/accountUtils.js"/>
diff --git a/suite/mailnews/content/msgHdrViewOverlay.js b/suite/mailnews/content/msgHdrViewOverlay.js
--- a/suite/mailnews/content/msgHdrViewOverlay.js
+++ b/suite/mailnews/content/msgHdrViewOverlay.js
@@ -928,17 +928,17 @@ function UpdateMessageHeaders()
 
     if (headerName == "subject")
     {
       try {
         if (gDBView.keyForFirstSelectedMessage == nsMsgKey_None)
         {
           let folder = null;
           if (gCurrentFolderUri)
-            folder = GetMsgFolderFromUri(gCurrentFolderUri);
+            folder = MailUtils.getFolderForURI(gCurrentFolderUri);
           setTitleFromFolder(folder, headerField.headerValue);
         }
       } catch (ex) {}
     }
 
     if (gCollapsedHeaderViewMode && !gBuiltCollapsedView)
     {
       if (headerName in gCollapsedHeaderView)
diff --git a/suite/mailnews/content/msgMail3PaneWindow.js b/suite/mailnews/content/msgMail3PaneWindow.js
--- a/suite/mailnews/content/msgMail3PaneWindow.js
+++ b/suite/mailnews/content/msgMail3PaneWindow.js
@@ -1,15 +1,17 @@
 /* -*- Mode: javascript; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+ChromeUtils.import("resource:///modules/MailUtils.js");
+ChromeUtils.import("resource:///modules/msgDBCacheManager.js");
+
 /* This is where functions related to the 3 pane window are kept */
-ChromeUtils.import("resource:///modules/msgDBCacheManager.js");
 
 // from MailNewsTypes.h
 const nsMsgKey_None = 0xFFFFFFFF;
 const nsMsgViewIndex_None = 0xFFFFFFFF;
 const kMailCheckOncePrefName = "mail.startup.enabledMailCheckOnce";
 
 var gFolderTree;
 var gSearchInput;
@@ -1358,17 +1360,17 @@ function EnsureFolderIndex(builder, msgF
     builder.toggleOpenState(EnsureFolderIndex(builder, msgFolder.parent));
     index = builder.getIndexOfResource(msgFolder);
   }
   return index;
 }
 
 function SelectFolder(folderUri)
 {
-  let msgFolder = GetMsgFolderFromUri(folderUri);
+  let msgFolder = MailUtils.getFolderForURI(folderUri);
   SelectMsgFolder(msgFolder);
 }
 
 function SelectMsgFolder(msgFolder) {
   var folderTree = GetFolderTree();
 
   // Before we can select a folder, we need to make sure it is "visible"
   // in the tree. To do that, we need to ensure that all its
diff --git a/suite/mailnews/content/searchBar.js b/suite/mailnews/content/searchBar.js
--- a/suite/mailnews/content/searchBar.js
+++ b/suite/mailnews/content/searchBar.js
@@ -54,17 +54,17 @@ var gSearchNotificationListener =
         statusFeedback.showProgress(0);
         gProgressMeter.setAttribute("mode", "normal");
         gSearchInProgress = false;
 
         // ### TODO need to find out if there's quick search within a virtual folder.
         if (gCurrentVirtualFolderUri &&
             (!gSearchInput || gSearchInput.value == ""))
         {
-          var vFolder = GetMsgFolderFromUri(gCurrentVirtualFolderUri, false);
+          var vFolder = MailUtils.getFolderForURI(gCurrentVirtualFolderUri, false);
           var dbFolderInfo = vFolder.msgDatabase.dBFolderInfo;
           dbFolderInfo.numUnreadMessages = gNumUnreadMessages;
           dbFolderInfo.numMessages = gNumTotalMessages;
           vFolder.updateSummaryTotals(true); // force update from db.
           var msgdb = vFolder.msgDatabase;
           msgdb.Commit(Ci.nsMsgDBCommitType.kLargeCommit);
           // now that we have finished loading a virtual folder,
           // scroll to the correct message if there is at least one.
@@ -303,17 +303,17 @@ function createSearchTermsWithList(aTerm
     if (msgDatabase)
     {
       var dbFolderInfo = msgDatabase.dBFolderInfo;
       var srchFolderUri = dbFolderInfo.getCharProperty("searchFolderUri");
       viewDebug("createSearchTermsWithList xf vf scope = " + srchFolderUri + "\n");
       var srchFolderUriArray = srchFolderUri.split('|');
       for (i in srchFolderUriArray)
       {
-        let realFolder = GetMsgFolderFromUri(srchFolderUriArray[i]);
+        let realFolder = MailUtils.getFolderForURI(srchFolderUriArray[i]);
         if (!realFolder.isServer)
           gSearchSession.addScopeTerm(nsMsgSearchScope.offlineMail, realFolder);
       }
     }
   }
   else
   {
     viewDebug ("in createSearchTermsWithList, adding scope term for selected folder\n");
diff --git a/suite/mailnews/content/widgetglue.js b/suite/mailnews/content/widgetglue.js
deleted file mode 100644
--- a/suite/mailnews/content/widgetglue.js
+++ /dev/null
@@ -1,28 +0,0 @@
-/* -*- Mode: javascript; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*
- * widget-specific wrapper glue. There should be one function for every
- * widget/menu item, which gets some context (like the current selection)
- * and then calls a function/command in commandglue
- */
-
-//The eventual goal is for this file to go away and its contents to be brought into
-//mailWindowOverlay.js.  This is currently being done.
-
-ChromeUtils.import("resource:///modules/MailUtils.js");
-
-// Given a URI we would like to return corresponding message folder here.
-// An additonal input param which specifies whether or not to check folder
-// attributes (like if there exists a parent or is it a server) is also passed
-// to this routine. Qualifying against those checks would return an existing
-// folder. Callers who don't want to check those attributes will specify the
-// same and then this routine will simply return a msgfolder. This scenario
-// applies to a new imap account creation where special folders are created
-// on demand and hence needs to prior check of existence.
-function GetMsgFolderFromUri(uri, checkFolderAttributes)
-{
-  return MailUtils.getFolderForURI(uri, checkFolderAttributes);
-}
diff --git a/suite/mailnews/jar.mn b/suite/mailnews/jar.mn
--- a/suite/mailnews/jar.mn
+++ b/suite/mailnews/jar.mn
@@ -60,16 +60,15 @@ messenger.jar:
     content/messenger/nsDragAndDrop.js                                         (content/nsDragAndDrop.js)
     content/messenger/phishingDetector.js                                      (content/phishingDetector.js)
     content/messenger/searchBar.js                                             (content/searchBar.js)
     content/messenger/start.xhtml                                              (content/start.xhtml)
     content/messenger/tabmail.js                                               (content/tabmail.js)
     content/messenger/tabmail.xml                                              (content/tabmail.xml)
     content/messenger/threadPane.js                                            (content/threadPane.js)
     content/messenger/threadPane.xul                                           (content/threadPane.xul)
-    content/messenger/widgetglue.js                                            (content/widgetglue.js)
 
     content/messenger/SearchDialog.xul                                         (content/SearchDialog.xul)
     content/messenger/SearchDialog.js                                          (content/SearchDialog.js)
     content/messenger/ABSearchDialog.xul                                       (content/ABSearchDialog.xul)
     content/messenger/ABSearchDialog.js                                        (content/ABSearchDialog.js)
     content/messenger/FilterListDialog.xul                                     (content/FilterListDialog.xul)
     content/messenger/FilterListDialog.js                                      (content/FilterListDialog.js)