diff --git a/ChangeLog b/ChangeLog
index 0e9e36a0f..78b802e77 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2011-06-03  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/MAPIStoreSOGo.m (sogo_op_opendir): op_opendir no
+	longer takes the parent fid as parameter.
+
 	* OpenChange/MAPIStoreCalendarMessageTable.m
 	(-sortIdentifierForProperty:): c_isallday and c_creationdate as
 	mappings for PidLidAppointmentSubType and PR_CREATION_TIME.
diff --git a/OpenChange/MAPIStoreContext.h b/OpenChange/MAPIStoreContext.h
index 16616313f..59a42b3ad 100644
--- a/OpenChange/MAPIStoreContext.h
+++ b/OpenChange/MAPIStoreContext.h
@@ -117,8 +117,7 @@
   inParentFID: (uint64_t) parentFID;
 - (int) rmDirWithFID: (uint64_t) fid
          inParentFID: (uint64_t) parentFid;
-- (int) openDir: (uint64_t) fid
-    inParentFID: (uint64_t) parentFID;
+- (int) openDir: (uint64_t) fid;
 - (int) closeDir;
 - (int) readCount: (uint32_t *) rowCount
       ofTableType: (uint8_t) tableType
diff --git a/OpenChange/MAPIStoreContext.m b/OpenChange/MAPIStoreContext.m
index 4dbd58198..6e023c352 100644
--- a/OpenChange/MAPIStoreContext.m
+++ b/OpenChange/MAPIStoreContext.m
@@ -385,18 +385,15 @@ _prepareContextClass (struct mapistore_context *newMemCtx,
    \return MAPISTORE_SUCCESS on success, otherwise MAPISTORE_ERROR
 */
 - (int) openDir: (uint64_t) fid
-    inParentFID: (uint64_t) parentFID
 {
   [self logWithFormat:
-	  @"UNIMPLEMENTED METHOD '%s' (%d):\n fid=0x%.16x, parentFID=0x%.16x",
+	  @"UNIMPLEMENTED METHOD '%s' (%d):\n fid=0x%.16x",
 	__FUNCTION__, __LINE__,
-	(unsigned long long) fid,
-	(unsigned long long) parentFID];
+	(unsigned long long) fid];
 
-  return MAPISTORE_ERROR;
+  return MAPISTORE_SUCCESS;
 }
 
-
 /**
    \details Close a folder from the sogo backend
 
diff --git a/OpenChange/MAPIStoreSOGo.m b/OpenChange/MAPIStoreSOGo.m
index bb5d448cc..733f4014e 100644
--- a/OpenChange/MAPIStoreSOGo.m
+++ b/OpenChange/MAPIStoreSOGo.m
@@ -336,7 +336,7 @@ sogo_op_rmdir(void *private_data, uint64_t parent_fid, uint64_t fid)
    \return MAPISTORE_SUCCESS on success, otherwise MAPISTORE_ERROR
 */
 static int
-sogo_op_opendir(void *private_data, uint64_t parent_fid, uint64_t fid)
+sogo_op_opendir(void *private_data, uint64_t fid)
 {
   NSAutoreleasePool *pool;
   sogo_context *cContext;
@@ -351,7 +351,7 @@ sogo_op_opendir(void *private_data, uint64_t parent_fid, uint64_t fid)
   context = cContext->objcContext;
   [context setupRequest];
 
-  rc = [context openDir: fid inParentFID: parent_fid];
+  rc = [context openDir: fid];
 
   [context tearDownRequest];
   [pool release];