diff --git a/mozilla/mailnews/news/src/nsNewsFolder.cpp b/mozilla/mailnews/news/src/nsNewsFolder.cpp
index 208c6eca427..73b25fcd50b 100644
--- a/mozilla/mailnews/news/src/nsNewsFolder.cpp
+++ b/mozilla/mailnews/news/src/nsNewsFolder.cpp
@@ -1675,28 +1675,7 @@ NS_IMETHODIMP nsMsgNewsFolder::RemoveMessage(nsMsgKey key)
 {
   nsresult rv;
 
-  nsCAutoString msgURI;
-  rv = nsBuildNewsMessageURI(mBaseMessageURI, key, msgURI);
-  if (NS_FAILED(rv)) return rv;
-
-  nsCOMPtr <nsIRDFService> rdfService = do_GetService(kRDFServiceCID, &rv);
-  if (NS_FAILED(rv)) return rv;
-
-  nsCOMPtr <nsIRDFResource> res;
-  rv = rdfService->GetResource(msgURI.GetBuffer(), getter_AddRefs(res));
-  if (NS_FAILED(rv)) return rv;
-
-  nsCOMPtr<nsIDBMessage> dbMessage = do_QueryInterface(res);
-  if (!dbMessage) return NS_ERROR_FAILURE;
-
-  nsCOMPtr <nsIMsgDBHdr> msgDBHdr;
-  rv = dbMessage->GetMsgDBHdr(getter_AddRefs(msgDBHdr));
-  if (NS_FAILED(rv)) return rv;
-
-  rv = mDatabase->DeleteHeader(msgDBHdr, nsnull, PR_TRUE, PR_TRUE);
-  if (NS_FAILED(rv)) return rv;
-
-  return NS_OK;
+  return mDatabase->DeleteMessage(key, nsnull, PR_TRUE);
 }
 
 NS_IMETHODIMP nsMsgNewsFolder::CancelComplete()
diff --git a/mozilla/mailnews/news/src/nsNntpService.cpp b/mozilla/mailnews/news/src/nsNntpService.cpp
index 13ac416dfc1..245b8c9ec78 100644
--- a/mozilla/mailnews/news/src/nsNntpService.cpp
+++ b/mozilla/mailnews/news/src/nsNntpService.cpp
@@ -1209,7 +1209,7 @@ NS_IMETHODIMP nsNntpService::CancelMessages(const char *hostname, const char *ne
   nsXPIDLCString messageId;
   
   nsCOMPtr<nsISupports> msgSupports = getter_AddRefs(messages->ElementAt(0));
-  nsCOMPtr<nsIMessage> message(do_QueryInterface(msgSupports));
+  nsCOMPtr<nsIMsgDBHdr> message(do_QueryInterface(msgSupports));
   if (message) {
     rv = message->GetMessageKey(&key);
     if (NS_FAILED(rv)) return rv;