fix removing pre-tag labels, sr=mscott 342214

mail/base/content/mailWindowOverlay.js

@@ -608,7 +608,9 @@ function InitMessageTags(menuType)
   var newMenuItem; 
 
   var curMsgHdrKeyArray = curKeys.split(" ");
-
+  if (msgHdr.label != 0)
+    curMsgHdrKeyArray.push("$label" + msgHdr.label);
+    
   while (allTags.hasMore())
   {
     var tag = allTags.getNext();

mailnews/base/util/nsMsgDBFolder.cpp

@@ -5308,7 +5308,7 @@ NS_IMETHODIMP nsMsgDBFolder::RemoveKeywordFromMessages(nsISupportsArray *aMessag
       {
         nsMsgLabelValue labelValue;
         message->GetLabel(&labelValue);
-        if (labelValue == aKeyword[6])
+        if (labelValue == aKeyword[6] - '0')
           message->SetLabel(0);
       }