fix for #79736 (cross folder message navigation is broken)

fix for #76792 (text zoom not working in 3 pane, alt 3 pane, or the stand alone msg window.)
sr=bienvenu,mscott

mailnews/base/resources/content/mailWindowOverlay.xul

@@ -45,11 +45,11 @@ Rights Reserved.
 <script type="application/x-javascript" src="chrome://communicator/content/findUtils.js"/>
 <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bookmarksOverlay.js"/>
 
-<stringbundleset id="mailStringBundles">
+<stringbundleset id="stringbundleset">
   <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
   <stringbundle id="bundle_viewZoom"/>
 </stringbundleset>
-
+ 
 <commandset id="mailFileMenuItems"
             commandupdater="true"
             events="create-menu-file"
@@ -100,7 +100,7 @@ Rights Reserved.
    <command id="cmd_viewWatchedThreadsWithUnread" oncommand="goDoCommand('cmd_viewWatchedThreadsWithUnread')" disabled="true"/>
    <command id="cmd_viewIgnoredThreads" oncommand="goDoCommand('cmd_viewIgnoredThreads')" disabled="true"/>
    <command id="cmd_sortByThread" oncommand="goDoCommand('cmd_sortByThread')" disabled="true"/>
-
+   <commandset id="viewZoomCommands"/>
 </commandset>
 
 <commandset id="mailEditMenuItems"

mailnews/base/resources/content/messageWindow.js

@@ -679,7 +679,7 @@ function performNavigation(type)
   gDBView.viewNavigate(type, resultId, resultIndex, threadIndex, true /* wrap */);
   
   // if we found something....display it.
-  if ((resultId.value != -1) && (resultIndex.value != -1)) 
+  if ((resultId.value != nsMsgViewIndex_None) && (resultIndex.value != nsMsgViewIndex_None)) 
   {
     // load the message key
     gDBView.loadMessageByMsgKey(resultId.value);

mailnews/base/resources/content/messageWindow.xul

@@ -45,7 +45,7 @@ Rights Reserved.
         persist="width height screenX screenY sizemode"
         windowtype="mail:messageWindow">
 
-  <stringbundleset id="mailStringBundles">
+  <stringbundleset id="stringbundleset">
     <stringbundle id="bundle_brand" src="chrome://global/locale/brand.properties"/>
     <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
   </stringbundleset>
@@ -66,6 +66,7 @@ Rights Reserved.
   <script type="application/x-javascript" src="chrome://global/content/nsJSComponentManager.js"/>
   <script type="application/x-javascript" src="chrome://global/content/nsTransferable.js"/>
   <script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
+  <script type="application/x-javascript" src="chrome://messenger/content/msgViewNavigation.js"/>
 
   <commandset id="mailCommands">
     <commandset id="mailFileMenuItems"/>

mailnews/base/resources/content/messenger.xul

@@ -51,7 +51,7 @@ Rights Reserved.
         persist="width height screenX screenY sizemode"
         windowtype="mail:3pane">
 
-<stringbundleset id="mailStringBundles">
+<stringbundleset id="stringbundleset">
   <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
   <stringbundle id="bundle_brand" src="chrome://global/locale/brand.properties"/>
 </stringbundleset>

mailnews/base/resources/content/msgViewNavigation.js

@@ -162,6 +162,9 @@ function CrossFolderNavigation(type, supportsFolderPane )
     return nextFolderURI;
 }
 
+// from MailNewsTypes.h
+const nsMsgViewIndex_None = 0xFFFFFFFF;
+
 function ScrollToMessage(type, wrap, selectMessage)
 {
   try {
@@ -176,7 +179,7 @@ function ScrollToMessage(type, wrap, selectMessage)
     gDBView.viewNavigate(type, resultId, resultIndex, threadIndex, true /* wrap */);
 
     // only scroll and select if we found something
-    if ((resultId.value != -1) && (resultIndex.value != -1)) {
+    if ((resultId.value != nsMsgViewIndex_None) && (resultIndex.value != nsMsgViewIndex_None)) {
         if (selectMessage) {
             outlinerSelection.select(resultIndex.value);
         }