diff --git a/xpinstall/packager/windows/langenus.jst b/xpinstall/packager/windows/langenus.jst
index 2a65c371322e..9d0e713d7cdf 100644
--- a/xpinstall/packager/windows/langenus.jst
+++ b/xpinstall/packager/windows/langenus.jst
@@ -59,7 +59,6 @@ if(verifyDiskSpace(fProgram, srDest))
     registerChrome(chromeType, cf, localeName + "communicator/");
     registerChrome(chromeType, cf, localeName + "messenger/");
     registerChrome(chromeType, cf, localeName + "messenger-smime/");
-    registerChrome(chromeType, cf, localeName + "messenger-mapi/");
     registerChrome(chromeType, cf, localeName + "editor/");
     registerChrome(chromeType, cf, localeName + "navigator/");
     registerChrome(chromeType, cf, localeName + "necko/");
@@ -74,6 +73,10 @@ if(verifyDiskSpace(fProgram, srDest))
     registerChrome(chromeType, pf, localeName + "global-platform/");
     registerChrome(chromeType, pf, localeName + "communicator-platform/");
     registerChrome(chromeType, pf, localeName + "navigator-platform/");
+    // mesenger-mapi package exists only on windows.
+    // Register this package only for windows.
+    if (platformNode == "win")
+      registerChrome(chromeType, pf, localeName + "messenger-mapi/");
  
     err = performInstall(); 
     logComment("performInstall() returned: " + err);