--- a/creator/engine/src/creator_message.cpp	Fri May 14 16:10:39 2010 +0300
+++ b/creator/engine/src/creator_message.cpp	Tue Jun 01 14:40:54 2010 +0300
@@ -133,11 +133,13 @@
         return;
         }
     
+    const TDesC* showText = &KSavingText;
     TBool finished(EFalse);
     TBool retval(ETrue);
     switch(aUserData)
         {
         case ECreatorMessagesDelete:
+            showText = &KDeletingText;
             iEntriesToBeCreated = 1;
             finished = ETrue;
             break;
@@ -225,7 +227,7 @@
         // add this command to command array
         iEngine->AppendToCommandArrayL(iCommand, NULL, iEntriesToBeCreated);
         // started exucuting commands
-        iEngine->ExecuteFirstCommandL( KSavingText );
+        iEngine->ExecuteFirstCommandL( *showText );
         }
     }
 //----------------------------------------------------------------------------
@@ -455,10 +457,11 @@
     clientMtm->CreateMessageL(defaultServiceId);
 
     // set the from field to sms header
-    if (parameters.iFolderType == EInbox)
+    // !!! This will cause CRASH
+    /*if (parameters.iFolderType == EInbox)
         {
         CSmsHeader* smsHeader = &clientMtm->SmsHeader();
-        delete smsHeader;
+        delete smsHeader; // <-- This will cause CRASH
         smsHeader = NULL;
         smsHeader = CSmsHeader::NewL(CSmsPDU::ESmsDeliver, clientMtm->Body());        
         if( parameters.iSenderAddress )
@@ -469,7 +472,7 @@
             {
             smsHeader->SetFromAddressL(KEmpty);
             }
-        }       
+        }       */
 
     // set body
     clientMtm->Body().Reset();
@@ -481,11 +484,11 @@
     // set the details field
     if (parameters.iFolderType == EInbox)
         {
-        SetSenderToEntryDetails(messageEntry, parameters, EFalse);        
+        SetSenderToEntryDetailsL(messageEntry, parameters, EFalse);        
         }
     else
         {
-        SetRecipientToEntryDetails(messageEntry, parameters, EFalse);
+        SetRecipientToEntryDetailsL(messageEntry, parameters, EFalse);
         // Add all recipients to clientMtm
         // iRecipientArray is up-to-date so don't call AddRecipientsL here 
         for( TInt i = 0; i < iRecipientArray.Count(); i++ )
@@ -664,11 +667,11 @@
     // set the details field
     if (parameters.iFolderType == EInbox)
         {
-        SetSenderToEntryDetails(messageEntry, parameters, EFalse);        
+        SetSenderToEntryDetailsL(messageEntry, parameters, EFalse);        
         }
     else
         {
-        SetRecipientToEntryDetails(messageEntry, parameters, EFalse);
+        SetRecipientToEntryDetailsL(messageEntry, parameters, EFalse);
         }    
 
     // set the description field same as the message subject
@@ -923,11 +926,11 @@
     // set the details field
     if (parameters.iFolderType == EInbox)
         {
-        SetSenderToEntryDetails(messageEntry, parameters, EFalse);        
+        SetSenderToEntryDetailsL(messageEntry, parameters, EFalse);        
         }  
     else
         {
-        SetRecipientToEntryDetails(messageEntry, parameters, EFalse);
+        SetRecipientToEntryDetailsL(messageEntry, parameters, EFalse);
         }
 
     // set the description field same as the message subject
@@ -1088,14 +1091,14 @@
     if (parameters.iFolderType == EInbox)
         {
         AddSenderToMtmAddresseeL(*clientMtm, parameters, ETrue );
-        SetSenderToEntryDetails(messageEntry, parameters, ETrue);
+        SetSenderToEntryDetailsL(messageEntry, parameters, ETrue);
         messageEntry.iMtm = KUidMsgTypeIMAP4;  // or any other than KUidMsgTypeSMTP to display 'from' field instead of 'to' field 
         }
     else
         {
         // Add all recipients to clientMtm
         AddRecipientsL( *clientMtm, parameters, ETrue );
-        SetRecipientToEntryDetails(messageEntry, parameters, EFalse);        
+        SetRecipientToEntryDetailsL(messageEntry, parameters, EFalse);        
         }
 
     // set the description field same as the message subject
@@ -1319,11 +1322,11 @@
     // set the details field
     if (parameters.iFolderType == EInbox)
         {
-        SetSenderToEntryDetails(messageEntry, parameters, EFalse);        
+        SetSenderToEntryDetailsL(messageEntry, parameters, EFalse);        
         }        
     else
         {
-        SetRecipientToEntryDetails(messageEntry, parameters, EFalse);
+        SetRecipientToEntryDetailsL(messageEntry, parameters, EFalse);
         }
 
     // set the subject line
@@ -1430,11 +1433,11 @@
     // set the details field and
     if (parameters.iFolderType == EInbox)
         {
-        SetSenderToEntryDetails(messageEntry, parameters, EFalse);
+        SetSenderToEntryDetailsL(messageEntry, parameters, EFalse);
         }        
     else
         {
-        SetRecipientToEntryDetails(messageEntry, parameters, EFalse);
+        SetRecipientToEntryDetailsL(messageEntry, parameters, EFalse);
         }
     
     // set mtm
@@ -1520,7 +1523,7 @@
     }
 
 //----------------------------------------------------------------------------
-void CCreatorMessages::SetSenderToEntryDetails(TMsvEntry& aMsgEntry, const CMessagesParameters& aParameters, TBool aUseEmailAddress)
+void CCreatorMessages::SetSenderToEntryDetailsL(TMsvEntry& aMsgEntry, const CMessagesParameters& aParameters, TBool aUseEmailAddress)
     {        
     // Only one sender allowed:
     if( iSenderArray.Count() == 0 )
@@ -1538,7 +1541,7 @@
     }
 
 //----------------------------------------------------------------------------
-void CCreatorMessages::SetRecipientToEntryDetails(TMsvEntry& aMsgEntry, const CMessagesParameters& aParameters, TBool aUseEmailAddress)
+void CCreatorMessages::SetRecipientToEntryDetailsL(TMsvEntry& aMsgEntry, const CMessagesParameters& aParameters, TBool aUseEmailAddress)
     {        
     // Only one sender allowed:
     GetAllRecipientsL(iRecipientArray, aParameters, aUseEmailAddress);