diff --git a/mozilla/mailnews/base/prefs/resources/content/accountUtils.js b/mozilla/mailnews/base/prefs/resources/content/accountUtils.js
index 3e3a09f5522..663e408308d 100644
--- a/mozilla/mailnews/base/prefs/resources/content/accountUtils.js
+++ b/mozilla/mailnews/base/prefs/resources/content/accountUtils.js
@@ -88,7 +88,7 @@ function verifyAccounts(wizardcallback) {
         // then kick off the account migration
         if (accountCount == invalidAccounts.length) {
             try {
-                  messengerMigrator = Components.classes[messengerMigratorContractID].getService(Components.interfaces.nsIMessengerMigrator);  
+                  var messengerMigrator = Components.classes[messengerMigratorContractID].getService(Components.interfaces.nsIMessengerMigrator);  
                   dump("attempt to UpgradePrefs.  If that fails, open the account wizard.\n");
                   messengerMigrator.UpgradePrefs();
                   // if there is a callback mechanism then inform parent window to shut itself down
diff --git a/mozilla/mailnews/local/build/nsMsgLocalCID.h b/mozilla/mailnews/local/build/nsMsgLocalCID.h
index 2a5b6a47314..5284c4f1f27 100644
--- a/mozilla/mailnews/local/build/nsMsgLocalCID.h
+++ b/mozilla/mailnews/local/build/nsMsgLocalCID.h
@@ -164,7 +164,7 @@
 //
 
 #define NS_MOVEMAILSERVICE_CONTRACTID \
-  "component://netscape/messenger/movemailservice"
+  "@mozilla.org/messenger/movemailservice;1"
 
 #define NS_MOVEMAILPROTOCOLINFO_CONTRACTID \
   NS_MSGPROTOCOLINFO_CONTRACTID_PREFIX "movemail"