From 2016e64507116836c60613a7e0569a9e9f7b5f57 Mon Sep 17 00:00:00 2001
From: philippe_mingo <philippe_mingo@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Mon, 29 Oct 2001 13:04:38 +0000
Subject: [PATCH] Multiple changes. * Added sqclock to core with its options in
 folder options * Change options_folder to use new functions * removed some
 straight php in order to let xgetpo to work

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@1645 7612ce4b-ef26-0410-bec9-ea0150e637f0
---
 functions/mailbox_display.php |  30 ++-
 functions/prefs.php           |   2 +-
 po/squirrelmail.po            | 399 +++++++++++++++++++---------------
 src/left_main.php             |  28 +++
 src/load_prefs.php            |  10 +-
 src/options.php               |   8 +-
 src/options_display.php       |  11 +-
 src/options_folder.php        |  78 +++----
 src/right_main.php            |  41 ++--
 9 files changed, 334 insertions(+), 273 deletions(-)

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index c0ff4804..bd9ba32d 100644
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -639,22 +639,18 @@
    function ShowSelectAllLink($startMessage, $sort) {
        global $checkall, $PHP_SELF, $what, $where, $mailbox;
 
-       ?>&nbsp;
-<script language="JavaScript">
-<!--
-function CheckAll() {
-  for (var i = 0; i < document.messageList.elements.length; i++) {
-    if( document.messageList.elements[i].type == 'checkbox' ) {
-      document.messageList.elements[i].checked =
-        !(document.messageList.elements[i].checked);
-    }
-  }
-}
-window.document.write('<a href=# onClick="CheckAll();"><?php echo
- _("Toggle All") ?></a>');
-//-->
-</script><noscript>
-<?PHP
+       echo '&nbsp;<script language="JavaScript">' .
+            "\n<!-- \n" .
+            "function CheckAll() {\n" .
+            "   for (var i = 0; i < document.messageList.elements.length; i++) {\n" .
+            "       if( document.messageList.elements[i].type == 'checkbox' ) {\n" .
+            "           document.messageList.elements[i].checked = !(document.messageList.elements[i].checked);\n".
+            "       }\n" .
+            "   }\n" .
+            "}\n" .
+            'window.document.write(\'<a href=# onClick="CheckAll();">' . _("Toggle All") . "</a>');\n" .
+            "//-->\n" .
+            "</script>\n<noscript>\n";
 
        echo "<a href=\"$PHP_SELF?mailbox=" . urlencode($mailbox) .
           "&startMessage=$startMessage&sort=$sort&checkall=";
@@ -703,4 +699,4 @@ window.document.write('<a href=# onClick="CheckAll();"><?php echo
       return substr($subject, 0, $trim_val) . '...';
    }
 
-?>
+?>
\ No newline at end of file
diff --git a/functions/prefs.php b/functions/prefs.php
index 4f9d2a68..e719adf6 100644
--- a/functions/prefs.php
+++ b/functions/prefs.php
@@ -150,4 +150,4 @@
       }
       return $sig;
    }
-?>
+?>
\ No newline at end of file
diff --git a/po/squirrelmail.po b/po/squirrelmail.po
index e1bfa730..fc4637ae 100644
--- a/po/squirrelmail.po
+++ b/po/squirrelmail.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-10-25 09:49+0200\n"
+"POT-Creation-Date: 2001-10-29 13:51+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -49,46 +49,46 @@ msgstr ""
 msgid "Address Book Search"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:167
+#: squirrelmail/src/addrbook_search.php:166
 #: squirrelmail/src/addrbook_search_html.php:124
 msgid "Search for"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:174
+#: squirrelmail/src/addrbook_search.php:173
 #: squirrelmail/src/addrbook_search_html.php:135
 msgid "in"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:176
+#: squirrelmail/src/addrbook_search.php:175
 #: squirrelmail/src/addrbook_search_html.php:138
 msgid "All address books"
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:75
-#: squirrelmail/src/addrbook_search.php:186
+#: squirrelmail/functions/page_header.php:69
+#: squirrelmail/src/addrbook_search.php:185
 #: squirrelmail/src/addrbook_search_html.php:150
 #: squirrelmail/src/search.php:17 squirrelmail/src/search.php:73
 msgid "Search"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:188
+#: squirrelmail/src/addrbook_search.php:187
 #: squirrelmail/src/addrbook_search_html.php:152
 msgid "List all"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:209
+#: squirrelmail/src/addrbook_search.php:206
 #: squirrelmail/src/addrbook_search_html.php:175
 #, c-format
 msgid "Unable to list addresses from %s"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:231
+#: squirrelmail/src/addrbook_search.php:228
 #: squirrelmail/src/addrbook_search_html.php:198
 msgid "Your search failed with the following error(s)"
 msgstr ""
 
 #: squirrelmail/src/addrbook_search.php:154
-#: squirrelmail/src/addrbook_search.php:238
+#: squirrelmail/src/addrbook_search.php:235
 #: squirrelmail/src/addrbook_search_html.php:202
 msgid "No persons matching your search was found"
 msgstr ""
@@ -97,7 +97,7 @@ msgstr ""
 msgid "Return"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:191
+#: squirrelmail/src/addrbook_search.php:190
 msgid "Close window"
 msgstr ""
 
@@ -140,7 +140,7 @@ msgstr ""
 
 #: squirrelmail/functions/display_messages.php:66
 #: squirrelmail/functions/display_messages.php:82
