diff -r 12c456ceeff2 -r 5253a20d2a1e emailuis/emailui/inc/ncscomposeviewcontainer.h
--- a/emailuis/emailui/inc/ncscomposeviewcontainer.h	Thu Jan 07 12:38:38 2010 +0200
+++ b/emailuis/emailui/inc/ncscomposeviewcontainer.h	Mon Jan 18 20:08:26 2010 +0200
@@ -29,10 +29,7 @@
 #include "ncsconstants.h"
 #include "FreestyleEmailUiContactHandlerObserver.h"
 #include "FreestyleEmailUi.hrh"
-
-//<cmail>
 #include <aknlongtapdetector.h>
-//</cmail>
 
 class CAknPhysics;
 class CNcsEditor;
@@ -76,7 +73,7 @@
 
     /**
     * Two-phased constructor.
-    * Create a CNcsComposeViewContainer object, which will draw itself to aRect
+    * Create a CNcsComposeViewContainer object, that draws itself to aRect
     * @param aView The parent view of this container.
     * @param aRect The rectangle this view will be drawn to.
     * @param aMailBox reference to current mailbox item.
@@ -105,21 +102,24 @@
     * Get addresses in TO-field.
     * @return Array of address objects.
     */
-    const RPointerArray<CNcsEmailAddressObject>& GetToFieldAddressesL( TBool aParseNow=ETrue );
+    const RPointerArray<CNcsEmailAddressObject>& 
+    GetToFieldAddressesL( TBool aParseNow=ETrue );
 
     /**
     * GetCcFieldAddressesL
     * Get addresses in CC-field.
     * @return Array of address objects.
     */
-    const RPointerArray<CNcsEmailAddressObject>& GetCcFieldAddressesL( TBool aParseNow=ETrue );
+    const RPointerArray<CNcsEmailAddressObject>& 
+    GetCcFieldAddressesL( TBool aParseNow=ETrue );
 
     /**
     * GetBccFieldAddressesL
     * Get addresses in BCC-field.
     * @return Array of address objects.
     */
-    const RPointerArray<CNcsEmailAddressObject>& GetBccFieldAddressesL( TBool aParseNow=ETrue );
+    const RPointerArray<CNcsEmailAddressObject>& 
+    GetBccFieldAddressesL( TBool aParseNow=ETrue );
 
     /**
     * GetSubjectLC
@@ -210,42 +210,48 @@
     * Set TO-field addresses.
     * @param aAddress Array of address objects.
     */
-    void SetToFieldAddressesL( RPointerArray<CNcsEmailAddressObject>& aAddress );
+    void SetToFieldAddressesL( 
+            RPointerArray<CNcsEmailAddressObject>& aAddress );
 
     /**
     * SetCcFieldAddressesL
     * Set CC-field addresses.
     * @param aAddress Array of address objects.
     */
-    void SetCcFieldAddressesL( RPointerArray<CNcsEmailAddressObject>& aAddress );
+    void SetCcFieldAddressesL( 
+            RPointerArray<CNcsEmailAddressObject>& aAddress );
 
     /**
     * SetBccFieldAddressesL
     * Set BCC-field addresses.
     * @param aAddress Array of address objects.
     */
-    void SetBccFieldAddressesL( RPointerArray<CNcsEmailAddressObject>& aAddress );
+    void SetBccFieldAddressesL( 
+            RPointerArray<CNcsEmailAddressObject>& aAddress );
 
     /**
     * AppendToFieldAddressesL
     * Append TO-field addresses.
     * @param aAddress Array of address objects.
     */
-    void AppendToFieldAddressesL( RPointerArray<CNcsEmailAddressObject>& aAddress );
+    void AppendToFieldAddressesL( 
+            RPointerArray<CNcsEmailAddressObject>& aAddress );
 
     /**
     * AppendCcFieldAddressesL
     * Append CC-field addresses.
     * @param aAddress Array of address objects.
     */
