diff --git a/ChangeLog b/ChangeLog
index 9cbb91fa7..9ca6a3a72 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
 	* SoObjects/Appointments/SOGoAppointmentFolder.m
 	(-davCalendarComponentSet): componentSet is now an ivar. Include
 	VTODO only with showCalendarTasks returns YES.
+	(-davResourceType): return vtodo-collection only when
+	showCalendarTasks returns YES.
 
 	* UI/Scheduler/UIxCalListingActions.m
 	(_fetchFields:forComponentOfType:): do not check for
diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m
index e2833640a..c2d568c41 100644
--- a/SoObjects/Appointments/SOGoAppointmentFolder.m
+++ b/SoObjects/Appointments/SOGoAppointmentFolder.m
@@ -2026,9 +2026,12 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
       gdVEventCol = [NSArray arrayWithObjects: [gdRT objectAtIndex: 0],
                   XMLNS_GROUPDAV, nil];
       [colType addObject: gdVEventCol];
-      gdVTodoCol = [NSArray arrayWithObjects: [gdRT objectAtIndex: 1],
-                 XMLNS_GROUPDAV, nil];
-      [colType addObject: gdVTodoCol];
+      if ([self showCalendarTasks])
+        {
+          gdVTodoCol = [NSArray arrayWithObjects: [gdRT objectAtIndex: 1],
+                                XMLNS_GROUPDAV, nil];
+          [colType addObject: gdVTodoCol];
+        }
       if ([nameInContainer isEqualToString: @"personal"])
         [colType addObject: [NSArray arrayWithObjects: @"schedule-outbox",
                                      XMLNS_CALDAV, nil]];