-#: squirrelmail/functions/imap_general.php:214
+#: squirrelmail/functions/imap_general.php:217
 #: squirrelmail/src/addressbook.php:214 squirrelmail/src/addressbook.php:264
 msgid "ERROR"
 msgstr ""
@@ -166,90 +166,94 @@ msgstr ""
 msgid "Add to %s"
 msgstr ""
 
-#: squirrelmail/src/compose.php:93
+#: squirrelmail/src/compose.php:99
 msgid "Original Message"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:611
-#: squirrelmail/src/compose.php:94 squirrelmail/src/download.php:120
+#: squirrelmail/functions/mailbox_display.php:603
+#: squirrelmail/src/compose.php:100 squirrelmail/src/download.php:120
 #: squirrelmail/src/download.php:126 squirrelmail/src/options_order.php:42
 #: squirrelmail/src/search.php:58 squirrelmail/src/search.php:59
 msgid "Subject"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:599
-#: squirrelmail/src/compose.php:95 squirrelmail/src/download.php:121
+#: squirrelmail/functions/mailbox_display.php:589
+#: squirrelmail/src/compose.php:101 squirrelmail/src/download.php:121
 #: squirrelmail/src/download.php:128 squirrelmail/src/options_order.php:40
 #: squirrelmail/src/search.php:61 squirrelmail/src/search.php:62
 msgid "From"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:597
-#: squirrelmail/src/compose.php:96 squirrelmail/src/download.php:122
+#: squirrelmail/functions/mailbox_display.php:587
+#: squirrelmail/src/compose.php:102 squirrelmail/src/download.php:122
 #: squirrelmail/src/download.php:130 squirrelmail/src/search.php:67
 #: squirrelmail/src/search.php:68
 msgid "To"
 msgstr ""
 
-#: squirrelmail/src/compose.php:230 squirrelmail/src/read_body.php:387
+#: squirrelmail/src/compose.php:242 squirrelmail/src/read_body.php:393
 msgid "From:"
 msgstr ""
 
-#: squirrelmail/src/compose.php:255 squirrelmail/src/read_body.php:403
+#: squirrelmail/src/compose.php:267 squirrelmail/src/read_body.php:409
 msgid "To:"
 msgstr ""
 
-#: squirrelmail/src/compose.php:263
+#: squirrelmail/src/compose.php:275
 msgid "CC:"
 msgstr ""
 
-#: squirrelmail/src/compose.php:271
+#: squirrelmail/src/compose.php:283
 msgid "BCC:"
 msgstr ""
 
-#: squirrelmail/src/compose.php:279 squirrelmail/src/read_body.php:370
+#: squirrelmail/src/compose.php:291 squirrelmail/src/read_body.php:376
 msgid "Subject:"
 msgstr ""
 
-#: squirrelmail/src/compose.php:321 squirrelmail/src/compose.php:369
+#: squirrelmail/src/compose.php:333 squirrelmail/src/compose.php:385
 msgid "Send"
 msgstr ""
 
-#: squirrelmail/src/compose.php:327
+#: squirrelmail/src/compose.php:339
 msgid "Attach:"
 msgstr ""
 
-#: squirrelmail/src/compose.php:331 squirrelmail/src/options_order.php:128
+#: squirrelmail/src/compose.php:343 squirrelmail/src/options_order.php:128
 msgid "Add"
 msgstr ""
 
-#: squirrelmail/src/compose.php:346
+#: squirrelmail/src/compose.php:358
 msgid "Delete selected attachments"
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:69 squirrelmail/src/compose.php:362
-#: squirrelmail/src/compose.php:364 squirrelmail/src/compose.php:367
+#: squirrelmail/functions/page_header.php:63 squirrelmail/src/compose.php:378
+#: squirrelmail/src/compose.php:380 squirrelmail/src/compose.php:383
 msgid "Addresses"
 msgstr ""
 
-#: squirrelmail/src/compose.php:386
+#: squirrelmail/src/compose.php:406
 msgid "You have not filled in the \"To:\" field."
 msgstr ""
 
-#: squirrelmail/src/compose.php:469 squirrelmail/src/compose.php:506
-#: squirrelmail/src/compose.php:513
+#: squirrelmail/src/compose.php:447
+msgid "Draft Email Saved"
+msgstr ""
+
+#: squirrelmail/src/compose.php:506 squirrelmail/src/compose.php:543
+#: squirrelmail/src/compose.php:550
 msgid "Could not move/copy file. File not attached"
 msgstr ""
 
-#: squirrelmail/src/compose.php:572
+#: squirrelmail/src/compose.php:612
 msgid "said"
 msgstr ""
 
-#: squirrelmail/src/compose.php:575
+#: squirrelmail/src/compose.php:615
 msgid "quote"
 msgstr ""
 
-#: squirrelmail/src/compose.php:575
+#: squirrelmail/src/compose.php:615
 msgid "who"
 msgstr ""
 
@@ -266,7 +270,7 @@ msgstr ""
 msgid "Download this as a file"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:605
+#: squirrelmail/functions/mailbox_display.php:597
 #: squirrelmail/src/download.php:123 squirrelmail/src/download.php:132
 #: squirrelmail/src/options_order.php:41
 msgid "Date"
