diff --git a/mozilla/mail/base/content/askViewZoom.xul b/mozilla/mail/base/content/askViewZoom.xul
deleted file mode 100644
index d3af821dae1..00000000000
--- a/mozilla/mail/base/content/askViewZoom.xul
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0"?>
-
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is this file as it was released on
-# September 7, 2000.
-# 
-# The Initial Developer of the Original Code is Peter Annema.
-# Portions created by Peter Annema are Copyright (C) 2000
-# Peter Annema.  All Rights Reserved.
-# 
-# Contributor(s):
-#   Peter Annema <disttsc@bart.nl> (Original Author)
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-
-<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-
-<!DOCTYPE dialog SYSTEM "chrome://communicator/locale/askViewZoom.dtd">
-
-<dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-  id="askViewZoom"
-  title="&askViewZoom.title;"
-  ondialogaccept="return onAccept();"
-  onload="onLoad();">
-
-  <script type="application/x-javascript" src="chrome://communicator/content/askViewZoom.js"/>
-
-  <hbox align="center">
-    <label value="&selectZoom.label;"/>
-    <textbox id="zoomValue" oninput="doEnabling();"/>
-  </hbox>
-
-</dialog>
diff --git a/mozilla/mail/base/content/mailCommands.js b/mozilla/mail/base/content/mailCommands.js
new file mode 100644
index 00000000000..ec1adc48f7f
--- /dev/null
+++ b/mozilla/mail/base/content/mailCommands.js
@@ -0,0 +1,715 @@
+# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is Mozilla Communicator client code, released
+# March 31, 1998.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation. Portions created by Netscape are
+# Copyright (C) 1998-1999 Netscape Communications Corporation. All
+# Rights Reserved.
+
+function DoRDFCommand(dataSource, command, srcArray, argumentArray)
+{
+	var commandResource = RDF.GetResource(command);
+	if(commandResource) {
+      try {
+		dataSource.DoCommand(srcArray, commandResource, argumentArray);
+      }
+      catch(e) { 
+        if (command == "http://home.netscape.com/NC-rdf#NewFolder") {
+          throw(e); // so that the dialog does not automatically close.
+        }
+        dump("Exception : In mail commands\n");
+      }
+    }
+}
+
+function GetNewMessages(selectedFolders, compositeDataSource)
+{
+	var numFolders = selectedFolders.length;
+	if(numFolders > 0)
+	{
+		var msgFolder = selectedFolders[0];
+
+		//Whenever we do get new messages, clear the old new messages.
+		if(msgFolder) 
+		{
+			var nsIMsgFolder = Components.interfaces.nsIMsgFolder;
+			msgFolder.biffState = nsIMsgFolder.nsMsgBiffState_NoMail;
+
+			if (msgFolder.hasNewMessages)
+				msgFolder.clearNewMessages();
+		}
+		
+		if(compositeDataSource)
+		{
+			var folderResource = msgFolder.QueryInterface(Components.interfaces.nsIRDFResource);
+		    var folderArray = Components.classes["@mozilla.org/supports-array;1"].createInstance(Components.interfaces.nsISupportsArray);
+			folderArray.AppendElement(folderResource);
+
+			DoRDFCommand(compositeDataSource, "http://home.netscape.com/NC-rdf#GetNewMessages", folderArray, null);
+		}
+	}
+	else {
+		dump("Nothing was selected\n");
+	}
+}
+
+function getBestIdentity(identities, optionalHint)
+{
+  var identity = null;
+
+  // if we have more than one identity and a hint to help us pick one
+  if (identities.Count() > 1 && optionalHint) {
+    // iterate over all of the identities
+    var tempID;
+    for (id = 0; id < identities.Count(); id++) { 
+      tempID = identities.GetElementAt(id).QueryInterface(Components.interfaces.nsIMsgIdentity);
+      if (optionalHint.search(tempID.email) >= 0) {
+        identity = tempID;
+        break;
+      }
+    }
+
+    // if we could not find an exact email address match within the hint fields then maybe the message
+    // was to a mailing list. In this scenario, we won't have a match based on email address. 
+    // Before we just give up, try and search for just a shared domain between the the hint and 
+    // the email addresses for our identities. Hey, it is better than nothing and in the case
+    // of multiple matches here, we'll end up picking the first one anyway which is what we would have done
+    // if we didn't do this second search. This helps the case for corporate users where mailing lists will have the same domain
+    // as one of your multiple identities.
+
+    if (!identity) {
+      for (id = 0; id < identities.Count(); id++) { 
+        tempID = identities.GetElementAt(id).QueryInterface(Components.interfaces.nsIMsgIdentity);
+
+        // extract out the partial domain
+        var start = tempID.email.lastIndexOf("@"); // be sure to include the @ sign in our search to reduce the risk of false positives
+  
+        if (optionalHint.search(tempID.email.slice(start, tempID.email.length)) >= 0) {
+          identity = tempID;
+          break;
+        }
+      }
+    }
+  }
+
+  // still no matches? Give up and pick the first one like we used to.
+  if (!identity)
+    identity = identities.GetElementAt(0).QueryInterface(Components.interfaces.nsIMsgIdentity); 
+
+  return identity;
+}
+
+function getIdentityForServer(server, optionalHint)
+{
+    var identity = null;
+    if(server) {
+		// get the identity associated with this server
+        var identities = accountManager.GetIdentitiesForServer(server);
+        // dump("identities = " + identities + "\n");
+        // just get the first one
+        if (identities.Count() > 0 ) { 
+          identity = getBestIdentity(identities, optionalHint);
+        }
+    }
+
+    return identity;
+}
+
+function GetNextNMessages(folder)
+{
+	if (folder) {
+		var newsFolder = folder.QueryInterface(Components.interfaces.nsIMsgNewsFolder);
+		if (newsFolder) {
+			newsFolder.getNextNMessages(msgWindow);
+		}
+	}
+}
+
+// type is a nsIMsgCompType and format is a nsIMsgCompFormat
+function ComposeMessage(type, format, folder, messageArray) 
+{
+	var msgComposeType = Components.interfaces.nsIMsgCompType;
+	var identity = null;
+	var newsgroup = null;
+	var server;
+
+	//dump("ComposeMessage folder="+folder+"\n");
+	try 
+	{
+		if(folder)
+		{
+			// get the incoming server associated with this uri
+			server = folder.server;
+
+			// if they hit new or reply and they are reading a newsgroup
+			// turn this into a new post or a reply to group.
+      if (!folder.isServer && server.type == "nntp" && type == msgComposeType.New)
+			{
+        type = msgComposeType.NewsPost;
+        newsgroup = folder.folderURL;
+			}
+
+      // 
+      identity = getIdentityForServer(server);
+      // dump("identity = " + identity + "\n");
+		}
+	}
+	catch (ex) 
+	{
+        	dump("failed to get an identity to pre-select: " + ex + "\n");
+	}
+
+	//dump("\nComposeMessage from XUL: " + identity + "\n");
+	var uri = null;
+
+	if (! msgComposeService)
+	{
+		dump("### msgComposeService is invalid\n");
+		return;
+	}
+	
+	if (type == msgComposeType.New) //new message
+	{
+		//dump("OpenComposeWindow with " + identity + "\n");
+
+    // if the addressbook sidebar panel is open and has focus, get
+    // the selected addresses from it
+    if (document.commandDispatcher.focusedWindow.document.documentElement.hasAttribute("selectedaddresses"))
+      NewMessageToSelectedAddresses(type, format, identity);
+
+    else
+      msgComposeService.OpenComposeWindow(null, null, type, format, identity, msgWindow);
+		return;
+	}
+  else if (type == msgComposeType.NewsPost) 
+	{
+		//dump("OpenComposeWindow with " + identity + " and " + newsgroup + "\n");
+		msgComposeService.OpenComposeWindow(null, newsgroup, type, format, identity, msgWindow);
+		return;
+	}
+		
+	messenger.SetWindow(window, msgWindow);
+			
+	var object = null;
+	
+	if (messageArray && messageArray.length > 0)
+	{
+		uri = "";
+		for (var i = 0; i < messageArray.length; i ++)
+		{	
+			var messageUri = messageArray[i];
+
+      var hdr = messenger.messageServiceFromURI(messageUri).messageURIToMsgHdr(messageUri);
+      var hintForIdentity = (type == msgComposeType.Template) ? hdr.author : hdr.recipients + hdr.ccList;
+
+      if (server)
+        identity = getIdentityForServer(server, hintForIdentity);
+
+			if (type == msgComposeType.Reply || type == msgComposeType.ReplyAll || type == msgComposeType.ForwardInline ||
+				type == msgComposeType.ReplyToGroup || type == msgComposeType.ReplyToSender || 
+				type == msgComposeType.ReplyToSenderAndGroup ||
+				type == msgComposeType.Template || type == msgComposeType.Draft)
+			{
+				msgComposeService.OpenComposeWindow(null, messageUri, type, format, identity, msgWindow);
+        //limit the number of new compose windows to 8. Why 8? I like that number :-)
+        if (i == 7)
+          break;
+			}
+			else
+			{
+				if (i) 
+					uri += ","
+				uri += messageUri;
+			}
+		}
+		if (type == msgComposeType.ForwardAsAttachment)
+			msgComposeService.OpenComposeWindow(null, uri, type, format, identity, msgWindow);
+	}
+	else
+		dump("### nodeList is invalid\n");
+}
+
+function NewMessageToSelectedAddresses(type, format, identity) {
+  var abSidebarPanel = document.commandDispatcher.focusedWindow;
+  var abResultsTree = abSidebarPanel.document.getElementById("abResultsTree");
+  var abResultsBoxObject = abResultsTree.treeBoxObject;
+  var abView = abResultsBoxObject.view;
+  abView = abView.QueryInterface(Components.interfaces.nsIAbView);
+  var addresses = abView.selectedAddresses;
+  var params = Components.classes["@mozilla.org/messengercompose/composeparams;1"].createInstance(Components.interfaces.nsIMsgComposeParams);
+  if (params) {
+    params.type = type;
+    params.format = format;
+    params.identity = identity;
+    var composeFields = Components.classes["@mozilla.org/messengercompose/composefields;1"].createInstance(Components.interfaces.nsIMsgCompFields);
+    if (composeFields) {
+      var addressList = "";
+      for (var i = 0; i < addresses.Count(); i++) {
+        addressList = addressList + (i > 0 ? ",":"") + addresses.QueryElementAt(i,Components.interfaces.nsISupportsString).data;
+      }
+      composeFields.to = addressList;
+      params.composeFields = composeFields;
+      msgComposeService.OpenComposeWindowWithParams(null, params);
+    }
+  }
+}
+ 
+
+function CreateNewSubfolder(chromeWindowURL, preselectedMsgFolder,
+                            dualUseFolders, callBackFunctionName)
+{
+	var preselectedURI;
+
+	if(preselectedMsgFolder)
+	{
+		var preselectedFolderResource = preselectedMsgFolder.QueryInterface(Components.interfaces.nsIRDFResource);
+		if(preselectedFolderResource)
+			preselectedURI = preselectedFolderResource.Value;
+		dump("preselectedURI = " + preselectedURI + "\n");
+	}
+
+	var dialog = window.openDialog(
+				chromeWindowURL,
+				"",
+				"chrome,titlebar,modal",
+				{preselectedURI:preselectedURI,
+	                         dualUseFolders:dualUseFolders,
+	                         okCallback:callBackFunctionName});
+}
+
+function NewFolder(name,uri)
+{
+	//dump("uri,name = " + uri + "," + name + "\n");
+	if (uri && (uri != "") && name && (name != "")) {
+		var selectedFolderResource = RDF.GetResource(uri);
+		//dump("selectedFolder = " + uri + "\n");
+		var compositeDataSource = GetCompositeDataSource("NewFolder");
+
+	    var folderArray = Components.classes["@mozilla.org/supports-array;1"].createInstance(Components.interfaces.nsISupportsArray);
+	    var nameArray = Components.classes["@mozilla.org/supports-array;1"].createInstance(Components.interfaces.nsISupportsArray);
+
+		folderArray.AppendElement(selectedFolderResource);
+
+		var nameLiteral = RDF.GetLiteral(name);
+		nameArray.AppendElement(nameLiteral);
+		DoRDFCommand(compositeDataSource, "http://home.netscape.com/NC-rdf#NewFolder", folderArray, nameArray);
+
+	}
+	else {
+		dump("no name or nothing selected\n");
+	}
+}
+
+function UnSubscribe(folder)
+{
+	// Unsubscribe the current folder from the newsserver, this assumes any confirmation has already
+	// been made by the user  SPL
+    
+	var server = folder.server;
+	var subscribableServer =  server.QueryInterface(Components.interfaces.nsISubscribableServer);       
+	subscribableServer.unsubscribe(folder.name);
+	subscribableServer.commitSubscribeChanges();
+}   
+
+function Subscribe(preselectedMsgFolder)
+{
+	var preselectedURI;
+
+	if(preselectedMsgFolder)
+	{
+		var preselectedFolderResource = preselectedMsgFolder.QueryInterface(Components.interfaces.nsIRDFResource);
+		if(preselectedFolderResource)
+			preselectedURI = preselectedFolderResource.Value;
+		dump("preselectedURI = " + preselectedURI + "\n");
+	}
+
+	window.openDialog("chrome://messenger/content/subscribe.xul",
+					  "subscribe", "chrome,modal,titlebar,resizable=yes",
+				{preselectedURI:preselectedURI,
+				 okCallback:SubscribeOKCallback});
+}
+
+function SubscribeOKCallback(changeTable)
+{
+	for (var serverURI in changeTable) {
+	    var folder = GetMsgFolderFromUri(serverURI, true);
+	    var server = folder.server;
+	    var subscribableServer =
+            server.QueryInterface(Components.interfaces.nsISubscribableServer);
+
+        for (var name in changeTable[serverURI]) {
+		    if (changeTable[serverURI][name] == true) {
+                try {
+			        subscribableServer.subscribe(name);
+                }
+                catch (ex) {
+                    dump("failed to subscribe to " + name + ": " + ex + "\n");
+                }
+		    }
+		    else if (changeTable[serverURI][name] == false) {
+                try {
+			        subscribableServer.unsubscribe(name);
+                }
+                catch (ex) {
+                    dump("failed to unsubscribe to " + name + ": " + ex + "\n");
+                }
+            }
+		    else {
+			    // no change
+		    }
+        }
+
+        try {
+            subscribableServer.commitSubscribeChanges();
+        }
+        catch (ex) {
+            dump("failed to commit the changes: " + ex + "\n");
+        }
+    }
+}
+
+function SaveAsFile(uri)
+{
+  if (uri) {
+    var filename = null;
+    try {
+      var subject = messenger.messageServiceFromURI(uri)
+                             .messageURIToMsgHdr(uri).subject;
+      filename = GenerateValidFilename(subject, ".eml");
+    }
+    catch (ex) {}
+    messenger.saveAs(uri, true, null, filename);
+  }
+}
+
+function SaveAsTemplate(uri, folder)
+{
+	if (uri) {
+		var identity = getIdentityForServer(folder.server);
+		messenger.saveAs(uri, false, identity, null);
+	}
+}
+
+function MarkSelectedMessagesRead(markRead)
+{
+  gDBView.doCommand(markRead ? nsMsgViewCommandType.markMessagesRead : nsMsgViewCommandType.markMessagesUnread);
+}
+
+function MarkSelectedMessagesFlagged(markFlagged)
+{
+  gDBView.doCommand(markFlagged ? nsMsgViewCommandType.flagMessages : nsMsgViewCommandType.unflagMessages);
+}
+
+function MarkAllMessagesRead(compositeDataSource, folder)
+{
+  var folderResource = folder.QueryInterface(Components.interfaces.nsIRDFResource);
+  var folderArray = Components.classes["@mozilla.org/supports-array;1"].createInstance(Components.interfaces.nsISupportsArray);
+  folderArray.AppendElement(folderResource);
+
+  DoRDFCommand(compositeDataSource, "http://home.netscape.com/NC-rdf#MarkAllMessagesRead", folderArray, null);
+}
+
+function DownloadFlaggedMessages(compositeDataSource, folder)
+{
+    dump("fix DownloadFlaggedMessages()\n");
+}
+
+function DownloadSelectedMessages(compositeDataSource, messages, markFlagged)
+{
+    dump("fix DownloadSelectedMessages()\n");
+}
+
+function ViewPageSource(messages)
+{
+	var numMessages = messages.length;
+
+	if (numMessages == 0)
+	{
+		dump("MsgViewPageSource(): No messages selected.\n");
+		return false;
+	}
+
+    try {
+        // First, get the mail session
+        const mailSessionContractID = "@mozilla.org/messenger/services/session;1";
+        const nsIMsgMailSession = Components.interfaces.nsIMsgMailSession;
+        var mailSession = Components.classes[mailSessionContractID].getService(nsIMsgMailSession);
+
+        var mailCharacterSet = "charset=" + msgWindow.mailCharacterSet;
+
+        for (var i = 0; i < numMessages; i++)
+        {
+            // Now, we need to get a URL from a URI
+            var url = mailSession.ConvertMsgURIToMsgURL(messages[i], msgWindow);
+
+            window.openDialog( "chrome://global/content/viewSource.xul",
+                               "_blank",
+                               "scrollbars,resizable,chrome,dialog=no",
+                               url,
+                               mailCharacterSet);
+        }
+        return true;
+    } catch (e) {
+        // Couldn't get mail session
+        return false;
+    }
+}
+
+function doHelpButton() 
+{
+    openHelp("mail-offline-items");
+}
+
+// XXX The following junkmail code might be going away or changing
+
+const NS_BAYESIANFILTER_CONTRACTID = "@mozilla.org/messenger/filter-plugin;1?name=bayesianfilter";
+const nsIJunkMailPlugin = Components.interfaces.nsIJunkMailPlugin;
+const nsIMsgDBHdr = Components.interfaces.nsIMsgDBHdr;
+
+var gJunkmailComponent;
+var gJunkKeys = [];
+var gJunkTargetFolder;
+
+function saveJunkMsgForAction(aServer, aMsgURI, aClassification)
+{
+  // we only care when the message gets marked as junk
+  if (aClassification == nsIJunkMailPlugin.GOOD)
+    return;
+ 
+  var spamSettings = aServer.spamSettings
+ 
+  // if the spam feature is disabled,
+  // or if the move functionality is turned off, bail out.
+  // the user could still run the JMC manually,
+  // but let's not move in that scenario
+  if (!spamSettings.level || !spamSettings.moveOnSpam)
+    return;   
+  
+  var msgHdr = messenger.messageServiceFromURI(aMsgURI).messageURIToMsgHdr(aMsgURI);
+  
+  // don't move if we are already in the junk folder
+  if (msgHdr.folder.flags & MSG_FOLDER_FLAG_JUNK)
+    return;
+ 
+  var spamFolderURI = spamSettings.spamFolderURI;
+  if (!spamFolderURI)
+    return;
+  
+  var spamFolder = GetMsgFolderFromUri(spamFolderURI);
+
+  if (spamFolder) 
+  {
+    gJunkKeys[gJunkKeys.length] = msgHdr.messageKey;
+    gJunkTargetFolder = spamFolder;
+  }
+}
+
+function performActionOnJunkMsgs()
+{
+  if (!gJunkKeys.length)
+  {
+    gJunkTargetFolder = [];
+    return;
+  }
+
+  var indices = new Array(gJunkKeys.length);
+  for (var i=0;i<gJunkKeys.length;i++)
+    indices[i] = gDBView.findIndexFromKey(gJunkKeys[i], true /* expand */);
+
+  var treeView = gDBView.QueryInterface(Components.interfaces.nsITreeView);
+  var treeSelection = treeView.selection;
+  treeSelection.clearSelection();
+   
+  // select the messages
+  for (i=0;i<indices.length;i++)
+    treeSelection.rangedSelect(indices[i], indices[i], true /* augment */);
+
+  SetNextMessageAfterDelete();  
+  gDBView.doCommandWithFolder(nsMsgViewCommandType.moveMessages, gJunkTargetFolder);
+  
+  gJunkKeys = [];
+  gJunkTargetFolder = null;
+}
+
+function getJunkmailComponent()
+{
+    if (!gJunkmailComponent) {
+        gJunkmailComponent = Components.classes[NS_BAYESIANFILTER_CONTRACTID].getService(nsIJunkMailPlugin);
+    }
+}
+
+function analyze(aMsgHdr, aNextFunction)
+{
+    var listener = {
+        onMessageClassified: function(aMsgURI, aClassification)
+        {
+            // XXX todo
+            // update status bar, or a progress dialog
+            // running junk mail controls manually, on a large folder
+            // can take a while, and the user doesn't know when we are done.
+            dump(aMsgURI + ' is ' 
+                 + (aClassification == nsIJunkMailPlugin.JUNK
+                    ? 'JUNK' : 'GOOD') + '\n');
+            // XXX TODO, make the cut off 50, like in nsMsgSearchTerm.cpp
+            var score = 
+                aClassification == nsIJunkMailPlugin.JUNK ? "100" : "0";
+
+            // set these props via the db (instead of the message header
+            // directly) so that the nsMsgDBView knows to update the UI
+            //
+            var db = aMsgHdr.folder.getMsgDatabase(msgWindow);
+            db.setStringProperty(aMsgHdr.messageKey, "junkscore", score);
+            db.setStringProperty(aMsgHdr.messageKey, "junkscoreorigin", 
+                                 "plugin");
+            saveJunkMsgForAction(aMsgHdr.folder.server, aMsgURI, aClassification);
+            aNextFunction();
+        }
+    };
+
+    // if we are whitelisting, check if the email address is in the whitelist addressbook.
+    var spamSettings = aMsgHdr.folder.server.spamSettings;
+    if (spamSettings.useWhiteList && spamSettings.whiteListAbURI)
+    {
+      var whiteListDirectory = RDF.GetResource(spamSettings.whiteListAbURI).QueryInterface(Components.interfaces.nsIAbMDBDirectory);
+      var headerParser = Components.classes["@mozilla.org/messenger/headerparser;1"].getService(Components.interfaces.nsIMsgHeaderParser);
+      var authorEmailAddress = new Object;
+      headerParser.extractHeaderAddressMailboxes(null, aMsgHdr.author, authorEmailAddress);
+      if (whiteListDirectory.hasCardForEmailAddress(authorEmailAddress.value))
+      {
+        // skip over this message, like we do on incoming mail
+        // the difference is it could be marked as junk from previous analysis
+        // or from being manually marked by the user.
+        aNextFunction();
+        return;
+      }
+    }
+
+    var messageURI = aMsgHdr.folder.generateMessageURI(aMsgHdr.messageKey)
+        + "?fetchCompleteMessage=true";
+    gJunkmailComponent.classifyMessage(messageURI, msgWindow, listener);
+}
+
+function analyzeFolderForJunk()
+{
+  MsgJunkMailInfo(true);
+  var view = GetDBView();
+
+  // need to expand all threads, so we analyze everything
+  view.doCommand(nsMsgViewCommandType.expandAll);
+
+  var treeView = view.QueryInterface(Components.interfaces.nsITreeView);
+  var count = treeView.rowCount;
+  if (!count)
+    return;
+
+  var messages = new Array(count)
+  for (var i = 0; i < count; i++) {
+    messages[i] = view.getURIForViewIndex(i);
+  }
+  analyzeMessages(messages);
+}
+
+// not used yet, but soon
+function analyzeMessagesForJunk()
+{
+  var messages = GetSelectedMessages();
+  analyzeMessages(messages);
+}
+
+function analyzeMessages(messages)
+{
+    function processNext()
+    {
+        if (counter < messages.length) {
+            var messageUri = messages[counter];
+            var message = messenger.messageServiceFromURI(messageUri).messageURIToMsgHdr(messageUri);
+            ++counter;
+            analyze(message, processNext);
+        }
+        else {
+            dump('[bayesian filter message analysis complete.]\n');
+            gJunkmailComponent.endBatch();
+            performActionOnJunkMsgs();
+        }
+    }
+
+    getJunkmailComponent();
+    var counter = 0;
+    gJunkmailComponent.startBatch();
+    dump('[bayesian filter message analysis begins.]\n');
+    processNext();
+}
+
+function JunkSelectedMessages(setAsJunk)
+{
+    MsgJunkMailInfo(true);
+    gDBView.doCommand(setAsJunk ? nsMsgViewCommandType.junk
+                      : nsMsgViewCommandType.unjunk);
+}
+
+function deleteJunkInFolder()
+{
+  MsgJunkMailInfo(true);
+  var view = GetDBView();
+
+  // need to expand all threads, so we find everything
+  view.doCommand(nsMsgViewCommandType.expandAll);
+
+  var treeView = view.QueryInterface(Components.interfaces.nsITreeView);
+  var count = treeView.rowCount;
+  if (!count)
+    return;
+
+  var treeSelection = treeView.selection;
+
+  var clearedSelection = false;
+  
+  // select the junk messages
+  for (var i = 0; i < count; i++) 
+  {
+    var messageUri = view.getURIForViewIndex(i);
+    var msgHdr = messenger.messageServiceFromURI(messageUri).messageURIToMsgHdr(messageUri);
+    var junkScore = msgHdr.getStringProperty("junkscore"); 
+    var isJunk = ((junkScore != "") && (junkScore != "0"));
+    // if the message is junk, select it.
+    if (isJunk) 
+    {
+      // only do this once
+      if (!clearedSelection)
+      {
+        // clear the current selection
+        // since we will be deleting all selected messages
+        treeSelection.clearSelection();
+        clearedSelection = true;
+        treeSelection.selectEventsSuppressed = true;
+      }
+      treeSelection.rangedSelect(i, i, true /* augment */);
+    }
+  }
+
+  // if we didn't clear the selection
+  // there was no junk, so bail.
+  if (!clearedSelection)
+    return;
+
+  treeSelection.selectEventsSuppressed = false;
+  // delete the selected messages
+  //
+  // XXX todo
+  // should we try to set next message after delete 
+  // to the message selected before we did all this, if it was not junk?
+  SetNextMessageAfterDelete();  
+  view.doCommand(nsMsgViewCommandType.deleteMsg);
+  treeSelection.clearSelection();
+}
diff --git a/mozilla/mail/base/content/mailWindowOverlay.xul b/mozilla/mail/base/content/mailWindowOverlay.xul
index 1846e96a227..07f33f48399 100644
--- a/mozilla/mail/base/content/mailWindowOverlay.xul
+++ b/mozilla/mail/base/content/mailWindowOverlay.xul
@@ -39,7 +39,7 @@
 <script type="application/x-javascript" src="chrome://messenger/content/mailCommands.js"/>
 <script type="application/x-javascript" src="chrome://messenger/content/mailWindowOverlay.js"/>
 <script type="application/x-javascript" src="chrome://messenger/content/mailCore.js"/>
