--- a/mmsengine/mmsmessage/src/mmsheaders.cpp	Thu Aug 19 09:51:11 2010 +0300
+++ b/mmsengine/mmsmessage/src/mmsheaders.cpp	Tue Aug 31 15:11:31 2010 +0300
@@ -351,7 +351,6 @@
         stream.AssignLC( aStore, KUidMmsApplicationInfoStream ); // pushes 'stream' to the stack
         length = ApplicId().Length();
         stream.WriteInt32L( length );
-        // Coverty fix, Forward NULL , http://ousrv057/cov.cgi?cid=35556
         if ( length > 0 && iApplicationId )
             {
             stream << iApplicationId->Des();
@@ -359,7 +358,6 @@
         
         length = ReplyApplicId().Length();
         stream.WriteInt32L( length );
-        // Coverty fix, Forward NULL , http://ousrv057/cov.cgi?cid=35559
         if ( length > 0 && iReplyToApplicationId )
             {
             stream << iReplyToApplicationId->Des();
@@ -367,7 +365,7 @@
         
         length = AuxApplicInfo().Length();
         stream.WriteInt32L( length );
-        if ( length > 0 )
+        if ( length > 0 && iApplicationInfo )
             {
             stream << iApplicationInfo->Des();
             }
@@ -389,7 +387,6 @@
 
         length = RecommendedRetrievalModeText().Length();
         stream.WriteInt32L( length );
-        // Coverty fix, Forward NULL , http://ousrv057/cov.cgi?cid=35557
         if ( length > 0 && iRecommendedRetrievalModeText )
             {
             stream << iRecommendedRetrievalModeText->Des();
@@ -397,7 +394,6 @@
             
         length = ReplaceCancelId().Length();
         stream.WriteInt32L( length );
-        // Coverty fix, Forward NULL , http://ousrv057/cov.cgi?cid=35558
         if ( length > 0 && iReplaceCancelId )
             {
             stream << iReplaceCancelId->Des();