diff --git a/calendar/base/content/calendar-event-dialog.xul b/calendar/base/content/calendar-event-dialog.xul
index c00bc3616910..09a05182980b 100644
--- a/calendar/base/content/calendar-event-dialog.xul
+++ b/calendar/base/content/calendar-event-dialog.xul
@@ -24,6 +24,7 @@
    -   Stuart Parmenter <stuart.parmenter@oracle.com>
    -   Simon Paquet <bugzilla@babylonsounds.com>
    -   Joey Minta <jminta@gmail.com>
+   -   Cédric Corazza <cedric.corazza@wanadoo.fr>
    -
    - Alternatively, the contents of this file may be used under the terms of
    - either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -84,7 +85,9 @@
 
       <rows>
         <row align="center">
-          <label value="&newevent.title.label;"/>
+          <label value="&newevent.title.label;"
+                 accesskey="&newevent.title.accesskey;"
+                 control="item-title"/>
           <hbox flex="1" align="center">
             <textbox id="item-title" oninput="updateAccept();" flex="1"/>
             <menulist id="component-type" crop="none" disabled="true"
@@ -100,20 +103,27 @@
         </row>
 
         <row align="center">
-          <label value="&newevent.location.label;"/>
+          <label value="&newevent.location.label;"
+                 accesskey="&newevent.location.accesskey;"
+                 control="item-location"/>
           <textbox id="item-location"/>
         </row>
 
         <row align ="center">
           <hbox align="center">
-            <label value="&newevent.from.label;" class="event-only"/>
-            <label value="&newevent.date.label;" class="todo-only"/>
+            <label value="&newevent.from.label;" class="event-only"
+                   accesskey="&newevent.from.accesskey;"
+                   control="event-starttime"/>
+            <label value="&newevent.date.label;" class="todo-only"
+                   accesskey="&newevent.date.accesskey;"
+                   control="todo-entrydate"/>
           </hbox>
           <hbox>
             <datetimepicker id="event-starttime" onchange="onStartTimeChange();" 
                             class="event-only"/>
             <checkbox id="event-all-day" oncommand="updateAllDay();" 
-                      class="event-only" label="&newevent.alldayevent.label;"/>
+                      class="event-only" label="&newevent.alldayevent.label;"
+                      accesskey="&newevent.alldayevent.accesskey;"/>
             <checkbox id="todo-has-entrydate" oncommand="updateEntryDate();" 
                       class="todo-only checkbox-no-label"/>
             <datetimepicker id="todo-entrydate" onchange="onStartTimeChange();" 
@@ -124,8 +134,12 @@
 
         <row>
           <hbox align="center">
-            <label value="&newevent.to.label;" class="event-only"/>
-            <label value="&newtodo.duedate.label;" class="todo-only"/>
+            <label value="&newevent.to.label;" class="event-only"
+                   accesskey="&newevent.to.accesskey;"
+                   control="event-endtime"/>
+            <label value="&newtodo.duedate.label;" class="todo-only"
+                   accesskey="&newtodo.duedate.accesskey;"
+                   control="todo-duedate"/>
           </hbox>
           <vbox>
             <hbox align="center">
@@ -133,8 +147,11 @@
               <checkbox id="todo-has-duedate" oncommand="updateDueDate();" class="todo-only checkbox-no-label"/>
               <datetimepicker id="todo-duedate" onchange="onEndTimeChange();" class="todo-only"/>
               <checkbox id="item-recurrence" oncommand="updateRecurrence();"
-                        label="&newevent.repeat.label2;"/>
-              <button id="set-recurrence" label="&newevent.set.label;" oncommand="editRecurrence();"/>
+                      label="&newevent.repeat2.label;"
+                      accesskey="&newevent.repeat2.accesskey;"/>
+              <button id="set-recurrence" label="&newevent.set.label;"
+                      oncommand="editRecurrence();"
+                      accesskey="&newevent.set.accesskey;"/>
             </hbox>
             <label id="end-time-warning" class="warning-text-class"
                    value="&newevent.endtime.warning;"/>
@@ -148,7 +165,9 @@
         </row>
 
         <row align="center">
-          <label value="&newevent.server.label;"/>
+          <label value="&newevent.server.label;"
+                 accesskey="&newevent.server.accesskey;"
+                 control="item-calendar"/>
           <hbox align="center">
             <menulist id="item-calendar" oncommand="updateAccept()"/>
             <label id="read-only-cal"
@@ -156,7 +175,9 @@
                    class="warning-text-class" hidden="true"/>
             <spacer flex="1"/>
             <hbox id="categories-box" align="center">
