diff -r 578830873419 -r ecc8def7944a emailservices/emailcommon/inc/CFSMailMessage.h
--- a/emailservices/emailcommon/inc/CFSMailMessage.h	Fri Apr 16 14:51:52 2010 +0300
+++ b/emailservices/emailcommon/inc/CFSMailMessage.h	Mon May 03 12:23:15 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2007-2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2008 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -43,7 +43,7 @@
      * @param aMessageId message id in plugin containing email
      */
      IMPORT_C static CFSMailMessage* NewL( TFSMailMsgId aMessageId );
-
+    
     /**
      * Two-phased constructor.
      *
@@ -51,19 +51,21 @@
      */
      IMPORT_C static CFSMailMessage* NewLC( TFSMailMsgId aMessageId );
 
+// <qmail>
      /**
       * Two-phased constructor.
       *
       * @param aMessageId message id in plugin containing email
       */
       IMPORT_C static CFSMailMessage* NewL( const NmMessage &aMessage );
+// </qmail>
 
     /**
      * saves this message
      */
      IMPORT_C void SaveMessageL();
 
-     //<qmail>
+// <qmail>
     /**
      * saves this message asynchronously
      */
@@ -74,99 +76,99 @@
      */
     IMPORT_C TInt SaveMessagePartsL(
             MFSMailRequestObserver& aOperationObserver);
-    //</qmail>
+// </qmail>
 
     /**
      * destructor
-     */
+     */  
      IMPORT_C ~CFSMailMessage();
 
     /**
      * Adds new attachment to this email.
-     *
+     * 
      * @param aFilePath contains full path to new attachment file.
      * @param aInsertBefore specifies position where new attachment is created.
      *        If NullId then new attachment is created as last.
      *
      * @return new email part object, ownership is transferred to user
-     */
+     */ 
      IMPORT_C CFSMailMessagePart* AddNewAttachmentL( const TDesC& aFilePath,
                                                      const TFSMailMsgId aInsertBefore);
 
-     // <qmail>
+// <qmail>
      /**
       * Adds new attachment to this email asynchronously
       */
      IMPORT_C TInt AddNewAttachmentL( const TDesC& aFilePath,
                                       MFSMailRequestObserver& aOperationObserver);
-     // </qmail>
+// </qmail>
      
      /**
       * Adds new attachment to this email.
-      *
+      * 
       * @param aFile contains access to new attachment file.
       * @param aMimeType user can give content type of the new part,
       *        otherwise content type is tried to recognized by method
       *
       * @return new email part object, ownership is transferred to user
-      */
-     IMPORT_C CFSMailMessagePart* AddNewAttachmentL( RFile& aFile,
+      */ 
+     IMPORT_C CFSMailMessagePart* AddNewAttachmentL( RFile& aFile, 
                                                      const TDesC8& aMimeType );
 
      /**
-   * Returns a flat list of message parts that can be handled as attachments.
-   * Excludes message parts that are multipart and parts that are considered
-   * plain text or html body.
-   *
-   * @param aParts contains flat list of attachments
-   */
-   IMPORT_C void AttachmentListL(RPointerArray<CFSMailMessagePart>& aParts);
+     * Returns a flat list of message parts that can be handled as attachments.
+     * Excludes message parts that are multipart and parts that are considered
+     * plain text or html body.
+     * 
+     * @param aParts contains flat list of attachments
+     */        
+     IMPORT_C void AttachmentListL(RPointerArray<CFSMailMessagePart>& aParts);
 
-   //<qmail>
+// <qmail>
     /**
      * Returns plain text body part for this email or NULL if not found.
-     *
+     * 
      * @return plain text email body part, ownership is transferred to user
-     */
+     */        
     IMPORT_C CFSMailMessagePart* PlainTextBodyPartL(
             TFSMailMessagePartDataSource aDataSource =
                     EDataSourceMessageStore);
 
     /**
      * Returns html body part for this message or NULL if not found.
-     *
+     * 
      * @return html email body part, ownership is transferred to user
-     */
+     */        
     IMPORT_C CFSMailMessagePart* HtmlBodyPartL(
             TFSMailMessagePartDataSource aDataSource =
                     EDataSourceMessageStore);
-    //</qmail>
+// </qmail>
 
     /**
      * Returns ETrue if this part is actually a message.
      * In that case it shoud safe to cast this part to CFSMailMessage
-     *
+     * 
      * @return true if this message part is a message
-     */
-   IMPORT_C TBool IsMessageL() const;
+     */        
+     IMPORT_C TBool IsMessageL() const;
 
-   /**
+     /**
      * Returns a flat list of message parts that can be handled as attachments.
      * Excludes message parts that are multipart and parts that are considered
      * plain text or html body.
-     *
+     * 
      * @param aParts contains flat list of attachments
-     */
+     */        
      void DoAttachmentListL(RPointerArray<CFSMailMessagePart>& aParts);
 
-    //<qmail>
+// <qmail>
     /**
      * gets the new NmMessage object
      *
      * @return NmMessage object based on iNmPrivateMessagePart and iNmPrivateMessageEnvelope
      */
     IMPORT_C NmMessage* GetNmMessage();
-    //</qmail>
+// </qmail>
 
  protected:
 
@@ -182,18 +184,20 @@
      */
      void ConstructL( TFSMailMsgId aMessageId );
 
+// <qmail>
      /**
       * Two-phased constructor
       */
       void ConstructL( const NmMessage &aMessage );
+// </qmail>
 
     /**
      * Returns content-type parameters and their associated values.
      * This function is made private to prevent usage from CFSMailMessage
-     *
+     * 
      * @return content type parameters
      */
-  CDesCArray& ContentTypeParameters();
+    CDesCArray& ContentTypeParameters();
 
  private: // data
     //<qmail>