diff --git a/UI/Scheduler/English.lproj/Localizable.strings b/UI/Scheduler/English.lproj/Localizable.strings
index 05ff3cebb..68edabe86 100644
--- a/UI/Scheduler/English.lproj/Localizable.strings
+++ b/UI/Scheduler/English.lproj/Localizable.strings
@@ -240,9 +240,12 @@
 "prio_9" = "Low";
 
 /* access classes (privacy) */
-"privacy_PUBLIC" = "Public";
-"privacy_CONFIDENTIAL" = "Confidential";
-"privacy_PRIVATE" = "Private";
+"PUBLIC_vevent" = "Public Event";
+"CONFIDENTIAL_vevent" = "Confidential Event";
+"PRIVATE_vevent" = "Private Event";
+"PUBLIC_vtodo" = "Public Task";
+"CONFIDENTIAL_vtodo" = "Confidential Task";
+"PRIVATE_vtodo" = "Private Task";
 
 /* status type */
 "status_" = "Not specified";
diff --git a/UI/Scheduler/French.lproj/Localizable.strings b/UI/Scheduler/French.lproj/Localizable.strings
index ea72714b8..49515c124 100644
--- a/UI/Scheduler/French.lproj/Localizable.strings
+++ b/UI/Scheduler/French.lproj/Localizable.strings
@@ -238,9 +238,12 @@
 "prio_9" = "Basse";
 
 /* access classes (privacy) */
-"privacy_PUBLIC" = "Public";
-"privacy_CONFIDENTIAL" = "Date et heure seulement";
-"privacy_PRIVATE" = "Privé";
+"PUBLIC_vevent" = "Événement public";
+"CONFIDENTIAL_vevent" = "Événement confidentiel";
+"PRIVATE_vevent" = "Événement privé";
+"PUBLIC_vtodo" = "Tâche publique";
+"CONFIDENTIAL_vtodo" = "Tâche confidentielle";
+"PRIVATE_vtodo" = "Tâche privée";
 
 /* status type */
 "status_" = "Non-spécifié";
diff --git a/UI/Scheduler/UIxComponentEditor.m b/UI/Scheduler/UIxComponentEditor.m
index 290985885..9684e36b9 100644
--- a/UI/Scheduler/UIxComponentEditor.m
+++ b/UI/Scheduler/UIxComponentEditor.m
@@ -184,7 +184,11 @@
 
 - (NSString *) itemPrivacyText
 {
-  return [self labelForKey: [NSString stringWithFormat: @"privacy_%@", item]];
+  NSString *tag;
+
+  tag = [[self clientObject] componentTag];
+
+  return [self labelForKey: [NSString stringWithFormat: @"%@_%@", item, tag]];
 }
 
 - (NSString *) itemStatusText
@@ -325,11 +329,6 @@
   return calendarList;
 }
 
-- (NSString *) itemCalendarText
-{
-  return item;
-}
-
 - (NSString *) calendarsFoldersList
 {
   NSArray *calendars;
diff --git a/UI/Templates/SchedulerUI/UIxComponentEditor.wox b/UI/Templates/SchedulerUI/UIxComponentEditor.wox
index b80c661a2..2cee81ffd 100644
--- a/UI/Templates/SchedulerUI/UIxComponentEditor.wox
+++ b/UI/Templates/SchedulerUI/UIxComponentEditor.wox
@@ -15,13 +15,11 @@
   <script type="text/javascript" rsrc:src="UIxComponentEditor.js"><!-- space --></script>
 
   <div class="menu" id="privacy-menu">
-    <ul id="">
-      <li onmouseup="onMenuSetClassification(event, 'PUBLIC');"><var:string
-          label:value="Public Event" /></li>
-      <li onmouseup="onMenuSetClassification(event, 'CONFIDENTIAL');"><var:string
-          label:value="Show Time and Date Only" /></li>
-      <li onmouseup="onMenuSetClassification(event, 'PRIVATE');"><var:string
-          label:value="Private Event" /></li>
+    <ul id="itemPrivacyList">
+      <var:foreach list="privacyClasses" item="item">
+	<li var:classification="item"><var:string
+	    var:value="itemPrivacyText" /></li>
+      </var:foreach>
     </ul>
   </div>
 
diff --git a/UI/WebServerResources/UIxComponentEditor.js b/UI/WebServerResources/UIxComponentEditor.js
index 8e2945d2f..632d1f865 100644
--- a/UI/WebServerResources/UIxComponentEditor.js
+++ b/UI/WebServerResources/UIxComponentEditor.js
@@ -1,5 +1,3 @@
-window.addEventListener("load", onComponentEditorLoad, false);
-
 function onPopupAttendeesWindow(event) {
    if (event)
       event.preventDefault();
@@ -51,16 +49,14 @@ function onPopupDocumentWindow(event) {
    return false;
 }
 
-function onMenuSetClassification(event, classification) {
+function onMenuSetClassification(event) {
    event.cancelBubble = true;
 
-   var node = event.target;
-   if (node.tagName != "LI")
-      node = node.getParentWithTagName("li");
-   if (node.parentNode.chosenNode)
-      node.parentNode.chosenNode.removeClassName("_chosen");
-   node.addClassName("_chosen");
-   node.parentNode.chosenNode = node;
+   var classification = this.getAttribute("classification");
+   if (this.parentNode.chosenNode)
+      this.parentNode.chosenNode.removeClassName("_chosen");
+   this.addClassName("_chosen");
+   this.parentNode.chosenNode = this;
 
    log("classification: " + classification);
    var privacyInput = document.getElementById("privacy");
@@ -157,4 +153,10 @@ function onComponentEditorLoad(event) {
    var onSelectionChangeEvent = document.createEvent("Event");
    onSelectionChangeEvent.initEvent("change", false, false);
    list.dispatchEvent(onSelectionChangeEvent);
+
+   var menuItems = $("itemPrivacyList").childNodesWithTag("li");
+   for (var i = 0; i < menuItems.length; i++)
+      menuItems[i].addEventListener("mouseup", onMenuSetClassification, false);
 }
+
+window.addEventListener("load", onComponentEditorLoad, false);