diff --git a/SoObjects/SOGo/SOGoDefaults.plist b/SoObjects/SOGo/SOGoDefaults.plist
index 77848966a..24f91bcf4 100644
--- a/SoObjects/SOGo/SOGoDefaults.plist
+++ b/SoObjects/SOGo/SOGoDefaults.plist
@@ -51,8 +51,8 @@
     SOGoTimeFormat = "%H:%M";
     SOGoFirstDayOfWeek = 0;
     SOGoFirstWeekOfYear = "January1";
-    SOGoShortDateFormat = "default";
-    SOGoLongDateFormat = "default";
+    SOGoShortDateFormat = "%d-%b-%y";
+    SOGoLongDateFormat = "%A, %B %d, %Y";
 
     SOGoIMAPServer = "localhost";
     SOGoMailDomain = "localhost";
diff --git a/UI/PreferencesUI/UIxPreferences.m b/UI/PreferencesUI/UIxPreferences.m
index 5fdf859c2..8ed908ebf 100644
--- a/UI/PreferencesUI/UIxPreferences.m
+++ b/UI/PreferencesUI/UIxPreferences.m
@@ -257,7 +257,7 @@ static NSArray *reminderValues = nil;
   unsigned int nbr;
   BOOL done;
 
-  shortDateFormatsList = [NSMutableArray arrayWithObject: @"default"];
+  shortDateFormatsList = [NSMutableArray array];
 
   nbr = 0;
   done = NO;
@@ -2086,6 +2086,14 @@ static NSArray *reminderValues = nil;
       // We convert our object into a mutable one
       v = [[v mutableCopy] autorelease];
 
+
+      // We remove short/long date formats if they are default ones
+      if ([[v objectForKey: @"SOGoShortDateFormat"] isEqualToString: @"default"])
+        [v removeObjectForKey: @"SOGoShortDateFormat"];
+
+      if ([[v objectForKey: @"SOGoLongDateFormat"] isEqualToString: @"default"])
+        [v removeObjectForKey: @"SOGoLongDateFormat"];
+      
       //
       // We sanitize mail labels
       //