--- a/calendarui/editors/src/calenunifiededitor.cpp	Tue Feb 02 10:12:19 2010 +0200
+++ b/calendarui/editors/src/calenunifiededitor.cpp	Fri Feb 19 22:49:53 2010 +0200
@@ -1242,19 +1242,7 @@
                             }
                         break;
                         }
-                    case ECalenEditorDescription:
-                        {
-                        CEikEdwin* edwin = static_cast<CEikEdwin*>( Control( focusControl ) );  
-                        if ( edwin && edwin->Text()->DocumentLength() == 0 )
-                            {
-                                ProcessCommandL( ECalenCmdAddDescription );
-                            }
-                        else
-                            {
-                                ProcessCommandL( ECalenCmdShowDescription );
-                            }
-                        break;
-                        }
+
                     default:
                         {
                         break;
@@ -2185,7 +2173,7 @@
         {
         // If save error occurs, display error message.
         DisplayErrorMsgL( error );
-       // HandleErrorL(error);
+        iUnifiedEditorControl->HandleErrorL(error);
         TRACE_EXIT_POINT;
         return EFalse;
         }
@@ -2248,7 +2236,7 @@
             }
 		}
     
-    if(!IsCreatingNewEntry())
+    if(!IsCreatingNewEntry() && !iEditorDataHandler->IsCalendarEditedL())
         {
         iServices->EntryViewL(iEditorDataHandler->PreviousDbCollectionId())
                                                 ->DeleteL(*iOriginalCalEntry);
@@ -2278,7 +2266,11 @@
                    newInstanceEndDate,
                    iUnifiedEditorControl->GetCalendarNameForEntryL() ) );
         }
-
+    if(!IsCreatingNewEntry() && iEditorDataHandler->IsCalendarEditedL())
+        {
+        iServices->EntryViewL(iEditorDataHandler->PreviousDbCollectionId())
+                                                ->DeleteL(*iOriginalCalEntry);
+        }
     iEntryUiOutParams.iSpare = (TUint32) entry->LocalUidL();
 
     CleanupStack::PopAndDestroy(entry);
@@ -2314,7 +2306,6 @@
 
         CCalenEditorDataHandler::TAction action =
             EditorDataHandler().ShouldSaveOrDeleteOrDoNothingL();
-        
         if( iHasChosenRepeatType && iRepeatType == CalCommon::EThisAndAll ) 
         {
         // Check for the errors, with the entered data