diff -r d189ee25cf9d -r 3533d4323edc emailservices/emailclientapi/src/emailaddress.cpp
--- a/emailservices/emailclientapi/src/emailaddress.cpp	Tue Aug 31 15:04:17 2010 +0300
+++ b/emailservices/emailclientapi/src/emailaddress.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"
@@ -16,22 +16,16 @@
 */
 
 #include "emailaddress.h"
-#include "CFSMailClient.h"
+#include "cfsmailclient.h"
 #include "emailclientapi.hrh"
 
-// -----------------------------------------------------------------------------
-// 
-// -----------------------------------------------------------------------------
 CEmailAddress* CEmailAddress::NewL( const TRole aRole, const TDataOwner aOwner )
     {
     CEmailAddress* self = new ( ELeave ) CEmailAddress( aRole, aOwner );
-
+    
     return self;
     }
 
-// -----------------------------------------------------------------------------
-// 
-// -----------------------------------------------------------------------------
 CEmailAddress* CEmailAddress::NewLC( const TRole aRole, const TDataOwner aOwner )
     {
     CEmailAddress* self = CEmailAddress::NewL( aRole, aOwner );
@@ -39,35 +33,21 @@
     return self;
     }
 
-// -----------------------------------------------------------------------------
-// 
-// -----------------------------------------------------------------------------
 CEmailAddress::~CEmailAddress()
     {
     iAddress.Close();
     iDisplayName.Close();
     }
 
-// -----------------------------------------------------------------------------
-// 
-// -----------------------------------------------------------------------------
-CEmailAddress::CEmailAddress( const TRole aRole, const TDataOwner aOwner ) :
-    iRole( aRole ), 
-    iOwner( aOwner )
+CEmailAddress::CEmailAddress( const TRole aRole, const TDataOwner aOwner ) : iRole( aRole ), iOwner( aOwner )
     {
     }
 
-// -----------------------------------------------------------------------------
-// 
-// -----------------------------------------------------------------------------
 TEmailTypeId CEmailAddress::InterfaceId() const
     {
     return KEmailIFUidAddress;
     }
 
-// -----------------------------------------------------------------------------
-// 
-// -----------------------------------------------------------------------------
 void CEmailAddress::Release()
     {
     if ( iOwner == EClientOwns )
@@ -76,54 +56,36 @@
         }
     }
 
-// -----------------------------------------------------------------------------
-// 
-// -----------------------------------------------------------------------------
 void CEmailAddress::SetAddressL( const TDesC& aAddress )
     {
     iAddress.Close();
     iAddress.CreateL( aAddress );
     }
 
-// -----------------------------------------------------------------------------
-// 
-// -----------------------------------------------------------------------------
 TPtrC CEmailAddress::Address() const
     {    
     return iAddress;
     }
-
-// -----------------------------------------------------------------------------
-// 
-// -----------------------------------------------------------------------------
+    
 void CEmailAddress::SetDisplayNameL( const TDesC& aDisplayName )
     {
     iDisplayName.Close();
     iDisplayName.CreateL( aDisplayName );
     }
 
-// -----------------------------------------------------------------------------
-// 
-// -----------------------------------------------------------------------------
 TPtrC CEmailAddress::DisplayName() const
     {
     return iDisplayName;
     }
-
-// -----------------------------------------------------------------------------
-// 
-// -----------------------------------------------------------------------------
+    
 MEmailAddress::TRole CEmailAddress::Role() const
     {
     return iRole;
     }
 
-// -----------------------------------------------------------------------------
-// 
-// -----------------------------------------------------------------------------
 void CEmailAddress::SetRole( const TRole aRole )
     {
     iRole = aRole;
     }
 
-// End of file
+// End of file.