diff -r 3533d4323edc -r 968773a0b6ef emailuis/emailui/inc/FreestyleEmailUiMailListVisualiser.h
--- a/emailuis/emailui/inc/FreestyleEmailUiMailListVisualiser.h	Wed Sep 01 12:28:57 2010 +0100
+++ b/emailuis/emailui/inc/FreestyleEmailUiMailListVisualiser.h	Tue Sep 14 20:48:24 2010 +0300
@@ -573,7 +573,7 @@
 	// Control bar functions
 	void CreateControlBarLayoutL();
 	void ScaleControlBarL();
-	void SetSortButtonTextAndIconL();
+	void SetSortButtonIconL();
 	HBufC* GetSortButtonTextLC();
     void HandleControlBarEvent( TFsControlBarEvent aEvent, TInt aData );
 
@@ -647,12 +647,12 @@
     /**
      * Display marking mode title text
      */ 
-    void DisplayMarkingModeTitleTextL();
+    void DisplayMarkingModeTextOnButtonsL();
     
     /**
      * Remove marking mode title text
      */ 
-    void RemoveMarkingModeTitleTextL();
+    void RemoveMarkingModeTextOnButtonsL();
 
     /**
      * Displays or remove marking mode background
@@ -805,11 +805,6 @@
     void FocusVisibilityChange( TBool aVisible );
 
     /**
-     * Update texts in command area buttons
-     */
-    void UpdateButtonTextsL();
-
-    /**
      * Tests whether a point is inside the control.
      *
      * @param aControl  Control that is tested.
@@ -842,7 +837,9 @@
      */
     TBool HandleArrowEventInLandscapeL( const TInt aScancode,
             const TAlfEvent& aEvent, const TBool aShiftState );
-
+    
+    void UpdateFolderAndMarkingModeTextsL();
+    
 private: // data types