--- a/Msrp/MsrpServer/src/CMSRPMessageHandler.cpp	Fri Nov 26 12:09:49 2010 +0200
+++ b/Msrp/MsrpServer/src/CMSRPMessageHandler.cpp	Thu Dec 02 15:23:48 2010 +0200
@@ -320,7 +320,21 @@
             }
         else
             {
-            AppendMessageToFileL( aContent );
+            if( iBuffer.Length() )
+                {
+                HBufC8* combined = HBufC8::NewLC( iBuffer.Length() + aContent.Length() );
+                TPtr8 ptr = combined->Des();
+                ptr = iBuffer;
+                ptr.Append( aContent );
+                // must write to file
+                WriteMessageToFileL( ptr );
+                CleanupStack::PopAndDestroy( ); // combined
+                iBuffer.Zero();
+                }
+            else
+                {
+                AppendMessageToFileL( aContent );
+                }
             }
         }    
     MSRPLOG( "CMSRPMessageHandler::AddContentL exit" )
@@ -465,7 +479,7 @@
     if ( iActiveMsgType == EMSRPResponse )
         {
         // currently sending a response
-        MSRPLOG( "CMSRPMessageHandler::SendReportL sendin a response..." )
+        MSRPLOG( "CMSRPMessageHandler::SendReportL response sending in progress, do nothing" )
         return sendReport;
         }
     iMSRPMessageObserver = aMessageObserver;