diff --git a/mozilla/mailnews/ui/compose/src/nsComposeFactory.cpp b/mozilla/mailnews/ui/compose/src/nsComposeFactory.cpp
deleted file mode 100644
index 34245a903b1..00000000000
--- a/mozilla/mailnews/ui/compose/src/nsComposeFactory.cpp
+++ /dev/null
@@ -1,208 +0,0 @@
-/* -*- 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) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-
-#include "nsIFactory.h"
-#include "nsISupports.h"
-#include "nsComposeAppCore.h"
-#include "nsIComponentManager.h"
-#include "pratom.h"
-#include "nsIServiceManager.h"
-#include "nsCOMPtr.h"
-
-static NS_DEFINE_CID(kComponentManagerCID, NS_COMPONENTMANAGER_CID);
-static NS_DEFINE_CID(kCComposeAppCoreCID, NS_COMPOSEAPPCORE_CID);
-
-static PRInt32 g_InstanceCount = 0;
-static PRInt32 g_LockCount = 0;
-
-
-class nsComposeFactory : public nsIFactory {
-public:
-    // nsISupports methods
-    NS_DECL_ISUPPORTS 
-    
-    nsComposeFactory(const nsCID &aClass); 
-    
-    // nsIFactory methods   
-    NS_IMETHOD CreateInstance(nsISupports *aOuter, const nsIID &aIID, void **aResult);   
-    NS_IMETHOD LockFactory(PRBool aLock);   
-    
-protected:
-    virtual ~nsComposeFactory();   
-    
-private:  
-    nsCID     mClassID;
-};   
-
-nsComposeFactory::nsComposeFactory(const nsCID &aClass)   
-{   
-	NS_INIT_REFCNT();
-    PR_AtomicIncrement(&g_InstanceCount);
-	mClassID = aClass;
-}   
-
-nsComposeFactory::~nsComposeFactory()   
-{   
-    PR_AtomicDecrement(&g_InstanceCount);
-	NS_ASSERTION(mRefCnt == 0, "non-zero refcnt at destruction");   
-}   
-
-
-nsresult
-nsComposeFactory::QueryInterface(const nsIID &aIID, void **aResult)   
-{   
-  if (aResult == NULL)  
-    return NS_ERROR_NULL_POINTER;  
-
-  // Always NULL result, in case of failure   
-  *aResult = NULL;   
-
-  // we support two interfaces....nsISupports and nsFactory.....
-  if (aIID.Equals(::nsISupports::GetIID()))    
-    *aResult = (void *)(nsISupports*)this;   
-  else if (aIID.Equals(nsIFactory::GetIID()))   
-    *aResult = (void *)(nsIFactory*)this;   
-
-  if (*aResult == NULL)
-    return NS_NOINTERFACE;
-
-  AddRef(); // Increase reference count for caller   
-  return NS_OK;   
-}   
-
-NS_IMPL_ADDREF(nsComposeFactory)
-NS_IMPL_RELEASE(nsComposeFactory)
-
-nsresult
-nsComposeFactory::CreateInstance(nsISupports *aOuter, const nsIID &aIID, void **aResult)  
-{  
-	nsresult res = NS_OK;
-	nsISupports *inst = nsnull;
-    
-	if (aResult == NULL)  
-		return NS_ERROR_NULL_POINTER;  
-
-	*aResult = NULL;  
-
-    // get the interface this factory instance is supposed to create
-    if (mClassID.Equals(kCComposeAppCoreCID)) {
-        res = NS_NewComposeAppCore((nsIDOMComposeAppCore **)&inst);
-    }
-
-    // get the requested interface on the newly created class
-    if (NS_SUCCEEDED(res)) {
-        res = inst->QueryInterface(aIID, aResult);
-        NS_RELEASE(inst);
-    }
-        
-    return res;
-}
-
-
-nsresult nsComposeFactory::LockFactory(PRBool aLock)  
-{  
-  // Not implemented in simplest case.  
-    return NS_OK;
-}  
-
-
-
-//
-// begin DLL exports
-//
-nsresult
-NSGetFactory(nsISupports* aServMgr,
-             const nsCID &aClass,
-             const char *aClassName,
-             const char *aProgID,
-             nsIFactory **aFactory)
-{
-#ifdef NS_DEBUG
-    printf("compose: NSGetFactory()\n");
-#endif
-	if (nsnull == aFactory)
-		return NS_ERROR_NULL_POINTER;
-
-    // for now this factory implements only the compose CID.
-    *aFactory = new nsComposeFactory(aClass);
-
-	if (aFactory)
-		return (*aFactory)->QueryInterface(nsIFactory::GetIID(), (void**)aFactory); // they want a Factory Interface so give it to them
-	else
-		return NS_ERROR_OUT_OF_MEMORY;
-}
-
-
-PRBool
-NSCanUnload(nsISupports* aServMgr)
-{
-#ifdef NS_DEBUG
-    printf("compose: NSCanUnload()\n");
-#endif
-    return PRBool(g_InstanceCount == 0 && g_LockCount == 0);
-}
-
-nsresult
-NSRegisterSelf(nsISupports* aServMgr, const char *fullpath)
-{
-    nsresult rv;
-
-    nsCOMPtr<nsIServiceManager> servMgr(do_QueryInterface(aServMgr, &rv));
-    if (NS_FAILED(rv)) return rv;
-
-    nsIComponentManager* compMgr;
-    rv = servMgr->GetService(kComponentManagerCID, 
-                             nsIComponentManager::GetIID(), 
-                             (nsISupports**)&compMgr);
-
-#ifdef NS_DEBUG
-    printf("compose: NSRegisterSelf()\n");
-#endif
-
-    rv = compMgr->RegisterComponent(kCComposeAppCoreCID,
-                                    "Netscape Mail Composer",
-                                    "component://netscape/appcores/composer",
-                                    fullpath,
-                                    PR_TRUE, PR_TRUE);
-
-    (void)servMgr->ReleaseService(kComponentManagerCID, compMgr);
-    return rv;
-}
-    
-nsresult
-NSUnregisterSelf(nsISupports* aServMgr, const char *fullpath)
-{
-    nsresult rv;
-
-    nsCOMPtr<nsIServiceManager> servMgr(do_QueryInterface(aServMgr, &rv));
-    if (NS_FAILED(rv)) return rv;
-
-    nsIComponentManager* compMgr;
-    rv = servMgr->GetService(kComponentManagerCID, 
-                             nsIComponentManager::GetIID(), 
-                             (nsISupports**)&compMgr);
-
-#ifdef NS_DEBUG
-    printf("compose: NSUnregisterSelf()\n");
-#endif
-    rv = compMgr->UnregisterComponent(kCComposeAppCoreCID, fullpath);
-
-    (void)servMgr->ReleaseService(kComponentManagerCID, compMgr);
-    return rv;
-}
diff --git a/mozilla/mailnews/ui/compose/src/nsComposeFactory.h b/mozilla/mailnews/ui/compose/src/nsComposeFactory.h
deleted file mode 100644
index 3b28d6cb65d..00000000000
--- a/mozilla/mailnews/ui/compose/src/nsComposeFactory.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- 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) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#ifndef __nsComposeFactory_h
-#define __nsComposeFactory_h
-
-#include "nsComposeAppCore.h"
-
-NS_BEGIN_EXTERN_C
-
-nsresult
-NS_NewComposeFactory(const nsCID& aClass,
-                       nsIFactory **aFactory);
-
-NS_END_EXTERN_C
-
-#endif //__nsComposeFactory_h