--- a/fep/aknfep/src/aknfepuiinputstateminiqwertystrokephrase.cpp	Wed Sep 15 12:34:44 2010 +0300
+++ b/fep/aknfep/src/aknfepuiinputstateminiqwertystrokephrase.cpp	Wed Oct 13 14:55:58 2010 +0300
@@ -127,6 +127,7 @@
             if ( candidatePane->VisibleCandidateCount()!= 1 )
                 {
                 uiContainer->EditPaneWindow()->SetCandidateRefreshFlag( ETrue );
+                iOwner->ChangeState( ECandidate );
                 candidatePane->SelectNext();
                 }
             break;
@@ -136,7 +137,9 @@
             if ( candidatePane->VisibleCandidateCount()!= 1 )
                 {
                 uiContainer->EditPaneWindow()->SetCandidateRefreshFlag( ETrue );
-                candidatePane->SelectPrev();
+                iOwner->ChangeState( ECandidate );
+                TInt numbertotal = UIContainer()->CandidatePane()->VisibleCandidateCount();
+                UIContainer()->CandidatePane()->SelectIndex( numbertotal-1 );
                 }
             break;
             }
@@ -154,7 +157,7 @@
                     {
                     if ( CheckFirstGroupStroke() )
                         {
-                        iOwner->ChangeState( EEntry );
+                        iOwner->ChangeState( ECandidate );
                         }
                     else
                         {
@@ -188,31 +191,6 @@
     return ret;
     }
 
-void TAknFepInputStateEntryMiniQwertyStrokePhrase::SubmitTextL( const TDesC& aText )
-	{
-	MAknFepUICtrlContainerChinese* uiContainer = UIContainer();
-
-	if ( aText.Length())
-	   {
-	   if ( !CommitInlineEEPL( aText ) )
-	      {
-	      DoActionAfterCommit();
-	      }
-	      else
-	          {
-	          if  ( CheckFirstGroupStroke() )
-	              {
-	              iOwner->ChangeState( EEntry );
-	              }
-	          else
-	              {
-	              uiContainer->EditPaneWindow()->SetAutoChangeStateFlag( EAutoChangeStateFromInput );
-	              iOwner->ChangeState( EMiniQwertyEdit );
-	              }
-	          }
-	     }
-	}
-
 // ---------------------------------------------------------------------------
 // TAknFepInputStateEditingMiniQwertyStrokePhrase::TAknFepInputStateEditingMiniQwertyStrokePhrase
 // C++ default constructor
@@ -285,7 +263,7 @@
             if ( 0 != candidatePane->VisibleCandidateCount() )
                 {
                 uiContainer->EditPaneWindow()->SetChangeState( ETrue );
-                iOwner->ChangeState( EEntry );
+                iOwner->ChangeState( ECandidate );
                 }
             break;
             }
@@ -339,10 +317,9 @@
     {
     iState = ECandidate;
     MAknFepUICtrlContainerChinese* uiContainer = UIContainer();
-    uiContainer->CandidatePane()->SelectFirstPhrase();
     uiContainer->FocusCandidatePane( ETrue );
     uiContainer->CandidatePane()->ShowCandidateOrdinals( ETrue );
-    
+    uiContainer->CandidatePane()->SelectFirstPhrase();
     if ( uiContainer->EditPaneWindow()->GetCandidateRefreshFlag() )
         {
         uiContainer->EditPaneWindow()->DisableCursor();
@@ -503,31 +480,6 @@
         }
     }
 
-void TAknFepInputStateEditingMiniQwertyStrokePhrase::SubmitTextL( const TDesC& aText )
-	{
-	MAknFepUICtrlContainerChinese* uiContainer = UIContainer();
-	if ( aText.Length() )
-	    {
-	    if ( !CommitInlineEEPL( aText ) )
-	        {
-	        DoActionAfterCommit();
-	        }
-	    else
-	        {
-	        if ( CheckFirstGroupStroke() )
-	           {
-	           RefreshUI();
-	           uiContainer->CandidatePane()->SelectFirstPhrase();
-	           }
-	       else
-	           {
-	           uiContainer->EditPaneWindow()->SetAutoChangeStateFlag(
-	                        EAutoChangeStateFromCandidate );
-	           iOwner->ChangeState( EMiniQwertyEdit );
-	           }
-	        }
-	   }
-	}
 
 // ---------------------------------------------------------------------------
 // TAknFepInputStateEntryMiniQwertyStrokePhrase::HandleCommandL
@@ -553,7 +505,7 @@
                     {
                     if ( CheckFirstGroupStroke() )
                         {
-                        iOwner->ChangeState( EMiniQwertyEdit );
+                        iOwner->ChangeState( ECandidate );
                         }
                     else
                         {
@@ -611,29 +563,3 @@
             break;
         }
     }
-
-void TAknFepUiInputStateCandidateMiniQwertyStrokePhrase::SubmitTextL( const TDesC& aText )
-	{
-	MAknFepUICtrlContainerChinese* uiContainer = UIContainer();
-	if ( aText.Length() )
-	    {
-	    if ( !CommitInlineEEPL( aText ) )
-	        {
-	        DoActionAfterCommit();
-	        }
-	    else
-	        {
-	        if ( CheckFirstGroupStroke() )
-	           {
-	           RefreshUI();
-	           uiContainer->CandidatePane()->SelectFirstPhrase();
-	           }
-	           else
-	               {
-	               uiContainer->EditPaneWindow()->SetAutoChangeStateFlag(
-	                            EAutoChangeStateFromCandidate );
-	               iOwner->ChangeState( EMiniQwertyEdit );
-	               }
-	            }
-	   }
-	}