diff --git a/ChangeLog b/ChangeLog
index 5a69d879a..389a0f4f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2007-07-22  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/Appointments/SOGoAppointmentFolder.m
+	([-lookupActionForCalDAVMethod:]): removed method.
+	([SOGoAppointmentFolder -davNamespaces]): added new overriden
+	method that declares the DAV namespace related to CalDAV.
+
 	* SoObjects/SOGo/SOGoFolder.m ([SOGoFolder -davNamespaces]): new
 	optional method for subclasses which handle specific extensions to
 	the DAV protocol: CardDAV or CalDAV.
diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m
index 4e7257c30..8cc9c45d2 100644
--- a/SoObjects/Appointments/SOGoAppointmentFolder.m
+++ b/SoObjects/Appointments/SOGoAppointmentFolder.m
@@ -21,7 +21,6 @@
 
 #import <GDLContentStore/GCSFolder.h>
 #import <NGCards/NGCards.h>
-#import <NGObjWeb/SoObject+SoDAV.h>
 #import <NGObjWeb/WOContext.h>
 #import <NGObjWeb/WOMessage.h>
 #import <NGExtensions/NGCalendarDateRange.h>
@@ -32,7 +31,6 @@
 #import <SOGo/SOGoCustomGroupFolder.h>
 #import <SOGo/LDAPUserManager.h>
 #import <SOGo/SOGoPermissions.h>
-#import <SOGo/NSString+Utilities.h>
 #import <SOGo/SOGoUser.h>
 
 #import "common.h"
@@ -135,21 +133,6 @@ static NSNumber   *sharedYes = nil;
   return ([_key length] != 0);
 }
 
-- (id) lookupActionForCalDAVMethod: (NSString *)_key
-{
-  SoSelectorInvocation *invocation;
-  NSString *name;
-
-  name = [NSString stringWithFormat: @"%@:", [_key davMethodToObjC]];
-
-  invocation = [[SoSelectorInvocation alloc]
-                 initWithSelectorNamed: name
-                 addContextParameter: YES];
-  [invocation autorelease];
-
-  return invocation;
-}
-
 - (void) appendObject: (NSDictionary *) object
           withBaseURL: (NSString *) baseURL
      toREPORTResponse: (WOResponse *) r
@@ -280,6 +263,11 @@ static NSNumber   *sharedYes = nil;
     }
 }
 
+- (NSArray *) davNamespaces
+{
+  return [NSArray arrayWithObject: @"urn:ietf:params:xml:ns:caldav"];
+}
+
 - (id) davCalendarQuery: (id) queryContext
 {
   WOResponse *r;
@@ -376,10 +364,7 @@ static NSNumber   *sharedYes = nil;
       obj = [super lookupName:_key inContext:_ctx acquire:NO];
       if (!obj)
         {
-          if ([_key hasPrefix: @"{urn:ietf:params:xml:ns:caldav}"])
-            obj
-              = [self lookupActionForCalDAVMethod: [_key substringFromIndex: 31]];
-          else if ([self isValidAppointmentName:_key])
+	  if ([self isValidAppointmentName:_key])
             {
               url = [[[_ctx request] uri] urlWithoutParameters];
               if ([url hasSuffix: @"AsTask"])