diff --git a/ChangeLog b/ChangeLog
index 504865448..0991059fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2008-03-25  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/Scheduler/UIxComponentEditor.m ([UIxComponentEditor
+	-takeValuesFromRequest:_rqinContext:_ctx]): treat the regular
+	monthly recurrences as all others.
+
 	* SoObjects/SOGo/SOGoGCSFolder.m ([SOGoGCSFolder
 	-davSetProperties:setPropsremovePropertiesNamed:removedPropsinContext:localContext]):
 	returns an exception if the property to modify is not
diff --git a/UI/Scheduler/UIxComponentEditor.m b/UI/Scheduler/UIxComponentEditor.m
index 1521b06d9..91d40d0fb 100644
--- a/UI/Scheduler/UIxComponentEditor.m
+++ b/UI/Scheduler/UIxComponentEditor.m
@@ -1428,7 +1428,7 @@ RANGE(2);
 	// We recur on specific days...
 	if ([[self repeat2] intValue] == 1)
 	  {
-	    [theRule setNamedValue: @"bymonthday"  to: [self repeat5]];
+	    [theRule setNamedValue: @"bymonthday" to: [self repeat5]];
 	  }
 	else
 	  {
@@ -1526,16 +1526,12 @@ RANGE(2);
 			       |iCalWeekDayFriday)];
 	  [rule setFrequency: iCalRecurrenceFrequenceDaily];
 	}
-      else if ([repeat caseInsensitiveCompare: @"MONTHLY"] == NSOrderedSame)
-	{
-	  [rule setNamedValue: @"bymonthday"
-		to: [NSString stringWithFormat: @"%d", [[component startDate] dayOfMonth]]];
-	  [rule setFrequency: iCalRecurrenceFrequenceMonthly];
-	}
-      else if ([repeat caseInsensitiveCompare: @"DAILY"] == NSOrderedSame ||
-	       [repeat caseInsensitiveCompare: @"WEEKLY"] == NSOrderedSame ||
-	       [repeat caseInsensitiveCompare: @"YEARLY"] == NSOrderedSame)
+      else if ([repeat caseInsensitiveCompare: @"MONTHLY"] == NSOrderedSame
+	       || [repeat caseInsensitiveCompare: @"DAILY"] == NSOrderedSame
+	       || [repeat caseInsensitiveCompare: @"WEEKLY"] == NSOrderedSame
+	       || [repeat caseInsensitiveCompare: @"YEARLY"] == NSOrderedSame)
 	{
+	  [rule setInterval: @"1"];
 	  [rule setFrequency:
 		  (iCalRecurrenceFrequency) [rule valueForFrequency: repeat]];
 	}