-<script type="application/x-javascript" src="chrome://communicator/content/findUtils.js"/>
+<script type="application/x-javascript" src="chrome://global/content/findUtils.js"/>
 <script type="application/x-javascript" src="chrome://communicator/content/printing.js"/>
 <script type="application/x-javascript" src="chrome://messenger/content/msgViewPickerOverlay.js"/>
 <script type="application/x-javascript" src="chrome://global/content/viewZoomOverlay.js"/>
diff --git a/mozilla/mail/base/content/viewSource.xul b/mozilla/mail/base/content/viewSource.xul
deleted file mode 100644
index 1e992ba8d50..00000000000
--- a/mozilla/mail/base/content/viewSource.xul
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0"?> <!-- -*- Mode: HTML -*- --> 
-
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is mozilla.org viewsource frontend.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-#     Doron Rosenberg (doronr@naboonline.com)
-#     Roger B. Sidje (rbs@maths.uq.edu.au)
-#
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-
-<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
-<?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
-
-<!DOCTYPE window [
-<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
-%brandDTD;
-<!ENTITY % sourceDTD SYSTEM "chrome://navigator/locale/viewSource.dtd" >
-%sourceDTD;
-<!ENTITY % msgDTD SYSTEM "chrome://messenger/locale/messenger.dtd" >
-%msgDTD;
-<!ENTITY % contentAreaCommandsDTD SYSTEM "chrome://communicator/locale/contentAreaCommands.dtd" >
-%contentAreaCommandsDTD;
-]>
-
-<window id="main-window"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        onload="onLoadViewSource();"
-        contenttitlesetting="true"
-        title="&mainWindow.title;" 
-        titledefault="&mainWindow.titlemodifier;" 
-        titlepreface="&mainWindow.preface;"
-        titlemenuseparator ="&mainWindow.titlemodifierseparator;"  
-        windowtype="navigator:view-source"
-        width="640" height="480"
-        screenX="10" screenY="10"
-        persist="screenX screenY width height sizemode">
-
-  <script type="application/x-javascript" src="chrome://navigator/content/viewsource.js"/>
-  <script type="application/x-javascript" src="chrome://communicator/content/printing.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://communicator/content/contentAreaDD.js"/>
-  <script type="application/x-javascript" src="chrome://communicator/content/findUtils.js"/>
-  <script type="application/x-javascript" src="chrome://communicator/content/contentAreaUtils.js"/>
-  
-  <commandset id="commands">
-    <commandset id="globalEditMenuItems"/>
-    <commandset id="selectEditMenuItems"/>
-    <commandset id="clipboardEditMenuItems"/>
-    <commandset id="viewSourceMenuItems">
-      <command id="cmd_close" oncommand="ViewSourceClose()"/>
-      <command id="cmd_goToLine" oncommand="ViewSourceGoToLine();" disabled="true"/>
-    </commandset>
-  </commandset>  
-
-
-  <!-- keys are appended from the overlay -->
-  <keyset id="viewSourceKeys">
-
-    <!-- File Menu -->
-    <key id="key_close"/>
-
-    <!-- Edit Menu -->
-    <key id="key_undo"/>
-    <key id="key_redo"/>
-    <key id="key_cut"/>
-    <key id="key_copy"/>
-    <key id="key_paste"/>
-    <key id="key_delete"/>
-    <key id="key_selectAll"/>
-    <key id="key_find"         key="&findCmd.key;" command="Browser:Find" modifiers="accel"/>
-    <key id="key_findAgain"    key="&findAgainCmd.key;" command="Browser:FindAgain" modifiers="accel"/>
-    <key id="key_findPrev"     key="&findPrevCmd.key;"  command="Browser:FindPrev"  modifiers="accel, shift"/>
-    <key keycode="&findAgainCmd.key2;" command="Browser:FindAgain"/>
-    <key keycode="&findPrevCmd.key2;"  command="Browser:FindPrev"  modifiers="shift"/>
-  </keyset>
-
-  <stringbundleset id="viewSource-stringbundleset">
-    <stringbundle id="findBundle" src="chrome://global/locale/finddialog.properties"/>
-  </stringbundleset>
-    
-  <!-- context menu -->
-  <popupset id="viewSourceContextSet">
-    <popup id="viewSourceContextMenu">
-      <menuitem label="&findNextCmd.label;" accesskey="&findNextCmd.accesskey;"  command="Browser:FindAgain"/>
-      <menuseparator/>
-      <menuitem id="menu_copy_cm" command="cmd_copy"
-                label="&copyCmd.label;" accesskey="&copyCmd.accesskey;"/>
-      <menuseparator/>
-      <menuitem id="menu_selectAll_cm" command="cmd_selectAll"
-                label="&selectAllCmd.label;" accesskey="&selectAllCmd.accesskey;"/>
-    </popup>
-  </popupset>
-
-  <!-- Menu --> 
-  <toolbox id="viewSource-toolbox">
-    <menubar id="viewSource-main-menubar">
-      <menu id="menu_File">
-        <menupopup id="filemenu-popup">
-          <menuitem id="menu_close"/>
-        </menupopup>
-      </menu>
-
-      <menu id="menu_Edit">
-        <menupopup>
-          <menuitem id="menu_undo"/>   
-          <menuitem id="menu_redo"/>
-          <menuseparator/>
-          <menuitem id="menu_cut"/>
-          <menuitem id="menu_copy"/>
-          <menuitem id="menu_paste"/>
-          <menuitem id="menu_delete"/>
-          <menuseparator/>
-          <menuitem id="menu_selectAll"/>
-          <menuseparator /> 
-          <menuitem id="menu_find" key="key_find" command="Browser:Find"
-                    label="&findCmd.label;" accesskey="&findCmd.accesskey;"/>
-          <menuitem id="menu_findAgain" key="key_findAgain" command="Browser:FindAgain"
-                    label="&findAgainCmd.label;" accesskey="&findAgainCmd.accesskey;"/>
-          <menuitem id="menu_findPrev" key="key_findPrev" command="Browser:FindPrev"
-                    label="&findPrevCmd.label;" accesskey="&findPrevCmd.accesskey;"/>
-        </menupopup>
-      </menu>
-    </menubar>
-  </toolbox>
-
-  <vbox id="appcontent" flex="1"
-       ondragdrop="nsDragAndDrop.drop(event, contentAreaDNDObserver);">
-
-    <browser id="content" type="content-primary" name="content" src="about:blank" flex="1"/>
-
-  </vbox> 
-
-</window>
diff --git a/mozilla/mail/base/jar.mn b/mozilla/mail/base/jar.mn
index 2f3582fdd60..4f4def29a78 100644
--- a/mozilla/mail/base/jar.mn
+++ b/mozilla/mail/base/jar.mn
@@ -15,6 +15,7 @@ messenger.jar:
 *+  content/messenger/msgHdrViewOverlay.xul         (content/msgHdrViewOverlay.xul)
 *+  content/messenger/msgMail3PaneWindow.js         (content/msgMail3PaneWindow.js)
 *+  content/messenger/mail3PaneWindowCommands.js    (content/mail3PaneWindowCommands.js)
