diff --git a/UI/WebServerResources/UIxTaskEditor.js b/UI/WebServerResources/UIxTaskEditor.js
index 0cb69be84..65430d2cd 100644
--- a/UI/WebServerResources/UIxTaskEditor.js
+++ b/UI/WebServerResources/UIxTaskEditor.js
@@ -1,184 +1,188 @@
 /*
- Copyright (C) 2005 SKYRIX Software AG
+  Copyright (C) 2005 SKYRIX Software AG
  
- This file is part of OpenGroupware.org.
+  This file is part of SOGo.
  
- OGo is free software; you can redistribute it and/or modify it under
- the terms of the GNU Lesser General Public License as published by the
- Free Software Foundation; either version 2, or (at your option) any
- later version.
+  OGo is free software; you can redistribute it and/or modify it under
+  the terms of the GNU Lesser General Public License as published by the
+  Free Software Foundation; either version 2, or (at your option) any
+  later version.
  
- OGo is distributed in the hope that it will be useful, but WITHOUT ANY
- WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
- License for more details.
+  OGo is distributed in the hope that it will be useful, but WITHOUT ANY
+  WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+  License for more details.
  
- You should have received a copy of the GNU Lesser General Public
- License along with OGo; see the file COPYING.  If not, write to the
- Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
- 02111-1307, USA.
+  You should have received a copy of the GNU Lesser General Public
+  License along with OGo; see the file COPYING.  If not, write to the
+  Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+  02111-1307, USA.
 */
 
 var contactSelectorAction = 'calendars-contacts';
 
 function uixEarlierDate(date1, date2) {
-   // can this be done in a sane way?
-   //   cuicui = 'year';
-   if (date1.getYear()  < date2.getYear()) return date1;
-   if (date1.getYear()  > date2.getYear()) return date2;
-   // same year
-   //   cuicui += '/month';
-   if (date1.getMonth() < date2.getMonth()) return date1;
-   if (date1.getMonth() > date2.getMonth()) return date2;
-   //   // same month
-   //   cuicui += '/date';
-   if (date1.getDate() < date2.getDate()) return date1;
-   if (date1.getDate() > date2.getDate()) return date2;
-   // same day
-   return null;
+  // can this be done in a sane way?
+  //   cuicui = 'year';
+  if (date1 && date2) {
+    if (date1.getYear()  < date2.getYear()) return date1;
+    if (date1.getYear()  > date2.getYear()) return date2;
+  // same year
+  //   cuicui += '/month';
+    if (date1.getMonth() < date2.getMonth()) return date1;
+    if (date1.getMonth() > date2.getMonth()) return date2;
+  //   // same month
+  //   cuicui += '/date';
+    if (date1.getDate() < date2.getDate()) return date1;
+    if (date1.getDate() > date2.getDate()) return date2;
+  }
+  // same day
+  return null;
+}
+
+function validateDate(date, label) {
+  var result, dateValue;
+
+  dateValue = date.calendar.prs_date(date.value);
+  if (date.value.length != 10 || !dateValue) {
+    alert(label.decodeEntities());
+    result = false;
+  } else
+    result = dateValue;
+
+  return result;
 }
 
 function validateAptEditor() {
-   var e, startdate, enddate, tmpdate;
+  var e, startdate, enddate, tmpdate;
 
-   e = document.getElementById('summary');
-   if (e.value.length == 0) {
-      if (!confirm(labels.validate_notitle.decodeEntities()))
-         return false;
-   }
+  e = document.getElementById('summary');
+  if (e.value.length == 0
+      && !confirm(labels.validate_notitle.decodeEntities()))
+    return false;
 
-   e = document.getElementById('startTime_date');
-   if (!e.disabled) {
-      if (e.value.length != 10) {
-         alert(labels.validate_invalid_startdate.decodeEntities());
-         return false;
-      }
-      startdate = e.calendar.prs_date(e.value);
-      if (startdate == null) {
-         alert(labels.validate_invalid_startdate.decodeEntities());
-         return false;
-      }
-   }
-   
-   e = document.getElementById('dueTime_date');
-   if (!e.disabled) {
-      if (e.value.length != 10) {
-         alert(labels.validate_invalid_enddate.decodeEntities());
-         return false;
-      }
-      enddate = e.calendar.prs_date(e.value);
-      if (enddate == null) {
-         alert(labels.validate_invalid_enddate.decodeEntities());
-         return false;
-      }
-   }
-   //   cuicui = '';
-   tmpdate = uixEarlierDate(startdate, enddate);
-   if (tmpdate == enddate) {
+  e = document.getElementById('startTime_date');
+  if (!e.disabled) {
+    startdate = validateDate(e, labels.validate_invalid_startdate);
+    if (!startdate)
+      return false;
+  }
+
+  e = document.getElementById('dueTime_date');
+  if (!e.disabled) {
+    enddate = validateDate(e, labels.validate_invalid_enddate);
+    if (!enddate)
+      return false;
+  }
+
+  if (startdate && enddate) {
+    tmpdate = uixEarlierDate(startdate, enddate);
+    if (tmpdate == enddate) {
       //     window.alert(cuicui);
       alert(labels.validate_endbeforestart.decodeEntities());
       return false;
-   }
-   else if (tmpdate == null /* means: same date */) {
+    }
+    else if (tmpdate == null /* means: same date */) {
       // TODO: check time
       var start, end;
       
       start = parseInt(document.forms[0]['startTime_time_hour'].value);
       end = parseInt(document.forms[0]['dueTime_time_hour'].value);
-
+      
       if (start > end) {
-         alert(labels.validate_endbeforestart.decodeEntities());
-         return false;
+        alert(labels.validate_endbeforestart.decodeEntities());
+        return false;
       }
       else if (start == end) {
-         start = parseInt(document.forms[0]['startTime_time_minute'].value);
-         end = parseInt(document.forms[0]['dueTime_time_minute'].value);
-         if (start > end) {
-	    alert(labels.validate_endbeforestart.decodeEntities());
-	    return false;
-         }
+        start = parseInt(document.forms[0]['startTime_time_minute'].value);
+        end = parseInt(document.forms[0]['dueTime_time_minute'].value);
+        if (start > end) {
+          alert(labels.validate_endbeforestart.decodeEntities());
+          return false;
+        }
       }
-   }
+    }
+  }
 
-   return true;
+  return true;
 }
 
 function toggleDetails() {
-   var div = $("details");
-   var buttons = $("buttons");
-   var buttonsHeight = buttons.clientHeight * 3;
+  var div = $("details");
+  var buttons = $("buttons");
+  var buttonsHeight = buttons.clientHeight * 3;
 
-   if (div.style.visibility) {
-      div.style.visibility = null;
-      window.resizeBy(0, -(div.clientHeight + buttonsHeight));
-      $("detailsButton").innerHTML = labels["Show Details"];
-   } else {
-      div.style.visibility = 'visible;';
-      window.resizeBy(0, (div.clientHeight + buttonsHeight));
-      $("detailsButton").innerHTML = labels["Hide Details"];
-   }
+  if (div.style.visibility) {
+    div.style.visibility = null;
+    window.resizeBy(0, -(div.clientHeight + buttonsHeight));
+    $("detailsButton").innerHTML = labels["Show Details"];
+  } else {
+    div.style.visibility = 'visible;';
+    window.resizeBy(0, (div.clientHeight + buttonsHeight));
+    $("detailsButton").innerHTML = labels["Hide Details"];
+  }
 
-   return false;
+  return false;
 }
 
 function toggleCycleVisibility(node, nodeName, hiddenValue) {
-   var spanNode = $(nodeName);
-   var newVisibility = ((node.value == hiddenValue) ? null : 'visible;');
-   spanNode.style.visibility = newVisibility;
+  var spanNode = $(nodeName);
+  var newVisibility = ((node.value == hiddenValue) ? null : 'visible;');
+  spanNode.style.visibility = newVisibility;
 
-   if (nodeName == 'cycleSelectionFirstLevel') {
-      var otherSpanNode = $('cycleSelectionSecondLevel');
-      if (!newVisibility)
+  if (nodeName == 'cycleSelectionFirstLevel') {
+    var otherSpanNode = $('cycleSelectionSecondLevel');
+    if (!newVisibility)
       {
-         otherSpanNode.superVisibility = otherSpanNode.style.visibility;
-         otherSpanNode.style.visibility = null;
+        otherSpanNode.superVisibility = otherSpanNode.style.visibility;
+        otherSpanNode.style.visibility = null;
       }
-      else
+    else
       {
-         otherSpanNode.style.visibility = otherSpanNode.superVisibility;
-         otherSpanNode.superVisibility = null;
+        otherSpanNode.style.visibility = otherSpanNode.superVisibility;
+        otherSpanNode.superVisibility = null;
       }
-   }
+  }
 }
 
 function addContact(tag, fullContactName, contactId, contactName, contactEmail)
 {
-   var uids = $('uixselector-participants-uidList');
-   log ("contactId: " + contactId);
-   if (contactId)
-   {
+  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)
+        {
+          log ("no match... realling adding");
+          if (uids.value.length > 0)
             uids.value += ',' + contactId;
-         else
+          else
             uids.value = contactId;
 
-         log ('values: ' + uids.value);
-         var names = $('uixselector-participants-display');
-         names.innerHTML += ('<li onmousedown="return false;"'
-                             + ' onclick="onRowClick(event);"><img src="'
-                             + ResourcesURL + '/abcard.gif" />'
-                             + contactName + '</li>');
-      }
+          log ('values: ' + uids.value);
+          var names = $('uixselector-participants-display');
+          names.innerHTML += ('<li onmousedown="return false;"'
+                              + ' onclick="onRowClick(event);"><img src="'
+                              + ResourcesURL + '/abcard.gif" />'
+                              + contactName + '</li>');
+        }
       else
-         log ("match... ignoring contact");
-   }
+        log ("match... ignoring contact");
+    }
 
-   return false;
+  return false;
 }
 
 function onTimeControlCheck(checkBox) {
-   var inputs = checkBox.parentNode.getElementsByTagName("input");
-   var selects = checkBox.parentNode.getElementsByTagName("select");
-   for (var i = 0; i < inputs.length; i++)
-      if (inputs[i] != checkBox)
-         inputs[i].disabled = !checkBox.checked;
-   for (var i = 0; i < selects.length; i++)
-      if (selects[i] != checkBox)
-         selects[i].disabled = !checkBox.checked;
+  var inputs = checkBox.parentNode.getElementsByTagName("input");
+  var selects = checkBox.parentNode.getElementsByTagName("select");
+  for (var i = 0; i < inputs.length; i++)
+    if (inputs[i] != checkBox)
+      inputs[i].disabled = !checkBox.checked;
+  for (var i = 0; i < selects.length; i++)
+    if (selects[i] != checkBox)
+      selects[i].disabled = !checkBox.checked;
 }