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 Dec 30 16:45:41 2004
+++ www/cgi-bin/openwebmail/etc/lang/en	Sun Jan  9 15:10:01 2005
@@ -687,7 +687,7 @@
    shouldnt_move_here=> 'You shouldn\'t be trying to move messages here!',
    destination_folder=> 'Destination folder',
    doesnt_exist      => 'doesn\'t exist!',
-   foldername_long   => 'Folder name cannot be more than 16 characters!',
+   foldername_long   => 'Folder name cannot be more than @@@FOLDERNAME_MAXLEN@@@ characters!',
    folder_with_name  => 'A folder with the name',
    already_exists    => 'already exists!',
    cant_create_folder=> 'Can\'t create folder!',
@@ -747,7 +747,7 @@
    abook_delete_book => 'Unable to delete addressbook @@@ADDRESSBOOK@@@',
    abook_doesnt_exist => 'The addressbook @@@ADDRESSBOOK@@@ does not exist',
    abook_already_exists => 'The addressbook @@@ADDRESSBOOK@@@ already exists. Please choose a different name',
-   abook_name_too_long => 'The addressbook name @@@ADDRESSBOOK@@@ is too long. The limit is @@@FOLDERNAME_MAX@@@',
+   abook_name_too_long => 'The addressbook name @@@ADDRESSBOOK@@@ is too long. The limit is @@@FOLDERNAME_MAXLEN@@@',
    abook_cant_rename => 'Rename of addressbook failed',
    abook_ext_notsupported => 'The filetype uploaded is not supported as a ',
    abook_toobig => 'Sorry, this would exceed the total size limit for all your addressbooks.  Please go',
diff -ruN www.orig/cgi-bin/openwebmail/etc/templates/dir.template www/cgi-bin/openwebmail/etc/templates/dir.template
--- www.orig/cgi-bin/openwebmail/etc/templates/dir.template	Sat Jul 17 07:36:35 2004
+++ www/cgi-bin/openwebmail/etc/templates/dir.template	Mon Jan 10 20:14:42 2005
@@ -75,7 +75,7 @@
 
 @@@UPLOADSTART@@@
 <table border="0" width="100%" cellpadding="1" cellspacing="1"><tr>
-<td nowrap bgcolor=@@@COLUMNHEADER@@@><B>Upload</B></td>
+<td nowrap bgcolor=@@@COLUMNHEADER@@@><B>Upload</B> ( filename or URL )</td>
 </tr><tr>
 <td nowrap bgcolor=@@@MENUBAR@@@>@@@UPLOADFILEFIELD@@@</td>
 </tr></table>
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	Wed Jan  5 23:11:43 2005
+++ www/cgi-bin/openwebmail/etc/templates/prefs.template	Mon Jan 10 15:06:05 2005
@@ -120,9 +120,9 @@
 
 @@@WEBMAILSTART@@@
 <tr><td colspan="2">&nbsp;</td></tr>
-<tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>Folder browsing</B></td></tr>
+<tr><td colspan="2" bgcolor=@@@COLUMNHEADER@@@><B>Messages Listing</B></td></tr>
 <tr><td align="right" bgcolor=@@@WINDOW_DARK@@@>
-<B>Controlbar position in folder view:</B>
+<B>Controlbar position in messages list:</B>
 </td><td bgcolor=@@@WINDOW_DARK@@@>
 @@@CTRLPOSITIONFOLDERVIEWMENU@@@
 </td></tr>