+*+  content/messenger/mailCommands.js               (content/mailCommands.js)
 *+  content/messenger/mailCore.js                   (content/mailCore.js)
 *+  content/messenger/commandglue.js                (content/commandglue.js)
 *+  content/messenger/widgetglue.js                 (content/widgetglue.js)
@@ -98,9 +99,6 @@ classic.jar:
     skin/classic/messenger/icons/unreadmail.png            (skin/icons/unreadmail.png)
               
 comm.jar:
-*+  content/navigator/viewSource.xul                (content/viewSource.xul)
-+   content/navigator/contents.rdf                  (content/navigator.rdf)
-*+  content/communicator/askViewZoom.xul            (content/askViewZoom.xul)
     content/help/contents.rdf                       (content/help.rdf)
     content/help/contextHelp.js                     (content/contextHelp.js)
 *+  content/communicator/contentAreaClick.js        (content/contentAreaClick.js)
diff --git a/mozilla/mail/config/en-US-jar.mn b/mozilla/mail/config/en-US-jar.mn
index 90502dd99f9..2b69d5014cf 100644
--- a/mozilla/mail/config/en-US-jar.mn
+++ b/mozilla/mail/config/en-US-jar.mn
@@ -26,7 +26,6 @@ locale/en-US/mozapps/contents.rdf,                        en-US/locale/en-US/moz
 
 locale/en-US/navigator/contents.rdf,                      en-US/locale/en-US/navigator/contents.rdf
 locale/en-US/navigator/navigator.properties,              en-US/locale/en-US/navigator/navigator.properties
