--- a/mailnews/base/public/nsIMsgMailSession.idl
+++ b/mailnews/base/public/nsIMsgMailSession.idl
@@ -41,22 +41,20 @@
  * The mail session is a replacement for the old 4.x MSG_Master object. It
  * contains mail session generic information such as the account manager, etc
  * I'm starting this off as an empty interface and as people feel they need to
  * add more information to it, they can. I think this is a better approach
  * than trying to port over the old MSG_Master in its entirety as that had a
  * lot of cruft in it....
  */
 
-#include "nsISupports.idl"
 #include "nsIFolderListener.idl"
-#include "nsIMsgWindow.idl"
-#include "nsIAtom.idl"
 
 interface nsIFile;
+interface nsIMsgWindow;
 interface nsIMsgUserFeedbackListener;
 interface nsIMsgMailNewsUrl;
 
 [scriptable, uuid(577ead34-553e-4cd6-b484-76ff6662082d)]
 interface nsIMsgMailSession : nsISupports {
   void Shutdown();
 
   /**

--- a/mailnews/base/src/nsMessengerBootstrap.cpp
+++ b/mailnews/base/src/nsMessengerBootstrap.cpp
@@ -42,17 +42,17 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
 #include "nsMessengerBootstrap.h"
 #include "nsCOMPtr.h"
 
 #include "nsDOMCID.h"
 #include "nsMsgBaseCID.h"
-#include "nsIMsgMailSession.h"
+#include "nsIMsgFolder.h"
 #include "nsIMsgFolderCache.h"
 #include "nsIPrefService.h"
 #include "nsIPrefBranch.h"
 #include "nsIDOMWindow.h"
 #include "nsXPCOM.h"
 #include "nsISupportsPrimitives.h"
 #include "nsIWindowWatcher.h"
 #include "nsIPromptService.h"

--- a/mailnews/base/src/nsMessengerContentHandler.cpp
+++ b/mailnews/base/src/nsMessengerContentHandler.cpp
@@ -38,17 +38,18 @@
 
 #include "nsMessengerContentHandler.h"
 #include "nsIChannel.h"
 #include "nsPIDOMWindow.h"
 #include "nsIServiceManager.h"
 #include "nsIWindowWatcher.h"
 #include "nsIDocShell.h"
 #include "nsIWebNavigation.h"
-#include "nsIMsgMailSession.h"
+#include "nsIURL.h"
+#include "nsStringGlue.h"
 #include "nsMsgBaseCID.h"
 #include "plstr.h"
 #include "nsIURL.h"
 
 nsMessengerContentHandler::nsMessengerContentHandler()
 {
 }
 

--- a/mailnews/base/src/nsMessengerContentHandler.h
+++ b/mailnews/base/src/nsMessengerContentHandler.h
@@ -31,17 +31,16 @@
  * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "nsISupportsArray.h"
 #include "nsIContentHandler.h"
 #include "nsIURI.h"
 
 class nsMessengerContentHandler : public nsIContentHandler
 {
 public:
   nsMessengerContentHandler();
   virtual ~nsMessengerContentHandler();

--- a/mailnews/base/src/nsMessengerOSXIntegration.cpp
+++ b/mailnews/base/src/nsMessengerOSXIntegration.cpp
@@ -69,16 +69,17 @@
 #include "nsINotificationsList.h"
 #include "nsIMsgDatabase.h"
 #include "nsIMsgHdr.h"
 #include "nsIMsgHeaderParser.h"
 #include "nsISupportsPrimitives.h"
 #include "nsIWindowWatcher.h"
 #include "nsMsgLocalCID.h"
 #include "nsIMsgMailNewsUrl.h"
+#include "nsIMsgWindow.h"
 
 #include <Carbon/Carbon.h>
 
 #define kNewMailAlertIcon "chrome://messenger/skin/icons/new-mail-alert.png"
 #define kBiffShowAlertPref "mail.biff.show_alert"
 #define kMaxDisplayCount 10
 
 // HACK: Limitations in Focus/SetFocus on Mac (see bug 465446)

--- a/mailnews/base/src/nsMessengerUnixIntegration.cpp
+++ b/mailnews/base/src/nsMessengerUnixIntegration.cpp
@@ -40,16 +40,17 @@
 
 #include "nsMessengerUnixIntegration.h"
 #include "nsIMsgAccountManager.h"
 #include "nsIMsgMailSession.h"
 #include "nsIMsgIncomingServer.h"
 #include "nsIMsgIdentity.h"
 #include "nsIMsgAccount.h"
 #include "nsIMsgFolder.h"
+#include "nsIMsgWindow.h"
 #include "nsCOMPtr.h"
 #include "nsMsgBaseCID.h"
 #include "nsMsgFolderFlags.h"
 #include "nsDirectoryServiceDefs.h"
 #include "nsAppDirectoryServiceDefs.h"
 #include "nsIDirectoryService.h"
 #include "nsIWindowWatcher.h"
 #include "nsIWindowMediator.h"

--- a/mailnews/base/src/nsMessengerWinIntegration.cpp
+++ b/mailnews/base/src/nsMessengerWinIntegration.cpp
@@ -44,16 +44,17 @@
 
 #include "nsMessengerWinIntegration.h"
 #include "nsIMsgAccountManager.h"
 #include "nsIMsgMailSession.h"
 #include "nsIMsgIncomingServer.h"
 #include "nsIMsgIdentity.h"
 #include "nsIMsgAccount.h"
 #include "nsIMsgFolder.h"
+#include "nsIMsgWindow.h"
 #include "nsCOMPtr.h"
 #include "nsMsgBaseCID.h"
 #include "nsMsgFolderFlags.h"
 #include "nsDirectoryServiceDefs.h"
 #include "nsAppDirectoryServiceDefs.h"
 #include "nsIDirectoryService.h"
 #include "nsIWindowWatcher.h"
 #include "nsIWindowMediator.h"

--- a/mailnews/base/src/nsMsgAccountManagerDS.cpp
+++ b/mailnews/base/src/nsMsgAccountManagerDS.cpp
@@ -42,17 +42,16 @@
  */
 
 #include "nsMsgAccountManagerDS.h"
 #include "rdf.h"
 #include "nsRDFCID.h"
 #include "nsIRDFDataSource.h"
 #include "nsEnumeratorUtils.h"
 #include "nsIServiceManager.h"
-#include "nsIMsgMailSession.h"
 #include "nsMsgRDFUtils.h"
 #include "nsIMsgFolder.h"
 #include "nsMsgBaseCID.h"
 
 #include "nsICategoryManager.h"
 #include "nsXPCOM.h"
 #include "nsISupportsPrimitives.h"
 #include "nsIPrefService.h"

--- a/mailnews/base/src/nsMsgBiffManager.cpp
+++ b/mailnews/base/src/nsMsgBiffManager.cpp
@@ -35,17 +35,16 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
 #ifdef MOZ_LOGGING
 #define FORCE_PR_LOG /* Allow logging in the release build */
 #endif
 
 #include "nsMsgBiffManager.h"
-#include "nsIMsgMailSession.h"
 #include "nsIMsgAccountManager.h"
 #include "nsMsgBaseCID.h"
 #include "nsStatusBarBiffManager.h"
 #include "nsCOMArray.h"
 #include "prlog.h"
 #include "nspr.h"
 #include "nsIPrefService.h"
 #include "nsIPrefBranch.h"

--- a/mailnews/base/src/nsMsgPrintEngine.cpp
+++ b/mailnews/base/src/nsMsgPrintEngine.cpp
@@ -42,29 +42,26 @@
 
 #include "nsIComponentManager.h"
 
 #include "nsISupports.h"
 
 #include "nsIURI.h"
 #include "nsReadableUtils.h"
 #include "nsIDocShell.h"
-#include "nsIDOMDocument.h"
 #include "nsPIDOMWindow.h"
 #include "nsIDocumentViewer.h"
 #include "nsPresContext.h"
 #include "nsIPresShell.h"
 #include "nsIDocument.h"
 #include "nsIMsgMessageService.h"
 #include "nsMsgUtils.h"
 #include "nsIWebProgress.h"
-#include "nsIInterfaceRequestor.h"
 #include "nsIInterfaceRequestorUtils.h"
 #include "nsIMarkupDocumentViewer.h"
-#include "nsIMsgMailSession.h"
 #include "nsMsgPrintEngine.h"
 #include "nsMsgBaseCID.h"
 #include "nsIDocumentLoader.h"
 #include "nsIWidget.h"
 #include "nsIXULWindow.h"
 #include "nsIPrefService.h"
 #include "nsIPrefBranch.h"
 #include "nsThreadUtils.h"

--- a/mailnews/base/src/nsMsgServiceProvider.cpp
+++ b/mailnews/base/src/nsMsgServiceProvider.cpp
@@ -40,17 +40,16 @@
 #include "nsIServiceManager.h"
 
 #include "nsRDFCID.h"
 #include "nsIRDFService.h"
 #include "nsIRDFRemoteDataSource.h"
 
 #include "nsIFileChannel.h"
 #include "nsNetUtil.h"
-#include "nsIMsgMailSession.h"
 #include "nsMsgBaseCID.h"
 
 #include "nsMailDirServiceDefs.h"
 #include "nsDirectoryServiceUtils.h"
 #include "nsDirectoryServiceDefs.h"
 #include "nsISimpleEnumerator.h"
 #include "nsIDirectoryEnumerator.h"
 

--- a/mailnews/base/src/nsStatusBarBiffManager.cpp
+++ b/mailnews/base/src/nsStatusBarBiffManager.cpp
@@ -38,21 +38,17 @@
 
 #include "nsStatusBarBiffManager.h"
 #include "nsMsgBiffManager.h"
 #include "nsIMsgMailSession.h"
 #include "nsIMsgAccountManager.h"
 #include "nsMsgBaseCID.h"
 #include "nsIObserverService.h"
 #include "nsIWindowMediator.h"
-#include "nsIDOMDocument.h"
-#include "nsIDOMWindowInternal.h"
-#include "nsIDOMElement.h"
 #include "nsIMsgMailSession.h"
-#include "nsMsgFolderDataSource.h"
 #include "MailNewsTypes.h"
 #include "nsIMsgFolder.h" // TO include biffState enum. Change to bool later...
 #include "nsIFileChannel.h"
 #include "nsIPrefService.h"
 #include "nsIPrefBranch.h"
 #include "nsIURL.h"
 #include "nsNetUtil.h"
 #include "nsIFileURL.h"

--- a/mailnews/base/util/nsMsgIncomingServer.cpp
+++ b/mailnews/base/util/nsMsgIncomingServer.cpp
@@ -52,17 +52,16 @@
 #include "nsMsgBaseCID.h"
 #include "nsMsgDBCID.h"
 #include "nsIMsgFolder.h"
 #include "nsIMsgFolderCache.h"
 #include "nsIMsgFolderCacheElement.h"
 #include "nsIMsgWindow.h"
 #include "nsIMsgFilterService.h"
 #include "nsIMsgProtocolInfo.h"
-#include "nsIMsgMailSession.h"
 #include "nsIPrefService.h"
 #include "nsIRelativeFilePref.h"
 #include "nsIDocShell.h"
 #include "nsIAuthPrompt.h"
 #include "nsNetUtil.h"
 #include "nsIWindowWatcher.h"
 #include "nsIStringBundle.h"
 #include "nsIMsgHdr.h"

--- a/mailnews/base/util/nsMsgMailNewsUrl.cpp
+++ b/mailnews/base/util/nsMsgMailNewsUrl.cpp
@@ -33,17 +33,16 @@
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 #include "msgCore.h"
 #include "nsMsgMailNewsUrl.h"
 #include "nsMsgBaseCID.h"
-#include "nsIMsgMailSession.h"
 #include "nsIMsgAccountManager.h"
 #include "nsStringGlue.h"
 #include "nsILoadGroup.h"
 #include "nsIDocShell.h"
 #include "nsIWebProgress.h"
 #include "nsIWebProgressListener.h"
 #include "nsIInterfaceRequestor.h"
 #include "nsIInterfaceRequestorUtils.h"

--- a/mailnews/compose/src/nsMsgCompose.cpp
+++ b/mailnews/compose/src/nsMsgCompose.cpp
@@ -108,16 +108,17 @@
 #include "nsIUnicodeNormalizer.h"
 #include "nsIMsgAccountManager.h"
 #include "nsIMsgProgress.h"
 #include "nsMsgFolderFlags.h"
 #include "nsIMsgDatabase.h"
 #include "nsStringStream.h"
 #include "nsIMutableArray.h"
 #include "nsArrayUtils.h"
+#include "nsIMsgWindow.h"
 
 static void GetReplyHeaderInfo(PRInt32* reply_header_type,
                                nsString& reply_header_locale,
                                nsString& reply_header_authorwrote,
                                nsString& reply_header_ondate,
                                nsString& reply_header_separator,
                                nsString& reply_header_colon,
                                nsString& reply_header_originalmessage)

--- a/mailnews/compose/src/nsMsgSend.cpp
+++ b/mailnews/compose/src/nsMsgSend.cpp
@@ -75,17 +75,17 @@
 #include "nsIDocument.h"
 #include "nsIDOMDocument.h"
 #include "nsMsgCompCID.h"
 #include "nsIAbAddressCollector.h"
 #include "nsAbBaseCID.h"
 #include "nsCOMPtr.h"
 #include "mozITXTToHTMLConv.h"
 #include "nsIMsgStatusFeedback.h"
-#include "nsIMsgMailSession.h"
+#include "nsIMsgWindow.h"
 #include "nsTextFormatter.h"
 #include "nsIPrompt.h"
 #include "nsMailHeaders.h"
 #include "nsIDocShell.h"
 #include "nsMimeTypes.h"
 #include "nsISmtpUrl.h"
 #include "nsIInterfaceRequestor.h"
 #include "nsIInterfaceRequestorUtils.h"

--- a/mailnews/compose/src/nsSmtpService.cpp
+++ b/mailnews/compose/src/nsSmtpService.cpp
@@ -42,17 +42,16 @@
 #include "nsIPrefService.h"
 #include "nsIPrefBranch.h"
 #include "nsIIOService.h"
 #include "nsIPipe.h"
 #include "nsNetCID.h"
 #include "nsMsgUtils.h"
 #include "nsNetUtil.h"
 #include "nsSmtpService.h"
-#include "nsIMsgMailSession.h"
 #include "nsMsgBaseCID.h"
 #include "nsMsgCompCID.h"
 #include "nsArrayEnumerator.h"
 #include "nsSmtpUrl.h"
 #include "nsSmtpProtocol.h"
 #include "nsCOMPtr.h"
 #include "nsIMsgIdentity.h"
 #include "nsIPrompt.h"

--- a/mailnews/imap/src/nsImapService.h
+++ b/mailnews/imap/src/nsImapService.h
@@ -35,17 +35,16 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
 #ifndef nsImapService_h___
 #define nsImapService_h___
 
 #include "nsIImapService.h"
 #include "nsIMsgMessageService.h"
-#include "nsISupportsArray.h"
 #include "nsCOMPtr.h"
 #include "nsIFile.h"
 #include "nsIProtocolHandler.h"
 #include "nsIMsgProtocolInfo.h"
 #include "nsIContentHandler.h"
 #include "nsICacheSession.h"
 
 class nsIImapHostSessionList; 

--- a/mailnews/imap/src/nsImapUrl.cpp
+++ b/mailnews/imap/src/nsImapUrl.cpp
@@ -36,17 +36,16 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
 #include "msgCore.h"    // precompiled header...
 #include "nsMsgImapCID.h"
 
 #include "nsIURL.h"
 #include "nsImapUrl.h"
-#include "nsIMsgMailSession.h"
 #include "nsIIMAPHostSessionList.h"
 #include "nsThreadUtils.h"
 #include "nsString.h"
 #include "prmem.h"
 #include "plstr.h"
 #include "prprf.h"
 #include "nsCRT.h"
 #include "nsCOMPtr.h"

--- a/mailnews/import/eudora/src/nsEudoraCompose.cpp
+++ b/mailnews/import/eudora/src/nsEudoraCompose.cpp
@@ -52,17 +52,16 @@
 #include "nsIOutputStream.h"
 
 #include "nsMsgBaseCID.h"
 #include "nsMsgCompCID.h"
 
 #include "nsIMsgCompose.h"
 #include "nsIMsgCompFields.h"
 #include "nsIMsgSend.h"
-#include "nsIMsgMailSession.h"
 #include "nsIMsgAccountManager.h"
 #include "nsMsgI18N.h"
 
 #include "nsNetCID.h"
 
 #include "nsEudoraCompose.h"
 #include "nsEudoraEditor.h"
 

--- a/mailnews/import/outlook/src/nsOutlookCompose.cpp
+++ b/mailnews/import/outlook/src/nsOutlookCompose.cpp
@@ -55,17 +55,16 @@
 #include "nsNetUtil.h"
 
 #include "nsMsgBaseCID.h"
 #include "nsMsgCompCID.h"
 
 #include "nsIMsgCompose.h"
 #include "nsIMsgCompFields.h"
 #include "nsIMsgSend.h"
-#include "nsIMsgMailSession.h"
 #include "nsIMsgAccountManager.h"
 
 #include "nsNetCID.h"
 
 #include "nsOutlookCompose.h"
 
 #include "OutlookDebugLog.h"
 

--- a/mailnews/import/src/nsImportMail.cpp
+++ b/mailnews/import/src/nsImportMail.cpp
@@ -56,17 +56,16 @@
 #include "nsISupportsPrimitives.h"
 #include "nsIImportMailboxDescriptor.h"
 
 #include "nsStringGlue.h"
 #include "nsUnicharUtils.h"
 #include "nsIProxyObjectManager.h"
 
 #include "nsIMsgAccountManager.h"
-#include "nsIMsgMailSession.h"
 #include "nsMsgBaseCID.h"
 #include "nsIMsgFolder.h"
 #include "nsImportStringBundle.h"
 #include "nsIStringBundle.h"
 #include "nsTextFormatter.h"
 #include "nsServiceManagerUtils.h"
 #include "nsComponentManagerUtils.h"
 #include "nsIImportService.h"

--- a/mailnews/local/src/nsMailboxService.cpp
+++ b/mailnews/local/src/nsMailboxService.cpp
@@ -35,17 +35,16 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 #include "msgCore.h"    // precompiled header...
 #include "nsCOMPtr.h"
 
 #include "nsMailboxService.h"
-#include "nsIMsgMailSession.h"
 #include "nsMailboxUrl.h"
 #include "nsIMsgMailNewsUrl.h"
 #include "nsMailboxProtocol.h"
 #include "nsIMsgDatabase.h"
 #include "nsMsgDBCID.h"
 #include "MailNewsTypes.h"
 #include "nsTArray.h"
 #include "nsLocalUtils.h"

--- a/mailnews/local/src/nsMovemailService.cpp
+++ b/mailnews/local/src/nsMovemailService.cpp
@@ -48,17 +48,16 @@
 
 #include "msgCore.h"    // precompiled header...
 
 #include "nsMovemailService.h"
 #include "nsIMovemailService.h"
 #include "nsIMsgIncomingServer.h"
 #include "nsIMovemailIncomingServer.h"
 #include "nsIMsgProtocolInfo.h"
-#include "nsIMsgMailSession.h"
 #include "nsParseMailbox.h"
 #include "nsIMsgFolder.h"
 #include "nsIPrompt.h"
 
 #include "nsILocalFile.h"
 #include "nsMailDirServiceDefs.h"
 #include "nsMsgUtils.h"
 

--- a/mailnews/local/src/nsNoneService.cpp
+++ b/mailnews/local/src/nsNoneService.cpp
@@ -38,17 +38,16 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "msgCore.h"    // precompiled header...
 
 #include "nsNoneService.h"
 #include "nsINoIncomingServer.h"
 #include "nsINoneService.h"
 #include "nsIMsgProtocolInfo.h"
-#include "nsIMsgMailSession.h"
 
 #include "nsMsgLocalCID.h"
 #include "nsMsgBaseCID.h"
 #include "nsILocalFile.h"
 #include "nsCOMPtr.h"
 #include "nsMsgUtils.h"
 
 #include "nsIDirectoryService.h"

--- a/mailnews/local/src/nsPop3Service.cpp
+++ b/mailnews/local/src/nsPop3Service.cpp
@@ -36,17 +36,16 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
 #include "msgCore.h"    // precompiled header...
 
 #include "nsPop3Service.h"
 #include "nsIMsgIncomingServer.h"
 #include "nsIPop3IncomingServer.h"
-#include "nsIMsgMailSession.h"
 
 #include "nsPop3URL.h"
 #include "nsPop3Sink.h"
 #include "nsPop3Protocol.h"
 #include "nsMsgLocalCID.h"
 #include "nsMsgBaseCID.h"
 #include "nsCOMPtr.h"
 #include "nsIMsgWindow.h"

--- a/mailnews/news/src/nsNNTPProtocol.cpp
+++ b/mailnews/news/src/nsNNTPProtocol.cpp
@@ -81,17 +81,16 @@
 #include "nsIMsgSearchAdapter.h"
 #include "nsIMsgStatusFeedback.h"
 
 #include "nsMsgKeySet.h"
 
 #include "nsNewsUtils.h"
 #include "nsMsgUtils.h"
 
-#include "nsIMsgMailSession.h"
 #include "nsIMsgIdentity.h"
 #include "nsIMsgAccountManager.h"
 
 #include "nsIPrompt.h"
 #include "nsIMsgStatusFeedback.h"
 
 #include "nsIMsgFolder.h"
 #include "nsIMsgNewsFolder.h"

--- a/mailnews/news/src/nsNewsFolder.cpp
+++ b/mailnews/news/src/nsNewsFolder.cpp
@@ -59,17 +59,16 @@
 #include "nsIRDFService.h"
 #include "nsRDFCID.h"
 #include "nsMsgDBCID.h"
 #include "nsMsgNewsCID.h"
 #include "nsMsgUtils.h"
 #include "nsNewsUtils.h"
 
 #include "nsCOMPtr.h"
-#include "nsIMsgMailSession.h"
 #include "nsIMsgIncomingServer.h"
 #include "nsINntpIncomingServer.h"
 #include "nsINewsDatabase.h"
 #include "nsMsgBaseCID.h"
 #include "nsILineInputStream.h"
 
 #include "nsIMsgWindow.h"
 #include "nsIDocShell.h"

--- a/mailnews/news/src/nsNntpService.cpp
+++ b/mailnews/news/src/nsNntpService.cpp
@@ -43,17 +43,16 @@
 
 #include "msgCore.h"    // precompiled header...
 #include "nntpCore.h"
 #include "nsISupportsObsolete.h"
 #include "nsMsgNewsCID.h"
 #include "nsINntpUrl.h"
 #include "nsIMsgNewsFolder.h"
 #include "nsNNTPNewsgroupPost.h"
-#include "nsIMsgMailSession.h"
 #include "nsIMsgIdentity.h"
 #include "nsString.h"
 #include "nsReadableUtils.h"
 #include "nsNewsUtils.h"
 #include "nsNewsDatabase.h"
 #include "nsMsgDBCID.h"
 #include "nsMsgBaseCID.h"
 #include "nsIPrefBranch.h"