diff --git a/ChangeLog b/ChangeLog
index a4c799c2f..d879621d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2007-09-14  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/Scheduler/UIxCalendarSelector.m ([UIxCalendarSelector
+	-calendars]): also returns the owner of the listed folders.
+
 	* SoObjects/Appointments/SOGoAppointmentFolder.m
 	([-deleteEntriesWithIds:ids]): moved method into SOGoFolder.
 
diff --git a/UI/Scheduler/UIxCalendarSelector.m b/UI/Scheduler/UIxCalendarSelector.m
index e077176ab..6bee8aad6 100644
--- a/UI/Scheduler/UIxCalendarSelector.m
+++ b/UI/Scheduler/UIxCalendarSelector.m
@@ -129,6 +129,8 @@ colorForNumber (unsigned int number)
 		    forKey: @"color"];
 	  isActive = [NSNumber numberWithBool: [folder isActive]];
 	  [calendar setObject: isActive forKey: @"active"];
+	  [calendar setObject: [folder ownerInContext: context]
+		    forKey: @"owner"];
 	  [calendars addObject: calendar];
 	}
     }
diff --git a/UI/Templates/SchedulerUI/UIxCalMainView.wox b/UI/Templates/SchedulerUI/UIxCalMainView.wox
index 9ab3d56d5..4c5039a3d 100644
--- a/UI/Templates/SchedulerUI/UIxCalMainView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalMainView.wox
@@ -49,6 +49,8 @@
 
   <div class="menu" id="calendarsMenu">
     <ul>
+      <li><var:string label:value="Modify"/></li>
+      <li><!-- separator --></li>
       <li><var:string label:value="New Calendar..."/></li>
       <li><var:string label:value="Delete Calendar"/></li>
       <li><!-- separator --></li>
diff --git a/UI/Templates/SchedulerUI/UIxCalendarSelector.wox b/UI/Templates/SchedulerUI/UIxCalendarSelector.wox
index a54fcfb6b..ae36b74f9 100644
--- a/UI/Templates/SchedulerUI/UIxCalendarSelector.wox
+++ b/UI/Templates/SchedulerUI/UIxCalendarSelector.wox
@@ -29,7 +29,8 @@
     </span>
     <ul id="calendarList" multiselect="yes">
       <var:foreach list="calendars" item="currentCalendar"
-	><li class="denied" var:id="currentCalendar.id">
+	><li class="denied" var:id="currentCalendar.id"
+	  var:owner="currentCalendar.owner">
 	  <input type="checkbox" class="checkBox"
 	    const:disabled="disabled"
 	    var:checked="currentCalendar.active" />
diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js
index 199a1a87c..8a4d6aa42 100644
--- a/UI/WebServerResources/SchedulerUI.js
+++ b/UI/WebServerResources/SchedulerUI.js
@@ -1299,7 +1299,9 @@ function getMenus() {
 				       editEvent, deleteEvent, "-",
 				       onSelectAll, "-",
 				       null, null);
-   menus["calendarsMenu"] = new Array(onCalendarNew, onCalendarRemove,
+   menus["calendarsMenu"] = new Array(onMenuModify,
+				      "-",
+				      onCalendarNew, onCalendarRemove,
 				      "-", null, null, "-",
 				      null, "-", onMenuSharing);
    menus["searchMenu"] = new Array(setSearchCriteria);
@@ -1355,6 +1357,35 @@ function initCalendarSelector() {
   Event.observe(links[2], "click",  onCalendarRemove);
 }
 
+function onMenuModify(event) {
+  var folders = $("calendarList");
+  var selected = folders.getSelectedNodes()[0];
+
+  if (UserLogin == selected.getAttribute("owner")) {
+    var node = selected.childNodes[4];
+    var currentName = node.nodeValue.trim();
+    var newName = window.prompt(labels["Address Book Name"],
+				currentName);
+    if (newName && newName.length > 0
+	&& newName != currentName) {
+      var url = (URLForFolderID(selected.getAttribute("id"))
+		 + "/renameFolder?name=" + escape(newName.utf8encode()));
+      triggerAjaxRequest(url, folderRenameCallback,
+			 {node: node, name: " " + newName});
+    }
+  } else
+    window.alert(clabels["Unable to rename that folder!"]);
+}
+
+function folderRenameCallback(http) {
+  if (http.readyState == 4) {
+    if (isHttpStatus204(http.status)) {
+      var dict = http.callbackData;
+      dict["node"].nodeValue = dict["name"];
+    }
+  }
+}
+
 function onCalendarNew(event) {
   createFolder(window.prompt(labels["Name of the Calendar"]),
 	       appendCalendar);