diff --git a/mozilla/mail/config/Makefile.in b/mozilla/mail/config/Makefile.in
index 6f5cbf5267a..12e02438e00 100644
--- a/mozilla/mail/config/Makefile.in
+++ b/mozilla/mail/config/Makefile.in
@@ -76,7 +76,7 @@ endif
 	-$(RM) -f $(MOZILLA_DIR)/mail/config/mail-tmp.mn
 	-$(RM) -f $(MOZILLA_DIR)/mail/config/qute-tmp.mn
 	-$(RM) -f $(MOZILLA_DIR)/mail/config/en-US-tmp.mn
-#	-$(RM) -rf $(DIST)/$(APP_NAME)/tmpchrome 
+	-$(RM) -rf $(DIST)/$(APP_NAME)/tmpchrome 
 
 mail_copy::
 	$(PERL) $(topsrcdir)/xpinstall/packager/pkgcp.pl -s $(DIST)/bin -d $(DIST) --f $(srcdir)/$(BASEMAIL) -o $(_PLATFORM) -v
diff --git a/mozilla/mail/config/basemail-win b/mozilla/mail/config/basemail-win
index aa8e2e0cc7d..b355b3c7e0e 100644
--- a/mozilla/mail/config/basemail-win
+++ b/mozilla/mail/config/basemail-win
@@ -88,6 +88,14 @@ components\nsHelperAppDlg.js
 components\nsDownloadProgressListener.js
 components\downloadmanager.xpt
 
+; spellchecker (may not be present)
+components\myspell.dll
+components\spellchecker.xpt
+components\spellchk.dll
+;; XXX these two files are bogus, they should not be in components\myspell...
+components\myspell\*
+
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; Base Package Files
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/mozilla/mail/config/en-US-jar.mn b/mozilla/mail/config/en-US-jar.mn
index d07f2d6e1d5..0195b4761e5 100644
--- a/mozilla/mail/config/en-US-jar.mn
+++ b/mozilla/mail/config/en-US-jar.mn
@@ -88,7 +88,7 @@ locale/en-US/editor/editor.properties,                    en-US/locale/en-US/edi
 locale/en-US/editor/EdNamedAnchorProperties.dtd,          en-US/locale/en-US/editor/EdNamedAnchorProperties.dtd
 locale/en-US/editor/EdAdvancedEdit.dtd,                   en-US/locale/en-US/editor/EdAdvancedEdit.dtd
 locale/en-US/editor/EdDialogOverlay.dtd,                  en-US/locale/en-US/editor/EdDialogOverlay.dtd
-
+locale/en-US/editor/EditorSpellCheck.dtd,                 en-US/locale/en-US/editor/EditorSpellCheck.dtd
 
 #################################################################################################
 # US
diff --git a/mozilla/mail/config/mail-jar.mn b/mozilla/mail/config/mail-jar.mn
index 28f7ece2370..cbb4e50c079 100644
--- a/mozilla/mail/config/mail-jar.mn
+++ b/mozilla/mail/config/mail-jar.mn
@@ -39,6 +39,7 @@ content/communicator/platformBrowserBindings.xul,     comm/content/communicator/
 content/communicator/platformEditorBindings.xul,      comm/content/communicator/platformEditorBindings.xul 
 content/communicator/platformCommunicatorOverlay.xul, comm/content/communicator/platformCommunicatorOverlay.xul 
 content/communicator/contentAreaUtils.js,             comm/content/communicator/contentAreaUtils.js 
+content/communicator/builtinURLs.js,                  comm/content/communicator/builtinURLs.js 
 content/communicator/contentAreaDD.js,                comm/content/communicator/contentAreaDD.js 
 content/communicator/contentAreaClick.js,             comm/content/communicator/contentAreaClick.js 
 content/communicator/contentAreaContextOverlay.xul,   comm/content/communicator/contentAreaContextOverlay.xul