start fixing this branch

git-svn-id: svn://10.0.0.236/branches/alecf_killuri_branch@50832 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/mailnews/Makefile.in

@@ -0,0 +1,28 @@
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+DEPTH		= ..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+DIRS		= idl public base db news local compose mime imap addrbook
+
+include $(topsrcdir)/config/rules.mk
+

mozilla/mailnews/addrbook/resources/content/abCommon.js

@@ -3,9 +3,21 @@
 // Controller object for Results Pane
 var ResultsPaneController =
 {
-	IsCommandEnabled: function(command)
+    supportsCommand: function(command)
 	{
-		dump('ResultsPaneController::IsCommandEnabled(' + command + ')\n');
+        switch ( command )
+		{
+			case "cmd_selectAll":
+			case "cmd_delete":
+                return true;
+			default:
+				return false;
+		}
+	},
+
+	isCommandEnabled: function(command)
+	{
+		dump('ResultsPaneController::isCommandEnabled(' + command + ')\n');
 		switch ( command )
 		{
 			case "cmd_selectAll":
@@ -23,7 +35,7 @@ var ResultsPaneController =
 		}
 	},
 
-	DoCommand: function(command)
+	doCommand: function(command)
 	{
 		var resultsTree = document.getElementById('resultsTree');
 		
@@ -52,9 +64,21 @@ var ResultsPaneController =
 // Controller object for Dir Pane
 var DirPaneController =
 {
-	IsCommandEnabled: function(command)
+    supportsCommand: function(command)
 	{
-		dump('DirPaneController::IsCommandEnabled(' + command + ')\n');
+        switch ( command )
+		{
+			case "cmd_selectAll":
+			case "cmd_delete":
+                return true;
+			default:
+				return false;
+		}
+	},
+
+	isCommandEnabled: function(command)
+	{
+		dump('DirPaneController::isCommandEnabled(' + command + ')\n');
 		switch ( command )
 		{
 			case "cmd_selectAll":
@@ -71,7 +95,7 @@ var DirPaneController =
 		}
 	},
 
-	DoCommand: function(command)
+	doCommand: function(command)
 	{
 		var dirTree = document.getElementById('dirTree');
 
@@ -99,13 +123,19 @@ function SetupCommandUpdateHandlers()
 	
 	// dir pane
 	widget = document.getElementById('dirTree');
-	if ( widget )
-		widget.controller = DirPaneController;
+	if ( widget ) {
+	    dump('About to execute appendController(DirPaneController \n');
+		widget.controllers.appendController(DirPaneController);
+		dump('Finished appendController(DirPaneController \n');
+    }
 	
 	// results pane
 	widget = document.getElementById('resultsTree');
-	if ( widget )
-		widget.controller = ResultsPaneController;
+	if ( widget ) {
+	    dump('About to execute appendController(ResultsPaneController \n');
+		widget.controllers.appendController(ResultsPaneController);
+		dump('Finished to execute appendController(ResultsPaneController \n');
+		}
 }
 
 

mozilla/mailnews/addrbook/resources/locale/en-US/abMainWindow.dtd

@@ -74,9 +74,9 @@ Rights Reserved.
 <!ENTITY newmsgButton.label "New Msg">  
 <!ENTITY deleteButton.img "chrome://messenger/skin/trash.gif">
 <!ENTITY deleteButton.label "Delete">  
-<!ENTITY stopButton.img "resource:/res/toolbar/TB_Stop.gif">
+<!ENTITY stopButton.img "chrome://global/skin/stop.gif">
 <!ENTITY stopButton.label ".Stop">  
-<!ENTITY searchButton.img "resource:/res/toolbar/TB_Search.gif">
+<!ENTITY searchButton.img "chrome://navigator/skin/search.gif">
 <!ENTITY searchButton.label ".Search">  
 <!ENTITY showNames.label "Show names containing:">  
 <!ENTITY throbber.img "resource:/res/throbber/anims00.gif">

mozilla/mailnews/addrbook/src/nsAbAddressCollecter.cpp

@@ -51,6 +51,7 @@ nsAbAddressCollecter::~nsAbAddressCollecter()
 	{
 		m_historyAB->Commit(kSessionCommit);
 		m_historyAB->Close(PR_FALSE);
+		m_historyAB = null_nsCOMPtr();
 	}
 }
 

mozilla/mailnews/addrbook/src/nsAbCard.cpp

@@ -45,8 +45,6 @@ nsAbCard::~nsAbCard(void)
 	{
 		nsIAddrDBListener* listener = this;
 		mCardDatabase->RemoveListener(listener);
-
-		mCardDatabase->Close(PR_TRUE);
 		mCardDatabase = null_nsCOMPtr();
 	}
 

mozilla/mailnews/addrbook/src/nsAbCardProperty.cpp

@@ -163,10 +163,7 @@ nsAbCardProperty::~nsAbCardProperty(void)
 		RemoveAnonymousList(m_pAnonymousBoolValues);
 
 	if (mCardDatabase)
-	{
-		mCardDatabase->Close(PR_TRUE);
 		mCardDatabase = null_nsCOMPtr();
-	}
 }
 
 nsresult nsAbCardProperty::RemoveAnonymousList(nsVoidArray* pArray)

mozilla/mailnews/addrbook/src/nsAddrDatabase.cpp

@@ -172,7 +172,7 @@ nsAddrDatabase::~nsAddrDatabase()
         delete m_ChangeListeners;
     }
 
-	CleanupCache();
+	RemoveFromCache(this);
 
 	if (m_pAnonymousStrAttributes)
 		RemoveAnonymousList(m_pAnonymousStrAttributes);
@@ -558,7 +558,7 @@ NS_IMETHODIMP nsAddrDatabase::Open
 		return NS_ERROR_OUT_OF_MEMORY;
 	}
 
-	pAddressBookDB->AddRef();
+	NS_ADDREF(pAddressBookDB);
 
 	err = pAddressBookDB->OpenMDB(pabName, create);
 	if (NS_SUCCEEDED(err)) 
@@ -567,7 +567,6 @@ NS_IMETHODIMP nsAddrDatabase::Open
 		*pAddrDB = pAddressBookDB;
 		if (pAddressBookDB)  
 			GetDBCache()->AppendElement(pAddressBookDB);
-		NS_IF_ADDREF(*pAddrDB);
 	}
 	else 
 	{
@@ -614,30 +613,8 @@ NS_IMETHODIMP nsAddrDatabase::OpenMDB(nsFileSpec *dbName, PRBool create)
 				mdbOpenPolicy inOpenPolicy;
 				mdb_bool	canOpen;
 				mdbYarn		outFormatVersion;
-				// char		bufFirst512Bytes[512];
-				// mdbYarn		first512Bytes;
-
-				// first512Bytes.mYarn_Buf = bufFirst512Bytes;
-				// first512Bytes.mYarn_Size = 512;
-				// first512Bytes.mYarn_Fill = 512;
-				// first512Bytes.mYarn_Form = 0;	// what to do with this? we're storing csid in the msg hdr...
-
-				// {
-				// 	nsFileSpec ioStream(dbName->GetCString());
-				// 	nsIOFileStream *dbStream = new nsIOFileStream(ioStream);
-				// 	if (dbStream) {
-				// 		PRInt32 bytesRead = dbStream->read(bufFirst512Bytes, sizeof(bufFirst512Bytes));
-				// 		first512Bytes.mYarn_Fill = bytesRead;
-				// 		dbStream->close();
-				// 		delete dbStream;
-				// 	}
-				// 	else {
-				// 		PR_FREEIF(nativeFileName);
-				// 		return NS_ERROR_OUT_OF_MEMORY;
-				// 	}
-				// }
-				
 				nsIMdbFile* oldFile = 0;
+
 				ret = myMDBFactory->OpenOldFile(m_mdbEnv, dbHeap, nativeFileName,
 					 dbFrozen, &oldFile);
 				if ( oldFile )
@@ -712,6 +689,10 @@ NS_IMETHODIMP nsAddrDatabase::OpenMDB(nsFileSpec *dbName, PRBool create)
 					newFile->CutStrongRef(m_mdbEnv); // always release our file ref, store has own
 				}
 			}
+			if(thumb)
+			{
+				thumb->CutStrongRef(m_mdbEnv);
+			}
 		}
 	}
 	return ret;
@@ -721,6 +702,11 @@ NS_IMETHODIMP nsAddrDatabase::CloseMDB(PRBool commit)
 {
 	if (commit)
 		Commit(kSessionCommit);
+	if (m_mdbStore)
+	{
+		m_mdbStore->CloseMdbObject(m_mdbEnv);
+		m_mdbStore = nsnull;
+	}
 	return NS_OK;
 }
 
@@ -765,11 +751,6 @@ NS_IMETHODIMP nsAddrDatabase::ForceClosed()
 	RemoveFromCache(this);
 
 	err = CloseMDB(PR_FALSE);	// since we're about to delete it, no need to commit.
-	if (m_mdbStore)
-	{
-		m_mdbStore->CloseMdbObject(m_mdbEnv);
-		m_mdbStore = nsnull;
-	}
 	Release();
 	return err;
 }

mozilla/mailnews/addrbook/src/nsDirectoryDataSource.cpp

@@ -77,7 +77,6 @@ nsAbDirectoryDataSource::nsAbDirectoryDataSource():
   mInitialized(PR_FALSE),
   mRDFService(nsnull)
 {
-
 }
 
 nsAbDirectoryDataSource::~nsAbDirectoryDataSource (void)
