diff -r 478bc57ad291 -r 64e38f08e49c emailservices/emailstore/message_store/server/src/ContainerStoreEncryption.cpp
--- a/emailservices/emailstore/message_store/server/src/ContainerStoreEncryption.cpp	Thu Sep 02 20:15:00 2010 +0300
+++ b/emailservices/emailstore/message_store/server/src/ContainerStoreEncryption.cpp	Fri Sep 17 08:27:21 2010 +0300
@@ -74,7 +74,7 @@
 TBool CContainerStoreEncryption::Authenticated()
     {
     //always return true if authentication is not required
-    return ( iCryptoLibrary != NULL || !iAuthenticationRequired ); 
+    return ( iCryptoLibrary || !iAuthenticationRequired ); 
     } // end Authenticated
 
 // ==========================================================================