-    void AppendCcFieldAddressesL( RPointerArray<CNcsEmailAddressObject>& aAddress );
+    void AppendCcFieldAddressesL( 
+            RPointerArray<CNcsEmailAddressObject>& aAddress );
 
     /**
     * AppendBccFieldAddressesL
     * Append BCC-field addresses.
     * @param aAddress Array of address objects.
     */
-    void AppendBccFieldAddressesL( RPointerArray<CNcsEmailAddressObject>& aAddress );
+    void AppendBccFieldAddressesL( 
+            RPointerArray<CNcsEmailAddressObject>& aAddress );
 
     /**
     * SetSubjectL
@@ -278,24 +284,32 @@
     void SetMenuBar( CEikButtonGroupContainer* aMenuBar );
 
     /**
-    * SetAttachmentLabelTextL
-    * Set attachments label information.
-    * @param aText The text to be shown in the attachments label.
-    */
-    void SetAttachmentLabelTextL( const TDesC& aText );
+     * SetAttachmentLabelTextsL
+     * Set attachment label informations from arrays of file name and
+     * size informations. Some decorations may be added. 
+     * The file name will be truncated autoamtically if needed.
+     * The method takes ownership of the passed arrays.
+     * @param  aAttachmentNames Descriptor array containing file names.
+     * @param  aAttachmentSizes Descriptor array containing file sizes.
+     */
+    void SetAttachmentLabelTextsLD( CDesCArray* aAttachmentNames, 
+                                    CDesCArray* aAttachmentSizes );
 
     /**
-    * SetAttachmentLabelTextL
-    * Set attachments label information from file name and size information.
-    * Some decorations may be added. The file name will be truncated autoamtically if needed.
-    * @param    aAttachmentName     The name of the attachment to be shown
-    * @param    aAttachmentSizeDesc Descriptor containing size information about the file
-    */
-    void SetAttachmentLabelTextL( const TDesC& aAttachmentName, const TDesC& aAttachmentSizeDesc );
-
+     * FocusedAttachmentLabelIndex
+     * Returns the index of the attachment label that is currently focused
+     * @return Index of the focused attachment label.
+     */
+    TInt FocusedAttachmentLabelIndex();
+    
+    /**
+     * FixSemicolonL
+     * Fixes possibly missing semicolon in message header address fields.
+     */
     void FixSemicolonL();
     
     void HideAttachmentLabel();
+ 
     /**
     * IsCcFieldVisible
     * Test if CC-field is visible.
@@ -310,9 +324,6 @@
     */
     TBool IsBccFieldVisible() const;
 
-// <cmail> Removed unneeded IsFocusAif
-// </cmail>
-
     /**
     * IsFocusTo
     * Test if TO-field is focused.
@@ -384,15 +395,6 @@
     CRichText& BodyText();
 
     /**
-    * SetApplicationRect
-    * Sets the container rectangle.
-    * @param aRect The rectangle.
-    */
-	// <cmail>
-    // void SetApplicationRect( TRect aRect );
-	// </cmail>
-
-    /**
     * SetFocusToToField
     * Focuses the TO-field.
     */
@@ -464,10 +466,10 @@
     void HandleAttachmentsOpenCommandL();
 		
     /**
-    * LaunchAttachmentActionMenuL
+    * LaunchStylusPopupMenu
     * 
     */
-    void LaunchAttachmentActionMenuL();
+    void LaunchStylusPopupMenu( const TPoint& aPenEventScreenLocation );
     
     /**
     * AreAddressFieldsEmpty
@@ -488,10 +490,12 @@
     */
     void CommitL( TFieldToCommit aFieldToCommit = EAllFields );
 
-    //<cmail>
-    //sets up iSwitchChangeMskOff falg, which disables changes of MSK label if any popup dialog is open
+    /**
+     * SwitchChangeMskOff
+     * Sets up iSwitchChangeMskOff falg, which disables changes of MSK label
+     * if any popup dialog is open
+     */
     void SwitchChangeMskOff(TBool aTag);