@@ -178,7 +177,6 @@ NS_IMETHODIMP nsAbDirectoryDataSource::GetTarget(nsIRDFResource* source,
                                                nsIRDFNode** target)
 {
   nsresult rv = NS_RDF_NO_VALUE;
-
   // we only have positive assertions in the mail data source.
   if (! tv)
     return NS_RDF_NO_VALUE;

mozilla/mailnews/base/Makefile.in

@@ -0,0 +1,32 @@
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+DEPTH		= ../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+DIRS		= public src util search prefs build resources
+
+ifdef ENABLE_TESTS
+DIRS		+= tests
+endif
+
+include $(topsrcdir)/config/rules.mk
+

mozilla/mailnews/base/build/MANIFEST

@@ -0,0 +1,19 @@
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+# This is a list of local files which get copied to the mozilla:dist:mailnews directory
+#
+
+nsMsgBaseCID.h

mozilla/mailnews/base/build/Makefile.in

@@ -0,0 +1,53 @@
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= msgbase
+LIBRARY_NAME	= mailnews
+IS_COMPONENT	= 1
+
+CPPSRCS		= nsMsgFactory.cpp
+EXPORTS		= nsMsgBaseCID.h
+
+SHARED_LIBRARY_LIBS = \
+		$(DIST)/lib/libmsgbase_s.a \
+		$(DIST)/lib/librdfutil_s.a \
+		$(DIST)/lib/libmsgsearch_s.a \
+		$(NULL)
+
+EXTRA_DSO_LDOPTS = \
+		$(MKSHLIB_FORCE_ALL) \
+		$(SHARED_LIBRARY_LIBS) \
+		$(MKSHLIB_UNFORCE_ALL) \
+		-L$(DIST)/lib	\
+		$(MOZ_TIMER_LIBS) \
+		-L$(DIST)/bin \
+		-lxpcom \
+		-lmsgbaseutil \
+		$(NSPR_LIBS) \
+		$(NULL)
+
+include $(topsrcdir)/config/rules.mk
+
+$(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile
+

mozilla/mailnews/base/build/makefile.win

@@ -0,0 +1,50 @@
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+DEPTH=..\..\..
+MODULE=msgbase 
+
+LIBNAME = .\$(OBJDIR)\msgbase
+DLL = $(LIBNAME).dll
+
+################################################################################
+## exports
+
+EXPORTS =              		\
+			nsMsgBaseCID.h  \
+	        $(NULL)
+
+################################################################################
+## library
+
+CPP_OBJS=									\
+			.\$(OBJDIR)\nsMsgFactory.obj    \
+			$(NULL)
+
+LLIBS=										\
+			$(DIST)\lib\xpcom.lib			\
+			$(DIST)\lib\msgbsutl.lib		\
+			$(DIST)\lib\msgbase_s.lib		\
+			$(DIST)\lib\msgsearch_s.lib		\
+			$(DIST)\lib\timer_s.lib 		\
+			$(LIBNSPR)						\
+			$(NULL)
+
+include <$(DEPTH)/config/rules.mak>
+
+install:: $(DLL)
+	$(MAKE_INSTALL)  $(LIBNAME).$(DLL_SUFFIX) $(DIST)\bin\components
+	$(MAKE_INSTALL)  $(LIBNAME).$(LIB_SUFFIX) $(DIST)\lib
+

mozilla/mailnews/base/build/nsMsgBaseCID.h

@@ -0,0 +1,250 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsMessageBaseCID_h__
+#define nsMessageBaseCID_h__
+
+#include "nsISupports.h"
+#include "nsIFactory.h"
+#include "nsIComponentManager.h"
+
+#define NS_MSGFOLDEREVENT_CID				              \
+{ /* FBFEBE7A-C1DD-11d2-8A40-0060B0FC04D2 */      \
+ 0xfbfebe7a, 0xc1dd, 0x11d2,                      \
+ {0x8a, 0x40, 0x0, 0x60, 0xb0, 0xfc, 0x4, 0xd2}}
+
+#define NS_MSGGROUPRECORD_CID                     \
+{ /* a8f54ee0-d292-11d2-b7f6-00805f05ffa5 */      \
+ 0xa8f54ee0, 0xd292, 0x11d2,                      \
+ {0xb7, 0xf6, 0x00, 0x80, 0x5f, 0x05, 0xff, 0xa5}}
+
+//
+// nsMsgFolderDataSource
+//
+#define NS_MAILNEWSFOLDERDATASOURCE_PROGID \
+  NS_RDF_DATASOURCE_PROGID_PREFIX "mailnewsfolders"
+
+#define NS_MAILNEWSFOLDERDATASOURCE_CID                    \
+{ /* 2B8ED4A4-F684-11d2-8A5D-0060B0FC04D2 */         \
+    0x2b8ed4a4,                                      \
+    0xf684,                                          \
+    0x11d2,                                          \
+    {0x8a, 0x5d, 0x0, 0x60, 0xb0, 0xfc, 0x4, 0xd2} \
+}
+
+//
+// nsMsgMessageDataSource
+//
+#define NS_MAILNEWSMESSAGEDATASOURCE_PROGID \
+  NS_RDF_DATASOURCE_PROGID_PREFIX "mailnewsmessages"
+
+#define NS_MAILNEWSMESSAGEDATASOURCE_CID                    \
+{ /* 2B8ED4A5-F684-11d2-8A5D-0060B0FC04D2 */         \
+    0x2b8ed4a5,                                      \
+    0xf684,                                          \
+    0x11d2,                                          \
+    {0x8a, 0x5d, 0x0, 0x60, 0xb0, 0xfc, 0x4, 0xd2} \
+}
+
+
+//
+// nsMessageViewDataSource
+//
+#define NS_MESSAGEVIEWDATASOURCE_PROGID \
+  NS_RDF_DATASOURCE_PROGID_PREFIX "mail-messageview"
+
+#define NS_MESSAGEVIEWDATASOURCE_CID				\
+{ /* 14495573-E945-11d2-8A52-0060B0FC04D2 */		\
+0x14495573, 0xe945, 0x11d2,							\
+{0x8a, 0x52, 0x0, 0x60, 0xb0, 0xfc, 0x4, 0xd2}}
+
+
+//
+// nsMsgAccountManager
+// 
+#define NS_MSGACCOUNTMANAGER_PROGID \
+  "component://netscape/messenger/account-manager"
+
+#define NS_MSGACCOUNTMANAGER_CID									\
+{ /* D2876E50-E62C-11d2-B7FC-00805F05FFA5 */			\
+ 0xd2876e50, 0xe62c, 0x11d2,											\
+ {0xb7, 0xfc, 0x0, 0x80, 0x5f, 0x5, 0xff, 0xa5 }}
+
+//
+// nsMsgIdentity
+//
+#define NS_MSGIDENTITY_PROGID \
+  "component://netscape/messenger/identity"
+
+#define NS_MSGIDENTITY_CID												\
+{ /* 8fbf6ac0-ebcc-11d2-b7fc-00805f05ffa5 */			\
+ 0x8fbf6ac0, 0xebcc, 0x11d2,											\
+ {0xb7, 0xfc, 0x0, 0x80, 0x5f, 0x5, 0xff, 0xa5 }}
+
+//
+// nsMsgIncomingServer
+#define NS_MSGINCOMINGSERVER_PROGID_PREFIX \
+  "component://netscape/messenger/server&type="
+
+#define NS_MSGINCOMINGSERVER_PROGID \
+  NS_MSGINCOMINGSERVER_PROGID_PREFIX "generic"
+
+/* {66e5ff08-5126-11d3-9711-006008948010} */
+#define NS_MSGINCOMINGSERVER_CID \
+  {0x66e5ff08, 0x5126, 0x11d3, \
+    {0x97, 0x11, 0x00, 0x60, 0x08, 0x94, 0x80, 0x10}}
+
+
+//
+// nsMsgAccount
+//
+#define NS_MSGACCOUNT_PROGID \
+  "component://netscape/messenger/account"
+
+#define NS_MSGACCOUNT_CID													\
+{ /* 68b25510-e641-11d2-b7fc-00805f05ffa5 */			\
+ 0x68b25510, 0xe641, 0x11d2,											\
+ {0xb7, 0xfc, 0x0, 0x80, 0x5f, 0x5, 0xff, 0xa5 }}
+
+//
+// nsMsgFilterService
+//
+#define NS_MSGFILTERSERVICE_PROGID \
+  "component://netscape/messenger/services/filters"
+
+#define NS_MSGFILTERSERVICE_CID                         \
+{ 0x5cbb0700, 0x04bc, 0x11d3,                 \
+    { 0xa5, 0x0a, 0x0, 0x60, 0xb0, 0xfc, 0x04, 0xb7 } }
+
+
+//
+// nsMsgSearchSession
+//
+/* e9a7cd70-0303-11d3-a50a-0060b0fc04b7 */
+#define NS_MSGSEARCHSESSION_CID						  \
+{ 0xe9a7cd70, 0x0303, 0x11d3,                 \
+    { 0xa5, 0x0a, 0x0, 0x60, 0xb0, 0xfc, 0x04, 0xb7 } }
+
+//
+// nsMsgMailSession
+//
+#define NS_MSGMAILSESSION_PROGID \
+  "component://netscape/messenger/services/session"
+
+/* D5124441-D59E-11d2-806A-006008128C4E */
+#define NS_MSGMAILSESSION_CID							\
+{ 0xd5124441, 0xd59e, 0x11d2,							\
+    { 0x80, 0x6a, 0x0, 0x60, 0x8, 0x12, 0x8c, 0x4e } }
+
+//
+// nsMsgBiffManager
+//
+#define NS_MSGBIFFMANAGER_PROGID \
+  "component://netscape/messenger/biffManager"
+
+/* 4A374E7E-190F-11d3-8A88-0060B0FC04D2 */
+#define NS_MSGBIFFMANAGER_CID							\
+{ 0x4a374e7e, 0x190f, 0x11d3,							\
+    { 0x8a, 0x88, 0x0, 0x60, 0xb0, 0xfc, 0x4, 0xd2 } }
+
+//
+// nsMsgNotificationManager
+//
+#define NS_MSGNOTIFICATIONMANAGER_PROGID \
+  NS_RDF_DATASOURCE_PROGID_PREFIX "msgnotifications"
+
+/* 7C601F60-1EF3-11d3-9574-006097222B83 */
+#define NS_MSGNOTIFICATIONMANAGER_CID							\
+{ 0x7c601f60, 0x1ef3, 0x11d3,							\
+    { 0x95, 0x74, 0x0, 0x60, 0x97, 0x22, 0x2b, 0x83 } }
+
+//
+// nsCopyMessageStreamListener
+//
+#define NS_COPYMESSAGESTREAMLISTENER_PROGID \
+  "component://netscape/messenger/copymessagestreamlistener"
+
+#define NS_COPYMESSAGESTREAMLISTENER_CID							\
+{ 0x7741daed, 0x2125, 0x11d3,							\
+    { 0x8a, 0x90, 0x0, 0x60, 0xb0, 0xfc, 0x4, 0xd2 } }
+
+//
+// nsMsgCopyService
+//
+#define NS_MSGCOPYSERVICE_PROGID \
+  "component://netscape/messenger/messagecopyservice"
+
+/* c766e666-29bd-11d3-afb3-001083002da8 */
+#define NS_MSGCOPYSERVICE_CID \
+{ 0xc766e666, 0x29bd, 0x11d3, \
+    { 0xaf, 0xb3, 0x00, 0x10, 0x83, 0x00, 0x2d, 0xa8 } }
+
+#define NS_MSGFOLDERCACHE_PROGID \
+	"component://netscape/messenger/msgFolderCache"
+
+/* bcdca970-3b22-11d3-8d76-00805f8a6617 */
+#define NS_MSGFOLDERCACHE_CID \
+{ 0xbcdca970, 0x3b22, 0x11d3,  \
+	{ 0x8d, 0x76, 0x00, 0x80, 0xf5, 0x8a, 0x66, 0x17 } }
+
+//
+// nsUrlListenerManager
+//
+#define NS_URLLISTENERMANAGER_PROGID \
+  "component://netscape/messenger/urlListenerManager"
+
+/* B1AA0820-D04B-11d2-8069-006008128C4E */
+#define NS_URLLISTENERMANAGER_CID \
+{ 0xb1aa0820, 0xd04b, 0x11d2, \
+  {0x80, 0x69, 0x0, 0x60, 0x8, 0x12, 0x8c, 0x4e} }
+
+//
+// nsMessengerBootstrap
+//
+#define NS_MESSENGERBOOTSTRAP_PROGID \
+  "component://netscape/appshell/component/messenger"
+
+//
+// nsMessenger
+//
+#define NS_MESSENGER_PROGID	\
+  "component://netscape/messenger"
+
+//
+// nsMsgStatusFeedback
+//
+#define NS_MSGSTATUSFEEDBACK_PROGID \
+  "component://netscape/messenger/statusfeedback"
+
+/* B1AA0820-D04B-11d2-8069-006008128C4E */
+#define NS_MSGSTATUSFEEDBACK_CID \
+{ 0xbd85a417, 0x5433, 0x11d3, \
+  {0x8a, 0xc5, 0x0, 0x60, 0xb0, 0xfc, 0x4, 0xd2} }
+
+//
+//nsMessageView
+//
+#define NS_MESSAGEVIEW_PROGID \
+	"component://netscape/messenger/messageview"
+
+/* 4E03B3A6-624A-11d3-8AD4-0060B0FC04D2*/
+#define NS_MESSAGEVIEW_CID \
+{ 0x4e03b3a6, 0x624a, 0x11d3, \
+  { 0x8a, 0xd4, 0x0, 0x60, 0xb0, 0xfc, 0x4, 0xd2}}
+
+#endif // nsMessageBaseCID_h__

mozilla/mailnews/base/build/nsMsgFactory.cpp

@@ -0,0 +1,505 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsIFactory.h"
+#include "nsISupports.h"
+#include "msgCore.h"
+#include "nsIModule.h"
+#include "nsIGenericFactory.h"
+#include "nsMsgBaseCID.h"
+#include "pratom.h"
+#include "nsIComponentManager.h"
+#include "nsIServiceManager.h"
+#include "rdf.h"
+#include "nsCRT.h"
+#include "nsCOMPtr.h"
+
+#include "nsMessengerBootstrap.h"
+#include "nsMessenger.h"
+#include "nsMsgGroupRecord.h"
+
+#include "nsIAppShellComponent.h"
+#include "nsIRegistry.h"
+
+
+/* Include all of the interfaces our factory can generate components for */
+
+#include "nsIUrlListenerManager.h"
+#include "nsUrlListenerManager.h"
+#include "nsMsgMailSession.h"
+#include "nsMsgAccount.h"
+#include "nsMsgAccountManager.h"
+#include "nsMsgIdentity.h"
+#include "nsMsgIncomingServer.h"
+#include "nsMessageViewDataSource.h"
+#include "nsMsgFolderDataSource.h"
+#include "nsMsgMessageDataSource.h"
+
+#include "nsMsgAccountManagerDS.h"
+
+#include "nsMsgBiffManager.h"
+#include "nsMsgNotificationManager.h"
+
+#include "nsCopyMessageStreamListener.h"
+#include "nsMsgCopyService.h"
+
+#include "nsMsgFolderCache.h"
+
+#include "nsMsgStatusFeedback.h"
+
+#include "nsMsgFilterService.h"
+#include "nsMessageView.h"
+
+static NS_DEFINE_CID(kComponentManagerCID, NS_COMPONENTMANAGER_CID);
+
+static NS_DEFINE_CID(kCMsgMailSessionCID, NS_MSGMAILSESSION_CID); 
+
+static NS_DEFINE_CID(kCUrlListenerManagerCID, NS_URLLISTENERMANAGER_CID);
+
+static NS_DEFINE_CID(kCMessengerBootstrapCID, NS_MESSENGERBOOTSTRAP_CID);
+
+static NS_DEFINE_CID(kCMsgFolderEventCID, NS_MSGFOLDEREVENT_CID);
+
+static NS_DEFINE_CID(kCMessengerCID, NS_MESSENGER_CID);
+static NS_DEFINE_CID(kCMsgGroupRecordCID, NS_MSGGROUPRECORD_CID);
+
+static NS_DEFINE_CID(kMailNewsFolderDataSourceCID, NS_MAILNEWSFOLDERDATASOURCE_CID);
+static NS_DEFINE_CID(kMailNewsMessageDataSourceCID, NS_MAILNEWSMESSAGEDATASOURCE_CID);
+
+// account manager stuff
+static NS_DEFINE_CID(kMsgAccountManagerCID, NS_MSGACCOUNTMANAGER_CID);
+static NS_DEFINE_CID(kMsgAccountCID, NS_MSGACCOUNT_CID);
+static NS_DEFINE_CID(kMsgIdentityCID, NS_MSGIDENTITY_CID);
+static NS_DEFINE_CID(kMsgIncomingServerCID, NS_MSGINCOMINGSERVER_CID);
+
+// account manager RDF stuff
+static NS_DEFINE_CID(kMsgAccountManagerDataSourceCID, NS_MSGACCOUNTMANAGERDATASOURCE_CID);
+
+// search and filter stuff
+static NS_DEFINE_CID(kMsgSearchSessionCID, NS_MSGSEARCHSESSION_CID);
+static NS_DEFINE_CID(kMsgFilterServiceCID, NS_MSGFILTERSERVICE_CID);
+
+// Biff and notifications
+static NS_DEFINE_CID(kMsgBiffManagerCID, NS_MSGBIFFMANAGER_CID);
+static NS_DEFINE_CID(kMsgNotificationManagerCID, NS_MSGNOTIFICATIONMANAGER_CID);
+
+// Copy
+static NS_DEFINE_CID(kCopyMessageStreamListenerCID,
+                     NS_COPYMESSAGESTREAMLISTENER_CID);
+static NS_DEFINE_CID(kMsgCopyServiceCID, NS_MSGCOPYSERVICE_CID);
+
+// Msg Folder Cache stuff
+static NS_DEFINE_CID(kMsgFolderCacheCID, NS_MSGFOLDERCACHE_CID);
+
+//Feedback stuff
+static NS_DEFINE_CID(kMsgStatusFeedbackCID, NS_MSGSTATUSFEEDBACK_CID);
+
+//MessageView
+static NS_DEFINE_CID(kMessageViewCID, NS_MESSAGEVIEW_CID);
+
+
+// private factory declarations for each component we know how to produce
+
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsMessengerBootstrap)
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsUrlListenerManager)
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsMsgMailSession, Init)
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsMessenger)
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgAccountManager)
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgAccount)
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgIdentity)
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsMsgFolderDataSource, Init)
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsMsgMessageDataSource, Init)
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgAccountManagerDataSource)
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgFilterService)
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgBiffManager)
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsMsgNotificationManager, Init)
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsCopyMessageStreamListener)
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgCopyService)
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgFolderCache)
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgStatusFeedback)
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsMessageView,Init)
+
+// Module implementation for the sample library
+class nsMsgBaseModule : public nsIModule
+{
+public:
+    nsMsgBaseModule();
+    virtual ~nsMsgBaseModule();
+
+    NS_DECL_ISUPPORTS
+
+    NS_DECL_NSIMODULE
+
+protected:
+    nsresult Initialize();
+
+    void Shutdown();
+
+    PRBool mInitialized;
+
+    nsCOMPtr<nsIGenericFactory> mMessengerBootstrapFactory;
+    nsCOMPtr<nsIGenericFactory> mUrlListenerManagerFactory;
+    nsCOMPtr<nsIGenericFactory> mMsgMailSessionFactory;
+    nsCOMPtr<nsIGenericFactory> mMessengerFactory;
+    nsCOMPtr<nsIGenericFactory> mMsgAccountManagerFactory;
+    nsCOMPtr<nsIGenericFactory> mMsgAccountFactory;
+    nsCOMPtr<nsIGenericFactory> mMsgIdentityFactory;
+    nsCOMPtr<nsIGenericFactory> mMsgFolderDataSourceFactory;
+    nsCOMPtr<nsIGenericFactory> mMsgMessageDataSourceFactory;
+    nsCOMPtr<nsIGenericFactory> mMsgAccountManagerDataSourceFactory;
+    nsCOMPtr<nsIGenericFactory> mMsgFilterServiceFactory;
+    nsCOMPtr<nsIGenericFactory> mMsgBiffManagerFactory;
+    nsCOMPtr<nsIGenericFactory> mMsgNotificationManagerFactory;
+    nsCOMPtr<nsIGenericFactory> mCopyMessageStreamListenerFactory;
+    nsCOMPtr<nsIGenericFactory> mMsgCopyServiceFactory;
+    nsCOMPtr<nsIGenericFactory> mMsgFolderCacheFactory;
+    nsCOMPtr<nsIGenericFactory> mMsgStatusFeedbackFactory;
+    nsCOMPtr<nsIGenericFactory> mMessageViewFactory;
+};
+
+nsMsgBaseModule::nsMsgBaseModule()
+    : mInitialized(PR_FALSE)
+{
+    NS_INIT_ISUPPORTS();
+}
+
+nsMsgBaseModule::~nsMsgBaseModule()
+{
+    Shutdown();
+}
+
+NS_IMPL_ISUPPORTS(nsMsgBaseModule, NS_GET_IID(nsIModule))
+
+// Perform our one-time intialization for this module
+nsresult nsMsgBaseModule::Initialize()
+{
+    if (mInitialized)
+        return NS_OK;
+
+    mInitialized = PR_TRUE;
+    return NS_OK;
+}
+
+// Shutdown this module, releasing all of the module resources
+void nsMsgBaseModule::Shutdown()
+{
+    // Release the factory object
+    mMessengerBootstrapFactory = null_nsCOMPtr();
+    mUrlListenerManagerFactory = null_nsCOMPtr();
+    mMsgMailSessionFactory = null_nsCOMPtr();
+    mMessengerFactory = null_nsCOMPtr();
+    mMsgAccountManagerFactory = null_nsCOMPtr();
+    mMsgAccountFactory = null_nsCOMPtr();
+    mMsgIdentityFactory = null_nsCOMPtr();
+    mMsgFolderDataSourceFactory = null_nsCOMPtr();
+    mMsgMessageDataSourceFactory = null_nsCOMPtr();
+    mMsgAccountManagerDataSourceFactory = null_nsCOMPtr();
+    mMsgFilterServiceFactory = null_nsCOMPtr();
+    mMsgBiffManagerFactory = null_nsCOMPtr();
+    mMsgNotificationManagerFactory = null_nsCOMPtr();
+    mCopyMessageStreamListenerFactory = null_nsCOMPtr();
+    mMsgCopyServiceFactory = null_nsCOMPtr();
+    mMsgFolderCacheFactory = null_nsCOMPtr();
+    mMsgStatusFeedbackFactory = null_nsCOMPtr();
+    mMessageViewFactory = null_nsCOMPtr();
+}
+
+// Create a factory object for creating instances of aClass.
+NS_IMETHODIMP nsMsgBaseModule::GetClassObject(nsIComponentManager *aCompMgr,
+                               const nsCID& aClass,
+                               const nsIID& aIID,
+                               void** r_classObj)
+{
+    nsresult rv;
+
+    // Defensive programming: Initialize *r_classObj in case of error below
+    if (!r_classObj)
+        return NS_ERROR_INVALID_POINTER;
+
+    *r_classObj = NULL;
+
+    // Do one-time-only initialization if necessary
+    if (!mInitialized) 
+    {
+        rv = Initialize();
+        if (NS_FAILED(rv)) // Initialization failed! yikes!
+            return rv;
+    }
+    // Choose the appropriate factory, based on the desired instance
+    // class type (aClass).
+    nsCOMPtr<nsIGenericFactory> fact;
+
+    if (aClass.Equals(kCMessengerBootstrapCID))
+    {
+        if (!mMessengerBootstrapFactory)
+            rv = NS_NewGenericFactory(getter_AddRefs(mMessengerBootstrapFactory), &nsMessengerBootstrapConstructor);
+        fact = mMessengerBootstrapFactory;
+    }
+    else if (aClass.Equals(kCUrlListenerManagerCID))
+    {
+        if (!mUrlListenerManagerFactory)
+            rv = NS_NewGenericFactory(getter_AddRefs(mUrlListenerManagerFactory), &nsUrlListenerManagerConstructor);
+        fact = mUrlListenerManagerFactory;
+    }
+    else if (aClass.Equals(kCMsgMailSessionCID))
+    {
+        if (!mMsgMailSessionFactory)
+            rv = NS_NewGenericFactory(getter_AddRefs(mMsgMailSessionFactory), &nsMsgMailSessionConstructor);
+        fact = mMsgMailSessionFactory;
+    }
+    else if (aClass.Equals(kCMessengerCID))
+    {
+        if (!mMessengerFactory)
+            rv = NS_NewGenericFactory(getter_AddRefs(mMessengerFactory), &nsMessengerConstructor);
+        fact = mMessengerFactory;
+    }
+
+    else if (aClass.Equals(kMsgAccountManagerCID))
+    {
+        if (!mMsgAccountManagerFactory)
+            rv = NS_NewGenericFactory(getter_AddRefs(mMsgAccountManagerFactory), &nsMsgAccountManagerConstructor);
+        fact = mMsgAccountManagerFactory;
+    }
+    else if (aClass.Equals(kMsgAccountCID))
+    {
+        if (!mMsgAccountFactory)
+            rv = NS_NewGenericFactory(getter_AddRefs(mMsgAccountFactory), &nsMsgAccountConstructor);
+        fact = mMsgAccountFactory;
+    }
+    else if (aClass.Equals(kMsgIdentityCID))
+    {
+        if (!mMsgIdentityFactory)
+            rv = NS_NewGenericFactory(getter_AddRefs(mMsgIdentityFactory), &nsMsgIdentityConstructor);
+        fact = mMsgIdentityFactory;
+    }
+    else if (aClass.Equals(kMailNewsFolderDataSourceCID)) 
+    {
+        if (!mMsgFolderDataSourceFactory)
+            rv = NS_NewGenericFactory(getter_AddRefs(mMsgFolderDataSourceFactory), &nsMsgFolderDataSourceConstructor);
+        fact = mMsgFolderDataSourceFactory;
+    }
+    else if (aClass.Equals(kMailNewsMessageDataSourceCID)) 
+    {
+        if (!mMsgMessageDataSourceFactory)
+            rv = NS_NewGenericFactory(getter_AddRefs(mMsgMessageDataSourceFactory), &nsMsgMessageDataSourceConstructor);
+        fact = mMsgMessageDataSourceFactory;
+    }
+    else if (aClass.Equals(kMsgAccountManagerDataSourceCID)) 
+    {
+        if (!mMsgAccountManagerDataSourceFactory)
+            rv = NS_NewGenericFactory(getter_AddRefs(mMsgAccountManagerDataSourceFactory), &nsMsgAccountManagerDataSourceConstructor);
+        fact = mMsgAccountManagerDataSourceFactory;
+    }
+    else if (aClass.Equals(kMsgFilterServiceCID)) 
+    {
+        if (!mMsgFilterServiceFactory)
+            rv = NS_NewGenericFactory(getter_AddRefs(mMsgFilterServiceFactory), &nsMsgFilterServiceConstructor);
+        fact = mMsgFilterServiceFactory;
+    }
+    else if (aClass.Equals(kMsgBiffManagerCID)) 
+    {
+        if (!mMsgBiffManagerFactory)
+            rv = NS_NewGenericFactory(getter_AddRefs(mMsgBiffManagerFactory), &nsMsgBiffManagerConstructor);
+        fact = mMsgBiffManagerFactory;
+    }
+    else if (aClass.Equals(kMsgNotificationManagerCID)) 
+    {
+        if (!mMsgNotificationManagerFactory)
+            rv = NS_NewGenericFactory(getter_AddRefs(mMsgNotificationManagerFactory), &nsMsgNotificationManagerConstructor);
+        fact = mMsgNotificationManagerFactory;
+    }
+    else if (aClass.Equals(kCopyMessageStreamListenerCID)) 
+    {
+        if (!mCopyMessageStreamListenerFactory)
+            rv = NS_NewGenericFactory(getter_AddRefs(mCopyMessageStreamListenerFactory), &nsCopyMessageStreamListenerConstructor);
+        fact = mCopyMessageStreamListenerFactory;
+    }
+    else if (aClass.Equals(kMsgCopyServiceCID)) 
+    {
+        if (!mMsgCopyServiceFactory)
+            rv = NS_NewGenericFactory(getter_AddRefs(mMsgCopyServiceFactory), &nsMsgCopyServiceConstructor);
+        fact = mMsgCopyServiceFactory;
+    }
+    else if (aClass.Equals(kMsgFolderCacheCID)) 
+    {
+        if (!mMsgFolderCacheFactory)
+            rv = NS_NewGenericFactory(getter_AddRefs(mMsgFolderCacheFactory), &nsMsgFolderCacheConstructor);
+        fact = mMsgFolderCacheFactory;
+    }
+    else if (aClass.Equals(kMsgStatusFeedbackCID)) 
+    {
+        if (!mMsgStatusFeedbackFactory)
+            rv = NS_NewGenericFactory(getter_AddRefs(mMsgStatusFeedbackFactory), &nsMsgStatusFeedbackConstructor);
+        fact = mMsgStatusFeedbackFactory;
+    }
+    else if (aClass.Equals(kMessageViewCID)) 
+    {
+        if (!mMessageViewFactory)
+            rv = NS_NewGenericFactory(getter_AddRefs(mMessageViewFactory), &nsMessageViewConstructor);
+        fact = mMessageViewFactory;
+    }
+    
+    
+    if (fact)
+        rv = fact->QueryInterface(aIID, r_classObj);
+
+    return rv;
+}
+
+struct Components {
+    const char* mDescription;
+    const nsID* mCID;
+    const char* mProgID;
+};
+
+// The list of components we register
+static Components gComponents[] = {
+    { "Netscape Messenger Bootstrapper", &kCMessengerBootstrapCID,
+      NS_MESSENGERBOOTSTRAP_PROGID },
+    { "UrlListenerManager", &kCUrlListenerManagerCID,
+      NS_URLLISTENERMANAGER_PROGID },
+    { "Mail Session", &kCMsgMailSessionCID,
+      NS_MSGMAILSESSION_PROGID },    
+    { "Messenger DOM interaction object", &kCMessengerCID,
+      NS_MESSENGER_PROGID },
+    { "Messenger Account Manager", &kMsgAccountManagerCID,
+      NS_MSGACCOUNTMANAGER_PROGID },
+    { "Messenger User Account", &kMsgAccountCID,
+      NS_MSGACCOUNT_PROGID },
+    { "Messenger User Identity", &kMsgIdentityCID,
+      NS_MSGIDENTITY_PROGID },
+    { "Mail/News Folder Data Source", &kMailNewsFolderDataSourceCID,
+      NS_MAILNEWSFOLDERDATASOURCE_PROGID },
+    { "Mail/News Message Data Source", &kMailNewsMessageDataSourceCID,
+      NS_MAILNEWSMESSAGEDATASOURCE_PROGID},
+    { "Mail/News Account Manager Data Source", &kMsgAccountManagerDataSourceCID,
+      NS_RDF_DATASOURCE_PROGID_PREFIX "msgaccountmanager"},
+    { "Message Filter Service", &kMsgFilterServiceCID,
+      NS_MSGFILTERSERVICE_PROGID},
+    { "Messenger Biff Manager", &kMsgBiffManagerCID,
+      NS_MSGBIFFMANAGER_PROGID},
+    { "Mail/News Notification Manager", &kMsgNotificationManagerCID,
+      NS_MSGNOTIFICATIONMANAGER_PROGID},
+    { "Mail/News CopyMessage Stream Listener", &kCopyMessageStreamListenerCID,
+      NS_COPYMESSAGESTREAMLISTENER_PROGID},
+    { "Mail/News Message Copy Service", &kMsgCopyServiceCID,
+      NS_MSGCOPYSERVICE_PROGID},
+    { "Mail/News Folder Cache", &kMsgFolderCacheCID,
+      NS_MSGFOLDERCACHE_PROGID},
+    { "Mail/News Status Feedback", &kMsgStatusFeedbackCID,
+      NS_MSGSTATUSFEEDBACK_PROGID},
+    { "Mail/News MessageView", &kMessageViewCID,
+      NS_MESSAGEVIEW_PROGID}
+
+};
+
+#define NUM_COMPONENTS (sizeof(gComponents) / sizeof(gComponents[0]))
+
+NS_IMETHODIMP nsMsgBaseModule::RegisterSelf(nsIComponentManager *aCompMgr,
+                          nsIFileSpec* aPath,
+                          const char* registryLocation,
+                          const char* componentType)
+{
+    nsresult rv = NS_OK;
+
+    Components* cp = gComponents;
+    Components* end = cp + NUM_COMPONENTS;
+    while (cp < end) 
+    {
+        rv = aCompMgr->RegisterComponentSpec(*cp->mCID, cp->mDescription,
+                                             cp->mProgID, aPath, PR_TRUE,
+                                             PR_TRUE);
+        if (NS_FAILED(rv)) 
+            break;
+        cp++;
+    }
+
+   /* Add to MessengerBootstrap appshell component list. */
+    NS_WITH_SERVICE(nsIRegistry, registry, NS_REGISTRY_PROGID, &rv); 
+
+    if ( NS_SUCCEEDED( rv ) ) { 
+      registry->OpenWellKnownRegistry(nsIRegistry::ApplicationComponentRegistry);
+      char buffer[256]; 
+      char *cid = kCMessengerBootstrapCID.ToString();
+      PR_snprintf( buffer, 
+                   sizeof buffer, 
+                   "%s/%s", 
+                   NS_IAPPSHELLCOMPONENT_KEY, 
+                   cid ? cid : "unknown" ); 
+      nsCRT::free(cid); 
+      nsRegistryKey key; 
+      rv = registry->AddSubtree( nsIRegistry::Common, 
+                                 buffer, 
+                                 &key );
+	}
+	  
+  return rv;
+}
+
+NS_IMETHODIMP nsMsgBaseModule::UnregisterSelf(nsIComponentManager* aCompMgr,
+                            nsIFileSpec* aPath,
+                            const char* registryLocation)
+{
+    Components* cp = gComponents;
+    Components* end = cp + NUM_COMPONENTS;
+    while (cp < end) 
+    {
+        aCompMgr->UnregisterComponentSpec(*cp->mCID, aPath);
+        cp++;
+    }
+
+    return NS_OK;
+}
+
+NS_IMETHODIMP nsMsgBaseModule::CanUnload(nsIComponentManager *aCompMgr, PRBool *okToUnload)
+{
+    if (!okToUnload)
+        return NS_ERROR_INVALID_POINTER;
+
+    *okToUnload = PR_FALSE;
+    return NS_ERROR_FAILURE;
+}
+
+//----------------------------------------------------------------------
+
+static nsMsgBaseModule *gModule = NULL;
+
+extern "C" NS_EXPORT nsresult NSGetModule(nsIComponentManager *servMgr,
+                                          nsIFileSpec* location,
+                                          nsIModule** return_cobj)
+{
+    nsresult rv = NS_OK;
+
+    NS_ASSERTION(return_cobj, "Null argument");
+    NS_ASSERTION(gModule == NULL, "nsMsgBaseModule: Module already created.");
+
+    // Create an initialize the imap module instance
+    nsMsgBaseModule *module = new nsMsgBaseModule();
+    if (!module)
+        return NS_ERROR_OUT_OF_MEMORY;
+
+    // Increase refcnt and store away nsIModule interface to m in return_cobj
+    rv = module->QueryInterface(nsIModule::GetIID(), (void**)return_cobj);
+    if (NS_FAILED(rv)) 
+    {
+        delete module;
+        module = nsnull;
+    }
+    gModule = module;                  // WARNING: Weak Reference
+    return rv;
+}