@@ -281,15 +285,14 @@ msgid "Click here to go back"
 msgstr ""
 
 #: squirrelmail/functions/imap_mailbox.php:40
-#: squirrelmail/functions/mailbox_display.php:38
+#: squirrelmail/functions/mailbox_display.php:39
 #: squirrelmail/src/folders.php:20 squirrelmail/src/folders.php:124
 #: squirrelmail/src/folders.php:126 squirrelmail/src/options.php:27
-#: squirrelmail/src/options_display.php:161
 msgid "None"
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:71 squirrelmail/src/folders.php:28
-#: squirrelmail/src/left_main.php:134
+#: squirrelmail/functions/page_header.php:65 squirrelmail/src/folders.php:28
+#: squirrelmail/src/left_main.php:159
 msgid "Folders"
 msgstr ""
 
@@ -313,7 +316,7 @@ msgstr ""
 msgid "Renamed successfully!"
 msgstr ""
 
-#: squirrelmail/src/folders.php:52 squirrelmail/src/left_main.php:137
+#: squirrelmail/src/folders.php:52 squirrelmail/src/left_main.php:190
 msgid "refresh folder list"
 msgstr ""
 
@@ -321,7 +324,7 @@ msgstr ""
 msgid "Delete Folder"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:570
+#: squirrelmail/functions/mailbox_display.php:559
 #: squirrelmail/src/folders.php:103 squirrelmail/src/read_body.php:326
 msgid "Delete"
 msgstr ""
@@ -383,7 +386,7 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:77 squirrelmail/src/help.php:80
+#: squirrelmail/functions/page_header.php:71 squirrelmail/src/help.php:80
 msgid "Help"
 msgstr ""
 
@@ -402,19 +405,19 @@ msgstr ""
 msgid "Table of Contents"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:395
-#: squirrelmail/functions/mailbox_display.php:399
-#: squirrelmail/functions/mailbox_display.php:403
+#: squirrelmail/functions/mailbox_display.php:390
+#: squirrelmail/functions/mailbox_display.php:393
+#: squirrelmail/functions/mailbox_display.php:396
 #: squirrelmail/src/help.php:163 squirrelmail/src/help.php:164
-#: squirrelmail/src/read_body.php:339 squirrelmail/src/read_body.php:341
+#: squirrelmail/src/read_body.php:345 squirrelmail/src/read_body.php:347
 msgid "Previous"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:396
-#: squirrelmail/functions/mailbox_display.php:400
-#: squirrelmail/functions/mailbox_display.php:404
+#: squirrelmail/functions/mailbox_display.php:391
+#: squirrelmail/functions/mailbox_display.php:394
+#: squirrelmail/functions/mailbox_display.php:397
 #: squirrelmail/src/help.php:166 squirrelmail/src/help.php:167
-#: squirrelmail/src/read_body.php:343 squirrelmail/src/read_body.php:345
+#: squirrelmail/src/read_body.php:349 squirrelmail/src/read_body.php:351
 msgid "Next"
 msgstr ""
 
@@ -422,7 +425,7 @@ msgstr ""
 msgid "Top"
 msgstr ""
 
-#: squirrelmail/src/left_main.php:113
+#: squirrelmail/src/left_main.php:133
 msgid "purge"
 msgstr ""
 
@@ -458,9 +461,9 @@ msgstr ""
 msgid "No messages were selected."
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:73 squirrelmail/src/options.php:35
-#: squirrelmail/src/options_display.php:26
-#: squirrelmail/src/options_folder.php:29
+#: squirrelmail/functions/page_header.php:67 squirrelmail/src/options.php:35
+#: squirrelmail/src/options_display.php:27
+#: squirrelmail/src/options_folder.php:30
 #: squirrelmail/src/options_highlight.php:49
 #: squirrelmail/src/options_identities.php:36
 #: squirrelmail/src/options_order.php:31
@@ -468,204 +471,234 @@ msgstr ""
 msgid "Options"
 msgstr ""
 
-#: squirrelmail/src/options.php:203 squirrelmail/src/options_display.php:26
+#: squirrelmail/src/options.php:214 squirrelmail/src/options_display.php:27
 msgid "Display Preferences"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:34
+#: squirrelmail/src/options_display.php:35
 msgid "Theme"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:49
+#: squirrelmail/src/options_display.php:36
 msgid "Language"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:69
+#: squirrelmail/src/options_display.php:37
 msgid "Use Javascript or HTML addressbook?"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:71
-#: squirrelmail/src/options_display.php:74
+#: squirrelmail/src/options_display.php:39
 msgid "JavaScript"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:72
-#: squirrelmail/src/options_display.php:75
+#: squirrelmail/src/options_display.php:40
 msgid "HTML"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:81
+#: squirrelmail/src/options_display.php:42
 msgid "Number of Messages to Index"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:92
+#: squirrelmail/src/options_display.php:43
 msgid "Wrap incoming text at"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:103
+#: squirrelmail/src/options_display.php:44
 msgid "Size of editor window"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:114
+#: squirrelmail/src/options_display.php:45
 msgid "Location of buttons when composing"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:118
+#: squirrelmail/src/options_display.php:47
 msgid "Before headers"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:121
+#: squirrelmail/src/options_display.php:48
 msgid "Between headers and message body"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:124
+#: squirrelmail/src/options_display.php:49
 msgid "After message body"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:129
