diff -r d189ee25cf9d -r 3533d4323edc emailservices/emailclientapi/src/emailattachment.cpp
--- a/emailservices/emailclientapi/src/emailattachment.cpp	Tue Aug 31 15:04:17 2010 +0300
+++ b/emailservices/emailclientapi/src/emailattachment.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"
@@ -19,155 +19,105 @@
 #include "emailcontent.h"
 #include "emailclientapi.hrh"
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------/
-CEmailAttachment::CEmailAttachment( const TDataOwner aOwner ) : iOwner( aOwner )
+CEmailAttachment::CEmailAttachment( const TDataOwner aOwner) : iOwner( aOwner )
     {
     }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
 CEmailAttachment::~CEmailAttachment()
     {
     delete iEmailMsgContent;
     }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-CEmailAttachment* CEmailAttachment::NewLC(
+CEmailAttachment* CEmailAttachment::NewLC(        
         CPluginData& aPluginData,
         const TMessageContentId& aMsgContentId,
         CFSMailMessagePart *aAtt,
-        const TDataOwner aOwner )
+        const TDataOwner aOwner )    
     {    
     CEmailAttachment* self = new (ELeave) CEmailAttachment( aOwner );
     CleanupStack::PushL( self );
     self->ConstructL( aPluginData, aMsgContentId, aAtt );
-
+    
     return self;
     }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-CEmailAttachment* CEmailAttachment::NewL(
+CEmailAttachment* CEmailAttachment::NewL(        
         CPluginData& aPluginData,
         const TMessageContentId& aMsgContentId,
         CFSMailMessagePart *aAtt,
-        const TDataOwner aOwner )
+        const TDataOwner aOwner )    
     {
-    CEmailAttachment* self = CEmailAttachment::NewLC( aPluginData, aMsgContentId, aAtt, aOwner );
-    CleanupStack::Pop( self );
-
+    CEmailAttachment* self = CEmailAttachment::NewLC(aPluginData, aMsgContentId, aAtt, aOwner );
+    CleanupStack::Pop(); // self;
+    
     return self;
     }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
 void CEmailAttachment::ConstructL(
         CPluginData& aPluginData,
         const TMessageContentId& aMsgContentId,
-        CFSMailMessagePart *aAtt)
+        CFSMailMessagePart *aAtt)    
     {
     iEmailMsgContent = CEmailMessageContent::NewL( aPluginData, aMsgContentId, aAtt );
     }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
+
 TInt CEmailAttachment::AvailableSize() const
 {
-    return iEmailMsgContent->AvailableSize();
+    return iEmailMsgContent->AvailableSize(); 
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
 void CEmailAttachment::CancelFetch()
 {
-    iEmailMsgContent->CancelFetch();
+    iEmailMsgContent->CancelFetch(); 
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
 TPtrC CEmailAttachment::ContentL() const
 {
     User::Leave(KErrNotSupported);
-    return iEmailMsgContent->ContentL();
+    return iEmailMsgContent->ContentL(); 
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
 TPtrC CEmailAttachment::ContentClass() const
 {
     return iEmailMsgContent->ContentClass();
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
 TPtrC CEmailAttachment::ContentDescription() const
 {
     return iEmailMsgContent->ContentDescription();
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
 TPtrC CEmailAttachment::ContentDisposition() const
 {
     return iEmailMsgContent->ContentDisposition();
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
 TPtrC CEmailAttachment::ContentId() const
 {
     return iEmailMsgContent->ContentId();
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
 TPtrC CEmailAttachment::ContentType() const
 {
     return iEmailMsgContent->ContentType();
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void CEmailAttachment::FetchL( MEmailFetchObserver & aObserver )
+void CEmailAttachment::FetchL(MEmailFetchObserver & aObserver)
 {
-    iEmailMsgContent->FetchL( aObserver );
+    iEmailMsgContent->FetchL(aObserver); 
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
 TMessageContentId CEmailAttachment::Id() const
 {
-    return iEmailMsgContent->Id();
+    return iEmailMsgContent->Id(); 
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
 TEmailTypeId CEmailAttachment::InterfaceId() const
     {
     return KEmailIFUidAttachment;
     }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
 void CEmailAttachment::Release()
     {
     if ( iOwner == EClientOwns )
@@ -176,117 +126,74 @@
         }
     }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void CEmailAttachment::SaveToFileL( const TDesC& aPath )
+void CEmailAttachment::SaveToFileL(const TDesC & aPath)
 {
-    iEmailMsgContent->SaveToFileL( aPath );
+    iEmailMsgContent->SaveToFileL(aPath);
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void CEmailAttachment::SetContentClass( const TDesC& aContentClass )
+void CEmailAttachment::SetContentClass(const TDesC & aContentClass)
 {
-    iEmailMsgContent->SetContentClass( aContentClass );
+    iEmailMsgContent->SetContentClass(aContentClass); 
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void CEmailAttachment::SetContentDescription( const TDesC& aContentDescription )
+void CEmailAttachment::SetContentDescription(const TDesC & aContentDescription)
 {
-    iEmailMsgContent->SetContentDescription(aContentDescription);
+    iEmailMsgContent->SetContentDescription(aContentDescription); 
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void CEmailAttachment::SetContentDisposition( const TDesC& aContentDisposition )
+void CEmailAttachment::SetContentDisposition(const TDesC & aContentDisposition)
 {
-    iEmailMsgContent->SetContentDisposition( aContentDisposition );
+    iEmailMsgContent->SetContentDisposition(aContentDisposition); 
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void CEmailAttachment::SetContentId( const TDesC &aContentId )
+void CEmailAttachment::SetContentId(const TDesC & aContentId)
 {
-    iEmailMsgContent->SetContentId( aContentId );
+    iEmailMsgContent->SetContentId(aContentId); 
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void CEmailAttachment::SetContentL( const TDesC &aContent )
+void CEmailAttachment::SetContentL(const TDesC & aContent)
 {
-    iEmailMsgContent->SetContentL( aContent );
+    iEmailMsgContent->SetContentL(aContent); 
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void CEmailAttachment::SetContentType( const TDesC &aContentType )
+void CEmailAttachment::SetContentType(const TDesC & aContentType)
 {
-    iEmailMsgContent->SetContentType( aContentType );
+    iEmailMsgContent->SetContentType(aContentType); 
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
 TInt CEmailAttachment::TotalSize() const
 {
     return iEmailMsgContent->TotalSize();
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
 MEmailMultipart* CEmailAttachment::AsMultipartOrNull() const
-    {
+    {    
     return NULL;
     }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
 MEmailTextContent* CEmailAttachment::AsTextContentOrNull() const
     {
     return NULL;
     }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
 MEmailAttachment* CEmailAttachment::AsAttachmentOrNull() const
     {
     const MEmailAttachment* ptr = this;
-    return const_cast<MEmailAttachment *>( ptr );
+    return const_cast<MEmailAttachment *>(ptr);    
     }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
+// CEmailAttachment
 RFile CEmailAttachment::FileL() const
     {
     return iEmailMsgContent->Part().GetContentFileL();
     }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------/
 void CEmailAttachment::SetFileNameL( const TDesC& aFileName )
     {
-    iEmailMsgContent->Part().SetAttachmentNameL( aFileName );
+    iEmailMsgContent->Part().SetAttachmentNameL(aFileName);
     }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
 TPtrC CEmailAttachment::FileNameL() const
     {
     return iEmailMsgContent->Part().AttachmentNameL();
     }
-
-// End of file