From cee9020d98b24b3db68e1dec612be850c519c7e4 Mon Sep 17 00:00:00 2001
From: "David :Bienvenu" <bienvenu@nventure.com>
Date: Fri, 7 Aug 2009 10:27:35 +0100
Subject: [PATCH] Bug 467527 - "Restart needed for localized folder name
 (Drafts/Junk/Sent/Templates/Archives name in folderpane tree)" - fix fcc to
 reply folder case [r+sr=Standard8]

---
 mailnews/compose/src/nsMsgCopy.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/mailnews/compose/src/nsMsgCopy.cpp b/mailnews/compose/src/nsMsgCopy.cpp
index 1bd6a013b8..5995b487e7 100644
--- a/mailnews/compose/src/nsMsgCopy.cpp
+++ b/mailnews/compose/src/nsMsgCopy.cpp
@@ -379,7 +379,13 @@ nsMsgCopy::GetSentFolder(nsIMsgIdentity *userIdentity, nsIMsgFolder **folder, PR
 {
   nsresult ret = LocateMessageFolder(userIdentity, nsIMsgSend::nsMsgDeliverNow, mSavePref, folder);
   if (*folder)
-    (*folder)->SetFlag(nsMsgFolderFlags::SentMail);
+  {
+    // If mSavePref is the same as the identity's fcc folder, set the sent flag.
+    nsCString identityFccUri;
+    userIdentity->GetFccFolder(identityFccUri);
+    if (identityFccUri.Equals(mSavePref))
+      (*folder)->SetFlag(nsMsgFolderFlags::SentMail);
+  }
   CreateIfMissing(folder, waitForUrl);
   return ret;
 }