diff --git a/ChangeLog b/ChangeLog
index 1d56cb208..7afe15f01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2012-03-26  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/MAPIStoreTasksMessage.m (-save): take PR_HTML as
+	possible value for the COMMENT field, as as with
+	MAPIStoreCalendarMessages.
+
 	* OpenChange/MAPIApplication.m (-init): removed hack pertaining to
 	UnixSignalHandler since the class no longer exists.
 
diff --git a/OpenChange/MAPIStoreTasksMessage.m b/OpenChange/MAPIStoreTasksMessage.m
index 206907973..963c04a0b 100644
--- a/OpenChange/MAPIStoreTasksMessage.m
+++ b/OpenChange/MAPIStoreTasksMessage.m
@@ -38,6 +38,7 @@
 #import <SOGo/SOGoUserDefaults.h>
 #import <Appointments/iCalEntityObject+SOGo.h>
 #import <Appointments/SOGoTaskObject.h>
+#import <Mailer/NSString+Mail.h>
 
 #import "MAPIStoreContext.h"
 #import "MAPIStoreTasksFolder.h"
@@ -346,6 +347,21 @@
   // comment
   value = [properties
             objectForKey: MAPIPropertyKey (PR_BODY_UNICODE)];
+  if (!value)
+    {
+      value = [properties objectForKey: MAPIPropertyKey (PR_HTML)];
+      if (value)
+        {
+          value = [[NSString alloc] initWithData: value
+                                        encoding: NSUTF8StringEncoding];
+          [value autorelease];
+          value = [value htmlToText];
+        }
+    }
+  if (value && [value length] == 0)
+    value = nil;
+  [vToDo setComment: value];
+
   if (value)
     [vToDo setComment: value];