--- a/emailservices/emailserver/cmailhandlerplugin/src/cmailcpsif.cpp	Fri Mar 12 15:41:14 2010 +0200
+++ b/emailservices/emailserver/cmailhandlerplugin/src/cmailcpsif.cpp	Mon Mar 15 12:39:10 2010 +0200
@@ -880,11 +880,14 @@
                                  {
                                  iInstIdList.AppendL( contentid.AllocL() );
                                  }
-                             TInt widgetInstance = FindWidgetInstanceId(cid->Des());
-                             PublishSetupWizardL(widgetInstance);
-                             iMailCpsHandler->UpdateMailboxesL(widgetInstance, cid->Des());
-                             // Widget visible on the homescreen. Publishing allowed.
-                             iAllowedToPublish[widgetInstance] = ETrue;
+                             TInt widgetInstance = FindWidgetInstanceId(cid->Des()); 
+                             if(widgetInstance>=0)// coverity fix, index can be negativ, allowed 0, since it is valid index
+                                 {
+                                 PublishSetupWizardL(widgetInstance);
+                                 iMailCpsHandler->UpdateMailboxesL(widgetInstance, cid->Des());
+                                 // Widget visible on the homescreen. Publishing allowed.
+                                 iAllowedToPublish[widgetInstance] = ETrue;
+                                 }
                              CleanupStack::PopAndDestroy( cid );
                              }
                          else if (trigger.Compare(KPluginStartup16) == 0)
@@ -1012,7 +1015,7 @@
     {
     FUNC_LOG;
     // Clean up all published data
-    if( !iMsgInterface ) GetMessagingInterfaceL();
+    if( iMsgInterface == NULL) GetMessagingInterfaceL(); // Coverity fix, it does not like !iMsgInterface comparison
     CLiwGenericParamList* inParam = &(iServiceHandler->InParamListL());
     CLiwGenericParamList* outParam = &(iServiceHandler->OutParamListL());