--- a/emailuis/emailui/src/ncscomposeviewcontainer.cpp	Tue Feb 02 00:02:40 2010 +0200
+++ b/emailuis/emailui/src/ncscomposeviewcontainer.cpp	Fri Feb 19 22:37:30 2010 +0200
@@ -287,6 +287,7 @@
                     {
                     iFocused = iHeader;
                     iHeader->SetFocus( ETrue,EDrawNow );
+                    iMessageField->ClearSelectionL();
                     iMessageField->SetFocus( EFalse, EDrawNow );
                     iHeader->MakeVisible( ETrue );
                     CommitL( EBodyField );
@@ -425,6 +426,11 @@
     		break;
     		}
     	}
+    	
+    if( iFocused == iMessageField )
+    	{
+    	iMessageField->HandleTextChangedL();
+    	}
 
     if ( aPointerEvent.iType == TPointerEvent::EButton1Down &&
          iHeader->NeedsLongTapL( aPointerEvent.iPosition ) )
@@ -505,7 +511,9 @@
     if ( ret == EKeyWasNotConsumed )
         {
         ret = iFocused->OfferKeyEventL( aKeyEvent, aType );
-
+        if( aType == EEventKeyUp )
+        	iView.HandleContainerChangeRequiringToolbarRefresh();
+        
         // Report user activity to auto saver if editor field handled the
         // event. In case of message field (body text), EKeyWasConsumed
         // condition does not come true because AknFep consumes EKeyEvent
@@ -514,7 +522,6 @@
         // autosaver is notified in HandleEdwinEventL()
         if ( ( ret == EKeyWasConsumed ) && ( iFocused != iMessageField ) )
             {
-            iView.HandleContainerChangeRequiringToolbarRefresh();
             iAutoSaver.ReportActivity();
             }
         }