diff --git a/ChangeLog b/ChangeLog
index 8ed0ffc10..5feac6cc0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-12-11  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* UI/PreferencesUI/UIxPreferences.m (-setUserShortDateFormat:):
+	fixed handling of the value "default", which actually should
+	unset the value in the user defaults.
+
 2009-12-09  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/SOGo/SOGoUserFolder.m (-toManyRelationShipKeys)
diff --git a/UI/PreferencesUI/UIxPreferences.m b/UI/PreferencesUI/UIxPreferences.m
index 1f80475ae..c70b677de 100644
--- a/UI/PreferencesUI/UIxPreferences.m
+++ b/UI/PreferencesUI/UIxPreferences.m
@@ -207,7 +207,10 @@
 
 - (void) setUserShortDateFormat: (NSString *) newFormat
 {
-  [userDefaults setShortDateFormat: newFormat];
+  if ([newFormat isEqualToString: @"default"])
+    [userDefaults unsetShortDateFormat];
+  else
+    [userDefaults setShortDateFormat: newFormat];
 }
 
 - (NSArray *) longDateFormatsList