diff --git a/ChangeLog b/ChangeLog
index 2904bdb48..ea03e541b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-09-06  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* UI/SOGoUI/UIxComponent.m ([UIxComponent -selectedDate]): make
+	sure the numbers in dateString are formatted so as to take 4 chars
+	for the year and 2 for the day and the month, otherwise
+	NSCalendarDate will return a nil date.
+
 2006-09-05  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* UI/SOGoUI/UIxComponent.m ([UIxComponent -selectedDate]): add the
diff --git a/UI/SOGoUI/UIxComponent.m b/UI/SOGoUI/UIxComponent.m
index 1bc1e386a..87d8b4b58 100644
--- a/UI/SOGoUI/UIxComponent.m
+++ b/UI/SOGoUI/UIxComponent.m
@@ -384,7 +384,7 @@ static BOOL uixDebugEnabled = NO;
       else
         {
           cdate = [NSCalendarDate calendarDate];
-          dateString = [NSString stringWithFormat: @"%d%d%d %@",
+          dateString = [NSString stringWithFormat: @"%.4d%.2d%.2d %@",
                                  [cdate yearOfCommonEra],
                                  [cdate monthOfYear],
                                  [cdate dayOfMonth],