mozilla/mailnews/base/macbuild/msgCorePrefix.h

@@ -0,0 +1,21 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+
+
+#include "MacPrefix.h"

mozilla/mailnews/base/macbuild/msgCorePrefixDebug.h

@@ -0,0 +1,21 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+
+
+#include "MacPrefix_debug.h"

mozilla/mailnews/base/makefile.win

@@ -0,0 +1,22 @@
+#!nmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+DEPTH=..\..
+
+DIRS=public src util search prefs build resources tests
+
+include <$(DEPTH)\config\rules.mak>

mozilla/mailnews/base/prefs/Makefile.in

@@ -0,0 +1,28 @@
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+DIRS		= resources
+
+include $(topsrcdir)/config/rules.mk
+

mozilla/mailnews/base/prefs/makefile.win

@@ -0,0 +1,22 @@
+#!nmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+DEPTH=..\..\..
+
+DIRS= resources
+
+include <$(DEPTH)\config\rules.mak>

mozilla/mailnews/base/prefs/resources/Makefile.in

@@ -0,0 +1,28 @@
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+DEPTH		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+DIRS		= content locale skin
+
+include $(topsrcdir)/config/rules.mk
+

mozilla/mailnews/base/prefs/resources/content/AccountManager.js

@@ -0,0 +1,479 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * 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 Communicator client code, released
+ * March 31, 1998.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1998-1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ */
+
+var accountArray;
+
+var lastServerId;
+var lastPageId;
+
+// services used
+var RDF;
+var accountManager;
+var smtpService;
+
+// widgets
+var duplicateButton;
+var deleteButton;
+var newAccountButton;
+var setDefaultButton;
+
+// called when the whole document loads
+// perform initialization here
+function onLoad() {
+  accountArray = new Array;
+  RDF = Components.classes["component://netscape/rdf/rdf-service"].getService(Components.interfaces.nsIRDFService);
+
+  var mailsession =
+    Components.classes["component://netscape/messenger/services/session"].getService(Components.interfaces.nsIMsgMailSession);
+
+  accountManager = mailsession.accountManager;
+
+  smtpService =
+    Components.classes["component://netscape/messengercompose/smtp"].getService(Components.interfaces.nsISmtpService);
+  var tree = document.getElementById("accounttree");
+  var items = tree.getElementsByTagName("treeitem");
+  
+  if (items && items.length>0) {
+    // skip the template?
+    tree.selectItem(items[1]);
+  }
+  
+  doSetOKCancel(onOk, 0);
+
+  newAccountButton = document.getElementById("newAccountButton");
+  duplicateButton = document.getElementById("duplicateButton");
+  deleteButton = document.getElementById("deleteButton");
+  setDefaultButton = document.getElementById("setDefaultButton");
+  
+}
+
+function onOk() {
+  onSave();
+    // hack hack - save the prefs file NOW in case we crash
+    try {
+        var prefs = Components.classes["component://netscape/preferences"].getService(Components.interfaces.nsIPref);
+        prefs.SavePrefFile();
+    } catch (ex) {
+        dump("Error saving prefs!\n");
+    }
+  return true;
+}
+
+function onSave() {
+
+  // make sure the current visible page is saved
+  savePage(lastServerId, lastPageId);
+  
+  for (var accountid in accountArray) {
+    var account = getAccountFromServerId(accountid);
+    var accountValues = accountArray[accountid];
+
+    saveAccount(accountValues, account);
+  }
+}
+
+function onNewAccount() {
+  var result = { refresh: false };
+  window.openDialog("chrome://messenger/content/AccountWizard.xul", "wizard", "chrome,modal", result);
+  if (result.refresh) {
+    refreshAccounts();
+    
+    // propagate refresh if it's not already on
+    // i.e. we'll never turn off refresh once it's on.
+    window.arguments[0].refresh = true;
+  }
+
+}
+
+// another temporary hack until the account manager
+// can refresh the account list itself.
+function refreshAccounts()
+{
+  var tree = document.getElementById("accounttree");
+  tree.clearItemSelection();
+  tree.setAttribute('ref', tree.getAttribute('ref'));
+}
+
+function saveAccount(accountValues, account)
+{
+  var identity;
+  var server;
+  
+  if (account) {
+    identity = account.defaultIdentity;
+    server = account.incomingServer;
+  }
+  
+  for (var type in accountValues) {
+    var typeArray = accountValues[type];
+    
+    for (var slot in typeArray) {
+      var dest;
+
+      try {
+      if (type == "identity")
+        dest = identity;
+      else if (type == "server")
+        dest = server;
+      else if (type == "pop3")
+        dest = server.QueryInterface(Components.interfaces.nsIPop3IncomingServer);
+      
+      else if (type == "imap")
+        dest = server.QueryInterface(Components.interfaces.nsIImapIncomingServer);
+      
+      else if (type == "none")
+        dest = server.QueryInterface(Components.interfaces.nsINoIncomingServer); 
+      
+      else if (type == "nntp")
+        dest = server.QueryInterface(Components.interfaces.nsINntpIncomingServer);
+      else if (type == "smtp")
+        dest = smtpService.defaultServer;
+      
+      } catch (ex) {
+        // don't do anything, just means we don't support that
+      }
+      if (dest == undefined) continue;
+      
+      if (dest[slot] != typeArray[slot]) {
+        //dump("Array->Account: " + slot + " to " + dest + "\n");
+        try {
+          dest[slot] = typeArray[slot];
+        } catch (ex) {
+          // hrm... need to handle special types here
+        }
+      }
+    }
+  }
+}
+
+// called when a prefs page is done loading
+function onPageLoad(event, name) {
+  // page needs to be filled with values.
+  // how do we determine which account we should be using?
+}
+
+
+function updateButtons(tree) {
+  if (tree.selectedItems.length > 0) {
+    if (duplicateButton) duplicateButton.removeAttribute("disabled");
+    if (setDefaultButton) setDefaultButton.removeAttribute("disabled");
+    if (deleteButton) deleteButton.removeAttribute("disabled");
+
+  } else {
+    if (duplicateButton) duplicateButton.setAttribute("disabled", "true");
+    if (setDefaultButton) setDefaultButton.setAttribute("disabled", "true");
+    if (deleteButton) deleteButton.setAttribute("disabled", "true");
+  }
+}
+
+//
+// called when someone clicks on an account
+// figure out context by what they clicked on
+//
+function onAccountClick(tree) {
+
+  if (tree.selectedItems.length < 1) return;
+  var node = tree.selectedItems[0];
+  
+  updateButtons(tree);
+  
+  // get the page to load
+  // (stored in the PageTag attribute of this node)
+  var pageId = node.getAttribute('PageTag');
+
+
+  // get the server's ID
+  // (stored in the ID attribute of the server node)
+  var servernode = node.parentNode.parentNode;
+  
+  // for toplevel treeitems, we just use the current treeitem
+  //  dump("servernode is " + servernode + "\n");
+  if (servernode.tagName != "treeitem") {
+    servernode = node;
+  }
+  var serverid = servernode.getAttribute('id');
+  
+  //dump("before showPage(" + serverid + "," + pageId + ");\n");
+  showPage(serverid, pageId);
+
+}
+
+// show the page for the given server:
+// - save the old values
+// - initialize the widgets with the new values
+function showPage(serverId, pageId) {
+
+  if (pageId == lastPageId &&
+      serverId == lastServerId) return;
+
+  savePage(lastServerId, lastPageId);
+
+  restorePage(serverId, pageId);
+  showDeckPage(pageId);
+
+  lastServerId = serverId;
+  lastPageId = pageId;
+}
+
+//
+// show the page with the given id
+//
+function showDeckPage(deckBoxId) {
+
+  /* bring the deck to the front */
+  var deckBox = top.document.getElementById(deckBoxId);
+  var deck = deckBox.parentNode;
+  var children = deck.childNodes;
+
+  // search through deck children, and find the index to load
+  for (var i=0; i<children.length; i++) {
+    if (children[i] == deckBox) break;
+  }
+
+  deck.setAttribute("index", i);
+
+}
+
+//
+// save the values of the widgets to the given server
+//
+function savePage(serverId, pageId) {
+  if (!serverId || !pageId) return;
+
+  // tell the page that it's about to save
+  if (top.frames[pageId].onSave)
+      top.frames[pageId].onSave();
+  
+  var accountValues = getValueArrayFor(serverId);
+  var pageElements = getPageFormElements(pageId);
+
+  // store the value in the account
+  for (var i=0; i<pageElements.length; i++) {
+      if (pageElements[i].name) {
+        var vals = pageElements[i].name.split(".");
+        var type = vals[0];
+        var slot = vals[1];
+
+        setAccountValue(accountValues,
+                        type, slot,
+                        getFormElementValue(pageElements[i]));
+      }
+  }
+
+}
+
+function setAccountValue(accountValues, type, slot, value) {
+  if (!accountValues[type])
+    accountValues[type] = new Array;
+
+  //dump("Form->Array: accountValues[" + type + "][" + slot + "] = " + value + "\n");
+  
+  accountValues[type][slot] = value;
+}
+
+function getAccountValue(account, accountValues, type, slot) {
+  if (!accountValues[type])
+    accountValues[type] = new Array;
+
+  // fill in the slot from the account if necessary
+  if (accountValues[type][slot]== undefined) {
+    // dump("Array->Form: lazily reading in the " + slot + " from the " + type + "\n");
+    var server;
+    if (account)
+      server= account.incomingServer;
+    var source = null;
+    try {
+    if (type == "identity")
+      source = account.defaultIdentity;
+
+    else if (type == "server")
+      source = account.incomingServer;
+
+    else if (type == "pop3")
+      source = server.QueryInterface(Components.interfaces.nsIPop3IncomingServer);
+    
+    else if (type == "imap")
+      source = server.QueryInterface(Components.interfaces.nsIImapIncomingServer);
+    
+    else if (type == "none")
+      source = server.QueryInterface(Components.interfaces.nsINoIncomingServer); 
+
+    else if (type == "nntp")
+      source = server.QueryInterface(Components.interfaces.nsINntpIncomingServer);
+
+    else if (type == "smtp")
+        source = smtpService.defaultServer;
+    
+    } catch (ex) {
+    }
+    
+    if (source) {
+      accountValues[type][slot] = source[slot];
+    }
+  }
+  var value = accountValues[type][slot];
+  //dump("Array->Form: accountValues[" + type + "][" + slot + "] = " + value + "\n");
+  return value;
+}
+//
+// restore the values of the widgets from the given server
+//
+function restorePage(serverId, pageId) {
+  if (!serverId || !pageId) return;
+  
+  var accountValues = getValueArrayFor(serverId);
+  var pageElements = getPageFormElements(pageId);
+
+  // restore the value from the account
+  for (var i=0; i<pageElements.length; i++) {
+      if (pageElements[i].name) {
+        var vals = pageElements[i].name.split(".");
+        var type = vals[0];
+        var slot = vals[1];
+
+        var account = getAccountFromServerId(serverId);
+        var value = getAccountValue(account, accountValues, type, slot);
+        setFormElementValue(pageElements[i], value);
+      }
+  }
+
+  // tell the page that new values have been loaded
+  if (top.frames[pageId].onInit)
+      top.frames[pageId].onInit();
+}
+
+//
+// gets the value of a widget
+//
+function getFormElementValue(formElement) {
+  if (formElement.type=="checkbox") {
+    if (formElement.getAttribute("reversed"))
+      return !formElement.checked;
+    else
+      return formElement.checked;
+  }
+
+  else if (formElement.type == "text" &&
+           formElement.getAttribute("datatype") == "nsIFileSpec") {
+    if (formElement.value) {
+      var filespec = Components.classes["component://netscape/filespec"].createInstance(Components.interfaces.nsIFileSpec);
+      filespec.nativePath = formElement.value;
+      return filespec;
+    } else {
+      return null;
+    }
+  }
+
+
+  else
+    return formElement.value;
+}
+
+//
+// sets the value of a widget
+//
+function setFormElementValue(formElement, value) {
+  
+  //formElement.value = formElement.defaultValue;
+  //  formElement.checked = formElement.defaultChecked;
+  
+  if (formElement.type == "checkbox") {
+    if (value == undefined) {
+      formElement.checked = formElement.defaultChecked;
+    } else {
+      if (formElement.getAttribute("reversed"))
+        formElement.checked = !value;
+      else
+        formElement.checked = value;
+    }
+    
+  }
+
+  // handle nsIFileSpec
+  else if (formElement.type == "text" &&
+           formElement.getAttribute("datatype") == "nsIFileSpec") {
+    if (value) {
+      var filespec = value.QueryInterface(Components.interfaces.nsIFileSpec);
+      try {
+        formElement.value = filespec.nativePath;
+      } catch (ex) {
+        dump("Still need to fix uninitialized filespec problem!\n");
+      }
+    } else
+      formElement.value = formElement.defaultValue;
+
+  }
+
+  // let the form figure out what to do with it
+  else {
+    if (value == undefined)
+      formElement.value = formElement.defaultValue;
+    else
+      formElement.value = value;
+  }
+}
+
+//
+// conversion routines - get data associated
+// with a given pageId, serverId, etc
+//
+
+//
+// get the account associated with this serverId
+//
+function getAccountFromServerId(serverId) {
+  // get the account by dipping into RDF and then into the acount manager
+  var serverResource = RDF.GetResource(serverId);
+  try {
+  var serverFolder =
+    serverResource.QueryInterface(Components.interfaces.nsIMsgFolder);
+  } catch (ex) {
+    return;
+  }
+  var incomingServer = serverFolder.server;
+
+  var account = accountManager.FindAccountForServer(incomingServer);
+  return account;
+}
+
+//
+// get the array of form elements for the given page
+//
+function getPageFormElements(pageId) {
+  var pageFrame = top.frames[pageId];
+  var pageDoc = top.frames[pageId].document;
+  var pageElements = pageDoc.getElementsByTagName("FORM")[0].elements;
+
+  return pageElements;
+}
+
+//
+// get the value array for the given serverId
+//
+function getValueArrayFor(serverId) {
+  if (serverId == undefined) serverId="global";
+  
+  if (accountArray[serverId] == null) {
+    accountArray[serverId] = new Array;
+  }
+  
+  return accountArray[serverId];
+}
+

mozilla/mailnews/base/prefs/resources/content/AccountManager.xul

@@ -0,0 +1,105 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
+<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
+
+<!DOCTYPE window SYSTEM "chrome://messenger/locale/AccountManager.dtd" >
+<window	id="account-manager" xmlns:html="http://www.w3.org/TR/REC-html40"
+		xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+		xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+		title="&accountManagerTitle.label;"
+        width="600" height="420"
+        align="vertical"
+        onload="onLoad(event);">
+
+    <html:script src="chrome://messenger/content/AccountManager.js"/>
+
+	<keyset id="keyset"/>
+
+	<box align="horizontal" flex="100%" style="padding: 10px">
+		<box align="vertical" flex="25%">
+<html:div style="border-style:inset" flex="100%">
+	<tree rdf:datasources="rdf:msgaccountmanager"
+          rdf:containment="http://home.netscape.com/NC-rdf#Settings"
+          onselect="onAccountClick(event.target)" id="accounttree"
+          style="height: 100%"
+          ref="msgaccounts:/">
+	  <template>
+	  	<rule>
+            <treechildren>
+			<treeitem uri="..."
+                PageTag="rdf:http://home.netscape.com/NC-rdf#PageTag">
+		  		<treerow >
+					<treecell indent="true" value="rdf:http://home.netscape.com/NC-rdf#Name"/>
+		  		</treerow>
+<!--
+                <treechildren>
+                  <treeitem>
+                    <treerow>
+                      <treecell value="a"/>
+                    </treerow>
+                  </treeitem>
+                  <treeitem>
+                    <treerow>
+                      <treecell value="b"/>
+                    </treerow>
+                  </treeitem>
+                  <treeitem>
+                    <treerow>
+                      <treecell value="c"/>
+                    </treerow>
+                  </treeitem>
+                </treechildren>
+-->
+			</treeitem>
+            </treechildren>
+		</rule>
+	  </template>
+
+	  <treecol style="width: 100%" rdf:resource="http://home.netscape.com/NC-rdf#Name"/>
+	  <treehead>
+		<treerow>
+	      <treecell value="&nameCol.label;"/>
+		</treerow>
+	  </treehead>
+
+	</tree>
+</html:div>
+            <titledbutton value="&newAccountButton.label;" onclick="onNewAccount();" id="newAccountButton"/>
+            <titledbutton value="&setDefaultButton.label;" disabled="true" id="setDefaultButton"/>
+            <box align="horizontal">
+              <titledbutton disabled="true" value="&duplicateButton.label;" id="duplicateButton" flex="50%"/>
+              <titledbutton disabled="true" value="&deleteButton.label;" id="deleteButton" flex="50%"/>
+            </box>
+		</box>
+        <box flex="75%">
+           <tabcontrol flex="100%" align="vertical">
+             <deck id="mydeck" flex="100%">
+                <box id="am-main.xul" flex="100%">
+<!-- need to specific these src= URLs as absolute URLs
+     so that DOM security knows these have the same principal as this file -->
+                     <html:iframe src="chrome://messenger/content/am-main.xul" name="am-main.xul"
+                          style="border: none" flex="100%"/>
+                </box>
+                <box id="am-server.xul" flex="100%">
+                     <html:iframe src="chrome://messenger/content/am-server.xul" name="am-server.xul"
+                          style="border: none" flex="100%"/>
+                </box>
+                <box id="am-copies.xul" flex="100%">
+                     <html:iframe src="chrome://messenger/content/am-copies.xul" name="am-copies.xul"
+                          style="border: none" flex="100%"/>
+                </box>
+                <box id="am-advanced.xul" flex="100%">
+                     <html:iframe src="chrome://messenger/content/am-advanced.xul" name="am-advanced.xul"
+                          style="border: none" flex="100%"/>
+                </box>
+                <box id="am-smtp.xul" flex="100%">
+                     <html:iframe src="chrome://messenger/content/am-smtp.xul" name="am-smtp.xul"
+                          style="border:none" flex="100%"/>
+                </box>
+              </deck>
+           </tabcontrol>
+        </box>
+	</box>
+    <html:hr/>
+    <box id="okCancelButtons"/>
+</window>

mozilla/mailnews/base/prefs/resources/content/AccountWizard.js

