diff --git a/mailnews/import/build/Makefile.in b/mailnews/import/build/Makefile.in
new file mode 100644
index 000000000000..1bca782bde12
--- /dev/null
+++ b/mailnews/import/build/Makefile.in
@@ -0,0 +1,97 @@
+#
+# The contents of this file are subject to the Netscape 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/NPL/
+#
+# 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.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE = import
+LIBRARY_NAME = import
+META_COMPONENT = mail
+EXPORT_LIBRARY = 1
+IS_COMPONENT	= 1
+
+MODULE_NAME	= nsImportModule
+
+REQUIRES	= xpcom \
+		  xpcom_obsolete \
+		  string \
+		  mailnews \
+		  addrbook \
+		  uconv \
+		  mork \
+		  msgbase \
+		  msgbaseutil \
+		  intl \
+		  imptext \
+		  impComm4xMail \
+		  necko \
+		  rdf \
+		  msgdb \
+		  unicharutil \
+		  $(NULL)
+
+ifeq ($(OS_ARCH),WINNT)
+REQUIRES += impEudra
+
+ifneq ($(_MSC_VER),1100)
+ifndef GNU_CC
+
+REQUIRES += importOE impOutlk
+
+endif
+endif
+
+endif
+
+CPPSRCS		=  nsImportModule.cpp  
+
+SHARED_LIBRARY_LIBS = \
+		$(DIST)/lib/$(LIB_PREFIX)import_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)imptext_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)imp4mail_s.$(LIB_SUFFIX) \
+	        $(DIST)/lib/$(LIB_PREFIX)msgbsutl_s.$(LIB_SUFFIX) \
+		$(NULL)
+
+ifeq ($(OS_ARCH),WINNT)
+SHARED_LIBRARY_LIBS += $(DIST)/lib/$(LIB_PREFIX)impEudra_s.$(LIB_SUFFIX) 
+
+ifneq ($(_MSC_VER),1100)
+ifndef GNU_CC
+SHARED_LIBRARY_LIBS += $(DIST)/lib/$(LIB_PREFIX)importOE_s.$(LIB_SUFFIX) 
+SHARED_LIBRARY_LIBS += $(DIST)/lib/$(LIB_PREFIX)impOutlk_s.$(LIB_SUFFIX) 
+endif
+endif
+
+endif
+
+EXTRA_DSO_LDOPTS += \
+	$(LIBS_DIR) \
+	$(EXTRA_DSO_LIBS) \
+	$(MOZ_UNICHARUTIL_LIBS) \
+	$(MOZ_COMPONENT_LIBS) \
+	$(MOZ_XPCOM_OBSOLETE_LIBS) \
+	$(NULL)
+
+include $(topsrcdir)/config/rules.mk
diff --git a/mailnews/import/build/nsImportModule.cpp b/mailnews/import/build/nsImportModule.cpp
new file mode 100644
index 000000000000..01206257edef
--- /dev/null
+++ b/mailnews/import/build/nsImportModule.cpp
@@ -0,0 +1,285 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Netscape 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/NPL/
+ *
+ * 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.
+ *
+ * The Initial Developer of the Original Code is 
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * 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 NPL, 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 NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+////////////////////////////////////////////////////////////////////////////////
+// Core Module Include Files
+////////////////////////////////////////////////////////////////////////////////
+#include "nsCOMPtr.h"
+#include "nsIModule.h"
+#include "nsIGenericFactory.h"
+#include "nsICategoryManager.h"
+#include "nsCRT.h"
+
+////////////////////////////////////////////////////////////////////////////////
+// core import Include Files
+////////////////////////////////////////////////////////////////////////////////
+#include "nsImportService.h"
+#include "nsImportMimeEncode.h"
+#include "nsImportStringBundle.h"
+
+////////////////////////////////////////////////////////////////////////////////
+// text import Include Files
+////////////////////////////////////////////////////////////////////////////////
+#include "nsTextImport.h"
+#include "nsTextStringBundle.h"
+
+static NS_DEFINE_CID(kTextImportCID,    	NS_TEXTIMPORT_CID);
+
+////////////////////////////////////////////////////////////////////////////////
+// nsComm4x import Include Files
+////////////////////////////////////////////////////////////////////////////////
+#include "nsComm4xProfile.h"
+#include "nsComm4xMailStringBundle.h"
+#include "nsComm4xMailImport.h"
+
+static NS_DEFINE_CID(kComm4xMailImportCID,      NS_COMM4XMAILIMPORT_CID);
+
+////////////////////////////////////////////////////////////////////////////////
+// eudora import Include Files
+////////////////////////////////////////////////////////////////////////////////
+#ifdef XP_WIN
+#include "nsEudoraImport.h"
+#include "nsEudoraStringBundle.h"
+
+static NS_DEFINE_CID(kEudoraImportCID,    	NS_EUDORAIMPORT_CID);
+
+////////////////////////////////////////////////////////////////////////////////
+// outlook import Include Files
+////////////////////////////////////////////////////////////////////////////////
+#if defined(_MSC_VER) && _MSC_VER >= 1100
+#include "nsOEImport.h"
+#include "nsOEStringBundle.h"
+#include "nsOutlookImport.h"
+#include "nsOutlookStringBundle.h"
+
+static NS_DEFINE_CID(kOEImportCID,       	NS_OEIMPORT_CID);
+static NS_DEFINE_CID(kOutlookImportCID,    	NS_OUTLOOKIMPORT_CID);
+#endif
+
+#endif // XP_WIN
+
+////////////////////////////////////////////////////////////////////////////////
+// core import factories
+////////////////////////////////////////////////////////////////////////////////
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsImportService)
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsIImportMimeEncodeImpl)
+
+////////////////////////////////////////////////////////////////////////////////
+// text import factories
+////////////////////////////////////////////////////////////////////////////////
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsTextImport)
+
+NS_METHOD TextRegister(nsIComponentManager *aCompMgr,
+                       nsIFile *aPath, const char *registryLocation,
+                       const char *componentType,
+                       const nsModuleComponentInfo *info)
+{	
+	nsresult rv;
+
+	nsCOMPtr<nsICategoryManager> catMan = do_GetService( NS_CATEGORYMANAGER_CONTRACTID, &rv);
+	if (NS_SUCCEEDED( rv)) {
+		nsXPIDLCString	replace;
+		char *theCID = kTextImportCID.ToString();
+		rv = catMan->AddCategoryEntry( "mailnewsimport", theCID, kTextSupportsString, PR_TRUE, PR_TRUE, getter_Copies( replace));
+		nsCRT::free( theCID);
+	}
+
+	return( rv);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// nsComm4x import factories
+////////////////////////////////////////////////////////////////////////////////
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsComm4xMailImport)
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(ImportComm4xMailImpl, Initialize)
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsComm4xProfile)
+
+NS_METHOD Comm4xMailRegister(nsIComponentManager *aCompMgr,
+                       nsIFile *aPath, const char *registryLocation,
+                       const char *componentType,
+                       const nsModuleComponentInfo *info)
+{   
+    nsresult rv;
+
+    nsCOMPtr<nsICategoryManager> catMan = do_GetService(NS_CATEGORYMANAGER_CONTRACTID, &rv);
+    if (NS_SUCCEEDED(rv)) {
+        nsXPIDLCString  replace;
+        char *theCID = kComm4xMailImportCID.ToString();
+        rv = catMan->AddCategoryEntry("mailnewsimport", theCID, kComm4xMailSupportsString, PR_TRUE, PR_TRUE, getter_Copies(replace));
+        nsCRT::free(theCID);
+    }
+
+    return rv;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// eudora import factories
+////////////////////////////////////////////////////////////////////////////////
+#ifdef XP_WIN
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsEudoraImport)
+
+NS_METHOD EudoraRegister(nsIComponentManager *aCompMgr,
+                         nsIFile *aPath, const char *registryLocation,
+                         const char *componentType,
+                         const nsModuleComponentInfo *info)
+{	
+	nsresult rv;
+
+	nsCOMPtr<nsICategoryManager> catMan = do_GetService( NS_CATEGORYMANAGER_CONTRACTID, &rv);
+	if (NS_SUCCEEDED( rv)) {
+		nsXPIDLCString	replace;
+		char *theCID = kEudoraImportCID.ToString();
+		rv = catMan->AddCategoryEntry( "mailnewsimport", theCID, kEudoraSupportsString, PR_TRUE, PR_TRUE, getter_Copies( replace));
+		nsCRT::free( theCID);
+	}
+
+	return( rv);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// outlook import factories
+////////////////////////////////////////////////////////////////////////////////
+#if defined(_MSC_VER) && _MSC_VER >= 1100
+
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsOEImport)
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsOutlookImport)
+
+NS_METHOD OERegister(nsIComponentManager *aCompMgr,
+                     nsIFile *aPath,
+                     const char *registryLocation,
+                     const char *componentType,
+                     const nsModuleComponentInfo *info)
+{
+	nsresult rv;
+	
+	nsCOMPtr<nsICategoryManager> catMan = do_GetService( NS_CATEGORYMANAGER_CONTRACTID, &rv);
+	if (NS_SUCCEEDED( rv)) {
+		nsXPIDLCString	replace;
+		char *theCID = kOEImportCID.ToString();
+		rv = catMan->AddCategoryEntry( "mailnewsimport", theCID, kOESupportsString, PR_TRUE, PR_TRUE, getter_Copies( replace));
+		nsCRT::free( theCID);
+	}
+
+    return( rv);
+}
+
+NS_METHOD OutlookRegister(nsIComponentManager *aCompMgr,
+                          nsIFile *aPath, const char *registryLocation,
+                          const char *componentType,
+                          const nsModuleComponentInfo *info)
+{
+	nsresult rv;
+	
+	nsCOMPtr<nsICategoryManager> catMan = do_GetService( NS_CATEGORYMANAGER_CONTRACTID, &rv);
+	if (NS_SUCCEEDED( rv)) {
+		nsXPIDLCString	replace;
+		char *theCID = kOutlookImportCID.ToString();
+		rv = catMan->AddCategoryEntry( "mailnewsimport", theCID, kOutlookSupportsString, PR_TRUE, PR_TRUE, getter_Copies( replace));
+		nsCRT::free( theCID);
+	}
+
+	return( rv);
+}
+#endif
+
+#endif // XP_WIN
+
+static const nsModuleComponentInfo components[] = {
+    ////////////////////////////////////////////////////////////////////////////////
+    // core import components
+    ////////////////////////////////////////////////////////////////////////////////
+    { "Import Service Component", NS_IMPORTSERVICE_CID, 
+        NS_IMPORTSERVICE_CONTRACTID, nsImportServiceConstructor },
+    { "Import Mime Encoder", NS_IMPORTMIMEENCODE_CID, 
+      "@mozilla.org/import/import-mimeencode;1", nsIImportMimeEncodeImplConstructor},
+   
+    ////////////////////////////////////////////////////////////////////////////////
+    // text import components
+    ////////////////////////////////////////////////////////////////////////////////
+    { "Text Import Component", NS_TEXTIMPORT_CID,
+	  "@mozilla.org/import/import-text;1", nsTextImportConstructor, TextRegister, nsnull },
+
+    ////////////////////////////////////////////////////////////////////////////////
+    // nsComm4x import components
+    ////////////////////////////////////////////////////////////////////////////////
+    { "Comm4xMail Import Component", NS_COMM4XMAILIMPORT_CID,
+      "@mozilla.org/import/import-comm4xMail;1", nsComm4xMailImportConstructor, Comm4xMailRegister, nsnull },
+    { "Comm4xMail Import Mail Implementation", NS_COMM4XMAILIMPL_CID,
+      NS_COMM4XMAILIMPL_CONTRACTID, ImportComm4xMailImplConstructor},
+    { NS_ICOMM4XPROFILE_CLASSNAME, NS_ICOMM4XPROFILE_CID,
+      NS_ICOMM4XPROFILE_CONTRACTID, nsComm4xProfileConstructor }
+
+    ////////////////////////////////////////////////////////////////////////////////
+    // eduora import components
+    ////////////////////////////////////////////////////////////////////////////////
+#ifdef XP_WIN
+    ,{ "Text Import Component", NS_EUDORAIMPORT_CID,
+	  "@mozilla.org/import/import-eudora;1", nsEudoraImportConstructor, EudoraRegister, nsnull }
+
+#if defined(_MSC_VER) && _MSC_VER >= 1100
+    ////////////////////////////////////////////////////////////////////////////////
+    // oexpress import components
+    ////////////////////////////////////////////////////////////////////////////////
+    ,{ "Outlook Express Import Component", NS_OEIMPORT_CID,
+	  "@mozilla.org/import/import-oe;1", nsOEImportConstructor,	OERegister,	nsnull },
+    { "Outlook Import Component", NS_OUTLOOKIMPORT_CID,
+	  "@mozilla.org/import/import-outlook;1", nsOutlookImportConstructor, OutlookRegister, nsnull }
+#endif
+#endif
+
+};
+
+
+PR_STATIC_CALLBACK(void) importModuleDtor(nsIModule* self)
+{
+	nsImportStringBundle::Cleanup();
+    nsTextStringBundle::Cleanup();
+
+#ifdef XP_WIN
+    nsEudoraStringBundle::Cleanup();
+
+#if defined(_MSC_VER) && _MSC_VER >= 1100
+    nsOEStringBundle::Cleanup();
+    nsOutlookStringBundle::Cleanup();
+#endif
+
+#endif
+}
+
+NS_IMPL_NSGETMODULE_WITH_DTOR( nsImportServiceModule, components, importModuleDtor)
+
+