Bug #2775 --> only force a delete model if the server is a AOL server.

only show deleted messages if the server is a AOL server.
r=bienvenu sr=alecf

mailnews/imap/src/nsImapIncomingServer.cpp

@@ -338,7 +338,10 @@ nsImapIncomingServer::GetDeleteModel(PRInt32 *retval)
   NS_ENSURE_ARG(retval);
 
   GetIsAOLServer(&isAOLServer);
-  if (isAOLServer)
+  nsXPIDLCString hostName;
+  GetHostName(getter_Copies(hostName));
+
+  if (isAOLServer && ((const char *) hostName) && !nsCRT::strcmp(hostName, "imap.mail.aol.com"))
   {
     *retval = nsMsgImapDeleteModels::DeleteNoTrash;
     return NS_OK;

mailnews/imap/src/nsImapMailFolder.cpp

@@ -3148,7 +3148,11 @@ PRBool nsImapMailFolder::ShowDeletedMessages()
     {
       PRBool isAOLServer = PR_FALSE;
       imapServer->GetIsAOLServer(&isAOLServer);
-      if (isAOLServer)
+      nsCOMPtr<nsIMsgIncomingServer> incomingServer (do_QueryInterface(imapServer));
+      nsXPIDLCString hostName;
+      incomingServer->GetHostName(getter_Copies(hostName));
+      
+      if (isAOLServer && ((const char *) hostName) && !nsCRT::strcmp(hostName, "imap.mail.aol.com"))
       {
         nsXPIDLString folderName;
         GetName(getter_Copies(folderName));