diff --git a/ChangeLog b/ChangeLog
index 0bf464dd4..24fa871c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2007-07-10  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/Scheduler/UIxTaskEditor.m ([UIxTaskEditor
+	-takeValuesFromRequest:_rqinContext:_ctx]): explicitly set the
+	start and due dates to nil if hasStartDate and hasDueDate are
+	false.
+
 	* SoObjects/SOGo/SOGoAuthenticator.m ([SOGoAuthenticator
 	-passwordInContext:context]): made method public.
 
diff --git a/UI/Scheduler/UIxTaskEditor.m b/UI/Scheduler/UIxTaskEditor.m
index c2764a393..d2c2a342c 100644
--- a/UI/Scheduler/UIxTaskEditor.m
+++ b/UI/Scheduler/UIxTaskEditor.m
@@ -373,8 +373,14 @@
 
   if (hasStartDate)
     [todo setStartDate: taskStartDate];
+  else
+    [todo setStartDate: nil];
+
   if (hasDueDate)
     [todo setDue: taskDueDate];
+  else
+    [todo setDue: nil];
+
   if ([status isEqualToString: @"COMPLETED"])
     [todo setCompleted: statusDate];
   else