diff -r d189ee25cf9d -r 3533d4323edc emailservices/emailclientapi/src/emailtextcontent.cpp
--- a/emailservices/emailclientapi/src/emailtextcontent.cpp	Tue Aug 31 15:04:17 2010 +0300
+++ b/emailservices/emailclientapi/src/emailtextcontent.cpp	Wed Sep 01 12:28:57 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2009 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"
@@ -25,6 +25,7 @@
 // -----------------------------------------------------------------------------
 // 
 // -----------------------------------------------------------------------------
+//
 CEmailTextContent* CEmailTextContent::NewL( 
         CPluginData& aPluginData,
         const TMessageContentId& aMsgContentId,
@@ -34,13 +35,14 @@
     CEmailTextContent* self = new ( ELeave ) CEmailTextContent( aOwner );
     CleanupStack::PushL( self );
     self->ConstructL( aPluginData, aMsgContentId, aPart );
-    CleanupStack::Pop( self );
+    CleanupStack::Pop();
     return self;
     }
 
 // -----------------------------------------------------------------------------
 // 
 // -----------------------------------------------------------------------------
+//
 void CEmailTextContent::ConstructL(
         CPluginData& aPluginData,
         const TMessageContentId& aMsgContentId,
@@ -50,30 +52,32 @@
     TContentType contentType( aPart->GetContentType() );
     if ( contentType.Equals( KFSMailContentTypeTextHtml ) )
         {
-        iTextType = EHtmlText;
+        iTextType = EHtmlText;        
         }
     }
 
+
+// -----------------------------------------------------------------------------
+// 
+// -----------------------------------------------------------------------------
+//
+CEmailTextContent::~CEmailTextContent()
+    {    
+    delete iEmailMsgContent;    
+    }
+
 // -----------------------------------------------------------------------------
 // 
 // -----------------------------------------------------------------------------
-CEmailTextContent::~CEmailTextContent()
-    {
-    delete iEmailMsgContent;
-    }
-
-// -----------------------------------------------------------------------------
-// 
-// -----------------------------------------------------------------------------
-CEmailTextContent::CEmailTextContent( TDataOwner aOwner ) : 
-    iTextType( EPlainText ), 
-    iOwner( aOwner )
+//
+CEmailTextContent::CEmailTextContent( TDataOwner aOwner ) : iTextType(EPlainText), iOwner( aOwner )        
     {
     }
 
 // -----------------------------------------------------------------------------
 // 
 // -----------------------------------------------------------------------------