+#: squirrelmail/src/options_display.php:51
 msgid "Location of folder list"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:133
+#: squirrelmail/src/options_display.php:53
 msgid "Left"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:136
+#: squirrelmail/src/options_display.php:54
 msgid "Right"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:141
+#: squirrelmail/src/options_display.php:57
+msgid "pixels"
+msgstr ""
+
+#: squirrelmail/src/options_display.php:59
 msgid "Width of folder list"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:157
-msgid "Auto refresh folder list"
+#: squirrelmail/src/options_display.php:63
+msgid "Minutes"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:160
-#: squirrelmail/src/options_display.php:194
-msgid "Seconds"
+#: squirrelmail/src/options_display.php:64
+msgid "Auto refresh folder list"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:162
-#: squirrelmail/src/options_display.php:192
-msgid "Minute"
+#: squirrelmail/src/options_display.php:66
+msgid "Never"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:163
-#: squirrelmail/src/options_display.php:190
-msgid "Minutes"
+#: squirrelmail/src/options_display.php:67
+msgid "Seconds"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:171
-msgid "Never"
+#: squirrelmail/src/options_display.php:68
+msgid "Minute"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:209
+#: squirrelmail/src/options_display.php:74
 msgid "Use alternating row colors?"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:220
+#: squirrelmail/src/options_display.php:76
 msgid "Yes"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:221
+#: squirrelmail/src/options_display.php:77
 msgid "No"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:226
+#: squirrelmail/src/options_display.php:79
 msgid "Show HTML version by default"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:233
+#: squirrelmail/src/options_display.php:82
 msgid "Yes, show me the HTML version of a mail message, if it is available."
 msgstr ""
 
-#: squirrelmail/src/options_display.php:239
+#: squirrelmail/src/options_display.php:83
 msgid "Include Self"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:245
+#: squirrelmail/src/options_display.php:86
 msgid "Don't remove me from the CC addresses when I use \"Reply All\""
 msgstr ""
 
-#: squirrelmail/src/options_display.php:251
+#: squirrelmail/src/options_display.php:88
 msgid "Page Selector"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:257
+#: squirrelmail/src/options_display.php:91
 msgid "Show page selector"
 msgstr ""
 
-#: squirrelmail/src/options.php:215 squirrelmail/src/options_folder.php:29
+#: squirrelmail/src/options_display.php:93
+msgid "pages max"
+msgstr ""
+
+#: squirrelmail/src/options.php:226 squirrelmail/src/options_folder.php:30
 msgid "Folder Preferences"
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:40
+#: squirrelmail/src/options_folder.php:41
 msgid "Folder Path"
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:53
+#: squirrelmail/src/options_folder.php:54
 msgid "Trash Folder:"
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:57
-msgid "Don't use Trash"
-msgstr ""
-
-#: squirrelmail/src/options_folder.php:59
+#: squirrelmail/src/options_folder.php:58
+#: squirrelmail/src/options_folder.php:60
 msgid "Do not use Trash"
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:81
+#: squirrelmail/src/options_folder.php:83
 msgid "Sent Folder:"
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:85
-msgid "Don't use Sent"
-msgstr ""
-
 #: squirrelmail/src/options_folder.php:87
+#: squirrelmail/src/options_folder.php:89
 msgid "Do not use Sent"
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:108
+#: squirrelmail/src/options_folder.php:110
+msgid "Drafts Folder:"
+msgstr ""
+
+#: squirrelmail/src/options_folder.php:114
+#: squirrelmail/src/options_folder.php:116
+msgid "Do not use Drafts"
+msgstr ""
+
+#: squirrelmail/src/options_folder.php:138
 msgid "Unseen message notification"
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:111
+#: squirrelmail/src/options_folder.php:140
 msgid "No notification"
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:112
+#: squirrelmail/src/options_folder.php:141
 msgid "Only INBOX"
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:113
+#: squirrelmail/src/options_folder.php:142
 msgid "All Folders"
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:118
+#: squirrelmail/src/options_folder.php:145
 msgid "Unseen message notification type"
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:121
+#: squirrelmail/src/options_folder.php:147
 msgid "Only unseen"
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:122
+#: squirrelmail/src/options_folder.php:148
 msgid "Unseen and Total"
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:127
+#: squirrelmail/src/options_folder.php:151
 msgid "Collapseable folders"
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:131
+#: squirrelmail/src/options_folder.php:154
 msgid "Enable Collapseable Folders"
 msgstr ""
 
-#: squirrelmail/src/options.php:177 squirrelmail/src/options_highlight.php:49
+#: squirrelmail/src/options_folder.php:155
+msgid "Show Clock on Folders Panel"
+msgstr ""
+
+#: squirrelmail/src/options_folder.php:155
+msgid "Date format"
+msgstr ""
+
+#: squirrelmail/src/options_folder.php:162
+msgid "No Clock"
+msgstr ""
+
+#: squirrelmail/src/options_folder.php:164
+msgid "Hour format"
+msgstr ""
+
+#: squirrelmail/src/options_folder.php:166
+msgid "24-hour clock"
+msgstr ""
+
+#: squirrelmail/src/options_folder.php:167
+msgid "12-hour clock"
+msgstr ""
+
+#: squirrelmail/src/options.php:188 squirrelmail/src/options_highlight.php:49
 msgid "Message Highlighting"
 msgstr ""
 