@@ -0,0 +1,250 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * 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 Communicator client code, released
+ * March 31, 1998.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1998-1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ */
+
+var wizardMap = {
+    accounttype: { next: "identity" },
+    identity: { next: "server", previous: "accounttype" },
+    server:   { next: "login", previous: "identity"},
+    login:    { next: "accname", previous: "server"},
+    accname:  { next: "done", previous: "login" },
+    done:     { previous: "accname" }
+}
+
+var pagePrefix="chrome://messenger/content/aw-";
+var pagePostfix=".xul";
+
+var currentPageTag;
+
+var contentWindow;
+
+var wizardContents;
+var smtpService;
+
+function init() {
+    if (!contentWindow) contentWindow = window.frames["wizardContents"];
+    if (!wizardContents) wizardContents = new Array;
+}
+// event handlers
+function onLoad() {
+    if (!smtpService)
+        smtpService =
+            Components.classes["component://netscape/messengercompose/smtp"].getService(Components.interfaces.nsISmtpService);;
+
+    wizardContents["smtp.hostname"] = smtpService.defaultServer.hostname;
+    dump("initialized with " + wizardContents["smtp.hostname"] + "\n");
+    init();
+}
+
+function wizardPageLoaded(tag) {
+    init();
+    currentPageTag=tag;
+    initializePage(contentWindow, wizardContents);
+}
+
+function onNext(event) {
+
+    if (!wizardMap[currentPageTag]) {
+        dump("Error, could not find entry for current page: " +
+             currentPageTag + "\n");
+        return;
+    }
+    
+    // only run validation routine if it's there
+    var validate = wizardMap[currentPageTag].validate;
+    if (validate)
+        if (!validate(contentWindow, wizardContents)) return;
+
+    if (typeof(contentWindow.ValidateContents) == "function")
+        if (!contentWindow.ValidateContents()) return;
+
+    saveContents(contentWindow, wizardContents);
+    
+    nextPage(contentWindow);
+}
+
+function onCancel(event) {
+    window.close();
+}
+
+function onLoadPage(event) {
+    contentWindow.location = getUrlFromTag(document.getElementById("newPage").value);
+}
+
+function onBack(event) {
+    previousPage(contentWindow);
+}
+
+// utility functions
+function getUrlFromTag(title) {
+    return pagePrefix + title + pagePostfix;
+}
+
+
+// helper functions that actually do stuff
+function setNextEnabled(enabled) {
+    
+}
+
+function setBackEnabled(enabled) {
+
+}
+
+function nextPage(win) {
+    var nextPageTag = wizardMap[currentPageTag].next;
+    if (nextPageTag)
+        win.location=getUrlFromTag(nextPageTag);
+    else
+        onFinish();
+}
+
+function previousPage(win) {
+    previousPageTag = wizardMap[currentPageTag].previous;
+    if (previousPageTag)
+        win.location=getUrlFromTag(previousPageTag)
+}
+
+function initializePage(win, hash) {
+    var inputs= win.document.getElementsByTagName("FORM")[0].elements;
+    for (var i=0; i<inputs.length; i++) {
+        restoreValue(hash, inputs[i]);
+    }
+
+    if (win.onInit) win.onInit();
+}
+
+
+function saveContents(win, hash) {
+
+    var inputs = win.document.getElementsByTagName("FORM")[0].elements;
+    for (var i=0 ; i<inputs.length; i++) {
+        saveValue(hash, inputs[i])
+    }
+
+}
+
+function restoreValue(hash, element) {
+    if (!hash[element.name]) return;
+    dump("Restoring " + element.name + " from " + hash[element.name] + "\n");
+    if (element.type=="radio") {
+        if (hash[element.name] == element.value)
+            element.checked=true;
+        else
+            element.checked=false;
+    } else if (element.type=="checkbox") {
+        element.checked=hash[element.name];
+    } else {
+        element.value=hash[element.name];
+    }
+}
+
+function saveValue(hash, element) {
+
+    if (element.type=="radio") {
+        if (element.checked) {
+            hash[element.name] = element.value;
+        }
+    } else if (element.type == "checkbox") {
+        hash[element.name] = element.checked;
+    }
+    else {
+        hash[element.name] = element.value;
+    }
+}
+
+function validateIdentity(win, hash) {
+    var email = win.document.getElementById("email").value;
+    
+    if (email.indexOf('@') == -1) {
+        window.alert("Invalid e-mail address!");
+        dump("Invalid e-mail address!\n");
+        return false;
+    }
+    return true;
+}
+
+function validateServer(win, hash) {
+    return true;
+}
+
+function validateSmtp(win, hash) {
+    return true;
+}
+
+function onFinish() {
+    var i;
+    dump("There are " + wizardContents.length + " elements\n");
+    for (i in wizardContents) {
+        dump("wizardContents[" + i + "] = " + wizardContents[i] + "\n");
+    }
+    if (createAccount(wizardContents))
+        window.arguments[0].refresh = true;
+
+    // hack hack - save the prefs file NOW in case we crash
+    try {
+        var prefs = Components.classes["component://netscape/preferences"].getService(Components.interfaces.nsIPref);
+        prefs.SavePrefFile();
+    } catch (ex) {
+        dump("Error saving prefs!\n");
+    }
+    window.close();
+}
+
+function createAccount(hash) {
+
+    try {
+    var mail = Components.classes["component://netscape/messenger/services/session"].getService(Components.interfaces.nsIMsgMailSession);
+    var am = mail.accountManager;
+
+
+    // workaround for lame-ass combo box bug
+    var serverType = hash["server.type"];
+    if (!serverType  || serverType == "")
+        serverType = "pop3";
+    var server = am.createIncomingServer(serverType);
+    
+    var identity = am.createIdentity();
+
+    for (var i in hash) {
+        var vals = i.split(".");
+        var type = vals[0];
+        var slot = vals[1];
+
+        if (type == "identity")
+            identity[slot] = hash[i];
+        else if (type == "server")
+            server[slot] = hash[i];
+        else if (type == "smtp")
+            smtpService.defaultServer.hostname = hash[i];
+    }
+    
+    var account = am.createAccount();
+    account.incomingServer = server;
+    account.addIdentity(identity);
+
+    return true;
+    
+    } catch (ex) {
+        // return false (meaning we did not create the account)
+        // on any error
+        dump("Error creating account: ex\n");
+        return false;
+    }
+}
+

mozilla/mailnews/base/prefs/resources/content/AccountWizard.xul

@@ -0,0 +1,56 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://messenger/skin/wizard.css" type="text/css"?>
+
+<!--
+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 Communicator client code, released
+March 31, 1998.
+
+The Initial Developer of the Original Code is Netscape
+Communications Corporation. Portions created by Netscape are
+ Copyright (C) 1998-1999 Netscape Communications Corporation. All
+Rights Reserved.
+-->
+
+<!DOCTYPE window SYSTEM "chrome://messenger/locale/AccountWizard.dtd" >
+
+<window id="account-wizard-dialog" xmlns:html="http://www.w3.org/TR/REC-html40"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+    title="New Messenger Account Wizard"
+    height="350" width="450"
+    onload="onLoad();">
+
+<html:script language="JavaScript" src="chrome://messenger/content/AccountWizard.js"/>
+<box align="vertical" flex="100%">
+  <html:iframe flex="100%" style="width: 100%; height:100%; border: none"
+               src="chrome://messenger/content/aw-accounttype.xul"
+               name="wizardContents" scrolling="auto"/>
+  <html:div>
+    &instructions.label;
+  </html:div>
+  <html:br/><html:hr/>
+  <box align="horizontal" style="margin: 10px">
+<!--
+    <html:input type="text" id="newPage" flex="100%"/>
+    <titledbutton value="Load Page" onclick="onLoadPage(event);"/>
+-->
+    <spring flex="100%"/>
+    <titledbutton value="&lt; &backButton.label;" onclick="onBack(event);"/>
+    <titledbutton value="&nextButton.label; &gt;" onclick="onNext(event);"/>
+    <spring style="width: 10px"/>
+    <titledbutton value="&finishButton.label;" onclick="onFinish(event);"/>
+    <spring style="width: 10px"/>
+    <titledbutton value="&cancelButton.label;" onclick="onCancel(event);"/>
+  </box>
+</box>
+</window>

mozilla/mailnews/base/prefs/resources/content/MANIFEST

@@ -0,0 +1,42 @@
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+# This is a list of local files which get copied to the res\mailnews\messenger directory
+#
+
+AccountManager.xul
+AccountManager.js
+am-main.xul
+am-server.xul
+am-server.js
+am-server-top.xul
+am-copies.xul
+am-copies.js
+am-advanced.xul
+am-smtp.xul
+pref-mailnews.xul
+pref-winsetting.xul
+pref-receipts.xul
+custreceipt.xul
+pref-diskspace.xul
+AccountWizard.xul
+AccountWizard.js
+aw-accounttype.xul
+aw-identity.xul
+aw-server.xul
+aw-login.xul
+aw-accname.xul
+aw-done.xul
+aw-done.js

mozilla/mailnews/base/prefs/resources/content/Makefile.in

@@ -0,0 +1,60 @@
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+DEPTH		= ../../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+SAMPLES_DIR	= $(DIST)/bin/chrome/messenger/content/default
+
+EXPORT_RESOURCE_SAMPLES = \
+		AccountManager.xul \
+		AccountManager.js \
+		am-main.xul \
+		am-server.xul \
+		am-server.js \
+		am-server-top.xul \
+		am-copies.xul \
+		am-copies.js \
+		am-advanced.xul \
+		am-smtp.xul \
+		pref-mailnews.xul \
+		pref-winsetting.xul \
+		pref-receipts.xul \
+		custreceipt.xul \
+		pref-diskspace.xul \
+		AccountWizard.xul \
+		AccountWizard.js \
+		aw-accounttype.xul \
+		aw-identity.xul \
+		aw-server.xul \
+		aw-login.xul \
+		aw-accname.xul \
+		aw-done.xul \
+		aw-done.js	\
+		$(NULL)
+
+include $(topsrcdir)/config/rules.mk
+
+GARBAGE		+= $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES))
+
+install::
+	$(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES)) $(SAMPLES_DIR)
+

mozilla/mailnews/base/prefs/resources/content/am-advanced.xul

@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
+
+<!DOCTYPE window SYSTEM "chrome://messenger/locale/am-advanced.dtd" >
+
+<window xmlns:html="http://www.w3.org/TR/REC-html40"
+      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      align="vertical">
+
+
+</window>

mozilla/mailnews/base/prefs/resources/content/am-copies.js

@@ -0,0 +1,83 @@
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * 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 Communicator client code, released
+ * March 31, 1998.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1998-1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ */
+
+var RDF = Components.classes["component://netscape/rdf/rdf-service"].getService(Components.interfaces.nsIRDFService);
+
+function onInit() {
+    initFolderDisplay("identity.fccFolder", "fccFolderVerbose");
+    initFolderDisplay("identity.draftFolder", "draftFolderVerbose");
+    initFolderDisplay("identity.stationaryFolder", "stationaryFolderVerbose");
+    initFolderDisplay("identity.junkMailFolder", "junkMailFolderVerbose");
+    initBccSelf();
+    dump("document is " + document + "\n");
+}
+
+function initFolderDisplay(fieldname, divname) {
+
+    var formElement = document.getElementById(fieldname);
+
+    var folder = getFolder(formElement.value);
+    
+    var verboseName = "";
+    if (folder)
+        verboseName = folder.prettyName;
+
+    setDivText(divname, verboseName);
+}
+
+function initBccSelf() {
+    var bccValue = document.getElementById("identity.email").value;
+    setDivText("bccemail",bccValue);
+}
+
+function setDivText(divid, str) {
+    var divtag = document.getElementById(divid);
+    dump("setting " + divtag + " to " + str + "\n");
+    if (divtag) {
+        if (divtag.firstChild)
+            divtag.removeChild(divtag.firstChild);
+        divtag.appendChild(document.createTextNode(str));
+    }
+}
+
+function getFolder(uri) {
+    dump("uri = " + uri + "\n");
+    if (uri) {
+	var res = null;
+	try {
+        	res = RDF.GetResource(uri);
+        }
+	catch (ex) {
+		dump("GetResource of this uri failed: " + uri + "\n");
+		return null;
+	}
+        if (res) {
+		try {
+            		return res.QueryInterface(Components.interfaces.nsIMsgFolder);
+		}
+		catch (ex) {
+			dump(uri + " was not a nsIMsgFolder\n");
+			return null;
+		}
+	}
+    }
+    return null;
+}
+

mozilla/mailnews/base/prefs/resources/content/am-copies.xul

@@ -0,0 +1,117 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
+
+<!DOCTYPE window SYSTEM "chrome://messenger/locale/am-copies.dtd" >
+<window xmlns:html="http://www.w3.org/TR/REC-html40"
+      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      align="vertical">
+<html:script src="chrome://messenger/content/am-copies.js"/>
+<html:input type="hidden" name="identity.fccFolder" id="identity.fccFolder"/>
+<html:input type="hidden" name="identity.draftFolder" id="identity.draftFolder"/>
+<html:input type="hidden" name="identity.stationaryFolder" id="identity.stationaryFolder"/>
+<html:input type="hidden" name="identity.junkMailFolder" id="identity.junkMailFolder"/>
+<html:input type="hidden" name="identity.email" id="identity.email"/>
+
+<html:div>&copyAndFolderTitle.label;</html:div>
+<box align="vertical" flex="100%">
+<html:div>&sendingPrefix.label;</html:div>
+
+  <box align="horizontal">
+    <html:input name="identity.doFcc" type="checkbox"/>
+    <html:div>&fccMailFolder.label;</html:div>
+    <html:select flex="100%"
+         onchange="dump('value=' + event.target.value + '\n')"
+         rdf:datasources="rdf:mailnewsfolders rdf:msgaccountmanager"
+         name="identity.fccFolder" 
+         ref="msgaccounts:/">
+<!--
+    <html:input type="text" name="identity.fccFolder"/>
+    <html:optgroup/>
+-->
+    <template>
+      <rule iscontainer="true" isempty="false">
+          <html:optgroup uri="..." label="rdf:http://home.netscape.com/NC-rdf#Name">
+              <html:option value="..." label="rdf:http://home.netscape.com/NC-rdf#Name"/>
+          </html:optgroup>
+      </rule>
+      <rule>
+          <html:option value="..." uri="..." label="rdf:http://home.netscape.com/NC-rdf#Name"/>
+      </rule>
+    </template>
+    </html:select>
+<!--    <titledbutton value="&chooseFolderButton.label;"/> -->
+  </box>
+  <box align="horizontal">
+    <html:input name="identity.bccSelf" type="checkbox"/>
+    <html:div>&bccAccount.label;</html:div>
+    <html:div id="bccemail"/>
+  </box>
+  <box align="horizontal">
+    <html:input name="identity.bccOthers" type="checkbox"/>
+    <html:div>&bccAddress.label;</html:div>
+    <html:input type="text" name="identity.bccList"/> 
+  </box>
+</box>
+
+<html:div>&specialFolderTitle.label;</html:div>
+<box align="vertical" flex="100%">
+  <box align="horizontal">
+    <html:div flex="34%">&draftMailFolder.label;</html:div>
+    <html:select flex="66%"
+         onchange="dump('value=' + event.target.value + '\n')"
+         rdf:datasources="rdf:mailnewsfolders rdf:msgaccountmanager"
+         name="identity.draftFolder"
+         ref="msgaccounts:/">
+    <template>
+      <rule iscontainer="true" isempty="false">
+          <html:optgroup uri="..." label="rdf:http://home.netscape.com/NC-rdf#Name">
+              <html:option value="..." label="rdf:http://home.netscape.com/NC-rdf#Name"/>
+          </html:optgroup>
+      </rule>
+      <rule>
+          <html:option value="..." uri="..." label="rdf:http://home.netscape.com/NC-rdf#Name"/>
+      </rule>
+    </template>
+    </html:select>
+  </box>
+  <box align="horizontal">
+    <html:div flex="34%">&templateMailFolder.label;</html:div>
+    <html:select flex="66%"
+         onchange="dump('value=' + event.target.value + '\n')"
+         rdf:datasources="rdf:mailnewsfolders rdf:msgaccountmanager"
+         name="identity.stationaryFolder"
+         ref="msgaccounts:/">
+    <template>
+      <rule iscontainer="true" isempty="false">
+          <html:optgroup uri="..." label="rdf:http://home.netscape.com/NC-rdf#Name">
+              <html:option value="..." label="rdf:http://home.netscape.com/NC-rdf#Name"/>
+          </html:optgroup>
+      </rule>
+      <rule>
+          <html:option value="..." uri="..." label="rdf:http://home.netscape.com/NC-rdf#Name"/>
+      </rule>
+    </template>
+    </html:select>
+  </box>
+  <box align="horizontal">
+    <html:div>&junkMailFolder.label;</html:div>
+    <html:select flex="100%"
+         onchange="dump('value=' + event.target.value + '\n')"
+         rdf:datasources="rdf:mailnewsfolders rdf:msgaccountmanager"
+         name="identity.junkMailFolder"
+         ref="msgaccounts:/">
+    <template>
+      <rule iscontainer="true" isempty="false">
+          <html:optgroup uri="..." label="rdf:http://home.netscape.com/NC-rdf#Name">
+              <html:option value="..." label="rdf:http://home.netscape.com/NC-rdf#Name"/>
+          </html:optgroup>
+      </rule>
+      <rule>
+          <html:option value="..." uri="..." label="rdf:http://home.netscape.com/NC-rdf#Name"/>
+      </rule>
+    </template>
+    </html:select>
+  </box>
+</box>
+
+</window>

mozilla/mailnews/base/prefs/resources/content/am-main.xul

@@ -0,0 +1,80 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
+
+<!DOCTYPE window SYSTEM "chrome://messenger/locale/am-main.dtd" >
+
+<window xmlns:html="http://www.w3.org/TR/REC-html40"
+     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+     flex="100%"
+     align="vertical"> 
+    
+    <html:div class="pageTitle">&accountTitle.label;</html:div>
+    <box align="vertical">
+    <html:div class="secDesc">&accountSettingsDesc.label;</html:div>
+    <html:div>&accountNameDesc.label;</html:div>
+    <box align="horizontal">
+      <html:div>&accountName.label;</html:div>
+      <html:spacer/>
+      <html:input type="text" name="server.prettyName" flex="100%"/>
+    </box>
+    </box>
+
+    <html:div class="secTitle">&identityTitle.label;</html:div>
+    <box align="vertical">
+    <html:div class="secDesc">&identityDesc.label;</html:div>
+    <html:div style="width: 100%">
+    <html:table width="100%">
+    <html:tr>
+      <html:td>&name.label;</html:td>
+      <html:td align="right"><html:input name="identity.fullName" type="text" size="30"/></html:td>
+    </html:tr>
+    <html:tr>
+      <html:td>&email.label;</html:td>
+      <html:td align="right"><html:input name="identity.email" type="text" size="30"/></html:td>
+    </html:tr>
+    <html:tr>
+      <html:td flex="40%">&replyTo.label;</html:td>
+      <html:td align="right"><html:input name="identity.replyTo" type="text" size="30"/></html:td>
+    </html:tr>
+    <html:tr>
+      <html:td flex="40%">&organization.label;</html:td>
+      <html:td align="right"><html:input name="identity.organization" type="text" size="30"/></html:td>
+    </html:tr>
+<!-- no vcard in PR1
+    <html:tr class="checkboxrow">
+      <html:td colspan="2">
+        <html:input name="identity.attachVCard" type="checkbox"/>
+        &attachVCard.label;
+      <titledbutton value="&editVCard.label;"/>
+      </html:td>
+      </html:tr>    
+-->
+      <html:tr class="checkboxrow">
+      <html:td colspan="2">
+        <html:input name="identity.attachSignature" type="checkbox"/>
+        &signature.label;
+        <html:input type="text" datatype="nsIFileSpec" flex="100%" name="identity.signature"/>
+      </html:td>
+      </html:tr>
+<!--
+      <html:select flex="100%">
+         <html:option value="sig1">&sampleSig1.label;</html:option>
+         <html:option value="sig2">&sampleSig2.label;</html:option>
+         <html:option value="sig3">&sampleSig3.label;</html:option>
+      </html:select>
+      <titledbutton value="&editSignature.label;"/>
+
+-->
+    
+    </html:table>
+    </html:div>
+    </box>
+
+    <html:table>
+      <html:tr class="checkboxrow"><html:td>
+        <html:input name="identity.composeHtml" type="checkbox"/>
+        &useHtml.label;
+      </html:td></html:tr>
+    </html:table>
+
+</window>

mozilla/mailnews/base/prefs/resources/content/am-server-top.xul

@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
+
+<!DOCTYPE window SYSTEM "chrome://messenger/locale/am-server-top.dtd" >
+
+<window xmlns:html="http://www.w3.org/TR/REC-html40"
+      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      align="vertical">
+
+</window>

mozilla/mailnews/base/prefs/resources/content/am-server.js

@@ -0,0 +1,64 @@
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * 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 Communicator client code, released
+ * March 31, 1998.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1998-1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ */
+
+function onInit() {
+    initServerType();
+
+}
+
+function initServerType() {
+  var serverType = document.getElementById("server.type").value;
+  
+  var verboseName;
+  var index;
+  if (serverType == "pop3") {
+      verboseName = "POP Mail Server";
+      index = 0;
+  } else if (serverType == "imap") {
+      verboseName = "IMAP Mail Server";
+      index = 1;
+  } else if (serverType == "nntp") {
+      verboseName = "Newsgroup server (NNTP)";
+      index = 2;
+  } else if (serverType == "none") {
+      verboseName = "Local Mail store";
+      index = 3;
+  }
+
+  if (index != undefined) {
+      var deck = document.getElementById("serverdeck");
+      deck.setAttribute("index", index);
+  }
+
+  var hostname = document.getElementById("server.hostName").value;
+  var username = document.getElementById("server.username").value;
+
+  setDivText("servertype.verbose", verboseName);
+  setDivText("servername.verbose", hostname);
+  setDivText("username.verbose", username);
+}
+
+function setDivText(divname, value) {
+    var div = document.getElementById(divname);
+    if (!div) return;
+    if (div.firstChild)
+        div.removeChild(div.firstChild);
+    div.appendChild(document.createTextNode(value));
+}

mozilla/mailnews/base/prefs/resources/content/am-server.xul

@@ -0,0 +1,87 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
+
+<!DOCTYPE window SYSTEM "chrome://messenger/locale/am-server-top.dtd" >
+
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        xmlns:html="http://www.w3.org/TR/REC-html40" align="vertical">
+
+  <html:script src="chrome://messenger/content/am-server.js"/>
+
+  <html:input type="hidden" name="server.type" id="server.type"/>
+  <html:input type="hidden" name="server.hostName" id="server.hostName"/>
+  <html:input type="hidden" name="server.username" id="server.username"/>
+
+  <html:div>&serverSettings.label;</html:div>
+  <box align="vertical">
+  <html:table width="100%">
+  <html:tr>
+    <html:td>&serverType.label;</html:td>
+    <html:td><html:div flex="80%" id="servertype.verbose"/></html:td>
+  </html:tr>
+
+  <html:tr>
+    <html:td>&serverName.label;</html:td>
+    <html:td><html:div flex="80%" id="servername.verbose"/></html:td>
+  </html:tr>
+
+    <html:tr>
+      <html:td>&userName.label;</html:td>
+      <html:td><html:div id="username.verbose"/></html:td>
+    </html:tr>
+  </html:table>
+
+  <html:div><html:input name="server.rememberPassword"
+                        type="checkbox"/>&savePassword.label;</html:div>
+  <html:div><html:input name="server.doBiff"
+                        type="checkbox"/>&biffStart.label;
+            <html:input name="server.biffMinutes" type="text" size="3"/>
+            &biffEnd.label;
+  </html:div>
+  </box>
+  <tabcontrol flex="100%">
+    <deck id="serverdeck">
+      <!-- POP -->
+      <box align="vertical" flex="100%">
+        <html:div><html:input name="pop3.leaveMessagesOnServer" type="checkbox"/>&leaveOnServer.label;</html:div>
+        <html:div><html:input name="pop3.deleteMailLeftOnServer" type="checkbox"/>&deleteOnServer.label;</html:div>
+      </box>
+      <!-- IMAP -->
+      <box align="vertical" flex="100%">
+        <html:div>&deleteMessagePrefix.label;</html:div>
+        <html:div>
+          <html:select name="imap.deleteModel">
+            <html:option value="0">&modelMoveToTrash.label;</html:option>
+            <html:option value="1">&modelMarkDeleted.label;</html:option>
+            <html:option value="2">&modelDeleteImmediately.label;</html:option>
+          </html:select>
+        </html:div>
+        <html:div>
+          <html:input name="imap.cleanupInboxOnExit" type="checkbox"/>
+          &expungeOnExit.label;
+        </html:div>
+        <html:div><html:input name="imap.emptyTrashOnExit" type="checkbox"/>&emptyTrashOnExit.label;</html:div>
+      </box>
+      <!-- News -->
+      <box align="vertical" flex="100%">
+        <box align="horizontal">
+          <html:div>
+          <html:input name="nntp.notifyOn" type="checkbox"/>
+            &maxMessagesStart.label;
+          </html:div>
+  		  <html:div>
+            <html:input name="nntp.maxArticles" type="text" size="6"/>
+  		    &maxMessagesEnd.label;
+          </html:div>
+        </box>
+      </box>
+      <!-- None -->
+      <box align="vertical" flex="100%">
+      </box>
+    </deck>
+  </tabcontrol>
+  <box align="vertical">
+    <html:div>&localPath.label;</html:div>
+    <html:input type="text" name="server.localPath" datatype="nsIFileSpec"/>
+  </box>
+</window>

