diff --git a/ChangeLog b/ChangeLog
index 1185946f9..73709dd45 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2010-03-15  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/SOGo/SOGoUserFolder.m (-davUsersQuery): we invoke
+	"prepareDAVResponse" only when there is content to return.
+
 	* UI/Scheduler/UIxCalListingActions.m (_fixDates:): the events
 	appearing in the month view needs to have their dates fixed too.
 	Also, the algorithm was lightly simplified.
diff --git a/SoObjects/SOGo/SOGoUserFolder.m b/SoObjects/SOGo/SOGoUserFolder.m
index f45e590d6..db8263f4f 100644
--- a/SoObjects/SOGo/SOGoUserFolder.m
+++ b/SoObjects/SOGo/SOGoUserFolder.m
@@ -469,15 +469,13 @@
   NSString *content;
 
   r = [queryContext response];
-  [r prepareDAVResponse];
 
   document = [[context request] contentAsDOMDocument];
   content = [self _davUsersFromQuery: document];
-  if (content)
+  if ([content length])
     {
-      [r setStatus: 207];
-      if ([content length])
-        [r appendContentString: content];
+      [r prepareDAVResponse];
+      [r appendContentString: content];
     }
   else
     [r setStatus: 400];