diff --git a/ChangeLog b/ChangeLog
index f08d58b83..b67af94ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-05-22  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* UI/Scheduler/UIxComponentEditor.m ([UIxComponentEditor
+	-_toolbarForOwner:andClientObject:]): ignore the participation
+	status for tasks so the usual edition toolbar appears.
+
 2009-05-21  Ludovic Marcotte <lmarcotte@inverse.ca>
 
 	* Regenerated the SOPE patchset so we now correctly
diff --git a/UI/Scheduler/UIxComponentEditor.m b/UI/Scheduler/UIxComponentEditor.m
index 3664158c2..1cd7c77f2 100644
--- a/UI/Scheduler/UIxComponentEditor.m
+++ b/UI/Scheduler/UIxComponentEditor.m
@@ -1843,11 +1843,14 @@ RANGE(2);
 
   if ([[component attendees] count]
       && [component userIsParticipant: ownerUser]
-      && !isOrganizer)
+      && !isOrganizer
+      // Lightning does not manage participation status within tasks,
+      // so we also ignore the participation status of tasks in the
+      // web interface.
+      && ![[component tag] isEqualToString: @"VTODO"])
     {
       participationStatus
 	= [[component findParticipant: ownerUser] participationStatus];
-      /* Lightning does not manage participation status within tasks */
       if (participationStatus == iCalPersonPartStatAccepted)
 	toolbarFilename = @"SOGoAppointmentObjectDecline.toolbar";
       else if (participationStatus == iCalPersonPartStatDeclined)