From c54cdb0a5e76569b644608582cb1e2168080f4da Mon Sep 17 00:00:00 2001
From: "bienvenu%nventure.com"
 <bienvenu%nventure.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 30 Jun 2006 01:25:37 +0000
Subject: [PATCH] fix 342886 crash when removing the last tag on a message
 after adding and removing the last tag before, sr=mscott

git-svn-id: svn://10.0.0.236/trunk@201316 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/mailnews/base/src/nsMsgDBView.cpp | 5 +++++
 mozilla/mailnews/base/util/nsMsgUtils.cpp | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/mozilla/mailnews/base/src/nsMsgDBView.cpp b/mozilla/mailnews/base/src/nsMsgDBView.cpp
index f67d99542f1..537888299b9 100644
--- a/mozilla/mailnews/base/src/nsMsgDBView.cpp
+++ b/mozilla/mailnews/base/src/nsMsgDBView.cpp
@@ -360,6 +360,11 @@ nsresult nsMsgDBView::AppendKeywordProperties(const char *keywords, nsISupportsA
   // append that as a property.
   nsCStringArray keywordsArray;
   nsCAutoString color;
+  // skip leading spaces 
+  while (*keywords == ' ')
+    keywords++;
+  if (!*keywords)
+    return NS_OK;
   keywordsArray.ParseString(keywords, " ");
   nsresult rv;
   if (!mTagService)
diff --git a/mozilla/mailnews/base/util/nsMsgUtils.cpp b/mozilla/mailnews/base/util/nsMsgUtils.cpp
index 7962e2a095f..60feee794f6 100644
--- a/mozilla/mailnews/base/util/nsMsgUtils.cpp
+++ b/mozilla/mailnews/base/util/nsMsgUtils.cpp
@@ -1243,6 +1243,8 @@ PRBool MsgFindKeyword(const nsACString &keyword, nsACString &keywords, nsACStrin
       {
         if (*end == ' ')
           end++;
+        if (*beforeStart == ' ' && endMatches)
+          start--;
         return PR_TRUE;
       }
       else