--- a/messagingapp/msgutils/unidatautils/unidatamodelplugins/unibiomessagedataplugin/src/unibiomessagedataplugin.cpp	Mon May 03 12:29:07 2010 +0300
+++ b/messagingapp/msgutils/unidatautils/unidatamodelplugins/unibiomessagedataplugin/src/unibiomessagedataplugin.cpp	Fri Jun 25 15:47:40 2010 +0530
@@ -18,7 +18,7 @@
 //SYSTEM INCLUDES
 #include <mtclreg.h>
 #include <mtclbase.h>
-#include <s60qconversions.h>
+#include <xqconversions.h>
 
 //USER INCLUDES
 #include "unibiomessagedataplugin.h"
@@ -122,6 +122,12 @@
 {
     RFile file = d_ptr->attachmentL();
 
+    if(attachmentCount() == 0)
+    {
+        file.Close();
+        return QList<UniMessageInfo*> ();
+    }
+     
     UniMessageInfoList attlist;
 
     QString path;
@@ -132,7 +138,7 @@
     User::LeaveIfError(file.FullName(fullName));
     User::LeaveIfError(file.Size(size));
 
-    path = S60QConversions::s60DescToQString(*fullName.AllocL());
+    path = XQConversions::s60DescToQString(*fullName.AllocL());
 
     UniMessageInfo *msgobj = new UniMessageInfo(path, size, mimetype);
     attlist << msgobj;
@@ -170,7 +176,11 @@
 //---------------------------------------------------------------
 bool UniBioMessageDataPlugin::hasAttachment()
 {
-    return true;
+    if(attachmentCount() > 0)
+        return true;
+    else
+        return false; 
+        
 }
 
 // UniBioMessageDataPlugin::objectCount()