diff --git a/mozilla/mailnews/import/resources/content/importDialog.js b/mozilla/mailnews/import/resources/content/importDialog.js index 909aa0ada6e..be400d0bb84 100644 --- a/mozilla/mailnews/import/resources/content/importDialog.js +++ b/mozilla/mailnews/import/resources/content/importDialog.js @@ -663,8 +663,12 @@ function ImportMail( module, success, error) { comm4xprofile = comm4xprofile.QueryInterface( Components.interfaces.nsIComm4xProfile); if(comm4xprofile != null) { var length = {value:0}; - var profileList = comm4xprofile.getProfileList(length); - if (profileList) + var profileList = null; + try { + profileList = comm4xprofile.getProfileList(length); + } + catch (ex) {} + if (length.value) { var selected = {value:0}; if (length.value == 1) diff --git a/mozilla/mailnews/import/resources/locale/en-us/importMsgs.properties b/mozilla/mailnews/import/resources/locale/en-us/importMsgs.properties index 92fc2ad74ec..a0d09f4c23b 100644 --- a/mozilla/mailnews/import/resources/locale/en-us/importMsgs.properties +++ b/mozilla/mailnews/import/resources/locale/en-us/importMsgs.properties @@ -293,6 +293,8 @@ ImportSettingsSuccess=Settings were imported from %S ImportMailBadModule=Unable to load mail import module ImportMailNotFound=Unable to find mail to import. Check to make sure the mail application is correctly installed on this machine. # LOCALIZATION NOTE : Do not translate the word "%S" below. +ImportMailFailed=An error occurred importing mail from %S +# LOCALIZATION NOTE : Do not translate the word "%S" below. ImportMailSuccess=Mail was successfully imported from %S # Error string for address import