diff -ruN www.orig/cgi-bin/openwebmail/etc/lang/en www/cgi-bin/openwebmail/etc/lang/en
--- www.orig/cgi-bin/openwebmail/etc/lang/en	Thu Feb 24 20:43:23 2005
+++ www/cgi-bin/openwebmail/etc/lang/en	Fri Apr 29 21:46:57 2005
@@ -21,14 +21,14 @@
 %lang_sortlabels =
    (
    status      => 'Status (Unread first)',
-   date        => 'Date (Newest first)',
-   date_rev    => 'Date (Oldest first)',
-   sender      => 'Sender (Newest first)',
-   sender_rev  => 'Sender (Oldest first)',
-   subject     => 'Subject (Newest first)',
-   subject_rev => 'Subject (Oldest first)',
-   size        => 'Size (Largest first)',
-   size_rev    => 'Size (Smallest first)'
+   date        => 'Date (Oldest first)',
+   date_rev    => 'Date (Newest first)',
+   sender      => 'Sender (Ascending)',
+   sender_rev  => 'Sender (Descending)',
+   subject     => 'Subject (Oldest first)',
+   subject_rev => 'Subject (Newest first)',
+   size        => 'Size (Smallest first)',
+   size_rev    => 'Size (Largest first)',
    );
 
 %lang_abooksortlabels =
@@ -55,6 +55,7 @@
    (
    ALL => "All Addressbooks",
    global => "Global Addressbook",
+   ldapcache => "Global Addressbook - ldap",
    );
 
 %lang_onofflabels =
@@ -380,6 +381,8 @@
    markasunread => 'Mark as unread',
    dateformat => 'Date format',
    date       => 'Date',
+   sentdate   => 'Sent Date',
+   recvdate   => 'Received Date',
    recipient  => 'Recipient',
    sender     => 'Sender',
    subject    => 'Subject',
diff -ruN www.orig/cgi-bin/openwebmail/etc/templates/addreditform.template www/cgi-bin/openwebmail/etc/templates/addreditform.template
--- www.orig/cgi-bin/openwebmail/etc/templates/addreditform.template	Sun Nov  7 00:20:16 2004
+++ www/cgi-bin/openwebmail/etc/templates/addreditform.template	Fri May  6 15:43:52 2005
@@ -225,11 +225,13 @@
 </table>
 
 <style type="text/css">
+<!--
 #bdaycalpopupDiv{ position: absolute;
                   visibility: hidden;
                   background-color: @@@MENUBAR@@@;
                   layer-background-color: @@@MENUBAR@@@;
                 }
+// -->
 </style>
 <div id="bdaycalpopupDiv"></div>
 
diff -ruN www.orig/cgi-bin/openwebmail/etc/templates/addrlistview.template www/cgi-bin/openwebmail/etc/templates/addrlistview.template
--- www.orig/cgi-bin/openwebmail/etc/templates/addrlistview.template	Wed Nov 10 19:35:06 2004
+++ www/cgi-bin/openwebmail/etc/templates/addrlistview.template	Wed Mar  2 19:33:10 2005
@@ -150,6 +150,13 @@
       return(confirm('Are you sure you want to delete this contact?'));
    }
 }
+
+function setchkbox (id) {
+   if (!document.layers) {
+      var cb=document.getElementById(id);
+      cb.checked=!cb.checked;
+   }
+}
 //-->
 </script>
 
diff -ruN www.orig/cgi-bin/openwebmail/etc/templates/advsearch.template www/cgi-bin/openwebmail/etc/templates/advsearch.template
--- www.orig/cgi-bin/openwebmail/etc/templates/advsearch.template	Sat Jan 15 13:46:17 2005
+++ www/cgi-bin/openwebmail/etc/templates/advsearch.template	Tue May 10 21:15:44 2005
@@ -66,10 +66,12 @@
 <tr><td colspan="5"><B>Results: @@@TOTALFOUND@@@</B></td></tr>
 <tr><td width="10%" bgcolor=@@@COLUMNHEADER@@@>
 <B>@@@FOLDER@@@</B></td>
-<td width="18%" bgcolor=@@@COLUMNHEADER@@@>
+<td bgcolor=@@@COLUMNHEADER@@@>
 <B>@@@DATE@@@</B></td>
-<td width="25%" bgcolor=@@@COLUMNHEADER@@@>
+<td bgcolor=@@@COLUMNHEADER@@@>
 <B>@@@SENDER@@@</B></td>
+<td bgcolor=@@@COLUMNHEADER@@@>
+<B>@@@RECIPIENT@@@</B></td>
 <td bgcolor=@@@COLUMNHEADER@@@>
 <B>@@@SUBJECT@@@</B></td>
 <td bgcolor=@@@COLUMNHEADER@@@>
diff -ruN www.orig/cgi-bin/openwebmail/etc/templates/dayview.template www/cgi-bin/openwebmail/etc/templates/dayview.template
--- www.orig/cgi-bin/openwebmail/etc/templates/dayview.template	Mon Dec 15 23:43:44 2003
+++ www/cgi-bin/openwebmail/etc/templates/dayview.template	Fri May  6 15:43:52 2005
@@ -47,6 +47,7 @@
 <tr><td colspan=2 nowrap>Send notification email to</td></tr>
 <tr><td colspan=2 nowrap>@@@EMAILFIELD@@@</td></tr>
 @@@EMAILEND@@@
