--- a/uifw/eikctl/src/EIKSECED.CPP	Wed Sep 15 12:29:17 2010 +0300
+++ b/uifw/eikctl/src/EIKSECED.CPP	Wed Oct 13 14:50:15 2010 +0300
@@ -283,15 +283,6 @@
         delete listener;
         }
 #endif
-	// When destruct secret editor, inform FEP that secret editor has been destroyed ,
-    // so FEP can get opportunity to do some clean work, e.g. closing opened SCT dialog.
-    if ( iFepState )
-    	{
-        TRAP_IGNORE( 
-            static_cast<CAknEdwinState*>( iFepState )->ReportAknEdStateEventL( 
-	            MAknEdStateObserver::EAknEdwinDestroy ) 
-            );
-    	}
     delete iInlineEditText;
     delete iFepState;
     delete iTimer;
@@ -951,8 +942,7 @@
     editorState->SetFlags( EAknEditorFlagNoLRNavigation |
                            EAknEditorFlagLatinInputModesOnly |
                            EAknEditorFlagNoT9 |
-                           EAknEditorFlagUseSCTNumericCharmap |
-                           EAknEditorFlagAvkonSecretEditor );
+                           EAknEditorFlagUseSCTNumericCharmap );
 
     editorState->SetDefaultInputMode(EAknEditorSecretAlphaInputMode);
     editorState->SetCurrentInputMode(EAknEditorSecretAlphaInputMode);
@@ -1218,7 +1208,7 @@
     TInt textWidth( iRevealSecretText ? 
         iFont->TextWidthInPixels( *iSecCharArr ) : 
         iFont->CharWidthInPixels( KSecretChar ) * pos );
-    TInt x( 0 );
+    TInt x;
     if ( iExtension )
     	{
 		if ( iAlign == CGraphicsContext::ELeft )
@@ -1288,11 +1278,11 @@
         TInt flags( edwinState->Flags() );
         if ( aEnable )
             {
-            flags |= EAknEditorFlagTextCursorVisible;
+            flags &= ~EEikEdwinAvkonDisableCursor;
             }
         else
             {
-            flags &= ~EAknEditorFlagTextCursorVisible;
+            flags |= EEikEdwinAvkonDisableCursor;
             }
         edwinState->SetFlags( flags );
         }