diff --git a/ChangeLog b/ChangeLog
index ed8c5bedd..be5956ea4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,12 @@
 2012-03-30  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/MAPIStoreCalendarMessage.m (-save): remove comment if
+	content is "\n".
+
 	* OpenChange/MAPIStoreTasksMessage.m (-save): do not reset fields
 	that have not been passed in the properties array, since only
 	RopDeleteProperties should remove them.
+	Remove comment if content is "\n".
 
 	* OpenChange/MAPIStoreObject.m (-addPropertiesFromRow:): dates are
 	now all converted to the user's timezone, even though it just
diff --git a/OpenChange/MAPIStoreCalendarMessage.m b/OpenChange/MAPIStoreCalendarMessage.m
index 70aa0b64a..daa9cc83d 100644
--- a/OpenChange/MAPIStoreCalendarMessage.m
+++ b/OpenChange/MAPIStoreCalendarMessage.m
@@ -874,10 +874,13 @@
           value = [value htmlToText];
         }
     }
-  if (value && [value length] == 0)
-    value = nil;
-  [newEvent setComment: value];
-      
+  if (value)
+    {
+      if ([value length] == 0 || [value isEqualToString: @"\\n"])
+        value = nil;
+      [newEvent setComment: value];
+    }
+
   /* recurrence */
   value = [properties
                 objectForKey: MAPIPropertyKey (PidLidAppointmentRecur)];
diff --git a/OpenChange/MAPIStoreTasksMessage.m b/OpenChange/MAPIStoreTasksMessage.m
index cad848f76..e3a24afe5 100644
--- a/OpenChange/MAPIStoreTasksMessage.m
+++ b/OpenChange/MAPIStoreTasksMessage.m
@@ -365,7 +365,7 @@
     }
   if (value)
     {
-      if ([value length] == 0)
+      if ([value length] == 0 || [value isEqualToString: @"\\n"])
         value = nil;
       [vToDo setComment: value];
     }