diff --git a/mozilla/xpinstall/packager/windows/config.it b/mozilla/xpinstall/packager/windows/config.it
index e138e9a78d3..15f188ca8eb 100644
--- a/mozilla/xpinstall/packager/windows/config.it
+++ b/mozilla/xpinstall/packager/windows/config.it
@@ -478,76 +478,6 @@ $InstallSizeArchive$:mail.xpi
 Attributes=SELECTED|FORCE_UPGRADE
 Force Upgrade File0=[SETUP PATH]\msgbsutl.dll
 
-[Component MailNews-Windows Registry0]
-Root Key=HKEY_LOCAL_MACHINE
-Key=Software\Clients\Mail\$ProductName$ Mail
-Name=
-Name Value=$ProductName$ Mail
-Type=REG_SZ
-Decrypt Key=FALSE
-Decrypt Name=FALSE
-Decrypt Name Value=TRUE
-Overwrite Key=TRUE
-Overwrite Name=TRUE
-Timing=post archive
-OS=NT51
-
-[Component MailNews-Windows Registry1]
-Root Key=HKEY_LOCAL_MACHINE
-Key=Software\Clients\Mail\$ProductName$ Mail\DefaultIcon
-Name=
-Name Value=[SETUP PATH]\$MainExeFile$,0
-Type=REG_SZ
-Decrypt Key=FALSE
-Decrypt Name=FALSE
-Decrypt Name Value=TRUE
-Overwrite Key=TRUE
-Overwrite Name=TRUE
-Timing=post archive
-OS=NT51
-
-[Component MailNews-Windows Registry2]
-Root Key=HKEY_LOCAL_MACHINE
-Key=Software\Clients\Mail\$ProductName$ Mail\shell
-Name=
-Name Value=
-Type=REG_SZ
-Decrypt Key=FALSE
-Decrypt Name=FALSE
-Decrypt Name Value=TRUE
-Overwrite Key=TRUE
-Overwrite Name=TRUE
-Timing=post archive
-OS=NT51
-
-[Component MailNews-Windows Registry3]
-Root Key=HKEY_LOCAL_MACHINE
-Key=Software\Clients\Mail\$ProductName$ Mail\shell\open
-Name=
-Name Value=
-Type=REG_SZ
-Decrypt Key=FALSE
-Decrypt Name=FALSE
-Decrypt Name Value=TRUE
-Overwrite Key=TRUE
-Overwrite Name=TRUE
-Timing=post archive
-OS=NT51
-
-[Component MailNews-Windows Registry4]
-Root Key=HKEY_LOCAL_MACHINE
-Key=Software\Clients\Mail\$ProductName$ Mail\shell\open\command
-Name=
-Name Value="[SETUP PATH]\$MainExeFile$" -mail
-Type=REG_SZ
-Decrypt Key=FALSE
-Decrypt Name=FALSE
-Decrypt Name Value=TRUE
-Overwrite Key=TRUE
-Overwrite Name=TRUE
-Timing=post archive
-OS=NT51
-
 
 
 [Component Uninstaller]
diff --git a/mozilla/xpinstall/packager/windows/mail.jst b/mozilla/xpinstall/packager/windows/mail.jst
index b2ad600b3a7..dbe4ffe011b 100644
--- a/mozilla/xpinstall/packager/windows/mail.jst
+++ b/mozilla/xpinstall/packager/windows/mail.jst
@@ -230,6 +230,16 @@ if(verifyDiskSpace(fProgram, srDest))
                    getFolder("Chrome","messenger.jar"),
                    "content/messenger-region/");
 
+    // log comments for uninstalling the registry keys created by mail for setting
+    // itself up in WinXP's Start menu
+    logComment("Create Registry Key: HKEY_LOCAL_MACHINE\\Software\\Clients\\StartMenuInternet\\Mozilla []");
+    logComment("Store Registry Value: HKEY_LOCAL_MACHINE\\Software\\Clients\\StartMenuInternet\\Mozilla []");
+    logComment("Create Registry Key: HKEY_LOCAL_MACHINE\\Software\\Clients\\StartMenuInternet\\Mozilla\\DefaultIcon []");
+    logComment("Store Registry Value: HKEY_LOCAL_MACHINE\\Software\\Clients\\StartMenuInternet\\Mozilla\\DefaultIcon []");
+    logComment("Create Registry Key: HKEY_LOCAL_MACHINE\\Software\\Clients\\StartMenuInternet\\Mozilla\\shell []");
+    logComment("Create Registry Key: HKEY_LOCAL_MACHINE\\Software\\Clients\\StartMenuInternet\\Mozilla\\shell\\open []");
+    logComment("Create Registry Key: HKEY_LOCAL_MACHINE\\Software\\Clients\\StartMenuInternet\\Mozilla\\shell\\open\\command []");
+
     // check return value
     err = getLastError();
     if(err == SUCCESS)