diff --git a/SOPE/NGCards/ChangeLog b/SOPE/NGCards/ChangeLog
index e176b447f..67f5bfa01 100644
--- a/SOPE/NGCards/ChangeLog
+++ b/SOPE/NGCards/ChangeLog
@@ -1,3 +1,9 @@
+2011-11-09  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* NSString+NGCards.m (-escapedForCards): restored the escaping of
+	commas, since they might be used in fields such as
+	COMMENT/DESCRIPTION (iCalendar) or NOTE (vCards)
+
 2011-09-20  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* iCalToDo.m (-setCompleted:):  (hack) when invoked with a nil
diff --git a/SOPE/NGCards/NSString+NGCards.m b/SOPE/NGCards/NSString+NGCards.m
index 0387b9b6e..7614e100a 100644
--- a/SOPE/NGCards/NSString+NGCards.m
+++ b/SOPE/NGCards/NSString+NGCards.m
@@ -156,8 +156,8 @@
 
   string = [self stringByReplacingString: @"\\"
                  withString: @"\\\\"];
-  //  string = [string stringByReplacingString: @","
-  //                withString: @"\\,"];
+  string = [string stringByReplacingString: @","
+                   withString: @"\\,"];
   //  string = [string stringByReplacingString: @":"
   //                withString: @"\\:"];
   string = [string stringByReplacingString: @";"
diff --git a/SOPE/NGCards/iCalEntityObject.m b/SOPE/NGCards/iCalEntityObject.m
index bbe7fa262..9aba6a262 100644
--- a/SOPE/NGCards/iCalEntityObject.m
+++ b/SOPE/NGCards/iCalEntityObject.m
@@ -102,6 +102,7 @@
   return [[self uniqueChildWithTag: @"location"] value: 0];
 }
 
+#warning the "comment" accessors are actually "description" accessors, the "comment" ones are missing
 - (void) setComment: (NSString *) _value
 {
   [[self uniqueChildWithTag: @"description"] setValue: 0 to: _value];