Bug #198087 --> Mark new items in Unsent and Drafts folders to Unread

sr=bienvenu

mailnews/compose/src/nsMsgSend.cpp

@@ -4412,10 +4412,13 @@ nsMsgComposeAndSend::MimeDoFCC(nsFileSpec       *input_file,
   {
     char       *buf = 0;
     PRUint16   flags = 0;
-
-    flags |= MSG_FLAG_READ;
+    
+    // for save as draft and send later, we want to leave the message as unread.
+    // See Bug #198087
     if (mode == nsMsgQueueForLater)
       flags |= MSG_FLAG_QUEUED;
+    else if (mode != nsMsgSaveAsDraft)
+      flags |= MSG_FLAG_READ;
     buf = PR_smprintf(X_MOZILLA_STATUS_FORMAT CRLF, flags);
     if (buf)
     {

mailnews/imap/src/nsImapMailFolder.cpp

@@ -4388,6 +4388,8 @@ NS_IMETHODIMP nsImapMailFolder::GetCurMoveCopyMessageFlags(nsIImapUrl *runningUr
       if (label != 0)
         *aResult |= label << 25;
     }
+    else if (mFlags & MSG_FOLDER_FLAG_DRAFTS) // if the message is being added to the drafts folder, don't add the seen flag (Bug #198087)
+      *aResult = 0;
   }
   return NS_OK;
 }