--- a/emailservices/emailclientapi/src/emailfolder.cpp	Tue Feb 02 00:02:40 2010 +0200
+++ b/emailservices/emailclientapi/src/emailfolder.cpp	Fri Feb 19 22:37:30 2010 +0200
@@ -20,8 +20,8 @@
 #include "emailapiutils.h"
 #include "messageiterator.h"
 #include "emailsorting.h"
-#include "CFSMailFolder.h"
-#include "CFSMailPlugin.h"
+#include "cfsmailfolder.h"
+#include "cfsmailplugin.h"
 #include "emailclientapi.hrh"
 #include "emailclientapiimpldefs.h"
 
@@ -255,7 +255,7 @@
     for ( TInt i=0; i < aSortCriteria.Count(); i++ )
         {
         const TEmailSortCriteria& criteria  = aSortCriteria[i];
-        __ASSERT_ALWAYS( criteria.iField < sizeof( fieldValues ),
+        __ASSERT_ALWAYS( criteria.iField < sizeof( fieldValues ) / sizeof (fieldValues [i] ),
             Panic( EMailPanicSortMapIndexOutOfBounds ) );
         TFSMailSortCriteria fsCriteria;
         fsCriteria.iField = fieldValues[ criteria.iField ];