--- a/mtpdataproviders/mtpimagedp/src/cmtpimagedpgetobjectproplist.cpp	Wed Mar 31 22:58:56 2010 +0300
+++ b/mtpdataproviders/mtpimagedp/src/cmtpimagedpgetobjectproplist.cpp	Wed Apr 14 16:49:36 2010 +0300
@@ -146,12 +146,7 @@
     TUint32 propCode = Request().Uint32(TMTPTypeRequest::ERequestParameter3);
     if (propCode == 0)
         {
-            TUint32 groupCode = Request().Uint32(TMTPTypeRequest::ERequestParameter4);
-            if(groupCode != KMTPImageDpPropertyGroupOneNumber)
-            {
-            //Only supported group one
-            response = EMTPRespCodeSpecificationByGroupUnsupported;
-            }
+            /*Do nothing */
         }
     else if (propCode != KMaxTUint)
         {
@@ -309,15 +304,18 @@
 void CMTPImageDpGetObjectPropList::ServiceGroupPropertiesL(TUint32 aHandle,TUint16 /*aGroupCode*/)
     {
     __FLOG(_L8(">> CMTPImageDpGetObjectPropList::ServiceGroupPropertiesL"));
-    
-    if (iFramework.ObjectMgr().ObjectOwnerId(aHandle) == iFramework.DataProviderId())
+    TUint32 groupCode = Request().Uint32(TMTPTypeRequest::ERequestParameter4);
+    if (KMTPImageDpPropertyGroupOneNumber == groupCode) //only return data for group one
         {
-        for (TUint propCodeIndex(0); propCodeIndex < KMTPImageDpGroupOneSize; propCodeIndex++)
+        if (iFramework.ObjectMgr().ObjectOwnerId(aHandle) == iFramework.DataProviderId())
             {
-            TUint16 propCode = KMTPImageDpGroupOneProperties[propCodeIndex];  
-            if(propCode != 0)
+            for (TUint propCodeIndex(0); propCodeIndex < KMTPImageDpGroupOneSize; propCodeIndex++)
                 {
-                ServiceOneObjectPropertyL(aHandle, propCode);
+                TUint16 propCode = KMTPImageDpGroupOneProperties[propCodeIndex];  
+                if(propCode != 0)
+                    {
+                    ServiceOneObjectPropertyL(aHandle, propCode);
+                    }
                 }
             }
         }