-                <label value="&newtodo.categories.label;" class="label"/>
+                <label value="&newtodo.categories.label;" class="label"
+                       accesskey="&newtodo.categories.accesskey;"
+                       control="item-categories"/>
                 <menulist id="item-categories" oncommand="categorySelect(this.value)"/>
             </hbox>
           </hbox>
@@ -171,12 +192,16 @@
         <!-- We work off of this row's collapsed state to determine whether or
              not to show details when loading the dialog -->
         <row id="description-row" details="true" collapsed="true" persist="collapsed" flex="1">
-          <label value="&newevent.description.label;"/>
+          <label value="&newevent.description.label;"
+                 accesskey="&newevent.description.accesskey;"
+                 control="item-description"/>
           <textbox id="item-description" multiline="true" rows="4" flex="1"/>
         </row>
 
         <row details="true">
-          <label value="&newevent.attendees.label;"/>
+          <label value="&newevent.attendees.label;"
+                 accesskey="&newevent.attendees.accesskey;"
+                 control="attendees-list"/>
           <hbox flex="1">
             <!-- XXX This should be changed to a richlistbox that actually
                -     works and doesn't need to be constrained by max-height.
@@ -193,7 +218,9 @@
 
               <rows>
                 <row align="center">
-                  <label value="&newevent.privacy.label;"/>
+                  <label value="&newevent.privacy.label;"
+                         accesskey="&newevent.privacy.accesskey;"
+                         control="privacy-menulist"/>
                   <menulist id="privacy-menulist" crop="none">
                     <menupopup>
                       <menuitem label="&newevent.public.label;" value="PUBLIC"/>
@@ -205,7 +232,9 @@
 
                 <row align="center">
                   <label id="priority-label"
-                         value="&newtodo.priority.label;"/>
+                         value="&newtodo.priority.label;"
+                         accesskey="&newtodo.priority.accesskey;"
+                         control="priority-levels"/>
                   <menulist id="priority-levels">
                     <menupopup>
                       <menuitem label="&priority.level.none;"   value="0"/>
@@ -218,7 +247,9 @@
 
                 <row align="center">
                   <label id="status-label" class="event-only"
-                         value="&newevent.status.label;"/>
+                         value="&newevent.status.label;"
+                         accesskey="&newevent.status.accesskey;"
+                         control="event-status"/>
                   <menulist id="event-status" class="event-only">
                     <menupopup>
                       <menuitem label="&newevent.status.none.label;"
@@ -234,7 +265,9 @@
                 </row>
 
                 <row align="center">
-                  <label value="&newevent.alarm.label;"/>
+                  <label value="&newevent.alarm.label;"
+                         accesskey="&newevent.alarm.accesskey;"
+                         control="item-alarm"/>
                   <hbox align="center">
                     <menulist id="item-alarm" oncommand="updateAlarm()">
                       <menupopup>
@@ -290,11 +323,13 @@
         </row>
 
         <row align="center" details="true">
-          <label value="&newevent.uri.label;"/>
+          <label value="&newevent.uri.label;"
+                 accesskey="&newevent.uri.accesskey;" control="item-url"/>
           <hbox flex="1">
             <textbox id="item-url" flex="1" oninput="updateURL(this.value)"/>
             <button id="load-url-button" oncommand="loadURL()"
-                    label="&newevent.uri.visit.label;"/>
+                    label="&newevent.uri.visit.label;"
+                    accesskey="&newevent.uri.visit.accesskey;"/>
           </hbox>
         </row>
 
diff --git a/calendar/locales/en-US/chrome/calendar/calendar.dtd b/calendar/locales/en-US/chrome/calendar/calendar.dtd
index 244f3b719e7c..8894d116fc6e 100644
--- a/calendar/locales/en-US/chrome/calendar/calendar.dtd
+++ b/calendar/locales/en-US/chrome/calendar/calendar.dtd
@@ -84,30 +84,43 @@
 <!ENTITY priority.level.high.accesskey    "H">
 
 <!ENTITY newevent.title.label        "Title" >
+<!ENTITY newevent.title.accesskey    "i" >
 <!ENTITY newevent.location.label     "Location" >
+<!ENTITY newevent.location.accesskey "L" >
 <!ENTITY newevent.start.label        "Start" >
 <!ENTITY newevent.date.label         "Date" >
+<!ENTITY newevent.date.accesskey     "a" >
 <!ENTITY newevent.startdate.label    "Start" >
 <!ENTITY newevent.from.label         "From" >
+<!ENTITY newevent.from.accesskey     "F" >
 <!ENTITY newevent.to.label           "To" >
+<!ENTITY newevent.to.accesskey       "T" >
 <!ENTITY newevent.enddate.label      "End" >
 <!ENTITY newevent.set.label          "Set pattern..." >
