diff --git a/ChangeLog b/ChangeLog
index e6d330315..2263afd30 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2012-04-12  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/Scheduler/UIxCalListingActions.m
+	(_fetchFields:forComponentOfType:): do not check for
+	"showCalendarTasks" since it is now handled at the
+	SOGoApopintmentFolder level.
+
 	* SoObjects/Appointments/SOGoAppointmentFolder.m
 	(-bareFetchFields: ...,
 	(-fetchFields:from:to:title:component:additionalFilters:includeProtectedInformation:):
diff --git a/UI/Scheduler/UIxCalListingActions.m b/UI/Scheduler/UIxCalListingActions.m
index 854537bd8..b6ef06590 100644
--- a/UI/Scheduler/UIxCalListingActions.m
+++ b/UI/Scheduler/UIxCalListingActions.m
@@ -322,8 +322,7 @@ static NSArray *tasksFields = nil;
   folders = [[clientObject subFolders] objectEnumerator];
   while ((currentFolder = [folders nextObject]))
     {
-      if ([currentFolder isActive]
-          && (![component isEqualToString: @"vtodo"] || [currentFolder showCalendarTasks]))
+      if ([currentFolder isActive])
         {
           folderIsRemote
             = [currentFolder isKindOfClass: [SOGoWebAppointmentFolder class]];