--- a/mmsengine/mmspushhandler/src/CMmsPushHandler.cpp	Thu Aug 19 09:51:11 2010 +0300
+++ b/mmsengine/mmspushhandler/src/CMmsPushHandler.cpp	Tue Aug 31 15:11:31 2010 +0300
@@ -172,14 +172,16 @@
     // If memory runs out, tough luck..
     //
     TPtrC8 messageBodyPtr;
-    iPushMsg->GetMessageBody( messageBodyPtr );
-    iBody = messageBodyPtr.Alloc();
-    if ( !iBody )
+    if ( iPushMsg->GetMessageBody( messageBodyPtr ) )
         {
-        LOGTEXT( _L("HandleMessageL(): Out of memory when allocating body buffer") );
-        // Commit suicide - the caller expects it even if we leave
-        iPluginKiller->KillPushPlugin();
-        User::Leave( KErrNoMemory );
+        iBody = messageBodyPtr.Alloc();
+        if ( !iBody )
+            {
+        	LOGTEXT( _L("HandleMessageL(): Out of memory when allocating body buffer") );
+        	// Commit suicide - the caller expects it even if we leave
+        	iPluginKiller->KillPushPlugin();
+        	User::Leave( KErrNoMemory );
+            }
         }
     
     //
@@ -753,7 +755,7 @@
     // They should be at the end of the list
     TInt count = selection->Count();
     TInt i;
-    for ( i = count - 1; i >= 0; i-- )
+    for ( i = count - 1; i >= 0; --i )
         {
         if ( selection->At( i ) <= KMsvDeletedEntryFolderEntryId )
             {
@@ -765,7 +767,7 @@
     // Check if anything left.
     count = selection->Count();
     // Loop through the rest and find possible correct folder
-    for ( i = 0; i < count && mmsFolderId == KMsvNullIndexEntryId; i++ )
+    for ( i = 0; i < count && mmsFolderId == KMsvNullIndexEntryId; ++i )
         {
         cMsvEntry->SetEntryL( selection->At( i ) );
         // must be exact match