diff -r dcf0eedfc1a3 -r d189ee25cf9d emailservices/emailclientapi/src/emailinterfacefactoryimpl.cpp
--- a/emailservices/emailclientapi/src/emailinterfacefactoryimpl.cpp	Thu Aug 19 09:38:05 2010 +0300
+++ b/emailservices/emailclientapi/src/emailinterfacefactoryimpl.cpp	Tue Aug 31 15:04:17 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2010 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"
@@ -20,7 +20,7 @@
 
 #include "emailinterfacefactoryimpl.h"
 #include "emailcontent.h"
-#include "cfsmailclient.h"
+#include "CFSMailClient.h"
 #include "emailclientapiimpldefs.h"
 #include "emailclientapiimpl.h"
 #include "emailaddress.h"
@@ -33,18 +33,16 @@
 // ---------------------------------------------------------------------------
 // Email client API panic wrapper
 // ---------------------------------------------------------------------------
-//
 void Panic( TEmailImplPanic aPanic )
     {
     User::Panic( KEmailImplPanic(), aPanic );
     }
-    
+
 // ======== MEMBER FUNCTIONS ========
 
 // ---------------------------------------------------------------------------
 // CEmailInterfaceFactoryImpl::NewL
 // ---------------------------------------------------------------------------
-//
 CEmailInterfaceFactoryImpl* CEmailInterfaceFactoryImpl::NewL()
     {
     CEmailInterfaceFactoryImpl* self = new (ELeave) CEmailInterfaceFactoryImpl();
@@ -53,11 +51,10 @@
     CleanupStack::Pop( self );
     return self;
     }
-    
+
 // ---------------------------------------------------------------------------
 // CEmailInterfaceFactoryImpl::~CEmailInterfaceFactoryImpl
 // ---------------------------------------------------------------------------
-//
 CEmailInterfaceFactoryImpl::~CEmailInterfaceFactoryImpl()
     {
     TRAP_IGNORE( AppendOrRemoveUidL( EEmailUidModeRemove ) );
@@ -66,7 +63,6 @@
 // ---------------------------------------------------------------------------
 // CEmailInterfaceFactoryImpl::CEmailInterfaceFactoryImpl
 // ---------------------------------------------------------------------------
-//
 CEmailInterfaceFactoryImpl::CEmailInterfaceFactoryImpl() : 
     CEmailInterfaceFactory()
     {
@@ -75,7 +71,6 @@
 // ---------------------------------------------------------------------------
 // CEmailInterfaceFactoryImpl::ConstructL
 // ---------------------------------------------------------------------------
-//
 void CEmailInterfaceFactoryImpl::ConstructL()
     {
 	// This leaves if related P&S keys are not defined by EmailServerMonitor,
@@ -88,7 +83,6 @@
 // ---------------------------------------------------------------------------
 // CEmailInterfaceFactoryImpl::InterfaceL
 // ---------------------------------------------------------------------------
-//
 MEmailInterface* CEmailInterfaceFactoryImpl::InterfaceL( const TInt aInterfaceId )
     {
     MEmailInterface* interface = NULL;
@@ -97,11 +91,10 @@
         case KEmailClientApiInterface:
             interface = CEmailClientApi::NewL();
             break;
-        case KEmailIFUidTextContent:
-            //interface = CEmailTextContent::NewL();
-            break;
         case KEmailIFUidAddress:
             interface = CEmailAddress::NewL( MEmailAddress::EUndefined, EClientOwns );
+            break;
+        case KEmailIFUidTextContent:
         default:
             break;
         }
@@ -115,7 +108,6 @@
 // ---------------------------------------------------------------------------
 // CEmailInterfaceFactoryImpl::AppendOrRemoveUidL
 // ---------------------------------------------------------------------------
-//
 void CEmailInterfaceFactoryImpl::AppendOrRemoveUidL(
         const TEmailUidAppendRemoveMode aMode )
     {
@@ -186,7 +178,7 @@
             writeLength += KEmailPlatformApiUidItemSize;
             }
         }
-    
+
     // If we are appending our UID and it wasn't found from the list,
     // write it to the stream
     if( aMode == EEmailUidModeAppend && !ownUidFound )
@@ -217,8 +209,8 @@
                         EEmailPsKeyPlatformApiAppsToCloseLength,
                         writeLength ) );
         }
-    
+
     CleanupStack::PopAndDestroy( 4, readBuf );
     }
 
-// End of file.
+// End of file