mozilla/mailnews/base/prefs/resources/content/am-smtp.xul

@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
+
+<!DOCTYPE window SYSTEM "chrome://messenger/locale/am-advanced.dtd" >
+
+<window xmlns:html="http://www.w3.org/TR/REC-html40"
+      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      align="vertical">
+
+<html:div>&smtpServer.label;</html:div>
+<html:div>&smtpDesc.label;</html:div>
+
+  <box align="horizontal">
+     <html:div>&smtpHostname.label;</html:div>
+     <html:input type="text" name="smtp.hostname" flex="100%"/>
+  </box>
+  <html:div>
+    <html:input type="checkbox" name="smtp.useUsername"/>
+    &smtpAlwaysUseName.label;
+  </html:div>
+  <box align="horizontal">
+     <html:div>&smtpUsername.label;</html:div>
+     <html:input type="text" name="smtp.username" flex="100%"/>
+  </box>
+  <html:div>
+    <html:input type="checkbox" name="smtp.savePassword"/>
+    &smtpSavePassword.label;
+  </html:div>
+
+</window>

mozilla/mailnews/base/prefs/resources/content/aw-accname.xul

@@ -0,0 +1,43 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://messenger/skin/wizard.css" type="text/css"?>
+
+<!--
+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 Communicator client code, released
+March 31, 1998.
+
+The Initial Developer of the Original Code is Netscape
+Communications Corporation. Portions created by Netscape are
+ Copyright (C) 1998-1999 Netscape Communications Corporation. All
+Rights Reserved.
+-->
+
+<!DOCTYPE window SYSTEM "chrome://messenger/locale/aw-accname.dtd" >
+<window id="accnamepage" xmlns:html="http://www.w3.org/TR/REC-html40"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+    align="vertical"
+    onload="parent.wizardPageLoaded('accname');">
+
+  <box class="title" align="horizontal">
+    <html:div class="title">&accnameTitle.label;</html:div>
+    <spring flex="100%"/>
+    <titledbutton class="plain" src="chrome://navigator/skin/animthrob_single.gif"/>
+  </box>
+  <html:div>&accnameDesc.label;</html:div>
+  <spring style="height: 1em"/>
+  <box align="horizontal">
+    <html:div>&accnameLabel.label;</html:div>
+    <html:input type="text" name="server.prettyName" id="server.prettyName" flex="100%"/>
+  </box>
+
+</window>

mozilla/mailnews/base/prefs/resources/content/aw-accounttype.xul

@@ -0,0 +1,67 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://messenger/skin/wizard.css" type="text/css"?>
+
+<!--
+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 Communicator client code, released
+March 31, 1998.
+
+The Initial Developer of the Original Code is Netscape
+Communications Corporation. Portions created by Netscape are
+ Copyright (C) 1998-1999 Netscape Communications Corporation. All
+Rights Reserved.
+-->
+
+<!DOCTYPE window SYSTEM "chrome://messenger/locale/aw-accounttype.dtd" >
+<window id="accounttype" xmlns:html="http://www.w3.org/TR/REC-html40"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+    onload="parent.wizardPageLoaded('accounttype');">
+
+<box align="vertical" style="width: 100%; height: 100%" flex="100%">
+
+  <box class="title" align="horizontal">
+    <html:div class="title">&accountTypeTitle.label;</html:div>
+    <spring flex="100%"/>
+    <titledbutton class="plain" src="chrome://navigator/skin/animthrob_single.gif"/>
+  </box>
+
+  <html:div class="desc">&accountTypeDesc.label;</html:div>
+<box align="vertical">
+  <html:div>
+    <html:input type="radio" name="acctyperadio" id="mailaccount" value="mail" checked="1"/>
+    &accountTypeMail.label;
+  </html:div>
+  <html:div>
+    <html:input type="radio" name="acctyperadio" id="newsaccount" value="news"/>
+    &accountTypeNews.label;
+  </html:div>
+<!-- no webmail yet...
+  <html:div>
+    <html:input type="radio" name="acctyperadio" id="webmailaccount" value="webmail"/>
+    &accountTypeWebMail.label;
+  </html:div>
+  <html:div style="padding-left: 15px">
+    <html:div>
+      <html:input type="radio" name="webmailradio" id="newwebmail" value="webmail" checked="1"/>
+      &webMailNew.label;
+    </html:div>
+    <html:div>
+      <html:input type="radio" name="webmailradio" id="existwebmail" value="webmail"/>
+      &webMailExisting.label;
+    </html:div>
+  </html:div>
+-->
+    
+</box>
+</box>
+</window>

mozilla/mailnews/base/prefs/resources/content/aw-done.js

@@ -0,0 +1,37 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * 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 Communicator client code, released
+ * March 31, 1998.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1998-1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ */
+
+function onInit() {
+    setDivTextFromForm("identity.email.text", "identity.email");
+    setDivTextFromForm("server.username.text", "server.username");
+}
+
+function setDivTextFromForm(divid, elementid) {
+    var div = document.getElementById(divid);
+    if (!div) return;
+
+    var element = document.getElementById(elementid);
+    var value=element.value;
+
+    if (div.firstChild)
+        div.removeChild(div.firstChild);
+    div.appendChild(document.createTextNode(value));
+
+}

mozilla/mailnews/base/prefs/resources/content/aw-done.xul

@@ -0,0 +1,51 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://messenger/skin/wizard.css" type="text/css"?>
+<!--
+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 Communicator client code, released
+March 31, 1998.
+
+The Initial Developer of the Original Code is Netscape
+Communications Corporation. Portions created by Netscape are
+ Copyright (C) 1998-1999 Netscape Communications Corporation. All
+Rights Reserved.
+-->
+
+<!DOCTYPE window SYSTEM "chrome://messenger/locale/aw-done.dtd" >
+
+<window id="done" xmlns:html="http://www.w3.org/TR/REC-html40"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+    align="vertical"
+    onload="parent.wizardPageLoaded('done');">
+  <html:script src="chrome://messenger/content/aw-done.js"/>
+  <box class="title" align="horizontal">
+    <html:div class="title">&completionTitle.label;</html:div>
+    <spring flex="100%"/>
+    <titledbutton class="plain" src="chrome://navigator/skin/animthrob_single.gif"/>
+  </box>
+
+<html:input type="hidden" name="server.username" id="server.username"/>
+<html:input type="hidden" name="identity.email" id="identity.email"/>
+<html:div>&completionText.label;</html:div>
+<html:p/>
+<box align="horizontal">
+  <html:div>&userNamePrefix.label;</html:div>
+  <html:div id="server.username.text"/>
+</box>
+<box align="horizontal">
+  <html:div>&emailPrefix.label;</html:div>
+  <html:div id="identity.email.text"/>
+</box>
+<html:p/>
+<html:div>&setupAnother.label;</html:div>
+</window>

mozilla/mailnews/base/prefs/resources/content/aw-email.xul

@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://messenger/skin/wizard.css" type="text/css"?>
+
+<!--
+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 Communicator client code, released
+March 31, 1998.
+
+The Initial Developer of the Original Code is Netscape
+Communications Corporation. Portions created by Netscape are
+ Copyright (C) 1998-1999 Netscape Communications Corporation. All
+Rights Reserved.
+-->
+
+<!DOCTYPE window SYSTEM "chrome://messenger/locale/aw-email.dtd" >
+<window id="emailpage" xmlns:html="http://www.w3.org/TR/REC-html40"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+    onload="parent.wizardPageLoaded('email');">
+<box align="vertical" style="width: 100%; height: 100%">
+  <html:div>
+    <html:div>&emailTitle.label;</html:div>
+    <html:div>&emailDesc.label;</html:div>
+  </html:div>
+  <box align="horizontal">
+    <html:input type="text" name="email" id="email"/>
+    <spring flex="100%"/>
+  </box>
+  <html:div>&emailExample.label;</html:div>
+</box>
+</window>

mozilla/mailnews/base/prefs/resources/content/aw-fullname.xul

@@ -0,0 +1,39 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
+
+<!--
+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 Communicator client code, released
+March 31, 1998.
+
+The Initial Developer of the Original Code is Netscape
+Communications Corporation. Portions created by Netscape are
+ Copyright (C) 1998-1999 Netscape Communications Corporation. All
+Rights Reserved.
+-->
+
+<!DOCTYPE window SYSTEM "chrome://messenger/locale/aw-fullname.dtd" >
+<window id="fullnamepage" xmlns:html="http://www.w3.org/TR/REC-html40"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+    onload="parent.wizardPageLoaded('fullname');">
+<box align="vertical" style="width: 100%; height: 100%">
+  <html:div>
+    <html:div>&fullnameTitle.label;</html:div>
+    <html:div>&fullnameDesc.label;</html:div>
+  </html:div>
+  <box align="horizontal">
+    <html:input type="text" name="fullname" id="fullname"/>
+    <spring flex="100%"/>
+  </box>
+  <html:div>&fullnameExample.label;</html:div>
+</box>
+</window>

mozilla/mailnews/base/prefs/resources/content/aw-identity.xul

@@ -0,0 +1,56 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://messenger/skin/wizard.css" type="text/css"?>
+
+<!--
+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 Communicator client code, released
+March 31, 1998.
+
+The Initial Developer of the Original Code is Netscape
+Communications Corporation. Portions created by Netscape are
+ Copyright (C) 1998-1999 Netscape Communications Corporation. All
+Rights Reserved.
+-->
+
+<!DOCTYPE window SYSTEM "chrome://messenger/locale/aw-identity.dtd" >
+<window id="identitypage" xmlns:html="http://www.w3.org/TR/REC-html40"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+    align="vertical"
+    onload="parent.wizardPageLoaded('identity');">
+
+  <box class="title" align="horizontal">
+    <html:div class="title">&identityTitle.label;</html:div>
+    <spring flex="100%"/>
+    <titledbutton class="plain" src="chrome://navigator/skin/animthrob_single.gif"/>
+  </box>
+  <html:div>&identityDesc.label;</html:div>
+
+
+  <html:div>
+    <html:div>&fullnameDesc.label; &fullnameExample.label;</html:div>
+    <box align="horizontal">
+      <html:div>&fullnameLabel.label;</html:div>
+      <html:input type="text" name="identity.fullName" id="identity.fullName"/>
+      <spring flex="100%"/>
+    </box>
+  </html:div>
+
+  <html:div>
+    <html:div>&emailDesc.label; &emailExample.label;</html:div>
+    <box align="horizontal">
+      <html:div>&emailLabel.label;</html:div>
+      <html:input type="text" name="identity.email" id="identity.email"/>
+      <spring flex="100%"/>
+    </box>
+  </html:div>
+</window>

mozilla/mailnews/base/prefs/resources/content/aw-intro.xul

@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
+
+<!--
+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 Communicator client code, released
+March 31, 1998.
+
+The Initial Developer of the Original Code is Netscape
+Communications Corporation. Portions created by Netscape are
+ Copyright (C) 1998-1999 Netscape Communications Corporation. All
+Rights Reserved.
+-->
+
+
+<window id="intro" title="intro" xmlns:html="http://www.w3.org/TR/REC-html40"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+    onload="parent.wizardPageLoaded('intro');">
+<html:div>Welcome to the account wizard</html:div>
+</window>

mozilla/mailnews/base/prefs/resources/content/aw-login.xul

@@ -0,0 +1,62 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://messenger/skin/wizard.css" type="text/css"?>
+
+<!--
+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 Communicator client code, released
+March 31, 1998.
+
+The Initial Developer of the Original Code is Netscape
+Communications Corporation. Portions created by Netscape are
+ Copyright (C) 1998-1999 Netscape Communications Corporation. All
+Rights Reserved.
+-->
+
+<!DOCTYPE window SYSTEM "chrome://messenger/locale/aw-login.dtd" >
+<window id="loginpage" xmlns:html="http://www.w3.org/TR/REC-html40"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+    align="vertical"
+    onload="parent.wizardPageLoaded('login');">
+
+  <box class="title" align="horizontal">
+    <html:div class="title">&loginTitle.label;</html:div>
+    <spring flex="100%"/>
+    <titledbutton class="plain" src="chrome://navigator/skin/animthrob_single.gif"/>
+  </box>
+
+  <box align="vertical" class="padded">
+    <html:div>&usernameDesc.label; &usernameExample.label;</html:div>
+    <html:div>
+      &usernameLabel.label;
+      <html:input type="text" name="server.username" id="server.username"/>
+    </html:div>
+  </box>
+
+  <box align="vertical" class="padded">
+    <html:div class="title">&passwordTitle.label;</html:div>
+    <html:div>&savePasswordDesc.label;</html:div>
+    <html:div>&savePasswordLabel.label;</html:div>
+    <html:div>
+      <html:input type="checkbox" name="server.rememberPassword"
+                  id="server.rememberPassword"/>
+      &savePasswordCheckbox.label;
+    </html:div>
+    <html:div style="padding-left: 15px">
+      <html:div>&passwordDesc.label;</html:div>
+      <html:div>
+        &passwordLabel.label;
+        <html:input type="password" name="server.password" id="server.password"/>
+      </html:div>
+    </html:div>
+  </box>
+</window>

mozilla/mailnews/base/prefs/resources/content/aw-mailtype.xul

@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
+
+<!--
+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 Communicator client code, released
+March 31, 1998.
+
+The Initial Developer of the Original Code is Netscape
+Communications Corporation. Portions created by Netscape are
+ Copyright (C) 1998-1999 Netscape Communications Corporation. All
+Rights Reserved.
+-->
+
+<!DOCTYPE window SYSTEM "chrome://messenger/locale/aw-mailtype.dtd" >
+<window id="mailtype" xmlns:html="http://www.w3.org/TR/REC-html40"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+    onload="parent.wizardPageLoaded('mailtype');">
+<box align="vertical" style="width: 100%; height: 100%">
+<html:div>
+  <html:div>&mailTypeTitle.label;</html:div>
+  <html:div>&mailTypeDesc.label;</html:div>
+</html:div>
+<box align="vertical">
+  <html:div>
+    <html:input type="radio" name="acctyperadio" value="webmail" id="webmail"/>
+    &mailTypeWebMail.label;
+  </html:div>
+  <html:div>
+    <html:input type="radio" name="acctyperadio" value="mail" id="mail" checked="1"/>
+    &mailTypeOtherMail.label;
+  </html:div>
+</box>
+</box>
+</window>

mozilla/mailnews/base/prefs/resources/content/aw-server.xul

@@ -0,0 +1,64 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://messenger/skin/wizard.css" type="text/css"?>
+
+<!--
+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 Communicator client code, released
+March 31, 1998.
+
+The Initial Developer of the Original Code is Netscape
+Communications Corporation. Portions created by Netscape are
+ Copyright (C) 1998-1999 Netscape Communications Corporation. All
+Rights Reserved.
+-->
+
+<!DOCTYPE window SYSTEM "chrome://messenger/locale/aw-server.dtd" >
+<window id="serverpage" xmlns:html="http://www.w3.org/TR/REC-html40"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+    align="vertical"
+    onload="parent.wizardPageLoaded('server');">
+
+  <box class="title" align="horizontal">
+    <html:div class="title">&serverTitle.label;</html:div>
+    <spring flex="100%"/>
+    <titledbutton class="plain" src="chrome://navigator/skin/animthrob_single.gif"/>
+  </box>
+
+  <box align="vertical" class="padded">
+    <html:div class="title">&incomingServerTitle.label;</html:div>
+    <html:div>&incomingServerTypeDesc.label;</html:div>
+    <html:div>
+      &incomingServerTypeLabel.label;
+      <html:select id="server.type" name="server.type">
+        <html:option value="pop3">&popType.label;</html:option>
+        <html:option value="imap">&imapType.label;</html:option>
+        <html:option value="nntp">&nntpType.label;</html:option>
+      </html:select>
+    </html:div>
+    <html:br/>
+    <html:div>&incomingServerNameDesc.label;</html:div>
+    <html:div>
+      &incomingServerLabel.label;
+      <html:input type="text" id="server.hostName" name="server.hostName"/>
+    </html:div>
+  </box>
+
+  <box align="vertical" class="padded">
+    <html:div class="title">&smtpServerTitle.label;</html:div>
+    <html:div>&smtpServerDesc.label;</html:div>
+    <html:div>
+      &smtpServerLabel.label;
+      <html:input type="text" id="smtp.hostname" name="smtp.hostname"/>
+    </html:div>
+  </box>
+</window>

mozilla/mailnews/base/prefs/resources/content/aw-smtp.xul

@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
+
+<!--
+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 Communicator client code, released
+March 31, 1998.
+
+The Initial Developer of the Original Code is Netscape
+Communications Corporation. Portions created by Netscape are
+ Copyright (C) 1998-1999 Netscape Communications Corporation. All
+Rights Reserved.
+-->
+
+
+<window id="smtp" xmlns:html="http://www.w3.org/TR/REC-html40"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+    onload="parent.wizardPageLoaded('smtp');">
+
+<box align="vertical" style="width: 100%; height: 100%; margin: 10px">
+  <html:div>Outgoing mail (SMTP) server:</html:div>
+  <box align="horizontal">
+    <html:input id="smtpserver" type="text"/>
+  </box>
+</box>
+</window>

mozilla/mailnews/base/prefs/resources/content/custreceipt.xul

@@ -0,0 +1,69 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://pref/skin/pref.css" type="text/css"?>
+
+<!DOCTYPE window SYSTEM "chrome://messenger/locale/custreceipt.dtd">
+
+<window xmlns:html="http://www.w3.org/TR/REC-html40"
+		xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+		title="&window.title;"
+		class="dialog"
+		onload="StartUp('Mailnews-Customize Receipts')" >
+
+<html:script language="javascript" src="chrome://pref/content/PrefsWindow.js"/>
+
+<html:script language="javascript">
+
+function DoOKButton() 
+{
+	top.window.close();
+}
+
+function DoCancelButton() 
+{
+	top.window.close();
+}
+
+</html:script>
+
+<html:div flex="100%">
+
+<html:br/>
+&sendReceipt.label;
+<html:form>
+	<html:table>
+		<html:tr><html:td> &notInToCc.label;
+			<html:select>
+			<html:option>&neverSend.label;</html:option>
+			<html:option>&automatically.label;</html:option>
+			<html:option>&askMe.label;</html:option>
+			</html:select>
+		</html:td></html:tr>
+		<html:tr><html:td>&outside.label;
+			<html:select>
+			<html:option>&neverSend.label;</html:option>
+			<html:option>&automatically.label;</html:option>
+			<html:option>&askMe.label;</html:option>
+			</html:select>
+		</html:td></html:tr>
+		<html:tr><html:td>&other.label;
+			<html:select>
+			<html:option>&neverSend.label;</html:option>
+			<html:option>&automatically.label;</html:option>
+			<html:option>&askMe.label;</html:option>
+			</html:select>
+		</html:td></html:tr>
+	</html:table>
+</html:form>
+
+<html:br/>
+<html:form>
+	<html:table>
+    <html:tr><html:td>
+		<html:input name="ok" type="button" value="&ok.label;" onclick="DoOKButton()"/>
+		<html:input name="cancel" type="button" value="&cancel.label;" onclick="DoCancelButton()"/>
+	</html:td></html:tr>
+	</html:table>
+</html:form>
+
+</html:div>
+</window>

mozilla/mailnews/base/prefs/resources/content/makefile.win