+<tr><td nowrap>Event reminder</td><td>@@@EVENTREMINDERMENU@@@</td></tr>
 <tr><td nowrap>Event Color</td><td nowrap>@@@EVENTCOLORMENU@@@</td></tr>
 <tr><td colspan=2>@@@COLORTABLE@@@</td></tr>
 <tr><td colspan=2 align=center>@@@SUBMITBUTTON@@@</td></tr>
@@ -62,13 +63,6 @@
              visibility: hidden;
              background-color: @@@MENUBAR@@@;
              layer-background-color: @@@MENUBAR@@@; }
-.stylecal { font-size: 9pt; color: #000000; }
-A.notmonth:link { font-size: 9pt; color: #cccccc; }
-A.notmonth:visited { font-size: 9pt; color: #cccccc; }
-A.notmonth:hover { font-size: 9pt; color: #ff0000; }
-A.stylecal:link { font-size: 9pt; color: #000000; }
-A.stylecal:visited { font-size: 9pt; color: #000000; }
-A.stylecal:hover { font-size: 9pt; color: #ff0000; }
 // -->
 </style>
 
diff -ruN www.orig/cgi-bin/openwebmail/etc/templates/editcalendar.template www/cgi-bin/openwebmail/etc/templates/editcalendar.template
--- www.orig/cgi-bin/openwebmail/etc/templates/editcalendar.template	Mon Dec 15 19:52:09 2003
+++ www/cgi-bin/openwebmail/etc/templates/editcalendar.template	Fri May  6 15:43:52 2005
@@ -47,6 +47,10 @@
 @@@EMAILFIELD@@@
 @@@EMAILEND@@@
 </td></tr><tr><td align="right" bgcolor=@@@WINDOW_DARK@@@>
+<B>Event reminder:</B>
+</td><td bgcolor=@@@WINDOW_DARK@@@>
+@@@EVENTREMINDERMENU@@@
+</td></tr><tr><td align="right" bgcolor=@@@WINDOW_DARK@@@>
 <B>Event Color:</B>
 </td><td bgcolor=@@@WINDOW_DARK@@@>
 @@@EVENTCOLORMENU@@@
@@ -66,13 +70,6 @@
                        visibility: hidden;
                        background-color: @@@MENUBAR@@@;
                        layer-background-color: @@@MENUBAR@@@; }
-.stylecal { font-size: 9pt; color: #000000; }
-A.notmonth:link { font-size: 9pt; color: #cccccc; }
-A.notmonth:visited { font-size: 9pt; color: #cccccc; }
-A.notmonth:hover { font-size: 9pt; color: #ff0000; }
-A.stylecal:link { font-size: 9pt; color: #000000; }
-A.stylecal:visited { font-size: 9pt; color: #000000; }
-A.stylecal:hover { font-size: 9pt; color: #ff0000; }
 // -->
 </style>
 
diff -ruN www.orig/cgi-bin/openwebmail/etc/templates/prefs.template www/cgi-bin/openwebmail/etc/templates/prefs.template
--- www.orig/cgi-bin/openwebmail/etc/templates/prefs.template	Sun Feb 20 17:29:43 2005
+++ www/cgi-bin/openwebmail/etc/templates/prefs.template	Sun Mar 20 21:48:57 2005
@@ -142,6 +142,11 @@
 @@@SORTMENU@@@
 </td></tr>
 <tr><td align="right" bgcolor=@@@WINDOW_DARK@@@>
+<B>Timestamp used for message date:</B>
+</td><td bgcolor=@@@WINDOW_DARK@@@>
+@@@MSGDATETIMESTAMPMENU@@@
+</td></tr>
+<tr><td align="right" bgcolor=@@@WINDOW_DARK@@@>
 <B>Display mini search icon@@@MINISEARCHICON@@@:</B>
 </td><td bgcolor=@@@WINDOW_DARK@@@>
 @@@USEMINISEARCHICONCHECKBOX@@@<br>
diff -ruN www.orig/cgi-bin/openwebmail/etc/templates/weekview.template www/cgi-bin/openwebmail/etc/templates/weekview.template
--- www.orig/cgi-bin/openwebmail/etc/templates/weekview.template	Mon Dec 15 23:43:47 2003
+++ www/cgi-bin/openwebmail/etc/templates/weekview.template	Fri May  6 15:43:52 2005
@@ -47,13 +47,6 @@
              visibility: hidden;
              background-color: @@@MENUBAR@@@;
              layer-background-color: @@@MENUBAR@@@; }
-.stylecal { font-size: 9pt; color: #000000; }
-A.notmonth:link { font-size: 9pt; color: #cccccc; }
-A.notmonth:visited { font-size: 9pt; color: #cccccc; }
-A.notmonth:hover { font-size: 9pt; color: #ff0000; }
-A.stylecal:link { font-size: 9pt; color: #000000; }
-A.stylecal:visited { font-size: 9pt; color: #000000; }
-A.stylecal:hover { font-size: 9pt; color: #ff0000; }
 // -->
 </style>