--- a/messagingapp/msgutils/unidatautils/unidatamodelplugins/unibiomessagedataplugin/src/unibiomessagedataplugin.cpp	Fri Jun 04 10:25:39 2010 +0100
+++ b/messagingapp/msgutils/unidatautils/unidatamodelplugins/unibiomessagedataplugin/src/unibiomessagedataplugin.cpp	Fri Jun 11 13:35:48 2010 +0300
@@ -122,6 +122,12 @@
 {
     RFile file = d_ptr->attachmentL();
 
+    if(attachmentCount() == 0)
+    {
+        file.Close();
+        return QList<UniMessageInfo*> ();
+    }
+     
     UniMessageInfoList attlist;
 
     QString path;
@@ -170,7 +176,11 @@
 //---------------------------------------------------------------
 bool UniBioMessageDataPlugin::hasAttachment()
 {
-    return true;
+    if(attachmentCount() > 0)
+        return true;
+    else
+        return false; 
+        
 }
 
 // UniBioMessageDataPlugin::objectCount()