diff --git a/mozilla/mailnews/base/util/nsMsgFolder.cpp b/mozilla/mailnews/base/util/nsMsgFolder.cpp
index b6a1e367dae..0c8ce2ba0ee 100644
--- a/mozilla/mailnews/base/util/nsMsgFolder.cpp
+++ b/mozilla/mailnews/base/util/nsMsgFolder.cpp
@@ -876,7 +876,9 @@ NS_IMETHODIMP nsMsgFolder::SetPrettyName(const PRUnichar *name)
   else if (mFlags & MSG_FOLDER_FLAG_SENTMAIL && unicodeName.Equals(NS_LITERAL_STRING("Sent"), nsCaseInsensitiveStringComparator()))
     rv = SetName(kLocalizedSentName);
 
-  else if (mFlags & MSG_FOLDER_FLAG_DRAFTS && unicodeName.Equals(NS_LITERAL_STRING("Drafts"), nsCaseInsensitiveStringComparator()))
+  //netscape webmail uses "Draft" instead of "Drafts"
+  else if (mFlags & MSG_FOLDER_FLAG_DRAFTS && (unicodeName.Equals(NS_LITERAL_STRING("Drafts"), nsCaseInsensitiveStringComparator()) 
+                                                || unicodeName.Equals(NS_LITERAL_STRING("Draft"), nsCaseInsensitiveStringComparator())))  
     rv = SetName(kLocalizedDraftsName);
 
   else if (mFlags & MSG_FOLDER_FLAG_TEMPLATES && unicodeName.Equals(NS_LITERAL_STRING("Templates"), nsCaseInsensitiveStringComparator()))
diff --git a/mozilla/mailnews/imap/src/nsImapIncomingServer.cpp b/mozilla/mailnews/imap/src/nsImapIncomingServer.cpp
index e929178c09b..ca76edfc3e3 100644
--- a/mozilla/mailnews/imap/src/nsImapIncomingServer.cpp
+++ b/mozilla/mailnews/imap/src/nsImapIncomingServer.cpp
@@ -1333,6 +1333,18 @@ NS_IMETHODIMP nsImapIncomingServer::PossibleImapMailbox(const char *folderPath,
       else
       {
         rv = ConvertFolderName(onlineName.get(), getter_Copies(convertedName));
+
+        //make sure rv value is not crunched, it is used to SetPrettyName
+        nsXPIDLCString redirectorType;
+        GetRedirectorType(getter_Copies(redirectorType)); //Sent mail folder as per netscape webmail and aol server
+        if ((redirectorType.Equals(NS_LITERAL_CSTRING("aol")) && convertedName.Equals(NS_LITERAL_STRING("Sent Mail"))) ||
+          (redirectorType.Equals(NS_LITERAL_CSTRING("netscape")) && onlineName.Equals(NS_LITERAL_CSTRING("Sent"))))
+          //we know that we don't allowConversion for netscape webmail so just use the onlineName
+          child->SetFlag(MSG_FOLDER_FLAG_SENTMAIL);
+
+        else if (redirectorType.Equals(NS_LITERAL_CSTRING("netscape")) && onlineName.Equals(NS_LITERAL_CSTRING("Draft")))
+          child->SetFlag(MSG_FOLDER_FLAG_DRAFTS);
+
         if (NS_SUCCEEDED(rv))
           child->SetPrettyName(convertedName);
       }