--- a/emailuis/emailui/src/ncsaifeditor.cpp	Wed Jun 09 09:22:57 2010 +0300
+++ b/emailuis/emailui/src/ncsaifeditor.cpp	Mon Jun 21 15:20:54 2010 +0300
@@ -351,10 +351,6 @@
         ret = CNcsEditor::OfferKeyEventL( aKeyEvent, aType );
         }
     
-    if( ret == EKeyWasNotConsumed  && aType == EEventKeyDown )
-        {
-        HandleTextUpdateDeferred(); // update for lang that don't support CPS
-        }
     return ret;
     }
 
@@ -594,7 +590,7 @@
     // First, add all the addresses without updating the editor text contents 
     for ( TInt i=0 ; i<aAddresses.Count() ; i++ )
         {
-    	AddAddressL( *aAddresses[i], ETrue );
+        AddAddressL( *aAddresses[i], EFalse );
         }
     // Update editor text content after all the items have been added
     RepositionEntriesL( NULL );