diff --git a/mozilla/mail/components/migration/Makefile.in b/mozilla/mail/components/migration/Makefile.in
index b76f28f38ae..fb7b424f786 100644
--- a/mozilla/mail/components/migration/Makefile.in
+++ b/mozilla/mail/components/migration/Makefile.in
@@ -41,7 +41,7 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS		= src
+DIRS		= public src
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/mail/components/migration/content/migration.css b/mozilla/mail/components/migration/content/migration.css
new file mode 100644
index 00000000000..845c5494c3e
--- /dev/null
+++ b/mozilla/mail/components/migration/content/migration.css
@@ -0,0 +1,27 @@
+#-*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+# ***** BEGIN LICENSE BLOCK ***** */
+# Version: MPL 1.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is mozilla.org code.
+#
+# Portions created by the Initial Developer are Copyright (C) 2004
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#  Scott MacGregor <mscott@mozilla.org>
+#
+# ***** END LICENSE BLOCK ***** */
+
+.wizard-header {
+  background: url("chrome://messenger/content/thunderbird-wizard-badge.png") no-repeat right center Window;
+}
diff --git a/mozilla/mail/components/migration/content/migration.js b/mozilla/mail/components/migration/content/migration.js
new file mode 100644
index 00000000000..ca1032436ef
--- /dev/null
+++ b/mozilla/mail/components/migration/content/migration.js
@@ -0,0 +1,327 @@
+const kIMig = Components.interfaces.nsIMailProfileMigrator;
+const kIPStartup = Components.interfaces.nsIProfileStartup;
+const kProfileMigratorContractIDPrefix = "@mozilla.org/profile/migrator;1?app=mail&type=";
+
+var MigrationWizard = {
+  _source: "",                  // Source Profile Migrator ContractID suffix
+  _itemsFlags: kIMig.ALL,       // Selected Import Data Sources (16-bit bitfield)
+  _selectedProfile: null,       // Selected Profile name to import from
+  _wiz: null,
+  _migrator: null,
+  _autoMigrate: null,
+
+  init: function ()
+  {
+    var os = Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService);
+    os.addObserver(this, "Migration:Started", false);
+    os.addObserver(this, "Migration:ItemBeforeMigrate", false);
+    os.addObserver(this, "Migration:ItemAfterMigrate", false);
+    os.addObserver(this, "Migration:Ended", false);
+    os.addObserver(this, "Migration:Progress", false);
+    
+    this._wiz = document.documentElement;
+
+    if ("arguments" in window) {
+      this._source = window.arguments[0];
+      this._migrator = window.arguments[1].QueryInterface(kIMig);
+      this._autoMigrate = window.arguments[2].QueryInterface(kIPStartup);
+      
+      // Show the "nothing" option in the automigrate case to provide an
+      // easily identifiable way to avoid migration and create a new profile.
+      var nothing = document.getElementById("nothing");
+      nothing.hidden = false;      
+    }
+  },
+  
+  uninit: function ()
+  {
+    var os = Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService);
+    os.removeObserver(this, "Migration:Started");
+    os.removeObserver(this, "Migration:ItemBeforeMigrate");
+    os.removeObserver(this, "Migration:ItemAfterMigrate");
+    os.removeObserver(this, "Migration:Ended");
+    os.removeObserver(this, "Migration:Progress");
+  },
+  
+  // 1 - Import Source
+  onImportSourcePageShow: function ()
+  {
+    document.documentElement.getButton("back").disabled = true;
+    
+    // Figure out what source apps are are available to import from:
+    var group = document.getElementById("importSourceGroup");
+    for (var i = 0; i < group.childNodes.length; ++i) {
+      var suffix = group.childNodes[i].id;
+      if (suffix != "nothing") {
+        var contractID = kProfileMigratorContractIDPrefix + suffix;
+        var migrator = Components.classes[contractID].createInstance(kIMig);
+        if (!migrator.sourceExists)
+          group.childNodes[i].hidden = true;
+      }
+    }
+    
+    var firstNonDisabled = null;
+    for (var i = 0; i < group.childNodes.length; ++i) {
+      if (!group.childNodes[i].disabled) {
+        firstNonDisabled = group.childNodes[i];
+        break;
+      }
+    }
+
+    group.selectedItem = this._source == "" ? firstNonDisabled : document.getElementById(this._source);
+  },
+  
+  onImportSourcePageAdvanced: function ()
+  {
+    var newSource = document.getElementById("importSourceGroup").selectedItem.id;
+    
+    if (newSource == "nothing") {
+      document.documentElement.cancel();
+      return;
+    }
+    
+    if (!this._migrator || (newSource != this._source)) {
+      // Create the migrator for the selected source.
+      var contractID = kProfileMigratorContractIDPrefix + newSource;
+      this._migrator = Components.classes[contractID].createInstance(kIMig);
+
+      this._itemsFlags = kIMig.ALL;
+      this._selectedProfile = null;
+    }
+    if (!this._autoMigrate)
+      this._source = newSource;
+      
+    // check for more than one source profile
+    if (this._migrator.sourceHasMultipleProfiles)
+      this._wiz.currentPage.next = "selectProfile";
+    else {
+      this._wiz.currentPage.next = this._autoMigrate ? "migrating" : "importItems";
+      var sourceProfiles = this._migrator.sourceProfiles;
+      if (sourceProfiles && sourceProfiles.Count() == 1) {
+        var profileName = sourceProfiles.QueryElementAt(0, Components.interfaces.nsISupportsString);
+        this._selectedProfile = profileName.data;
+      }
+      else
+        this._selectedProfile = "";
+    }
+  },
+  
+  // 2 - [Profile Selection]
+  onSelectProfilePageShow: function ()
+  {
+    // Disabling this for now, since we ask about import sources in automigration
+    // too and don't want to disable the back button
+    // if (this._autoMigrate)
+    //   document.documentElement.getButton("back").disabled = true;
+      
+    var profiles = document.getElementById("profiles");
+    while (profiles.hasChildNodes()) 
+      profiles.removeChild(profiles.firstChild);
+    
+    var sourceProfiles = this._migrator.sourceProfiles;
+    var count = sourceProfiles.Count();
+    for (var i = 0; i < count; ++i) {
+      var item = document.createElement("radio");
+      var str = sourceProfiles.QueryElementAt(i, Components.interfaces.nsISupportsString);
+      item.id = str.data;
+      item.setAttribute("label", str.data);
+      profiles.appendChild(item);
+    }
+    
+    profiles.selectedItem = this._selectedProfile ? document.getElementById(this._selectedProfile) : profiles.firstChild;
+  },
+  
+  onSelectProfilePageRewound: function ()
+  {
+    var profiles = document.getElementById("profiles");
+    this._selectedProfile = profiles.selectedItem.id;
+  },
+  
+  onSelectProfilePageAdvanced: function ()
+  {
+    var profiles = document.getElementById("profiles");
+    this._selectedProfile = profiles.selectedItem.id;
+    
+    // If we're automigrating, don't show the item selection page, just grab everything.
+    if (this._autoMigrate)
+      this._wiz.currentPage.next = "migrating";
+  },
+  
+  // 3 - ImportItems
+  onImportItemsPageShow: function ()
+  {
+    var dataSources = document.getElementById("dataSources");
+    while (dataSources.hasChildNodes())
+      dataSources.removeChild(dataSources.firstChild);
+    
+    var bundle = document.getElementById("bundle");
+    
+    var items = this._migrator.getMigrateData(this._selectedProfile, this._autoMigrate);
+    for (var i = 0; i < 16; ++i) {
+      var itemID = (items >> i) & 0x1 ? Math.pow(2, i) : 0;
+      if (itemID > 0) {
+        var checkbox = document.createElement("checkbox");
+        checkbox.id = itemID;
+        checkbox.setAttribute("label", bundle.getString(itemID + "_" + this._source));
+        dataSources.appendChild(checkbox);
+        if (!this._itemsFlags || this._itemsFlags & itemID)
+          checkbox.checked = true;
+      }
+    }
+  },
+
+  onImportItemsPageAdvanced: function ()
+  {
+    var dataSources = document.getElementById("dataSources");
+    this._itemsFlags = 0;
+    for (var i = 0; i < dataSources.childNodes.length; ++i) {
+      var checkbox = dataSources.childNodes[i];
+      if (checkbox.localName == "checkbox" && checkbox.checked)
+        this._itemsFlags |= parseInt(checkbox.id);
+    }
+  },
+  
+  onImportItemCommand: function (aEvent)
+  {
+    var items = document.getElementById("dataSources");
+    var checkboxes = items.getElementsByTagName("checkbox");
+
+    var oneChecked = false;
+    for (var i = 0; i < checkboxes.length; ++i) {
+      if (checkboxes[i].checked) {
+        oneChecked = true;
+        break;
+      }
+    }
+
+    this._wiz.getButton("next").disabled = !oneChecked;
+  },
+  
+  // 4 - Migrating
+  onMigratingPageShow: function ()
+  {
+    this._wiz.getButton("cancel").disabled = true;
+    this._wiz.getButton("back").disabled = true;
+    this._wiz.getButton("next").disabled = true;
+    
+    // When automigrating, show all of the data that can be received from this source.
+    if (this._autoMigrate)
+      this._itemsFlags = this._migrator.getMigrateData(this._selectedProfile, this._autoMigrate);
+
+    this._listItems("migratingItems");
+    setTimeout(this.onMigratingMigrate, 0, this);
+  },
+  
+  onMigratingMigrate: function (aOuter)
+  {
+    aOuter._migrator.migrate(aOuter._itemsFlags, aOuter._autoMigrate, aOuter._selectedProfile);
+  },
+  
+  _listItems: function (aID)
+  {
+    var items = document.getElementById(aID);
+    while (items.hasChildNodes())
+      items.removeChild(items.firstChild);
+    
+    var bundle = document.getElementById("bundle");
+    var itemID;
+    for (var i = 0; i < 16; ++i) {
+      var itemID = (this._itemsFlags >> i) & 0x1 ? Math.pow(2, i) : 0;
+      if (itemID > 0) {
+        var label = document.createElement("label");
+        label.id = itemID + "_migrated";
+        try {
+          label.setAttribute("value", "- " + bundle.getString(itemID + "_" + this._source));
+          items.appendChild(label);
+        }
+        catch (e) {
+          // if the block above throws, we've enumerated all the import data types we
+          // currently support and are now just wasting time, break. 
+          break;
+        }
+      }
+    }
+  },
+  
+  observe: function (aSubject, aTopic, aData)
+  {
+    switch (aTopic) {
+    case "Migration:Started":
+      dump("*** started\n");
+      break;
+    case "Migration:ItemBeforeMigrate":
+      dump("*** before " + aData + "\n");
+      var label = document.getElementById(aData + "_migrated");
+      if (label)
+        label.setAttribute("style", "font-weight: bold");
+      break;
+    case "Migration:ItemAfterMigrate":
+      dump("*** after " + aData + "\n");
+      var label = document.getElementById(aData + "_migrated");
+      if (label)
+        label.removeAttribute("style");
+      break;
+    case "Migration:Ended":
+      dump("*** done\n");
+      if (this._autoMigrate) {
+        // We're done now.
+        this._wiz.advance();
+        setTimeout("close()", 5000);
+      }
+      else {
+        var nextButton = this._wiz.getButton("next");
+        nextButton.disabled = false;
+        nextButton.click();
+      }
+      break;
+    case "Migration:Progress":
+      document.getElementById('progressBar').value = aData;
+      break;
+    }
+  },
+  
+  onDonePageShow: function ()
+  {
+    this._wiz.getButton("cancel").disabled = true;
+    this._wiz.getButton("back").disabled = true;
+    this._wiz.getButton("finish").disabled = false;
+    this._listItems("doneItems");
+  }
+};
+
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is The Browser Profile Migrator.
+#
+# The Initial Developer of the Original Code is Ben Goodger.
+# Portions created by the Initial Developer are Copyright (C) 2004
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Ben Goodger <ben@bengoodger.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
diff --git a/mozilla/mail/components/migration/content/migration.xul b/mozilla/mail/components/migration/content/migration.xul
new file mode 100644
index 00000000000..66d49c81185
--- /dev/null
+++ b/mozilla/mail/components/migration/content/migration.xul
@@ -0,0 +1,122 @@
+<?xml version="1.0"?> 
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is The Mail Profile Migrator.
+#
+# The Initial Developer of the Original Code is Ben Goodger.
+# Portions created by the Initial Developer are Copyright (C) 2004
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Scott MacGregor <mscott@mozilla.org>
+#   Ben Goodger <ben@bengoodger.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+
+#ifndef XP_MACOSX
+<?xml-stylesheet href="chrome://messenger/content/migration/migration.css" type="text/css"?>
+#endif
+
+<!DOCTYPE dialog SYSTEM "chrome://messenger/locale/migration/migration.dtd" >
+ 
+<wizard id="migrationWizard"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        title="&migrationWizard.title;"
+        onload="MigrationWizard.init()"
+        onunload="MigrationWizard.uninit()"
+        style="width: 40em;"
+        buttons="accept,cancel">
+
+  <script type="application/x-javascript" src="chrome://messenger/content/migration/migration.js"/>
+  
+  <stringbundle id="bundle" src="chrome://messenger/locale/migration/migration.properties"/>
+  
+  <wizardpage id="importSource" pageid="importSource" next="selectProfile"
+              label="&importSource.title;"
+              onpageshow="MigrationWizard.onImportSourcePageShow();"
+              onpageadvanced="MigrationWizard.onImportSourcePageAdvanced();">
+#ifdef XP_WIN
+    <description>&importFrom.label;</description>
+#else
+    <description>&importFromUnix.label;</description>
+#endif
+    
+    <radiogroup id="importSourceGroup">
+      <radio id="seamonkey" label="&importFromSeamonkey.label;" accesskey="&importFromSeamonkey.accesskey;"/>
+      <radio id="oexpress"  label="&importFromOExpress.label;"  accesskey="&importFromOExpress.accesskey;"/>
+      <radio id="outlook"   label="&importFromOutlook.label;"   accesskey="&importFromOutlook.accesskey;"/>
+      <radio id="dogbert"   label="&importFromNetscape4.label;" accesskey="&importFromNetscape4.accesskey;"/>
+      <radio id="eudora"    label="&importFromEudora.label;"    accesskey="&importFromEudora.accesskey;"/>
+      <radio id="nothing"   label="&importFromNothing.label;"   accesskey="&importFromNothing.accesskey;" hidden="true"/>
+    </radiogroup>
+  </wizardpage>
+
+  <wizardpage id="selectProfile" pageid="selectProfile" label="&selectProfile.title;"
+              next="importItems"
+              onpageshow="return MigrationWizard.onSelectProfilePageShow();"
+              onpagerewound="return MigrationWizard.onSelectProfilePageRewound();"
+              onpageadvanced="return MigrationWizard.onSelectProfilePageAdvanced();">
+    <description>&selectProfile.label;</description>    
+    <radiogroup id="profiles" align="left"/>
+  </wizardpage>
+
+  <wizardpage id="importItems" pageid="importItems" label="&importItems.title;"
+              next="migrating"
+              onpageshow="return MigrationWizard.onImportItemsPageShow();"
+              onpagerewound="return MigrationWizard.onImportItemsPageAdvanced();"
+              onpageadvanced="return MigrationWizard.onImportItemsPageAdvanced();"
+              oncommand="MigrationWizard.onImportItemCommand();"> 
+    <description>&importItems.label;</description>
+    
+    <vbox id="dataSources" style="overflow: auto; -moz-appearance: listbox" align="left" flex="1"/>
+  </wizardpage>
+
+  <wizardpage id="migrating" pageid="migrating" label="&migrating.title;"
+              next="done"
+              onpageshow="MigrationWizard.onMigratingPageShow();">
+   
+    <description>&migrating.label;</description>    
+    <separator class="thin"/> 
+    <vbox id="migratingItems" class="indent" style="overflow: auto;" flex="1" align="left"/>
+    <separator class="thin"/> 
+
+    <hbox>
+      <progressmeter class="progressmeter-statusbar" id="progressBar"  flex="1" mode="normal" value="0"/>
+    </hbox>
+
+  </wizardpage>
+
+  <wizardpage id="done" pageid="done" label="&done.title;"
+              onpageshow="MigrationWizard.onDonePageShow();">
+    <description>&done.label;</description>
+    
+    <separator class="thin"/>    
+    <vbox id="doneItems" class="indent" style="overflow: auto;" align="left"/>
+  </wizardpage>
+</wizard>
+
diff --git a/mozilla/mail/components/migration/jar.mn b/mozilla/mail/components/migration/jar.mn
new file mode 100644
index 00000000000..c864bf07214
--- /dev/null
+++ b/mozilla/mail/components/migration/jar.mn
@@ -0,0 +1,9 @@
+messenger.jar:
+*  content/messenger/migration/migration.xul                 (content/migration.xul)
+*  content/messenger/migration/migration.js                  (content/migration.js)
+*  content/messenger/migration/migration.css                 (content/migration.css)
+  
+en-US.jar:
+   locale/en-US/messenger/migration/migration.dtd               (locale/migration.dtd)
+   locale/en-US/messenger/migration/migration.properties        (locale/migration.properties)
+
diff --git a/mozilla/mail/components/migration/locale/migration.dtd b/mozilla/mail/components/migration/locale/migration.dtd
new file mode 100644
index 00000000000..37459f5efab
--- /dev/null
+++ b/mozilla/mail/components/migration/locale/migration.dtd
@@ -0,0 +1,31 @@
+
+<!ENTITY migrationWizard.title          "Import Wizard">
+
+<!ENTITY importFrom.label               "Import Options, Account Settings, Addressbook and other data from:">
+<!ENTITY importFromUnix.label           "Import Preferences, Account Settings, Addressbook and other data from:">
+
+<!ENTITY importFromNothing.label        "Don't import anything">
+<!ENTITY importFromNothing.accesskey    "D">
+<!ENTITY importFromSeamonkey.label      "Netscape 6, 7 or Mozilla 1.x">
+<!ENTITY importFromSeamonkey.accesskey  "N">
+<!ENTITY importFromNetscape4.label      "Netscape 4.x">
+<!ENTITY importFromNetscape4.accesskey  "4">
+<!ENTITY importFromOExpress.label       "Outlook Express">
+<!ENTITY importFromOExpress.accesskey   "u">
+<!ENTITY importFromOutlook.label        "Outlook">
+<!ENTITY importFromOutlook.accesskey    "O">
+<!ENTITY importFromEudora.label         "Eudora">
+<!ENTITY importFromEudora.accesskey     "E">
+
+<!ENTITY importSource.title             "Import Settings and Mail Folders From">
+<!ENTITY importItems.title              "Items to Import">
+<!ENTITY importItems.label              "Select which items to import:">
+
+<!ENTITY migrating.title                "Importing...">
+<!ENTITY migrating.label                "The following items are currently being imported...">
+
+<!ENTITY selectProfile.title            "Select Profile">
+<!ENTITY selectProfile.label            "The following profiles are available to import from:">
+
+<!ENTITY done.title                     "Import Complete">
+<!ENTITY done.label                     "The following items were successfully imported:">
diff --git a/mozilla/mail/components/migration/locale/migration.properties b/mozilla/mail/components/migration/locale/migration.properties
new file mode 100644
index 00000000000..356b2ab7ffa
--- /dev/null
+++ b/mozilla/mail/components/migration/locale/migration.properties
@@ -0,0 +1,46 @@
+profileName_format=%S %S
+
+# Browser Specific
+sourceNameSeamonkey=Netscape 6/7/Mozilla
+sourceNameDogbert=Netscape 4
+sourceNameOExpress=Outlook Express
+sourceNameOutlook=Outlook
+
+# Import Sources
+1_dogbert=Preferences
+1_seamonkey=Preferences
+
+2_dogbert=Account Settings
+2_seamonkey=Account Settings
+2_oexpress=Account Settings
+2_outlook=Account Settings
+
+4_dogbert=Address Books
+4_seamonkey=Address Books
+4_oexpress=Address Book
+4_outlook=Address Book
+
+8_dogbert=Junk Mail Training
+8_seamonkey=Junk Mail Training
+
+16_dogbert=Saved Passwords
+16_seamonkey=Saved Passwords
+
+32_dogbert=Other Data
+32_seamonkey=Other Data
+
+64_dogbert=Newsgroup Folders
+64_seamonkey=Newsgroup Folders
+
+128_dogbert=Mail Folders
+128_seamonkey=Mail Folders
+128_oexpress=Mail Folders
+128_outlook=Mail Folders
+
+# mailDirName needs to be set to the same value as in 4.x
+# see bug #55449
+mailDirName=Mail
+
+# newsDirName needs to be set to the same value as in 4.x
+# see bug #55449
+newsDirName=News
diff --git a/mozilla/mail/components/migration/public/Makefile.in b/mozilla/mail/components/migration/public/Makefile.in
new file mode 100644
index 00000000000..3fd01554dc9
--- /dev/null
+++ b/mozilla/mail/components/migration/public/Makefile.in
@@ -0,0 +1,50 @@
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is The Mail Profile Migrator.
+#
+# The Initial Developer of the Original Code is Ben Goodger.
+# Portions created by the Initial Developer are Copyright (C) 2004
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#    Scott MacGregor <mscott@mozilla.org>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+DEPTH		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= mailprofilemigration
+XPIDL_MODULE	= mailprofilemigration
+
+XPIDLSRCS	= nsIMailProfileMigrator.idl
+
+include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/mail/components/migration/public/nsIMailProfileMigrator.idl b/mozilla/mail/components/migration/public/nsIMailProfileMigrator.idl
new file mode 100644
index 00000000000..025b147e1b9
--- /dev/null
+++ b/mozilla/mail/components/migration/public/nsIMailProfileMigrator.idl
@@ -0,0 +1,95 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is The Browser Profile Migrator.
+ *
+ * The Initial Developer of the Original Code is Ben Goodger.
+ * Portions created by the Initial Developer are Copyright (C) 2004
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "nsISupports.idl"
+
+interface nsISupportsArray;
+interface nsIProfileStartup;
+
+[scriptable, uuid(C3CB4343-2E8B-40fd-A639-A65731BED3AE)]
+interface nsIMailProfileMigrator : nsISupports 
+{
+  /**
+   * profile items to migrate. use with migrate().
+   */
+  const unsigned short ALL              = 0x0000;
+  const unsigned short SETTINGS         = 0x0001;
+  const unsigned short ACCOUNT_SETTINGS = 0x0002;
+  const unsigned short ADDRESSBOOK_DATA = 0x0004;
+  const unsigned short JUNKTRAINING     = 0x0008;
+  const unsigned short PASSWORDS        = 0x0010;
+  const unsigned short OTHERDATA        = 0x0020;
+  const unsigned short NEWSDATA         = 0x0040;
+  const unsigned short MAILDATA         = 0x0080;
+
+  /**
+   * Copy user profile information to the current active profile.
+   * @param aItems   list of data items to migrate. see above for values.
+   * @param aReplace replace or append current data where applicable. 
+   * @param aProfile profile to migrate from, if there is more than one.
+   */
+  void migrate(in unsigned short aItems, in nsIProfileStartup aStartup, in wstring aProfile);
+
+  /**
+   * A bit field containing profile items that this migrator
+   * offers for import. 
+   * @param   aProfile the profile that we are looking for available data
+   *          to import
+   * @param   aStarting "true" if the profile is not currently being used.
+   * @returns bit field containing profile items (see above)
+   */
+  unsigned short getMigrateData(in wstring aProfile, in boolean aDoingStartup);
+
+  /** 
+   * Whether or not there is any data that can be imported from this 
+   * browser (i.e. whether or not it is installed, and there exists
+   * a user profile)
+   */
+  readonly attribute boolean          sourceExists;
+
+  /** 
+   * Whether or not the import source implementing this interface
+   * has multiple user profiles configured.
+   */
+  readonly attribute boolean sourceHasMultipleProfiles;
+
+  /** 
+   * An enumeration of available profiles. If the import source does 
+   * not support profiles, this attribute is null.
+   */
+  readonly attribute nsISupportsArray sourceProfiles;
+};  
+
diff --git a/mozilla/mail/components/migration/src/Makefile.in b/mozilla/mail/components/migration/src/Makefile.in
index 8e5b6f3fe7f..215affcbad0 100644
--- a/mozilla/mail/components/migration/src/Makefile.in
+++ b/mozilla/mail/components/migration/src/Makefile.in
@@ -14,12 +14,48 @@ MODULE_NAME = nsMailProfileMigratorModule
 REQUIRES = \
 	string \
 	xpcom \
+	xpcom_obsolete \
 	xulapp \
 	libreg \
 	toolkitcomps \
+	windowwatcher \
+	dom \
+	pref \
+	rdf \
+	libreg \
+	necko \
+	intl \
+	uconv \
+	import \
+	msgbase \
+	mailnews \
 	$(NULL)
 
-CPPSRCS = nsProfileMigrator.cpp
+EXPORTS = nsMailMigrationCID.h
+
+CPPSRCS = \
+	nsProfileMigrator.cpp \
+	nsMailProfileMigratorUtils.cpp \
+	nsNetscapeProfileMigratorBase.cpp \
+	nsSeamonkeyProfileMigrator.cpp \
+	nsDogbertProfileMigrator.cpp \
+	$(NULL)
+
+ifeq ($(OS_ARCH),WINNT)
+CPPSRCS += \
+	nsProfileMigratorBase.cpp \
+	nsOEProfileMigrator.cpp \
+	nsOutlookProfileMigrator.cpp \
+	nsEudoraProfileMigrator.cpp \
+	$(NULL)
+endif
+
+ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+CPPSRCS += \
+	nsProfileMigratorBase.cpp \
+	nsEudoraProfileMigrator.cpp \
+        $(NULL)
+endif
 
 EXTRA_DSO_LDOPTS += \
 	$(MOZ_XPCOM_OBSOLETE_LIBS) \
