diff --git a/UI/Scheduler/English.lproj/Localizable.strings b/UI/Scheduler/English.lproj/Localizable.strings
index aa8e4c08a..494b6d747 100644
--- a/UI/Scheduler/English.lproj/Localizable.strings
+++ b/UI/Scheduler/English.lproj/Localizable.strings
@@ -348,7 +348,7 @@
 validate_notitle           = "No title is set, continue?";
 validate_invalid_startdate = "Incorrect startdate field!";
 validate_invalid_enddate   = "Incorrect enddate field!";
-validate_endbeforestart    = "Enddate is before startdate!";
+validate_endbeforestart    = "The end date that you enteterd occurs before the start date.";
 
 "Tasks" = "Tasks";
 "Show completed tasks" = "Show completed tasks";
diff --git a/UI/Scheduler/French.lproj/Localizable.strings b/UI/Scheduler/French.lproj/Localizable.strings
index d0f002d0f..1688824d9 100644
--- a/UI/Scheduler/French.lproj/Localizable.strings
+++ b/UI/Scheduler/French.lproj/Localizable.strings
@@ -346,7 +346,7 @@
 validate_notitle           = "Le titre n'est pas rempli. Continuer quand-même ?";
 validate_invalid_startdate = "La date de début est invalide !";
 validate_invalid_enddate   = "La date de fin est invalide !";
-validate_endbeforestart    = "La date de fin est avant la date de début !";
+validate_endbeforestart    = "La date de fin est avant la date de début.";
 
 "Tasks" = "Tâches";
 "Show completed tasks" = "Afficher les tâches accomplies";
diff --git a/UI/Templates/SchedulerUI/UIxAppointmentEditor.wox b/UI/Templates/SchedulerUI/UIxAppointmentEditor.wox
index 533f88b0a..909b253a4 100644
--- a/UI/Templates/SchedulerUI/UIxAppointmentEditor.wox
+++ b/UI/Templates/SchedulerUI/UIxAppointmentEditor.wox
@@ -10,6 +10,7 @@
   className="UIxComponentEditor"
   var:component="event"
   var:saveURL="saveURL">
+
   <label><span id="allDay" class="content"><input class="checkBox"
         type="checkbox" var:selection="isAllDay"
         var:checked="isAllDay"
diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js
index 96a035a8e..79be003e6 100644
--- a/UI/WebServerResources/SchedulerUI.js
+++ b/UI/WebServerResources/SchedulerUI.js
@@ -901,7 +901,7 @@ function assignCalendar(name) {
 }
 
 function popupCalendar(node) {
-   var nodeId = node.getAttribute("inputId");
+   var nodeId = $(node).readAttribute("inputId");
    var input = $(nodeId);
    input.calendar.popup();
 
diff --git a/UI/WebServerResources/UIxAppointmentEditor.js b/UI/WebServerResources/UIxAppointmentEditor.js
index 0f441cfa8..12a3fe281 100644
--- a/UI/WebServerResources/UIxAppointmentEditor.js
+++ b/UI/WebServerResources/UIxAppointmentEditor.js
@@ -134,15 +134,13 @@ function toggleCycleVisibility(node, nodeName, hiddenValue) {
 
 function addContact(tag, fullContactName, contactId, contactName, contactEmail) {
   var uids = $('uixselector-participants-uidList');
-  log ("contactId: " + contactId);
+
   if (contactId)
     {
       var re = new RegExp("(^|,)" + contactId + "($|,)");
 
-      log ("uids: " + uids);
       if (!re.test(uids.value))
         {
-          log ("no match... realling adding");
           if (uids.value.length > 0)
             uids.value += ',' + contactId;
           else
@@ -154,8 +152,6 @@ function addContact(tag, fullContactName, contactId, contactName, contactEmail)
                               + ResourcesURL + '/abcard.gif" />'
                               + contactName + '</li>');
         }
-      else
-        log ("match... ignoring contact");
     }
 
   return false;
@@ -190,7 +186,6 @@ function _getShadowDate(which) {
   date.setHours(intValue);
   intValue = parseInt(window.timeWidgets[which]['minute'].getAttribute("shadow-value"));
   date.setMinutes(intValue);
-  //   window.alert("shadow: " + date);
 
   return date;
 }
@@ -225,19 +220,40 @@ function setStartDate(newStartDate) {
 }
 
 function setEndDate(newEndDate) {
-  //   window.alert(newEndDate);
   this._setDate('end', newEndDate);
 }
 
-function onAdjustEndTime(event) {
-  var dateDelta = (window.getStartDate().valueOf()
-                   - window.getShadowStartDate().valueOf());
-  //   window.alert(window.getEndDate().valueOf() + '  ' + dateDelta);
-  var newEndDate = new Date(window.getEndDate().valueOf() + dateDelta);
-  window.setEndDate(newEndDate);
-  window.timeWidgets['start']['date'].updateShadowValue();
-  window.timeWidgets['start']['hour'].updateShadowValue();
-  window.timeWidgets['start']['minute'].updateShadowValue();
+function onAdjustTime(event) {
+  var endDate = window.getEndDate();
+  var startDate = window.getStartDate();
+  
+  if ($(this).readAttribute("id").startsWith("start")) {
+    // Start date was changed
+    var delta = window.getShadowStartDate().valueOf() -
+      startDate.valueOf();
+    var newEndDate = new Date(endDate.valueOf() - delta);
+    window.setEndDate(newEndDate);
+    
+    window.timeWidgets['end']['date'].updateShadowValue();
+    window.timeWidgets['end']['hour'].updateShadowValue();
+    window.timeWidgets['end']['minute'].updateShadowValue();
+    window.timeWidgets['start']['date'].updateShadowValue();
+    window.timeWidgets['start']['hour'].updateShadowValue();
+    window.timeWidgets['start']['minute'].updateShadowValue();
+  }
+  else {
+    // End date was changed
+    var delta = endDate.valueOf() - startDate.valueOf();  
+    if (delta < 0) {
+      alert(labels.validate_endbeforestart);
+      var oldEndDate = window.getShadowEndDate();
+      window.setEndDate(oldEndDate);
+
+      window.timeWidgets['end']['date'].updateShadowValue();
+      window.timeWidgets['end']['hour'].updateShadowValue();
+      window.timeWidgets['end']['minute'].updateShadowValue();
+    }
+  }
 }
 
 function onAllDayChanged(event) {
@@ -251,11 +267,18 @@ function initTimeWidgets(widgets) {
   this.timeWidgets = widgets;
 
   Event.observe(widgets['start']['date'], "change",
-		this.onAdjustEndTime, false);
+		this.onAdjustTime, false);
   Event.observe(widgets['start']['hour'], "change",
-		this.onAdjustEndTime, false);
+		this.onAdjustTime, false);
   Event.observe(widgets['start']['minute'], "change",
-		this.onAdjustEndTime, false);
+		this.onAdjustTime, false);
+
+  Event.observe(widgets['end']['date'], "change",
+		this.onAdjustTime, false);
+  Event.observe(widgets['end']['hour'], "change",
+		this.onAdjustTime, false);
+  Event.observe(widgets['end']['minute'], "change",
+		this.onAdjustTime, false);
 
   var allDayLabel = $("allDay");
   var input = $(allDayLabel).childNodesWithTag("input")[0];
diff --git a/UI/WebServerResources/skycalendar.html b/UI/WebServerResources/skycalendar.html
index 265205de6..0b7b4fa9d 100644
--- a/UI/WebServerResources/skycalendar.html
+++ b/UI/WebServerResources/skycalendar.html
@@ -111,20 +111,8 @@ function set_datetime(n_datetime, b_close) {
             ? obj_caller.gen_tsmp(dt_datetime)
             : obj_caller.gen_date(dt_datetime)
           );
-          if (document.initEvent) {
-            var onChangeEvent = document.createEvent("Events");
-            onChangeEvent.initEvent("mousedown", false, true);
-            obj_caller.target.dispatchEvent(onChangeEvent);
-          }
-          else if (document.createEvent) {
-            var onChangeEvent = document.createEvent("UIEvents");
-            onChangeEvent.initEvent("mousedown", false, true);
-            obj_caller.target.dispatchEvent(onChangeEvent);
-          }
-          else {
-            // Francis: add support for IE
-            obj_caller.target.fireEvent("onmousedown");
-          }
+          var adjustTime = window.opener.onAdjustTime.bind(obj_caller.target);
+          adjustTime();
         }
 	if (b_close) window.close();
 	else obj_caller.popup(dt_datetime.valueOf());