--- a/email/pop3andsmtpmtm/popservermtm/src/POPS.CPP	Mon Mar 15 12:40:06 2010 +0200
+++ b/email/pop3andsmtpmtm/popservermtm/src/POPS.CPP	Wed Mar 31 21:25:02 2010 +0300
@@ -208,7 +208,17 @@
 		iSocket->Disconnect();
 		iSocketConnected=EFalse;
 		}
-	iSocket->Cancel();	// clear a pending socket call
+	
+	if(iState == EPopCapabilities || iState == EWaitingForReply)
+	    {
+	    if(iPopCapabilities)
+	        {
+	        iPopCapabilities->Cancel();
+	        }
+	    }
+	
+	iSocket->Cancel();  // clear a pending socket call
+
 	CMsgActive::DoCancel();
 	}