diff --git a/mozilla/mail/components/migration/src/nsDogbertProfileMigrator.cpp b/mozilla/mail/components/migration/src/nsDogbertProfileMigrator.cpp
new file mode 100644
index 00000000000..d594d2c7f13
--- /dev/null
+++ b/mozilla/mail/components/migration/src/nsDogbertProfileMigrator.cpp
@@ -0,0 +1,2359 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is The Mail Profile Migrator.
+ *
+ * The Initial Developer of the Original Code is Scott MacGregor
+ * Portions created by the Initial Developer are Copyright (C) 2004
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *  Scott MacGregor <mscott@mozilla.org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+// this file is mostly a copy of nsPrefMigration.cpp...old nsFileSpec warts and all
+
+#include "nsMailProfileMigratorUtils.h"
+#include "nsCRT.h"
+#include "nsDirectoryServiceDefs.h"
+#include "nsIObserverService.h"
+#include "nsIPasswordManagerInternal.h"
+#include "nsIPrefLocalizedString.h"
+#include "nsIPrefService.h"
+#include "nsIServiceManager.h"
+#include "nsISupportsArray.h"
+#include "nsISupportsPrimitives.h"
+#include "nsNetCID.h"
+#include "nsNetUtil.h"
+#include "nsDogbertProfileMigrator.h"
+#include "nsIRelativeFilePref.h"
+#include "nsAppDirectoryServiceDefs.h"
+#include "nsVoidArray.h"
+#include "prprf.h"
+#include "prmem.h"
+#include "prio.h"
+#include "prenv.h"
+#include "NSReg.h"
+
+// lots of includes required for the nsPrefMigration.cpp code that we copied:
+#include "nsICharsetConverterManager.h"
+#include "nsIPlatformCharset.h"
+#include "nsIPref.h"
+#include "nsIFileSpec.h"
+#include "nsFileSpec.h"
+#include "nsFileStream.h"
+
+static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID);
+static NS_DEFINE_CID(kPrefServiceCID, NS_PREF_CID);
+static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID);
+
+#define MIGRATION_PROPERTIES_URL "chrome://messenger/locale/migration/migration.properties"
+
+#ifndef MAXPATHLEN
+#ifdef _MAX_PATH
+#define MAXPATHLEN _MAX_PATH
+#elif defined(CCHMAXPATH)
+#define MAXPATHLEN CCHMAXPATH
+#else
+#define MAXPATHLEN 1024
+#endif
+#endif
+
+#if defined(XP_UNIX) && !defined(XP_MACOSX)
+#define PREF_FILE_NAME_IN_4x      "preferences.js"
+#define IMAP_MAIL_FILTER_FILE_NAME_IN_4x "mailrule"
+#define POP_MAIL_FILTER_FILE_NAME_IN_4x "mailrule"
+#define MAIL_SUMMARY_SUFFIX_IN_4x ".summary"
+#define NEWS_SUMMARY_SUFFIX_IN_4x ".snm"
+#define NEWSRC_PREFIX_IN_4x ".newsrc-"
+#define SNEWSRC_PREFIX_IN_4x ".snewsrc-"
+#define POPSTATE_FILE_IN_4x "popstate"
+#define PSM_CERT7_DB "cert7.db"
+#define PSM_KEY3_DB "key3.db"
+#define PSM_SECMODULE_DB "secmodule.db"
+#define HOME_ENVIRONMENT_VARIABLE         "HOME"
+#define PROFILE_HOME_ENVIRONMENT_VARIABLE "PROFILE_HOME"
+#define DEFAULT_UNIX_PROFILE_NAME         "default"
+#elif defined(XP_MAC) || defined(XP_MACOSX)
+#define OLDREG_NAME               "Netscape Registry"
+#define OLDREG_DIR                NS_MAC_PREFS_DIR
+#define PREF_FILE_NAME_IN_4x      "Netscape Preferences"
+#define MAC_RULES_FILE_ENDING_STRING_IN_4X " Rules"
+#define IMAP_MAIL_FILTER_FILE_NAME_IN_4x "<hostname> Rules"
+#define POP_MAIL_FILTER_FILE_NAME_IN_4x "Filter Rules"
+#define MAIL_SUMMARY_SUFFIX_IN_4x ".snm"
+#define NEWS_SUMMARY_SUFFIX_IN_4x ".snm"
+#define POPSTATE_FILE_IN_4x "Pop State"
+#define SECURITY_PATH "Security"
+#define PSM_CERT7_DB "Certificates7"
+#define PSM_KEY3_DB "Key Database3"
+#define PSM_SECMODULE_DB "Security Modules"
+#else /* XP_WIN || XP_OS2 */
+#define PREF_FILE_NAME_IN_4x      "prefs.js"
+#define IMAP_MAIL_FILTER_FILE_NAME_IN_4x "rules.dat"
+#define POP_MAIL_FILTER_FILE_NAME_IN_4x "rules.dat"
+#define MAIL_SUMMARY_SUFFIX_IN_4x ".snm"
+#define NEWS_SUMMARY_SUFFIX_IN_4x ".snm"
+#define OLDREG_NAME               "nsreg.dat"
+#ifdef XP_WIN
+#define OLDREG_DIR                NS_WIN_WINDOWS_DIR
+#else
+#define OLDREG_DIR                NS_OS2_DIR
+#endif
+// purposely not defined, since it was in the right place
+// and with the right name in 4.x
+//#define POPSTATE_FILE_IN_4x "popstate.dat"
+#define PSM_CERT7_DB "cert7.db"
+#define PSM_KEY3_DB "key3.db"
+#define PSM_SECMODULE_DB "secmod.db"
+#endif /* XP_UNIX */
+
+#define SUMMARY_SUFFIX_IN_5x ".msf"
+#define IMAP_MAIL_FILTER_FILE_NAME_IN_5x "rules.dat"
+#define POP_MAIL_FILTER_FILE_NAME_IN_5x "rules.dat"
+#define POPSTATE_FILE_IN_5x	"popstate.dat"
+
+// only UNIX had movemail in 4.x
+#if defined(XP_UNIX) && !defined(XP_MACOSX)
+#define HAVE_MOVEMAIL 1
+#endif /* XP_UNIX */
+
+#define PREMIGRATION_PREFIX "premigration."
+#define ADDRBOOK_FILE_EXTENSION_IN_4X  ".na2"
+#define PREF_FILE_HEADER_STRING "# Mozilla User Preferences    " 
+#define MAX_PREF_LEN 1024
+
+// this is for the hidden preference setting in mozilla/modules/libpref/src/init/mailnews.js
+// pref("mail.migration.copyMailFiles", true);
+//
+// see bugzilla bug 80035 (http://bugzilla.mozilla.org/show_bug.cgi?id=80035)
+//
+// the default value for this setting is true which means when migrating from
+// Netscape 4.x, mozilla will copy all the contents of Local Folders and Imap
+// Folder to the newly created subfolders of migrated mozilla profile
+// when this value is set to false, mozilla will not copy these contents and
+// still share them with Netscape 4.x
+//
+// Advantages of forbidding copy operation:
+//     reduce the disk usage
+//     quick migration
+// Disadvantage of forbidding copy operation:
+//     without perfect lock mechamism, there is possibility of data corruption
+//     when Netscape 4.x and mozilla run at the same time and access the same
+//     mail file at the same time
+#define PREF_MIGRATION_MODE_FOR_MAIL "mail.migration.copyMailFiles"
+#define PREF_MAIL_DIRECTORY "mail.directory"
+#define PREF_NEWS_DIRECTORY "news.directory"
+#define PREF_MAIL_IMAP_ROOT_DIR "mail.imap.root_dir"
+#define PREF_NETWORK_HOSTS_POP_SERVER "network.hosts.pop_server"
+#define PREF_4X_NETWORK_HOSTS_IMAP_SERVER "network.hosts.imap_servers"  
+#define PREF_MAIL_SERVER_TYPE	"mail.server_type"
+#define PREF_BROWSER_CACHE_DIRECTORY "browser.cache.directory"
+#define POP_4X_MAIL_TYPE 0
+#define IMAP_4X_MAIL_TYPE 1
+#ifdef HAVE_MOVEMAIL
+#define MOVEMAIL_4X_MAIL_TYPE 2
+#define NEW_MOVEMAIL_DIR_NAME "movemail"
+#endif /* HAVE_MOVEMAIL */
+
+#if defined(XP_UNIX) && !defined(XP_MACOSX)
+/* a 4.x profile on UNIX is rooted at something like
+ * "/u/sspitzer/.netscape"
+ * profile + OLD_MAIL_DIR_NAME = "/u/sspitzer/.netscape/../nsmail" = "/u/sspitzer/nsmail"
+ * profile + OLD_NEWS_DIR_NAME = "/u/sspitzer/.netscape/xover-cache"
+ * profile + OLD_IMAPMAIL_DIR_NAME = "/u/sspitzer/.netscape/../ns_imap" = "/u/sspitzer/ns_imap"
+ * which is as good as we're going to get for defaults on UNIX.
+ */
+#define OLD_MAIL_DIR_NAME "/../nsmail"
+#define OLD_NEWS_DIR_NAME "/xover-cache"
+#define OLD_IMAPMAIL_DIR_NAME "/../ns_imap"
+#else
+#define OLD_MAIL_DIR_NAME "Mail"
+#define OLD_NEWS_DIR_NAME "News"
+#define OLD_IMAPMAIL_DIR_NAME "ImapMail"
+#endif /* XP_UNIX */
+
+#define NEW_MAIL_DIR_NAME "Mail"
+#define NEW_NEWS_DIR_NAME "News"
+#define NEW_IMAPMAIL_DIR_NAME "ImapMail"
+#define NEW_LOCAL_MAIL_DIR_NAME "Local Folders"
+
+#define NEW_DIR_SUFFIX "5"
+#define PREF_FILE_NAME_IN_5x "prefs.js"
+
+static PRBool nsCStringEndsWith(nsCString& name, const char *ending);
+
+#ifdef NEED_TO_COPY_AND_RENAME_NEWSRC_FILES
+static PRBool nsCStringStartsWith(nsCString& name, const char *starting);
+#endif
+
+///////////////////////////////////////////////////////////////////////////////
+// nsDogbertProfileMigrator
+struct PrefBranchStruct {
+  char*         prefName;
+  PRInt32       type;
+  union {
+    char*       stringValue;
+    PRInt32     intValue;
+    PRBool      boolValue;
+    PRUnichar*  wstringValue;
+  };
+};
+
+NS_IMPL_ISUPPORTS2(nsDogbertProfileMigrator, nsIMailProfileMigrator, nsITimerCallback)
+
+
+nsDogbertProfileMigrator::nsDogbertProfileMigrator()
+{
+  mObserverService = do_GetService("@mozilla.org/observer-service;1");
+  mMaxProgress = LL_ZERO;
+  mCurrentProgress = LL_ZERO;
+}
+
+nsDogbertProfileMigrator::~nsDogbertProfileMigrator()
+{           
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// nsITimerCallback
+
+NS_IMETHODIMP
+nsDogbertProfileMigrator::Notify(nsITimer *timer)
+{
+  CopyNextFolder();
+  return NS_OK;
+}
+
+void nsDogbertProfileMigrator::CopyNextFolder() 
+{
+  if (mFileCopyTransactionIndex < mFileCopyTransactions->Count())
+  {
+    PRUint32 percentage = 0;
+    fileTransactionEntry* fileTransaction = (fileTransactionEntry*) mFileCopyTransactions->SafeElementAt(mFileCopyTransactionIndex++);
+    if (fileTransaction) // copy the file
+    {
+      fileTransaction->srcFile->CopyTo(fileTransaction->destFile, fileTransaction->newName);
+
+      // add to our current progress
+      PRInt64 fileSize;
+      fileTransaction->srcFile->GetFileSize(&fileSize);
+      LL_ADD(mCurrentProgress, mCurrentProgress, fileSize);
+
+      PRInt64 percentDone;
+      LL_MUL(percentDone, mCurrentProgress, 100);
+
+      LL_DIV(percentDone, percentDone, mMaxProgress);
+      
+      LL_L2UI(percentage, percentDone);
+
+      nsAutoString index;
+      index.AppendInt( percentage ); 
+
+      NOTIFY_OBSERVERS(MIGRATION_PROGRESS, index.get());
+    }
+    // fire a timer to handle the next one. 
+    mFileIOTimer = do_CreateInstance("@mozilla.org/timer;1");
+    // if the progress = 100% let's pause for a second or two with a finished progessmeter before we move on
+    mFileIOTimer->InitWithCallback(NS_STATIC_CAST(nsITimerCallback *, this), percentage == 100 ? 500 : 0, nsITimer::TYPE_ONE_SHOT);
+  } else
+    EndCopyFolders();
+  
+  return;
+}
+
+void nsDogbertProfileMigrator::EndCopyFolders() 
+{
+  // clear out the file transaction array
+  if (mFileCopyTransactions)
+  {
+    PRUint32 count = mFileCopyTransactions->Count();
+    for (PRUint32 i = 0; i < count; ++i) 
+    {
+      fileTransactionEntry* fileTransaction = (fileTransactionEntry*) mFileCopyTransactions->ElementAt(i);
+      if (fileTransaction)
+      {
+        fileTransaction->srcFile = nsnull;
+        fileTransaction->destFile = nsnull;
+        delete fileTransaction;
+      }
+    }
+  
+    mFileCopyTransactions->Clear();
+    delete mFileCopyTransactions;
+  }
+
+  // notify the UI that we are done with the migration process
+  nsAutoString index;
+  index.AppendInt(nsIMailProfileMigrator::MAILDATA); 
+  NOTIFY_OBSERVERS(MIGRATION_ITEMAFTERMIGRATE, index.get());
+
+  NOTIFY_OBSERVERS(MIGRATION_ENDED, nsnull);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// nsIMailProfileMigrator
+
+NS_IMETHODIMP
+nsDogbertProfileMigrator::Migrate(PRUint16 aItems, nsIProfileStartup* aStartup, const PRUnichar* aProfile)
+{
+  nsresult rv = NS_OK;
+  PRBool aReplace = aStartup ? PR_TRUE : PR_FALSE;
+
+  if (!mTargetProfile) {
+    GetProfilePath(aStartup, mTargetProfile);
+    if (!mTargetProfile) return NS_ERROR_FAILURE;
+  }
+  if (!mSourceProfile)
+    GetSourceProfile(aProfile);
+
+  NOTIFY_OBSERVERS(MIGRATION_STARTED, nsnull);
+
+  rv = CopyPreferences();
+  return rv;
+}
+
+NS_IMETHODIMP
+nsDogbertProfileMigrator::GetMigrateData(const PRUnichar* aProfile, 
+                                           PRBool aReplace, 
+                                           PRUint16* aResult)
+{
+  // add some extra migration fields for things we also migrate
+  *aResult |= nsIMailProfileMigrator::ACCOUNT_SETTINGS 
+           | nsIMailProfileMigrator::MAILDATA 
+           | nsIMailProfileMigrator::NEWSDATA
+           | nsIMailProfileMigrator::ADDRESSBOOK_DATA;
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsDogbertProfileMigrator::GetSourceExists(PRBool* aResult)
+{
+  nsCOMPtr<nsISupportsArray> profiles;
+  GetSourceProfiles(getter_AddRefs(profiles));
+
+  if (profiles) { 
+    PRUint32 count;
+    profiles->Count(&count);
+    *aResult = count > 0;
+  }
+  else
+    *aResult = PR_FALSE;
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsDogbertProfileMigrator::GetSourceHasMultipleProfiles(PRBool* aResult)
+{
+  nsCOMPtr<nsISupportsArray> profiles;
+  GetSourceProfiles(getter_AddRefs(profiles));
+
+  if (profiles) {
+    PRUint32 count;
+    profiles->Count(&count);
+    *aResult = count > 1;
+  }
+  else
+    *aResult = PR_FALSE;
+
+  return NS_OK;
+}
+
+#if defined(XP_WIN) || defined(XP_OS2) || defined(XP_MACOSX)
+NS_IMETHODIMP
+nsDogbertProfileMigrator::GetSourceProfiles(nsISupportsArray** aResult)
+{
+  if (!mProfiles) {
+    nsresult rv;
+
+    rv = NS_NewISupportsArray(getter_AddRefs(mProfiles));
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    nsCOMPtr<nsIFile> regFile;
+    rv = NS_GetSpecialDirectory(OLDREG_DIR, getter_AddRefs(regFile));
+    NS_ENSURE_SUCCESS(rv, rv);
+    regFile->AppendNative(NS_LITERAL_CSTRING(OLDREG_NAME));
+  
+    nsCAutoString path;
+    rv = regFile->GetNativePath(path);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    if (NR_StartupRegistry())
+      return NS_ERROR_FAILURE;
+
+    HREG reg = nsnull;
+    REGENUM enumstate = 0;
+
+    if (NR_RegOpen(path.get(), &reg)) {
+      NR_ShutdownRegistry();
+      return NS_ERROR_FAILURE;
+    }
+
+    char profileName[MAXREGNAMELEN];
+    while (!NR_RegEnumSubkeys(reg, ROOTKEY_USERS, &enumstate,
+                              profileName, MAXREGNAMELEN, REGENUM_CHILDREN)) {
+      nsCOMPtr<nsISupportsString> nameString
+        (do_CreateInstance("@mozilla.org/supports-string;1"));
+      if (nameString) {
+        nameString->SetData(NS_ConvertUTF8toUTF16(profileName));
+        mProfiles->AppendElement(nameString);
+      }
+    }
+  }
+  
+  NS_IF_ADDREF(*aResult = mProfiles);
+  return NS_OK;
+}
+#else // XP_UNIX
+
+NS_IMETHODIMP
+nsDogbertProfileMigrator::GetSourceProfiles(nsISupportsArray** aResult)
+{
+  nsresult rv;
+  const char* profileDir  = PR_GetEnv(PROFILE_HOME_ENVIRONMENT_VARIABLE);
+
+  if (!profileDir) {
+    profileDir = PR_GetEnv(HOME_ENVIRONMENT_VARIABLE);
+  }
+  if (!profileDir) return NS_ERROR_FAILURE;
+
+  nsCAutoString profilePath(profileDir);
+  profilePath += "/.netscape";
+
+  nsCOMPtr<nsILocalFile> profileFile;
+  rv = NS_NewNativeLocalFile(profilePath, PR_TRUE, getter_AddRefs(profileFile));
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  nsCOMPtr<nsIFile> prefFile;
+  rv = profileFile->Clone(getter_AddRefs(prefFile));
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  prefFile->AppendNative(NS_LITERAL_CSTRING("preferences.js"));
+
+  PRBool exists;
+  rv = prefFile->Exists(&exists);
+  if (NS_FAILED(rv) || !exists) {
+    return NS_ERROR_FAILURE;
+  }
+
+  mSourceProfile = profileFile;
+
+  rv = NS_NewISupportsArray(getter_AddRefs(mProfiles));
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  nsCOMPtr<nsISupportsString> nameString
+    (do_CreateInstance("@mozilla.org/supports-string;1"));
+  if (!nameString) return NS_ERROR_FAILURE;
+
+  nameString->SetData(NS_LITERAL_STRING("Netscape 4.x"));
+  mProfiles->AppendElement(nameString);
+  NS_ADDREF(*aResult = mProfiles);
+  return NS_OK;
+}
+
+#endif // GetSourceProfiles
+
+// on win/mac/os2, NS4x uses a registry to determine profile locations
+#if defined(XP_WIN) || defined(XP_MACOSX) || defined(XP_OS2)
+void nsDogbertProfileMigrator::GetSourceProfile(const PRUnichar* aProfile)
+{
+  nsresult rv;
+
+  nsCOMPtr<nsIFile> regFile;
+  rv = NS_GetSpecialDirectory(OLDREG_DIR, getter_AddRefs(regFile));
+  if (NS_FAILED(rv)) return;
+
+  regFile->AppendNative(NS_LITERAL_CSTRING(OLDREG_NAME));
+  
+  nsCAutoString path;
+  rv = regFile->GetNativePath(path);
+  if (NS_FAILED(rv)) return;
+
+  if (NR_StartupRegistry())
+    return;
+
+  HREG reg = nsnull;
+  RKEY profile = nsnull;
+
+  if (NR_RegOpen(path.get(), &reg))
+    goto cleanup;
+
+  {
+    // on macos, registry entries are UTF8 encoded
+    NS_ConvertUTF16toUTF8 profileName(aProfile);
+
+    if (NR_RegGetKey(reg, ROOTKEY_USERS, profileName.get(), &profile))
+      goto cleanup;
+  }
+
+  char profilePath[MAXPATHLEN];
+  if (NR_RegGetEntryString(reg, profile, "ProfileLocation", profilePath, MAXPATHLEN))
+    goto cleanup;
+
+  mSourceProfile = do_CreateInstance("@mozilla.org/file/local;1");
+  if (!mSourceProfile) goto cleanup;
+
+  {
+    // the string is UTF8 encoded, which forces us to do some strange string-do
+    rv = mSourceProfile->InitWithPath(NS_ConvertUTF8toUTF16(profilePath));
+  }
+
+  if (NS_FAILED(rv))
+    mSourceProfile = nsnull;
+
+cleanup:
+  if (reg)
+    NR_RegClose(reg);
+  NR_ShutdownRegistry();
+}
+#else
+
+void
+nsDogbertProfileMigrator::GetSourceProfile(const PRUnichar* aProfile)
+{
+  // if GetSourceProfiles didn't do its magic, we're screwed
+}
+
+#endif
+
+
+nsresult nsDogbertProfileMigrator::CopyPreferences()
+{
+  // Load the source pref file
+
+  mPrefs = do_GetService(kPrefServiceCID);
+
+  nsCAutoString oldProfDirStr;
+  nsCAutoString newProfDirStr;
+
+  nsCOMPtr<nsILocalFile> sourceProfile = do_QueryInterface(mSourceProfile);
+  nsCOMPtr<nsILocalFile> targetProfile = do_QueryInterface(mTargetProfile);
+
+  sourceProfile->GetPersistentDescriptor(oldProfDirStr);
+  targetProfile->GetPersistentDescriptor(newProfDirStr); 
+
+  nsAutoString index;
+  index.AppendInt(nsIMailProfileMigrator::MAILDATA); 
+  NOTIFY_OBSERVERS(MIGRATION_ITEMBEFOREMIGRATE, index.get());
+
+  ProcessPrefsCallback(oldProfDirStr.get(), newProfDirStr.get());
+
+  // Generate the max progress value now that we know all of the files we need to copy
+  PRUint32 count = mFileCopyTransactions->Count();
+  for (PRUint32 i = 0; i < count; ++i) 
+  {
+    fileTransactionEntry* fileTransaction = (fileTransactionEntry*) mFileCopyTransactions->ElementAt(i);
+    if (fileTransaction)
+    {
+      PRInt64 fileSize; 
+      fileTransaction->srcFile->GetFileSize(&fileSize);
+      LL_ADD(mMaxProgress, mMaxProgress, fileSize);
+    }
+  }
+
+  CopyNextFolder();
+  return NS_OK;
+}
+
+/*--------------------------------------------------------------------------
+ * ProcessPrefsCallback is the primary funtion for the class nsPrefMigration.
+ *
+ * Called by: The Profile Manager (nsProfile.cpp)
+ * INPUT: The specific profile path (prefPath) and the 5.0 installed path
+ * OUTPUT: The modified 5.0 prefs files
+ * RETURN: Success or a failure code
+ *
+ *-------------------------------------------------------------------------*/
+nsresult
+nsDogbertProfileMigrator::ProcessPrefsCallback(const char* oldProfilePathStr, const char * newProfilePathStr)
+{ 
+  nsresult rv;
+  
+  nsCOMPtr<nsIFileSpec> oldProfilePath;
+  nsCOMPtr<nsIFileSpec> newProfilePath; 
+  nsCOMPtr<nsIFileSpec> oldPOPMailPath;
+  nsCOMPtr<nsIFileSpec> newPOPMailPath;
+  nsCOMPtr<nsIFileSpec> oldIMAPMailPath;
+  nsCOMPtr<nsIFileSpec> newIMAPMailPath;
+  nsCOMPtr<nsIFileSpec> oldIMAPLocalMailPath;
+  nsCOMPtr<nsIFileSpec> newIMAPLocalMailPath;
+  nsCOMPtr<nsIFileSpec> oldNewsPath;
+  nsCOMPtr<nsIFileSpec> newNewsPath;
+  nsCOMPtr<nsILocalFile> newPrefsFile;
+#ifdef HAVE_MOVEMAIL
+  nsCOMPtr<nsIFileSpec> oldMOVEMAILMailPath;
+  nsCOMPtr<nsIFileSpec> newMOVEMAILMailPath;
+#endif /* HAVE_MOVEMAIL */
+  PRBool exists                  = PR_FALSE, 
+         enoughSpace             = PR_TRUE,
+         localMailDriveDefault   = PR_FALSE,
+         summaryMailDriveDefault = PR_FALSE,
+         newsDriveDefault        = PR_FALSE,
+         copyMailFileInMigration = PR_TRUE;
+
+  nsFileSpec localMailSpec,
+             summaryMailSpec,
+             newsSpec, 
+             oldProfileSpec, newProfileSpec;
+
+  PRInt32 serverType = POP_4X_MAIL_TYPE; 
+  char *popServerName = nsnull;
+
+  PRUint32 totalLocalMailSize = 0,
+           totalSummaryFileSize = 0,
+           totalNewsSize = 0, 
+           totalProfileSize = 0,
+           totalRequired = 0;
+
+
+  PRInt64  localMailDrive   = LL_Zero(),
+           summaryMailDrive = LL_Zero(),
+           newsDrive        = LL_Zero(),
+           profileDrive     = LL_Zero();
+
+  PRInt64  DriveID[MAX_DRIVES];
+  PRUint32 SpaceRequired[MAX_DRIVES];
+  
+#if defined(NS_DEBUG)
+  printf("*Entered Actual Migration routine*\n");
+#endif
+
+  for (int i=0; i < MAX_DRIVES; i++)
+  {
+    DriveID[i] = LL_Zero();
+    SpaceRequired[i] = 0;
+  }
+  
+  rv = NS_NewFileSpec(getter_AddRefs(oldProfilePath));
+  if (NS_FAILED(rv)) return rv;
+  rv = NS_NewFileSpec(getter_AddRefs(newProfilePath));
+  if (NS_FAILED(rv)) return rv;
+      
+  rv = ConvertPersistentStringToFileSpec(oldProfilePathStr, oldProfilePath);
+  if (NS_FAILED(rv)) return rv;
+  rv = ConvertPersistentStringToFileSpec(newProfilePathStr, newProfilePath);
+  if (NS_FAILED(rv)) return rv;
+
+  oldProfilePath->GetFileSpec(&oldProfileSpec);
+  newProfilePath->GetFileSpec(&newProfileSpec);
+  
+  /* initialize prefs with the old prefs.js file (which is a copy of the 4.x preferences file) */
+  nsCOMPtr<nsIFileSpec> PrefsFile4x;
+
+  //Get the location of the 4.x prefs file
+  rv = NS_NewFileSpec(getter_AddRefs(PrefsFile4x));
+  if (NS_FAILED(rv)) return rv;
+  
+  rv = PrefsFile4x->FromFileSpec(oldProfilePath);
+  if (NS_FAILED(rv)) return rv;
+
+  rv = PrefsFile4x->AppendRelativeUnixPath(PREF_FILE_NAME_IN_4x);
+  if (NS_FAILED(rv)) return rv;
+
+  //Need to convert PrefsFile4x to an IFile in order to copy it to a 
+  //unique name in the system temp directory.
+  nsFileSpec PrefsFile4xAsFileSpec;
+  rv = PrefsFile4x->GetFileSpec(&PrefsFile4xAsFileSpec);
+  if (NS_FAILED(rv)) return rv;
+  
+  nsCOMPtr<nsILocalFile> PrefsFile4xAsIFile;
+  rv = NS_FileSpecToIFile(&PrefsFile4xAsFileSpec,
+                     getter_AddRefs(PrefsFile4xAsIFile));
+  if (NS_FAILED(rv)) return rv;
+
+  nsCOMPtr<nsIFile> systemTempDir;
+  rv = NS_GetSpecialDirectory(NS_OS_TEMP_DIR, getter_AddRefs(systemTempDir));
+  if (NS_FAILED(rv)) return rv;
+
+  systemTempDir->AppendNative(NS_LITERAL_CSTRING("migrate"));
+  
+  //Create a unique directory in the system temp dir based on the name of the 4.x prefs file
+  rv = systemTempDir->CreateUnique(nsIFile::DIRECTORY_TYPE, 0700); 
+  if (NS_FAILED(rv)) return rv;
+
+  rv = PrefsFile4xAsIFile->CopyToNative(systemTempDir, NS_LITERAL_CSTRING(PREF_FILE_NAME_IN_4x));
+  if (NS_FAILED(rv)) return rv;
+  
+  nsCOMPtr<nsIFile> cloneFile;
+  rv = systemTempDir->Clone(getter_AddRefs(cloneFile));
+  if (NS_FAILED(rv)) return rv;
+
+  m_prefsFile = do_QueryInterface(cloneFile, &rv);
+  if (NS_FAILED(rv)) return rv;
+
+  rv = m_prefsFile->AppendNative(NS_LITERAL_CSTRING(PREF_FILE_NAME_IN_4x));
+  if (NS_FAILED(rv)) return rv;
+
+  //Clear the prefs in case a previous set was read in.
+  mPrefs->ResetPrefs();
+
+  //Now read the prefs from the prefs file in the system directory
+  mPrefs->ReadUserPrefs(m_prefsFile);
+
+  // Start computing the sizes required for migration
+  //
+  rv = GetSizes(oldProfileSpec, PR_FALSE, &totalProfileSize);
+  profileDrive = newProfileSpec.GetDiskSpaceAvailable();
+
+  rv = mPrefs->GetIntPref(PREF_MAIL_SERVER_TYPE, &serverType);
+  if (NS_FAILED(rv)) return rv;
+
+  // get the migration mode for mail
+  rv = mPrefs->GetBoolPref(PREF_MIGRATION_MODE_FOR_MAIL, &copyMailFileInMigration);
+  if (NS_FAILED(rv))
+    return rv;
+
+  if (serverType == POP_4X_MAIL_TYPE) {
+    summaryMailDriveDefault = PR_TRUE; //summary files are only used in IMAP so just set it to true here.
+    summaryMailDrive = profileDrive;   //just set the drive for summary files to be the same as the new profile
+
+    rv = NS_NewFileSpec(getter_AddRefs(newPOPMailPath));
+    if (NS_FAILED(rv)) return rv;
+
+    rv = NS_NewFileSpec(getter_AddRefs(oldPOPMailPath));
+    if (NS_FAILED(rv)) return rv;
+    
+    rv = GetDirFromPref(oldProfilePath,newProfilePath,NEW_MAIL_DIR_NAME, PREF_MAIL_DIRECTORY, newPOPMailPath, oldPOPMailPath);
+    if (NS_FAILED(rv)) {
+      rv = DetermineOldPath(oldProfilePath, OLD_MAIL_DIR_NAME, "mailDirName", oldPOPMailPath);
+      if (NS_FAILED(rv)) return rv;
+
+      rv = SetPremigratedFilePref(PREF_MAIL_DIRECTORY, oldPOPMailPath);
+      if (NS_FAILED(rv)) return rv;
+
+      rv = newPOPMailPath->FromFileSpec(newProfilePath);
+      if (NS_FAILED(rv)) return rv;
+
+      localMailDriveDefault = PR_TRUE;
+    }
+    oldPOPMailPath->GetFileSpec(&localMailSpec);
+    rv = GetSizes(localMailSpec, PR_TRUE, &totalLocalMailSize);
+    localMailDrive = localMailSpec.GetDiskSpaceAvailable();
+  }
+  else if(serverType == IMAP_4X_MAIL_TYPE) {
+    rv = NS_NewFileSpec(getter_AddRefs(newIMAPLocalMailPath));
+    if (NS_FAILED(rv)) return rv;
+      
+    rv = NS_NewFileSpec(getter_AddRefs(oldIMAPLocalMailPath));
+    if (NS_FAILED(rv)) return rv;
+        
+    /* First get the actual 4.x "Local Mail" files location */
+    rv = GetDirFromPref(oldProfilePath,newProfilePath, NEW_MAIL_DIR_NAME, PREF_MAIL_DIRECTORY, newIMAPLocalMailPath, oldIMAPLocalMailPath);
+    if (NS_FAILED(rv)) {
+      rv = DetermineOldPath(oldProfilePath, OLD_MAIL_DIR_NAME, "mailDirName", oldIMAPLocalMailPath);
+      if (NS_FAILED(rv)) return rv;
+
+      rv = SetPremigratedFilePref(PREF_MAIL_DIRECTORY, oldIMAPLocalMailPath);
+      if (NS_FAILED(rv)) return rv;
+
+      rv = newIMAPLocalMailPath->FromFileSpec(newProfilePath);
+      if (NS_FAILED(rv)) return rv;
+      
+      localMailDriveDefault = PR_TRUE;
+    }
+
+    oldIMAPLocalMailPath->GetFileSpec(&localMailSpec);
+    rv = GetSizes(localMailSpec, PR_TRUE, &totalLocalMailSize);
+    localMailDrive = localMailSpec.GetDiskSpaceAvailable();
+
+    /* Next get IMAP mail summary files location */
+    rv = NS_NewFileSpec(getter_AddRefs(newIMAPMailPath));
+    if (NS_FAILED(rv)) return rv;
+    
+    rv = NS_NewFileSpec(getter_AddRefs(oldIMAPMailPath));
+    if (NS_FAILED(rv)) return rv;
+
+    rv = GetDirFromPref(oldProfilePath,newProfilePath, NEW_IMAPMAIL_DIR_NAME, PREF_MAIL_IMAP_ROOT_DIR,newIMAPMailPath,oldIMAPMailPath);
+    if (NS_FAILED(rv)) {
+      rv = oldIMAPMailPath->FromFileSpec(oldProfilePath);
+      if (NS_FAILED(rv)) return rv;
+        
+      /* we didn't over localize "ImapMail" in 4.x, so this is all we have to do */
+      rv = oldIMAPMailPath->AppendRelativeUnixPath(OLD_IMAPMAIL_DIR_NAME);
+      if (NS_FAILED(rv)) return rv;
+
+      rv = SetPremigratedFilePref(PREF_MAIL_IMAP_ROOT_DIR, oldIMAPMailPath);
+      if (NS_FAILED(rv)) return rv;   
+      
+      rv = newIMAPMailPath->FromFileSpec(newProfilePath);
+      if (NS_FAILED(rv)) return rv;
+
+      summaryMailDriveDefault = PR_TRUE;
+    }
+
+    oldIMAPMailPath->GetFileSpec(&summaryMailSpec);
+    rv = GetSizes(summaryMailSpec, PR_TRUE, &totalSummaryFileSize);
+    summaryMailDrive = summaryMailSpec.GetDiskSpaceAvailable();
+  }   
+
+#ifdef HAVE_MOVEMAIL
+  else if (serverType == MOVEMAIL_4X_MAIL_TYPE) {
+    
+    summaryMailDriveDefault = PR_TRUE;
+    summaryMailDrive = profileDrive;
+
+    rv = NS_NewFileSpec(getter_AddRefs(newMOVEMAILMailPath));
+    if (NS_FAILED(rv)) return rv;
+
+    rv = NS_NewFileSpec(getter_AddRefs(oldMOVEMAILMailPath));
+    if (NS_FAILED(rv)) return rv;
+    
+    rv = GetDirFromPref(oldProfilePath,newProfilePath,NEW_MAIL_DIR_NAME, PREF_MAIL_DIRECTORY, newMOVEMAILMailPath, oldMOVEMAILMailPath);
+    if (NS_FAILED(rv)) {
+      rv = oldMOVEMAILMailPath->FromFileSpec(oldProfilePath);
+      if (NS_FAILED(rv)) return rv;
+
+      /* we didn't over localize this in 4.x, so this is all we have to do */
+      rv = oldMOVEMAILMailPath->AppendRelativeUnixPath(OLD_MAIL_DIR_NAME);
+      if (NS_FAILED(rv)) return rv;
+      
+      rv = SetPremigratedFilePref(PREF_MAIL_DIRECTORY, oldMOVEMAILMailPath);
+      if (NS_FAILED(rv)) return rv;
+
+      rv = newMOVEMAILMailPath->FromFileSpec(newProfilePath);
+      if (NS_FAILED(rv)) return rv;
+
+      localMailDriveDefault = PR_TRUE;
+    }
+    oldMOVEMAILMailPath->GetFileSpec(&localMailSpec);
+    rv = GetSizes(localMailSpec, PR_TRUE, &totalLocalMailSize);
+
+    localMailDrive = localMailSpec.GetDiskSpaceAvailable();
+   
+  }    
+#endif //HAVE_MOVEMAIL
+
+    ////////////////////////////////////////////////////////////////////////////
+    // Now get the NEWS disk space requirements for migration.
+    ////////////////////////////////////////////////////////////////////////////
+    rv = NS_NewFileSpec(getter_AddRefs(newNewsPath));
+    if (NS_FAILED(rv)) return rv;
+    
+    rv = NS_NewFileSpec(getter_AddRefs(oldNewsPath));
+    if (NS_FAILED(rv)) return rv;
+    
+    rv = GetDirFromPref(oldProfilePath,newProfilePath, NEW_NEWS_DIR_NAME, PREF_NEWS_DIRECTORY, newNewsPath,oldNewsPath);
+    if (NS_FAILED(rv)) {
+      rv = DetermineOldPath(oldProfilePath, OLD_NEWS_DIR_NAME, "newsDirName", oldNewsPath);
+      if (NS_FAILED(rv)) return rv;
+
+      rv = SetPremigratedFilePref(PREF_NEWS_DIRECTORY, oldNewsPath);
+      if (NS_FAILED(rv)) return rv; 
+
+      rv = newNewsPath->FromFileSpec(newProfilePath);
+      if (NS_FAILED(rv)) return rv;
+
+      newsDriveDefault = PR_TRUE;
+    }
+    oldNewsPath->GetFileSpec(&newsSpec);
+    rv = GetSizes(newsSpec, PR_TRUE, &totalNewsSize);
+    newsDrive = newsSpec.GetDiskSpaceAvailable();
+
+    // 
+    // Compute the space needed to migrate the profile
+    //
+    if(newsDriveDefault && localMailDriveDefault && summaryMailDriveDefault) // DEFAULT: All on the same drive
+    {
+      totalRequired = totalNewsSize + totalLocalMailSize + totalSummaryFileSize + totalProfileSize;
+      rv = ComputeSpaceRequirements(DriveID, SpaceRequired, profileDrive, totalRequired);
+      if (NS_FAILED(rv))
+        enoughSpace = PR_FALSE;
+    }
+    else
+    {
+      rv = ComputeSpaceRequirements(DriveID, SpaceRequired, profileDrive, totalProfileSize);
+      if (NS_FAILED(rv))
+        enoughSpace = PR_FALSE;
+      rv = ComputeSpaceRequirements(DriveID, SpaceRequired, localMailDrive, totalLocalMailSize);
+      if (NS_FAILED(rv))
+        enoughSpace = PR_FALSE;
+      rv = ComputeSpaceRequirements(DriveID, SpaceRequired, summaryMailDrive, totalSummaryFileSize);
+      if (NS_FAILED(rv))
+        enoughSpace = PR_FALSE;
+      rv = ComputeSpaceRequirements(DriveID, SpaceRequired, newsDrive, totalNewsSize);
+      if (NS_FAILED(rv))
+        enoughSpace = PR_FALSE;
+    }
+
+    // do something if not enough space
+
+  ////////////////////////////////////////////////////////////////////////////
+  // If we reached this point, there is enough room to do a migration.
+  // Start creating directories and setting new pref values.
+  ////////////////////////////////////////////////////////////////////////////
+
+  /* Create the new profile tree for 5.x */
+  rv = CreateNewUser5Tree(oldProfilePath, newProfilePath);
+  if (NS_FAILED(rv)) return rv;
+
+  
+  if (serverType == POP_4X_MAIL_TYPE) {
+
+    rv = newPOPMailPath->Exists(&exists);
+    if (NS_FAILED(rv)) return rv;
+    if (!exists)  {
+      rv = newPOPMailPath->CreateDir();
+      if (NS_FAILED(rv)) return rv;
+    }
+
+    rv = newPOPMailPath->AppendRelativeUnixPath(NEW_MAIL_DIR_NAME);
+    if (NS_FAILED(rv)) return rv;
+ 
+    rv = newPOPMailPath->Exists(&exists);
+    if (NS_FAILED(rv)) return rv;
+    if (!exists)  {
+      rv = newPOPMailPath->CreateDir();
+      if (NS_FAILED(rv)) return rv;
+    }
+
+    {
+      // temporarily go through nsFileSpec
+      nsFileSpec newPOPMailPathSpec;
+      newPOPMailPath->GetFileSpec(&newPOPMailPathSpec);
+      
+      nsCOMPtr<nsILocalFile> newPOPMailPathFile;
+      NS_FileSpecToIFile(&newPOPMailPathSpec,
+                         getter_AddRefs(newPOPMailPathFile));
+      
+      rv = mPrefs->SetFileXPref(PREF_MAIL_DIRECTORY, newPOPMailPathFile); 
+      if (NS_FAILED(rv)) return rv;
+    }
+
+    mPrefs->CopyCharPref(PREF_NETWORK_HOSTS_POP_SERVER, &popServerName);
+
+    nsCAutoString popServerNamewithoutPort(popServerName);
+    PRInt32 colonPos = popServerNamewithoutPort.FindChar(':');
+
+    if (colonPos != -1 ) {
+	    popServerNamewithoutPort.Truncate(colonPos);
+	    rv = newPOPMailPath->AppendRelativeUnixPath(popServerNamewithoutPort.get());
+    }
+    else {
+	    rv = newPOPMailPath->AppendRelativeUnixPath(popServerName);
+    }
+
+    if (NS_FAILED(rv)) return rv;				  
+    
+    rv = newPOPMailPath->Exists(&exists);
+    if (NS_FAILED(rv)) return rv;
+    if (!exists)  {
+      rv = newPOPMailPath->CreateDir();
+      if (NS_FAILED(rv)) return rv;
+    }
+  }
+  else if (serverType == IMAP_4X_MAIL_TYPE) {
+   if( copyMailFileInMigration )  // copy mail files in migration 
+   {
+     rv = newIMAPLocalMailPath->Exists(&exists);
+     if (NS_FAILED(rv)) return rv;
+     if (!exists)  {
+        rv = newIMAPLocalMailPath->CreateDir();
+        if (NS_FAILED(rv)) return rv;
+     }
+      
+    rv = newIMAPLocalMailPath->AppendRelativeUnixPath(NEW_MAIL_DIR_NAME);
+    if (NS_FAILED(rv)) return rv;
+
+    /* Now create the new "Mail/Local Folders" directory */
+    rv = newIMAPLocalMailPath->Exists(&exists);
+    if (NS_FAILED(rv)) return rv;
+    if (!exists)  {
+      newIMAPLocalMailPath->CreateDir();
+    }
+
+    {
+      // temporarily go through nsFileSpec
+      nsFileSpec newIMAPLocalMailPathSpec;
+      newIMAPLocalMailPath->GetFileSpec(&newIMAPLocalMailPathSpec);
+      
+      nsCOMPtr<nsILocalFile> newIMAPLocalMailPathFile;
+      NS_FileSpecToIFile(&newIMAPLocalMailPathSpec,
+                         getter_AddRefs(newIMAPLocalMailPathFile));
+      
+      rv = mPrefs->SetFileXPref(PREF_MAIL_DIRECTORY, newIMAPLocalMailPathFile); 
+      if (NS_FAILED(rv)) return rv;
+    }
+
+    rv = newIMAPLocalMailPath->AppendRelativeUnixPath(NEW_LOCAL_MAIL_DIR_NAME);
+    if (NS_FAILED(rv)) return rv;
+    rv = newIMAPLocalMailPath->Exists(&exists);
+    if (NS_FAILED(rv)) return rv;
+    if (!exists)  {
+      rv = newIMAPLocalMailPath->CreateDir();
+      if (NS_FAILED(rv)) return rv;
+    }
+
+    /* Now deal with the IMAP mail summary file location */
+    rv = newIMAPMailPath->Exists(&exists);
+    if (NS_FAILED(rv)) return rv;
+    if (!exists)  {
+      rv = newIMAPMailPath->CreateDir();
+      if (NS_FAILED(rv)) return rv;
+    }
+
+    rv = newIMAPMailPath->AppendRelativeUnixPath(NEW_IMAPMAIL_DIR_NAME);
+    if (NS_FAILED(rv)) return rv;
+
+    rv = newIMAPMailPath->Exists(&exists);
+    if (NS_FAILED(rv)) return rv;
+    if (!exists)  {
+      rv = newIMAPMailPath->CreateDir();
+      if (NS_FAILED(rv)) return rv;
+    }
+
+    {
+      // temporarily go through nsFileSpec
+      nsFileSpec newIMAPMailPathSpec;
+      newIMAPMailPath->GetFileSpec(&newIMAPMailPathSpec);
+      
+      nsCOMPtr<nsILocalFile> newIMAPMailPathFile;
+      NS_FileSpecToIFile(&newIMAPMailPathSpec,
+                         getter_AddRefs(newIMAPMailPathFile));
+      
+      rv = mPrefs->SetFileXPref(PREF_MAIL_IMAP_ROOT_DIR, newIMAPMailPathFile);
+      if (NS_FAILED(rv)) return rv;
+    }
+   }
+   else
+   {
+    {
+      // temporarily go through nsFileSpec
+      nsFileSpec oldIMAPLocalMailPathSpec;
+      oldIMAPLocalMailPath->GetFileSpec(&oldIMAPLocalMailPathSpec);
+
+      nsCOMPtr<nsILocalFile> oldIMAPLocalMailPathFile;
+      NS_FileSpecToIFile(&oldIMAPLocalMailPathSpec,
+                         getter_AddRefs(oldIMAPLocalMailPathFile));
+
+      rv = mPrefs->SetFileXPref(PREF_MAIL_DIRECTORY, oldIMAPLocalMailPathFile);
+      if (NS_FAILED(rv)) return rv;
+    }
+    {
+      // temporarily go through nsFileSpec
+      nsFileSpec oldIMAPMailPathSpec;
+      oldIMAPMailPath->GetFileSpec(&oldIMAPMailPathSpec);
+
+      nsCOMPtr<nsILocalFile> oldIMAPMailPathFile;
+      NS_FileSpecToIFile(&oldIMAPMailPathSpec,
+                         getter_AddRefs(oldIMAPMailPathFile));
+
+      rv = mPrefs->SetFileXPref(PREF_MAIL_IMAP_ROOT_DIR, oldIMAPMailPathFile);
+      if (NS_FAILED(rv)) return rv;
+    }
+   }
+  }
+
+#ifdef HAVE_MOVEMAIL
+  else if (serverType == MOVEMAIL_4X_MAIL_TYPE) {
+
+    rv = newMOVEMAILMailPath->Exists(&exists);
+    if (NS_FAILED(rv)) return rv;
+    if (!exists)  {
+      rv = newMOVEMAILMailPath->CreateDir();
+      if (NS_FAILED(rv)) return rv;
+    }
+
+    rv = newMOVEMAILMailPath->AppendRelativeUnixPath(NEW_MAIL_DIR_NAME);
+    if (NS_FAILED(rv)) return rv;
+
+    rv = newMOVEMAILMailPath->Exists(&exists);
+    if (NS_FAILED(rv)) return rv;
+    if (!exists)  {
+      rv = newMOVEMAILMailPath->CreateDir();
+      if (NS_FAILED(rv)) return rv;
+    }
+
+    {
+      // temporarily go through nsFileSpec
+      nsFileSpec newMOVEMAILPathSpec;
+      newMOVEMAILMailPath->GetFileSpec(&newMOVEMAILPathSpec);
+      
+      nsCOMPtr<nsILocalFile> newMOVEMAILPathFile;
+      NS_FileSpecToIFile(&newMOVEMAILPathSpec,
+                         getter_AddRefs(newMOVEMAILPathFile));
+      
+      rv = mPrefs->SetFileXPref(PREF_MAIL_DIRECTORY, newMOVEMAILPathFile); 
+      if (NS_FAILED(rv)) return rv;
+    }
+
+    rv = newMOVEMAILMailPath->AppendRelativeUnixPath(NEW_MOVEMAIL_DIR_NAME);
+    if (NS_FAILED(rv)) return rv;
+
+    rv = newMOVEMAILMailPath->Exists(&exists);
+    if (NS_FAILED(rv)) return rv;
+    if (!exists)  {
+      rv = newMOVEMAILMailPath->CreateDir();
+      if (NS_FAILED(rv)) return rv;
+    }
+    rv = NS_OK;
+  }
+#endif /* HAVE_MOVEMAIL */
+  else {
+    NS_ASSERTION(0,"failure, didn't recognize your mail server type.\n");
+    return NS_ERROR_UNEXPECTED;
+  }
+  
+  ////////////////////////////////////////////////////////////////////////////
+  // Set all the appropriate NEWS prefs.
+  ////////////////////////////////////////////////////////////////////////////
+
+  rv = newNewsPath->Exists(&exists);
+  if (NS_FAILED(rv)) return rv;
+  if (!exists)  {
+    rv = newNewsPath->CreateDir();
+    if (NS_FAILED(rv)) return rv;
+  }
+
+  rv = newNewsPath->AppendRelativeUnixPath(NEW_NEWS_DIR_NAME);
+  if (NS_FAILED(rv)) return rv;
+
+  rv = newNewsPath->Exists(&exists);
+  if (NS_FAILED(rv)) return rv;
+  if (!exists)  {
+    rv = newNewsPath->CreateDir();
+    if (NS_FAILED(rv)) return rv;
+  }
+
+  {
+    // temporarily go through nsFileSpec
+    nsFileSpec newNewsPathSpec;
+    newNewsPath->GetFileSpec(&newNewsPathSpec);
+    
+    nsCOMPtr<nsILocalFile> newNewsPathFile;
+    NS_FileSpecToIFile(&newNewsPathSpec,
+                       getter_AddRefs(newNewsPathFile));
+    
+    rv = mPrefs->SetFileXPref(PREF_NEWS_DIRECTORY, newNewsPathFile); 
+    if (NS_FAILED(rv)) return rv;
+  }
+
+  PRBool needToRenameFilterFiles;
+  if (PL_strcmp(IMAP_MAIL_FILTER_FILE_NAME_IN_4x,IMAP_MAIL_FILTER_FILE_NAME_IN_5x)) {
+#ifdef IMAP_MAIL_FILTER_FILE_NAME_FORMAT_IN_4x
+    // if we defined a format, the filter files don't live in the host directories
+    // (mac does this.)  we'll take care of those filter files later, in DoSpecialUpdates()
+    needToRenameFilterFiles = PR_FALSE;
+#else
+    needToRenameFilterFiles = PR_TRUE;
+#endif /* IMAP_MAIL_FILTER_FILE_NAME_FORMAT_IN_4x */
+  }
+  else {
+    // if the name was the same in 4x as in 5x, no need to rename it
+    needToRenameFilterFiles = PR_FALSE;
+  }
+  
+  // just copy what we need
+#if defined(XP_MAC) || defined(XP_MACOSX)
+  rv = DoTheCopy(oldProfilePath, newProfilePath, SECURITY_PATH, PR_TRUE);
+  if (NS_FAILED(rv)) return rv;
+#else
+  rv = DoTheCopy(oldProfilePath, newProfilePath, PSM_CERT7_DB);
+  if (NS_FAILED(rv)) return rv;
+  rv = DoTheCopy(oldProfilePath, newProfilePath, PSM_KEY3_DB);
+  if (NS_FAILED(rv)) return rv;
+  rv = DoTheCopy(oldProfilePath, newProfilePath, PSM_SECMODULE_DB);
+  if (NS_FAILED(rv)) return rv;
+#endif /* XP_MAC */
+
+  // Copy the addrbook files.
+  rv = CopyFilesByPattern(oldProfilePath, newProfilePath, ADDRBOOK_FILE_EXTENSION_IN_4X);
+  NS_ENSURE_SUCCESS(rv,rv);
+
+#if defined(XP_MAX) || defined(XP_MACOSX)
+  // Copy the Mac filter rule files which sits at the top level dir of a 4.x profile.
+  if(serverType == IMAP_4X_MAIL_TYPE) {
+    rv = CopyFilesByPattern(oldProfilePath, newProfilePath, MAC_RULES_FILE_ENDING_STRING_IN_4X);
+    NS_ENSURE_SUCCESS(rv,rv);
+  }
+#endif
+
+  rv = DoTheCopy(oldNewsPath, newNewsPath, PR_TRUE);
+  if (NS_FAILED(rv)) return rv;
+
+#ifdef NEED_TO_COPY_AND_RENAME_NEWSRC_FILES
+  /* in 4.x, the newsrc files were in $HOME.  Now that we can have multiple
+   * profiles in 5.x, with the same user, this won't fly.
+   * when they migrate, we need to copy from $HOME/.newsrc-<host> to
+   * ~/.mozilla/<profile>/News/newsrc-<host>
+   */
+  rv = CopyAndRenameNewsrcFiles(newNewsPath);
+  if (NS_FAILED(rv)) return rv;
+#endif /* NEED_TO_COPY_AND_RENAME_NEWSRC_FILES */
+
+  if (serverType == IMAP_4X_MAIL_TYPE) {
+    if( copyMailFileInMigration )  // copy mail files in migration
+    {
+    rv = DoTheCopyAndRename(oldIMAPMailPath, newIMAPMailPath, PR_TRUE, needToRenameFilterFiles, IMAP_MAIL_FILTER_FILE_NAME_IN_4x, IMAP_MAIL_FILTER_FILE_NAME_IN_5x);
+    if (NS_FAILED(rv)) return rv;
+    rv = DoTheCopyAndRename(oldIMAPLocalMailPath, newIMAPLocalMailPath, PR_TRUE, needToRenameFilterFiles,IMAP_MAIL_FILTER_FILE_NAME_IN_4x,IMAP_MAIL_FILTER_FILE_NAME_IN_5x);
+    if (NS_FAILED(rv)) return rv;
+    }
+    else  // Copy & Rename filter files
+    {
+      // IMAP path
+      // don't care if this fails
+      (void)DoTheCopyAndRename(oldIMAPMailPath, PR_TRUE, IMAP_MAIL_FILTER_FILE_NAME_IN_4x, IMAP_MAIL_FILTER_FILE_NAME_IN_5x);
+      
+      // Local Folders path
+      // don't care if this fails
+      (void)DoTheCopyAndRename(oldIMAPLocalMailPath, PR_TRUE, IMAP_MAIL_FILTER_FILE_NAME_IN_4x, IMAP_MAIL_FILTER_FILE_NAME_IN_5x);
+    }
+  }
+  else if (serverType == POP_4X_MAIL_TYPE) {
+    // fix for bug #202010
+    // copy over the pop filter and popstate files now
+    // and later, in DoSpecialUpdates()
+    // we'll move and rename them
+#ifdef POP_MAIL_FILTER_FILE_NAME_IN_4x
+    rv = DoTheCopy(oldProfilePath, newProfilePath, POP_MAIL_FILTER_FILE_NAME_IN_4x);
+    if (NS_FAILED(rv)) return rv;
+#endif
+    
+#ifdef POPSTATE_FILE_IN_4x 
+    rv = DoTheCopy(oldProfilePath, newProfilePath, POPSTATE_FILE_IN_4x);
+    if (NS_FAILED(rv)) return rv;
+#endif
+    
+    rv = DoTheCopy(oldPOPMailPath, newPOPMailPath, PR_TRUE);
+    if (NS_FAILED(rv)) return rv;
+  }
+#ifdef HAVE_MOVEMAIL
+  else if (serverType == MOVEMAIL_4X_MAIL_TYPE) {
+    // in 4.x, the movemail filter name was the same as the pop filter name
+    // copy over the filter file now
+    // and later, in DoSpecialUpdates()
+    // we'll move and rename them
+    rv = DoTheCopy(oldProfilePath, newProfilePath, POP_MAIL_FILTER_FILE_NAME_IN_4x);
+    if (NS_FAILED(rv)) return rv;
+    
+    rv = DoTheCopy(oldMOVEMAILMailPath, newMOVEMAILMailPath, PR_TRUE);
+  }
+#endif /* HAVE_MOVEMAIL */
+  else {
+    NS_ASSERTION(0, "unknown mail server type!");
+    return NS_ERROR_FAILURE;
+  }
+  
+  // Don't inherit the 4.x cache file location for mozilla!
+  // The cache pref later gets set with a default in nsAppRunner::InitCachePrefs().
+  mPrefs->ClearUserPref(PREF_BROWSER_CACHE_DIRECTORY);
+
+  rv = DoSpecialUpdates(newProfilePath);
+  if (NS_FAILED(rv)) return rv;
+    PR_FREEIF(popServerName);
+
+  nsXPIDLCString path;
+
+  newProfilePath->GetNativePath(getter_Copies(path));
+  NS_NewNativeLocalFile(path, PR_TRUE, getter_AddRefs(newPrefsFile));
+
+  rv = newPrefsFile->AppendNative(NS_LITERAL_CSTRING(PREF_FILE_NAME_IN_5x));
+  if (NS_FAILED(rv)) return rv;
+
+  rv=mPrefs->SavePrefFile(newPrefsFile);
+  if (NS_FAILED(rv)) return rv;
+  rv=mPrefs->ResetPrefs();
+  if (NS_FAILED(rv)) return rv;
+
+  PRBool flagExists = PR_FALSE;
+  m_prefsFile->Exists(&flagExists); //Delete the prefs.js file in the temp directory.
+  if (flagExists)
+    m_prefsFile->Remove(PR_FALSE);
+  
+  systemTempDir->Exists(&flagExists); //Delete the unique dir in the system temp dir.
+  if (flagExists)
+    systemTempDir->Remove(PR_FALSE);
+
+  return rv;
+}
+
+nsresult nsDogbertProfileMigrator::CreateNewUser5Tree(nsIFileSpec * oldProfilePath, nsIFileSpec * newProfilePath)
+{
+  nsresult rv;
+  PRBool exists;
+  
+  NS_ASSERTION(*PREF_FILE_NAME_IN_4x, "don't know how to migrate your platform");
+  if (!*PREF_FILE_NAME_IN_4x) {
+    return NS_ERROR_UNEXPECTED;
+  }
+      
+  /* Copy the old prefs file to the new profile directory for modification and reading.  
+     after copying it, rename it to pref.js, the 5.x pref file name on all platforms */
+  nsCOMPtr<nsIFileSpec> oldPrefsFile;
+  rv = NS_NewFileSpec(getter_AddRefs(oldPrefsFile)); 
+  if (NS_FAILED(rv)) return rv;
+  
+  rv = oldPrefsFile->FromFileSpec(oldProfilePath);
+  if (NS_FAILED(rv)) return rv;
+  
+  rv = oldPrefsFile->AppendRelativeUnixPath(PREF_FILE_NAME_IN_4x);
+  if (NS_FAILED(rv)) return rv;
+
+  /* the new prefs file */
+  nsCOMPtr<nsIFileSpec> newPrefsFile;
+  rv = NS_NewFileSpec(getter_AddRefs(newPrefsFile)); 
+  if (NS_FAILED(rv)) return rv;
+  
+  rv = newPrefsFile->FromFileSpec(newProfilePath);
+  if (NS_FAILED(rv)) return rv;
+  
+  rv = newPrefsFile->Exists(&exists);
+  if (!exists)
+  {
+	  rv = newPrefsFile->CreateDir();
+  }
+
+  rv = oldPrefsFile->CopyToDir(newPrefsFile);
+  NS_ASSERTION(NS_SUCCEEDED(rv),"failed to copy prefs file");
+
+  rv = newPrefsFile->AppendRelativeUnixPath(PREF_FILE_NAME_IN_4x);
+  rv = newPrefsFile->Rename(PREF_FILE_NAME_IN_5x);
+
+  return NS_OK;
+}
+
+#ifdef NEED_TO_COPY_AND_RENAME_NEWSRC_FILES
+nsresult nsDogbertProfileMigrator::CopyAndRenameNewsrcFiles(nsIFileSpec * newPathSpec)
+{
+  nsresult rv;
+  nsCOMPtr <nsIFileSpec>oldPathSpec;
+  nsFileSpec oldPath;
+  nsFileSpec newPath;
+  char* folderName = nsnull;
+  nsCAutoString fileOrDirNameStr;
+
+  rv = GetPremigratedFilePref(PREF_NEWS_DIRECTORY, getter_AddRefs(oldPathSpec));
+  if (NS_FAILED(rv)) return rv;
+  rv = oldPathSpec->GetFileSpec(&oldPath);
+  if (NS_FAILED(rv)) return rv;
+  rv = newPathSpec->GetFileSpec(&newPath);
+  if (NS_FAILED(rv)) return rv;
+
+  for (nsDirectoryIterator dir(oldPath, PR_FALSE); dir.Exists(); dir++)
+  {
+    nsFileSpec fileOrDirName = dir.Spec(); //set first file or dir to a nsFileSpec
+    folderName = fileOrDirName.GetLeafName();    //get the filename without the full path
+    fileOrDirNameStr.Assign(folderName);
+
+    if (nsCStringStartsWith(fileOrDirNameStr, NEWSRC_PREFIX_IN_4x) || nsCStringStartsWith(fileOrDirNameStr, SNEWSRC_PREFIX_IN_4x)) {
+#ifdef DEBUG_seth
+	    printf("newsrc file == %s\n",folderName);
+#endif /* DEBUG_seth */
+
+	    rv = fileOrDirName.CopyToDir(newPath);
+        NS_ASSERTION(NS_SUCCEEDED(rv),"failed to copy news file");
+
+        nsFileSpec newFile = newPath;
+        newFile += fileOrDirNameStr.get();
+        newFile.Rename(folderName + 1); /* rename .newsrc-news to newsrc-news, no need to keep it hidden anymore */
+    }
+  }
+
+  return NS_OK;
+}
+#endif /* NEED_TO_COPY_AND_RENAME_NEWSRC_FILES */
+
+
+/*-------------------------------------------------------------------------
+ * DoTheCopyAndRename copies the files listed in oldPath to newPath
+ *                    and renames files, if necessary
+ *
+ * INPUT: oldPath - The old profile path plus the specific data type 
+ *                  (e.g. mail or news)
+ *        newPath - The new profile path plus the specific data type
+ *
+ *        readSubdirs
+ *
+ *        needToRenameFiles - do we need to search for files named oldFile
+ *                            and rename them to newFile
+ *
+ *        oldFile           - old file name (used for renaming)
+ *
+ *        newFile           - new file name (used for renaming)
+ *
+ * RETURNS: NS_OK if successful
+ *          NS_ERROR_FAILURE if failed
+ *
+ *--------------------------------------------------------------------------*/
+nsresult nsDogbertProfileMigrator::DoTheCopyAndRename(nsIFileSpec * oldPathSpec, nsIFileSpec *newPathSpec, PRBool readSubdirs, PRBool needToRenameFiles, const char *oldName, const char *newName)
+{
+  nsresult rv;
+  char* folderName = nsnull;
+  nsCAutoString fileOrDirNameStr;
+  nsFileSpec oldPath;
+  nsFileSpec newPath;
+  
+  rv = oldPathSpec->GetFileSpec(&oldPath);
+  if (NS_FAILED(rv)) return rv;
+  rv = newPathSpec->GetFileSpec(&newPath);
+  if (NS_FAILED(rv)) return rv;
+  
+  for (nsDirectoryIterator dir(oldPath, PR_FALSE); dir.Exists(); dir++)
+  {
+    nsFileSpec fileOrDirName = dir.Spec(); //set first file or dir to a nsFileSpec
+    folderName = fileOrDirName.GetLeafName();    //get the filename without the full path
+    fileOrDirNameStr.Assign(folderName);
+
+    if (nsCStringEndsWith(fileOrDirNameStr, MAIL_SUMMARY_SUFFIX_IN_4x) || nsCStringEndsWith(fileOrDirNameStr, NEWS_SUMMARY_SUFFIX_IN_4x) || nsCStringEndsWith(fileOrDirNameStr, SUMMARY_SUFFIX_IN_5x)) /* Don't copy the summary files */
+      continue;
+    else
+    {
+      if (fileOrDirName.IsDirectory())
+      {
+        if(readSubdirs)
+        {
+          nsCOMPtr<nsIFileSpec> newPathExtended;
+          rv = NS_NewFileSpecWithSpec(newPath, getter_AddRefs(newPathExtended));
+          rv = newPathExtended->AppendRelativeUnixPath(folderName);
+          rv = newPathExtended->CreateDir();
+          
+          nsCOMPtr<nsIFileSpec>fileOrDirNameSpec;
+          rv = NS_NewFileSpecWithSpec(fileOrDirName, getter_AddRefs(fileOrDirNameSpec));
+          DoTheCopyAndRename(fileOrDirNameSpec, newPathExtended, PR_TRUE, needToRenameFiles, oldName, newName); /* re-enter the DoTheCopyAndRename function */
+        }
+        else
+          continue;
+      }
+      else {
+        // copy the file
+        if (fileOrDirNameStr.Equals(oldName)) 
+          AddFileCopyToList(&fileOrDirName, &newPath, newName);
+        else
+          AddFileCopyToList(&fileOrDirName, &newPath, "");
+      }
+    }
+  }  
+  
+  return NS_OK;
+}
+
+/*-------------------------------------------------------------------------
+ * DoTheCopyAndRename copies and renames files
+ *
+ * INPUT: aPath - the path
+ *
+ *        aReadSubdirs - if sub directories should be handled
+ *
+ *        aOldFile - old file name (used for renaming)
+ *
+ *        aNewFile - new file name (used for renaming)
+ *
+ * RETURNS: NS_OK if successful
+ *          NS_ERROR_FAILURE if failed
+ *
+ *--------------------------------------------------------------------------*/
+nsresult nsDogbertProfileMigrator::DoTheCopyAndRename(nsIFileSpec * aPathSpec, PRBool aReadSubdirs, const char *aOldName, const char *aNewName)
+{
+  if( !aOldName || !aNewName || !strcmp(aOldName, aNewName) )
+    return NS_ERROR_FAILURE;
+
+  nsresult rv;
+  nsFileSpec path, file;
+  
+  rv = aPathSpec->GetFileSpec(&path);
+  if (NS_FAILED(rv))
+    return rv;
+  rv = aPathSpec->GetFileSpec(&file);
+  if (NS_FAILED(rv))
+    return rv;
+  file += aOldName;
+  
+  // Handle sub folders
+  for (nsDirectoryIterator dir(path, PR_FALSE); dir.Exists(); dir++)
+  {
+    nsFileSpec fileOrDirName = dir.Spec(); //set first file or dir to a nsFileSpec
+    if (fileOrDirName.IsDirectory())
+    {
+      if( aReadSubdirs )
+      {
+        nsCOMPtr<nsIFileSpec>fileOrDirNameSpec;
+        rv = NS_NewFileSpecWithSpec(fileOrDirName, getter_AddRefs(fileOrDirNameSpec));
+        DoTheCopyAndRename(fileOrDirNameSpec, aReadSubdirs, aOldName, aNewName); /* re-enter the DoTheCopyAndRename function */
+      }
+      else
+        continue;
+    }
+  }
+
+  nsCOMPtr<nsILocalFile> localFileOld, localFileDirectory;
+  rv = NS_FileSpecToIFile(&file, getter_AddRefs(localFileOld));
+  if (NS_FAILED(rv))
+    return rv;
+  rv = NS_FileSpecToIFile(&path, getter_AddRefs(localFileDirectory));
+  if (NS_FAILED(rv))
+    return rv;
+  nsAutoString newName = NS_ConvertUTF8toUCS2(aNewName);
+  localFileOld->CopyTo(localFileDirectory, newName);
+
+  return NS_OK;
+}
+
+nsresult nsDogbertProfileMigrator::CopyFilesByPattern(nsIFileSpec * oldPathSpec, nsIFileSpec * newPathSpec, const char *pattern)
+{
+  nsFileSpec oldPath;
+  nsFileSpec newPath;
+  
+  nsresult rv = oldPathSpec->GetFileSpec(&oldPath);
+  NS_ENSURE_SUCCESS(rv,rv);
+  rv = newPathSpec->GetFileSpec(&newPath);
+  NS_ENSURE_SUCCESS(rv,rv);
+  
+  for (nsDirectoryIterator dir(oldPath, PR_FALSE); dir.Exists(); dir++)
+  {
+    nsFileSpec fileOrDirName = dir.Spec();    //set first file or dir to a nsFileSpec
+
+    if (fileOrDirName.IsDirectory())
+      continue;
+
+    nsCAutoString fileOrDirNameStr(fileOrDirName.GetLeafName());
+    if (!nsCStringEndsWith(fileOrDirNameStr, pattern))
+      continue;
+
+
+    AddFileCopyToList(&fileOrDirName, &newPath, "");
+  }  
+  
+  return NS_OK;
+}
+
+nsresult nsDogbertProfileMigrator::AddFileCopyToList(nsFileSpec * aOldPath, nsFileSpec * aNewPath, const char * newName)
+{
+  // convert to nsIFile
+  nsCOMPtr<nsILocalFile> oldPathFile;
+  nsCOMPtr<nsILocalFile> newPathFile;
+
+  NS_FileSpecToIFile(aOldPath, getter_AddRefs(oldPathFile));
+  NS_FileSpecToIFile(aNewPath, getter_AddRefs(newPathFile));
+
+  fileTransactionEntry* fileEntry = new fileTransactionEntry;
+  fileEntry->srcFile = do_QueryInterface(oldPathFile);
+  fileEntry->destFile = do_QueryInterface(newPathFile);
+  fileEntry->newName = NS_ConvertUTF8toUCS2(newName);
+  mFileCopyTransactions->AppendElement((void*) fileEntry);
+
+  return NS_OK;
+}
+
+nsresult nsDogbertProfileMigrator::DoTheCopy(nsIFileSpec * oldPath, nsIFileSpec * newPath, PRBool readSubdirs)
+{
+  return DoTheCopyAndRename(oldPath, newPath, readSubdirs, PR_FALSE, "", "");
+}
+
+nsresult nsDogbertProfileMigrator::DoTheCopy(nsIFileSpec * oldPath, nsIFileSpec * newPath, const char *fileOrDirName, PRBool isDirectory)
+{
+  nsresult rv;
+
+  if (isDirectory)
+  {
+    nsCOMPtr<nsIFileSpec> oldSubPath;
+
+    NS_NewFileSpec(getter_AddRefs(oldSubPath));
+    oldSubPath->FromFileSpec(oldPath);
+    rv = oldSubPath->AppendRelativeUnixPath(fileOrDirName);
+    if (NS_FAILED(rv)) return rv;
+    PRBool exist;
+    rv = oldSubPath->Exists(&exist);
+    if (NS_FAILED(rv)) return rv;
+    if (!exist)
+    {
+      rv = oldSubPath->CreateDir();
+      if (NS_FAILED(rv)) return rv;
+    }
+
+    nsCOMPtr<nsIFileSpec> newSubPath;
+
+    NS_NewFileSpec(getter_AddRefs(newSubPath));
+    newSubPath->FromFileSpec(newPath);
+    rv = newSubPath->AppendRelativeUnixPath(fileOrDirName);
+    if (NS_FAILED(rv)) return rv;
+    rv = newSubPath->Exists(&exist);
+    if (NS_FAILED(rv)) return rv;
+    if (!exist)
+    {
+      rv = newSubPath->CreateDir();
+      if (NS_FAILED(rv)) return rv;
+    }
+
+    DoTheCopy(oldSubPath, newSubPath, PR_TRUE);
+  }
+  else
+  {
+    nsCOMPtr<nsIFileSpec> file;
+    NS_NewFileSpec(getter_AddRefs(file));
+    file->FromFileSpec(oldPath);
+    rv = file->AppendRelativeUnixPath(fileOrDirName);
+    if( NS_FAILED(rv) ) return rv;
+    PRBool exist;
+    rv = file->Exists(&exist);
+    if( NS_FAILED(rv) ) return rv;
+    if( exist) {
+      // convert back to nsFileSpec
+      nsFileSpec oldPath;
+      nsFileSpec newPathSpec;
+
+      file->GetFileSpec(&oldPath);
+      newPath->GetFileSpec(&newPathSpec);
+      AddFileCopyToList(&oldPath, &newPathSpec, "");
+    }
+  }
+
+  return rv;
+}
+
+
+/*----------------------------------------------------------------------------
+ * DoSpecialUpdates updates is a routine that does some miscellaneous updates 
+ * like renaming certain files, etc.
+ *--------------------------------------------------------------------------*/
+nsresult nsDogbertProfileMigrator::DoSpecialUpdates(nsIFileSpec  * profilePath)
+{
+  nsresult rv;
+  PRInt32 serverType;
+  nsFileSpec fs;
+
+  rv = profilePath->GetFileSpec(&fs);
+  if (NS_FAILED(rv)) return rv;
+  
+  fs += PREF_FILE_NAME_IN_5x;
+  
+  nsOutputFileStream fsStream(fs, (PR_WRONLY | PR_CREATE_FILE | PR_APPEND));
+  
+  if (!fsStream.is_open())
+  {
+    return NS_ERROR_FAILURE;
+  }
+
+  /* Need to add a string to the top of the prefs.js file to prevent it
+   * from being loaded as a standard javascript file which would be a
+   * security hole.
+   */
+  fsStream << PREF_FILE_HEADER_STRING << nsEndl ;
+  fsStream.close();
+    
+  /* Create the new mail directory from the setting in prefs.js or a default */
+  rv = mPrefs->GetIntPref(PREF_MAIL_SERVER_TYPE, &serverType);
+  if (NS_FAILED(rv)) return rv; 
+  if (serverType == POP_4X_MAIL_TYPE) {
+	rv = RenameAndMove4xPopFilterFile(profilePath);
+  	if (NS_FAILED(rv)) return rv; 
+
+	rv = RenameAndMove4xPopStateFile(profilePath);
+  	if (NS_FAILED(rv)) return rv; 
+  }
+#ifdef IMAP_MAIL_FILTER_FILE_NAME_FORMAT_IN_4x 
+  else if (serverType == IMAP_4X_MAIL_TYPE) {
+  	rv = RenameAndMove4xImapFilterFiles(profilePath);
+	if (NS_FAILED(rv)) return rv;
+  }
+#endif /* IMAP_MAIL_FILTER_FILE_NAME_FORMAT_IN_4x */
+
+  return rv;
+}
+
+nsresult nsDogbertProfileMigrator::RenameAndMove4xPopFilterFile(nsIFileSpec * profilePath)
+{
+  return RenameAndMove4xPopFile(profilePath, POP_MAIL_FILTER_FILE_NAME_IN_4x, POP_MAIL_FILTER_FILE_NAME_IN_5x);
+}
+
+nsresult nsDogbertProfileMigrator::RenameAndMove4xPopStateFile(nsIFileSpec * profilePath)
+{
+#ifdef POPSTATE_FILE_IN_4x
+  return RenameAndMove4xPopFile(profilePath, POPSTATE_FILE_IN_4x, POPSTATE_FILE_IN_5x);
+#else 
+  // on windows, popstate.dat was in Users\<profile>\MAIL\popstate.dat
+  // which is the right place, unlike linux and mac.
+  // so, when we migrate Users\<profile>\Mail to Users50\<profile>\Mail\<hostname>
+  // it just works
+  return NS_OK;
+#endif /* POPSTATE_FILE_IN_4x */
+}
+
+nsresult nsDogbertProfileMigrator::RenameAndMove4xPopFile(nsIFileSpec * profilePath, const char *fileNameIn4x, const char *fileNameIn5x)
+{
+  nsFileSpec file;
+  nsresult rv = profilePath->GetFileSpec(&file);
+  if (NS_FAILED(rv)) return rv;
+  
+  // we assume the 4.x pop files live at <profile>/<fileNameIn4x>
+  file += fileNameIn4x;
+
+  // figure out where the 4.x pop mail directory got copied to
+  char *popServerName = nsnull;
+  nsFileSpec migratedPopDirectory;
+  rv = profilePath->GetFileSpec(&migratedPopDirectory);
+  migratedPopDirectory += NEW_MAIL_DIR_NAME;
+  mPrefs->CopyCharPref(PREF_NETWORK_HOSTS_POP_SERVER, &popServerName);
+  migratedPopDirectory += popServerName;
+  PR_FREEIF(popServerName);
+
+  // copy the 4.x file from <profile>/<fileNameIn4x> to the <profile>/Mail/<hostname>/<fileNameIn4x>
+  rv = file.CopyToDir(migratedPopDirectory);
+  NS_ASSERTION(NS_SUCCEEDED(rv),"failed to copy pop file");
+  
+  // XXX todo, delete the old file
+  // we are leaving it behind
+  
+  // make migratedPopDirectory point the the copied filter file,
+  // <profile>/Mail/<hostname>/<fileNameIn4x>
+  migratedPopDirectory += fileNameIn4x;
+
+  // rename <profile>/Mail/<hostname>/<fileNameIn4x>to <profile>/Mail/<hostname>/<fileNameIn5x>, if necessary
+  if (PL_strcmp(fileNameIn4x,fileNameIn5x)) {
+	  migratedPopDirectory.Rename(fileNameIn5x);
+  }
+
+  return NS_OK;
+}
+
+
+#ifdef IMAP_MAIL_FILTER_FILE_NAME_FORMAT_IN_4x
+#define BUFFER_LEN	128
+nsresult nsDogbertProfileMigrator::RenameAndMove4xImapFilterFile(nsIFileSpec * profilePath, const char *hostname)
+{
+  nsresult rv = NS_OK;
+  char imapFilterFileName[BUFFER_LEN];
+
+  // the 4.x imap filter file lives in "<profile>/<hostname> Rules"
+  nsFileSpec file;
+  rv = profilePath->GetFileSpec(&file);
+  if (NS_FAILED(rv)) return rv;
+  
+  PR_snprintf(imapFilterFileName, BUFFER_LEN, IMAP_MAIL_FILTER_FILE_NAME_FORMAT_IN_4x, hostname);
+  file += imapFilterFileName;
+
+  // if that file didn't exist, because they didn't use filters for that server, return now
+  if (!file.Exists()) return NS_OK;
+
+  // figure out where the 4.x pop mail directory got copied to
+  nsFileSpec migratedImapDirectory;
+  rv = profilePath->GetFileSpec(&migratedImapDirectory);
+  migratedImapDirectory += NEW_IMAPMAIL_DIR_NAME;
+  migratedImapDirectory += hostname;
+
+  // copy the 4.x file from "<profile>/<hostname> Rules" to <profile>/ImapMail/<hostname>/
+  rv = file.CopyToDir(migratedImapDirectory);
+  NS_ASSERTION(NS_SUCCEEDED(rv),"failed to copy imap file");
+
+  // make migratedPopDirectory point the the copied filter file,
+  // "<profile>/ImapMail/<hostname>/<hostname> Rules"
+  migratedImapDirectory += imapFilterFileName;
+
+  // rename "<profile>/ImapMail/<hostname>/<hostname> Rules" to  "<profile>/ImapMail/<hostname>/rules.dat"
+  migratedImapDirectory.Rename(IMAP_MAIL_FILTER_FILE_NAME_IN_5x);
+
+  return NS_OK;         
+}
+
+nsresult nsDogbertProfileMigrator::RenameAndMove4xImapFilterFiles(nsIFileSpec * profilePath)
+{
+  nsresult rv;
+  char *hostList=nsnull;
+
+  rv = mPrefs->CopyCharPref(PREF_4X_NETWORK_HOSTS_IMAP_SERVER, &hostList);
+  if (NS_FAILED(rv)) return rv;
+
+  if (!hostList || !*hostList) return NS_OK; 
+
+  char *token = nsnull;
+  char *rest = hostList;
+  nsCAutoString str;
+
+  token = nsCRT::strtok(rest, ",", &rest);
+  while (token && *token) {
+    str = token;
+    str.StripWhitespace();
+
+    if (!str.IsEmpty()) {
+      // str is the hostname
+      rv = RenameAndMove4xImapFilterFile(profilePath,str.get());
+      if  (NS_FAILED(rv)) {
+        // failed to migrate.  bail.
+        return rv;
+      }
+      str = "";
+    }
+    token = nsCRT::strtok(rest, ",", &rest);
+  }
+  PR_FREEIF(hostList);
+  return NS_OK;    
+}
+#endif /* IMAP_MAIL_FILTER_FILE_NAME_FORMAT_IN_4x */
+
+nsresult
+nsDogbertProfileMigrator::Rename4xFileAfterMigration(nsIFileSpec * profilePath, const char *oldFileName, const char *newFileName)
+{
+  nsresult rv = NS_OK;
+  // if they are the same, don't bother to rename the file.
+  if (PL_strcmp(oldFileName, newFileName) == 0) {
+    return rv;
+  }
+               
+  nsFileSpec file;
+  rv = profilePath->GetFileSpec(&file);
+  if (NS_FAILED(rv)) return rv;
+  
+  file += oldFileName;
+  
+  // make sure it exists before you try to rename it
+  if (file.Exists()) {
+    file.Rename(newFileName);
+  }
+  return rv;
+}
+
+#ifdef NEED_TO_COPY_AND_RENAME_NEWSRC_FILES
+nsresult nsDogbertProfileMigrator::GetPremigratedFilePref(const char *pref_name, nsIFileSpec **path)
+{
+  nsresult rv;
+  if (!pref_name) return NS_ERROR_FAILURE;
+  char premigration_pref[MAX_PREF_LEN];
+  PR_snprintf(premigration_pref,MAX_PREF_LEN,"%s%s",PREMIGRATION_PREFIX,pref_name);
+  rv = mPrefs->GetFilePref((const char *)premigration_pref, path);
+  return rv;
+}
+
+#endif /* NEED_TO_COPY_AND_RENAME_NEWSRC_FILES */
+
+nsresult nsDogbertProfileMigrator::DetermineOldPath(nsIFileSpec *profilePath, const char *oldPathName, const char *oldPathEntityName, nsIFileSpec *oldPath)
+{
+	nsresult rv;
+
+  	/* set oldLocalFile to profilePath.  need to convert nsIFileSpec->nsILocalFile */
+	nsCOMPtr<nsILocalFile> oldLocalFile;
+	nsFileSpec pathSpec;
+	profilePath->GetFileSpec(&pathSpec);
+	rv = NS_FileSpecToIFile(&pathSpec, getter_AddRefs(oldLocalFile));
+	if (NS_FAILED(rv)) return rv;
+	
+	/* get the string bundle, and get the appropriate localized string out of it */
+	nsCOMPtr<nsIStringBundleService> bundleService = do_GetService(kStringBundleServiceCID, &rv);
+	if (NS_FAILED(rv)) return rv;
+
+  nsCOMPtr<nsIStringBundle> bundle;
+  rv = bundleService->CreateBundle(MIGRATION_PROPERTIES_URL, getter_AddRefs(bundle));
+	if (NS_FAILED(rv)) return rv;
+
+	nsXPIDLString localizedDirName;
+	nsAutoString entityName;
+	entityName.AssignWithConversion(oldPathEntityName);
+	rv = bundle->GetStringFromName(entityName.get(), getter_Copies(localizedDirName));
+	if (NS_FAILED(rv)) return rv;
+
+	rv = oldLocalFile->AppendRelativePath(localizedDirName);
+	if (NS_FAILED(rv)) return rv;
+
+	PRBool exists = PR_FALSE;
+	rv = oldLocalFile->Exists(&exists);
+	if (!exists) {
+		/* if the localized name doesn't exist, use the english name */
+		rv = oldPath->FromFileSpec(profilePath);
+		if (NS_FAILED(rv)) return rv;
+		
+		rv = oldPath->AppendRelativeUnixPath(oldPathName);
+		if (NS_FAILED(rv)) return rv;
+		
+		return NS_OK;
+	}
+
+	/* at this point, the folder with the localized name exists, so use it */
+	nsCAutoString persistentDescriptor;
+	rv = oldLocalFile->GetPersistentDescriptor(persistentDescriptor);
+	if (NS_FAILED(rv)) return rv;
+	rv = oldPath->SetPersistentDescriptorString(persistentDescriptor.get());
+	if (NS_FAILED(rv)) return rv;
+
+	return NS_OK;
+}
+
+nsresult nsDogbertProfileMigrator::ConvertPersistentStringToFileSpec(const char *str, nsIFileSpec *path)
+{
+	nsresult rv;
+	if (!str || !path) return NS_ERROR_NULL_POINTER;
+	
+	rv = path->SetPersistentDescriptorString(str);
+	return rv;
+}
+
+/*---------------------------------------------------------------------------------
+ * GetSizes reads the 4.x files in the profile tree and accumulates their sizes
+ *--------------------------------------------------------------------------------*/
+
+nsresult nsDogbertProfileMigrator::GetSizes(nsFileSpec inputPath, PRBool readSubdirs, PRUint32 *sizeTotal)
+{
+  char* folderName;
+  nsCAutoString fileOrDirNameStr;
+
+  for (nsDirectoryIterator dir(inputPath, PR_FALSE); dir.Exists(); dir++)
+  {
+    nsFileSpec fileOrDirName = dir.Spec();
+    folderName = fileOrDirName.GetLeafName();
+    fileOrDirNameStr.Assign(folderName);
+    if (nsCStringEndsWith(fileOrDirNameStr, MAIL_SUMMARY_SUFFIX_IN_4x) || nsCStringEndsWith(fileOrDirNameStr, NEWS_SUMMARY_SUFFIX_IN_4x) || nsCStringEndsWith(fileOrDirNameStr, SUMMARY_SUFFIX_IN_5x)) /* Don't copy the summary files */
+      continue;
+    else
+    {
+      if (fileOrDirName.IsDirectory())
+      {
+        if(readSubdirs)
+        {
+          GetSizes(fileOrDirName, PR_TRUE, sizeTotal); /* re-enter the GetSizes function */
+        }
+        else
+          continue;
+      }
+      else
+        *sizeTotal += fileOrDirName.GetFileSize();
+    }
+  }
+
+  return NS_OK;
+}
+
+/*---------------------------------------------------------------------------------
+ * GetDirFromPref gets a directory based on a preference set in the 4.x
+ * preferences file, adds a 5 and resets the preference.
+ *
+ * INPUT: 
+ *         oldProfilePath - the path to the old 4.x profile directory.  
+ *                          currently only used by UNIX
+ *
+ *         newProfilePath - the path to the 5.0 profile directory
+ *                          currently only used by UNIX
+ *
+ *         newDirName     - the leaf name of the directory in the 5.0 world that corresponds to
+ *                          this pref.  Examples:  "Mail", "ImapMail", "News".
+ *                          only used on UNIX.
+ *
+ *         pref - the pref in the "dot" format (e.g. mail.directory)
+ *
+ * OUTPUT: newPath - The old path with a 5 added (on mac and windows)
+ *                   the newProfilePath + "/" + newDirName (on UNIX)
+ *         oldPath - The old path from the pref (if any)
+ *
+ *
+ * RETURNS: NS_OK if the pref was successfully pulled from the prefs file
+ *
+ *--------------------------------------------------------------------------------*/
+nsresult
+nsDogbertProfileMigrator::GetDirFromPref(nsIFileSpec * oldProfilePath, nsIFileSpec * newProfilePath, const char *newDirName, const char* pref, nsIFileSpec* newPath, nsIFileSpec* oldPath)
+{
+  nsresult rv;
+  
+  if (!oldProfilePath || !newProfilePath || !newDirName || !pref || !newPath || !oldPath) return NS_ERROR_NULL_POINTER;
+  
+  nsCOMPtr <nsIFileSpec> oldPrefPath;
+  nsXPIDLCString oldPrefPathStr;
+  rv = mPrefs->CopyCharPref(pref,getter_Copies(oldPrefPathStr));
+  if (NS_FAILED(rv)) return rv;
+  
+  // the default on the mac was "".  doing GetFileXPref on that would return
+  // the current working directory, like viewer_debug.  yikes!
+  if (oldPrefPathStr.IsEmpty()) {
+  	rv = NS_ERROR_FAILURE;
+  }
+  if (NS_FAILED(rv)) return rv;
+  
+  nsCOMPtr <nsILocalFile> oldPrefPathFile;
+  rv = mPrefs->GetFileXPref(pref, getter_AddRefs(oldPrefPathFile));
+  if (NS_FAILED(rv)) return rv;
+  
+  // convert nsILocalFile to nsIFileSpec
+  rv = oldPrefPathFile->GetNativePath(oldPrefPathStr);
+  if (NS_FAILED(rv)) return rv;
+
+  rv = NS_NewFileSpec(getter_AddRefs(oldPrefPath));
+  if (NS_FAILED(rv)) return rv;
+  
+  rv = oldPrefPath->SetNativePath(oldPrefPathStr);
+  if (NS_FAILED(rv)) return rv;
+
+  // oldPath will also needs the conversion from nsILocalFile
+  // this is nasty, eventually we'll switch entirely over to nsILocalFile
+  rv = oldPath->SetNativePath(oldPrefPathStr);
+  if (NS_FAILED(rv)) return rv;
+
+  
+#ifdef XP_UNIX
+	// what if they don't want to go to <profile>/<newDirName>?
+	// what if unix users want "mail.directory" + "5" (like "~/ns_imap5")
+	// or "mail.imap.root_dir" + "5" (like "~/nsmail5")?
+	// should we let them?  no.  let's migrate them to
+	// <profile>/Mail and <profile>/ImapMail
+	// let's make all three platforms the same.
+	if (PR_TRUE) {
+#else
+	nsCOMPtr <nsIFileSpec> oldPrefPathParent;
+	rv = oldPrefPath->GetParent(getter_AddRefs(oldPrefPathParent));
+	if (NS_FAILED(rv)) return rv;
+
+	// if the pref pointed to the default directory
+	// treat it as if the pref wasn't set
+	// this way it will get migrated as the user expects
+	PRBool pathsMatch;
+	rv = oldProfilePath->Equals(oldPrefPathParent, &pathsMatch);
+	if (NS_SUCCEEDED(rv) && pathsMatch) {
+#endif /* XP_UNIX */
+		rv = newPath->FromFileSpec(newProfilePath);
+		if (NS_FAILED(rv)) return rv;
+	}
+	else {
+		nsXPIDLCString leafname;
+		rv = newPath->FromFileSpec(oldPath);
+		if (NS_FAILED(rv)) return rv;
+		rv = newPath->GetLeafName(getter_Copies(leafname));
+		if (NS_FAILED(rv)) return rv;
+		nsCString newleafname((const char *)leafname);
+		newleafname += NEW_DIR_SUFFIX;
+		rv = newPath->SetLeafName(newleafname.get());
+		if (NS_FAILED(rv)) return rv;
+	}
+
+  rv = SetPremigratedFilePref(pref, oldPath);
+  if (NS_FAILED(rv)) return rv;
+  
+#ifdef XP_UNIX
+  /* on UNIX, we kept the newsrc files in "news.directory", (which was usually ~)
+   * and the summary files in ~/.netscape/xover-cache
+   * oldPath should point to ~/.netscape/xover-cache, not "news.directory"
+   * but we want to save the old "news.directory" in "premigration.news.directory"
+   * later, again for UNIX only, 
+   * we will copy the .newsrc files (from "news.directory") into the new <profile>/News directory.
+   * isn't this fun?  
+   */
+  if (PL_strcmp(PREF_NEWS_DIRECTORY, pref) == 0) {
+    rv = oldPath->FromFileSpec(oldProfilePath);
+    if (NS_FAILED(rv)) return rv;
+    rv = oldPath->AppendRelativeUnixPath(OLD_NEWS_DIR_NAME);
+    if (NS_FAILED(rv)) return rv;
+  }
+#endif /* XP_UNIX */
+  return rv;
+}
+
+nsresult nsDogbertProfileMigrator::SetPremigratedFilePref(const char *pref_name, nsIFileSpec *path)
+{
+	nsresult rv;
+
+	if (!pref_name) return NS_ERROR_FAILURE;
+
+	// save off the old pref, prefixed with "premigration"
+	// for example, we need the old "mail.directory" pref when
+	// migrating the copies and folder prefs in nsMsgAccountManager.cpp
+	//
+	// note we do this for all platforms.
+	char premigration_pref[MAX_PREF_LEN];
+	PR_snprintf(premigration_pref,MAX_PREF_LEN,"%s%s",PREMIGRATION_PREFIX,pref_name);
+
+  // need to convert nsIFileSpec->nsILocalFile
+  nsFileSpec pathSpec;
+  path->GetFileSpec(&pathSpec);
+  
+  nsCOMPtr<nsILocalFile> pathFile;
+  rv = NS_FileSpecToIFile(&pathSpec, getter_AddRefs(pathFile));
+  if (NS_FAILED(rv)) return rv;
+  
+  PRBool exists = PR_FALSE;
+  pathFile->Exists(&exists);
+  
+  NS_ASSERTION(exists, "the path does not exist.  see bug #55444");
+  if (!exists) return NS_OK;
+  
+	rv = mPrefs->SetFileXPref((const char *)premigration_pref, pathFile);
+	return rv;
+}
+
+nsresult nsDogbertProfileMigrator::ComputeSpaceRequirements(PRInt64 DriveArray[MAX_DRIVES], 
+                                          PRUint32 SpaceReqArray[MAX_DRIVES], 
+                                          PRInt64 Drive, 
+                                          PRUint32 SpaceNeeded)
+{
+  int i=0;
+  PRFloat64 temp;
+
+  while(LL_NE(DriveArray[i],LL_Zero()) && LL_NE(DriveArray[i], Drive) && i < MAX_DRIVES)
+    i++;
+
+  if (LL_EQ(DriveArray[i], LL_Zero()))
+  {
+    DriveArray[i] = Drive;
+    SpaceReqArray[i] += SpaceNeeded;
+  }
+  else if (LL_EQ(DriveArray[i], Drive))
+    SpaceReqArray[i] += SpaceNeeded;
+  else
+    return NS_ERROR_FAILURE;
+  
+  LL_L2F(temp, DriveArray[i]);
+  if (SpaceReqArray[i] > temp)
+    return NS_ERROR_FAILURE;
+  
+  return NS_OK;
+}
+
+static PRBool
+nsCStringEndsWith(nsCString& name, const char *ending)
+{
+  if (!ending) return PR_FALSE;
+
+  PRInt32 len = name.Length();
+  if (len == 0) return PR_FALSE;
+
+  PRInt32 endingLen = PL_strlen(ending);
+  if (len > endingLen && name.RFind(ending, PR_TRUE) == len - endingLen) {
+        return PR_TRUE;
+  }
+  else {
+        return PR_FALSE;
+  }
+}
+
+#ifdef NEED_TO_COPY_AND_RENAME_NEWSRC_FILES
+static PRBool
+nsCStringStartsWith(nsCString& name, const char *starting)
+{
+	if (!starting) return PR_FALSE;
+	PRInt32	len = name.Length();
+	if (len == 0) return PR_FALSE;
+	
+	PRInt32 startingLen = PL_strlen(starting);
+	if (len > startingLen && name.RFind(starting, PR_TRUE) == 0) {
+		return PR_TRUE;
+	}
+	else {
+		return PR_FALSE;
+	}
+}
+#endif
+
+////////////////////////////////////////////////////////////////////////
+// nsPrefConverter
+////////////////////////////////////////////////////////////////////////
+
+/* 
+  these are the prefs we know we need to convert to utf8.
+  we'll also be converting:
+
+  Please make sure that any pref that contains native characters
+  in it's value is not included in this list as we do not want to 
+  convert them into UTF-8 format. Prefs are being get and set in a 
+  unicode format (FileXPref) now and there is no need for 
+  conversion of those prefs. 
+
+ "ldap_2.server.*.description"
+ "intl.font*.fixed_font"
+ "intl.font*.prop_font"
+ "mail.identity.vcard.*"
+ */
+
+static const char *prefsToConvert[] = {
+      "li.server.ldap.userbase",
+      "mail.identity.organization",
+      "mail.identity.username",
+      nsnull
+};
+
+nsPrefConverter::~nsPrefConverter()
+{}
+
+
+nsPrefConverter::nsPrefConverter()
+{}
+
+// Apply a charset conversion from the given charset to UTF-8 for the input C string.
+static nsresult ConvertStringToUTF8(const char* aCharset, const char* inString, char** outString)
+{
+  if (nsnull == outString)
+    return NS_ERROR_NULL_POINTER;
+
+  nsresult rv;
+  // convert result to unicode
+  nsCOMPtr<nsICharsetConverterManager> ccm = do_GetService(kCharsetConverterManagerCID, &rv);
+
+  if(NS_SUCCEEDED(rv)) {
+    nsCOMPtr <nsIUnicodeDecoder> decoder; // this may be cached
+
+    rv = ccm->GetUnicodeDecoderRaw(aCharset, getter_AddRefs(decoder));
+    if(NS_SUCCEEDED(rv) && decoder) {
+      PRInt32 uniLength = 0;
+      PRInt32 srcLength = strlen(inString);
+      rv = decoder->GetMaxLength(inString, srcLength, &uniLength);
+      if (NS_SUCCEEDED(rv)) {
+        PRUnichar *unichars = new PRUnichar [uniLength];
+
+        if (nsnull != unichars) {
+          // convert to unicode
+          rv = decoder->Convert(inString, &srcLength, unichars, &uniLength);
+          if (NS_SUCCEEDED(rv)) {
+            nsAutoString aString;
+            aString.Assign(unichars, uniLength);
+            // convert to UTF-8
+            *outString = ToNewUTF8String(aString);
+          }
+          delete [] unichars;
+        }
+        else {
+          rv = NS_ERROR_OUT_OF_MEMORY;
+        }
+      }
+    }    
+  }
+
+  return rv;
+}
+
+nsresult ConvertPrefToUTF8(const char *prefname, nsIPref *prefs, const char* charSet)
+{
+  nsresult rv;
+
+  if (!prefname || !prefs) return NS_ERROR_FAILURE;  
+  nsXPIDLCString prefval;
+
+  rv = prefs->CopyCharPref(prefname, getter_Copies(prefval));
+  if (NS_FAILED(rv)) return rv;
+
+  if (prefval.IsEmpty()) 
+    return NS_OK;
+
+  nsXPIDLCString outval;
+  rv = ConvertStringToUTF8(charSet, (const char *)prefval, getter_Copies(outval));
+  // only set the pref if the conversion worked, and it convert to something non null
+  if (NS_SUCCEEDED(rv) && (const char *)outval && PL_strlen((const char *)outval)) 
+    rv = prefs->SetCharPref(prefname, (const char *)outval);
+  return NS_OK;
+}
+
+static PRBool charEndsWith(const char *str, const char *endStr)
+{
+  PRUint32 endStrLen = PL_strlen(endStr);
+  PRUint32 strLen = PL_strlen(str);
+    
+  if (strLen < endStrLen) return PR_FALSE;
+
+  PRUint32 pos = strLen - endStrLen;
+  if (PL_strncmp(str + pos, endStr, endStrLen) == 0)
+    return PR_TRUE;
+  else 
+    return PR_FALSE;
+}
+
+static void fontPrefEnumerationFunction(const char *name, void *data)
+{
+  nsCStringArray *arr;
+  arr = (nsCStringArray *)data;
+  if (charEndsWith(name,".fixed_font") || charEndsWith(name,".prop_font")) {
+    nsCString str(name);
+    arr->AppendCString(str);
+  }
+}
+
+static void ldapPrefEnumerationFunction(const char *name, void *data)
+{
+  nsCStringArray *arr;
+  arr = (nsCStringArray *)data;
+  // we only want to convert "ldap_2.servers.*.description"
+  if (charEndsWith(name,".description")) {
+    nsCString str(name);
+    arr->AppendCString(str);
+  }
+}
+
+static void vCardPrefEnumerationFunction(const char *name, void *data)
+{
+  nsCStringArray *arr;
+  arr = (nsCStringArray *)data;
+
+  // the 4.x vCard prefs might need converting
+  nsCString str(name);
+  arr->AppendCString(str);
+}
+
+
+typedef struct {
+    nsIPref *prefs;
+    const char* charSet;
+} PrefEnumerationClosure;
+
+PRBool convertPref(nsCString &aElement, void *aData)
+{
+  PrefEnumerationClosure *closure;
+  closure = (PrefEnumerationClosure *)aData;
+
+  ConvertPrefToUTF8(aElement.get(), closure->prefs, closure->charSet);
+  return PR_TRUE;
+}
+
+nsresult nsPrefConverter::ConvertPrefsToUTF8()
+{
+  nsresult rv;
+
+  nsCStringArray prefsToMigrate;
+  nsCOMPtr<nsIPref> prefs(do_GetService(kPrefServiceCID, &rv));
+
+  if(NS_FAILED(rv)) return rv;
+  if (!prefs) return NS_ERROR_FAILURE;
+
+  nsCAutoString charSet;
+  rv = GetPlatformCharset(charSet);
+  
+  if (NS_FAILED(rv)) return rv;
+
+  for (PRUint32 i = 0; prefsToConvert[i]; i++) {
+    nsCString prefnameStr( prefsToConvert[i] );
+    prefsToMigrate.AppendCString(prefnameStr);
+  }
+
+  prefs->EnumerateChildren("intl.font",fontPrefEnumerationFunction,(void *)(&prefsToMigrate));
+  prefs->EnumerateChildren("ldap_2.servers",ldapPrefEnumerationFunction,(void *)(&prefsToMigrate));
+  prefs->EnumerateChildren("mail.identity.vcard",vCardPrefEnumerationFunction,(void *)(&prefsToMigrate));
+
+  PrefEnumerationClosure closure;
+
+  closure.prefs = prefs;
+  closure.charSet = charSet.get();
+
+  prefsToMigrate.EnumerateForwards((nsCStringArrayEnumFunc)convertPref, (void *)(&closure));
+
+  rv = prefs->SetBoolPref("prefs.converted-to-utf8",PR_TRUE);
+  return NS_OK;
+}
+
+// A wrapper function to call the interface to get a platform file charset.
+nsresult 
+nsPrefConverter::GetPlatformCharset(nsCString& aCharset)
+{
+  nsresult rv;
+
+  // we may cache it since the platform charset will not change through application life
+  nsCOMPtr <nsIPlatformCharset> platformCharset = do_GetService(NS_PLATFORMCHARSET_CONTRACTID, &rv);
+  if (NS_SUCCEEDED(rv) && platformCharset)
+   rv = platformCharset->GetCharset(kPlatformCharsetSel_4xPrefsJS, aCharset);
+  if (NS_FAILED(rv))
+   aCharset.Assign(NS_LITERAL_CSTRING("ISO-8859-1"));  // use ISO-8859-1 in case of any error
+ 
+  return rv;
+}
diff --git a/mozilla/mail/components/migration/src/nsDogbertProfileMigrator.h b/mozilla/mail/components/migration/src/nsDogbertProfileMigrator.h
new file mode 100644
index 00000000000..5b40f64faaf
--- /dev/null
+++ b/mozilla/mail/components/migration/src/nsDogbertProfileMigrator.h
@@ -0,0 +1,182 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is The Communicator 4.x Mail Migrator Code
+ *
+ * The Initial Developer of the Original Code is Scott MacGregor.
+ * Portions created by the Initial Developer are Copyright (C) 2004
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *  Scott MacGregor <mscott@mozilla.org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef dogbertprofilemigrator___h___
+#define dogbertprofilemigrator___h___
+
+#include "nsIMailProfileMigrator.h"
+#include "nsILocalFile.h"
+#include "nsIObserverService.h"
+#include "nsISupportsArray.h"
+#include "nsNetscapeProfileMigratorBase.h"
+#include "nsString.h"
+#include "nsITimer.h"
+
+#include "nsIPref.h"
+
+class nsIFile;
+class nsIPrefBranch;
+class nsIPrefService;
+class nsIFileSpec;
+class nsFileSpec;
+
+// ripped off from nsPrefMigration, warts and all
+
+#define MIGRATION_SUCCESS    0
+#define MIGRATION_RETRY      1
+#define MIGRATION_CANCEL     2
+#define MIGRATION_CREATE_NEW 3
+
+#define MAX_DRIVES 4
+
+//Interfaces Needed
+
+#if defined(XP_MAC) || defined(XP_MACOSX)
+#define IMAP_MAIL_FILTER_FILE_NAME_FORMAT_IN_4x "%s Rules" 
+#endif
+
+#if defined(XP_UNIX) && !defined(XP_MACOSX)
+#define NEED_TO_COPY_AND_RENAME_NEWSRC_FILES
+#endif
+
+class nsPrefConverter
+{
+public:
+  nsPrefConverter();
+  virtual ~nsPrefConverter();
+  nsresult ConvertPrefsToUTF8();
+  nsresult GetPlatformCharset(nsCString& aCharset);
+};
+
+class nsDogbertProfileMigrator :   public nsNetscapeProfileMigratorBase, 
+                                   public nsIMailProfileMigrator,
+                                   public nsITimerCallback
+{
+public:
+  NS_DECL_NSIMAILPROFILEMIGRATOR
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSITIMERCALLBACK
+
+  nsDogbertProfileMigrator();
+  virtual ~nsDogbertProfileMigrator();
+
+protected:
+  void GetSourceProfile(const PRUnichar* aProfile);
+
+  nsresult CopyPreferences();
+
+private:
+  nsCOMPtr<nsISupportsArray> mProfiles;
+  nsCOMPtr<nsISupportsArray> mProfileLocations;
+  nsCOMPtr<nsIObserverService> mObserverService;
+  nsCOMPtr<nsITimer> mFileIOTimer;
+
+  PRInt64 mMaxProgress;
+  PRInt64 mCurrentProgress;
+  
+  nsCOMPtr<nsIPref> mPrefs;
+  nsCOMPtr<nsILocalFile> m_prefsFile;
+protected:
+  nsresult ProcessPrefsCallback(const char* oldProfilePathStr, const char * newProfilePathStr);
+  nsresult ConvertPersistentStringToFileSpec(const char *str, nsIFileSpec *path);
+  nsresult CreateNewUser5Tree(nsIFileSpec* oldProfilePath, 
+                              nsIFileSpec* newProfilePath);
+
+  nsresult GetDirFromPref(nsIFileSpec* oldProfilePath,
+                          nsIFileSpec* newProfilePath, 
+                          const char* newDirName,
+                          const char* pref, 
+                          nsIFileSpec* newPath, 
+                          nsIFileSpec* oldPath);
+
+  nsresult GetSizes(nsFileSpec inputPath,
+                    PRBool readSubdirs,
+                    PRUint32* sizeTotal);
+
+  nsresult ComputeSpaceRequirements(PRInt64 DriveArray[], 
+                                    PRUint32 SpaceReqArray[], 
+                                    PRInt64 Drive, 
+                                    PRUint32 SpaceNeeded);
+
+  nsresult DoTheCopy(nsIFileSpec *oldPath, 
+                     nsIFileSpec *newPath,
+                     PRBool readSubdirs); 
+  nsresult DoTheCopy(nsIFileSpec *oldPath,
+                     nsIFileSpec *newPath,
+                     const char *fileOrDirName,
+                     PRBool isDirectory = PR_FALSE);
+
+  nsresult DoTheCopyAndRename(nsIFileSpec *oldPath, 
+                          nsIFileSpec *newPath,
+                          PRBool readSubdirs,
+                          PRBool needToRenameFiles,
+                          const char *oldName,
+                          const char *newName); 
+  nsresult DoTheCopyAndRename(nsIFileSpec *aPath, 
+                          PRBool aReadSubdirs,
+                          const char *aOldName,
+                          const char *aNewName);
+  nsresult CopyFilesByPattern(nsIFileSpec * oldPathSpec,
+                          nsIFileSpec * newPathSpec,
+                          const char *pattern);
+
+  nsresult AddFileCopyToList(nsFileSpec * aOldPath, nsFileSpec * aNewPath, const char * newFileName);
+  void CopyNextFolder();
+  void EndCopyFolders();
+
+#ifdef NEED_TO_COPY_AND_RENAME_NEWSRC_FILES
+  nsresult CopyAndRenameNewsrcFiles(nsIFileSpec *newPath);
+#endif /* NEED_TO_COPY_AND_RENAME_NEWSRC_FILES */
+
+  nsresult DoSpecialUpdates(nsIFileSpec * profilePath);
+  nsresult Rename4xFileAfterMigration(nsIFileSpec *profilePath, const char *oldFileName, const char *newFileName);
+#ifdef IMAP_MAIL_FILTER_FILE_NAME_FORMAT_IN_4x
+  nsresult RenameAndMove4xImapFilterFile(nsIFileSpec *profilePath, const char *hostname);
+  nsresult RenameAndMove4xImapFilterFiles(nsIFileSpec *profilePath);
+#endif /* IMAP_MAIL_FILTER_FILE_NAME_FORMAT_IN_4x */
+  nsresult RenameAndMove4xPopStateFile(nsIFileSpec *profilePath);
+  nsresult RenameAndMove4xPopFilterFile(nsIFileSpec *profilePath);
+  nsresult RenameAndMove4xPopFile(nsIFileSpec * profilePath, const char *fileNameIn4x, const char *fileNameIn5x);
+  
+  nsresult DetermineOldPath(nsIFileSpec *profilePath, const char *oldPathName, const char *oldPathEntityName, nsIFileSpec *oldPath);
+  nsresult SetPremigratedFilePref(const char *pref_name, nsIFileSpec *filePath);
+#ifdef NEED_TO_COPY_AND_RENAME_NEWSRC_FILES
+  nsresult GetPremigratedFilePref(const char *pref_name, nsIFileSpec **filePath);
+#endif /* NEED_TO_COPY_AND_RENAME_NEWSRC_FILES */
+};
+
+#endif
diff --git a/mozilla/mail/components/migration/src/nsEudoraProfileMigrator.cpp b/mozilla/mail/components/migration/src/nsEudoraProfileMigrator.cpp
new file mode 100644
index 00000000000..98d53c18703
--- /dev/null
+++ b/mozilla/mail/components/migration/src/nsEudoraProfileMigrator.cpp
@@ -0,0 +1,177 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is The Mail Profile Migrator.
+ *
+ * The Initial Developer of the Original Code is Scott MacGregor.
+ * Portions created by the Initial Developer are Copyright (C) 2004
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *  Scott MacGregor <mscott@mozilla.org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "nsMailProfileMigratorUtils.h"
+#include "nsCRT.h"
+#include "nsDirectoryServiceDefs.h"
+#include "nsIObserverService.h"
+#include "nsIPrefLocalizedString.h"
+#include "nsIPrefService.h"
+#include "nsIServiceManager.h"
+#include "nsISupportsArray.h"
+#include "nsISupportsPrimitives.h"
+#include "nsNetCID.h"
+#include "nsNetUtil.h"
+#include "nsEudoraProfileMigrator.h"
+#include "nsIProfileMigrator.h"
+#include "nsVoidArray.h"
+
+#include "nsIImportSettings.h"
+#include "nsIFileSpec.h" // needed for an obsolete API
+
+
+NS_IMPL_ISUPPORTS2(nsEudoraProfileMigrator, nsIMailProfileMigrator, nsITimerCallback)
+
+
+nsEudoraProfileMigrator::nsEudoraProfileMigrator()
+{
+  mProcessingMailFolders = PR_FALSE;
+  // get the import service
+  mImportModule = do_CreateInstance("@mozilla.org/import/import-eudora;1");
+}
+
+nsEudoraProfileMigrator::~nsEudoraProfileMigrator()
+{           
+}
+
+nsresult nsEudoraProfileMigrator::ContinueImport()
+{
+  return Notify(nsnull);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// nsITimerCallback
+
+NS_IMETHODIMP
+nsEudoraProfileMigrator::Notify(nsITimer *timer)
+{
+  PRInt32 progress;
+  mGenericImporter->GetProgress(&progress);
+  
+  nsAutoString index;
+  index.AppendInt( progress ); 
+  NOTIFY_OBSERVERS(MIGRATION_PROGRESS, index.get());
+ 
+  if (progress == 100) // are we done yet?
+  {
+    if (mProcessingMailFolders)
+      return FinishCopyingMailFolders();
+    else
+      return FinishCopyingAddressBookData();
+  }
+  else
+  {
+    // fire a timer to handle the next one. 
+    mFileIOTimer = do_CreateInstance("@mozilla.org/timer;1");
+    // if the progress = 100% let's pause for a second or two with a finished progessmeter before we move on
+    mFileIOTimer->InitWithCallback(NS_STATIC_CAST(nsITimerCallback *, this), 100, nsITimer::TYPE_ONE_SHOT);
+  }
+  return NS_OK;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// nsIMailProfileMigrator
+
+NS_IMETHODIMP
+nsEudoraProfileMigrator::Migrate(PRUint16 aItems, nsIProfileStartup* aStartup, const PRUnichar* aProfile)
+{
+  nsresult rv = NS_OK;
+
+  PRBool aReplace = PR_FALSE;
+
+  if (aStartup) 
+  {
+    aReplace = PR_TRUE;
+    rv = aStartup->DoStartup();
+    NS_ENSURE_SUCCESS(rv, rv);
+  }
+
+  NOTIFY_OBSERVERS(MIGRATION_STARTED, nsnull);
+  rv = ImportSettings(mImportModule);
+
+  // now import address books
+  // this routine will asynchronously import address book data and it will then kick off
+  // the final migration step, copying the mail folders over.
+  rv = ImportAddressBook(mImportModule);  
+
+  // don't broadcast an on end migration here. We aren't done until our asynch import process says we are done.
+  return rv;
+}
+
+NS_IMETHODIMP
+nsEudoraProfileMigrator::GetMigrateData(const PRUnichar* aProfile, 
+                                           PRBool aReplace, 
+                                           PRUint16* aResult)
+{
+  // There's no harm in assuming everything is available.
+  *aResult = nsIMailProfileMigrator::ACCOUNT_SETTINGS | nsIMailProfileMigrator::ADDRESSBOOK_DATA | 
+             nsIMailProfileMigrator::MAILDATA;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsEudoraProfileMigrator::GetSourceExists(PRBool* aResult)
+{
+  *aResult = PR_FALSE;
+  
+  nsCOMPtr<nsIImportSettings> importSettings;
+  mImportModule->GetImportInterface(NS_IMPORT_SETTINGS_STR, getter_AddRefs(importSettings));
+
+  if (importSettings)
+  {
+    nsXPIDLString description;
+    nsCOMPtr<nsIFileSpec> location;
+    importSettings->AutoLocate(getter_Copies(description), getter_AddRefs(location), aResult);
+  }
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsEudoraProfileMigrator::GetSourceHasMultipleProfiles(PRBool* aResult)
+{
+  *aResult = PR_FALSE;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsEudoraProfileMigrator::GetSourceProfiles(nsISupportsArray** aResult)
+{
+  *aResult = nsnull;
+  return NS_OK;
+}
+
diff --git a/mozilla/mail/components/migration/src/nsEudoraProfileMigrator.h b/mozilla/mail/components/migration/src/nsEudoraProfileMigrator.h
new file mode 100644
index 00000000000..a0e16f80a0e
--- /dev/null
+++ b/mozilla/mail/components/migration/src/nsEudoraProfileMigrator.h
@@ -0,0 +1,74 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is The Outlook Express Migrator.
+ *
+ * The Initial Developer of the Original Code is Scott MacGregor.
+ * Portions created by the Initial Developer are Copyright (C) 2004
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *  Scott MacGregor <mscott@mozilla.org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef eudoraprofilemigrator___h___
+#define eudoraprofilemigrator___h___
+
+#include "nsIMailProfileMigrator.h"
+#include "nsILocalFile.h"
+#include "nsIObserverService.h"
+#include "nsISupportsArray.h"
+#include "nsString.h"
+#include "nsITimer.h"
+#include "nsIImportGeneric.h"
+#include "nsIImportModule.h"
+#include "nsIMsgAccount.h"
+#include "nsProfileMigratorBase.h"
+
+class nsIFile;
+class nsIPrefBranch;
+class nsIPrefService;
+class nsVoidArray;
+
+class nsEudoraProfileMigrator : public nsIMailProfileMigrator,
+                            public nsITimerCallback,
+                            public nsProfileMigratorBase
+{
+public:
+  NS_DECL_NSIMAILPROFILEMIGRATOR
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSITIMERCALLBACK
+
+  nsEudoraProfileMigrator();
+  virtual ~nsEudoraProfileMigrator();
+
+  virtual nsresult ContinueImport();
+
+private:
+};
+ 
+#endif
diff --git a/mozilla/mail/components/migration/src/nsMailMigrationCID.h b/mozilla/mail/components/migration/src/nsMailMigrationCID.h
new file mode 100644
index 00000000000..4395aa4adff
--- /dev/null
+++ b/mozilla/mail/components/migration/src/nsMailMigrationCID.h
@@ -0,0 +1,16 @@
+#define NS_MAILPROFILEMIGRATOR_CONTRACTID_PREFIX "@mozilla.org/profile/migrator;1?app=mail&type="
+
+#define NS_SEAMONKEYPROFILEMIGRATOR_CID \
+{ 0x62c6e1f9, 0x3dc3, 0x4b68, { 0x9c, 0x39, 0xad, 0x2f, 0x6d, 0x47, 0x1a, 0xc0 } }
+
+#define NS_OEXPRESSPROFILEMIGRATOR_CID \
+{ 0xbc1db696, 0x7065, 0x46ad, { 0x87, 0x8f, 0xfd, 0x77, 0x41, 0x4e, 0x69, 0xef } }
+
+#define NS_OUTLOOKPROFILEMIGRATOR_CID \
+{ 0x910b6453, 0x719, 0x41e8, { 0xa4, 0xc9, 0x3, 0x19, 0xbb, 0x34, 0xc8, 0xff } }
+
+#define NS_DOGBERTPROFILEMIGRATOR_CID \
+{ 0x765d7884, 0x3644, 0x43bd, { 0xba, 0x86, 0x9b, 0x2c, 0x50, 0xa2, 0x2a, 0x56 } }
+
+#define NS_EUDORAPROFILEMIGRATOR_CID \
+{ 0x91622bdc, 0x3c73, 0x4474, { 0x85, 0x4, 0xac, 0xda, 0x4f, 0x1e, 0xd0, 0x68 } }
diff --git a/mozilla/mail/components/migration/src/nsMailProfileMigratorUtils.cpp b/mozilla/mail/components/migration/src/nsMailProfileMigratorUtils.cpp
new file mode 100644
index 00000000000..6dde29f7d10
--- /dev/null
+++ b/mozilla/mail/components/migration/src/nsMailProfileMigratorUtils.cpp
@@ -0,0 +1,127 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is The Browser Profile Migrator.
+ *
+ * The Initial Developer of the Original Code is Ben Goodger.
+ * Portions created by the Initial Developer are Copyright (C) 2004
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *  Ben Goodger <ben@bengoodger.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "nsMailProfileMigratorUtils.h"
+#include "nsIFile.h"
+#include "nsIProperties.h"
+#include "nsIProfileMigrator.h"
+
+#include "nsIServiceManagerUtils.h"
+#include "nsAppDirectoryServiceDefs.h"
+#include "nsXPCOMCID.h"
+#include "nsCRT.h"
+
+void SetProxyPref(const nsACString& aHostPort, const char* aPref, 
+                  const char* aPortPref, nsIPrefBranch* aPrefs) 
+{
+  nsCAutoString hostPort(aHostPort);  
+  PRInt32 portDelimOffset = hostPort.RFindChar(':');
+  if (portDelimOffset > 0) {
+    nsCAutoString host(Substring(hostPort, 0, portDelimOffset));
+    nsCAutoString port(Substring(hostPort, portDelimOffset + 1, 
+                                 hostPort.Length() - (portDelimOffset + 1)));
+    
+    aPrefs->SetCharPref(aPref, host.get());
+    PRInt32 stringErr;
+    PRInt32 portValue = port.ToInteger(&stringErr);
+    aPrefs->SetIntPref(aPortPref, portValue);
+  }
+  else
+    aPrefs->SetCharPref(aPref, hostPort.get());
+}
+
+void ParseOverrideServers(const char* aServers, nsIPrefBranch* aBranch)
+{
+  // Windows (and Opera) formats its proxy override list in the form:
+  // server;server;server where server is a server name or ip address, 
+  // or "<local>". Mozilla's format is server,server,server, and <local>
+  // must be translated to "localhost,127.0.0.1"
+  nsCAutoString override(aServers);
+  PRInt32 left = 0, right = 0;
+  for (;;) {
+    right = override.FindChar(';', right);
+    const nsACString& host = Substring(override, left, 
+                                       (right < 0 ? override.Length() : right) - left);
+    if (host.Equals("<local>"))
+      override.Replace(left, 7, NS_LITERAL_CSTRING("localhost,127.0.0.1"));
+    if (right < 0)
+      break;
+    left = right + 1;
+    override.Replace(right, 1, NS_LITERAL_CSTRING(","));
+  }
+  aBranch->SetCharPref("network.proxy.no_proxies_on", override.get());
+}
+
+void GetMigrateDataFromArray(MigrationData* aDataArray, PRInt32 aDataArrayLength, 
+                             PRBool aReplace, nsIFile* aSourceProfile, 
+                             PRUint16* aResult)
+{
+  nsCOMPtr<nsIFile> sourceFile; 
+  PRBool exists;
+  MigrationData* cursor;
+  MigrationData* end = aDataArray + aDataArrayLength;
+  for (cursor = aDataArray; cursor < end && cursor->fileName; ++cursor) {
+    // When in replace mode, all items can be imported. 
+    // When in non-replace mode, only items that do not require file replacement
+    // can be imported.
+    if (aReplace || !cursor->replaceOnly) {
+      aSourceProfile->Clone(getter_AddRefs(sourceFile));
+      sourceFile->Append(nsDependentString(cursor->fileName));
+      sourceFile->Exists(&exists);
+      if (exists)
+        *aResult |= cursor->sourceFlag;
+    }
+    nsCRT::free(cursor->fileName);
+    cursor->fileName = nsnull;
+  }
+}
+
+void
+GetProfilePath(nsIProfileStartup* aStartup, nsCOMPtr<nsIFile>& aProfileDir)
+{
+  if (aStartup) {
+    aStartup->GetDirectory(getter_AddRefs(aProfileDir));
+  }
+  else {
+    nsCOMPtr<nsIProperties> dirSvc
+      (do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID));
+    if (dirSvc) {
+      dirSvc->Get(NS_APP_USER_PROFILE_50_DIR, NS_GET_IID(nsIFile),
+                  (void**) getter_AddRefs(aProfileDir));
+    }
+  }
+}
diff --git a/mozilla/mail/components/migration/src/nsMailProfileMigratorUtils.h b/mozilla/mail/components/migration/src/nsMailProfileMigratorUtils.h
new file mode 100644
index 00000000000..663b027dae8
--- /dev/null
+++ b/mozilla/mail/components/migration/src/nsMailProfileMigratorUtils.h
@@ -0,0 +1,88 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is The Browser Profile Migrator.
+ *
+ * The Initial Developer of the Original Code is Ben Goodger.
+ * Portions created by the Initial Developer are Copyright (C) 2004
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *  Ben Goodger <ben@bengoodger.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef mailprofilemigratorutils___h___
+#define mailprofilemigratorutils___h___
+
+#define MIGRATION_ITEMBEFOREMIGRATE "Migration:ItemBeforeMigrate"
+#define MIGRATION_ITEMAFTERMIGRATE  "Migration:ItemAfterMigrate"
+#define MIGRATION_STARTED           "Migration:Started"
+#define MIGRATION_ENDED             "Migration:Ended"
+#define MIGRATION_PROGRESS          "Migration:Progress"
+
+#define NOTIFY_OBSERVERS(message, item) \
+  mObserverService->NotifyObservers(nsnull, message, item)
+
+#define COPY_DATA(func, replace, itemIndex) \
+  if (NS_SUCCEEDED(rv) && (aItems & itemIndex || !aItems)) { \
+    nsAutoString index; \
+    index.AppendInt(itemIndex); \
+    NOTIFY_OBSERVERS(MIGRATION_ITEMBEFOREMIGRATE, index.get()); \
+    rv = func(replace); \
+    NOTIFY_OBSERVERS(MIGRATION_ITEMAFTERMIGRATE, index.get()); \
+  }
+
+#include "nsIPrefBranch.h"
+#include "nsIFile.h"
+#include "nsString.h"
+class nsIProfileStartup;
+
+// Proxy utilities shared by the Opera and IE migrators
+void ParseOverrideServers(const char* aServers, nsIPrefBranch* aBranch);
+void SetProxyPref(const nsACString& aHostPort, const char* aPref, 
+                  const char* aPortPref, nsIPrefBranch* aPrefs);
+
+struct MigrationData { 
+  PRUnichar* fileName; 
+  PRUint32 sourceFlag;
+  PRBool replaceOnly;
+};
+
+class nsILocalFile;
+void GetMigrateDataFromArray(MigrationData* aDataArray, 
+                             PRInt32 aDataArrayLength,
+                             PRBool aReplace,
+                             nsIFile* aSourceProfile, 
+                             PRUint16* aResult);
+
+
+// get the base directory of the *target* profile
+// this is already cloned, modify it to your heart's content
+void GetProfilePath(nsIProfileStartup* aStartup, nsCOMPtr<nsIFile>& aProfileDir);
+
+#endif
+
diff --git a/mozilla/mail/components/migration/src/nsNetscapeProfileMigratorBase.cpp b/mozilla/mail/components/migration/src/nsNetscapeProfileMigratorBase.cpp
new file mode 100644
index 00000000000..4fed3a059db
--- /dev/null
+++ b/mozilla/mail/components/migration/src/nsNetscapeProfileMigratorBase.cpp
@@ -0,0 +1,407 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is The Browser Profile Migrator.
+ *
+ * The Initial Developer of the Original Code is Ben Goodger.
+ * Portions created by the Initial Developer are Copyright (C) 2004
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *  Ben Goodger <ben@bengoodger.com>
+ *  Scott MacGregor <mscott@mozilla.org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "nsAppDirectoryServiceDefs.h"
+#include "nsCRT.h"
+#include "nsIFile.h"
+#include "nsIInputStream.h"
+#include "nsILineInputStream.h"
+#include "nsInt64.h"
+#include "nsIPrefBranch.h"
+#include "nsIPrefLocalizedString.h"
+#include "nsIPrefService.h"
+#include "nsIRDFService.h"
+#include "nsIRegistry.h"
+#include "nsIServiceManager.h"
+#include "nsISupportsArray.h"
+#include "nsISupportsPrimitives.h"
+#include "nsIURL.h"
+#include "nsNetscapeProfileMigratorBase.h"
+#include "nsNetUtil.h"
+#include "nsReadableUtils.h"
+#include "nsXPIDLString.h"
+#include "prtime.h"
+#include "prprf.h"
+#include "nsVoidArray.h"
+
+static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID);
+
+#define MIGRATION_BUNDLE "chrome://messenger/locale/migration/migration.properties"
+
+#define FILE_NAME_PREFS_5X NS_LITERAL_STRING("prefs.js")
+
+///////////////////////////////////////////////////////////////////////////////
+// nsNetscapeProfileMigratorBase
+nsNetscapeProfileMigratorBase::nsNetscapeProfileMigratorBase()
+{
+  nsCOMPtr<nsIStringBundleService> bundleService(do_GetService(kStringBundleServiceCID));
+  bundleService->CreateBundle(MIGRATION_BUNDLE, getter_AddRefs(mBundle));
+
+  // create the array we'll be using to keep track of the asynchronous file copy routines
+  mFileCopyTransactions = new nsVoidArray();
+  mFileCopyTransactionIndex = 0;
+}
+
+nsresult
+nsNetscapeProfileMigratorBase::GetProfileDataFromRegistry(nsILocalFile* aRegistryFile,
+                                                          nsISupportsArray* aProfileNames,
+                                                          nsISupportsArray* aProfileLocations)
+{
+  nsresult rv = NS_OK;
+
+  // Open It
+  nsCOMPtr<nsIRegistry> reg(do_CreateInstance("@mozilla.org/registry;1"));
+  reg->Open(aRegistryFile);
+
+  nsRegistryKey profilesTree;
+  rv = reg->GetKey(nsIRegistry::Common, NS_LITERAL_STRING("Profiles").get(), &profilesTree);
+  if (NS_FAILED(rv)) return rv;
+
+  nsCOMPtr<nsIEnumerator> keys;
+  reg->EnumerateSubtrees(profilesTree, getter_AddRefs(keys));
+
+  keys->First();
+  while (keys->IsDone() != NS_OK) {
+    nsCOMPtr<nsISupports> key;
+    keys->CurrentItem(getter_AddRefs(key));
+
+    nsCOMPtr<nsIRegistryNode> node(do_QueryInterface(key));
+
+    nsRegistryKey profile;
+    node->GetKey(&profile);
+
+    // "migrated" is "yes" for all valid Seamonkey profiles. It is only "no"
+    // for 4.x profiles. 
+    nsXPIDLString isMigrated;
+    reg->GetString(profile, NS_LITERAL_STRING("migrated").get(), getter_Copies(isMigrated));
+
+    if (isMigrated.Equals(NS_LITERAL_STRING("no"))) {
+      keys->Next();
+      continue;
+    }
+
+    // Get the profile name and add it to the names array
+    nsXPIDLString profileName;
+    node->GetName(getter_Copies(profileName));
+
+    // Get the profile location and add it to the locations array
+    nsXPIDLString directory;
+    reg->GetString(profile, NS_LITERAL_STRING("directory").get(), getter_Copies(directory));
+
+    nsCOMPtr<nsILocalFile> dir;
+#ifdef XP_MACOSX
+    rv = NS_NewNativeLocalFile(nsCString(), PR_TRUE, getter_AddRefs(dir));
+    if (NS_FAILED(rv)) return rv;
+    dir->SetPersistentDescriptor(NS_LossyConvertUCS2toASCII(directory));
+#else
+    rv = NS_NewLocalFile(directory, PR_TRUE, getter_AddRefs(dir));
+    if (NS_FAILED(rv)) return rv;
+#endif
+
+    PRBool exists;
+    dir->Exists(&exists);
+
+    if (exists) {
+      nsCOMPtr<nsISupportsString> profileNameString(do_CreateInstance("@mozilla.org/supports-string;1"));
+      profileNameString->SetData(profileName);
+      aProfileNames->AppendElement(profileNameString);
+
+      aProfileLocations->AppendElement(dir);
+    }
+
+    keys->Next();
+  }
+  return rv;
+}
+
+#define GETPREF(xform, method, value) \
+  nsresult rv = aBranch->method(xform->sourcePrefName, value); \
+  if (NS_SUCCEEDED(rv)) \
+    xform->prefHasValue = PR_TRUE; \
+  return rv;
+
+#define SETPREF(xform, method, value) \
+  if (xform->prefHasValue) { \
+    return aBranch->method(xform->targetPrefName ? xform->targetPrefName : xform->sourcePrefName, value); \
+  } \
+  return NS_OK;
+
+nsresult 
+nsNetscapeProfileMigratorBase::GetString(void* aTransform, nsIPrefBranch* aBranch)
+{
+  PrefTransform* xform = (PrefTransform*)aTransform;
+  GETPREF(xform, GetCharPref, &xform->stringValue);
+}
+
+nsresult 
+nsNetscapeProfileMigratorBase::SetString(void* aTransform, nsIPrefBranch* aBranch)
+{
+  PrefTransform* xform = (PrefTransform*)aTransform;
+  SETPREF(xform, SetCharPref, xform->stringValue);
+}
+
+nsresult
+nsNetscapeProfileMigratorBase::GetWString(void* aTransform, nsIPrefBranch* aBranch)
+{
+  PrefTransform* xform = (PrefTransform*)aTransform;
+  nsCOMPtr<nsIPrefLocalizedString> prefValue;
+  nsresult rv = aBranch->GetComplexValue(xform->sourcePrefName, 
+                                         NS_GET_IID(nsIPrefLocalizedString),
+                                         getter_AddRefs(prefValue));
+
+  if (NS_SUCCEEDED(rv) && prefValue) {
+    nsXPIDLString data;
+    prefValue->ToString(getter_Copies(data));
+
+    xform->stringValue = ToNewCString(NS_ConvertUCS2toUTF8(data));
+    xform->prefHasValue = PR_TRUE;
+  }
+  return rv;
+}
+
+nsresult 
+nsNetscapeProfileMigratorBase::SetWStringFromASCII(void* aTransform, nsIPrefBranch* aBranch)
+{
+  PrefTransform* xform = (PrefTransform*)aTransform;
+  if (xform->prefHasValue) {
+    nsCOMPtr<nsIPrefLocalizedString> pls(do_CreateInstance("@mozilla.org/pref-localizedstring;1"));
+    nsAutoString data; data.AssignWithConversion(xform->stringValue);
+    pls->SetData(data.get());
+    return aBranch->SetComplexValue(xform->targetPrefName ? xform->targetPrefName : xform->sourcePrefName, NS_GET_IID(nsIPrefLocalizedString), pls);
+  }
+  return NS_OK;
+}
+
+nsresult
+nsNetscapeProfileMigratorBase::SetWString(void* aTransform, nsIPrefBranch* aBranch)
+{
+  PrefTransform* xform = (PrefTransform*)aTransform;
+  if (xform->prefHasValue) {
+    nsCOMPtr<nsIPrefLocalizedString> pls(do_CreateInstance("@mozilla.org/pref-localizedstring;1"));
+    nsAutoString data = NS_ConvertUTF8toUCS2(xform->stringValue);
+    pls->SetData(data.get());
+    return aBranch->SetComplexValue(xform->targetPrefName ? xform->targetPrefName : xform->sourcePrefName, NS_GET_IID(nsIPrefLocalizedString), pls);
+  }
+  return NS_OK;
+}
+
+
+nsresult 
+nsNetscapeProfileMigratorBase::GetBool(void* aTransform, nsIPrefBranch* aBranch)
+{
+  PrefTransform* xform = (PrefTransform*)aTransform;
+  GETPREF(xform, GetBoolPref, &xform->boolValue);
+}
+
+nsresult 
+nsNetscapeProfileMigratorBase::SetBool(void* aTransform, nsIPrefBranch* aBranch)
+{
+  PrefTransform* xform = (PrefTransform*)aTransform;
+  SETPREF(xform, SetBoolPref, xform->boolValue);
+}
+
+nsresult 
+nsNetscapeProfileMigratorBase::GetInt(void* aTransform, nsIPrefBranch* aBranch)
+{
+  PrefTransform* xform = (PrefTransform*)aTransform;
+  GETPREF(xform, GetIntPref, &xform->intValue);
+}
+
+nsresult 
+nsNetscapeProfileMigratorBase::SetInt(void* aTransform, nsIPrefBranch* aBranch)
+{
+  PrefTransform* xform = (PrefTransform*)aTransform;
+  SETPREF(xform, SetIntPref, xform->intValue);
+}
+
+nsresult
+nsNetscapeProfileMigratorBase::CopyFile(const nsAString& aSourceFileName, const nsAString& aTargetFileName)
+{
+  nsCOMPtr<nsIFile> sourceFile;
+  mSourceProfile->Clone(getter_AddRefs(sourceFile));
+
+  sourceFile->Append(aSourceFileName);
+  PRBool exists = PR_FALSE;
+  sourceFile->Exists(&exists);
+  if (!exists)
+    return NS_OK;
+
+  nsCOMPtr<nsIFile> targetFile;
+  mTargetProfile->Clone(getter_AddRefs(targetFile));
+  
+  targetFile->Append(aTargetFileName);
+  targetFile->Exists(&exists);
+  if (exists)
+    targetFile->Remove(PR_FALSE);
+
+  return sourceFile->CopyTo(mTargetProfile, aTargetFileName);
+}
+
+nsresult
+nsNetscapeProfileMigratorBase::GetSignonFileName(PRBool aReplace, char** aFileName)
+{
+  nsresult rv;
+  if (aReplace) {
+    // Find out what the signons file was called, this is stored in a pref
+    // in Seamonkey.
+    nsCOMPtr<nsIPrefService> psvc(do_GetService(NS_PREFSERVICE_CONTRACTID));
+    psvc->ResetPrefs();
+
+    nsCOMPtr<nsIFile> sourcePrefsName;
+    mSourceProfile->Clone(getter_AddRefs(sourcePrefsName));
+    sourcePrefsName->Append(FILE_NAME_PREFS_5X);
+    psvc->ReadUserPrefs(sourcePrefsName);
+
+    nsCOMPtr<nsIPrefBranch> branch(do_QueryInterface(psvc));
+    rv = branch->GetCharPref("signon.SignonFileName", aFileName);
+  }
+  else 
+    rv = LocateSignonsFile(aFileName);
+  return rv;
+}
+
+nsresult
+nsNetscapeProfileMigratorBase::LocateSignonsFile(char** aResult)
+{
+  nsCOMPtr<nsISimpleEnumerator> entries;
+  nsresult rv = mSourceProfile->GetDirectoryEntries(getter_AddRefs(entries));
+  if (NS_FAILED(rv)) return rv;
+
+  nsCAutoString fileName;
+  do {
+    PRBool hasMore = PR_FALSE;
+    rv = entries->HasMoreElements(&hasMore);
+    if (NS_FAILED(rv) || !hasMore) break;
+
+    nsCOMPtr<nsISupports> supp;
+    rv = entries->GetNext(getter_AddRefs(supp));
+    if (NS_FAILED(rv)) break;
+
+    nsCOMPtr<nsIFile> currFile(do_QueryInterface(supp));
+
+    nsCOMPtr<nsIURI> uri;
+    rv = NS_NewFileURI(getter_AddRefs(uri), currFile);
+    if (NS_FAILED(rv)) break;
+    nsCOMPtr<nsIURL> url(do_QueryInterface(uri));
+
+    nsCAutoString extn;
+    url->GetFileExtension(extn);
+
+    if (extn.EqualsIgnoreCase("s")) {
+      url->GetFileName(fileName);
+      break;
+    }
+  }
+  while (1);
+
+  *aResult = ToNewCString(fileName);
+
+  return NS_OK;
+}
+
+// helper function, copies the contents of srcDir into destDir.
+// destDir will be created if it doesn't exist.
+
+nsresult nsNetscapeProfileMigratorBase::RecursiveCopy(nsIFile* srcDir, nsIFile* destDir)
+{
+  nsresult rv;
+  PRBool isDir;
+  
+  rv = srcDir->IsDirectory(&isDir);
+  if (NS_FAILED(rv)) return rv;
+  if (!isDir) return NS_ERROR_INVALID_ARG;
+  
+  PRBool exists;
+  rv = destDir->Exists(&exists);
+  if (NS_SUCCEEDED(rv) && !exists)
+    rv = destDir->Create(nsIFile::DIRECTORY_TYPE, 0775);
+  if (NS_FAILED(rv)) return rv;
+  
+  PRBool hasMore = PR_FALSE;
+  nsCOMPtr<nsISimpleEnumerator> dirIterator;
+  rv = srcDir->GetDirectoryEntries(getter_AddRefs(dirIterator));
+  if (NS_FAILED(rv)) return rv;
+  
+  rv = dirIterator->HasMoreElements(&hasMore);
+  if (NS_FAILED(rv)) return rv;
+  
+  nsCOMPtr<nsIFile> dirEntry;
+  
+  while (hasMore)
+  {
+    rv = dirIterator->GetNext((nsISupports**)getter_AddRefs(dirEntry));
+    if (NS_SUCCEEDED(rv))
+    {
+      rv = dirEntry->IsDirectory(&isDir);
+      if (NS_SUCCEEDED(rv))
+      {
+        if (isDir)
+        {
+          nsCOMPtr<nsIFile> destClone;
+          rv = destDir->Clone(getter_AddRefs(destClone));
+          if (NS_SUCCEEDED(rv))
+          {
+            nsCOMPtr<nsILocalFile> newChild(do_QueryInterface(destClone));
+            nsAutoString leafName;
+            dirEntry->GetLeafName(leafName);
+            newChild->AppendRelativePath(leafName);
+            rv = newChild->Exists(&exists);
+            if (NS_SUCCEEDED(rv) && !exists)
+              rv = newChild->Create(nsIFile::DIRECTORY_TYPE, 0775);
+            rv = RecursiveCopy(dirEntry, newChild);
+          }
+        }
+        else
+        {
+          // we aren't going to do any actual file copying here. Instead, add this to our
+          // file transaction list so we can copy files asynchronously...
+          fileTransactionEntry* fileEntry = new fileTransactionEntry;
+          fileEntry->srcFile = dirEntry;
+          fileEntry->destFile = destDir;
+
+          mFileCopyTransactions->AppendElement((void*) fileEntry);
+        }
+      }      
+    }
+    rv = dirIterator->HasMoreElements(&hasMore);
+    if (NS_FAILED(rv)) return rv;
+  }
+  
+  return rv;
+}
+
diff --git a/mozilla/mail/components/migration/src/nsNetscapeProfileMigratorBase.h b/mozilla/mail/components/migration/src/nsNetscapeProfileMigratorBase.h
new file mode 100644
index 00000000000..c9f53c11096
--- /dev/null
+++ b/mozilla/mail/components/migration/src/nsNetscapeProfileMigratorBase.h
@@ -0,0 +1,110 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is The Browser Profile Migrator.
+ *
+ * The Initial Developer of the Original Code is Ben Goodger.
+ * Portions created by the Initial Developer are Copyright (C) 2004
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *  Ben Goodger <ben@bengoodger.com>
+ *  Scott MacGregor <mscott@mozilla.org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef netscapeprofilemigratorbase___h___
+#define netscapeprofilemigratorbase___h___
+
+#include "nsILocalFile.h"
+#include "nsIStringBundle.h"
+#include "nsString.h"
+
+class nsIFile;
+class nsIPrefBranch;
+class nsVoidArray;
+
+struct fileTransactionEntry {
+  nsCOMPtr<nsIFile> srcFile;  // the src path including leaf name
+  nsCOMPtr<nsIFile> destFile; // the destination path
+  nsString newName; // only valid if the file should be renamed after getting copied
+};
+
+
+class nsNetscapeProfileMigratorBase
+{
+public:
+  nsNetscapeProfileMigratorBase();
+  virtual ~nsNetscapeProfileMigratorBase() { };
+
+public:
+  typedef nsresult(*prefConverter)(void*, nsIPrefBranch*);
+
+  struct PrefTransform {
+    char*         sourcePrefName;
+    char*         targetPrefName;
+    prefConverter prefGetterFunc;
+    prefConverter prefSetterFunc;
+    PRBool        prefHasValue;
+    union {
+      PRInt32     intValue;
+      PRBool      boolValue;
+      char*       stringValue;
+    };
+  };
+
+  static nsresult GetString(void* aTransform, nsIPrefBranch* aBranch);
+  static nsresult SetString(void* aTransform, nsIPrefBranch* aBranch);
+  static nsresult GetWString(void* aTransform, nsIPrefBranch* aBranch);
+  static nsresult SetWString(void* aTransform, nsIPrefBranch* aBranch);
+  static nsresult SetWStringFromASCII(void* aTransform, nsIPrefBranch* aBranch);
+  static nsresult GetBool(void* aTransform, nsIPrefBranch* aBranch);
+  static nsresult SetBool(void* aTransform, nsIPrefBranch* aBranch);
+  static nsresult GetInt(void* aTransform, nsIPrefBranch* aBranch);
+  static nsresult SetInt(void* aTransform, nsIPrefBranch* aBranch);
+
+  nsresult RecursiveCopy(nsIFile* srcDir, nsIFile* destDir); // helper routine
+
+protected:
+  nsresult GetProfileDataFromRegistry(nsILocalFile* aRegistryFile,
+                                      nsISupportsArray* aProfileNames,
+                                      nsISupportsArray* aProfileLocations);
+
+  nsresult CopyFile(const nsAString& aSourceFileName, const nsAString& aTargetFileName);
+
+  nsresult GetSignonFileName(PRBool aReplace, char** aFileName);
+  nsresult LocateSignonsFile(char** aResult);
+
+protected:
+  nsCOMPtr<nsILocalFile> mSourceProfile;
+  nsCOMPtr<nsIFile> mTargetProfile;
+  nsCOMPtr<nsIStringBundle> mBundle;
+
+  nsVoidArray * mFileCopyTransactions; // list of src/destination files we still have to copy into the new profile directory
+  PRUint32 mFileCopyTransactionIndex;
+};
+ 
+#endif
diff --git a/mozilla/mail/components/migration/src/nsOEProfileMigrator.cpp b/mozilla/mail/components/migration/src/nsOEProfileMigrator.cpp
new file mode 100644
index 00000000000..85a0375dc39
--- /dev/null
+++ b/mozilla/mail/components/migration/src/nsOEProfileMigrator.cpp
@@ -0,0 +1,172 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is The Mail Profile Migrator.
+ *
+ * The Initial Developer of the Original Code is Scott MacGregor.
+ * Portions created by the Initial Developer are Copyright (C) 2004
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *  Scott MacGregor <mscott@mozilla.org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "nsMailProfileMigratorUtils.h"
+#include "nsDirectoryServiceDefs.h"
+#include "nsIObserverService.h"
+#include "nsIServiceManager.h"
+#include "nsISupportsArray.h"
+#include "nsISupportsPrimitives.h"
+#include "nsOEProfileMigrator.h"
+#include "nsIProfileMigrator.h"
+#include "nsVoidArray.h"
+
+#include "nsIImportSettings.h"
+#include "nsIFileSpec.h" // needed for an obsolete API
+
+
+NS_IMPL_ISUPPORTS2(nsOEProfileMigrator, nsIMailProfileMigrator, nsITimerCallback)
+
+
+nsOEProfileMigrator::nsOEProfileMigrator()
+{
+  mProcessingMailFolders = PR_FALSE;
+  // get the import service
+  mImportModule = do_CreateInstance("@mozilla.org/import/import-oe;1");
+}
+
+nsOEProfileMigrator::~nsOEProfileMigrator()
+{           
+}
+
+nsresult nsOEProfileMigrator::ContinueImport()
+{
+  return Notify(nsnull);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// nsITimerCallback
+
+NS_IMETHODIMP
+nsOEProfileMigrator::Notify(nsITimer *timer)
+{
+  PRInt32 progress;
+  mGenericImporter->GetProgress(&progress);
+  
+  nsAutoString index;
+  index.AppendInt( progress ); 
+  NOTIFY_OBSERVERS(MIGRATION_PROGRESS, index.get());
+ 
+  if (progress == 100) // are we done yet?
+  {
+    if (mProcessingMailFolders)
+      return FinishCopyingMailFolders();
+    else
+      return FinishCopyingAddressBookData();
+  }
+  else
+  {
+    // fire a timer to handle the next one. 
+    mFileIOTimer = do_CreateInstance("@mozilla.org/timer;1");
+    // if the progress = 100% let's pause for a second or two with a finished progessmeter before we move on
+    mFileIOTimer->InitWithCallback(NS_STATIC_CAST(nsITimerCallback *, this), 100, nsITimer::TYPE_ONE_SHOT);
+  }
+  return NS_OK;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// nsIMailProfileMigrator
+
+NS_IMETHODIMP
+nsOEProfileMigrator::Migrate(PRUint16 aItems, nsIProfileStartup* aStartup, const PRUnichar* aProfile)
+{
+  nsresult rv = NS_OK;
+
+  PRBool aReplace = PR_FALSE;
+
+  if (aStartup) 
+  {
+    aReplace = PR_TRUE;
+    rv = aStartup->DoStartup();
+    NS_ENSURE_SUCCESS(rv, rv);
+  }
+
+  NOTIFY_OBSERVERS(MIGRATION_STARTED, nsnull);
+  rv = ImportSettings(mImportModule);
+
+  // now import address books
+  // this routine will asynchronously import address book data and it will then kick off
+  // the final migration step, copying the mail folders over.
+  rv = ImportAddressBook(mImportModule);  
+
+  // don't broadcast an on end migration here. We aren't done until our asynch import process says we are done.
+  return rv;
+}
+
+NS_IMETHODIMP
+nsOEProfileMigrator::GetMigrateData(const PRUnichar* aProfile, 
+                                           PRBool aReplace, 
+                                           PRUint16* aResult)
+{
+  // There's no harm in assuming everything is available.
+  *aResult = nsIMailProfileMigrator::ACCOUNT_SETTINGS | nsIMailProfileMigrator::ADDRESSBOOK_DATA | 
+             nsIMailProfileMigrator::MAILDATA;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsOEProfileMigrator::GetSourceExists(PRBool* aResult)
+{
+  *aResult = PR_FALSE;
+  
+  nsCOMPtr<nsIImportSettings> importSettings;
+  mImportModule->GetImportInterface(NS_IMPORT_SETTINGS_STR, getter_AddRefs(importSettings));
+
+  if (importSettings)
+  {
+    nsXPIDLString description;
+    nsCOMPtr<nsIFileSpec> location;
+    importSettings->AutoLocate(getter_Copies(description), getter_AddRefs(location), aResult);
+  }
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsOEProfileMigrator::GetSourceHasMultipleProfiles(PRBool* aResult)
+{
+  *aResult = PR_FALSE;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsOEProfileMigrator::GetSourceProfiles(nsISupportsArray** aResult)
+{
+  *aResult = nsnull;
+  return NS_OK;
+}
+
diff --git a/mozilla/mail/components/migration/src/nsOEProfileMigrator.h b/mozilla/mail/components/migration/src/nsOEProfileMigrator.h
new file mode 100644
index 00000000000..57f67fb9696
--- /dev/null
+++ b/mozilla/mail/components/migration/src/nsOEProfileMigrator.h
@@ -0,0 +1,67 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is The Outlook Express Migrator.
+ *
+ * The Initial Developer of the Original Code is Scott MacGregor.
+ * Portions created by the Initial Developer are Copyright (C) 2004
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *  Scott MacGregor <mscott@mozilla.org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef oeprofilemigrator___h___
+#define oeprofilemigrator___h___
+
+#include "nsIMailProfileMigrator.h"
+#include "nsITimer.h"
+#include "nsProfileMigratorBase.h"
+
+class nsIFile;
+class nsIPrefBranch;
+class nsIPrefService;
+class nsVoidArray;
+
+class nsOEProfileMigrator : public nsIMailProfileMigrator,
+                            public nsITimerCallback,
+                            public nsProfileMigratorBase
+{
+public:
+  NS_DECL_NSIMAILPROFILEMIGRATOR
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSITIMERCALLBACK
+
+  nsOEProfileMigrator();
+  virtual ~nsOEProfileMigrator();
+
+  virtual nsresult ContinueImport();
+
+private:
+};
+ 
+#endif
diff --git a/mozilla/mail/components/migration/src/nsOutlookProfileMigrator.cpp b/mozilla/mail/components/migration/src/nsOutlookProfileMigrator.cpp
new file mode 100644
index 00000000000..a9bb75b6b5e
--- /dev/null
+++ b/mozilla/mail/components/migration/src/nsOutlookProfileMigrator.cpp
@@ -0,0 +1,165 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is The Mail Profile Migrator.
+ *
+ * The Initial Developer of the Original Code is Scott MacGregor.
+ * Portions created by the Initial Developer are Copyright (C) 2004
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *  Scott MacGregor <mscott@mozilla.org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "nsMailProfileMigratorUtils.h"
+#include "nsIServiceManager.h"
+#include "nsOutlookProfileMigrator.h"
+#include "nsIProfileMigrator.h"
+#include "nsVoidArray.h"
+
+#include "nsIImportSettings.h"
+#include "nsIFileSpec.h" // needed for an obsolete API
+
+NS_IMPL_ISUPPORTS2(nsOutlookProfileMigrator, nsIMailProfileMigrator, nsITimerCallback)
+
+
+nsOutlookProfileMigrator::nsOutlookProfileMigrator()
+{
+  mProcessingMailFolders = PR_FALSE;
+  // get the import service
+  mImportModule = do_CreateInstance("@mozilla.org/import/import-outlook;1");
+}
+
+nsOutlookProfileMigrator::~nsOutlookProfileMigrator()
+{           
+}
+
+nsresult nsOutlookProfileMigrator::ContinueImport()
+{
+  return Notify(nsnull);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// nsITimerCallback
+
+NS_IMETHODIMP
+nsOutlookProfileMigrator::Notify(nsITimer *timer)
+{
+  PRInt32 progress;
+  mGenericImporter->GetProgress(&progress);
+  
+  nsAutoString index;
+  index.AppendInt( progress ); 
+  NOTIFY_OBSERVERS(MIGRATION_PROGRESS, index.get());
+ 
+  if (progress == 100) // are we done yet?
+  {
+    if (mProcessingMailFolders)
+      return FinishCopyingMailFolders();
+    else
+      return FinishCopyingAddressBookData();
+  }
+  else
+  {
+    // fire a timer to handle the next one. 
+    mFileIOTimer = do_CreateInstance("@mozilla.org/timer;1");
+    // if the progress = 100% let's pause for a second or two with a finished progessmeter before we move on
+    mFileIOTimer->InitWithCallback(NS_STATIC_CAST(nsITimerCallback *, this), 100, nsITimer::TYPE_ONE_SHOT);
+  }
+  return NS_OK;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// nsIMailProfileMigrator
+
+NS_IMETHODIMP
+nsOutlookProfileMigrator::Migrate(PRUint16 aItems, nsIProfileStartup* aStartup, const PRUnichar* aProfile)
+{
+  nsresult rv = NS_OK;
+
+  PRBool aReplace = PR_FALSE;
+
+  if (aStartup) 
+  {
+    aReplace = PR_TRUE;
+    rv = aStartup->DoStartup();
+    NS_ENSURE_SUCCESS(rv, rv);
+  }
+
+  NOTIFY_OBSERVERS(MIGRATION_STARTED, nsnull);
+
+  rv = ImportSettings(mImportModule);
+
+  // now import address books
+  // this routine will asynchronously import address book data and it will then kick off
+  // the final migration step, copying the mail folders over.
+  rv = ImportAddressBook(mImportModule);  
+
+  // don't broadcast an on end migration here. We aren't done until our asynch import process says we are done.
+  return rv;
+}
+
+NS_IMETHODIMP
+nsOutlookProfileMigrator::GetMigrateData(const PRUnichar* aProfile, PRBool aReplace, PRUint16* aResult)
+{
+  // There's no harm in assuming everything is available.
+  *aResult = nsIMailProfileMigrator::ACCOUNT_SETTINGS | nsIMailProfileMigrator::ADDRESSBOOK_DATA | 
+             nsIMailProfileMigrator::MAILDATA;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsOutlookProfileMigrator::GetSourceExists(PRBool* aResult)
+{
+  *aResult = PR_FALSE;
+  
+  nsCOMPtr<nsIImportSettings> importSettings;
+  mImportModule->GetImportInterface(NS_IMPORT_SETTINGS_STR, getter_AddRefs(importSettings));
+
+  if (importSettings)
+  {
+    nsXPIDLString description;
+    nsCOMPtr<nsIFileSpec> location;
+    importSettings->AutoLocate(getter_Copies(description), getter_AddRefs(location), aResult);
+  }
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsOutlookProfileMigrator::GetSourceHasMultipleProfiles(PRBool* aResult)
+{
+  *aResult = PR_FALSE;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsOutlookProfileMigrator::GetSourceProfiles(nsISupportsArray** aResult)
+{
+  *aResult = nsnull;
+  return NS_OK;
+}
diff --git a/mozilla/mail/components/migration/src/nsOutlookProfileMigrator.h b/mozilla/mail/components/migration/src/nsOutlookProfileMigrator.h
new file mode 100644
index 00000000000..4207331f8f1
--- /dev/null
+++ b/mozilla/mail/components/migration/src/nsOutlookProfileMigrator.h
@@ -0,0 +1,59 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is The Outlook Express Migrator.
+ *
+ * The Initial Developer of the Original Code is Scott MacGregor.
+ * Portions created by the Initial Developer are Copyright (C) 2004
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *  Scott MacGregor <mscott@mozilla.org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef outlookprofilemigrator___h___
+#define outlookprofilemigrator___h___
+
+#include "nsIMailProfileMigrator.h"
+#include "nsITimer.h"
+#include "nsProfileMigratorBase.h"
+
+class nsOutlookProfileMigrator : public nsIMailProfileMigrator,
+                                 public nsITimerCallback,
+                                 public nsProfileMigratorBase
+{
+public:
+  NS_DECL_NSIMAILPROFILEMIGRATOR
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSITIMERCALLBACK
+
+  nsOutlookProfileMigrator();
+  virtual ~nsOutlookProfileMigrator();
+  virtual nsresult ContinueImport();
+};
+ 
+#endif
diff --git a/mozilla/mail/components/migration/src/nsProfileMigrator.cpp b/mozilla/mail/components/migration/src/nsProfileMigrator.cpp
index ce99022baeb..465d05e8eb0 100644
--- a/mozilla/mail/components/migration/src/nsProfileMigrator.cpp
+++ b/mozilla/mail/components/migration/src/nsProfileMigrator.cpp
@@ -38,14 +38,20 @@
 
 #include "nsIGenericFactory.h"
 #include "nsILocalFile.h"
+#include "nsIDOMWindowInternal.h"
 #include "nsIProfileMigrator.h"
 #include "nsIServiceManager.h"
 #include "nsIToolkitProfile.h"
 #include "nsIToolkitProfileService.h"
+#include "nsIWindowWatcher.h"
+#include "nsISupportsPrimitives.h"
+#include "nsISupportsArray.h"
 
 #include "nsDirectoryServiceDefs.h"
 #include "nsProfileMigrator.h"
+#include "nsMailMigrationCID.h"
 
+#include "nsCRT.h"
 #include "NSReg.h"
 #include "nsReadableUtils.h"
 #include "nsString.h"
@@ -65,12 +71,111 @@
 
 NS_IMPL_ISUPPORTS1(nsProfileMigrator, nsIProfileMigrator)
 
+#define MIGRATION_WIZARD_FE_URL "chrome://messenger/content/migration/migration.xul"
+#define MIGRATION_WIZARD_FE_FEATURES "chrome,dialog,modal,centerscreen"
+
 NS_IMETHODIMP
 nsProfileMigrator::Migrate(nsIProfileStartup* aStartup)
 {
-  // we don't do migration, only import
+  nsresult rv;
 
-  return NS_OK;
+  nsCAutoString key;
+  nsCOMPtr<nsIMailProfileMigrator> mailMigrator;
+
+  rv = GetDefaultMailMigratorKey(key, mailMigrator);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  if (!mailMigrator) 
+  {
+    nsCAutoString contractID = NS_LITERAL_CSTRING(NS_MAILPROFILEMIGRATOR_CONTRACTID_PREFIX) + key;
+    mailMigrator = do_CreateInstance(contractID.get());
+    NS_ENSURE_TRUE(mailMigrator, NS_ERROR_FAILURE);
+  }
+
+  PRBool sourceExists;
+  rv = mailMigrator->GetSourceExists(&sourceExists);
+  NS_ENSURE_SUCCESS(rv, rv);
+  if (!sourceExists) return NS_ERROR_FAILURE;
+
+  nsCOMPtr<nsISupportsCString> cstr (do_CreateInstance("@mozilla.org/supports-cstring;1"));
+  NS_ENSURE_TRUE(cstr, NS_ERROR_OUT_OF_MEMORY);
+  cstr->SetData(key);
+
+  // By opening the Migration FE with a supplied mailMigrator, it will automatically
+  // migrate from it. 
+  nsCOMPtr<nsIWindowWatcher> ww (do_GetService(NS_WINDOWWATCHER_CONTRACTID));
+  nsCOMPtr<nsISupportsArray> params;
+  NS_NewISupportsArray(getter_AddRefs(params));
+  if (!ww || !params) return NS_ERROR_FAILURE;
+
+  params->AppendElement(cstr);
+  params->AppendElement(mailMigrator);
+  params->AppendElement(aStartup);
+
+  nsCOMPtr<nsIDOMWindow> migrateWizard;
+  return ww->OpenWindow(nsnull, 
+                        MIGRATION_WIZARD_FE_URL,
+                        "_blank",
+                        MIGRATION_WIZARD_FE_FEATURES,
+                        params,
+                        getter_AddRefs(migrateWizard));
+}
+
+#ifdef XP_WIN
+typedef struct {
+  WORD wLanguage;
+  WORD wCodePage;
+} LANGANDCODEPAGE;
+
+#define INTERNAL_NAME_THUNDERBIRD     "Thunderbird"
+#define INTERNAL_NAME_SEAMONKEY       "Mozilla"
+#define INTERNAL_NAME_DOGBERT         "Netscape Messenger"
+#endif
+
+nsresult
+nsProfileMigrator::GetDefaultMailMigratorKey(nsACString& aKey,
+                                             nsCOMPtr<nsIMailProfileMigrator>& aMailMigrator)
+{
+#if 0
+  HKEY hkey;
+
+  const char* kCommandKey = "SOFTWARE\\Clients\\Mail";
+  if (::RegOpenKeyEx(HKEY_LOCAL_MACHINE, kCommandKey, 0, KEY_READ, &hkey) == ERROR_SUCCESS) 
+  {
+    DWORD type;
+    DWORD length = MAX_PATH;
+    unsigned char value[MAX_PATH];
+    if (::RegQueryValueEx(hkey, NULL, 0, &type, value, &length) == ERROR_SUCCESS) 
+    {
+      nsCAutoString str; str.Assign((char*)value);
+
+      if (!nsCRT::strcasecmp((char*)value, INTERNAL_NAME_SEAMONKEY)) 
+      {
+        aKey = "seamonkey";
+        return NS_OK;
+      }
+      
+      if (!nsCRT::strcasecmp((char*)value, INTERNAL_NAME_DOGBERT)) 
+      {
+        aKey = "dogbert";
+        return NS_OK;
+      }
+    }
+  }
+#else
+  // XXXben - until we figure out what to do here with default browsers on MacOS and
+  // GNOME, simply copy data from a previous Seamonkey install. 
+  PRBool exists = PR_FALSE;
+  aMailMigrator = do_CreateInstance(NS_MAILPROFILEMIGRATOR_CONTRACTID_PREFIX "seamonkey");
+  if (aMailMigrator)
+    aMailMigrator->GetSourceExists(&exists);
+  if (exists) {
+    aKey = "seamonkey";
+    return NS_OK;
+  }
+#endif
+
+  return NS_ERROR_FAILURE;
 }
 
 NS_IMETHODIMP
@@ -189,7 +294,28 @@ cleanup:
 
 // Make this into a component
 
+#include "nsSeamonkeyProfileMigrator.h"
+
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsProfileMigrator)
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsSeamonkeyProfileMigrator)
+
+#include "nsDogbertProfileMigrator.h"
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsDogbertProfileMigrator)
+
+#ifdef XP_WIN32
+
+#include "nsOEProfileMigrator.h"
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsOEProfileMigrator)
+
+#include "nsOutlookProfileMigrator.h"
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsOutlookProfileMigrator)
+
+#endif
+
+#if defined (XP_WIN32) || defined (XP_MACOSX)
+#include "nsEudoraProfileMigrator.h"
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsEudoraProfileMigrator)
+#endif
 
 static const nsModuleComponentInfo components[] =
 {
@@ -197,6 +323,30 @@ static const nsModuleComponentInfo components[] =
     NS_THUNDERBIRD_PROFILEIMPORT_CID,
     NS_PROFILEMIGRATOR_CONTRACTID,
     nsProfileMigratorConstructor },
+  { "Seamonkey Profile Migrator",
+    NS_SEAMONKEYPROFILEMIGRATOR_CID,
+    NS_MAILPROFILEMIGRATOR_CONTRACTID_PREFIX "seamonkey",
+    nsSeamonkeyProfileMigratorConstructor },
+  { "Netscape Communicator 4.x",
+    NS_DOGBERTPROFILEMIGRATOR_CID,
+    NS_MAILPROFILEMIGRATOR_CONTRACTID_PREFIX "dogbert",
+    nsDogbertProfileMigratorConstructor },
+#ifdef XP_WIN32
+  { "Outlook Express Profile Migrator",
+    NS_OEXPRESSPROFILEMIGRATOR_CID,
+    NS_MAILPROFILEMIGRATOR_CONTRACTID_PREFIX "oexpress",
+    nsOEProfileMigratorConstructor },
+  { "Outlook Profile Migrator",
+    NS_OUTLOOKPROFILEMIGRATOR_CID,
+    NS_MAILPROFILEMIGRATOR_CONTRACTID_PREFIX "outlook",
+    nsOutlookProfileMigratorConstructor },
+#endif
+#if defined (XP_WIN32) || defined (XP_MACOSX)
+  { "Eudora Profile Migrator",
+    NS_EUDORAPROFILEMIGRATOR_CID,
+    NS_MAILPROFILEMIGRATOR_CONTRACTID_PREFIX "eudora",
+    nsEudoraProfileMigratorConstructor },
+#endif
 };
 
 NS_IMPL_NSGETMODULE(nsMailProfileMigratorModule, components)
diff --git a/mozilla/mail/components/migration/src/nsProfileMigrator.h b/mozilla/mail/components/migration/src/nsProfileMigrator.h
index 9ccb8a587d4..b4ed8e45b37 100644
--- a/mozilla/mail/components/migration/src/nsProfileMigrator.h
+++ b/mozilla/mail/components/migration/src/nsProfileMigrator.h
@@ -39,6 +39,7 @@
 #include "nsIGenericFactory.h"
 #include "nsILocalFile.h"
 #include "nsIProfileMigrator.h"
+#include "nsIMailProfileMigrator.h"
 #include "nsIServiceManager.h"
 #include "nsIToolkitProfile.h"
 #include "nsIToolkitProfileService.h"
@@ -63,6 +64,8 @@ public:
 protected:
   ~nsProfileMigrator() { };
 
+  nsresult GetDefaultMailMigratorKey(nsACString& key, nsCOMPtr<nsIMailProfileMigrator>& bpm);
+
   /**
    * Import profiles from ~/.firefox/ or ~/.phoenix/
    * @return PR_TRUE if any profiles imported.
diff --git a/mozilla/mail/components/migration/src/nsProfileMigratorBase.cpp b/mozilla/mail/components/migration/src/nsProfileMigratorBase.cpp
new file mode 100644
index 00000000000..9df4baa7413
--- /dev/null
+++ b/mozilla/mail/components/migration/src/nsProfileMigratorBase.cpp
@@ -0,0 +1,178 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is The Mail Profile Migrator.
+ *
+ * The Initial Developer of the Original Code is Scott MacGregor.
+ * Portions created by the Initial Developer are Copyright (C) 2004
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *  Scott MacGregor <mscott@mozilla.org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "nsMailProfileMigratorUtils.h"
+#include "nsCRT.h"
+#include "nsDirectoryServiceDefs.h"
+#include "nsIObserverService.h"
+#include "nsIPasswordManagerInternal.h"
+#include "nsIPrefLocalizedString.h"
+#include "nsIPrefService.h"
+#include "nsIServiceManager.h"
+#include "nsISupportsArray.h"
+#include "nsISupportsPrimitives.h"
+#include "nsNetCID.h"
+#include "nsNetUtil.h"
+#include "nsProfileMigratorBase.h"
+#include "nsIProfileMigrator.h"
+#include "nsVoidArray.h"
+#include "nsIMailProfileMigrator.h"
+
+#include "nsIImportSettings.h"
+
+#define kPersonalAddressbookUri "moz-abmdbdirectory://abook.mab"
+
+nsProfileMigratorBase::nsProfileMigratorBase()
+{
+  mObserverService = do_GetService("@mozilla.org/observer-service;1");
+  mProcessingMailFolders = PR_FALSE;
+}
+
+nsProfileMigratorBase::~nsProfileMigratorBase()
+{           
+}
+
+nsresult nsProfileMigratorBase::ImportSettings(nsIImportModule * aImportModule)
+{  
+  nsresult rv; 
+  
+  nsAutoString index;
+  index.AppendInt(nsIMailProfileMigrator::ACCOUNT_SETTINGS); 
+  NOTIFY_OBSERVERS(MIGRATION_ITEMBEFOREMIGRATE, index.get());
+
+  nsCOMPtr<nsIImportSettings> importSettings;
+  rv = aImportModule->GetImportInterface(NS_IMPORT_SETTINGS_STR, getter_AddRefs(importSettings));
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  PRBool importedSettings = PR_FALSE;
+
+  rv = importSettings->Import(getter_AddRefs(mLocalFolderAccount), &importedSettings);
+
+  NOTIFY_OBSERVERS(MIGRATION_ITEMAFTERMIGRATE, index.get());
+
+  return rv;
+}
+
+nsresult nsProfileMigratorBase::ImportAddressBook(nsIImportModule * aImportModule)
+{  
+  nsresult rv; 
+  
+  nsAutoString index;
+  index.AppendInt(nsIMailProfileMigrator::ADDRESSBOOK_DATA); 
+  NOTIFY_OBSERVERS(MIGRATION_ITEMBEFOREMIGRATE, index.get());
+
+  rv = aImportModule->GetImportInterface(NS_IMPORT_ADDRESS_STR, getter_AddRefs(mGenericImporter));
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  nsCOMPtr<nsISupportsCString> pabString = do_CreateInstance(NS_SUPPORTS_CSTRING_CONTRACTID, &rv);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  // we want to migrate the outlook express addressbook into our personal address book
+  pabString->SetData(nsDependentCString(kPersonalAddressbookUri));
+  mGenericImporter->SetData("addressDestination", pabString);
+
+  PRBool importResult;
+  PRBool wantsProgress;
+  mGenericImporter->WantsProgress(&wantsProgress);
+  rv = mGenericImporter->BeginImport(nsnull, nsnull, PR_TRUE, &importResult);
+
+  if (wantsProgress)
+    ContinueImport();
+  else
+    FinishCopyingAddressBookData();
+
+  return rv;
+}
+
+nsresult nsProfileMigratorBase::FinishCopyingAddressBookData()
+{
+  nsAutoString index;
+  index.AppendInt(nsIMailProfileMigrator::ADDRESSBOOK_DATA); 
+  NOTIFY_OBSERVERS(MIGRATION_ITEMAFTERMIGRATE, index.get());
+
+  // now kick off the mail migration code
+  ImportMailData(mImportModule);
+
+  return NS_OK;
+}
+
+nsresult nsProfileMigratorBase::ImportMailData(nsIImportModule * aImportModule)
+{
+  nsresult rv; 
+  
+  nsAutoString index;
+  index.AppendInt(nsIMailProfileMigrator::MAILDATA); 
+  NOTIFY_OBSERVERS(MIGRATION_ITEMBEFOREMIGRATE, index.get());
+
+  rv = aImportModule->GetImportInterface(NS_IMPORT_MAIL_STR, getter_AddRefs(mGenericImporter));
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  nsCOMPtr<nsISupportsPRBool> migrating = do_CreateInstance(NS_SUPPORTS_PRBOOL_CONTRACTID, &rv);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  // by setting the migration flag, we force the import utility to install local folders from OE
+  // directly into Local Folders and not as a subfolder
+  migrating->SetData(PR_TRUE);
+  mGenericImporter->SetData("migration", migrating);
+
+  PRBool importResult;
+  PRBool wantsProgress;
+  mGenericImporter->WantsProgress(&wantsProgress);
+  rv = mGenericImporter->BeginImport(nsnull, nsnull, PR_TRUE, &importResult);
+
+  mProcessingMailFolders = PR_TRUE;
+
+  if (wantsProgress)
+    ContinueImport();
+  else
+    FinishCopyingMailFolders();
+
+  return rv;
+}
+
+nsresult nsProfileMigratorBase::FinishCopyingMailFolders()
+{
+  nsAutoString index;
+  index.AppendInt(nsIMailProfileMigrator::MAILDATA); 
+  NOTIFY_OBSERVERS(MIGRATION_ITEMAFTERMIGRATE, index.get());
+
+  // migration is now done...notify the UI.
+  NOTIFY_OBSERVERS(MIGRATION_ENDED, nsnull);
+  return NS_OK;
+}
+
+
diff --git a/mozilla/mail/components/migration/src/nsProfileMigratorBase.h b/mozilla/mail/components/migration/src/nsProfileMigratorBase.h
new file mode 100644
index 00000000000..ff624edd60f
--- /dev/null
+++ b/mozilla/mail/components/migration/src/nsProfileMigratorBase.h
@@ -0,0 +1,72 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Shared Migration Code.
+ *
+ * The Initial Developer of the Original Code is Scott MacGregor.
+ * Portions created by the Initial Developer are Copyright (C) 2004
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *  Scott MacGregor <mscott@mozilla.org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef profilemigratorbase___h___
+#define profilemigratorbase___h___
+
+#include "nsILocalFile.h"
+#include "nsIObserverService.h"
+#include "nsISupportsArray.h"
+#include "nsString.h"
+#include "nsITimer.h"
+#include "nsIImportGeneric.h"
+#include "nsIImportModule.h"
+#include "nsIMsgAccount.h"
+
+class nsProfileMigratorBase 
+{
+public:
+  nsProfileMigratorBase();
+  virtual ~nsProfileMigratorBase();
+  virtual nsresult ContinueImport() = 0; 
+
+protected:
+  nsresult ImportSettings(nsIImportModule * aImportModule);
+  nsresult ImportAddressBook(nsIImportModule * aImportModule);
+  nsresult ImportMailData(nsIImportModule * aImportModule);
+  nsresult FinishCopyingAddressBookData();
+  nsresult FinishCopyingMailFolders();
+
+  nsCOMPtr<nsIObserverService> mObserverService;
+  nsCOMPtr<nsITimer> mFileIOTimer;
+  nsCOMPtr<nsIImportGeneric> mGenericImporter;
+  nsCOMPtr<nsIImportModule> mImportModule;
+  nsCOMPtr<nsIMsgAccount> mLocalFolderAccount; // needed for nsIImportSettings::Import
+  PRBool mProcessingMailFolders; // we are either asynchronously parsing address books or mail folders
+};
+ 
+#endif
diff --git a/mozilla/mail/components/migration/src/nsSeamonkeyProfileMigrator.cpp b/mozilla/mail/components/migration/src/nsSeamonkeyProfileMigrator.cpp
new file mode 100644
index 00000000000..edbf637135d
--- /dev/null
+++ b/mozilla/mail/components/migration/src/nsSeamonkeyProfileMigrator.cpp
@@ -0,0 +1,866 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is The Mail Profile Migrator.
+ *
+ * The Initial Developer of the Original Code is Ben Goodger.
+ * Portions created by the Initial Developer are Copyright (C) 2004
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *  Ben Goodger <ben@bengoodger.com>
+ *  Scott MacGregor <mscott@mozilla.org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "nsMailProfileMigratorUtils.h"
+#include "nsCRT.h"
+#include "nsDirectoryServiceDefs.h"
+#include "nsIObserverService.h"
+#include "nsIPasswordManagerInternal.h"
+#include "nsIPrefLocalizedString.h"
+#include "nsIPrefService.h"
+#include "nsIServiceManager.h"
+#include "nsISupportsArray.h"
+#include "nsISupportsPrimitives.h"
+#include "nsNetCID.h"
+#include "nsNetUtil.h"
+#include "nsSeamonkeyProfileMigrator.h"
+#include "nsIRelativeFilePref.h"
+#include "nsAppDirectoryServiceDefs.h"
+#include "prprf.h"
+#include "nsVoidArray.h"
+
+static PRUint32 StringHash(const char *ubuf);
+nsresult NS_MsgHashIfNecessary(nsCString &name);
+
+// Mail specific folder paths
+#define MAIL_DIR_50_NAME             NS_LITERAL_STRING("Mail")
+#define IMAP_MAIL_DIR_50_NAME        NS_LITERAL_STRING("ImapMail")
+#define NEWS_DIR_50_NAME             NS_LITERAL_STRING("News")
+
+
+///////////////////////////////////////////////////////////////////////////////
+// nsSeamonkeyProfileMigrator
+#define FILE_NAME_JUNKTRAINING    NS_LITERAL_STRING("training.dat")
+#define FILE_NAME_PERSONALDICTIONARY NS_LITERAL_STRING("persdict.dat")
+#define FILE_NAME_PERSONAL_ADDRESSBOOK NS_LITERAL_STRING("abook.mab")
+#define FILE_NAME_MAILVIEWS       NS_LITERAL_STRING("mailviews.dat")
+#define FILE_NAME_CERT8DB         NS_LITERAL_STRING("cert8.db")
+#define FILE_NAME_KEY3DB          NS_LITERAL_STRING("key3.db")
+#define FILE_NAME_SECMODDB        NS_LITERAL_STRING("secmod.db")
+#define FILE_NAME_MIMETYPES       NS_LITERAL_STRING("mimeTypes.rdf")
+#define FILE_NAME_PREFS           NS_LITERAL_STRING("prefs.js")
+#define FILE_NAME_USER_PREFS      NS_LITERAL_STRING("user.js")
+
+struct PrefBranchStruct {
+  char*         prefName;
+  PRInt32       type;
+  union {
+    char*       stringValue;
+    PRInt32     intValue;
+    PRBool      boolValue;
+    PRUnichar*  wstringValue;
+  };
+};
+
+NS_IMPL_ISUPPORTS2(nsSeamonkeyProfileMigrator, nsIMailProfileMigrator, nsITimerCallback)
+
+
+nsSeamonkeyProfileMigrator::nsSeamonkeyProfileMigrator()
+{
+  mObserverService = do_GetService("@mozilla.org/observer-service;1");
+  mMaxProgress = LL_ZERO;
+  mCurrentProgress = LL_ZERO;
+}
+
+nsSeamonkeyProfileMigrator::~nsSeamonkeyProfileMigrator()
+{           
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// nsITimerCallback
+
+NS_IMETHODIMP
+nsSeamonkeyProfileMigrator::Notify(nsITimer *timer)
+{
+  CopyNextFolder();
+  return NS_OK;
+}
+
+void nsSeamonkeyProfileMigrator::CopyNextFolder() 
+{
+  if (mFileCopyTransactionIndex < mFileCopyTransactions->Count())
+  {
+    PRUint32 percentage = 0;
+    fileTransactionEntry* fileTransaction = (fileTransactionEntry*) mFileCopyTransactions->SafeElementAt(mFileCopyTransactionIndex++);
+    if (fileTransaction) // copy the file
+    {
+      fileTransaction->srcFile->CopyTo(fileTransaction->destFile, nsString());
+
+      // add to our current progress
+      PRInt64 fileSize;
+      fileTransaction->srcFile->GetFileSize(&fileSize);
+      LL_ADD(mCurrentProgress, mCurrentProgress, fileSize);
+
+      PRInt64 percentDone;
+      LL_MUL(percentDone, mCurrentProgress, 100);
+
+      LL_DIV(percentDone, percentDone, mMaxProgress);
+      
+      LL_L2UI(percentage, percentDone);
+
+      nsAutoString index;
+      index.AppendInt( percentage ); 
+
+      NOTIFY_OBSERVERS(MIGRATION_PROGRESS, index.get());
+    }
+    // fire a timer to handle the next one. 
+    mFileIOTimer = do_CreateInstance("@mozilla.org/timer;1");
+    // if the progress = 100% let's pause for a second or two with a finished progessmeter before we move on
+    mFileIOTimer->InitWithCallback(NS_STATIC_CAST(nsITimerCallback *, this), percentage == 100 ? 500 : 0, nsITimer::TYPE_ONE_SHOT);
+  } else
+    EndCopyFolders();
+  
+  return;
+}
+
+void nsSeamonkeyProfileMigrator::EndCopyFolders() 
+{
+  // clear out the file transaction array
+  if (mFileCopyTransactions)
+  {
+    PRUint32 count = mFileCopyTransactions->Count();
+    for (PRUint32 i = 0; i < count; ++i) 
+    {
+      fileTransactionEntry* fileTransaction = (fileTransactionEntry*) mFileCopyTransactions->ElementAt(i);
+      if (fileTransaction)
+      {
+        fileTransaction->srcFile = nsnull;
+        fileTransaction->destFile = nsnull;
+        delete fileTransaction;
+      }
+    }
+  
+    mFileCopyTransactions->Clear();
+    delete mFileCopyTransactions;
+  }
+
+  // notify the UI that we are done with the migration process
+  nsAutoString index;
+  index.AppendInt(nsIMailProfileMigrator::MAILDATA); 
+  NOTIFY_OBSERVERS(MIGRATION_ITEMAFTERMIGRATE, index.get());
+
+  NOTIFY_OBSERVERS(MIGRATION_ENDED, nsnull);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// nsIMailProfileMigrator
+
+NS_IMETHODIMP
+nsSeamonkeyProfileMigrator::Migrate(PRUint16 aItems, nsIProfileStartup* aStartup, const PRUnichar* aProfile)
+{
+  nsresult rv = NS_OK;
+  PRBool aReplace = aStartup ? PR_TRUE : PR_FALSE;
+
+  if (!mTargetProfile) {
+    GetProfilePath(aStartup, mTargetProfile);
+    if (!mTargetProfile) return NS_ERROR_FAILURE;
+  }
+  if (!mSourceProfile)
+    GetSourceProfile(aProfile);
+
+  NOTIFY_OBSERVERS(MIGRATION_STARTED, nsnull);
+
+  COPY_DATA(CopyPreferences,  aReplace, nsIMailProfileMigrator::SETTINGS);
+
+  // fake notifications for things we've already imported as part of CopyPreferences
+  COPY_DATA(DummyCopyRoutine, aReplace, nsIMailProfileMigrator::ACCOUNT_SETTINGS);  
+  COPY_DATA(DummyCopyRoutine, aReplace, nsIMailProfileMigrator::NEWSDATA);
+
+  // copy junk mail training file
+  COPY_DATA(CopyJunkTraining, aReplace, nsIMailProfileMigrator::JUNKTRAINING);
+  COPY_DATA(CopyPasswords,    aReplace, nsIMailProfileMigrator::PASSWORDS);
+
+  // the last thing to do is to actually copy over any mail folders we have marked for copying
+  // we want to do this last and it will be asynchronous so the UI doesn't freeze up while we perform 
+  // this potentially very long operation. 
+  
+  nsAutoString index;
+  index.AppendInt(nsIMailProfileMigrator::MAILDATA); 
+  NOTIFY_OBSERVERS(MIGRATION_ITEMBEFOREMIGRATE, index.get());
+
+  // Generate the max progress value now that we know all of the files we need to copy
+  PRUint32 count = mFileCopyTransactions->Count();
+  for (PRUint32 i = 0; i < count; ++i) 
+  {
+    fileTransactionEntry* fileTransaction = (fileTransactionEntry*) mFileCopyTransactions->ElementAt(i);
+    if (fileTransaction)
+    {
+      PRInt64 fileSize; 
+      fileTransaction->srcFile->GetFileSize(&fileSize);
+      LL_ADD(mMaxProgress, mMaxProgress, fileSize);
+    }
+  }
+
+  CopyNextFolder();
+
+  return rv;
+}
+
+NS_IMETHODIMP
+nsSeamonkeyProfileMigrator::GetMigrateData(const PRUnichar* aProfile, 
+                                           PRBool aReplace, 
+                                           PRUint16* aResult)
+{
+  *aResult = 0;
+
+  if (!mSourceProfile) {
+    GetSourceProfile(aProfile);
+    if (!mSourceProfile)
+      return NS_ERROR_FILE_NOT_FOUND;
+  }
+
+  MigrationData data[] = { { ToNewUnicode(FILE_NAME_PREFS),
+                             nsIMailProfileMigrator::SETTINGS,
+                             PR_TRUE },
+                           { ToNewUnicode(FILE_NAME_JUNKTRAINING),
+                             nsIMailProfileMigrator::JUNKTRAINING,
+                             PR_TRUE },
+                          };
+                                                                  
+  // Frees file name strings allocated above.
+  GetMigrateDataFromArray(data, sizeof(data)/sizeof(MigrationData), 
+                          aReplace, mSourceProfile, aResult);
+
+  // Now locate passwords
+  nsXPIDLCString signonsFileName;
+  GetSignonFileName(aReplace, getter_Copies(signonsFileName));
+
+  if (!signonsFileName.IsEmpty()) {
+    nsAutoString fileName; fileName.AssignWithConversion(signonsFileName);
+    nsCOMPtr<nsIFile> sourcePasswordsFile;
+    mSourceProfile->Clone(getter_AddRefs(sourcePasswordsFile));
+    sourcePasswordsFile->Append(fileName);
+    
+    PRBool exists;
+    sourcePasswordsFile->Exists(&exists);
+    if (exists)
+      *aResult |= nsIMailProfileMigrator::PASSWORDS;
+  }
+
+  // add some extra migration fields for things we also migrate
+  *aResult |= nsIMailProfileMigrator::ACCOUNT_SETTINGS 
+           | nsIMailProfileMigrator::MAILDATA 
+           | nsIMailProfileMigrator::NEWSDATA
+           | nsIMailProfileMigrator::ADDRESSBOOK_DATA;
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSeamonkeyProfileMigrator::GetSourceExists(PRBool* aResult)
+{
+  nsCOMPtr<nsISupportsArray> profiles;
+  GetSourceProfiles(getter_AddRefs(profiles));
+
+  if (profiles) { 
+    PRUint32 count;
+    profiles->Count(&count);
+    *aResult = count > 0;
+  }
+  else
+    *aResult = PR_FALSE;
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSeamonkeyProfileMigrator::GetSourceHasMultipleProfiles(PRBool* aResult)
+{
+  nsCOMPtr<nsISupportsArray> profiles;
+  GetSourceProfiles(getter_AddRefs(profiles));
+
+  if (profiles) {
+    PRUint32 count;
+    profiles->Count(&count);
+    *aResult = count > 1;
+  }
+  else
+    *aResult = PR_FALSE;
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSeamonkeyProfileMigrator::GetSourceProfiles(nsISupportsArray** aResult)
+{
+  if (!mProfileNames && !mProfileLocations) {
+    nsresult rv = NS_NewISupportsArray(getter_AddRefs(mProfileNames));
+    if (NS_FAILED(rv)) return rv;
+
+    rv = NS_NewISupportsArray(getter_AddRefs(mProfileLocations));
+    if (NS_FAILED(rv)) return rv;
+
+    // Fills mProfileNames and mProfileLocations
+    FillProfileDataFromSeamonkeyRegistry();
+  }
+  
+  NS_IF_ADDREF(*aResult = mProfileNames);
+  return NS_OK;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// nsSeamonkeyProfileMigrator
+
+nsresult
+nsSeamonkeyProfileMigrator::GetSourceProfile(const PRUnichar* aProfile)
+{
+  PRUint32 count;
+  mProfileNames->Count(&count);
+  for (PRUint32 i = 0; i < count; ++i) {
+    nsCOMPtr<nsISupportsString> str(do_QueryElementAt(mProfileNames, i));
+    nsXPIDLString profileName;
+    str->GetData(profileName);
+    if (profileName.Equals(aProfile)) {
+      mSourceProfile = do_QueryElementAt(mProfileLocations, i);
+      break;
+    }
+  }
+
+  return NS_OK;
+}
+
+nsresult
+nsSeamonkeyProfileMigrator::FillProfileDataFromSeamonkeyRegistry()
+{
+  // Find the Seamonkey Registry
+  nsCOMPtr<nsIProperties> fileLocator(do_GetService("@mozilla.org/file/directory_service;1"));
+  nsCOMPtr<nsILocalFile> seamonkeyRegistry;
+#ifdef XP_WIN
+  fileLocator->Get(NS_WIN_APPDATA_DIR, NS_GET_IID(nsILocalFile), getter_AddRefs(seamonkeyRegistry));
+
+  seamonkeyRegistry->Append(NS_LITERAL_STRING("Mozilla"));
+  seamonkeyRegistry->Append(NS_LITERAL_STRING("registry.dat"));
+#elif defined(XP_MACOSX)
+  fileLocator->Get(NS_MAC_USER_LIB_DIR, NS_GET_IID(nsILocalFile), getter_AddRefs(seamonkeyRegistry));
+  
+  seamonkeyRegistry->Append(NS_LITERAL_STRING("Mozilla"));
+  seamonkeyRegistry->Append(NS_LITERAL_STRING("Application Registry"));
+#elif defined(XP_UNIX)
+  fileLocator->Get(NS_UNIX_HOME_DIR, NS_GET_IID(nsILocalFile), getter_AddRefs(seamonkeyRegistry));
+  
+  seamonkeyRegistry->Append(NS_LITERAL_STRING(".mozilla"));
+  seamonkeyRegistry->Append(NS_LITERAL_STRING("appreg"));
+#elif defined(XP_OS2)
+  fileLocator->Get(NS_OS2_HOME_DIR, NS_GET_IID(nsILocalFile), getter_AddRefs(seamonkeyRegistry));
+  
+  seamonkeyRegistry->Append(NS_LITERAL_STRING("Mozilla"));
+  seamonkeyRegistry->Append(NS_LITERAL_STRING("registry.dat"));
+#endif
+
+  return GetProfileDataFromRegistry(seamonkeyRegistry, mProfileNames, mProfileLocations);
+}
+
+#define F(a) nsSeamonkeyProfileMigrator::a
+
+#define MAKEPREFTRANSFORM(pref, newpref, getmethod, setmethod) \
+  { pref, newpref, F(Get##getmethod), F(Set##setmethod), PR_FALSE, -1 }
+
+#define MAKESAMETYPEPREFTRANSFORM(pref, method) \
+  { pref, 0, F(Get##method), F(Set##method), PR_FALSE, -1 }
+
+
+static 
+nsSeamonkeyProfileMigrator::PrefTransform gTransforms[] = {
+
+
+  MAKESAMETYPEPREFTRANSFORM("signon.SignonFileName",                    String),
+  MAKESAMETYPEPREFTRANSFORM("mailnews.headers.showUserAgent",           Bool),
+  MAKESAMETYPEPREFTRANSFORM("mailnews.headers.showOrganization",        Bool),
+  MAKESAMETYPEPREFTRANSFORM("mail.wrap_long_lines",                     Bool),
+  MAKESAMETYPEPREFTRANSFORM("news.wrap_long_lines",                     Bool),
+  MAKESAMETYPEPREFTRANSFORM("mailnews.customHeaders",                   String),
+  MAKESAMETYPEPREFTRANSFORM("mail.default_html_action",                 Int),
+  MAKESAMETYPEPREFTRANSFORM("mail.forward_message_mode",                Int),
+  MAKESAMETYPEPREFTRANSFORM("mail.SpellCheckBeforeSend",                Bool),
+  MAKESAMETYPEPREFTRANSFORM("mail.warn_on_send_accel_key",              Bool),
+  MAKESAMETYPEPREFTRANSFORM("mailnews.html_domains",                    String),
+  MAKESAMETYPEPREFTRANSFORM("mailnews.plaintext_domains",               String),
+  MAKESAMETYPEPREFTRANSFORM("mailnews.headers.showUserAgent",           Bool), 
+  MAKESAMETYPEPREFTRANSFORM("mailnews.headers.showOrganization",        Bool), 
+  MAKESAMETYPEPREFTRANSFORM("mail.biff.play_sound",                     Bool),
+  MAKESAMETYPEPREFTRANSFORM("mail.biff.play_sound.type",                Int),
+  MAKESAMETYPEPREFTRANSFORM("mail.biff.play_sound.url",                 String),
+  MAKESAMETYPEPREFTRANSFORM("mail.biff.show_alert",                     Bool),
+  MAKESAMETYPEPREFTRANSFORM("signon.rememberSignons",                   Bool),
+  MAKESAMETYPEPREFTRANSFORM("network.proxy.type",                       Int),
+  MAKESAMETYPEPREFTRANSFORM("network.proxy.http",                       String),
+  MAKESAMETYPEPREFTRANSFORM("network.proxy.http_port",                  Int),
+  MAKESAMETYPEPREFTRANSFORM("network.proxy.ftp",                        String),
+  MAKESAMETYPEPREFTRANSFORM("network.proxy.ftp_port",                   Int),
+  MAKESAMETYPEPREFTRANSFORM("network.proxy.ssl",                        String),
+  MAKESAMETYPEPREFTRANSFORM("network.proxy.ssl_port",                   Int),
+  MAKESAMETYPEPREFTRANSFORM("network.proxy.socks",                      String),
+  MAKESAMETYPEPREFTRANSFORM("network.proxy.socks_port",                 Int),
+  MAKESAMETYPEPREFTRANSFORM("network.proxy.gopher",                     String),
+  MAKESAMETYPEPREFTRANSFORM("network.proxy.gopher_port",                Int),
+  MAKESAMETYPEPREFTRANSFORM("network.proxy.no_proxies_on",              String),
+  MAKESAMETYPEPREFTRANSFORM("network.proxy.autoconfig_url",             String),
+
+  MAKESAMETYPEPREFTRANSFORM("mail.accountmanager.accounts",             String),
+  MAKESAMETYPEPREFTRANSFORM("mail.accountmanager.defaultaccount",       String),
+  MAKESAMETYPEPREFTRANSFORM("mail.accountmanager.localfoldersserver",   String), 
+  MAKESAMETYPEPREFTRANSFORM("mail.smtp.defaultserver",   String), 
+
+  MAKESAMETYPEPREFTRANSFORM("msgcompose.font_face",                     String),
+  MAKESAMETYPEPREFTRANSFORM("msgcompose.font_size",                     String),
+  MAKESAMETYPEPREFTRANSFORM("msgcompose.text_color",                    String),
+  MAKESAMETYPEPREFTRANSFORM("msgcompose.background_color",              String),
+
+  MAKEPREFTRANSFORM("mail.pane_config","mail.pane_config.dynamic", Int, Int)
+};
+
+
+nsresult
+nsSeamonkeyProfileMigrator::TransformPreferences(const nsAString& aSourcePrefFileName,
+                                                 const nsAString& aTargetPrefFileName)
+{
+  PrefTransform* transform;
+  PrefTransform* end = gTransforms + sizeof(gTransforms)/sizeof(PrefTransform);
+
+  // Load the source pref file
+  nsCOMPtr<nsIPrefService> psvc(do_GetService(NS_PREFSERVICE_CONTRACTID));
+  psvc->ResetPrefs();
+
+  nsCOMPtr<nsIFile> sourcePrefsFile;
+  mSourceProfile->Clone(getter_AddRefs(sourcePrefsFile));
+  sourcePrefsFile->Append(aSourcePrefFileName);
+  psvc->ReadUserPrefs(sourcePrefsFile);
+
+  nsCOMPtr<nsIPrefBranch> branch(do_QueryInterface(psvc));
+  for (transform = gTransforms; transform < end; ++transform)
+    transform->prefGetterFunc(transform, branch);
+
+  // read in the various pref branch trees for accounts, identities, servers, etc. 
+
+  nsVoidArray* accounts = new nsVoidArray();
+  nsVoidArray* identities = new nsVoidArray();
+  nsVoidArray* servers = new nsVoidArray();
+  nsVoidArray* smtpservers = new nsVoidArray();
+  nsVoidArray* ldapservers = new nsVoidArray();
+
+  if (!accounts || !identities || !servers || !smtpservers || !ldapservers)
+    return NS_ERROR_OUT_OF_MEMORY;
+  
+  ReadBranch("mail.account.", psvc, accounts);
+  ReadBranch("mail.identity.", psvc, identities);
+  ReadBranch("mail.server.", psvc, servers);
+  ReadBranch("mail.smtpserver.", psvc, smtpservers);
+  ReadBranch("ldap_2.servers.", psvc, ldapservers);
+
+  // certain mail prefs may actually be absolute paths instead of profile relative paths
+  // we need to fix these paths up before we write them out to the new prefs.js
+  CopyMailFolders(servers, psvc);
+
+  CopyAddressBookDirectories(ldapservers, psvc);
+
+  // Now that we have all the pref data in memory, load the target pref file,
+  // and write it back out
+  psvc->ResetPrefs();
+  for (transform = gTransforms; transform < end; ++transform)
+    transform->prefSetterFunc(transform, branch);
+
+  WriteBranch("mail.account.", psvc, accounts);
+  WriteBranch("mail.identity.", psvc, identities);
+  WriteBranch("mail.server.", psvc, servers);
+  WriteBranch("mail.smtpserver.", psvc, smtpservers);
+  WriteBranch("ldap_2.servers.", psvc, ldapservers);
+
+  delete accounts;
+  delete identities;
+  delete servers;
+  delete smtpservers;
+  delete ldapservers;
+
+  nsCOMPtr<nsIFile> targetPrefsFile;
+  mTargetProfile->Clone(getter_AddRefs(targetPrefsFile));
+  targetPrefsFile->Append(aTargetPrefFileName);
+  psvc->SavePrefFile(targetPrefsFile);
+
+  return NS_OK;
+}
+
+nsresult nsSeamonkeyProfileMigrator::CopyAddressBookDirectories(nsVoidArray* aLdapServers, nsIPrefService* aPrefService)
+{
+  // each server has a pref ending with .filename. The value of that pref points to a profile which we
+  // need to migrate.
+  nsAutoString index;
+  index.AppendInt(nsIMailProfileMigrator::ADDRESSBOOK_DATA); 
+  NOTIFY_OBSERVERS(MIGRATION_ITEMBEFOREMIGRATE, index.get());
+
+  PRUint32 count = aLdapServers->Count();
+  for (PRUint32 i = 0; i < count; ++i) 
+  {
+    PrefBranchStruct* pref = (PrefBranchStruct*) aLdapServers->ElementAt(i);
+    nsDependentCString prefName (pref->prefName);
+
+    if (StringEndsWith(prefName, nsDependentCString(".filename")))
+    {
+      // should we be assuming utf-8 or ascii here?
+      CopyFile(NS_ConvertUTF8toUCS2(pref->stringValue), NS_ConvertUTF8toUCS2(pref->stringValue)); 
+    }
+
+    // we don't need to do anything to the fileName pref itself
+  }
+
+  NOTIFY_OBSERVERS(MIGRATION_ITEMAFTERMIGRATE, index.get());
+
+  return NS_OK;
+}
+
+nsresult nsSeamonkeyProfileMigrator::CopyMailFolders(nsVoidArray* aMailServers, nsIPrefService* aPrefService)
+{
+  // Each server has a .directory pref which points to the location of the mail data
+  // for that server. We need to do two things for that case...
+  // (1) Fix up the directory path for the new profile
+  // (2) copy the mail folder data from the source directory pref to the destination directory pref
+
+  nsresult rv = NS_OK;
+
+  PRUint32 count = aMailServers->Count();
+  for (PRUint32 i = 0; i < count; ++i) 
+  {
+    PrefBranchStruct* pref = (PrefBranchStruct*)aMailServers->ElementAt(i);
+    nsDependentCString prefName (pref->prefName);
+
+    if (StringEndsWith(prefName, nsDependentCString(".directory")))
+    {
+      // let's try to get a branch for this particular server to simplify things
+      prefName.Cut( prefName.Length() - strlen("directory"), strlen("directory"));
+      prefName.Insert("mail.server.", 0);
+
+      nsCOMPtr<nsIPrefBranch> serverBranch;
+      aPrefService->GetBranch(prefName.get(), getter_AddRefs(serverBranch));
+
+      if (!serverBranch)
+        break; // should we clear out this server pref from aMailServers?
+
+      nsXPIDLCString serverType; 
+      serverBranch->GetCharPref("type", getter_Copies(serverType));
+
+      nsCOMPtr<nsILocalFile> sourceMailFolder;
+      serverBranch->GetComplexValue("directory", NS_GET_IID(nsILocalFile), getter_AddRefs(sourceMailFolder));
+
+      // now based on type, we need to build a new destination path for the mail folders for this server
+      nsCOMPtr<nsIFile> targetMailFolder;
+      if (serverType.Equals("imap"))
+      {
+        mTargetProfile->Clone(getter_AddRefs(targetMailFolder));
+        targetMailFolder->Append(IMAP_MAIL_DIR_50_NAME);       
+      }
+      else if (serverType.Equals("none") || serverType.Equals("pop3")) 
+      {
+        // local folders and POP3 servers go under <profile>\Mail
+        mTargetProfile->Clone(getter_AddRefs(targetMailFolder));
+        targetMailFolder->Append(MAIL_DIR_50_NAME);
+      }
+      else if (serverType.Equals("nntp"))
+      {
+        mTargetProfile->Clone(getter_AddRefs(targetMailFolder));
+        targetMailFolder->Append(NEWS_DIR_50_NAME); 
+        
+        nsCAutoString alteredHost;
+        alteredHost = "host-";
+
+        nsXPIDLCString hostName; 
+        serverBranch->GetCharPref("hostname", getter_Copies(hostName)); 
+        alteredHost += hostName;
+
+        NS_MsgHashIfNecessary(alteredHost); 
+        targetMailFolder->Append(NS_ConvertASCIItoUCS2(alteredHost)); 
+      }
+
+      if (targetMailFolder)
+      {
+        // for all of our server types, append the host name to the directory as part of the new location
+        if (!serverType.Equals("nntp"))
+        {
+          nsXPIDLCString hostName; 
+          serverBranch->GetCharPref("hostname", getter_Copies(hostName));
+          targetMailFolder->Append(NS_ConvertASCIItoUCS2(hostName));  
+        }
+
+        rv = RecursiveCopy(sourceMailFolder, targetMailFolder);
+        // now we want to make sure the actual directory pref that gets transformed
+        // into the new profile's pref.js has the right file location. 
+        nsCAutoString descriptorString;
+        nsCOMPtr<nsILocalFile> localFile = do_QueryInterface(targetMailFolder);
+        localFile->GetPersistentDescriptor(descriptorString);
+        nsCRT::free(pref->stringValue);
+        pref->stringValue = ToNewCString(descriptorString);
+      }
+    }
+    else if (StringEndsWith(prefName, nsDependentCString(".newsrc.file")))
+    {
+      // copy the news RC file into \News. this won't work if the user has different newsrc files for each account
+      // I don't know what to do in that situation.
+      
+      nsCOMPtr<nsIFile> targetNewsRCFile;
+      mTargetProfile->Clone(getter_AddRefs(targetNewsRCFile));
+      targetNewsRCFile->Append(NEWS_DIR_50_NAME); 
+
+      // turn the pref into a nsILocalFile
+      nsCOMPtr<nsILocalFile> srcNewsRCFile = do_CreateInstance(NS_LOCAL_FILE_CONTRACTID);
+      srcNewsRCFile->SetPersistentDescriptor(nsDependentCString(pref->stringValue));
+
+      // now make the copy
+      PRBool exists; 
+      srcNewsRCFile->Exists(&exists);
+      if (exists)
+      {
+        nsAutoString leafName;
+        srcNewsRCFile->GetLeafName(leafName);
+        srcNewsRCFile->CopyTo(targetNewsRCFile,leafName); // will fail if we've already copied a newsrc file here
+        targetNewsRCFile->Append(leafName);
+
+        // now write out the new descriptor
+        nsCAutoString descriptorString;
+        nsCOMPtr<nsILocalFile> localFile = do_QueryInterface(targetNewsRCFile);
+        localFile->GetPersistentDescriptor(descriptorString);
+        nsCRT::free(pref->stringValue);
+        pref->stringValue = ToNewCString(descriptorString);
+      }      
+    }
+  }
+
+  return NS_OK;
+}
+
+nsresult
+nsSeamonkeyProfileMigrator::CopyPreferences(PRBool aReplace)
+{
+  nsresult rv = NS_OK;
+  if (!aReplace)
+    return rv;
+
+  rv |= TransformPreferences(FILE_NAME_PREFS, FILE_NAME_PREFS); 
+  rv |= CopyFile(FILE_NAME_USER_PREFS, FILE_NAME_USER_PREFS);
+
+  // Security Stuff
+  rv |= CopyFile(FILE_NAME_CERT8DB, FILE_NAME_CERT8DB);
+  rv |= CopyFile(FILE_NAME_KEY3DB, FILE_NAME_KEY3DB);
+  rv |= CopyFile(FILE_NAME_SECMODDB, FILE_NAME_SECMODDB);
+
+  // User MIME Type overrides
+  rv |= CopyFile(FILE_NAME_MIMETYPES, FILE_NAME_MIMETYPES);
+  rv |= CopyFile(FILE_NAME_PERSONALDICTIONARY, FILE_NAME_PERSONALDICTIONARY);
+  rv |= CopyFile(FILE_NAME_MAILVIEWS, FILE_NAME_MAILVIEWS);
+  return rv;
+}
+
+void nsSeamonkeyProfileMigrator::ReadBranch(const char * branchName, nsIPrefService* aPrefService, 
+                                            nsVoidArray* aPrefs)
+{
+  // Enumerate the branch
+  nsCOMPtr<nsIPrefBranch> branch;
+  aPrefService->GetBranch(branchName, getter_AddRefs(branch));
+
+  PRUint32 count;
+  char** prefs = nsnull;
+  nsresult rv = branch->GetChildList("", &count, &prefs);
+  if (NS_FAILED(rv)) return;
+
+  for (PRUint32 i = 0; i < count; ++i) {
+    // Save each pref's value into an array
+    char* currPref = prefs[i];
+    PRInt32 type;
+    branch->GetPrefType(currPref, &type);
+    PrefBranchStruct* pref = new PrefBranchStruct;
+    pref->prefName = currPref;
+    pref->type = type;
+    switch (type) {
+    case nsIPrefBranch::PREF_STRING:
+      rv = branch->GetCharPref(currPref, &pref->stringValue);
+      break;
+    case nsIPrefBranch::PREF_BOOL:
+      rv = branch->GetBoolPref(currPref, &pref->boolValue);
+      break;
+    case nsIPrefBranch::PREF_INT:
+      rv = branch->GetIntPref(currPref, &pref->intValue);
+      break;
+    case nsIPrefBranch::PREF_INVALID:
+      {
+        nsCOMPtr<nsIPrefLocalizedString> str;
+        rv = branch->GetComplexValue(currPref, 
+                                    NS_GET_IID(nsIPrefLocalizedString), 
+                                    getter_AddRefs(str));
+        if (NS_SUCCEEDED(rv) && str)
+          str->ToString(&pref->wstringValue);
+      }
+      break;
+    }
+
+    if (NS_SUCCEEDED(rv))
+      aPrefs->AppendElement((void*)pref);
+  }
+}
+
+void
+nsSeamonkeyProfileMigrator::WriteBranch(const char * branchName, nsIPrefService* aPrefService,
+                                        nsVoidArray* aPrefs)
+{
+  nsresult rv;
+
+  // Enumerate the branch
+  nsCOMPtr<nsIPrefBranch> branch;
+  aPrefService->GetBranch(branchName, getter_AddRefs(branch));
+
+  PRUint32 count = aPrefs->Count();
+  for (PRUint32 i = 0; i < count; ++i) {
+    PrefBranchStruct* pref = (PrefBranchStruct*)aPrefs->ElementAt(i);
+    switch (pref->type) {
+    case nsIPrefBranch::PREF_STRING:
+      rv = branch->SetCharPref(pref->prefName, pref->stringValue);
+      nsCRT::free(pref->stringValue);
+      pref->stringValue = nsnull;
+      break;
+    case nsIPrefBranch::PREF_BOOL:
+      rv = branch->SetBoolPref(pref->prefName, pref->boolValue);
+      break;
+    case nsIPrefBranch::PREF_INT:
+      rv = branch->SetIntPref(pref->prefName, pref->intValue);
+      break;
+    case nsIPrefBranch::PREF_INVALID:
+      nsCOMPtr<nsIPrefLocalizedString> pls(do_CreateInstance("@mozilla.org/pref-localizedstring;1"));
+      pls->SetData(pref->wstringValue);
+      rv = branch->SetComplexValue(pref->prefName, 
+                                   NS_GET_IID(nsIPrefLocalizedString),
+                                   pls);
+      nsCRT::free(pref->wstringValue);
+      pref->wstringValue = nsnull;
+      break;
+    }
+    nsCRT::free(pref->prefName);
+    pref->prefName = nsnull;
+    delete pref;
+    pref = nsnull;
+  }
+  aPrefs->Clear();
+}
+
+nsresult nsSeamonkeyProfileMigrator::DummyCopyRoutine(PRBool aReplace)
+{
+  // place holder function only to fake the UI out into showing some migration process.
+  return NS_OK;
+}
+
+nsresult
+nsSeamonkeyProfileMigrator::CopyJunkTraining(PRBool aReplace)
+{
+  return aReplace ? CopyFile(FILE_NAME_JUNKTRAINING, FILE_NAME_JUNKTRAINING) : NS_OK;
+}
+
+nsresult
+nsSeamonkeyProfileMigrator::CopyPasswords(PRBool aReplace)
+{
+  nsresult rv;
+
+  nsXPIDLCString signonsFileName;
+  GetSignonFileName(aReplace, getter_Copies(signonsFileName));
+
+  if (signonsFileName.IsEmpty())
+    return NS_ERROR_FILE_NOT_FOUND;
+
+  nsAutoString fileName; fileName.AssignWithConversion(signonsFileName);
+  if (aReplace)
+    rv = CopyFile(fileName, fileName);
+  else {
+    // don't do anything right now
+  }
+  return rv;
+}
+
+// helper functions for news migration
+static PRUint32 StringHash(const char *ubuf)
+{
+  unsigned char * buf = (unsigned char*) ubuf;
+  PRUint32 h=1;
+  while(*buf) {
+    h = 0x63c63cd9*h + 0x9c39c33d + (int32)*buf;
+    buf++;
+  }
+  return h;
+}
+
+nsresult NS_MsgHashIfNecessary(nsCString &name)
+{
+#if defined(XP_MAC)
+  const PRUint32 MAX_LEN = 25;
+#elif defined(XP_UNIX) || defined(XP_BEOS)
+  const PRUint32 MAX_LEN = 55;
+#elif defined(XP_WIN32)
+  const PRUint32 MAX_LEN = 55;
+#elif defined(XP_OS2)
+  const PRUint32 MAX_LEN = 55;
+#else
+  #error need_to_define_your_max_filename_length
+#endif
+  nsCAutoString illegalChars(FILE_PATH_SEPARATOR FILE_ILLEGAL_CHARACTERS);
+  nsCAutoString str(name);
+
+  // Given a filename, make it safe for filesystem
+  // certain filenames require hashing because they 
+  // are too long or contain illegal characters
+  PRInt32 illegalCharacterIndex = str.FindCharInSet(illegalChars);
+  char hashedname[MAX_LEN + 1];
+  if (illegalCharacterIndex == kNotFound) 
+  {
+    // no illegal chars, it's just too long
+    // keep the initial part of the string, but hash to make it fit
+    if (str.Length() > MAX_LEN) 
+    {
+      PL_strncpy(hashedname, str.get(), MAX_LEN + 1);
+      PR_snprintf(hashedname + MAX_LEN - 8, 9, "%08lx",
+                (unsigned long) StringHash(str.get()));
+      name = hashedname;
+    }
+  }
+  else 
+  {
+      // found illegal chars, hash the whole thing
+      // if we do substitution, then hash, two strings
+      // could hash to the same value.
+      // for example, on mac:  "foo__bar", "foo:_bar", "foo::bar"
+      // would map to "foo_bar".  this way, all three will map to
+      // different values
+      PR_snprintf(hashedname, 9, "%08lx",
+                (unsigned long) StringHash(str.get()));
+      name = hashedname;
+  }
+  
+  return NS_OK;
+}
diff --git a/mozilla/mail/components/migration/src/nsSeamonkeyProfileMigrator.h b/mozilla/mail/components/migration/src/nsSeamonkeyProfileMigrator.h
new file mode 100644
index 00000000000..e4264a27e77
--- /dev/null
+++ b/mozilla/mail/components/migration/src/nsSeamonkeyProfileMigrator.h
@@ -0,0 +1,95 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is The Browser Profile Migrator.
+ *
+ * The Initial Developer of the Original Code is Ben Goodger.
+ * Portions created by the Initial Developer are Copyright (C) 2004
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *  Ben Goodger <ben@bengoodger.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef seamonkeyprofilemigrator___h___
+#define seamonkeyprofilemigrator___h___
+
+#include "nsIMailProfileMigrator.h"
+#include "nsILocalFile.h"
+#include "nsIObserverService.h"
+#include "nsISupportsArray.h"
+#include "nsNetscapeProfileMigratorBase.h"
+#include "nsString.h"
+#include "nsITimer.h"
+
+class nsIFile;
+class nsIPrefBranch;
+class nsIPrefService;
+
+class nsSeamonkeyProfileMigrator : public nsNetscapeProfileMigratorBase, 
+                                   public nsIMailProfileMigrator,
+                                   public nsITimerCallback
+{
+public:
+  NS_DECL_NSIMAILPROFILEMIGRATOR
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSITIMERCALLBACK
+
+  nsSeamonkeyProfileMigrator();
+  virtual ~nsSeamonkeyProfileMigrator();
+
+protected:
+  nsresult FillProfileDataFromSeamonkeyRegistry();
+  nsresult GetSourceProfile(const PRUnichar* aProfile);
+
+  nsresult CopyPreferences(PRBool aReplace);
+  nsresult TransformPreferences(const nsAString& aSourcePrefFileName,
+                                const nsAString& aTargetPrefFileName);
+
+  nsresult DummyCopyRoutine(PRBool aReplace);
+  nsresult CopyJunkTraining(PRBool aReplace);  
+  nsresult CopyPasswords(PRBool aReplace);
+  nsresult CopyMailFolders(nsVoidArray* aMailServers, nsIPrefService* aPrefBranch);
+  nsresult CopyAddressBookDirectories(nsVoidArray* aLdapServers, nsIPrefService* aPrefService);
+
+  void ReadBranch(const char * branchName,  nsIPrefService* aPrefService, nsVoidArray* aPrefs);
+  void WriteBranch(const char * branchName, nsIPrefService* aPrefService, nsVoidArray* aPrefs);
+
+  void CopyNextFolder();
+  void EndCopyFolders();
+
+private:
+  nsCOMPtr<nsISupportsArray> mProfileNames;
+  nsCOMPtr<nsISupportsArray> mProfileLocations;
+  nsCOMPtr<nsIObserverService> mObserverService;
+  nsCOMPtr<nsITimer> mFileIOTimer;
+
+  PRInt64 mMaxProgress;
+  PRInt64 mCurrentProgress;
+};
+ 
+#endif
diff --git a/mozilla/mail/config/en-US-jar.mn b/mozilla/mail/config/en-US-jar.mn
index deed58b9efb..5ac8faa1b2f 100644
--- a/mozilla/mail/config/en-US-jar.mn
+++ b/mozilla/mail/config/en-US-jar.mn
@@ -12,6 +12,7 @@ locale/en-US/messenger,                                   en-US/locale/en-US/mes
 locale/en-US/messenger-mdn,                               en-US/locale/en-US/messenger-mdn
 locale/en-US/messenger/addressbook,                       en-US/locale/en-US/messenger/addressbook
 locale/en-US/messenger/messengercompose,                  en-US/locale/en-US/messenger/messengercompose
+locale/en-US/messenger/migration,                         en-US/locale/en-US/messenger/migration
 locale/en-US/messenger-smime,                             en-US/locale/en-US/messenger-smime
 
 #################################################################################################
diff --git a/mozilla/mail/config/mail-jar.mn b/mozilla/mail/config/mail-jar.mn
index c486630360a..855a4e85446 100644
--- a/mozilla/mail/config/mail-jar.mn
+++ b/mozilla/mail/config/mail-jar.mn
@@ -15,8 +15,9 @@ content/messenger-region,                            msg/content/messenger-regio
 content/messenger-smime,                             msg/content/messenger-smime
 content/messenger-views,                             msg/content/messenger-views
 content/messenger/messengercompose,                  msg/content/messenger/messengercompose
-content/editor/images,				                       msg/content/editor/images
+content/editor/images,				     msg/content/editor/images
 content/messenger/addressbook,                       msg/content/messenger/addressbook
+content/messenger/migration,                         msg/content/messenger/migration
 
 #################################################################################################
 # Files we need from comm.jar
@@ -25,7 +26,7 @@ content/editor,                                       comm/content/editor
 content/editor-region,                                comm/content/editor-region
 content/communicator-region,                          comm/content/communicator-region,
 content/communicator-platform,                        comm/content/communicator-platform
-content/communicator/contents.rdf, 		                comm/content/communicator/contents.rdf
+content/communicator/contents.rdf, 		      comm/content/communicator/contents.rdf
 content/communicator/communicatorOverlay.xul,         comm/content/communicator/communicatorOverlay.xul 
 content/communicator/utilityOverlay.xul,              comm/content/communicator/utilityOverlay.xul 
 content/communicator/utilityOverlay.js,               comm/content/communicator/utilityOverlay.js