diff --git a/ChangeLog b/ChangeLog
index b70f00530..c663d8b50 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-06-09  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* SoObjects/Appointments/SOGoAppointmentFolder.m
+	([SOGoAppointmentFolder -_sqlStringRangeFromto:]): dates are not
+	necessarily defined in case of vTODOs; don't apply the range
+	constraint when dates are null so the SQL query return tasks.
+
 2009-06-08  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/SOGo/SOGoGCSFolder.m (-davCollectionTag): moved method
diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m
index a2386d75a..ef09772b6 100644
--- a/SoObjects/Appointments/SOGoAppointmentFolder.m
+++ b/SoObjects/Appointments/SOGoAppointmentFolder.m
@@ -418,8 +418,9 @@ static NSArray *reducedReportQueryFields = nil;
   start = (unsigned int) [_startDate timeIntervalSince1970];
   end = (unsigned int) [_endDate timeIntervalSince1970];
 
+  // vTODOs don't necessarily have start/end dates
   return [NSString stringWithFormat:
-                     @" AND (c_startdate <= %u) AND (c_enddate >= %u)",
+                     @" AND (c_startdate = NULL OR c_startdate <= %u) AND (c_enddate = NULL OR c_enddate >= %u)",
                    end, start];
 }
 
@@ -515,7 +516,7 @@ static NSArray *reducedReportQueryFields = nil;
   sql = [[NSString stringWithFormat: @"%@%@%@%@",
 		   dateSqlString, titleSqlString, componentSqlString,
 		   filterSqlString] substringFromIndex: 4];
-
+  
   /* fetch non-recurrent apts first */
   qualifier = [EOQualifier qualifierWithQualifierFormat: sql];
 
@@ -1537,14 +1538,14 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
         {
           cEndDate = [filter objectForKey: @"cycleenddate"];
           filterString = [NSString stringWithFormat: 
-                          @"(c_cycleenddate = NULL or c_cycleenddate >= %u)",
+                          @"(c_cycleenddate = NULL OR c_cycleenddate >= %u)",
                           (unsigned int) [cEndDate timeIntervalSince1970]];
           [filters addObject: filterString];
         }
     }
 
   if ([filters count])
-    additionalFilter = [filters componentsJoinedByString: @" and "];
+    additionalFilter = [filters componentsJoinedByString: @" AND "];
   else
     additionalFilter = nil;
   [filters release];
diff --git a/SoObjects/SOGo/SOGoGroup.m b/SoObjects/SOGo/SOGoGroup.m
index e1ff24ed4..983076a00 100644
--- a/SoObjects/SOGo/SOGoGroup.m
+++ b/SoObjects/SOGo/SOGoGroup.m
@@ -175,7 +175,7 @@
   dns = [NSMutableArray array];
 
   // We check if it's a static group
-  NSLog(@"attributes = %@", [_entry attributes]);
+  //NSLog(@"attributes = %@", [_entry attributes]);
   
   // Fetch "members" - we get DNs
   o = [[_entry attributeWithName: @"member"] allStringValues];
@@ -203,7 +203,7 @@
 	{
 	  dn = [dns objectAtIndex: i];
 	  login = [um getLoginForDN: dn];
-	  NSLog(@"member = %@", login);
+	  //NSLog(@"member = %@", login);
 	  user = [SOGoUser userWithLogin: login roles: nil];
 	  if (user)
 	    [array addObject: user];