--- a/email/pop3andsmtpmtm/popservermtm/src/POPSMTM.CPP	Sun Jul 25 18:59:19 2010 +0530
+++ b/email/pop3andsmtpmtm/popservermtm/src/POPSMTM.CPP	Tue Aug 03 21:34:40 2010 +0530
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -1432,6 +1432,14 @@
 			{	
 			CommandComplete( eCode );
 			}
+		else if(iState.iLastCurrentOperation == EPopConnectedAndIdle && iState.iCurrentOperation == EPopDisconnected && eCode != KErrNone)
+		    {
+            // Some email servers doesn’t wait for QUIT command, in such cases need to close RConnection
+            delete iSessionManager; 
+            iSessionManager = NULL;
+			
+            iPopProgress.iErrorCode = eCode;
+		    }
 		else
 			{
 			iPopProgress.iErrorCode = eCode;

--- a/email/pop3andsmtpmtm/servermtmutils/src/IMCVSEND.CPP	Sun Jul 25 18:59:19 2010 +0530
+++ b/email/pop3andsmtpmtm/servermtmutils/src/IMCVSEND.CPP	Tue Aug 03 21:34:40 2010 +0530
@@ -2222,7 +2222,7 @@
 	iIsNewChunk = ETrue;
 
 	iCurrentChunk.Close();
-	iCurrentChunk.Create(KChunkSize);	
+	iCurrentChunk.CreateL(KChunkSize);	
 	
 	if (aServerEntry.HasStoreL())
 		{
@@ -2303,7 +2303,7 @@
 		TInt currentChunkLength = iCurrentChunk.Length();
 		
 		// Resize iCurrentChunk as per data left for send operation.
-		iCurrentChunk.ReAlloc(KChunkSize + currentChunkLength);		
+		iCurrentChunk.ReAllocL(KChunkSize + currentChunkLength);		
 		iCurrentChunk.SetMax();
 		
 		TPtr16 restoredChunkPtr =  iCurrentChunk.MidTPtr(currentChunkLength);

--- a/mobilemessaging/smsmtm/servermtm/src/SMSSOUTB.CPP	Sun Jul 25 18:59:19 2010 +0530
+++ b/mobilemessaging/smsmtm/servermtm/src/SMSSOUTB.CPP	Tue Aug 03 21:34:40 2010 +0530
@@ -23,7 +23,6 @@
 #include <logsmspdudata.h>
 #include <smsulog.h>
 #include <logwraplimits.h>
-#include <exterror.h>
 
 #include "SMSSendSession.h"
 #include "SMSSPAN.H"
@@ -211,15 +210,8 @@
 			{
 			if (iCurrentMessage)
 				{
-				if( (iProgress.iError == KErrGsmSMSShortMessageTransferRejected) || (iProgress.iError == KErrGsmSMSInvalidMandatoryInformation) || (iProgress.iError == KErrGsmSMSUnidentifiedSubscriber) ||
-					(iProgress.iError == KErrGsmSMSUnknownSubscriber) || (iProgress.iError == KErrGsmSMSNetworkOutOfOrder) )
-				    {
-					DoComplete(iProgress.iError);
-				    }
-				else
-				    {
-					ReScheduleFailedMessageL();
-				    }	
+                SMSSLOG(FLogFormat(_L8("CSmsOutboxSend::DoRunL(), error for ReSchedule %d"), iProgress.iError));
+				ReScheduleFailedMessageL();
 				}
 			else
 				{
@@ -523,7 +515,7 @@
 		_LIT16(KComma, ",");
 		
 		RBuf16 buffer;
-		buffer.Create(size+num);
+		buffer.CreateL(size+num);
 		if(num > 0)
 			{
 			rcpt = numbers[0];