@@ -801,7 +834,7 @@ msgstr ""
 msgid "Move Up"
 msgstr ""
 
-#: squirrelmail/src/options.php:189 squirrelmail/src/options_order.php:31
+#: squirrelmail/src/options.php:200 squirrelmail/src/options_order.php:31
 msgid "Index Order"
 msgstr ""
 
@@ -813,7 +846,7 @@ msgstr ""
 msgid "Flags"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:617
+#: squirrelmail/functions/mailbox_display.php:609
 #: squirrelmail/src/options_order.php:44
 msgid "Size"
 msgstr ""
@@ -841,7 +874,7 @@ msgstr ""
 msgid "Return to options page"
 msgstr ""
 
-#: squirrelmail/src/options.php:165 squirrelmail/src/options_personal.php:30
+#: squirrelmail/src/options.php:176 squirrelmail/src/options_personal.php:30
 msgid "Personal Information"
 msgstr ""
 
@@ -901,48 +934,48 @@ msgstr ""
 msgid "Successfully saved personal information!"
 msgstr ""
 
-#: squirrelmail/src/options.php:121
+#: squirrelmail/src/options.php:123
 msgid "Successfully saved display preferences!"
 msgstr ""
 
-#: squirrelmail/src/options.php:122
+#: squirrelmail/src/options.php:124
 msgid "Refresh Page"
 msgstr ""
 
-#: squirrelmail/src/options.php:151
+#: squirrelmail/src/options.php:162
 msgid "Successfully saved folder preferences!"
 msgstr ""
 
-#: squirrelmail/src/options.php:152
+#: squirrelmail/src/options.php:163
 msgid "Refresh Folder List"
 msgstr ""
 
-#: squirrelmail/src/options.php:170
+#: squirrelmail/src/options.php:181
 msgid ""
 "This contains personal information about yourself such as your name, your "
 "email address, etc."
 msgstr ""
 
-#: squirrelmail/src/options.php:182
+#: squirrelmail/src/options.php:193
 msgid ""
 "Based upon given criteria, incoming messages can have different background "
 "colors in the message list.  This helps to easily distinguish who the "
 "messages are from, especially for mailing lists."
 msgstr ""
 
-#: squirrelmail/src/options.php:194
+#: squirrelmail/src/options.php:205
 msgid ""
 "The order of the message index can be rearanged and changed to contain the "
 "headers in any order you want."
 msgstr ""
 
-#: squirrelmail/src/options.php:208
+#: squirrelmail/src/options.php:219
 msgid ""
 "You can change the way that SquirrelMail looks and displays information to "
 "you, such as the colors, the language, and other settings."
 msgstr ""
 
-#: squirrelmail/src/options.php:220
+#: squirrelmail/src/options.php:231
 msgid ""
 "These settings change the way your folders are displayed and manipulated."
 msgstr ""
@@ -963,23 +996,27 @@ msgstr ""
 msgid "Message List"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:352
+#: squirrelmail/src/read_body.php:330
+msgid "Resume Draft"
+msgstr ""
+
+#: squirrelmail/src/read_body.php:358
 msgid "Forward"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:355
+#: squirrelmail/src/read_body.php:361
 msgid "Reply"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:358
+#: squirrelmail/src/read_body.php:364
 msgid "Reply All"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:377 squirrelmail/src/read_body.php:379
+#: squirrelmail/src/read_body.php:383 squirrelmail/src/read_body.php:385
 msgid "View full header"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:395
+#: squirrelmail/src/read_body.php:401
 msgid "Date:"
 msgstr ""
 
@@ -1011,7 +1048,7 @@ msgstr ""
 msgid "Cc"
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:57 squirrelmail/src/signout.php:65
+#: squirrelmail/functions/page_header.php:51 squirrelmail/src/signout.php:65
 msgid "Sign Out"
 msgstr ""
 
@@ -1238,12 +1275,12 @@ msgid "Preference database error (%s). Exiting abnormally"
 msgstr ""
 
 #: squirrelmail/functions/display_messages.php:22
-#: squirrelmail/functions/imap_general.php:222
+#: squirrelmail/functions/imap_general.php:225
 msgid "Unknown user or password incorrect."
 msgstr ""
 
 #: squirrelmail/functions/display_messages.php:22
-#: squirrelmail/functions/imap_general.php:223
+#: squirrelmail/functions/imap_general.php:226
 msgid "Click here to try again"
 msgstr ""
 
@@ -1262,74 +1299,74 @@ msgstr ""
 msgid "Click here to return to %s"
 msgstr ""
 
-#: squirrelmail/functions/imap_general.php:121
-#: squirrelmail/functions/imap_messages.php:117
-#: squirrelmail/functions/imap_messages.php:126
-#: squirrelmail/functions/imap_messages.php:144
-#: squirrelmail/functions/imap_messages.php:153
+#: squirrelmail/functions/imap_general.php:124
+#: squirrelmail/functions/imap_messages.php:116
+#: squirrelmail/functions/imap_messages.php:124
+#: squirrelmail/functions/imap_messages.php:143
+#: squirrelmail/functions/imap_messages.php:152
 #: squirrelmail/functions/imap_messages.php:264
 msgid "ERROR : Could not complete request."
 msgstr ""
 
-#: squirrelmail/functions/imap_general.php:123
+#: squirrelmail/functions/imap_general.php:126
 msgid "Reason Given: "
 msgstr ""
 
