--- a/email/pop3andsmtpmtm/servermtmutils/src/imcvrecv.cpp	Wed Jun 09 09:37:26 2010 +0300
+++ b/email/pop3andsmtpmtm/servermtmutils/src/imcvrecv.cpp	Mon Jun 21 15:36:19 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 1998-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1998-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"
@@ -3976,7 +3976,11 @@
 			iLex.UnGetToMark(initMark);
 			ParseRfc2231ParameterInfoL(aTag, rBuffer, offset );
 			}
-			CleanupStack::Pop(rBuffer8);
+		if( param.Length() > 0 )
+		    {
+            CleanupStack::Pop(rBuffer8);
+		    }
+			
 		}
 	}