diff --git a/ChangeLog b/ChangeLog
index e636756ac..af3c13944 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-07-01  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/Appointments/SOGoAppointmentFolder.m
+	(-lookupName:inContext:acquire:): handle "AsTask" and
+	"AsAppointment" url suffix only for the default "so" handler.
+
 2009-07-01  Cyril Robert <crobert@inverse.ca>
 
 	* SoObjects/SOGo/SOGoGCSFolder.m: Remove color from user settings on
diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m
index 7a6295296..6ea25fe7d 100644
--- a/SoObjects/Appointments/SOGoAppointmentFolder.m
+++ b/SoObjects/Appointments/SOGoAppointmentFolder.m
@@ -64,6 +64,7 @@
 #import <SOGo/SOGoUserFolder.h>
 #import <SOGo/SOGoWebDAVAclManager.h>
 #import <SOGo/SOGoWebDAVValue.h>
+#import <SOGo/WORequest+SOGo.h>
 
 #import "iCalEntityObject+SOGo.h"
 #import "SOGoAppointmentObject.h"
@@ -1937,6 +1938,7 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
   id obj;
   NSString *url;
   BOOL handledLater;
+  WORequest *rq;
 
   /* first check attributes directly bound to the application */
   handledLater = [self requestNamedIsHandledLater: _key];
@@ -1947,9 +1949,11 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
       obj = [super lookupName:_key inContext:_ctx acquire:NO];
       if (!obj)
         {
-	  if ([self isValidContentName:_key])
+          rq = [_ctx request];
+	  if ([self isValidContentName:_key]
+              && [rq handledByDefaultHandler])
             {
-	      url = [[[_ctx request] uri] urlWithoutParameters];
+	      url = [[rq uri] urlWithoutParameters];
 	      if ([url hasSuffix: @"AsTask"])
 		obj = [SOGoTaskObject objectWithName: _key
 				      inContainer: self];