-    //</cmail>
     
     /**
      * ScrollL
@@ -501,22 +505,20 @@
     
 public: // from CoeControl
 
-        /**
-        * Draw
-        * Draw this CNcsComposeViewContainer to the screen.
-        * @param aRect the rectangle of this view that needs updating
-        */
+    /**
+    * Draw
+    * Draw this CNcsComposeViewContainer to the screen.
+    * @param aRect the rectangle of this view that needs updating
+    */
     void Draw( const TRect& aRect ) const;
     
     void SetMskL();
     
-	//<cmail>
     /**
     * Handle pointer event
     * 
     */
     void HandlePointerEventL( const TPointerEvent& aPointerEvent );
-    //</cmail>
 	
     /**
     * OfferKeyEventL
@@ -553,10 +555,11 @@
     
 public: // from MEikScrollBarObserver
     
-        /**
-        * HandleScrollEventL
-        */
-    void HandleScrollEventL( CEikScrollBar* aScrollBar, TEikScrollEvent aEventType );
+    /**
+    * HandleScrollEventL
+    */
+    void HandleScrollEventL( 
+            CEikScrollBar* aScrollBar, TEikScrollEvent aEventType );
 
 public: // from MFSEmailUiContactHandlerObserver
 
@@ -570,17 +573,17 @@
 
 public: // from base class MEikEdwinSizeObserver
     
-    TBool HandleEdwinSizeEventL( CEikEdwin* aEdwin, TEdwinSizeEvent aEventType, TSize aDesirableEdwinSize );
+    TBool HandleEdwinSizeEventL( CEikEdwin* aEdwin, 
+            TEdwinSizeEvent aEventType, TSize aDesirableEdwinSize );
     
 public:  // from MNcsFieldSizeObserver
 
     TBool UpdateFieldSizeL();
     void UpdateFieldPosition( CCoeControl* aAnchor );
 
-    //<cmail>
 private:  //From MAknLongTapDetectorCallBack
-    void HandleLongTapEventL( const TPoint& aPenEventLocation, const TPoint& aPenEventScreenLocation );
-    //</cmail>
+    void HandleLongTapEventL( const TPoint& aPenEventLocation, 
+            const TPoint& aPenEventScreenLocation );
     
 private:
     
@@ -612,9 +615,13 @@
     *                 in moving of display.
     */
     void UpdateScreenPositionL( const TUint& aKeyCode = EKeyNull );
-    //<cmail>
+
+    /**
+     * CalculateSeparatorLineSecondaryColor
+     * @return Separator line secondary color
+     */
     TRgb CalculateSeparatorLineSecondaryColor();
-    //</cmail>
+    
     void UpdatePhysicsL();
 
 private: // from MAknPhysicsObserver
@@ -622,7 +629,8 @@
    /**
     * @see MAknPhysicsObserver::ViewPositionChanged
     */
-   virtual void ViewPositionChanged( const TPoint& aNewPosition, TBool aDrawNow, TUint aFlags );
+   virtual void ViewPositionChanged( const TPoint& aNewPosition, 
+           TBool aDrawNow, TUint aFlags );
 
    /**
     * @see MAknPhysicsObserver::PhysicEmulationEnded
@@ -656,9 +664,11 @@
     */
     CCoeControl* iFocused;
     
-    //<cmail>
+    /**
+     * Long tap detector.
+     * Owned.
+     */
     CAknLongTapDetector* iLongTapDetector;
-    //</cmail>
     
     /**
     *
@@ -700,9 +710,8 @@
     CFSMailBox& iMailBox;
 		
     TAppendAddresses iAppendAddresses;
-    //<cmail>
+
     TInt iSeparatorLineYPos;
-    //</cmail>
     
     // panning related
     CAknPhysics* iPhysics;