-locale/en-US/navigator/viewSource.dtd,                    en-US/locale/en-US/navigator/viewSource.dtd
 
 #################################################################################################
 # global
diff --git a/mozilla/mail/config/mail-jar.mn b/mozilla/mail/config/mail-jar.mn
index a41f0a67a12..53be99d6736 100644
--- a/mozilla/mail/config/mail-jar.mn
+++ b/mozilla/mail/config/mail-jar.mn
@@ -44,7 +44,6 @@ content/communicator/contentAreaDD.js,                comm/content/communicator/
 content/communicator/contentAreaClick.js,             comm/content/communicator/contentAreaClick.js 
 content/communicator/contentAreaContextOverlay.xul,   comm/content/communicator/contentAreaContextOverlay.xul 
 content/communicator/nsContextMenu.js,                comm/content/communicator/nsContextMenu.js
-content/communicator/findUtils.js,                    comm/content/communicator/findUtils.js
 content/communicator/printPreviewBindings.xml,        comm/content/communicator/printPreviewBindings.xml
 content/communicator/printing.js,                     comm/content/communicator/printing.js
 content/communicator/XPCNativeWrapper.js,             comm/content/communicator/XPCNativeWrapper.js
@@ -90,9 +89,6 @@ content/mozldap,                                      comm/content/mozldap
 
 # from navigator
 content/navigator-region,                             comm/content/navigator-region
