diff --git a/UI/WebServerResources/SchedulerUI.css b/UI/WebServerResources/SchedulerUI.css
index 15326c3d5..03bea5702 100644
--- a/UI/WebServerResources/SchedulerUI.css
+++ b/UI/WebServerResources/SchedulerUI.css
@@ -84,6 +84,24 @@ UL#tasksList LI.completed
 UL#tasksList LI.duelater
 { color: #999; }
 
+UL#tasksList LI[class~="_selected"].overdue
+{ 
+  color: #fff !important;
+  background-color: #f00 !important;
+}
+
+UL#tasksList LI[class~="_selected"].duetoday
+{ 
+  color: #fff !important;
+  background-color: #00f !important;
+}
+
+UL#tasksList LI[class~="_selected"].duelater
+{ 
+  color: #fff !important;
+  background-color: #999 !important;
+}
+
 DIV#rightPanel
 {
   position: absolute;
@@ -252,7 +270,7 @@ DIV#calendarView A
   border: 1px solid #deebf7; }
 
 TABLE#appointmentsList
-{ width: auto; }
+{ width: 100%; }
 
 #dateSelector TD._selected,
 UL > LI._selected,
diff --git a/UI/WebServerResources/UIxMailEditor.css b/UI/WebServerResources/UIxMailEditor.css
index 91c7a7570..84aac4d0f 100644
--- a/UI/WebServerResources/UIxMailEditor.css
+++ b/UI/WebServerResources/UIxMailEditor.css
@@ -14,24 +14,36 @@ TABLE#compose_label
   text-align: right;
 }
 
-table#compose_table {
-  border-bottom-color: #808080;
-  border-bottom-width: 1px;
-  border-bottom-style: solid;
+DIV#addressList
+{
+  height: 8em;
+  overflow-y: auto;
+  overflow-x: hidden;
 }
 
-td#compose_leftside {
-  vertical-align:   top;
-}
+DIV.addressListElement
+{ margin: 0px;
+  margin-right: 8em;
+  padding: 0px; }
 
-td#compose_rightside {
-  vertical-align: top;
-}
+SPAN.headerField
+{ display: block;
+  float: left;
+  width: 8em;
+  text-align: right; }
+
+SPAN.headerInput > INPUT
+{ width: 100%;
+  padding-left: 24px;
+  background-image: url('/SOGo.woa/WebServerResources/abcard.gif');
+  background-repeat: no-repeat;
+  background-position: 2px 2px;
+  margin-right: -9em; }
+
+DIV#subjectRow INPUT
+{ background-image: none;
+  padding-left: .5em; }
 
-div#compose_fromline {
-}
-div#compose_toselection { 
-}
 div#compose_internetmarker { 
   padding:          8px;
   text-align:       center;
@@ -42,38 +54,52 @@ div#compose_internetmarker {
 }
 
 div#headerArea
-{ margin-right: 10em; }
-
-div#headerArea INPUT
-{ width: 35em; }
+{ position: absolute;
+  left: 0px;
+  right: 0px;
+  height: 12em;
+  border-top: 2px solid #fffffb;
+  border-left: 2px solid #fffffb;
+  border-right: 2px solid #888;
+  border-bottom: 2px solid #888;
+  -moz-border-top-colors: -moz-buttonhoverface transparent;
+  -moz-border-left-colors: -moz-buttonhoverface transparent;
+  -moz-border-right-colors: ThreeDDarkShadow ThreeDShadow transparent;
+  -moz-border-bottom-colors: ThreeDDarkShadow ThreeDShadow transparent; }
 
 div#attachmentsArea
-{ float: right;
-  width: 8em;
-  height: 2em;
-  padding-right: 1em; }
+{ display: none;
+  float: right;
+  width: 12em;
+  height: 12em;
+  margin: 0px;
+  padding-right: 1em;
+  padding-left: 5px;
+  border-left: 1px solid #888; }
 
 SPAN.headerField
-{ display: block;
-  float: left;
-  line-height: 1.8em;
+{ line-height: 1.8em;
   width: 5em;
   text-align: right; }
 
-div#compose_attachments_list  {
-  width:            100%;
-  height:           6em;
-  background-color: #FFFFFF;
-  margin-left:      0px;
-  padding:          2px;
-  border-color:     #c3c3c3;
-  border-width:     1px;
-  border-style:     solid;
+div#compose_attachments_list
+{
+  width: 100%;
+  height: 10em;
+  background-color: #ffffff;
+  margin-left: 0px;
+  padding: 2px;
+  border-bottom: 1px solid #fff;
+  border-right: 1px solid #fff;
+  border-top: 2px solid #222;
+  border-left: 2px solid #222;
+  -moz-border-top-colors: ThreeDShadow ThreeDDarkShadow transparent;
+  -moz-border-left-colors: ThreeDShadow ThreeDDarkShadow transparent;
 }
 
 TEXTAREA
 { position: absolute;
-  left: .5em;
-  right: .5em;
-  bottom: .5em;
-  height: 280px; }
+  left: 0em;
+  right: 0em;
+  bottom: 0em;
+  top: 17em; }
diff --git a/UI/WebServerResources/generic.css b/UI/WebServerResources/generic.css
index 90891e93f..7cbd6f1e6 100644
--- a/UI/WebServerResources/generic.css
+++ b/UI/WebServerResources/generic.css
@@ -529,6 +529,12 @@ TR.tableview TD
   padding-left: .3em;
   padding-right: .3em; }
 
+TR.tableview TD.headerDateTime
+{ width: 14em; }
+
+TR.tableview TD.headerLocation
+{ width: 10em; }
+
 td.tbtv_actcell
 { border-width: 1px;
   border-style: solid;
@@ -580,7 +586,8 @@ td img.tbtv_sortcell
 
 TD.subjectCell,
 td.tbtv_subject_headercell
-{ overflow: hidden; }
+{ overflow: hidden;
+  width: auto; }
 
 /* drag handles */
 DIV.dragHandle