@@ -0,0 +1,72 @@
+#!nmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+DEPTH=..\..\..\..\..
+
+include <$(DEPTH)\config\rules.mak>
+
+install:: 
+	$(MAKE_INSTALL) AccountManager.xul	$(DIST)\bin\chrome\messenger\content\default
+	$(MAKE_INSTALL) AccountManager.js	$(DIST)\bin\chrome\messenger\content\default
+	$(MAKE_INSTALL) am-main.xul			$(DIST)\bin\chrome\messenger\content\default
+	$(MAKE_INSTALL) am-server.xul		$(DIST)\bin\chrome\messenger\content\default
+	$(MAKE_INSTALL) am-server.js		$(DIST)\bin\chrome\messenger\content\default
+	$(MAKE_INSTALL) am-server-top.xul	$(DIST)\bin\chrome\messenger\content\default
+	$(MAKE_INSTALL) am-copies.xul		$(DIST)\bin\chrome\messenger\content\default
+	$(MAKE_INSTALL) am-copies.js		$(DIST)\bin\chrome\messenger\content\default
+	$(MAKE_INSTALL) am-advanced.xul		$(DIST)\bin\chrome\messenger\content\default
+	$(MAKE_INSTALL) am-smtp.xul		$(DIST)\bin\chrome\messenger\content\default
+	$(MAKE_INSTALL) pref-mailnews.xul	$(DIST)\bin\chrome\messenger\content\default
+	$(MAKE_INSTALL) pref-winsetting.xul $(DIST)\bin\chrome\messenger\content\default
+	$(MAKE_INSTALL) pref-receipts.xul	$(DIST)\bin\chrome\messenger\content\default
+	$(MAKE_INSTALL) custreceipt.xul		$(DIST)\bin\chrome\messenger\content\default
+	$(MAKE_INSTALL) pref-diskspace.xul	$(DIST)\bin\chrome\messenger\content\default
+	$(MAKE_INSTALL) AccountWizard.xul	$(DIST)\bin\chrome\messenger\content\default
+	$(MAKE_INSTALL) AccountWizard.js	$(DIST)\bin\chrome\messenger\content\default
+	$(MAKE_INSTALL) aw-accounttype.xul	$(DIST)\bin\chrome\messenger\content\default
+	$(MAKE_INSTALL) aw-identity.xul		$(DIST)\bin\chrome\messenger\content\default
+	$(MAKE_INSTALL) aw-server.xul		$(DIST)\bin\chrome\messenger\content\default
+	$(MAKE_INSTALL) aw-login.xul		$(DIST)\bin\chrome\messenger\content\default
+	$(MAKE_INSTALL) aw-accname.xul		$(DIST)\bin\chrome\messenger\content\default
+	$(MAKE_INSTALL) aw-done.xul			$(DIST)\bin\chrome\messenger\content\default
+	$(MAKE_INSTALL) aw-done.js			$(DIST)\bin\chrome\messenger\content\default
+
+clobber::
+	rm -f $(DIST)\chrome\messenger\content\default\AccountManager.xul
+	rm -f $(DIST)\chrome\messenger\content\default\AccountManager.js
+	rm -f $(DIST)\chrome\messenger\content\default\am-main.xul
+	rm -f $(DIST)\chrome\messenger\content\default\am-server.xul
+	rm -f $(DIST)\chrome\messenger\content\default\am-server.js
+	rm -f $(DIST)\chrome\messenger\content\default\am-server-top.xul
+	rm -f $(DIST)\chrome\messenger\content\default\am-copies.xul
+	rm -f $(DIST)\chrome\messenger\content\default\am-copies.js
+	rm -f $(DIST)\chrome\messenger\content\default\am-advanced.xul
+	rm -f $(DIST)\chrome\messenger\content\default\am-smtp.xul
+	rm -f $(DIST)\chrome\messenger\content\default\AccountWizard.xul
+	rm -f $(DIST)\chrome\messenger\content\default\AccountWizard.js
+	rm -f $(DIST)\chrome\messenger\content\default\aw-accounttype.xul
+	rm -f $(DIST)\chrome\messenger\content\default\aw-identity.xul
+	rm -f $(DIST)\chrome\messenger\content\default\aw-server.xul
+	rm -f $(DIST)\chrome\messenger\content\default\aw-smtp.xul
+	rm -f $(DIST)\chrome\messenger\content\default\aw-login.xul
+	rm -f $(DIST)\chrome\messenger\content\default\aw-accname.xul
+	rm -f $(DIST)\chrome\messenger\content\default\aw-done.xul
+	rm -f $(DIST)\chrome\messenger\content\default\pref-mailnews.xul
+	rm -f $(DIST)\chrome\messenger\content\default\pref-winsetting.xul
+	rm -f $(DIST)\chrome\messenger\content\default\pref-receipts.xul
+	rm -f $(DIST)\chrome\messenger\content\default\custreceipt.xul
+	rm -f $(DIST)\chrome\messenger\content\default\pref-diskspace.xul

mozilla/mailnews/base/prefs/resources/content/pref-diskspace.xul

@@ -0,0 +1,66 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://pref/skin/pref.css" type="text/css"?>
+
+<!DOCTYPE window SYSTEM "chrome://messenger/locale/pref-diskspace.dtd">
+
+<window xmlns:html="http://www.w3.org/TR/REC-html40"
+		xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+		onload="StartUp('Mailnews-Disk Space')" >
+
+<html:script language="javascript" src="chrome://pref/content/PrefsWindow.js"/>
+
+<html:div flex="100%">
+	<html:div id="top">
+		<html:span id="lefttext">&pane.title;</html:span>
+	</html:div>
+
+<html:br/>
+&allMsg.label;
+<html:form>
+	<html:table>
+		<html:tr><html:td>
+			<html:input type="checkbox" id="pref:0:bool:mail.limit_message_size"/>
+			<html:label>&storeMsgLimit.label;</html:label>
+			<html:input name="maxsize" id="pref:string:mail.max_size" size="4"/>&kb.label;
+		</html:td></html:tr>
+		<html:tr><html:td>
+			<html:input type="checkbox" id="pref:0:bool:mail.prompt_purge_threshhold"/>
+			<html:label>&autoCompact.label;</html:label>
+			<html:input name="purgesize" id="pref:string:mail.purge_threshhold" size="4"/>&kb.label;
+		</html:td></html:tr>
+	</html:table>
+</html:form>
+ 
+<html:br/>
+&newgroupMsgOnly.label;
+<html:table>
+		<html:tr><html:td><html:label>&whenToClean.label;</html:label></html:td></html:tr>
+		<html:tr><html:td>
+			<html:input name="keepmsg" type="radio" id="pref:1:int:news.keep.method"/>
+			<html:label>&keepMsgs.label;</html:label>
+			<html:input name="keepdays" id="pref:string:news.keep.days" size="4"/>&days.label;
+		</html:td></html:tr>
+		<html:tr><html:td>
+			<html:input name="keepmsg" type="radio" id="pref:0:int:news.keep.method" checked="true"/>
+			<html:label>&keepAllMsg.label;</html:label>
+		</html:td></html:tr>
+		<html:tr><html:td>
+			<html:input name="keepmsg" type="radio" id="pref:2:int:news.keep.method"/>
+			<html:label>&keepTheNewest.label;</html:label>
+			<html:input name="keepmsgcount" id="pref:string:news.keep.count" size="4"/>&messages.label;
+		</html:td></html:tr>
+		<html:tr><html:td> </html:td></html:tr>
+		<html:tr><html:td> </html:td></html:tr>
+		<html:tr><html:td>
+			<html:input type="checkbox" id="pref:0:bool:news.keep.only_unread"/>
+			<html:label>&keepUnread.label;</html:label>
+		</html:td></html:tr>
+		<html:tr><html:td>
+			<html:input type="checkbox" id="pref:0:bool:news.remove_bodies.by_age"/>
+			<html:label>&removeMsg.label;</html:label>
+			<html:input name="removedays" id="pref:string:news.remove_bodies.days" size="4"/>&days.label;
+		</html:td></html:tr>
+</html:table>
+
+</html:div>
+</window>

mozilla/mailnews/base/prefs/resources/content/pref-mailnews.xul

@@ -0,0 +1,72 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://pref/skin/pref.css" type="text/css"?>
+
+<!DOCTYPE window SYSTEM "chrome://messenger/locale/pref-mailnews.dtd">
+
+<window xmlns:html="http://www.w3.org/TR/REC-html40"
+		xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+		onload="StartUp('Mailnews-Main')" >
+
+<html:script language="javascript" src="chrome://pref/content/PrefsWindow.js"/>
+
+<html:div flex="100%">
+	<html:div id="top">
+		<html:span id="lefttext">&pane.title;</html:span>
+	</html:div>
+
+&textBegin.label;
+<html:form>
+	<html:table>
+		<html:tr><html:td>&style.label;
+			<html:select>
+			<html:option>&regular.label;</html:option>
+			<html:option>&bold.label;</html:option>
+			<html:option>&italic.label;</html:option>
+			<html:option>&boldItalic.label;</html:option>
+			</html:select>
+		</html:td></html:tr>
+		<html:tr><html:td>&size.label;
+			<html:select>
+			<html:option>&regular.label;</html:option>
+			<html:option>&bigger.label;</html:option>
+			<html:option>&smaller.label;</html:option>
+			</html:select>
+		</html:td></html:tr>
+		<html:tr><html:td>&color.label;
+			<html:select>
+			<html:option></html:option>
+			</html:select>
+		</html:td></html:tr>
+	</html:table>
+</html:form>
+
+&displayWith.label;
+<html:form>
+	<html:table>
+		<html:tr><html:td><html:input name="fontwidth" type="radio"
+			id="pref:1:int:mail.fixed_width_messages" checked="true"/>
+			<html:label>&fixedWidth.label;</html:label>
+		</html:td></html:tr>
+		<html:tr><html:td><html:input name="fontwidth" type="radio"
+			id="pref:0:int:mail.fixed_width_messages"/>
+			<html:label>&variableWidth.label;</html:label>
+		</html:td></html:tr>
+	</html:table>
+</html:form>
+ 
+<html:br/>
+<html:form>
+	<html:table>
+		<html:tr><html:td><html:input type="checkbox" id="pref:1:bool:mail.play_sound"/>
+		<html:label>&playSound.label;</html:label></html:td></html:tr>
+		<html:tr><html:td><html:input type="checkbox" id="pref:1:bool:mailnews.remember_selected_message"/>
+		<html:label>&rememberLastMsg.label;</html:label></html:td></html:tr>
+		<html:tr><html:td><html:input type="checkbox" id="pref:1:bool:mailnews.confirm.moveFoldersToTrash"/>
+		<html:label>&confirmMove.label;</html:label></html:td></html:tr>
+		<html:tr><html:td><html:input type="checkbox" id="pref:0:bool:mail.use_mapi_server"/>
+		<html:label>&useMessenger.label;</html:label></html:td></html:tr>
+	</html:table>
+</html:form>
+
+</html:div>
+</window>

mozilla/mailnews/base/prefs/resources/content/pref-receipts.xul

@@ -0,0 +1,78 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://pref/skin/pref.css" type="text/css"?>
+
+
+<!DOCTYPE window SYSTEM "chrome://messenger/locale/pref-receipts.dtd">
+
+<window xmlns:html="http://www.w3.org/TR/REC-html40"
+		xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+		onload="StartUp('Mailnews-Return Receipts')" >
+
+<html:script language="javascript" src="chrome://pref/content/PrefsWindow.js"/>
+
+<html:script language="javascript">
+
+function DoCustomize() 
+{
+	var dialog = window.openDialog("chrome://messenger/content/custreceipt.xul",
+								   "",
+								   "chrome");
+}
+
+</html:script>
+
+
+<html:div flex="100%">
+	<html:div id="top">
+		<html:span id="lefttext">&pane.title;</html:span>
+	</html:div>
+
+&requestReceipt.label;
+<html:form>
+	<html:table>
+		<html:tr><html:td>
+			<html:input name="msgreceipt" type="radio" id="pref:1:int:mail.request.return_receipt"/>
+			<html:label>&dsn.label;</html:label> 
+		</html:td></html:tr>
+		<html:tr><html:td>
+			<html:input name="msgreceipt" type="radio" id="pref:2:int:mail.request.return_receipt" checked="true"/>
+			<html:label>&mdn.label;</html:label>
+		</html:td></html:tr>
+		<html:tr><html:td>
+			<html:input name="msgreceipt" type="radio" id="pref:3:int:mail.request.return_receipt"/>
+			<html:label>&both.label;</html:label>
+		</html:td></html:tr>
+	</html:table>
+</html:form>
+ 
+&receiptArrive.label;
+<html:form>
+	<html:table>
+		<html:tr><html:td>
+			<html:input name="getreceipt" type="radio" id="pref:0:int:mail.incorporate.return_receipt" checked="true"/>
+			<html:label>&leaveIt.label;</html:label>
+		</html:td></html:tr>
+		<html:tr><html:td>
+			<html:input name="getreceipt" type="radio" id="pref:1:int:mail.incorporate.return_receipt"/>
+			<html:label>&moveToSent.label;</html:label>
+		</html:td></html:tr>
+	</html:table>
+</html:form>
+
+&requestMDN.label;
+<html:form>
+	<html:table>
+		<html:tr><html:td>
+			<html:input name="returnreceipt" type="radio" id="pref:0:int:mail.mdn.report.enabled"/>
+			<html:label>&never.label;</html:label>
+		</html:td></html:tr>
+		<html:tr><html:td>
+			<html:input name="returnreceipt" type="radio" id="pref:1:int:mail.mdn.report.enabled" checked="true"/>
+			<html:label>&returnSome.label;</html:label>
+			<html:input name="custom" type="button" value="&custom.label;"/>
+		</html:td></html:tr>
+	</html:table>
+</html:form>
+
+</html:div>
+</window>

mozilla/mailnews/base/prefs/resources/content/pref-winsetting.xul

@@ -0,0 +1,59 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://pref/skin/pref.css" type="text/css"?>
+
+<!DOCTYPE window SYSTEM "chrome://messenger/locale/pref-winsetting.dtd">
+
+<window xmlns:html="http://www.w3.org/TR/REC-html40"
+		xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+		onload="StartUp('Mailnews-Window Setting')" >
+
+<html:script language="javascript" src="chrome://pref/content/PrefsWindow.js"/>
+
+<html:div flex="100%">
+	<html:div id="top">
+		<html:span id="lefttext">&pane.title;</html:span>
+	</html:div>
+
+<html:form>
+	<html:table>
+		<html:tr><html:td><html:label>&chooseLayout.label;</html:label></html:td></html:tr>
+		<html:tr><html:td>
+			<html:input name="winlayout" type="radio" id="pref:0:int:mail.pane_arrangement" checked="true"/> 
+			<html:img src="chrome://messenger/skin/winclassic.gif"/>
+			<html:input name="winlayout" type="radio" id="pref:1:int:mail.pane_arrangement"/>
+			<html:img src="chrome://messenger/skin/winwide.gif"/>
+		</html:td></html:tr>
+	<html:tr><html:td>&chooseExp.label;</html:td></html:tr>
+	</html:table>
+</html:form>
+
+<html:form>
+	<html:table>
+		<html:tr><html:td>
+			<html:input type="checkbox" id="pref:1:int:mailnews.reuse_thread_window2"/>
+			<html:label>&reuseThread.label;</html:label>
+		</html:td></html:tr>
+		<html:tr><html:td>
+			<html:input type="checkbox" id="pref:1:int:mailnews.reuse_message_window"/>
+			<html:label>&reuseMessage.label;</html:label>
+		</html:td></html:tr>
+		<html:tr><html:td>&reuseExp.label;</html:td></html:tr>
+	</html:table>
+</html:form>
+
+&newsOpt.label;
+<html:form>
+	<html:table>
+		<html:tr><html:td>
+			<html:input name="opennews" type="radio" id="pref:0:int:news.use_message_center" checked="true"/>
+			<html:label>&openMessenger.label;</html:label>
+		</html:td></html:tr>
+		<html:tr><html:td>
+			<html:input name="opennews" type="radio" id="pref:1:int:news.use_message_center"/>
+			<html:label>&openCenter.label;</html:label>
+		</html:td></html:tr>
+	</html:table>
+</html:form>
+ 
+</html:div>
+</window>

mozilla/mailnews/base/prefs/resources/locale/en-US/AccountManager.dtd

@@ -0,0 +1,11 @@
+<!-- extracted from AccountManager.xul -->
+
+<!ENTITY accountManagerTitle.label "Account Settings">
+
+<!ENTITY newAccountButton.label "New Account">
+<!ENTITY setDefaultButton.label "Set as Default">
+<!ENTITY duplicateButton.label "Duplicate">
+<!ENTITY deleteButton.label "Delete">
+
+<!ENTITY nameCol.label "Name">
+<!ENTITY duplicate.label "Duplicate">

mozilla/mailnews/base/prefs/resources/locale/en-US/AccountWizard.dtd

@@ -0,0 +1,7 @@
+<!-- extracted from AccountWizard.xul -->
+
+<!ENTITY backButton.label "Back">
+<!ENTITY nextButton.label "Next">
+<!ENTITY finishButton.label "Finish">
+<!ENTITY cancelButton.label "Cancel">
+<!ENTITY instructions.label "Click next to continue entering information.">

mozilla/mailnews/base/prefs/resources/locale/en-US/MANIFEST

@@ -0,0 +1,38 @@
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+# This is a list of local files which get copied to the res\mailnews\messenger directory
+#
+
+custreceipt.dtd
+pref-diskspace.dtd
+pref-mailnews.dtd
+pref-receipts.dtd
+pref-winsetting.dtd
+aw-accname.dtd
+aw-accounttype.dtd
+aw-done.dtd
+aw-email.dtd
+aw-fullname.dtd
+aw-identity.dtd
+aw-login.dtd
+aw-mailtype.dtd
+aw-server.dtd
+AccountManager.dtd
+AccountWizard.dtd
+am-advanced.dtd
+am-copies.dtd
+am-main.dtd
+am-server-top.dtd

mozilla/mailnews/base/prefs/resources/locale/en-US/Makefile.in

@@ -0,0 +1,56 @@
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+DEPTH		= ../../../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+SAMPLES_DIR	= $(DIST)/bin/chrome/messenger/locale/en-US
+
+EXPORT_RESOURCE_SAMPLES = \
+		custreceipt.dtd \
+		pref-diskspace.dtd \
+		pref-mailnews.dtd \
+		pref-receipts.dtd \
+		pref-winsetting.dtd \
+		aw-accname.dtd \
+		aw-accounttype.dtd \
+		aw-done.dtd \
+		aw-email.dtd \
+		aw-fullname.dtd \
+		aw-identity.dtd \
+		aw-login.dtd \
+		aw-mailtype.dtd \
+		aw-server.dtd \
+		AccountManager.dtd \
+		AccountWizard.dtd \
+		am-advanced.dtd \
+		am-copies.dtd \
+		am-main.dtd \
+		am-server-top.dtd \
+		$(NULL)
+
+include $(topsrcdir)/config/rules.mk
+
+GARBAGE		+= $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES))
+
+install::
+	$(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES)) $(SAMPLES_DIR)
+

mozilla/mailnews/base/prefs/resources/locale/en-US/am-advanced.dtd

@@ -0,0 +1,12 @@
+<!-- extracted from am-advanced.xul -->
+
+<!ENTITY advancedSettings.label "Advanced Settings">
+<!-- LOCALIZATION NOTE (smtpServer.label): do not translate "SMTP" in below line -->
+<!ENTITY smtpServer.label "SMTP Server">
+<!-- LOCALIZATION NOTE (smtpDesc.label): do not translate "SMTP" in below line -->
+<!ENTITY smtpDesc.label "Only one outgoing (SMTP) server needs to be specified, even if you have several mail accounts. Enter the name of the outgoing server you use the most frequently to access your mail">
+
+<!ENTITY smtpAlwaysUseName.label "Always use name and password">
+<!ENTITY smtpSavePassword.label "Save my password">
+<!ENTITY smtpHostname.label "Server Name:">
+<!ENTITY smtpUsername.label "User Name:">

mozilla/mailnews/base/prefs/resources/locale/en-US/am-copies.dtd

@@ -0,0 +1,14 @@
+<!-- extracted from am-copies.xul -->
+
+<!ENTITY copyAndFolderTitle.label "Copy and Folder settings">
+<!ENTITY sendingPrefix.label "When sending messages, automatically ">
+<!ENTITY fccMailFolder.label "Place a copy in:">
+<!ENTITY chooseFolderButton.label "Choose Folder...">
+<!-- LOCALIZATION NOTE (bccAccount.label): do not translate "Bcc" in below line -->
+<!ENTITY bccAccount.label "Bcc ">
+<!-- LOCALIZATION NOTE (bccAddress.label): do not translate "Bcc" in below line -->
+<!ENTITY bccAddress.label "Bcc these addresses:">
+<!ENTITY specialFolderTitle.label "Special Folders">
+<!ENTITY junkMailFolder.label "Keep junk mail in:">
+<!ENTITY draftMailFolder.label "Keep message drafts in:">
+<!ENTITY templateMailFolder.label "Keep message stationary in:">

mozilla/mailnews/base/prefs/resources/locale/en-US/am-main.dtd

@@ -0,0 +1,23 @@
+<!-- extracted from am-main.xul -->
+
+<!ENTITY accountTitle.label "Account Settings">
+<!ENTITY accountSettingsDesc.label "The following information is needed before you can send mail. If you do not know the information requested, please contact your system administrator or Internet Service Provider.">
+<!ENTITY accountName.label "Account Name:">
+<!ENTITY accountNameDesc.label "The account name identitifies each account">
+<!ENTITY identityTitle.label "Identity">
+<!ENTITY identityDesc.label "Each account can have its own identity, which is the information that other people see when they read your messages.">
+<!ENTITY name.label "Your Name:">
+<!ENTITY email.label "Email Address:">
+<!ENTITY replyTo.label "Reply-to Address:">
+<!ENTITY organization.label "Organization:">
+<!ENTITY signature.label "Attach this signature">
+<!ENTITY editSignature.label "Edit...">
+<!-- LOCALIZATION NOTE (editVCard.label) : do not translate "vCard" in below line -->
+<!ENTITY editVCard.label "Edit vCard...">
+<!ENTITY sampleSig1.label "Sample Signature 1">
+<!ENTITY sampleSig2.label "Sample Signature 2">
+<!ENTITY sampleSig3.label "Sample Signature 3">
+<!-- LOCALIZATION NOTE (useHtml.label) : do not translate "html" in below line -->
+<!ENTITY useHtml.label "Compose messages using html">
+<!-- LOCALIZATION NOTE (attachVCard.label) : do not translate "vCard" in below line -->
+<!ENTITY attachVCard.label "Attach my vCard to messages">

mozilla/mailnews/base/prefs/resources/locale/en-US/am-server-top.dtd

