diff --git a/ChangeLog b/ChangeLog
index 25b59ec7a..8aedc76f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-10-06  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* OpenChange/MAPIStoreContext.m:
+	(-getMessageTableChildproperty:atURL:withTag:inFolder:withFID:)
+	added response for PR_ROW_TYPE (always 1) and PR_DEPTH (always 0).
+
 2010-10-05  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* OpenChange/MAPIStoreTasksContext.m
diff --git a/OpenChange/MAPIStoreContext.h b/OpenChange/MAPIStoreContext.h
index d233bc121..4b5e6423c 100644
--- a/OpenChange/MAPIStoreContext.h
+++ b/OpenChange/MAPIStoreContext.h
@@ -30,6 +30,11 @@
 #define SENSITIVITY_PRIVATE 2
 #define SENSITIVITY_COMPANY_CONFIDENTIAL 3
 
+#define TBL_LEAF_ROW 0x00000001
+#define TBL_EMPTY_CATEGORY 0x00000002
+#define TBL_EXPANDED_CATEGORY 0x00000003
+#define TBL_COLLAPSED_CATEGORY 0x00000004
+
 @class NSArray;
 @class NSMutableDictionary;
 @class NSString;
diff --git a/OpenChange/MAPIStoreContext.m b/OpenChange/MAPIStoreContext.m
index 27f1bc159..103399707 100644
--- a/OpenChange/MAPIStoreContext.m
+++ b/OpenChange/MAPIStoreContext.m
@@ -591,6 +591,16 @@ static MAPIStoreMapping *mapping = nil;
       *data = llongValue;
       break;
       // case PR_INST_ID: // TODO: DOUBT
+    case PR_DEPTH: // TODO: DOUBT
+      longValue = talloc_zero(memCtx, uint32_t);
+      *longValue = 0;
+      *data = longValue;
+      break;
+    case PR_ROW_TYPE: // TODO: DOUBT
+      longValue = talloc_zero(memCtx, uint32_t);
+      *longValue = TBL_LEAF_ROW;
+      *data = longValue;
+      break;
     case PR_INSTANCE_NUM: // TODO: DOUBT
       longValue = talloc_zero(memCtx, uint32_t);
       *longValue = 0;
diff --git a/OpenChange/MAPIStoreMailContext.m b/OpenChange/MAPIStoreMailContext.m
index d3eca7c78..75841a876 100644
--- a/OpenChange/MAPIStoreMailContext.m
+++ b/OpenChange/MAPIStoreMailContext.m
@@ -140,17 +140,6 @@ static Class SOGoUserFolderK;
                                     hour: 0 minute: 0 second: 0];
       *data = [offsetDate asFileTimeInMemCtx: memCtx];
       break;
-    // case PR_DEPTH: // TODO: DOUBT
-    //   longValue = talloc_zero(memCtx, uint32_t);
-    //   *longValue = 1;
-    //   *data = longValue;
-    //   break;
-
-      // case PR_ROW_TYPE: // TODO: DOUBT
-      //         longValue = talloc_zero(memCtx, uint32_t);
-      //         *longValue = 1;
-      //         *data = longValue;
-      //         break;
     case PR_FLAG_STATUS: // TODO
     case PR_MSG_STATUS: // TODO
     case PR_MESSAGE_FLAGS: // TODO