-#: squirrelmail/functions/imap_general.php:130
+#: squirrelmail/functions/imap_general.php:133
 msgid "ERROR : Bad or malformed request."
 msgstr ""
 
-#: squirrelmail/functions/imap_general.php:132
+#: squirrelmail/functions/imap_general.php:135
 msgid "Server responded: "
 msgstr ""
 
-#: squirrelmail/functions/imap_general.php:162
+#: squirrelmail/functions/imap_general.php:165
 #, c-format
 msgid "Error connecting to IMAP server: %s."
 msgstr ""
 
-#: squirrelmail/functions/imap_general.php:179
+#: squirrelmail/functions/imap_general.php:182
 #, c-format
 msgid "Bad request: %s"
 msgstr ""
 
-#: squirrelmail/functions/imap_general.php:181
+#: squirrelmail/functions/imap_general.php:184
 #, c-format
 msgid "Unknown error: %s"
 msgstr ""
 
-#: squirrelmail/functions/imap_general.php:183
+#: squirrelmail/functions/imap_general.php:186
 msgid "Read data:"
 msgstr ""
 
-#: squirrelmail/functions/imap_messages.php:119
-#: squirrelmail/functions/imap_messages.php:146
+#: squirrelmail/functions/imap_messages.php:118
+#: squirrelmail/functions/imap_messages.php:145
 #: squirrelmail/functions/imap_messages.php:266
 msgid "Unknown response from IMAP server: "
 msgstr ""
 
-#: squirrelmail/functions/imap_messages.php:128
+#: squirrelmail/functions/imap_messages.php:126
 msgid "Unknown message number in reply from server: "
 msgstr ""
 
-#: squirrelmail/functions/imap_messages.php:155
+#: squirrelmail/functions/imap_messages.php:154
 msgid "Unknown messagenumber in reply from server: "
 msgstr ""
 
-#: squirrelmail/functions/imap_messages.php:164
-#: squirrelmail/functions/imap_messages.php:193
+#: squirrelmail/functions/imap_messages.php:163
+#: squirrelmail/functions/imap_messages.php:192
 #: squirrelmail/functions/imap_messages.php:436
 #: squirrelmail/functions/imap_messages.php:475
-#: squirrelmail/functions/mailbox_display.php:685
+#: squirrelmail/functions/mailbox_display.php:676
 msgid "(no subject)"
 msgstr ""
 
-#: squirrelmail/functions/imap_messages.php:165
+#: squirrelmail/functions/imap_messages.php:164
 msgid "Unknown Sender"
 msgstr ""
 
-#: squirrelmail/functions/imap_messages.php:218
-msgid "(only Cc/Bcc)"
+#: squirrelmail/functions/imap_messages.php:217
+msgid "No To Address"
 msgstr ""
 
 #: squirrelmail/functions/imap_messages.php:478
@@ -1344,64 +1381,64 @@ msgstr ""
 msgid "messages"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:382
+#: squirrelmail/functions/mailbox_display.php:377
 msgid "Viewing messages"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:382
+#: squirrelmail/functions/mailbox_display.php:377
 msgid "to"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:382
-#: squirrelmail/functions/mailbox_display.php:384
+#: squirrelmail/functions/mailbox_display.php:377
+#: squirrelmail/functions/mailbox_display.php:379
 msgid "total"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:384
+#: squirrelmail/functions/mailbox_display.php:379
 msgid "Viewing message"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:458
+#: squirrelmail/functions/mailbox_display.php:457
 msgid "THIS FOLDER IS EMPTY"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:541
+#: squirrelmail/functions/mailbox_display.php:532
 msgid "Move selected to:"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:545
+#: squirrelmail/functions/mailbox_display.php:535
 msgid "Transform Selected Messages"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:561
+#: squirrelmail/functions/mailbox_display.php:551
 msgid "Move"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:566
+#: squirrelmail/functions/mailbox_display.php:555
 msgid "Expunge"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:566
+#: squirrelmail/functions/mailbox_display.php:555
 msgid "mailbox"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:568
+#: squirrelmail/functions/mailbox_display.php:557
 msgid "Read"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:569
+#: squirrelmail/functions/mailbox_display.php:558
 msgid "Unread"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:659
+#: squirrelmail/functions/mailbox_display.php:651
 msgid "Toggle All"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:674
+#: squirrelmail/functions/mailbox_display.php:665
 msgid "Unselect All"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:676
+#: squirrelmail/functions/mailbox_display.php:667
 msgid "Select All"
 msgstr ""
 
@@ -1417,11 +1454,11 @@ msgstr ""
 msgid "Title:"
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:59
+#: squirrelmail/functions/page_header.php:53
 msgid "Current Folder"
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:67
+#: squirrelmail/functions/page_header.php:61
 msgid "Compose"
 msgstr ""
 
@@ -1432,6 +1469,6 @@ msgid ""
 "default preference file."
 msgstr ""
 
-#: squirrelmail/functions/prefs.php:123
+#: squirrelmail/functions/prefs.php:124
 msgid "Error opening "
 msgstr ""
diff --git a/src/left_main.php b/src/left_main.php
index f7c81b25..10cd02a7 100644
--- a/src/left_main.php
+++ b/src/left_main.php
@@ -158,6 +158,34 @@
     echo '<CENTER><FONT SIZE=4><B>';
     echo _("Folders") . "</B><BR></FONT>\n\n";
 
