diff --git a/ChangeLog b/ChangeLog
index 0b0e7c6e6..024724735 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-11-22  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* OpenChange/SOGoTaskObject+MAPIStore.m (-setMAPIProperties:): the
+	start date must be taken from the 0x811e0040 property rather than
+	"PR_START_DATE" (contrary to the event properties), we now handle
+	the due date (0x811f0040) as well as the task "body", set as
+	comment.
+
 2010-11-19  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* OpenChange/MAPIStoreTasksContext.m (-createMessageInFolder:):
diff --git a/OpenChange/SOGoTaskObject+MAPIStore.m b/OpenChange/SOGoTaskObject+MAPIStore.m
index a92fbae96..9afe3e37a 100644
--- a/OpenChange/SOGoTaskObject+MAPIStore.m
+++ b/OpenChange/SOGoTaskObject+MAPIStore.m
@@ -106,7 +106,7 @@
   id value;
   SOGoUserDefaults *ud;
   iCalTimeZone *tz;
-  iCalDateTime *start;
+  iCalDateTime *date;
   NSString *status, *priority;
 
   vToDo = [self component: YES secure: NO];
@@ -119,6 +119,12 @@
   if (value)
     [vToDo setSummary: value];
 
+  // comment
+  value = [properties
+            objectForKey: MAPIPropertyNumber (PR_BODY_UNICODE)];
+  if (value)
+    [vToDo setComment: value];
+
   // Location
   value = [properties objectForKey: MAPIPropertyNumber (0x810c001f)];
   if (value)
@@ -142,12 +148,21 @@
   [vCalendar addTimeZone: tz];
 
   // start
-  value = [properties objectForKey: MAPIPropertyNumber (PR_START_DATE)];
+  value = [properties objectForKey: MAPIPropertyNumber (0x811e0040)];
   if (value)
     {
-      start = (iCalDateTime *) [vToDo uniqueChildWithTag: @"dtstart"];
-      [start setTimeZone: tz];
-      [start setDateTime: value];
+      date = (iCalDateTime *) [vToDo uniqueChildWithTag: @"dtstart"];
+      [date setTimeZone: tz];
+      [date setDateTime: value];
+    }
+
+  // due
+  value = [properties objectForKey: MAPIPropertyNumber (0x811f0040)];
+  if (value)
+    {
+      date = (iCalDateTime *) [vToDo uniqueChildWithTag: @"due"];
+      [date setTimeZone: tz];
+      [date setDateTime: value];
     }
 
   // status