diff -r 968773a0b6ef -r c8382f7b54ef emailuis/uicomponents/src/fstreelist.cpp
--- a/emailuis/uicomponents/src/fstreelist.cpp	Tue Sep 14 20:48:24 2010 +0300
+++ b/emailuis/uicomponents/src/fstreelist.cpp	Wed Sep 15 11:52:37 2010 +0300
@@ -20,15 +20,9 @@
 //////SYSTEM INCLUDES
 
 //////TOOLKIT INCLUDES
-// <cmail> SF
 #include "emailtrace.h"
 #include <alf/alfenv.h>
-// </cmail>
 
-//////PROJECT INCLUDES
-//<cmail> removed __FS_ALFRED_SUPPORT flag
-//#include <fsconfig.h>
-//</cmail> removed __FS_ALFRED_SUPPORT flag
 #include "fstreelist.h"
 #include "fstreecontrol.h"
 #include "fstree.h"
@@ -347,6 +341,16 @@
     return iListFocused;
     }
 
+//---------------------------------------------------------------------------
+// 
+//---------------------------------------------------------------------------
+EXPORT_C void CFsTreeList::SetMarkingModeL( const TBool aMarkingMode )
+    {
+    FUNC_LOG;
+    iTreeVisualizer->SetMarkingModeL( aMarkingMode );
+    }
+
+
 // ---------------------------------------------------------------------------
 //  The function sets duration of the slide-in effect.
 // ---------------------------------------------------------------------------
@@ -940,19 +944,16 @@
 //  Retrieves events from tree visualizer
 // ---------------------------------------------------------------------------
 //
-// <cmail> Touch
 EXPORT_C void CFsTreeList::TreeVisualizerEventL(
         const TFsTreeVisualizerEvent aEvent,
         const TFsTreeItemId aId,
         const TPoint& aPoint ) const
-// </cmail>
     {
     FUNC_LOG;
     MFsTreeListObserver::TFsTreeListEvent listEvent;
 
     switch ( aEvent )
     {
-    // <cmail> "Base class modifications for using touch"
     case MFsTreeVisualizerObserver::EFsTreeItemTouchAction:
         {
         listEvent = MFsTreeListObserver::EFsTreeListItemTouchAction;
@@ -968,9 +969,6 @@
         listEvent = MFsTreeListObserver::EFsTreeListItemTouchFocused;
         break;
         }
-
-    // </cmail>
-
     case MFsTreeVisualizerObserver::EFsTreeItemSelected:
         {
         listEvent = MFsTreeListObserver::EFsTreeItemSelected;
@@ -1006,8 +1004,6 @@
         listEvent = MFsTreeListObserver::EFsTreeListItemWillGetFocused;
         break;
         }
-
-    // <cmail>
     // Pass on the collapse/expand events.
     case MFsTreeVisualizerObserver::EFsTreeListItemCollapsed:
         {
@@ -1029,7 +1025,6 @@
         listEvent = MFsTreeListObserver::EFsTreeListExpandedAll;
         break;
         }
-    // </cmail>
     case MFsTreeVisualizerObserver::EFsChangeFocusVisibility:
         {
         listEvent = MFsTreeListObserver::EFsFocusVisibilityChange;