+    if ($hour_format == 1) {
+      if ($date_format == 4)
+         $hr = "G:i:s";
+      else
+         $hr = "G:i";
+    } else {  
+      if ($date_format == 4)
+         $hr = "g:i:s a";
+      else   
+         $hr = "g:i a";
+    }
+    
+    switch( $date_format ) {
+    case 1:
+      $clk = date("m/d/y ".$hr, time()); 
+      break;
+    case 2:
+      $clk = date("d/m/y ".$hr, time()); 
+      break;
+    case 4:
+    case 5:
+      $clk = date($hr, time()); 
+      break;
+    default:   
+      $clk = date("D, ".$hr, time()); 
+    }
+
+    echo "<center><table bgcolor=$color[5]><tr><td><table bgcolor=$color[4]><tr><td><small>$clk</small></td></tr></table></td></tr></table></center>";
     echo '<SMALL>(<A HREF="../src/left_main.php" TARGET="left">';
     echo _("refresh folder list");
     echo '</A>)</SMALL></CENTER><BR>';
diff --git a/src/load_prefs.php b/src/load_prefs.php
index 7938a8b9..9e9794eb 100644
--- a/src/load_prefs.php
+++ b/src/load_prefs.php
@@ -195,7 +195,13 @@
     $collapse_folders = getPref($data_dir, $username, 'collapse_folders');
 
     /* show_html_default is a int value. */
-    $show_html_default = intval(getPref($data_dir, $username, 'show_html_default'), 1 );
+    $show_html_default = intval(getPref($data_dir, $username, 'show_html_default', 1 ) );
+
+    /* SqClock into the core */
+    global $date_format, $hour_format, $username, $data_dir;
+    
+    $date_format = getPref($data_dir, $username, 'date_format', 3);
+    $hour_format = getPref($data_dir, $username, 'hour_format', 2);
 
     do_hook("loading_prefs");
-?>
+?>
\ No newline at end of file
diff --git a/src/options.php b/src/options.php
index c6e4b77d..01692c2d 100644
--- a/src/options.php
+++ b/src/options.php
@@ -98,11 +98,7 @@
          setPref($data_dir, $username, 'alt_index_colors', 0);
       }
 
-      if (isset($showhtmldefault)) {
-         setPref($data_dir, $username, 'show_html_default', 1);
-      } else {
-         removePref($data_dir, $username, 'show_html_default');
-      }
+      setPref($data_dir, $username, 'show_html_default', ($showhtmldefault?1:0) );
 
       if (isset($includeselfreplyall)) {
          setPref($data_dir, $username, 'include_self_reply_all', 1);
@@ -160,6 +156,8 @@
           setPref($data_dir, $username, 'collapse_folders', $collapsefolders);
       else
           removePref($data_dir, $username, 'collapse_folders');
+      setPref($data_dir, $username, 'date_format', $dateformat);
+      setPref($data_dir, $username, 'hour_format', $hourformat);
       do_hook('options_folders_save');
       echo '<br><b>'._("Successfully saved folder preferences!").'</b><br>';
       echo '<a href="../src/left_main.php" target=left>' . _("Refresh Folder List") . '</a><br>';
diff --git a/src/options_display.php b/src/options_display.php
index e3ee45a7..b258a075 100644
--- a/src/options_display.php
+++ b/src/options_display.php
@@ -92,13 +92,10 @@
                 " <input name=pageselectormax size=3  value=\"$psw\"> &nbsp;" .
                 _("pages max") );
 
-   do_hook('options_display_inside'); ?>
-         <tr>
-            <td>&nbsp;
-            </td><td>
-               <input type="submit" value="<?php echo _("Submit"); ?>"name="submit_display">
-            </td>
-         </tr>
+   echo '<tr><td colspan=2><hr noshade></td></tr>';
+   do_hook('options_display_inside');
+   OptionSubmit();
+?>
 
       </table>
    </form>
diff --git a/src/options_folder.php b/src/options_folder.php
index f0650600..e780d383 100644
--- a/src/options_folder.php
+++ b/src/options_folder.php
@@ -15,6 +15,7 @@
    require_once('../functions/imap.php');
    require_once('../functions/array.php');
    require_once('../functions/plugin.php');
+   require_once('../functions/options.php');   
    
    displayPageHeader($color, 'None');
 
@@ -132,42 +133,45 @@
    }
    echo "</SELECT></TT>\n";
    echo '</td></tr>';
