diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 560d962ad9..172279d1a2 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,10 @@
+2008-08-04  Paul Bolle  <pebolle@tiscali.nl>
+
+	** Fix for bug #544157
+
+	* gui/GNOME_Evolution_Calendar.server.in.in:
+	Sort View / Window (sub)menu in shortcut order.
+
 2008-08-04  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes bug #249844
diff --git a/calendar/gui/GNOME_Evolution_Calendar.server.in.in b/calendar/gui/GNOME_Evolution_Calendar.server.in.in
index 831b7d5aa3..fb5d1160cb 100644
--- a/calendar/gui/GNOME_Evolution_Calendar.server.in.in
+++ b/calendar/gui/GNOME_Evolution_Calendar.server.in.in
@@ -75,7 +75,7 @@
 	<oaf_attribute name="evolution:button_label" type="string" _value="Tasks"/>
 	<oaf_attribute name="evolution:button_tooltips" type="string" _value="Tasks"/>
         <oaf_attribute name="evolution:button_icon" type="string" value="stock_todo"/>
-	<oaf_attribute name="evolution:button_sort_order" type="string" value="-8"/>
+	<oaf_attribute name="evolution:button_sort_order" type="string" value="-7"/>
 
         <oaf_attribute name="evolution:uri_schemas" type="stringv">
           <item value="task"/>
@@ -100,7 +100,7 @@
 	<oaf_attribute name="evolution:button_label" type="string" _value="Memos"/>
 	<oaf_attribute name="evolution:button_tooltips" type="string" _value="Memos"/>
         <oaf_attribute name="evolution:button_icon" type="string" value="stock_notes"/>
-	<oaf_attribute name="evolution:button_sort_order" type="string" value="-8"/>
+	<oaf_attribute name="evolution:button_sort_order" type="string" value="-6"/>
 </oaf_server>
 
 <oaf_server iid="OAFIID:GNOME_Evolution_Calendar_CompEditorFactory:@VERSION@"