+<!ENTITY newevent.set.accesskey      "n" >
 <!ENTITY newevent.settings.label     "General Settings" >
 <!ENTITY newevent.none.label         "none" >
 <!ENTITY newevent.custom.label       "Custom..." >
 <!ENTITY newevent.alldayevent.label  "All Day" >
+<!ENTITY newevent.alldayevent.accesskey "A" >
 <!ENTITY newevent.description.label  "Description" >
+<!ENTITY newevent.description.accesskey "D" >
 <!ENTITY newevent.uri.label          "URL" >
+<!ENTITY newevent.uri.accesskey      "U" >
 <!ENTITY newevent.uri.visit.label    "Visit URL" >
+<!ENTITY newevent.uri.visit.accesskey "V" >
 <!ENTITY newevent.before.label       "before" >
 <!ENTITY newevent.after.label        "after" >
 <!ENTITY newevent.private.label      "Private" >
 <!ENTITY newevent.privacy.label      "Privacy" >
+<!ENTITY newevent.privacy.accesskey  "P" >
 <!ENTITY newevent.private.note       "This event is private." >
 <!ENTITY newevent.public.label       "Public" >
 <!ENTITY newevent.confidential.label "Confidential" >
 <!ENTITY newevent.alarm.label        "Alarm" >
+<!ENTITY newevent.alarm.accesskey    "m" >
 <!ENTITY newevent.server.label       "Calendar" >
+<!ENTITY newevent.server.accesskey   "C" >
 <!ENTITY newevent.invite.label       "Invite" >
 <!ENTITY newevent.details.label      "Details" >
 <!ENTITY newevent.email.label        "Email Alarm To:" >
@@ -116,11 +129,11 @@
 <!ENTITY newevent.end.label          "ends" >
 <!ENTITY newevent.isdue.label        "is due" >
 <!ENTITY newevent.repeat.label       "Repeat every" >
-<!ENTITY newevent.repeat.label2      "Repeat" >
+<!ENTITY newevent.repeat2.label      "Repeat" >
+<!ENTITY newevent.repeat2.accesskey  "R" >
 <!ENTITY newevent.until.label        "Until" >
 <!ENTITY newevent.forever.label      "Forever" >
 <!ENTITY newevent.numberoftimes.label "Number of times" >
-<!ENTITY newevent.category.label      "Category" >
 <!ENTITY newevent.popup.label         "Popup" >
 <!ENTITY newevent.popupsound.label    "Popup &amp; Play Sound" >
 <!ENTITY newevent.sendmail.label      "Send Email to:" >
@@ -163,11 +176,13 @@
 
 <!ENTITY newevent.attendees.tab.label       "Attendees" >
 <!ENTITY newevent.attendees.label           "Attendees" >
+<!ENTITY newevent.attendees.accesskey       "e" >
 <!ENTITY calendar.edit.attendees            "Edit Attendees" >
 <!ENTITY newevent.attachments.tab.label     "Attachments" >
 <!ENTITY newevent.advanced.tab.label        "Advanced" >
 <!ENTITY newevent.completed.label           "Completed" >
 <!ENTITY newevent.status.label "Status" >
+<!ENTITY newevent.status.accesskey "S" >
 <!ENTITY newevent.status.longlabel "Event Status">
 <!ENTITY newevent.status.needsaction.label "Needs Action" >
 <!ENTITY newevent.status.inprogress.label  "In Process" >
@@ -187,13 +202,15 @@
 
 <!ENTITY newtodo.completed.label "Completed">
 <!ENTITY newtodo.duedate.label "Due Date">
+<!ENTITY newtodo.duedate.accesskey "t">
 <!ENTITY newtodo.startdate.label "Start Date">
 <!ENTITY newtodo.priority.label "Priority">
+<!ENTITY newtodo.priority.accesskey "y">
 <!ENTITY newtodo.percentcomplete.label "&#37; complete">
 <!ENTITY newtodo.categories.label "Category">
+<!ENTITY newtodo.categories.accesskey "o">
 <!ENTITY newtodo.starttime.warning "Your start date occurs after your due date.">
 <!ENTITY newtodo.cancelled.label "Cancelled">
-<!ENTITY newtodo.status.label "Status">
 <!ENTITY newtodo.beforealarm.label  "before this task" >
 <!ENTITY newtodo.beforealarmends.label  "before the task is due" >
 <!ENTITY newtodo.newtodo.tab.label "Task" >
@@ -208,7 +225,6 @@
 
 <!ENTITY event.alarm.checkbox.label "Remind me again in " >
 
-<!ENTITY event.title.alarm         "Alarm" >
 <!ENTITY event.title.new         "New Event" >
 <!ENTITY event.title.label       "Edit Item" >
 <!ENTITY event.title.edit        "Edit Event" >