diff -r c8382f7b54ef -r 726fba06891a emailuis/uicomponents/src/fstreelist.cpp
--- a/emailuis/uicomponents/src/fstreelist.cpp	Wed Sep 15 11:52:37 2010 +0300
+++ b/emailuis/uicomponents/src/fstreelist.cpp	Wed Oct 13 14:11:15 2010 +0300
@@ -20,9 +20,15 @@
 //////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"
@@ -341,16 +347,6 @@
     return iListFocused;
     }
 
-//---------------------------------------------------------------------------
-// 
-//---------------------------------------------------------------------------
-EXPORT_C void CFsTreeList::SetMarkingModeL( const TBool aMarkingMode )
-    {
-    FUNC_LOG;
-    iTreeVisualizer->SetMarkingModeL( aMarkingMode );
-    }
-
-
 // ---------------------------------------------------------------------------
 //  The function sets duration of the slide-in effect.
 // ---------------------------------------------------------------------------
@@ -944,16 +940,19 @@
 //  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;
@@ -969,6 +968,9 @@
         listEvent = MFsTreeListObserver::EFsTreeListItemTouchFocused;
         break;
         }
+
+    // </cmail>
+
     case MFsTreeVisualizerObserver::EFsTreeItemSelected:
         {
         listEvent = MFsTreeListObserver::EFsTreeItemSelected;
@@ -1004,6 +1006,8 @@
         listEvent = MFsTreeListObserver::EFsTreeListItemWillGetFocused;
         break;
         }
+
+    // <cmail>
     // Pass on the collapse/expand events.
     case MFsTreeVisualizerObserver::EFsTreeListItemCollapsed:
         {
@@ -1025,6 +1029,7 @@
         listEvent = MFsTreeListObserver::EFsTreeListExpandedAll;
         break;
         }
+    // </cmail>
     case MFsTreeVisualizerObserver::EFsChangeFocusVisibility:
         {
         listEvent = MFsTreeListObserver::EFsFocusVisibilityChange;