--- a/calendarui/editors/src/calenunifiededitor.cpp	Mon Jun 21 15:38:59 2010 +0300
+++ b/calendarui/editors/src/calenunifiededitor.cpp	Thu Jul 15 18:37:27 2010 +0300
@@ -944,7 +944,7 @@
                 iEditorDataHandler->ResetOriginalDataL();
                 }
             }
-        iUnifiedEditorControl->SetDataToEditorL();
+        iUnifiedEditorControl->SetDataToEditorL(ETrue);
         }
 
     if ( aChange & EChangesLocale )
@@ -1062,9 +1062,6 @@
         case EAknCmdHelp:
             OnCmdHelpL();
             break;
-        case ECalenSend:
-            OnCmdSendL( aCommandId );
-            break;
         case ECalenGetLocation:
           {
             ReadPlaceFromEditorL(); // to remove any picture characters in location string
@@ -1320,8 +1317,6 @@
                 {
                 aMenuPane->DeleteMenuItem( ECalenCmdAddPeople );
                 }
-            
-            TryInsertSendMenuL( aResourceId, aMenuPane );
             }
             break;
 
@@ -1367,42 +1362,6 @@
     }
 
 // -----------------------------------------------------------------------------
-// CCalenUnifiedEditor::OnCmdSendL
-// Handles the send command. This function differs from the ViewerBase version
-// in that the ViewerBase does not attempt to save or delete the entry first.
-// -----------------------------------------------------------------------------
-//
-void CCalenUnifiedEditor::OnCmdSendL( TInt aCommandId )
-    {
-    TRACE_ENTRY_POINT;
-
-    // Show menu to user 
-    // CCalenSend handles selection internally, so we don't get anything in return
-    iGlobalData->CalenSendL().DisplaySendCascadeMenuL();
-
-    // Try to send
-    if ( iGlobalData->CalenSendL().CanSendL(aCommandId) )
-        {
-        TBool canSend(ETrue);
-
-        const TBool continueOnError = EFalse;
-        iUnifiedEditorControl->ReadDataFromEditorL( continueOnError );
-        CCalenEditorDataHandler::TAction action =
-            EditorDataHandler().ShouldSaveOrDeleteOrDoNothingL();
-        if(  action == CCalenEditorDataHandler::EActionSave )
-            {
-            canSend = TryToSaveNoteL();
-            }
-
-        if ( canSend )
-            {
-            iGlobalData->CalenSendL().SendAsVCalendarL( aCommandId, EditorDataHandler().Entry() );
-            }
-        }
-    TRACE_EXIT_POINT;
-    }
-
-// -----------------------------------------------------------------------------
 // CCalenUnifiedEditor::OnCmdHelpL
 // Handles help command.
 // -----------------------------------------------------------------------------
@@ -1468,27 +1427,6 @@
     }
 
 // -----------------------------------------------------------------------------
-// CCalenUnifiedEditor::TryInsertSendMenuL
-// Inserts the send menu, if needed.
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CCalenUnifiedEditor::TryInsertSendMenuL( TInt /*aResourceId*/, CEikMenuPane* aMenuPane )
-    {
-    TRACE_ENTRY_POINT;
-
-    // Only insert if there is some summary (or location)
-    // Changes done to remove Lunar calendar item from options menu
-    if( EditorDataHandler().AreTextFieldsEmptyL() )
-        {
-        // Delete Send Menu item if exists
-        aMenuPane->DeleteMenuItem( ECalenSend );
-        }    
-
-    TRACE_EXIT_POINT;
-    }
-
-// -----------------------------------------------------------------------------
 // CCalenUnifiedEditor::CloseFormWithoutActionsL
 // Closes the form. We have to do it via dialog's exit mechanism
 // with custom id (KCalenButtonIdCloseForm).