-content/navigator/viewSource.xul,                     comm/content/navigator/viewSource.xul
-content/navigator/viewsource.js,                      comm/content/navigator/viewsource.js
-content/navigator/contents.rdf,                       comm/content/navigator/contents.rdf
 
 # from xpinstall for theme installations
 content/communicator/xpinstall,                       comm/content/communicator/xpinstall
@@ -148,6 +144,13 @@ content/global/customizeToolbar.css,                  toolkit/content/global/cus
 content/global/customizeCharset.xul,                  toolkit/content/global/customizeCharset.xul
 content/global/customizeCharset.js,                   toolkit/content/global/customizeCharset.js
 content/global/viewZoomOverlay.js,                    toolkit/content/global/viewZoomOverlay.js
+content/global/viewSource.css,                        toolkit/content/global/viewSource.css
+content/global/viewSource.xul,                        toolkit/content/global/viewSource.xul
+content/global/viewSource.js,                         toolkit/content/global/viewSource.js
+content/global/findUtils.js,                          toolkit/content/global/findUtils.js
+content/global/printUtils.js,                         toolkit/content/global/printUtils.js
+content/global/editMenuOverlay.xul,                   toolkit/content/global/editMenuOverlay.xul
+content/global/editMenuOverlay.js,                    toolkit/content/global/editMenuOverlay.js
 
 #from mozapps
 content/mozapps/downloads,                            toolkit/content/mozapps/downloads
@@ -169,9 +172,6 @@ content/global/filepicker.xul,                        toolkit/content/global/fil
 content/global/nsHelperAppDlg.xul,                    toolkit/content/global/nsHelperAppDlg.xul
 content/global/nsProgressDialog.xul,                  toolkit/content/global/nsProgressDialog.xul
 
-# from mozilla\toolkit
-content/global/widgets,                               toolkit/content/global/widgets
-
 #################################################################################################
 # Files we need from pipnss and pippki jars
 #################################################################################################
diff --git a/mozilla/toolkit/components/Makefile.in b/mozilla/toolkit/components/Makefile.in
index 13c3a0e33c3..40bbee6acfc 100644
--- a/mozilla/toolkit/components/Makefile.in
+++ b/mozilla/toolkit/components/Makefile.in
@@ -43,7 +43,7 @@ VPATH   = @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 ifdef MOZ_THUNDERBIRD
-DIRS = console filepicker printing
+DIRS = console filepicker printing viewsource
 else
 DIRS = 		\
 	autocomplete \