--- a/mmsengine/mmscodec/src/mmsencode.cpp	Fri Feb 19 22:47:38 2010 +0200
+++ b/mmsengine/mmscodec/src/mmsencode.cpp	Fri Mar 12 15:42:19 2010 +0200
@@ -869,9 +869,8 @@
 
     if( iTargetEncodingType != 0 )
         {
+#ifndef _NO_MMSS_LOGGING_
         TRAPD( err, PreProcessAttachmentDataL() );
-
-#ifndef _NO_MMSS_LOGGING_
     /* if any error, korean specific encoding failed, But this should not stop from sending MMS using
      * existing default encoding. Hence just log the error and continue in any case
      */
@@ -879,6 +878,8 @@
             {
             TMmsLogger::Log( _L("CMmsEncode::EncodeHeadersChunkedL:: PreProcessAttachmentDataL error: %d"), err );
             }
+#else
+				TRAP_IGNORE( PreProcessAttachmentDataL() );            
 #endif /* _NO_MMSS_LOGGING_ */
         }
     
@@ -4726,12 +4727,9 @@
 
         if( retVal )
             {
-            TRAPD( 
-                    err,
-                    attachManagerSync.ModifyAttachmentInfoL(attachmentInfo);
-                    editStore->CommitL();
-                  );
 #ifndef _NO_MMSS_LOGGING_
+            TRAPD( err,attachManagerSync.ModifyAttachmentInfoL(attachmentInfo);
+                    editStore->CommitL(););
             if(err != KErrNone)
                 {
                 TMmsLogger::Log( _L("CMmsEncode::PreProcessAttachmentData:: store commit error: %d"), err );
@@ -4740,6 +4738,9 @@
                 {
                 TMmsLogger::Log( _L("CMmsEncode::PreProcessAttachmentData:: store commit success") );                
                 }
+#else
+				    TRAP_IGNORE( attachManagerSync.ModifyAttachmentInfoL(attachmentInfo);
+                    editStore->CommitL(););	                
 #endif /* _NO_MMSS_LOGGING_ */
             /*  attachmentInfo ownership is transfered to attachment manager
              *  Hence, JUST pop attachmentInfo, DO NOT Destroy.