diff --git a/ChangeLog b/ChangeLog
index e66008742..e0e014cf1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-12-05  Ludovic Marcotte  <lmarcotte@inverse.ca>
+
+	* SOPE/NGCards/NSString+NGCards.m
+	We avoid escaping the comma during content generation
+	* SOPE/NGCards/iCalDailyRecurrenceCalculator.m
+	Fixed RRULE lamenesses.
+
 2008-12-04  Ludovic Marcotte  <lmarcotte@inverse.ca>
 
 	* Fixed a typ in SoObjects/SOGo/SOGoCache.m
diff --git a/SOPE/NGCards/NSString+NGCards.m b/SOPE/NGCards/NSString+NGCards.m
index f17b9889d..e791879c1 100644
--- a/SOPE/NGCards/NSString+NGCards.m
+++ b/SOPE/NGCards/NSString+NGCards.m
@@ -104,10 +104,10 @@ static NSString *commaSeparator = nil;
 
   string = [self stringByReplacingString: @"\\"
                  withString: @"\\\\"];
-  string = [string stringByReplacingString: @","
-                   withString: @"\\,"];
-//   string = [string stringByReplacingString: @":"
-//                    withString: @"\\:"];
+  //  string = [string stringByReplacingString: @","
+  //                withString: @"\\,"];
+  //  string = [string stringByReplacingString: @":"
+  //                withString: @"\\:"];
   string = [string stringByReplacingString: @";"
                    withString: @"\\;"];
   string = [string stringByReplacingString: @"\n"
diff --git a/SOPE/NGCards/iCalDailyRecurrenceCalculator.m b/SOPE/NGCards/iCalDailyRecurrenceCalculator.m
index 6c9fd423b..a8ed612bd 100644
--- a/SOPE/NGCards/iCalDailyRecurrenceCalculator.m
+++ b/SOPE/NGCards/iCalDailyRecurrenceCalculator.m
@@ -68,7 +68,7 @@
     }
     else {
       jnRuleLast = (interval * [self->rrule repeatCount])
-      + jnFirst;
+      + jnFirst - 1;
       if (jnRuleLast < jnStart)
         return nil;
     }
@@ -104,7 +104,7 @@
 	//        to check if the end date is also within it.
 	if ([self->rrule byDayMask]) {
 	  mask = ([start dayOfWeek]
-		  ? (unsigned int) 1 << ([start dayOfWeek] - 1)
+		  ? (unsigned int) 1 << ([start dayOfWeek])
 		  : iCalWeekDaySunday);
 	  if (([self->rrule byDayMask]&mask) != mask) continue;
 	}