--- a/messagingapp/msgui/msguiutils/src/mmsconformancecheck.cpp	Fri Jun 25 15:47:40 2010 +0530
+++ b/messagingapp/msgui/msguiutils/src/mmsconformancecheck.cpp	Tue Jun 29 23:42:47 2010 +0530
@@ -183,11 +183,10 @@
     UniDataModelLoader* pluginLoader = new UniDataModelLoader();
     UniDataModelPluginInterface* pluginInterface =
             pluginLoader->getDataModelPlugin(ConvergedMessage::Mms);
-    int id = pluginInterface->setMessageId(messageId);
+    int error = pluginInterface->setMessageId(messageId);
 
     //Check if invalid id and slide count is greater than 1
-    if ( ( id <= 0 ) ||
-         (pluginInterface->slideCount() > 1) )
+    if ( (error != KErrNone) || pluginInterface->slideCount() > 1)
     {
         delete pluginLoader;
         return false;