diff --git a/ChangeLog b/ChangeLog
index 06fbc9f12..2de356649 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2010-02-15  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/WebServerResources/SchedulerUI.js (gotoToday): set the
+	selected day to the today date.
+
 	* UI/WebServerResources/SchedulerUIDnD.js
 	(SOGoEventDragGhostController.showGhosts): ghosts now also have an
 	"eventInside" DIV to contain the title and draw the border. This
diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js
index 814602615..31c3de91f 100644
--- a/UI/WebServerResources/SchedulerUI.js
+++ b/UI/WebServerResources/SchedulerUI.js
@@ -697,8 +697,7 @@ function onDateSelectorGotoMonth(event) {
 
 function onCalendarGotoDay(node) {
     var day = node.getAttribute("date");
-    var needRefresh = (listFilter == 'view_selectedday'
-                       && day != currentDay);
+    var needRefresh = (listFilter == 'view_selectedday' && day != currentDay);
 
     changeDateSelectorDisplay(day);
     changeCalendarDisplay( { "day": day } );
@@ -709,6 +708,8 @@ function onCalendarGotoDay(node) {
 }
 
 function gotoToday() {
+    var todayDate = new Date();
+    selectedDayDate = todayDate.getDayString();
     changeDateSelectorDisplay('');
     changeCalendarDisplay();