diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index feda557..363c5d0 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,12 @@
+2008-08-11  Dmitrijs Ledkovs  <dmitrij.ledkov@gmail.com>
+
+	** Fixes bug #498095
+
+	* dialogs/event-page.glade: "D_escription" -> "_Description"
+	* dialogs/task-page.glade: As above and "_Due Date" -> "D_ue Date"
+
+	Change mnemonics to resolve clash with "_Edit".
+
 2008-08-08  Milan Crha  <mcrha@redhat.com>
 
 	** Fix for bug #544117
diff --git a/calendar/gui/dialogs/event-page.glade b/calendar/gui/dialogs/event-page.glade
index f593357..f0f1d2e 100644
--- a/calendar/gui/dialogs/event-page.glade
+++ b/calendar/gui/dialogs/event-page.glade
@@ -159,7 +159,7 @@
 	      <child>
 		<widget class="GtkLabel" id="description-label">
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">D_escription:</property>
+		  <property name="label" translatable="yes">_Description:</property>
 		  <property name="use_underline">True</property>
 		  <property name="use_markup">False</property>
 		  <property name="justify">GTK_JUSTIFY_CENTER</property>
diff --git a/calendar/gui/dialogs/task-page.glade b/calendar/gui/dialogs/task-page.glade
index a5eb1e2..d106381 100644
--- a/calendar/gui/dialogs/task-page.glade
+++ b/calendar/gui/dialogs/task-page.glade
@@ -169,7 +169,7 @@
 	      <child>
 		<widget class="GtkLabel" id="due-date-label">
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">_Due date:</property>
+		  <property name="label" translatable="yes">D_ue date:</property>
 		  <property name="use_underline">True</property>
 		  <property name="use_markup">False</property>
 		  <property name="justify">GTK_JUSTIFY_CENTER</property>
@@ -274,7 +274,7 @@
 	      <child>
 		<widget class="GtkLabel" id="label18">
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">De_scription:</property>
+		  <property name="label" translatable="yes">_Description:</property>
 		  <property name="use_underline">True</property>
 		  <property name="use_markup">False</property>
 		  <property name="justify">GTK_JUSTIFY_CENTER</property>
