--- a/calendarui/editors/src/calenunifiededitorcontrol.cpp	Mon Jun 21 15:38:59 2010 +0300
+++ b/calendarui/editors/src/calenunifiededitorcontrol.cpp	Thu Jul 15 18:37:27 2010 +0300
@@ -144,7 +144,7 @@
 // Set data to the collapsed unified editor
 // -----------------------------------------------------------------------------
 //
-void CCalenUnifiedEditorControl::SetDataToEditorL()
+void CCalenUnifiedEditorControl::SetDataToEditorL(TBool onLocaleUpdate)
     {
     TRACE_ENTRY_POINT;
     
@@ -155,7 +155,9 @@
     
     TPtrC subject = iUnifiedEditor.Edited().Summary().Left(
                         iUnifiedEditor.MaxTextEditorLength() );
-    iUnifiedEditor.SetEditorTextL( ECalenEditorSubject, &subject );
+    
+    if(!onLocaleUpdate)
+        iUnifiedEditor.SetEditorTextL( ECalenEditorSubject, &subject );
    
 
     
@@ -246,7 +248,9 @@
         {
         TPtrC location = iUnifiedEditor.Edited().Location().Left(
                             iUnifiedEditor.MaxTextEditorLength() );
-        iUnifiedEditor.SetEditorTextL( ECalenEditorPlace, &location );
+        
+        if(!onLocaleUpdate)
+            iUnifiedEditor.SetEditorTextL( ECalenEditorPlace, &location );
         }
     
     // TODO: Uncomment this when enabling attachment support
@@ -1431,7 +1435,7 @@
         }
 
     iUnifiedEditor.TryChangeFocusToL( lastFocusedItem );
-    SetDataToEditorL();
+    SetDataToEditorL(ETrue);
     iUnifiedEditor.UpdateFormL();
     TRACE_EXIT_POINT;
     }