From 71f0c69771294dbd6d0d9885b83c0a7999bab8dd Mon Sep 17 00:00:00 2001
From: "bienvenu%nventure.com" <bienvenu%nventure.com>
Date: Fri, 20 Feb 2004 19:45:33 +0000
Subject: [PATCH] fix for phantom messages in db, sr=mscott 227472

---
 mailnews/db/msgdb/src/nsMsgThread.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/mailnews/db/msgdb/src/nsMsgThread.cpp b/mailnews/db/msgdb/src/nsMsgThread.cpp
index a068ac90d0d0..bf27c11b224a 100644
--- a/mailnews/db/msgdb/src/nsMsgThread.cpp
+++ b/mailnews/db/msgdb/src/nsMsgThread.cpp
@@ -1042,7 +1042,19 @@ nsresult nsMsgThread::GetChildHdrForKey(nsMsgKey desiredKey, nsIMsgDBHdr **resul
       (*result)->GetMessageKey(&msgKey);
       
       if (msgKey == desiredKey)
+      {
+        nsMsgKey threadKey;
+        (*result)->GetThreadId(&threadKey);
+        if (threadKey != m_threadKey) // this msg isn't in this thread
+        {
+          PRUint32 msgSize;
+          (*result)->GetMessageSize(&msgSize);
+          if (msgSize == 0) // this is a phantom message - let's get rid of it.
+            RemoveChild(msgKey);
+          rv = NS_ERROR_UNEXPECTED;
+        }
         break;
+      }
       NS_RELEASE(*result);
     }
   }