--- a/emailuis/emailui/src/ncseditor.cpp	Wed Sep 15 11:52:37 2010 +0300
+++ b/emailuis/emailui/src/ncseditor.cpp	Wed Oct 13 14:11:15 2010 +0300
@@ -28,13 +28,11 @@
 #include <AknsSkinInstance.h>
 #include <aknedsts.h>
 #include <AknsBasicBackgroundControlContext.h>
-#include <centralrepository.h>
 
 #include "ncseditor.h"
 #include "ncsutility.h"
 #include "ncscustomdraw.h"
 #include "ncseditorcustomdraw.h"
-#include "freestyleemailcenrepkeys.h"
 
 // ========================= MEMBER FUNCTIONS ==================================
 
@@ -73,19 +71,6 @@
             CEikEdwin::ENoAutoSelection | CEikEdwin::EInclusiveSizeFixed |
             CEikEdwin::ENoHorizScrolling | CEikRichTextEditor::EPasteAsPlainText );
     
-    CRepository* repository = NULL;
-    TRAPD( err, repository = CRepository::NewL( KFreestyleEmailCenRep ) );
-    if ( !err )
-        {
-        TInt value( 0 );
-        err = repository->Get( KEmailFeatureSplitScreen, value );
-        if( !err && value )
-            {
-            SetAknEditorFlags( AknEditorFlags() | EAknEditorFlagEnablePartialScreen );  
-            }
-        }
-    delete repository;
-    repository = NULL;
     iGlobalCharFormat = CCharFormatLayer::NewL();
     iGlobalCharFormat->SetBase( GlobalText()->GlobalCharFormatLayer() );
     GlobalText()->SetGlobalCharFormat( iGlobalCharFormat );
@@ -129,11 +114,11 @@
 // CNcsEditor::GetLineRectL() const
 // -----------------------------------------------------------------------------
 //
-void CNcsEditor::GetLineRect( TRect& aLineRect ) const
+void CNcsEditor::GetLineRectL( TRect& aLineRect ) const
     {
     FUNC_LOG;
     TPoint position;
-    TRAP_IGNORE( iLayout->DocPosToXyPosL( CursorPos(), position ) );
+    iLayout->DocPosToXyPosL( CursorPos(), position );
     iLayout->GetLineRect( position.iY, aLineRect );
     }
 
@@ -670,10 +655,7 @@
 void CNcsEditor::SetPhysicsEmulationOngoing( TBool aPhysOngoing )
     {
     iPhysOngoing = aPhysOngoing;
-    if ( IsFocused() )
-        {
-        SetCursorVisible( !aPhysOngoing );
-        }
+    this->SetCursorVisible( !aPhysOngoing );
     }
 
 TBool CNcsEditor::IsPhysicsEmulationOngoing() const