--- a/calendarui/controller/src/calenmultidbeditor.cpp	Wed Mar 31 21:29:10 2010 +0300
+++ b/calendarui/controller/src/calenmultidbeditor.cpp	Wed Apr 14 15:55:57 2010 +0300
@@ -419,6 +419,7 @@
                 {
                 iMultipleDbUi.UpdateOnAddOrEditL(!iEditFlag);
                 }
+             isExitForm = ETrue;
              iMultipleDbUi.ExitDialogL();           
 			 }
             break;
@@ -752,15 +753,15 @@
                TInt index = calendarInfoList.Find( *iCalendarName,CCalenMultiDBEditor::CalenInfoIdentifierL );
                if(index != KErrNotFound)
                    {
+                   retValue = EFalse;
                    if( EAknCmdExit != aButtonId )
-                       {
-                   retValue = EFalse;
-                   HBufC* infoText = StringLoader::LoadLC(
-                           R_QTN_CALE_DB_ALREADY_EXISTS_NOTE , iCalendarName->Des() );
-                   CAknInformationNote* dialog = new( ELeave ) CAknInformationNote(ETrue);
-                   dialog->ExecuteLD( *infoText );
-                   CleanupStack::PopAndDestroy( infoText );                        
-                       }                     
+                       {                       
+                       HBufC* infoText = StringLoader::LoadLC(
+                               R_QTN_CALE_DB_ALREADY_EXISTS_NOTE , iCalendarName->Des() );
+                       CAknInformationNote* dialog = new( ELeave ) CAknInformationNote(ETrue);
+                       dialog->ExecuteLD( *infoText );
+                       CleanupStack::PopAndDestroy( infoText );                        
+                       }
                    }
                else
                    {
@@ -773,13 +774,13 @@
            {
            if( EAknCmdExit != aButtonId )
                {
-           retValue = EFalse;
-           HBufC* infoText(NULL);
-           infoText = AreIllegalChars( *iCalendarName ) ? StringLoader::LoadLC( R_CALEN_ILLEGAL_CHARACTERS ) : 
-                                                    StringLoader::LoadLC( R_CALEN_BAD_FILE_NAME );
-           CAknInformationNote* dialog = new( ELeave ) CAknInformationNote(ETrue);
-           dialog->ExecuteLD( *infoText );
-           CleanupStack::PopAndDestroy( infoText ); 
+               retValue = EFalse;
+               HBufC* infoText(NULL);
+               infoText = AreIllegalChars( *iCalendarName ) ? StringLoader::LoadLC( R_CALEN_ILLEGAL_CHARACTERS ) : 
+                                                        StringLoader::LoadLC( R_CALEN_BAD_FILE_NAME );
+               CAknInformationNote* dialog = new( ELeave ) CAknInformationNote(ETrue);
+               dialog->ExecuteLD( *infoText );
+               CleanupStack::PopAndDestroy( infoText ); 
                }
            }