diff --git a/ChangeLog b/ChangeLog
index 42e45b227..92cd3825a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-03  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* UI/Scheduler/UIxCalView.m ([UIxCalView -setCurrentView:]): avoid
+	writing the user defaults if the current view hasn't change.
+
 2009-07-29  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* UI/Scheduler/UIxComponentEditor.m ([UIxComponentEditor
diff --git a/UI/Scheduler/UIxCalView.m b/UI/Scheduler/UIxCalView.m
index af82a6ebe..f03419bc4 100644
--- a/UI/Scheduler/UIxCalView.m
+++ b/UI/Scheduler/UIxCalView.m
@@ -1,6 +1,6 @@
 /* UIxCalMainView.m - this file is part of SOGo
  *
- * Copyright (C) 2006, 2007 Inverse inc.
+ * Copyright (C) 2006-2009 Inverse inc.
  *
  * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
  *
@@ -360,10 +360,12 @@ static BOOL shouldDisplayWeekend = NO;
       moduleSettings = [NSMutableDictionary dictionary];
       [ud setObject: moduleSettings forKey: module];
     }
-  
-  [moduleSettings setObject: theView
-		     forKey: @"View"];
-  [ud synchronize];
+  if (![theView isEqualToString: (NSString*)[moduleSettings objectForKey: @"View"]])
+    {
+      [moduleSettings setObject: theView
+			 forKey: @"View"];
+      [ud synchronize];
+    }
 }
 
 /* current day related */