diff --git a/ChangeLog b/ChangeLog
index 337414d68..b157243db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-09-10  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* UI/Scheduler/UIxComponentEditor.m (-setComment,comment):
+	properly substitute the form-provided "\r\n" sequences with "\n"
+	sequences and vice-versa.
+
 2009-09-09  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/Appointments/SOGoAppointmentFolder.m
diff --git a/UI/Scheduler/UIxComponentEditor.m b/UI/Scheduler/UIxComponentEditor.m
index 73ed2fdc5..316ee34dc 100644
--- a/UI/Scheduler/UIxComponentEditor.m
+++ b/UI/Scheduler/UIxComponentEditor.m
@@ -806,12 +806,13 @@ iRANGE(2);
 
 - (void) setComment: (NSString *) _value
 {
-  ASSIGN (comment, _value);
+#warning should we do the same for "location" and "summary"? What about ContactsUI?
+  ASSIGN (comment, [_value stringByReplacingString: @"\r\n" withString: @"\n"]);
 }
 
 - (NSString *) comment
 {
-  return comment;
+  return [comment stringByReplacingString: @"\n" withString: @"\r\n"];
 }
 
 - (BOOL) hasComment