diff -r e7aa27f58ae1 -r e1b6206813b4 emailuis/emailui/src/FreestyleEmailUiMsgDetailsModel.cpp
--- a/emailuis/emailui/src/FreestyleEmailUiMsgDetailsModel.cpp	Tue Feb 02 00:02:40 2010 +0200
+++ b/emailuis/emailui/src/FreestyleEmailUiMsgDetailsModel.cpp	Fri Feb 19 22:37:30 2010 +0200
@@ -19,7 +19,7 @@
 // SYSTEM INCLUDES
 //<cmail>
 #include "emailtrace.h"
-#include "CFSMailAddress.h"
+#include "cfsmailaddress.h"
 //</cmail>
 
 // INTERNAL INCLUDES
@@ -29,18 +29,18 @@
 // Folder list item constructor.
 // ---------------------------------------------------------------------------
 CFSEmailUiMsgDetailsItem::CFSEmailUiMsgDetailsItem( TFsTreeItemId aListId )
-	: iListId( aListId ), iMailAddress( NULL ), iText( NULL )
-	{
+    : iListId( aListId ), iMailAddress( NULL ), iText( NULL )
+    {
     FUNC_LOG;
-	}
+    }
 
 // ---------------------------------------------------------------------------
 // Folder list item destructor.
 // ---------------------------------------------------------------------------
 CFSEmailUiMsgDetailsItem::~CFSEmailUiMsgDetailsItem()
-	{
+    {
     FUNC_LOG;
-	}
+    }
 
 // ---------------------------------------------------------------------------
 // NewLC
@@ -59,66 +59,66 @@
 // Constructor
 // ---------------------------------------------------------------------------
 CFSEmailUiMsgDetailsModel::CFSEmailUiMsgDetailsModel()
-	{
+    {
     FUNC_LOG;
-	}
+    }
 
 // ---------------------------------------------------------------------------
 // Destructor.
 // ---------------------------------------------------------------------------
 CFSEmailUiMsgDetailsModel::~CFSEmailUiMsgDetailsModel()
-	{
+    {
     FUNC_LOG;
-	RemoveAll();
-	iItemArray.Close();
-	}
+    RemoveAll();
+    iItemArray.Close();
+    }
 
 // ---------------------------------------------------------------------------
 // Add an item to the end of the list.
 // ---------------------------------------------------------------------------
 void CFSEmailUiMsgDetailsModel::AppendL( TFsTreeItemId aListId, CFSMailAddress* aMailAddress )
-	{
+    {
     FUNC_LOG;
-	CFSEmailUiMsgDetailsItem* item = CFSEmailUiMsgDetailsItem::NewLC( aListId );
-	item->iMailAddress = aMailAddress;
-	iItemArray.AppendL( item );
+    CFSEmailUiMsgDetailsItem* item = CFSEmailUiMsgDetailsItem::NewLC( aListId );
+    item->iMailAddress = aMailAddress;
+    iItemArray.AppendL( item );
     CleanupStack::Pop( item );
-	}
+    }
 
 // ---------------------------------------------------------------------------
 // Add an item to the end of the list.
 // ---------------------------------------------------------------------------
 void CFSEmailUiMsgDetailsModel::AppendL( TFsTreeItemId aListId, TDesC* aText )
-	{
+    {
     FUNC_LOG;
-	CFSEmailUiMsgDetailsItem* item = CFSEmailUiMsgDetailsItem::NewLC( aListId );
-	item->iText = aText;
-	iItemArray.AppendL( item );
+    CFSEmailUiMsgDetailsItem* item = CFSEmailUiMsgDetailsItem::NewLC( aListId );
+    item->iText = aText;
+    iItemArray.AppendL( item );
     CleanupStack::Pop( item );
-	}
+    }
 
 // ---------------------------------------------------------------------------
 // Remove item by list item id.
 // ---------------------------------------------------------------------------
 void CFSEmailUiMsgDetailsModel::Remove( TFsTreeItemId aListId )
-	{
+    {
     FUNC_LOG;
-	TInt index = Index( aListId );
-	if( index != KErrNotFound )
-		{
-		delete iItemArray[index];
-		iItemArray.Remove( index );
-		}
-	}
+    TInt index = Index( aListId );
+    if( index != KErrNotFound )
+        {
+        delete iItemArray[index];
+        iItemArray.Remove( index );
+        }
+    }
 
 // ---------------------------------------------------------------------------
 // Remove all items.
-// ---------------------------------------------------------------------------	
+// ---------------------------------------------------------------------------  
 void CFSEmailUiMsgDetailsModel::RemoveAll()
-	{
+    {
     FUNC_LOG;
-	iItemArray.ResetAndDestroy();
-	}
+    iItemArray.ResetAndDestroy();
+    }
 
 // ---------------------------------------------------------------------------
 // Get an item by list item id.
@@ -126,56 +126,56 @@
 // @return NULL if not found.
 // ---------------------------------------------------------------------------
 CFSEmailUiMsgDetailsItem* CFSEmailUiMsgDetailsModel::ItemByListId( TFsTreeItemId aListId ) const
-	{
+    {
     FUNC_LOG;
-	TInt index = Index( aListId );
-	if( index != KErrNotFound )
-		{
-		return iItemArray[ index ];
-		}
-	else
-		{
-		return NULL;
-		}
-	}
-	
+    TInt index = Index( aListId );
+    if( index != KErrNotFound )
+        {
+        return iItemArray[ index ];
+        }
+    else
+        {
+        return NULL;
+        }
+    }
+    
 // ---------------------------------------------------------------------------
 // Get an item by list index.
 // 
 // @return NULL if not found.
 // ---------------------------------------------------------------------------
 CFSEmailUiMsgDetailsItem* CFSEmailUiMsgDetailsModel::ItemByIndex( TInt aModelIndex ) const
-	{
+    {
     FUNC_LOG;
-	return iItemArray[ aModelIndex ];
-	}
+    return iItemArray[ aModelIndex ];
+    }
 
 // ---------------------------------------------------------------------------
 // Get number of items in list.
 // 
 // @return Number of items.
-// ---------------------------------------------------------------------------		
+// ---------------------------------------------------------------------------      
 TInt CFSEmailUiMsgDetailsModel::Count() const
-	{
+    {
     FUNC_LOG;
-	return iItemArray.Count();
-	}
-	
+    return iItemArray.Count();
+    }
+    
 // ---------------------------------------------------------------------------
 // Get the array index of the spcified item.
 // 
 // @return Array index of the item.
-// ---------------------------------------------------------------------------		
+// ---------------------------------------------------------------------------      
 TInt CFSEmailUiMsgDetailsModel::Index( TFsTreeItemId aListId ) const
-	{
+    {
     FUNC_LOG;
-	for( TInt i = 0; i < Count(); i++ )
-		{
-		if( iItemArray[i]->iListId == aListId )
-			{
-			return i;
-			}
-		}
-	return KErrNotFound;
-	}
+    for( TInt i = 0; i < Count(); i++ )
+        {
+        if( iItemArray[i]->iListId == aListId )
+            {
+            return i;
+            }
+        }
+    return KErrNotFound;
+    }