--- a/mail/base/jar.mn
+++ b/mail/base/jar.mn
@@ -85,17 +85,17 @@ messenger.jar:
     content/messenger/CustomHeaders.js              (/mailnews/base/search/resources/content/CustomHeaders.js)
     content/messenger/FilterEditor.xul              (/mailnews/base/search/resources/content/FilterEditor.xul)
     content/messenger/FilterEditor.js               (/mailnews/base/search/resources/content/FilterEditor.js)
 *   content/messenger/searchWidgets.xml             (/mailnews/base/search/resources/content/searchWidgets.xml)
     content/messenger/viewLog.xul                   (/mailnews/base/search/resources/content/viewLog.xul)
     content/messenger/viewLog.js                    (/mailnews/base/search/resources/content/viewLog.js)
     content/messenger/junkLog.xul                   (/mailnews/base/resources/content/junkLog.xul)
     content/messenger/junkLog.js                    (/mailnews/base/resources/content/junkLog.js)
-    content/messenger/importDialog.js               (/mailnews/import/resources/content/importDialog.js)
+*   content/messenger/importDialog.js               (/mailnews/import/resources/content/importDialog.js)
 *   content/messenger/importDialog.xul              (/mailnews/import/resources/content/importDialog.xul)
     content/messenger/fieldMapImport.xul            (/mailnews/import/resources/content/fieldMapImport.xul)
     content/messenger/fieldMapImport.js             (/mailnews/import/resources/content/fieldMapImport.js)
     content/messenger/attach.js                     (/mailnews/mime/emitters/resources/content/attach.js)
     content/messenger/downloadheaders.js            (/mailnews/news/resources/content/downloadheaders.js)
     content/messenger/downloadheaders.xul           (/mailnews/news/resources/content/downloadheaders.xul)
     content/messenger/markByDate.js                 (/mailnews/base/resources/content/markByDate.js)
     content/messenger/markByDate.xul                (/mailnews/base/resources/content/markByDate.xul)

--- a/mailnews/import/resources/content/importDialog.js
+++ b/mailnews/import/resources/content/importDialog.js
@@ -970,18 +970,23 @@ function next()
   switch (index) {
   case "0":
     var backButton = document.getElementById("back");
     backButton.removeAttribute("disabled");
     var radioGroup = document.getElementById("importFields");
 
     if (radioGroup.value == "all")
     {
+#ifdef MOZ_THUNDERBIRD
       window.openDialog("chrome://messenger/content/migration/migration.xul",
                         "", "chrome,dialog,modal,centerscreen");
+#else
+      window.openDialog("chrome://communicator/content/migration/migration.xul",
+                        "", "chrome,dialog,modal,centerscreen");
+#endif
       close();
     }
     else
     {
       SwitchType(radioGroup.value);
       deck.setAttribute("selectedIndex", "1");
       SelectFirstItem();
       enableAdvance();

--- a/mailnews/jar.mn
+++ b/mailnews/jar.mn
@@ -195,17 +195,17 @@ messenger.jar:
     content/messenger/messengercompose/askSendFormat.js                        (compose/resources/content/askSendFormat.js)
     content/messenger/messengercompose/askSendFormat.xul                       (compose/resources/content/askSendFormat.xul)
     content/messenger/messengercompose/sendProgress.xul                        (compose/resources/content/sendProgress.xul)
     content/messenger/messengercompose/sendProgress.js                         (compose/resources/content/sendProgress.js)
     content/messenger/messengercompose/MsgAttachPage.xul                       (compose/resources/content/MsgAttachPage.xul)
     content/messenger/messengercompose/MsgAttachPage.js                        (compose/resources/content/MsgAttachPage.js)
     content/messenger/messengercompose/mailComposeExtrasOverlay.xul            (compose/resources/content/mailComposeExtrasOverlay.xul)
     content/messenger/messengercompose/mailComposeEditorOverlay.xul            (compose/resources/content/mailComposeEditorOverlay.xul)
-    content/messenger/importDialog.js                                          (import/resources/content/importDialog.js)
+*   content/messenger/importDialog.js                                          (import/resources/content/importDialog.js)
 *   content/messenger/importDialog.xul                                         (import/resources/content/importDialog.xul)
     content/messenger/fieldMapImport.xul                                       (import/resources/content/fieldMapImport.xul)
     content/messenger/fieldMapImport.js                                        (import/resources/content/fieldMapImport.js)
     content/messenger/attach.js                                                (mime/emitters/resources/content/attach.js)
     content/messenger/downloadheaders.js                                       (news/resources/content/downloadheaders.js)
     content/messenger/downloadheaders.xul                                      (news/resources/content/downloadheaders.xul)
     content/messenger/markByDate.js                                            (base/resources/content/markByDate.js)
     content/messenger/markByDate.xul                                           (base/resources/content/markByDate.xul)