--- a/mmsengine/mmsmessage/src/mmsheaders.cpp	Tue Aug 31 15:11:31 2010 +0300
+++ b/mmsengine/mmsmessage/src/mmsheaders.cpp	Wed Sep 01 12:31:54 2010 +0100
@@ -351,6 +351,7 @@
         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();
@@ -358,6 +359,7 @@
         
         length = ReplyApplicId().Length();
         stream.WriteInt32L( length );
+        // Coverty fix, Forward NULL , http://ousrv057/cov.cgi?cid=35559
         if ( length > 0 && iReplyToApplicationId )
             {
             stream << iReplyToApplicationId->Des();
@@ -365,7 +367,7 @@
         
         length = AuxApplicInfo().Length();
         stream.WriteInt32L( length );
-        if ( length > 0 && iApplicationInfo )
+        if ( length > 0 )
             {
             stream << iApplicationInfo->Des();
             }
@@ -387,6 +389,7 @@
 
         length = RecommendedRetrievalModeText().Length();
         stream.WriteInt32L( length );
+        // Coverty fix, Forward NULL , http://ousrv057/cov.cgi?cid=35557
         if ( length > 0 && iRecommendedRetrievalModeText )
             {
             stream << iRecommendedRetrievalModeText->Des();
@@ -394,6 +397,7 @@
             
         length = ReplaceCancelId().Length();
         stream.WriteInt32L( length );
+        // Coverty fix, Forward NULL , http://ousrv057/cov.cgi?cid=35558
         if ( length > 0 && iReplaceCancelId )
             {
             stream << iReplaceCancelId->Des();