--- a/emailuis/emailui/src/ncsheadercontainer.cpp	Mon Mar 15 12:39:10 2010 +0200
+++ b/emailuis/emailui/src/ncsheadercontainer.cpp	Wed Mar 31 21:08:33 2010 +0300
@@ -227,6 +227,7 @@
 		CCoeControlArray::TCursor cur = Components().End();
 		cur.Prev();
 		cur.Control<CCoeControl>()->SetFocus( ETrue, aDrawNow );
+        iFocused = cur.Control<CCoeControl>();
 		}
 	}
 
@@ -961,6 +962,7 @@
 				focused->SetFocus( EFalse );
 				}
 			iBccField->SetFocus( ETrue );
+            iFocused = iBccField;
 			iBccField->SelectAllTextL();
 			}
 		}
@@ -977,6 +979,7 @@
 			cur.Control<CCoeControl>()->SetFocus( ETrue );
 			}
 		Components().Remove( iBccField );
+        iFocused = iSubjectField;
 		}
 
     TRAP_IGNORE( iFieldSizeObserver.UpdateFieldSizeL() );
@@ -1012,6 +1015,7 @@
 				focused->SetFocus( EFalse );
 				}
 			iCcField->SetFocus( ETrue );
+            iFocused = iCcField;
 			iCcField->SelectAllTextL();
 			}
 		}
@@ -1023,6 +1027,7 @@
 			iToField->SetFocus( ETrue );
 			}
 		Components().Remove( iCcField );
+        iFocused = iToField;
 		}
     
 	TRAP_IGNORE( iFieldSizeObserver.UpdateFieldSizeL() );