diff --git a/mail/installer/windows/langenus.jst b/mail/installer/windows/langenus.jst
index cbad87557b5..9042a9ece17 100644
--- a/mail/installer/windows/langenus.jst
+++ b/mail/installer/windows/langenus.jst
@@ -15,7 +15,7 @@ var langcode = "en";
 var chromeNode = langcode + "-US";
 // --- END CHANGABLE STUFF ---
 var regName    = "locales/mozilla/" + chromeNode;
-var chromeName = chromeNode + ".jar";
+var chromeName = chromeNode + "-mail.jar";
 var platformName = langcode + "-" + platformNode + ".jar";
 var localeName = "locale/" + chromeNode + "/";
 
@@ -43,7 +43,7 @@ if(verifyDiskSpace(fProgram, srDest))
     chromeType |= PROFILE_CHROME;
     fProgram = getFolder("Profile");
     logComment("try installing to the user profile:" + fProgram);
-    err = addDirectory("","bin",fProgram,"");
+    err = addDirectory("","thunderbird",fProgram,"");
   }
  
   setPackageFolder(fProgram);
@@ -58,30 +58,25 @@ if(verifyDiskSpace(fProgram, srDest))
     registerChrome(chromeType, cf, localeName + "global/");
     registerChrome(chromeType, pf, localeName + "global-platform/");
 
-    registerChrome(chromeType, cf, localeName + "browser/");
-    registerChrome(chromeType, cf, localeName + "browser-region/");
     registerChrome(chromeType, cf, localeName + "passwordmgr/");
     registerChrome(chromeType, cf, localeName + "mozapps/");
 
     registerChrome(chromeType, cf, localeName + "necko/");
     registerChrome(chromeType, cf, localeName + "autoconfig/");
-    registerChrome(chromeType, cf, localeName + "cookie/");
     registerChrome(chromeType, cf, localeName + "wallet/");
     registerChrome(chromeType, cf, localeName + "pippki/");
     registerChrome(chromeType, cf, localeName + "pipnss/");
 
-    registerChrome(chromeType, cf, localeName + "editor/");
     registerChrome(chromeType, cf, localeName + "mozldap/");
     registerChrome(chromeType, cf, localeName + "messenger-mdn/");
     registerChrome(chromeType, cf, localeName + "messenger-views/");
     registerChrome(chromeType, cf, localeName + "messenger-smime/");
     registerChrome(chromeType, cf, localeName + "messenger/");
-    registerChrome(chromeType, cf, localeName + "messenger-mapi/");
+    registerChrome(chromeType, pf, localeName + "messenger-mapi/");
 
     registerChrome(chromeType, cf, localeName + "communicator/");
     registerChrome(chromeType, pf, localeName + "communicator-platform/");
     registerChrome(chromeType, cf, localeName + "navigator/");
-    registerChrome(chromeType, pf, localeName + "navigator-platform/");
 
     err = performInstall(); 
     logComment("performInstall() returned: " + err);
diff --git a/mail/installer/windows/mail.jst b/mail/installer/windows/mail.jst
index db3c19cc122..b1b4e792bbf 100644
--- a/mail/installer/windows/mail.jst
+++ b/mail/installer/windows/mail.jst
@@ -508,7 +508,6 @@ if(verifyDiskSpace(fProgram, srDest))
     registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","qute.jar"), "skin/classic/global/");
     registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","qute.jar"), "skin/classic/communicator/");
     registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","qute.jar"), "skin/classic/mozapps/");
-    registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","qute.jar"), "skin/classic/browser/");
     registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","qute.jar"), "skin/classic/navigator/");
     registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","qute.jar"), "skin/classic/editor/");
     registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","qute.jar"), "skin/classic/messenger/");
diff --git a/mail/installer/windows/regus.jst b/mail/installer/windows/regus.jst
index 25111204d4c..8fdfca1d19b 100644
--- a/mail/installer/windows/regus.jst
+++ b/mail/installer/windows/regus.jst
@@ -7,11 +7,13 @@ var platformNode = getPlatform();
 
 // ----LOCALIZATION NOTE: translate only these ------
 var prettyName = "US Region Pack";
-var chromeNode = "US";
+var langcode = "en";
+var chromeNode = langcode + "-US";
+
 // --- END CHANGABLE STUFF ---
 
 var regName    = "locales/mozilla/" + chromeNode;
-var chromeName = chromeNode + ".jar";
+var chromeName = chromeNode + "-mail.jar";
 var localeName = "locale/" + chromeNode + "/";
 
 srDest = $SpaceRequired$:thunderbird;
@@ -58,12 +60,8 @@ if(verifyDiskSpace(fProgram, srDest))
     // register chrome
     var cf = getFolder(fProgram, "chrome/"+ chromeName);
     registerChrome(chromeType, cf, localeName + "global-region/");
-    registerChrome(chromeType, cf, localeName + "browser-region/");
     registerChrome(chromeType, cf, localeName + "messenger-region/");
 
-    registerChrome(chromeType, cf, localeName + "communicator-region/");
-    registerChrome(chromeType, cf, localeName + "navigator-region/");
-
     err = performInstall(); 
     logComment("performInstall() returned: " + err);
   }