--- a/mailnews/db/msgdb/src/nsMsgOfflineImapOperation.cpp
+++ b/mailnews/db/msgdb/src/nsMsgOfflineImapOperation.cpp
@@ -219,16 +219,17 @@ NS_IMETHODIMP nsMsgOfflineImapOperation:
   NS_ENSURE_ARG(aKeywords);
   nsresult rv = m_mdb->GetProperty(m_mdbRow, PROP_KEYWORD_ADD, getter_Copies(m_keywordsToAdd));
   *aKeywords = ToNewCString(m_keywordsToAdd);
   return rv;
 }
 
 NS_IMETHODIMP nsMsgOfflineImapOperation::AddKeywordToAdd(const char * aKeyword)
 {
+  SetOperation(kAddKeywords);
   return AddKeyword(aKeyword, m_keywordsToAdd, PROP_KEYWORD_ADD, m_keywordsToRemove, PROP_KEYWORD_REMOVE);
 }
 
 NS_IMETHODIMP nsMsgOfflineImapOperation::GetKeywordsToRemove(char * *aKeywords)
 {
   NS_ENSURE_ARG(aKeywords);
   nsresult rv = m_mdb->GetProperty(m_mdbRow, PROP_KEYWORD_REMOVE, getter_Copies(m_keywordsToRemove));
   *aKeywords = ToNewCString(m_keywordsToRemove);
@@ -247,22 +248,22 @@ nsresult nsMsgOfflineImapOperation::AddK
   }
   // if the keyword we're removing was in the list of keywords to add,
   // cut it from that list.
   if (MsgFindKeyword(nsDependentCString(aKeyword), removeList, &startOffset, &keywordLength))
   {
     removeList.Cut(startOffset, keywordLength);
     m_mdb->SetProperty(m_mdbRow, removeProp, removeList.get());
   }
-  SetOperation(kRemoveKeywords);
   return m_mdb->SetProperty(m_mdbRow, addProp, addList.get());
 }
 
 NS_IMETHODIMP nsMsgOfflineImapOperation::AddKeywordToRemove(const char * aKeyword)
 {
+  SetOperation(kRemoveKeywords);
   return AddKeyword(aKeyword, m_keywordsToRemove, PROP_KEYWORD_REMOVE, m_keywordsToAdd, PROP_KEYWORD_ADD);
 }
 
 
 NS_IMETHODIMP nsMsgOfflineImapOperation::AddMessageCopyOperation(const char *destinationBox)
 {
   SetOperation(kMsgCopy);
   nsCAutoString newDest(destinationBox);