--- a/emailservices/emailclientapi/src/emailmailbox.cpp	Tue Apr 27 16:20:14 2010 +0300
+++ b/emailservices/emailclientapi/src/emailmailbox.cpp	Tue May 11 15:57:15 2010 +0300
@@ -243,7 +243,11 @@
             EFSMsgDataEnvelope);
 
     CleanupStack::PushL( fsMessage );
-    CEmailMessage* message = CEmailMessage::NewL( iPluginData, fsMessage, EClientOwns );
+    
+    CEmailMessage* message = NULL;
+    
+    if ( fsMessage )
+        message = CEmailMessage::NewL( iPluginData, fsMessage, EClientOwns );
     CleanupStack::Pop();  // fsMessage
 
     return message;