@@ -0,0 +1,37 @@
+<!-- extracted from am-server-top.xul -->
+
+<!ENTITY serverSettings.label "Server Settings">
+<!-- LOCALIZATION NOTE (popServer.label) : do not translate "POP" in below line -->
+<!ENTITY popServer.label "POP Mail server">
+<!-- LOCALIZATION NOTE (imapServer.label) : do not translate "IMAP" in below line -->
+<!ENTITY imapServer.label "IMAP Mail server">
+<!ENTITY newsServer.label "News Server">
+<!ENTITY webmail.label "Web mail account">
+<!ENTITY serverType.label "Server Type:">
+<!ENTITY serverName.label "Server Name:">
+<!ENTITY userName.label "User Name:">
+<!ENTITY savePassword.label "Save password.">
+<!-- LOCALIZATION NOTE (biffStart.label) : translate below 2 line with grammer dependency
+        For example, in Japanese cases:
+                biffStart.label "every"
+                biffEnd.label   "minutes for new messages Check"
+-->
+<!ENTITY biffStart.label "Check for new mail every ">
+<!ENTITY biffEnd.label "minutes">
+<!ENTITY leaveOnServer.label "Leave messages on server">
+<!ENTITY deleteOnServer.label "Delete messages on server when deleted locally.">
+<!ENTITY emptyTrashOnExit.label "Empty Trash on Exit">
+<!ENTITY hostname.label "Server Hostname">
+<!ENTITY username.label "Your Login Name">
+<!-- LOCALIZATION NOTE (popServerTitle.label) : do not translate "POP" in below line -->
+<!ENTITY popServerTitle.label "POP Server Information">
+<!ENTITY deleteMessagePrefix.label "When I delete a message:">
+<!ENTITY modelMoveToTrash.label "Move it to the Trash folder">
+<!ENTITY modelMarkDeleted.label "Mark it as deleted">
+<!ENTITY modelDeleteImmediately.label "Remove it immediately">
+<!-- LOCALIZATION NOTE (expungeOnExit.label) : do not translate two of "&quot;" in below line -->
+<!ENTITY expungeOnExit.label "Clean up (&quot;Expunge&quot;) Inbox on Exit.">
+<!ENTITY emptyTrashOnExit.label "Empty Trash on Exit.">
+<!ENTITY maxMessagesStart.label "Ask me before downloading more than">
+<!ENTITY maxMessagesEnd.label "messages.">
+<!ENTITY localPath.label "Local directory:">

mozilla/mailnews/base/prefs/resources/locale/en-US/aw-accname.dtd

@@ -0,0 +1,7 @@
+<!-- extracted from aw-accname.xul -->
+
+<!ENTITY accnameTitle.label "Account Name">
+<!-- LOCALIZATION NOTE (accnameDesc.label) : do not translate any "&quot;" in below line -->
+<!ENTITY accnameDesc.label "Enter the name by which you would like to refer to this account. (For example, &quot;WorkAccount&quot;, &quot;Home Account&quot; or &quot;News Account&quot;)">
+<!ENTITY accnameExample.label "For example, Work Account, Home Account or News Account">
+<!ENTITY accnameLabel.label "Account Name:">

mozilla/mailnews/base/prefs/resources/locale/en-US/aw-accounttype.dtd

@@ -0,0 +1,10 @@
+<!-- extracted from aw-accounttype.xul -->
+
+<!ENTITY accountTypeTitle.label "New Account Setup">
+<!ENTITY accountTypeDesc.label "This Wizard will collect the information necessary to setup a new Netscape Mail account. If you do not know the information requested, please contact your System Administrator or Internet Service Provider.">
+<!ENTITY accountTypeDirections.label "Select the type of account you would like to setup:">
+<!ENTITY accountTypeMail.label "Mail">
+<!ENTITY accountTypeNews.label "News">
+<!ENTITY accountTypeWebMail.label "Netscape WebMail">
+<!ENTITY webMailNew.label "New Account">
+<!ENTITY webMailExisting.label "Existing Account">

mozilla/mailnews/base/prefs/resources/locale/en-US/aw-done.dtd

@@ -0,0 +1,6 @@
+<!-- extracted from aw-done.xul -->
+<!ENTITY completionTitle.label "Congratulations!">
+<!ENTITY completionText.label "You have entered all the information required to set up this account.">
+<!ENTITY userNamePrefix.label "User Name:">
+<!ENTITY emailPrefix.label "Email Address:">
+<!ENTITY setupAnother.label "Click &quot;Set up Another&quot; to save these settings and set up another account.">

mozilla/mailnews/base/prefs/resources/locale/en-US/aw-email.dtd

@@ -0,0 +1,7 @@
+<!-- extracted from aw-email.xul -->
+
+<!ENTITY emailTitle.label "Your Email Address:">
+<!ENTITY emailDesc.label "Enter your email address; this is the address otherws will use to send email to you:">
+<!-- LOCALIZATION NOTE (emailExample.label) : do not translate "elmer@netscape.net" in below line -->
+<!ENTITY emailExample.label "For example: elmer@netscape.net">
+

mozilla/mailnews/base/prefs/resources/locale/en-US/aw-fullname.dtd

@@ -0,0 +1,7 @@
+<!-- extracted from aw-fullname.xul -->
+
+<!ENTITY fullnameTitle.label "Your Name:">
+<!ENTITY fullnameDesc.label "Enter your name as you would like it to appear in the From field of outgoing messages:">
+<!-- LOCALIZATION NOTE (fullnameExample.label) : Use different localized name instead of "Elmer Fudd" -->
+<!ENTITY fullnameExample.label "For example: Elmer Fudd">
+

mozilla/mailnews/base/prefs/resources/locale/en-US/aw-identity.dtd

@@ -0,0 +1,18 @@
+<!-- extracted from aw-identity.xul -->
+
+<!ENTITY identityTitle.label "Identity">
+<!ENTITY identityDesc.label "Each account can have its own identity, which is the information that identitifies you to others when they receive your messages.">
+
+<!-- LOCALIZATION NOTE (fullnameDesc.label) : do not translate two of "&quot;" in below line -->
+<!ENTITY fullnameDesc.label "Enter the name you would like to appear in the &quot;From&quot; field of your outgoing messages.">
+<!-- LOCALIZATION NOTE (fullnameExample.label) : use following directions for below line
+	1, do not translate two of "&quot;"
+	2, Use localized full name instead of "John Smith"
+-->
+<!ENTITY fullnameExample.label "(For example, &quot;John Smith&quot;)">
+<!ENTITY fullnameLabel.label "Your Name:">
+
+<!ENTITY emailDesc.label "Enter your email address. This is the address others will use to send email to you.">
+<!-- LOCALIZATION NOTE (fullnameDesc.label) : do not translate "&quot;test@netscape.net&quot;" in below line -->
+<!ENTITY emailExample.label "(For example, &quot;test@netscape.net&quot;)">
+<!ENTITY emailLabel.label "Email Address:">

mozilla/mailnews/base/prefs/resources/locale/en-US/aw-login.dtd

@@ -0,0 +1,15 @@
+<!-- extracted from aw-login.xul -->
+
+<!ENTITY loginTitle.label "Name and Password">
+<!ENTITY usernameDesc.label "Enter your user name given to you by your email provider.">
+<!-- LOCALIZATION NOTE (usernameExample.label) : do not translate "&quot;jsmith&quot;" in below line -->
+<!ENTITY usernameExample.label "(for example, &quot;jsmith&quot;)">
+<!ENTITY usernameLabel.label "User Name:">
+
+<!ENTITY passwordTitle.label "Password Storage">
+<!ENTITY savePasswordDesc.label "Netscape Mail can save your password and send it to the server so that you are not asked for it each time you access this account. This is not recommended if other people have access to your computer.">
+<!ENTITY savePasswordLabel.label "If you want Netscape Mail to save your password, check the box below.">
+<!ENTITY savePasswordCheckbox.label "Save my password">
+
+<!ENTITY passwordDesc.label "Enter the password given to you by your email provider">
+<!ENTITY passwordLabel.label "Password:">

mozilla/mailnews/base/prefs/resources/locale/en-US/aw-mailtype.dtd

@@ -0,0 +1,8 @@
+<!-- extracted from aw-mailtype.xul -->
+
+<!-- LOCALIZATION NOTE (mailTypeTitle.label) : Do not translate "WebMail" in below line. -->
+<!ENTITY mailTypeTitle.label "Netscape WebMail or Other Mail:">
+<!-- LOCALIZATION NOTE (mailTypeDesc.label) : Do not translate "WebMail" in below line. -->
+<!ENTITY mailTypeDesc.label "Select a free Netscape WebMail account or other mail account, such as your ISP or company mail.">
+<!ENTITY mailTypeOtherMail.label "Other Mail">
+

mozilla/mailnews/base/prefs/resources/locale/en-US/aw-server.dtd

@@ -0,0 +1,22 @@
+<!-- extracted from aw-server.xul -->
+
+<!ENTITY serverTitle.label "Server Information">
+<!ENTITY incomingServerTitle.label "Incoming Server">
+<!ENTITY incomingServerTypeDesc.label "Select the type of incoming server you are using.">
+<!ENTITY incomingServerTypeLabel.label "Server Type:">
+<!-- LOCALIZATION NOTE (incomingServerNameDesc.label) : Do not translate "&quot;pop.netscape.net&quot;" in below line -->
+<!ENTITY incomingServerNameDesc.label "Enter the name of your incoming server. (For example, &quot;pop.netscape.net&quot;)">
+<!ENTITY incomingServerLabel.label "Server Name:">
+
+<!-- LOCALIZATION NOTE (smtpServerTitle.label) : Do not translate "SMTP" in below line -->
+<!ENTITY smtpServerTitle.label "Outgoing (SMTP) Server">
+<!-- LOCALIZATION NOTE (smtpServerDesc.label) : Do not translate "SMTP" and "&quot;smtp.netscape.net&quot;" in below line -->
+<!ENTITY smtpServerDesc.label "Enter the name of your outgoing (SMTP) server. (For example, &quot;smtp.netscape.net&quot;)">
+<!ENTITY smtpServerLabel.label "Server Name:">
+
+<!-- LOCALIZATION NOTE (imapType.label) : Do not translate "IMAP" in below line -->
+<!ENTITY imapType.label "IMAP Mail Server">
+<!-- LOCALIZATION NOTE (popType.label) : Do not translate "POP" in below line -->
+<!ENTITY popType.label "POP Mail Server">
+<!ENTITY nntpType.label "News Server">
+

mozilla/mailnews/base/prefs/resources/locale/en-US/custreceipt.dtd

@@ -0,0 +1,32 @@
+<!--
+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 Communicator client code, released
+March 31, 1998.
+
+The Initial Developer of the Original Code is Netscape
+Communications Corporation. Portions created by Netscape are
+ Copyright (C) 1998-1999 Netscape Communications Corporation. All
+Rights Reserved.
+--> 
+
+<!ENTITY window.title "Customize Return Receipts">
+<!ENTITY pane.title "Customize Return Receipts">
+<!-- LOCALIZATION NOTE (sendReceipt.label) : Do not translate "MDN" in below line -->
+<!ENTITY sendReceipt.label "When I receive a message and its sender requested a receipt(MDN), send one in the following cases:">
+<!ENTITY notInToCc.label "If I'm not in the To or CC list of the message (as for a message to a mailing list):">
+<!ENTITY neverSend.label "Never Send">
+<!ENTITY automatically.label "Automatically">
+<!ENTITY askMe.label "Ask Me">
+<!ENTITY outside.label "If the message comes from outside the domain:">
+<!ENTITY other.label "In all other cases:">
+<!ENTITY ok.label "Ok">
+<!ENTITY cancel.label "Cancel">

mozilla/mailnews/base/prefs/resources/locale/en-US/makefile.win

@@ -0,0 +1,66 @@
+#!nmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+DEPTH=..\..\..\..\..\..
+
+include <$(DEPTH)\config\rules.mak>
+
+DISTBROWSER=$(DIST)\bin\chrome\messenger\locale\en-US
+
+install::
+	$(MAKE_INSTALL) custreceipt.dtd $(DISTBROWSER)
+	$(MAKE_INSTALL) pref-diskspace.dtd $(DISTBROWSER)
+	$(MAKE_INSTALL) pref-mailnews.dtd $(DISTBROWSER)
+	$(MAKE_INSTALL) pref-receipts.dtd $(DISTBROWSER)
+	$(MAKE_INSTALL) pref-winsetting.dtd $(DISTBROWSER)
+	$(MAKE_INSTALL) aw-accname.dtd $(DISTBROWSER)
+	$(MAKE_INSTALL) aw-accounttype.dtd $(DISTBROWSER)
+	$(MAKE_INSTALL) aw-done.dtd $(DISTBROWSER)
+	$(MAKE_INSTALL) aw-email.dtd $(DISTBROWSER)
+	$(MAKE_INSTALL) aw-fullname.dtd $(DISTBROWSER)
+	$(MAKE_INSTALL) aw-identity.dtd $(DISTBROWSER)
+	$(MAKE_INSTALL) aw-login.dtd $(DISTBROWSER)
+	$(MAKE_INSTALL) aw-mailtype.dtd $(DISTBROWSER)
+	$(MAKE_INSTALL) aw-server.dtd $(DISTBROWSER)
+	$(MAKE_INSTALL) AccountManager.dtd $(DISTBROWSER)
+	$(MAKE_INSTALL) AccountWizard.dtd $(DISTBROWSER)
+	$(MAKE_INSTALL) am-advanced.dtd $(DISTBROWSER)
+	$(MAKE_INSTALL) am-copies.dtd $(DISTBROWSER)
+	$(MAKE_INSTALL) am-main.dtd $(DISTBROWSER)
+	$(MAKE_INSTALL) am-server-top.dtd $(DISTBROWSER)
+
+clobber::
+	rm -f $(DIST)\bin\chrome\messenger\locale\en-US\custreceipt.dtd
+	rm -f $(DIST)\bin\chrome\messenger\locale\en-US\pref-diskspace.dtd
+	rm -f $(DIST)\bin\chrome\messenger\locale\en-US\pref-mailnews.dtd
+	rm -f $(DIST)\bin\chrome\messenger\locale\en-US\pref-receipts.dtd
+	rm -f $(DIST)\bin\chrome\messenger\locale\en-US\pref-winsetting.dtd
+	rm -f $(DIST)\bin\chrome\messenger\locale\en-US\aw-accname.dtd
+	rm -f $(DIST)\bin\chrome\messenger\locale\en-US\aw-accounttype.dtd
+	rm -f $(DIST)\bin\chrome\messenger\locale\en-US\aw-done.dtd
+	rm -f $(DIST)\bin\chrome\messenger\locale\en-US\aw-email.dtd
+	rm -f $(DIST)\bin\chrome\messenger\locale\en-US\aw-fullname.dtd
+	rm -f $(DIST)\bin\chrome\messenger\locale\en-US\aw-identity.dtd
+	rm -f $(DIST)\bin\chrome\messenger\locale\en-US\aw-login.dtd
+	rm -f $(DIST)\bin\chrome\messenger\locale\en-US\aw-mailtype.dtd
+	rm -f $(DIST)\bin\chrome\messenger\locale\en-US\aw-server.dtd
+	rm -f $(DIST)\bin\chrome\messenger\locale\en-US\AccountManager.dtd
+	rm -f $(DIST)\bin\chrome\messenger\locale\en-US\AccountWizard.dtd
+	rm -f $(DIST)\bin\chrome\messenger\locale\en-US\am-advanced.dtd
+	rm -f $(DIST)\bin\chrome\messenger\locale\en-US\am-copies.dtd
+	rm -f $(DIST)\bin\chrome\messenger\locale\en-US\am-main.dtd
+	rm -f $(DIST)\bin\chrome\messenger\locale\en-US\am-server-top.dtd

mozilla/mailnews/base/prefs/resources/locale/en-US/pref-diskspace.dtd

@@ -0,0 +1,41 @@
+<!--
+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 Communicator client code, released
+March 31, 1998.
+
+The Initial Developer of the Original Code is Netscape
+Communications Corporation. Portions created by Netscape are
+ Copyright (C) 1998-1999 Netscape Communications Corporation. All
+Rights Reserved.
+--> 
+
+<!-- LOCALIZATION NOTE pref-diskspace.dtd UI for Mail/News Disk Space prefs -->
+<!ENTITY window.title "Disk Space">
+<!ENTITY pane.title "Disk Space">
+<!ENTITY allMsg.label "All Messages">
+<!-- LOCALIZATION NOTE storeMsgLimit.label This string is followed by a number, then by kb.label -->
+<!ENTITY storeMsgLimit.label "Do not store messages locally that are larger than">
+<!-- LOCALIZATION NOTE autoCompact.label This string is followed by a number, then by kb.label -->
+<!ENTITY autoCompact.label "Automatically compact folders when it will save over">
+<!ENTITY kb.label " kB">
+<!ENTITY newgroupMsgOnly.label " Newsgroup Messages Only">
+<!ENTITY whenToClean.label "When it's time to clean up messages:">
+<!-- LOCALIZATION NOTE keepMsgs.label This string is followed by a number, then by days.label -->
+<!ENTITY keepMsgs.label "Keep messages which have arrived within the past">
+<!ENTITY days.label "days">
+<!ENTITY keepAllMsg.label "Keep all messages">
+<!-- LOCALIZATION NOTE keepTheNewest.label This string is followed by a number, then by messages.label -->
+<!ENTITY keepTheNewest.label "Keep the newest">
+<!ENTITY messages.label "messages">
+<!ENTITY keepUnread.label "Keep only unread messages">
+<!-- LOCALIZATION NOTE removeMsg.label This string is followed by a number, then by days.label -->
+<!ENTITY removeMsg.label "Remove message bodies only older than">

mozilla/mailnews/base/prefs/resources/locale/en-US/pref-mailnews.dtd

@@ -0,0 +1,42 @@
+<!--
+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 Communicator client code, released
+March 31, 1998.
+
+The Initial Developer of the Original Code is Netscape
+Communications Corporation. Portions created by Netscape are
+ Copyright (C) 1998-1999 Netscape Communications Corporation. All
+Rights Reserved.
+--> 
+
+<!-- LOCALIZATION NOTE pref-mailnews.dtd UI for Mail/News prefs -->
+<!ENTITY window.title "Mail &amp; Newsgroups">
+<!ENTITY pane.title "Mail &amp; Newsgroups">
+<!ENTITY textBegin.label "Plain quoted text beginning with '>' is displayed with">
+<!ENTITY style.label "Style:">
+<!ENTITY regular.label "Regular">
+<!ENTITY bold.label "Bold">
+<!ENTITY italic.label "Italic">
+<!ENTITY boldItalic.label "Bold Italic">
+<!ENTITY size.label "Size:">
+<!ENTITY regular.label "Regular">
+<!ENTITY bigger.label "Bigger">
+<!ENTITY smaller.label "Smaller">
+<!ENTITY color.label "Color:">
+<!ENTITY displayWith.label "Display plain text messages and articles with">
+<!ENTITY fixedWidth.label "Fixed width font">
+<!ENTITY variableWidth.label "Variable width font">
+<!ENTITY playSound.label "Play sound when messages arrive">
+<!ENTITY rememberLastMsg.label "Remember the last selected message">
+<!ENTITY confirmMove.label "Confirm when moving folders to the trash">
+<!ENTITY useMessenger.label "Use Netscape Messenger from MAPI-based applications">
+

mozilla/mailnews/base/prefs/resources/locale/en-US/pref-receipts.dtd

@@ -0,0 +1,35 @@
+<!--
+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 Communicator client code, released
+March 31, 1998.
+
+The Initial Developer of the Original Code is Netscape
+Communications Corporation. Portions created by Netscape are
+ Copyright (C) 1998-1999 Netscape Communications Corporation. All
+Rights Reserved.
+--> 
+
+<!-- LOCALIZATION NOTE pref-receipts.dtd UI for Mail/News Return Receipts prefs -->
+<!ENTITY window.title "Return Receipts">
+<!ENTITY pane.title "Return Receipts">
+<!ENTITY requestReceipt.label " If I request a receipt when sending a message, I want">
+<!ENTITY dsn.label "A delivery receipt from the receiving server (DSN)">
+<!ENTITY mdn.label "A read receipt, notifying me when recipients display the message (MDN)">
+<!ENTITY both.label "Both types of receipt">
+<!ENTITY receiptArrive.label " When a receipt arrives">
+<!ENTITY leaveIt.label "Leave it in my Inbox">
+<!-- LOCALIZATION NOTE moveToSent.label Translate 'Sent Mail' according to Netscape glossary -->
+<!ENTITY moveToSent.label "Move it to my Sent Mail folder">
+<!ENTITY requestMDN.label " When I receive a message and the sender requested a receipt (MDN)">
+<!ENTITY returnSome.label "Return receipts for some messages">
+<!ENTITY never.label "Never return a receipt">
+<!ENTITY custom.label "Customize...">

mozilla/mailnews/base/prefs/resources/locale/en-US/pref-winsetting.dtd

@@ -0,0 +1,32 @@
+<!--
+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 Communicator client code, released
+March 31, 1998.
+
+The Initial Developer of the Original Code is Netscape
+Communications Corporation. Portions created by Netscape are
+ Copyright (C) 1998-1999 Netscape Communications Corporation. All
+Rights Reserved.
+--> 
+
+<!-- LOCALIZATION NOTE pref-winsetting.dtd UI for Mail & News Window Settings prefs -->
+<!ENTITY window.title "Window Setting">
+<!ENTITY pane.title "Window Setting">
+<!-- LOCALIZATION NOTE chooseLayout.label Never translate the product name "Messenger" -->
+<!ENTITY chooseLayout.label "Choose which layout you prefer for the Messenger window:">
+<!ENTITY chooseExp.label "If you prefer fewer windows, unselect these options, and Messenger will open items into existing windows.">
+<!ENTITY reuseThread.label "Double-clicking a folder or a newsgroup opens it in a new windowr">
+<!ENTITY reuseMessage.label "Double-clicking a message opens it in a new window">
+<!ENTITY reuseExp.label "If you prefer fewer windows, unselect these options, and Messenger will open items into existing windows.">
+<!ENTITY newsOpt.label "The Newsgroups menu item or button:">
+<!ENTITY openMessenger.label "Opens newsgroups in a Messenger window">
+<!ENTITY openCenter.label "Opens the Message Center">

mozilla/mailnews/base/prefs/resources/locale/makefile.win

@@ -15,11 +15,8 @@
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
 
-
-
 DEPTH=..\..\..\..\..
 
 DIRS= en-US
 
 include <$(DEPTH)\config\rules.mak>
-

mozilla/mailnews/base/prefs/resources/makefile.win

