Bug 48825: When extracting msg ids, search '#' from the end of msg urls to avoid treating folder names as msg ids. r=sspitzer,sr=bienvenu.

mailnews/imap/src/nsImapService.cpp

@@ -687,7 +687,7 @@ NS_IMETHODIMP nsImapService::DisplayMessage(const char* aMessageURI,
       }
 
       nsCAutoString uriStr(aMessageURI);
-      PRInt32 keySeparator = uriStr.FindChar('#');
+      PRInt32 keySeparator = uriStr.RFindChar('#');
       if(keySeparator != -1)
       {
         PRInt32 keyEndSeparator = uriStr.FindCharInSet("/?&", 

mailnews/imap/src/nsImapUtils.cpp

@@ -183,7 +183,7 @@ nsresult nsParseImapMessageURI(const char* uri, nsCString& folderURI, PRUint32 *
 		return NS_ERROR_NULL_POINTER;
 
 	nsCAutoString uriStr(uri);
-	PRInt32 keySeparator = uriStr.FindChar('#');
+	PRInt32 keySeparator = uriStr.RFindChar('#');
 	if(keySeparator != -1)
 	{
     PRInt32 keyEndSeparator = uriStr.FindCharInSet("/?&",