+//
 TEmailTypeId CEmailTextContent::InterfaceId() const
     {
     return KEmailIFUidTextContent;
@@ -82,10 +86,11 @@
 // -----------------------------------------------------------------------------
 // 
 // -----------------------------------------------------------------------------
+//
 void CEmailTextContent::Release()
     {
     if ( iOwner == EClientOwns )
-        {
+        {    
         delete this;
         }
     }
@@ -93,20 +98,22 @@
 // -----------------------------------------------------------------------------
 // 
 // -----------------------------------------------------------------------------
+//
 MEmailTextContent::TTextType CEmailTextContent::TextType() const
-    {
+    {    
     return iTextType;
     }
 
 // -----------------------------------------------------------------------------
 // 
 // -----------------------------------------------------------------------------
+//
 void CEmailTextContent::SetTextL(
             const TTextType aPlainOrHtml,
             const TDesC& aText )
     {    
     iTextType = aPlainOrHtml;
-
+    
     if( aPlainOrHtml == EPlainText )
         {
         SetContentType( KContentTypeTextPlain );
@@ -121,6 +128,7 @@
 // -----------------------------------------------------------------------------
 // 
 // -----------------------------------------------------------------------------
+//
 TMessageContentId CEmailTextContent::Id() const
     {
     return iEmailMsgContent->Id(); 
@@ -129,6 +137,7 @@
 // -----------------------------------------------------------------------------
 // 
 // -----------------------------------------------------------------------------
+//
 TPtrC CEmailTextContent::ContentType() const
     {
     return iEmailMsgContent->ContentType();
@@ -137,6 +146,7 @@
 // -----------------------------------------------------------------------------
 // 
 // -----------------------------------------------------------------------------
+//
 void CEmailTextContent::SetContentType( const TDesC& aContentType )
     {
     iEmailMsgContent->SetContentType( aContentType );
@@ -145,38 +155,43 @@
 // -----------------------------------------------------------------------------
 // 
 // -----------------------------------------------------------------------------
+//
 TPtrC CEmailTextContent::ContentId() const
     {
-    return iEmailMsgContent->ContentId();
+    return iEmailMsgContent->ContentId();    
     }
 
 // -----------------------------------------------------------------------------
 // 
 // -----------------------------------------------------------------------------
+//
 void CEmailTextContent::SetContentId( const TDesC& aContentId )
     {
-    iEmailMsgContent->SetContentId( aContentId );
+    iEmailMsgContent->SetContentId(aContentId);
     }
 
 // -----------------------------------------------------------------------------
 // 
 // -----------------------------------------------------------------------------
+//
 TPtrC CEmailTextContent::ContentDescription() const
     {
-    return iEmailMsgContent->ContentDescription();
+    return iEmailMsgContent->ContentDescription();    
     }
 
 // -----------------------------------------------------------------------------
 // 
 // -----------------------------------------------------------------------------
+//
 void CEmailTextContent::SetContentDescription( const TDesC& aContentDescription )
     {
-    iEmailMsgContent->SetContentDescription( aContentDescription );
+    iEmailMsgContent->SetContentDescription(aContentDescription);
     }
 
 // -----------------------------------------------------------------------------
 // 
 // -----------------------------------------------------------------------------
+//
 TPtrC CEmailTextContent::ContentDisposition() const
     {
     return iEmailMsgContent->ContentDisposition();
@@ -185,14 +200,16 @@
 // -----------------------------------------------------------------------------
 // 
 // -----------------------------------------------------------------------------
+//
 void CEmailTextContent::SetContentDisposition( const TDesC& aContentDisposition )
     {
-    iEmailMsgContent->SetContentDisposition( aContentDisposition );
+    iEmailMsgContent->SetContentDisposition(aContentDisposition);
     }
 
 // -----------------------------------------------------------------------------
 // 
 // -----------------------------------------------------------------------------
+//
 TPtrC CEmailTextContent::ContentClass() const
     {
     return iEmailMsgContent->ContentClass();
@@ -201,14 +218,16 @@
 // -----------------------------------------------------------------------------
 // 
 // -----------------------------------------------------------------------------
+//
 void CEmailTextContent::SetContentClass( const TDesC& aContentClass )
     {
-    iEmailMsgContent->SetContentClass( aContentClass );
+    iEmailMsgContent->SetContentClass(aContentClass);
     }
 
 // -----------------------------------------------------------------------------
 // 
 // -----------------------------------------------------------------------------
+//
 TInt CEmailTextContent::AvailableSize() const
     {
     return iEmailMsgContent->AvailableSize();
@@ -217,6 +236,7 @@
 // -----------------------------------------------------------------------------
 // 
 // -----------------------------------------------------------------------------
+//
 TInt CEmailTextContent::TotalSize() const
     {
     return iEmailMsgContent->TotalSize();
@@ -225,6 +245,7 @@
 // -----------------------------------------------------------------------------
 // 
 // -----------------------------------------------------------------------------
+//
 TPtrC CEmailTextContent::ContentL() const
     {
     return iEmailMsgContent->ContentL();
@@ -233,6 +254,7 @@
 // -----------------------------------------------------------------------------
 // 
 // -----------------------------------------------------------------------------
+//
 void CEmailTextContent::SetContentL( const TDesC& aContent )
     {
     iEmailMsgContent->SetContentL( aContent );
@@ -241,14 +263,16 @@
 // -----------------------------------------------------------------------------
 // 
 // -----------------------------------------------------------------------------
+//
 void CEmailTextContent::FetchL( MEmailFetchObserver& aObserver )
     {
-    iEmailMsgContent->FetchL( aObserver );
+    iEmailMsgContent->FetchL(aObserver);
     }
 
 // -----------------------------------------------------------------------------
 // 
 // -----------------------------------------------------------------------------
+//
 void CEmailTextContent::CancelFetch()
     {
     iEmailMsgContent->CancelFetch();
@@ -257,15 +281,17 @@
 // -----------------------------------------------------------------------------
 // 
 // -----------------------------------------------------------------------------
+//
 void CEmailTextContent::SaveToFileL( const TDesC& aPath )
     {
-    iEmailMsgContent->SaveToFileL( aPath );
+    iEmailMsgContent->SaveToFileL(aPath);
     }
 
 // -----------------------------------------------------------------------------
 // 
 // -----------------------------------------------------------------------------
-MEmailMultipart* CEmailTextContent::AsMultipartOrNull() const
+//
+MEmailMultipart* CEmailTextContent::AsMultipartOrNull() const  
     {    
     return NULL;
     }
@@ -273,7 +299,8 @@
 // -----------------------------------------------------------------------------
 // 
 // -----------------------------------------------------------------------------
-MEmailTextContent* CEmailTextContent::AsTextContentOrNull() const
+//
+MEmailTextContent* CEmailTextContent::AsTextContentOrNull() const 
     {
     const MEmailTextContent* ptr = this;
     return const_cast<MEmailTextContent *>(ptr);
@@ -282,17 +309,18 @@
 // -----------------------------------------------------------------------------
 // 
 // -----------------------------------------------------------------------------
+//
 MEmailAttachment* CEmailTextContent::AsAttachmentOrNull() const
     {
     return NULL;
     }
 
+
 // -----------------------------------------------------------------------------
 // 
 // -----------------------------------------------------------------------------
+//
 void CEmailTextContent::SetOwner( const TDataOwner aOwner )
     {
     iOwner = aOwner;
     }
-
-// End of file