@@ -15,11 +15,8 @@
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
 
-
-
 DEPTH=..\..\..\..
 
-DIRS= skin content locale
+DIRS= content locale skin
 
 include <$(DEPTH)\config\rules.mak>
-

mozilla/mailnews/base/prefs/resources/skin/AccountManager.css

@@ -0,0 +1,5 @@
+
+div.pageTitle {
+    font: bolder large;
+}
+

mozilla/mailnews/base/prefs/resources/skin/MANIFEST

@@ -0,0 +1,23 @@
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+# This is a list of local files which get copied to the chrome\messenger\skin\default directory
+#
+
+AccountManager.css
+accounttree.css
+wizard.css
+winclassic.gif
+winwide.gif

mozilla/mailnews/base/prefs/resources/skin/Makefile.in

@@ -0,0 +1,40 @@
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+DEPTH		= ../../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+SAMPLES_DIR	= $(DIST)/bin/chrome/messenger/skin/default
+
+EXPORT_RESOURCE_SAMPLES = \
+		AccountManager.css \
+		wizard.css \
+		winclassic.gif \
+		winwide.gif \
+		$(NULL)
+
+include $(topsrcdir)/config/rules.mk
+
+GARBAGE		+= $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES))
+
+install::
+	$(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES)) $(SAMPLES_DIR)
+

mozilla/mailnews/base/prefs/resources/skin/accounttree.css

@@ -0,0 +1,3 @@
+treerow > treecell > titledbutton {
+ height: 16px;
+}

mozilla/mailnews/base/prefs/resources/skin/makefile.win

@@ -0,0 +1,34 @@
+#!nmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+DEPTH=..\..\..\..\..
+
+include <$(DEPTH)\config\rules.mak>
+
+install:: 
+	$(MAKE_INSTALL) accounttree.css		$(DIST)\bin\chrome\messenger\skin\default
+	$(MAKE_INSTALL) AccountManager.css	$(DIST)\bin\chrome\messenger\skin\default
+	$(MAKE_INSTALL) wizard.css		$(DIST)\bin\chrome\messenger\skin\default
+	$(MAKE_INSTALL) winclassic.gif	$(DIST)\bin\chrome\messenger\skin\default
+	$(MAKE_INSTALL) winwide.gif	$(DIST)\bin\chrome\messenger\skin\default
+
+clobber::
+	rm -f $(DIST)\chrome\messenger\skin\default\accounttree.css
+	rm -f $(DIST)\chrome\messenger\skin\default\wizard.css
+	rm -f $(DIST)\chrome\messenger\skin\default\winclassic.gif
+	rm -f $(DIST)\chrome\messenger\skin\default\winwide.gif
+

mozilla/mailnews/base/prefs/resources/skin/wizard.css

@@ -0,0 +1,34 @@
+/* -*- Mode: CSS; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * 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 Communicator client code, released
+ * March 31, 1998.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1998-1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ */
+
+
+box.title {
+  background-color: lightgray;
+  padding: 5px;
+}
+
+div.title {
+  font-weight: bold;
+  font-size: large;
+}
+
+div.subtitle {
+  font-weight: bold;
+}

mozilla/mailnews/base/public/MANIFEST

@@ -0,0 +1,25 @@
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+# This is a list of local files which get copied to the mozilla:dist:mailnews directory
+#
+
+msgCore.h
+nsIMsgHdr.h
+nsMsgFolderFlags.h
+nsMsgHeaderMasks.h
+nsMsgLocalFolderHdrs.h
+nsMsgMessageFlags.h
+nsMsgMD5.h

mozilla/mailnews/base/public/MANIFEST_IDL

@@ -0,0 +1,37 @@
+#
+# This is a list of local files which get copied to the mozilla:dist:idl directory
+#
+
+nsIMessenger.idl
+nsICopyMessageListener.idl
+nsICopyMsgStreamListener.idl
+nsIFolder.idl
+nsIFolderListener.idl
+nsIMessage.idl
+nsIMessageView.idl
+nsIMsgAccount.idl
+nsIMsgAccountManager.idl
+nsIMsgFolder.idl
+nsIMsgFolderCache.idl
+nsIMsgFolderCacheElement.idl
+nsIMsgGroupRecord.idl
+nsIMsgHost.idl
+nsIMsgIdentity.idl
+nsIMsgIncomingServer.idl
+nsIMsgMailSession.idl
+nsIMsgMessageService.idl
+nsIMsgSignature.idl
+nsIMsgThread.idl
+nsIMsgVCard.idl
+nsIUrlListener.idl
+nsIUrlListenerManager.idl
+nsIMsgBiffManager.idl
+nsIMsgCopyService.idl
+nsIMsgCopyServiceListener.idl
+nsIMsgStatusFeedback.idl
+nsIMsgMailNewsUrl.idl
+nsIMsgWindowData.idl
+nsIUrlListenerManager.idl
+nsIMsgProtocolInfo.idl
+
+

mozilla/mailnews/base/public/Makefile.in

@@ -0,0 +1,71 @@
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= msgbase
+
+EXPORTS		= \
+		msgCore.h \
+		nsIMsgHdr.h \
+		nsMsgFolderFlags.h \
+		nsMsgHeaderMasks.h \
+		nsMsgMessageFlags.h \
+		nsMsgLocalFolderHdrs.h \
+		nsMsgMD5.h \
+		$(NULL)
+
+XPIDLSRCS	= \
+		nsICopyMessageListener.idl \
+		nsICopyMsgStreamListener.idl \
+		nsIMessenger.idl \
+		nsIFolder.idl \
+		nsIFolderListener.idl \
+		nsIMessage.idl \
+		nsIMessageView.idl \
+		nsIMsgAccount.idl \
+		nsIMsgAccountManager.idl \
+		nsIMsgFolder.idl \
+		nsIMsgFolderCache.idl \
+		nsIMsgFolderCacheElement.idl \
+		nsIMsgGroupRecord.idl \
+		nsIMsgHost.idl \
+		nsIMsgIdentity.idl \
+		nsIMsgIncomingServer.idl \
+		nsIMsgMailSession.idl \
+		nsIMsgMessageService.idl \
+		nsIMsgSignature.idl \
+		nsIMsgThread.idl \
+		nsIMsgVCard.idl \
+		nsIUrlListener.idl \
+		nsIUrlListenerManager.idl \
+		nsIMsgBiffManager.idl \
+		nsIMsgCopyService.idl \
+		nsIMsgCopyServiceListener.idl \
+		nsIMsgStatusFeedback.idl \
+		nsIMsgMailNewsUrl.idl \
+		nsIMsgWindowData.idl \
+		nsIMsgProtocolInfo.idl \
+		$(NULL)
+
+include $(topsrcdir)/config/rules.mk
+

mozilla/mailnews/base/public/makefile.win

@@ -0,0 +1,69 @@
+#!nmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+DEPTH=..\..\..
+MODULE=msgbase
+
+XPIDLSRCS =								\
+		.\nsIMessenger.idl				\
+		.\nsICopyMsgStreamListener.idl \
+		.\nsICopyMessageListener.idl	\
+		.\nsIFolder.idl					\
+		.\nsIFolderListener.idl			\
+		.\nsIMessage.idl				\
+		.\nsIMessageView.idl			\
+		.\nsIMsgAccount.idl				\
+		.\nsIMsgAccountManager.idl		\
+		.\nsIMsgFolder.idl				\
+		.\nsIMsgFolderCache.idl			\
+		.\nsIMsgFolderCacheElement.idl	\
+		.\nsIMsgGroupRecord.idl			\
+		.\nsIMsgHost.idl				\
+		.\nsIMsgIdentity.idl			\
+		.\nsIMsgIncomingServer.idl		\
+		.\nsIMsgMailSession.idl			\
+		.\nsIMsgMessageService.idl		\
+		.\nsIMsgSignature.idl			\
+		.\nsIMsgThread.idl				\
+		.\nsIMsgVCard.idl				\
+		.\nsIUrlListener.idl			\
+		.\nsIMsgBiffManager.idl			\
+		.\nsIMsgCopyService.idl			\
+		.\nsIMsgCopyServiceListener.idl			\
+		.\nsIUrlListenerManager.idl		\
+		.\nsIMsgStatusFeedback.idl		\
+		.\nsIMsgMailNewsUrl.idl			\
+		.\nsIMsgWindowData.idl			\
+		.\nsIMsgProtocolInfo.idl		\
+		$(NULL)
+
+################################################################################
+## exports
+
+EXPORTS =                           \
+			msgCore.h               \
+			nsMsgFolderFlags.h      \
+			nsMsgHeaderMasks.h      \
+			nsMsgLocalFolderHdrs.h  \
+			nsMsgMessageFlags.h     \
+			nsMsgMD5.h	\
+			nsIMsgHdr.h	\
+			$(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+include <$(DEPTH)\config\config.mak>
+

mozilla/mailnews/base/public/msgCore.h

@@ -0,0 +1,154 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+/* Include files we are going to want available to all files....these files include
+   NSPR, memory, and string header files among others */
+
+#ifndef msgCore_h__
+#define msgCore_h__
+#include "xp_core.h"
+#include "nscore.h"
+#include "nsCRT.h"
+#include "prmem.h"
+#include "plstr.h"
+#include "prprf.h"
+
+#include "nsString.h"
+#include "nsVoidArray.h"
+
+#include "nsCRT.h"
+#include "nsEscape.h"
+#include "nsFileSpec.h"
+
+#include "nsTime.h"
+
+class nsIMessage;
+class nsIMsgFolder;
+
+// include common interfaces such as the service manager and the repository....
+#include "nsIServiceManager.h"
+#include "nsIComponentManager.h"
+
+/* NS_ERROR_MODULE_MAILNEWS is defined in mozilla/xpcom/public/nsError.h */
+
+/*
+ * NS_ERROR macros - use these macros to generate error constants
+ * to be used by XPCOM interfaces and possibly other useful things
+ * do not use these macros in your code - declare error macros for
+ * each specific error you need.
+ *
+ * for example:
+ * #define NS_MSG_ERROR_NO_SUCH_FOLDER NS_MSG_GENERATE_FAILURE(4)
+ * 
+ */
+
+/* use these routines to generate error values */
+#define NS_MSG_GENERATE_RESULT(severity, value) \
+NS_ERROR_GENERATE(severity, NS_ERROR_MODULE_MAILNEWS, value)
+
+#define NS_MSG_GENERATE_SUCCESS(value) \
+NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_MAILNEWS, value)
+
+#define NS_MSG_GENERATE_FAILURE(value) \
+NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_MAILNEWS, value)
+
+/* these are shortcuts to generate simple errors with a zero value */
+#define NS_MSG_SUCCESS NS_MSG_GENERATE_SUCCESS(0)
+#define NS_MSG_FAILURE NS_MSG_GENERATE_FAILURE(0)
+
+// mscott I should look into moving this into raptor base so everyone can use it...
+#define IS_SPACE(VAL)                \
+    (((((intn)(VAL)) & 0x7f) == ((intn)(VAL))) && isspace((intn)(VAL)) )
+
+#define IS_DIGIT(i) ((((unsigned int) (i)) > 0x7f) ? (int) 0 : isdigit(i))
+
+#if defined(XP_WIN) || defined(XP_OS2)
+#define IS_ALPHA(VAL)  (isascii((int)(VAL)) && isalpha((int)(VAL)))
+#else
+#define IS_ALPHA(VAL) ((((unsigned int) (VAL)) > 0x7f) ? FALSE : isalpha((int)(VAL)))
+#endif
+
+
+/* for retrieving information out of messenger nsresults */
+
+#define NS_IS_MSG_ERROR(err) \
+ (NS_ERROR_GET_MODULE(err) == NS_ERROR_MODULE_MAILNEWS)
+
+#define NS_MSG_SUCCEEDED(err) \
+ (NS_IS_MSG_ERROR(err) && NS_SUCCEEDED(err))
+
+#define NS_MSG_FAILED(err) \
+ (NS_IS_MSG_ERROR(err) && NS_FAILED(err))
+
+/* is this where we define our errors? Obviously, there has to be a central
+	place so we don't use the same error codes.
+*/
+#define NS_MSG_ERROR_FOLDER_SUMMARY_OUT_OF_DATE NS_MSG_GENERATE_FAILURE(5)
+#define NS_MSG_ERROR_FOLDER_SUMMARY_MISSING NS_MSG_GENERATE_FAILURE(6)
+#define NS_MSG_ERROR_FOLDER_MISSING NS_MSG_GENERATE_FAILURE(7)
+
+#define NS_MSG_MESSAGE_NOT_FOUND NS_MSG_GENERATE_FAILURE(8)
+#define NS_MSG_NOT_A_MAIL_FOLDER NS_MSG_GENERATE_FAILURE(9)
+
+#define NS_MSG_FOLDER_BUSY NS_MSG_GENERATE_FAILURE(10)
+
+#define NS_MSG_COULD_NOT_CREATE_DIRECTORY NS_MSG_GENERATE_FAILURE(11)
+#define NS_MSG_CANT_CREATE_FOLDER NS_MSG_GENERATE_FAILURE(12)
+
+#define NS_MSG_FILTER_PARSE_ERROR NS_MSG_GENERATE_FAILURE(13)
+
+#define NS_MSG_FOLDER_UNREADABLE NS_MSG_GENERATE_FAILURE(14)
+
+#define NS_MSG_ERROR_WRITING_MAIL_FOLDER NS_MSG_GENERATE_FAILURE(15)
+
+/* ducarroz: error codes for message compose are defined into compose\src\nsMsgComposeStringBundle.h.
+             Message compose use the same error code space than other mailnews modules. To avoid any
+             conflict, I reserve values between 12500 and 12999 for it.
+*/
+#define NS_MSGCOMP_ERROR_BEGIN	12500
+#define NS_MSGCOMP_ERROR_END	12999
+
+#define MSG_LINEBREAK NS_LINEBREAK
+#define MSG_LINEBREAK_LEN NS_LINEBREAK_LEN
+
+/* mscott - i'm only turning  NS_MSG_BASE on for windows so
+   define it as empty for the other platforms. */
+
+#ifdef XP_WIN
+
+#ifdef _IMPL_NS_MSG_BASE
+#define NS_MSG_BASE NS_EXPORT
+#else
+#define NS_MSG_BASE NS_IMPORT
+#endif
+
+#else
+#define NS_MSG_BASE
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+// Utilities 
+
+// mscott: one wouldn't normally have to add the NS_MSG_BASE prefix here 
+// except this function is implemented in base\util.
+nsresult NS_MSG_BASE
+nsGetMailFolderSeparator(nsString& result);
+
+////////////////////////////////////////////////////////////////////////////////
+
+#endif

mozilla/mailnews/base/public/nsICopyMessageListener.idl

@@ -0,0 +1,37 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1999 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsISupports.idl"
+
+interface nsIMessage;
+interface nsIInputStream;
+
+%{C++
+#include "nsIInputStream.h"
+%}
+
+[scriptable, uuid(53CA78FE-E231-11d2-8A4D-0060B0FC04D2)]
+
+/*  Use this for any object that wants to handle copying/moving messages to it */
+
+interface nsICopyMessageListener :  nsISupports
+{
+	void BeginCopy(in nsIMessage message);
+	void CopyData(in nsIInputStream aIStream, in long aLength);
+	void EndCopy(in boolean copySucceeded);
+};

mozilla/mailnews/base/public/nsICopyMsgStreamListener.idl

@@ -0,0 +1,28 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1999 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsISupports.idl"
+#include "nsIMsgFolder.idl"
+#include "nsICopyMessageListener.idl"
+
+[scriptable, uuid(7741DAEC-2125-11d3-8A90-0060B0FC04D2)]
+
+interface nsICopyMessageStreamListener: nsISupports
+{
+	void Init(in nsIMsgFolder srcFolder, in nsICopyMessageListener destination, in nsISupports listenerData);
+};

mozilla/mailnews/base/public/nsIFolder.idl

@@ -0,0 +1,39 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+ 
+#include "nsICollection.idl"
+#include "nsIFolderListener.idl"
+
+[scriptable, uuid(75621650-0fce-11d3-8b49-006008948010)]
+interface nsIFolder : nsICollection {
+
+        readonly attribute string URI;
+        attribute wstring name;
+        attribute wstring prettyName;
+
+        nsISupports GetChildNamed(in string name);
+        attribute nsIFolder parent;
+
+        nsIEnumerator GetSubFolders();
+        readonly attribute boolean hasSubFolders;
+
+		void AddFolderListener(in nsIFolderListener listener);
+		void RemoveFolderListener(in nsIFolderListener listener);
+		nsIFolder FindSubFolder(in string subFolderName);
+};
+

mozilla/mailnews/base/public/nsIFolderListener.idl

@@ -0,0 +1,32 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsISupports.idl"
+
+interface nsIFolder;
+
+[scriptable, uuid(1c5ef9f0-d1c0-11d2-94CA-006097222B83)]    /* XXX regenerate */
+interface nsIFolderListener : nsISupports {
+
+	void OnItemAdded(in nsIFolder parentFolder, in nsISupports item);
+	void OnItemRemoved(in nsIFolder parentFolder, in nsISupports item);
+	void OnItemPropertyChanged(in nsISupports item, in string property, in string oldValue, in string newValue);
+	void OnItemPropertyFlagChanged(in nsISupports item, in string property, in unsigned long oldFlag,
+									in unsigned long newFlag);
+	void OnFolderLoaded(in nsIFolder aFolder);
+};

mozilla/mailnews/base/public/nsIMessage.idl

@@ -0,0 +1,35 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1999 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsIMsgHdr.idl"
+interface nsIMsgFolder;
+
+[scriptable, uuid(5B926BB4-F839-11d2-8A5F-0060B0FC04D2)]
+interface nsIMessage : nsIMsgHdr {
+
+	nsIMsgFolder GetMsgFolder();
+	void SetMsgFolder(in nsIMsgFolder folder);
+};
+
+[scriptable, uuid(82702556-01A2-11d3-8A69-0060B0FC04D2)]
+interface nsIDBMessage : nsIMessage {
+
+	void SetMsgDBHdr(in nsIMsgDBHdr hdr);
+	nsIMsgDBHdr GetMsgDBHdr();
+};
+ 

mozilla/mailnews/base/public/nsIMessageView.idl

@@ -0,0 +1,32 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1999 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsISupports.idl"
+
+[scriptable, uuid(14495572-E945-11d2-8A52-0060B0FC04D2)]
+
+/*  Use this for any object that wants to handle copying/moving messages to it */
+
+interface nsIMessageView :  nsISupports
+{
+%{C++
+  enum {  eShowAll =0, eShowRead =1, eShowUnread =2 , eShowWatched =3};
+%}
+	attribute unsigned long viewType;
+	attribute boolean showThreads;
+};

mozilla/mailnews/base/public/nsIMessenger.idl

@@ -0,0 +1,83 @@
+/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsISupports.idl"
+#include "nsrootidl.idl"
+#include "domstubs.idl"
+#include "xulstubs.idl"
+#include "nsIRDFCompositeDataSource.idl"
+#include "nsIMsgStatusFeedback.idl"
+
+%{C++
+#include "nsIDOMWindow.h"
+#include "nsIDOMNodeList.h"
+#include "nsIDOMXULElement.h"
+%}
+
+interface nsITransactionManager;
+
+[scriptable, uuid(4f7966d0-c14f-11d2-b7f2-00805f05ffa5)]
+interface nsIMessenger : nsISupports {
+
+    readonly attribute nsITransactionManager transactionManager;
+
+    void GetNewMessages(in nsIRDFCompositeDataSource database, in nsIDOMXULElement folder);
+	void Open3PaneWindow();
+    void SetWindow(in nsIDOMWindow ptr, in nsIMsgStatusFeedback statusFeedback);
+    void DoPrint();
+    void DoPrintPreview();
+    void DeleteMessages(in nsIDOMXULElement tree, in nsIDOMXULElement srcFolder, in nsIDOMNodeList node);
+    void DeleteFolders(in nsIRDFCompositeDataSource db, in nsIDOMXULElement parentFolder, in nsIDOMXULElement folder);
+	void CopyMessages(in nsIRDFCompositeDataSource database, in nsIDOMXULElement srcFolderElement,
+					  in nsIDOMXULElement dstFolderElement, in nsIDOMNodeList messages,
+					  in boolean isMove);
+    nsISupports GetRDFResourceForMessage(in nsIDOMXULElement tree, in nsIDOMNodeList node);
+    void OpenURL(in string url);
+	void Exit();
+    void Close();
+    void OnUnload();
+	void MarkMessagesRead(in nsIRDFCompositeDataSource database, in nsIDOMNodeList messages,
+						  in boolean markRead);
+	void MarkMessageRead(in nsIRDFCompositeDataSource database, in nsIDOMXULElement message,
+						  in boolean markRead);
+	void MarkAllMessagesRead(in nsIRDFCompositeDataSource database, in nsIDOMXULElement folder);
+
+	void MarkMessagesFlagged(in nsIRDFCompositeDataSource database, in nsIDOMNodeList messages,
+						  in boolean markFlagged);
+	void MarkMessageFlagged(in nsIRDFCompositeDataSource database, in nsIDOMXULElement message,
+						  in boolean markFlagged);
+
+	void NewFolder(in nsIRDFCompositeDataSource database, in nsIDOMXULElement parentFolderElement,
+				   in string name);
+
+    void RenameFolder(in nsIRDFCompositeDataSource db, 
+                      in nsIDOMXULElement folder, in string name);
+    void CompactFolder(in nsIRDFCompositeDataSource db, in nsIDOMXULElement folder);
+    void EmptyTrash(in nsIRDFCompositeDataSource db, in nsIDOMXULElement folder);
+
+    void Undo();
+    void Redo();
+	void SendUnsentMessages();
+	void LoadFirstDraft();
+	void SetDocumentCharset(in wstring characterSet);
+    void saveAs(in string url, in boolean asFile);
+    void openAttachment(in string url, in string displayName, in string messageUri);
+    void forwardMessages(in nsIDOMNodeList messages,
+						 in PRInt32 type);
+};
+