-?>
-         <tr>
-            <td valign=top align=right>
-               <?php echo _("Unseen message notification"); ?>:
-            </td>
-            <td>
-               <input type=radio name=unseennotify value=1<?php if ($unseen_notify == 1) echo " checked"; ?>> <?php echo _("No notification") ?><br>
-               <input type=radio name=unseennotify value=2<?php if ($unseen_notify != 1 && $unseen_notify != 3) echo " checked"; ?>> <?php echo _("Only INBOX") ?><br>
-               <input type=radio name=unseennotify value=3<?php if ($unseen_notify == 3) echo " checked"; ?>> <?php echo _("All Folders") ?><br>
-            </td>
-         </tr>
-         <tr>
-            <td valign=top align=right>
-               <?php echo _("Unseen message notification type"); ?>:
-            </td>
-	    <td>
-               <input type=radio name=unseentype value=1<?php if ($unseen_type < 2 || $unseen_type > 2) echo " checked"; ?>> <?php echo _("Only unseen"); ?> - (4)<br>
-               <input type=radio name=unseentype value=2<?php if ($unseen_type == 2) echo " checked"; ?>> <?php echo _("Unseen and Total"); ?> - (4/27)
-            </td>
-         </tr>
-         <tr>
-            <td valign=top align=right>
-               <?php echo _("Collapseable folders"); ?>:
-            </td>
-            <td>
-               <input type=checkbox name=collapsefolders <?php if (isset($collapse_folders) && $collapse_folders) echo " checked"; ?>>
-	         <?php echo _("Enable Collapseable Folders"); ?>
-            </td>
-         </tr>
-         <?php do_hook("options_folders_inside"); ?>
-         <tr>
-            <td>&nbsp;
-            </td><td>
-               <input type="submit" value="<?php echo _("Submit"); ?>" name="submit_folder">
-            </td>
-         </tr>
+   // if( $unseen_notify == '' )
+   //   $unseen_notify = '2';
+   OptionRadio( _("Unseen message notification"),
+                'unseennotify',
+                array( 1 => _("No notification"),
+                       2 => _("Only INBOX"),
+                       3 => _("All Folders") ),
+                $unseen_notify, '', '',
+                '<br>' );
+    OptionRadio( _("Unseen message notification type"),
+                 'unseentype',
+                 array( 1 => _("Only unseen"),
+                        2 => _("Unseen and Total") ),
+                 $unseen_type, '', '',
+                 '<br>' );
+    OptionCheck( _("Collapseable folders"),
+                 'collapsefolders',
+                 $collapse_folders,
+                 _("Enable Collapseable Folders") );
+   OptionSelect( '<b>' . _("Show Clock on Folders Panel") . '</b> ' . _("Date format"),
+                 'dateformat',
+                 array( '1' => 'MM/DD/YY HH:MM',
+                        '2' => 'DD/MM/YY HH:MM',
+                        '3' => 'DDD, HH:MM',
+                        '4' => 'HH:MM:SS',
+                        '5' => 'HH:MM',
+                        '6' => _("No Clock") ),
+                 $date_format );
+   OptionSelect( _("Hour format"),
+                 'hourformat',
+                 array( '1' => _("24-hour clock"),
+                        '2' => _("12-hour clock") ),
+                 $hour_format );     
+                 
+   echo '<tr><td colspan=2><hr noshade></td></tr>';
+   do_hook("options_folders_inside");
+   OptionSubmit();
+?>         
+
       </table>
    </form>
 
@@ -178,4 +182,4 @@
 
 </td></tr>
 </table>
-</body></html>
+</body></html>
\ No newline at end of file
diff --git a/src/right_main.php b/src/right_main.php
index 1df82733..03ea014f 100644
--- a/src/right_main.php
+++ b/src/right_main.php
@@ -58,34 +58,29 @@
    displayPageHeader($color, $mailbox);
 
    do_hook('right_main_after_header');
-   
+
    if (isset($note))
       echo "<CENTER><B>$note</B></CENTER><BR>\n";
 
    if ($just_logged_in == true) {
       $just_logged_in = false;
-      
+
       if (strlen(trim($motd)) > 0) {
-?><br>
-<table align=center width=70% cellpadding=0 cellspacing=3 border=0
-bgcolor="<?PHP echo $color[9] ?>">
-<tr><td>
-  <table width=100% cellpadding=5 cellspacing=1 border=0 bgcolor="<?PHP
-    echo $color[4] ?>">
-    <tr><td align=center><?PHP 
-       echo $motd;
-       do_hook('motd');
-    ?></td></tr>
-  </table>
-</td></tr></table>
-<?PHP
+         echo "<br><table align=center width=70% cellpadding=0 cellspacing=3 border=0 bgcolor=\"$color[9]\">" .
+              '<tr><td>' .
+              "<table width=100% cellpadding=5 cellspacing=1 border=0 bgcolor=\"$color[4]\">" .
+              "<tr><td align=center>$motd";
+         do_hook('motd');
+         echo '</td></tr>' .
+              '</table>' .
+              '</td></tr></table>';
       }
    }
 
-	if (isset($newsort)) {
-		$sort = $newsort;
-		session_register('sort');
-	}	
+    if (isset($newsort)) {
+        $sort = $newsort;
+        session_register('sort');
+    }
 
    // Check to see if we can use cache or not.  Currently the only time when you wont use it is
    //    when a link on the left hand frame is used.  Also check to make sure we actually have the
@@ -99,13 +94,13 @@ bgcolor="<?PHP echo $color[9] ?>">
          unset($msgs);
       if (session_is_registered('msort'))
          unset($msort);
-		if (session_is_registered('numMessages'))
-			unset($numMessages);
+        if (session_is_registered('numMessages'))
+            unset($numMessages);
 
-   	$numMessages = sqimap_get_num_messages ($imapConnection, $mailbox);
+    $numMessages = sqimap_get_num_messages ($imapConnection, $mailbox);
 
       showMessagesForMailbox($imapConnection, $mailbox, $numMessages, $startMessage, $sort, $color, $show_num, $use_mailbox_cache);
-      
+
       if (session_is_registered('msgs') && isset($msgs))
          session_register('msgs');
       if (session_is_registered('msort') && isset($msort))
-- 
2.25.1