diff -r 8466d47a6819 -r 12c456ceeff2 emailuis/emailui/inc/FreestyleEmailUiLayoutHandler.h
--- a/emailuis/emailui/inc/FreestyleEmailUiLayoutHandler.h	Thu Dec 17 08:39:21 2009 +0200
+++ b/emailuis/emailui/inc/FreestyleEmailUiLayoutHandler.h	Thu Jan 07 12:38:38 2010 +0200
@@ -78,10 +78,10 @@
 		// One line node and item height
 		TInt OneLineListNodeHeight() const;
 		TInt OneLineListItemHeight() const;
+		TInt TwoLineListItemHeight() const;
     	// <cmail>
 		// Folder list item heigh
 		TInt FolderListOneLineItemHeight( const TBool& aFullscreen ) const;
-	    // </cmail>
 		
 		// Mail icon size
 		TSize MailIconSizeInThisResolution() const;
@@ -98,9 +98,8 @@
 		// Scroll pane list item size
 		TSize FolderListItemSizeInThisResolution( const TRect& aParent ) const;
 		
-	    // <cmail>
         // Drop down menu rect
-		TRect DropDownMenuListRect( const TDropDownMenuSide aSide ) const;
+		TRect DropDownMenuListRect( const TDropDownMenuSide aSide, TBool aStretch = ETrue ) const;
     	// </cmail>
 
 		// Folder list pane indentation in pixels
@@ -111,7 +110,7 @@
 
 		// FS Email UI fonts, returns font style. Calling
 		// View may set text visual style using SetTextStyle( CAlfTextStyle.Id() )
-		CAlfTextStyle* FSTextStyleFromIdL( TFSEmailFont aFontId ); // <cmail> const removed due to changes in method
+		CAlfTextStyle* FSTextStyleFromIdL( TFSEmailFont aFontId );
 		
 		// Control bar list padding
 		TPoint ControlBarListPadding() const;
@@ -126,11 +125,6 @@
 		// Control bar height
 		TInt ControlBarHeight() const;
 
-		// <cmail> Platform layout change
-		// Control bar text height
-		//TInt ControlBarTextHeight() const;
-		// </cmail> Platform layout change
-
 		// List fade effect times
         TInt ListFadeInEffectTime() const;
         TInt ListFadeOutEffectTime() const;
@@ -187,8 +181,7 @@
 		// List items font heigjht in twips global zoom level
 		TInt ListItemFontHeightInTwips( const TBool aPopup = EFalse ) const;
 		
- 
-		// Logical font id's for viewer fonts 		
+ 		// Logical font id's for viewer fonts 		
 		TAknLogicalFontId ViewerTitleFontAknLogicalFontId() const;
 		TAknLogicalFontId ViewerTextFontAknLogicalFontId() const;
 
@@ -272,26 +265,15 @@
 		TInt ControlBarArrowTextureXSize() const;
 		TInt ControlBarArrowTextureYSize() const;
 
-// <cmail> Use layout data instead of hardcoded values
 		TRect GetControlBarMailboxIconRect() const;
-		TPoint GetControlBarMailboxIconPos() const;
-		TSize GetControlBarMailboxIconSize() const;
-
+		TRect GetControlBarNewEmailButtonRect() const;
 		TRect GetControlBarFolderListButtonRect() const;
-		TPoint GetControlBarFolderListButtonPos() const;
-		TSize GetControlBarFolderListButtonSize() const;
-
         TRect GetControlBarSortButtonRect() const;
-        TPoint GetControlBarSortButtonPos() const;
-        TSize GetControlBarSortButtonSize() const;
-
         TRect GetControlBarConnectionIconRect() const;
-        TPoint GetControlBarConnectionIconPos() const;
-        TSize GetControlBarConnectionIconSize() const;
 
         TRect GetControlBarRect() const;
 
-        TRect GetListRect() const;
+        TRect GetListRect( TBool aControlsOnTop = EFalse ) const;
 
 		CAlfTextStyle& FSTextStyleFromLayoutL( const TAknTextComponentLayout& aLayout  );
 //<cmail>