--- a/emailuis/emailui/src/ncsheadercontainer.cpp	Thu Dec 17 08:39:21 2009 +0200
+++ b/emailuis/emailui/src/ncsheadercontainer.cpp	Thu Jan 07 12:38:38 2010 +0200
@@ -364,15 +364,20 @@
             CCoeControl* pNewCtrl= clicked;
             
             if (pOldCtrl != pNewCtrl)
-                {           
+                {
                 // Unfocus the control
                 if ( pOldCtrl )
                     {
-                    CommitFieldL( pOldCtrl );
                     pOldCtrl->SetFocus( EFalse, ENoDrawNow );
                     }
                 pNewCtrl->SetFocus( ETrue, ENoDrawNow );
 
+                // Commit changes to previously focused field.
+                if ( pOldCtrl )
+                    {
+                    CommitFieldL( pOldCtrl );
+                    }
+
                 // If the attachments label has changed focus
                 if ( pOldCtrl == iAttachmentField || pNewCtrl == iAttachmentField )
                     {