diff -r c8382f7b54ef -r 726fba06891a emailuis/emailui/inc/ncscomposeviewcontainer.h
--- a/emailuis/emailui/inc/ncscomposeviewcontainer.h	Wed Sep 15 11:52:37 2010 +0300
+++ b/emailuis/emailui/inc/ncscomposeviewcontainer.h	Wed Oct 13 14:11:15 2010 +0300
@@ -100,12 +100,6 @@
     void UpdateScrollBar();
 
     /**
-    * Updates scroll visibility.
-    * @param aVisible Whether or not to set scroll bar visible.
-    */
-    void UpdateScrollBarVisibility( TBool aVisible );
-    
-    /**
     * GetToFieldAddressesL
     * Get addresses in TO-field.
     * @return Array of address objects.
@@ -478,8 +472,14 @@
     * HandleAttachmentsOpenCommand
     * 
     */
-    void HandleAttachmentsOpenCommandL();
-		
+    void HandleAttachmentOpenCommandL();
+
+    /**
+     * HandleAttachmentRemoveCommandL
+     * Handles removing of currently focused attachment 
+     */
+    void HandleAttachmentRemoveCommandL();
+
     /**
     * LaunchStylusPopupMenu
     * 
@@ -497,10 +497,8 @@
     void HandleLayoutChangeL();
     
     void HandleSkinChangeL();
-
+    
     TInt ContentTotalHeight();
-    TInt VisibleAreaHeight();
-
     /**
     * CommitL
     * Commits changes to message
@@ -531,7 +529,7 @@
      * Called when text formatting was cancelled.
      */
     void FormatAllTextCancelled();
-
+    
     /**
      * Called when text formatting is complete. 
      */
@@ -642,13 +640,13 @@
     * @return Indicates whether the key event was used by this control.
     */
     TKeyResponse ChangeFocusL( const TKeyEvent& aKeyEvent );
-
+        
     /**
-    * UpdateScreenPosition
+    * UpdateScreenPositionL
     * @param aKeyCode Needed to recognize presses of the enter key
     *                 in moving of display.
     */
-    void UpdateScreenPosition( const TUint& aKeyCode = EKeyNull );
+    void UpdateScreenPositionL( const TUint& aKeyCode = EKeyNull );
 
     /**
      * CalculateSeparatorLineSecondaryColor
@@ -780,18 +778,17 @@
      * Currently processed field - needed by async text formatting.
      */
     CNcsEditor* iProcessedField;
-
+    
     /**
      * Async text formatter.
      * Own.
      */
     CFSAsyncTextFormatter* iAsyncTextFormatter;
-
-    // Cmail pane rect, calculated during SizeChanged.
+    
+    /**
+     * Pane rect calculated during ChangeSize.
+     */
     TRect iCmailPaneRect;
-    // Header origin, calculated during SizeChanged.
-    TPoint iHeaderPos;
-
     };