"Arief S Fitrianto" <arief@gurame.fisika.ui.ac.id>

[squirrelmail.git] / locale / nl_NL / LC_MESSAGES / squirrelmail.po

diff --git a/locale/nl_NL/LC_MESSAGES/squirrelmail.po b/locale/nl_NL/LC_MESSAGES/squirrelmail.po
index afe4f718a03884c7df135a74005e0e5b2ffd5dca..67b083b4771812954a03e9951e19d35abdb040d4 100644 (file)
--- a/locale/nl_NL/LC_MESSAGES/squirrelmail.po
+++ b/locale/nl_NL/LC_MESSAGES/squirrelmail.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: $Id$\n"
-"POT-Creation-Date: 2002-08-22 12:34+0200\n"
-"PO-Revision-Date: 2002-08-23 14:30+0200\n"
+"POT-Creation-Date: 2002-09-05 09:11+0200\n"
+"PO-Revision-Date: 2002-09-05 11:00+0200\n"
 "Last-Translator: M.J. Prinsen <translation@prinsenonline.com>\n"
 "Language-Team: Dutch <squirrelmail-i18n@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -19,44 +19,44 @@ msgid "Address Book"
 msgstr "Adresboek"
 
 # squirrelmail/plugins/mail_fetch/fetch.php:65
-#: squirrelmail/plugins/mail_fetch/fetch.php:71
-#: squirrelmail/src/addrbook_search_html.php:81
-#: squirrelmail/src/addrbook_search_html.php:83
-#: squirrelmail/src/addrbook_search_html.php:85
+#: squirrelmail/plugins/mail_fetch/fetch.php:79
+#: squirrelmail/src/addrbook_search_html.php:94
+#: squirrelmail/src/addrbook_search_html.php:96
+#: squirrelmail/src/addrbook_search_html.php:98
 msgid "All"
 msgstr "Alle"
 
 # squirrelmail/src/addrbook_search.php:98
 # squirrelmail/src/addrbook_search_html.php:67
 # squirrelmail/src/addressbook.php:285 squirrelmail/src/vcard.php:85
-#: squirrelmail/src/addrbook_search.php:100
-#: squirrelmail/src/addrbook_search_html.php:90
-#: squirrelmail/src/addressbook.php:305 squirrelmail/src/vcard.php:89
+#: squirrelmail/src/addrbook_search.php:116
+#: squirrelmail/src/addrbook_search_html.php:105
+#: squirrelmail/src/addressbook.php:314 squirrelmail/src/vcard.php:101
 msgid "Name"
 msgstr "Naam"
 
 # squirrelmail/src/addrbook_search.php:99
 # squirrelmail/src/addrbook_search_html.php:68
 # squirrelmail/src/addressbook.php:286
-#: squirrelmail/src/addrbook_search.php:101
-#: squirrelmail/src/addrbook_search_html.php:91
-#: squirrelmail/src/addressbook.php:306
+#: squirrelmail/src/addrbook_search.php:117
+#: squirrelmail/src/addrbook_search_html.php:106
+#: squirrelmail/src/addressbook.php:315
 msgid "E-mail"
 msgstr "E-mail"
 
 # squirrelmail/src/addrbook_search.php:100
 # squirrelmail/src/addrbook_search_html.php:69
 # squirrelmail/src/addressbook.php:287
-#: squirrelmail/src/addrbook_search.php:102
-#: squirrelmail/src/addrbook_search_html.php:92
-#: squirrelmail/src/addressbook.php:307
+#: squirrelmail/src/addrbook_search.php:118
+#: squirrelmail/src/addrbook_search_html.php:107
+#: squirrelmail/src/addressbook.php:316
 msgid "Info"
 msgstr "Informatie"
 
 # squirrelmail/src/addrbook_search.php:103
 # squirrelmail/src/addrbook_search_html.php:72
-#: squirrelmail/src/addrbook_search.php:105
-#: squirrelmail/src/addrbook_search_html.php:95
+#: squirrelmail/src/addrbook_search.php:121
+#: squirrelmail/src/addrbook_search_html.php:112
 msgid "Source"
 msgstr "Bron"
 
@@ -68,14 +68,14 @@ msgstr "Bron"
 # squirrelmail/src/options_highlight.php:330
 # squirrelmail/src/printer_friendly_bottom.php:96
 # squirrelmail/src/search.php:351
-#: squirrelmail/functions/mailbox_display.php:817
-#: squirrelmail/plugins/filters/options.php:124
-#: squirrelmail/src/addrbook_search_html.php:107
-#: squirrelmail/src/compose.php:86 squirrelmail/src/compose.php:98
-#: squirrelmail/src/options_highlight.php:82
-#: squirrelmail/src/options_highlight.php:371
-#: squirrelmail/src/printer_friendly_bottom.php:105
-#: squirrelmail/src/read_body.php:325 squirrelmail/src/search.php:416
+#: squirrelmail/functions/mailbox_display.php:752
+#: squirrelmail/plugins/filters/options.php:147
+#: squirrelmail/src/addrbook_search_html.php:122
+#: squirrelmail/src/compose.php:500 squirrelmail/src/download.php:363
+#: squirrelmail/src/download.php:370
+#: squirrelmail/src/options_highlight.php:357
+#: squirrelmail/src/printer_friendly_bottom.php:106
+#: squirrelmail/src/search.php:385
 msgid "To"
 msgstr "Aan"
 
@@ -83,49 +83,46 @@ msgstr "Aan"
 # squirrelmail/src/addrbook_search_html.php:84
 # squirrelmail/src/compose.php:443 squirrelmail/src/options_highlight.php:333
 # squirrelmail/src/search.php:350
-#: squirrelmail/plugins/filters/options.php:127
-#: squirrelmail/src/addrbook_search_html.php:109
-#: squirrelmail/src/compose.php:87 squirrelmail/src/compose.php:100
-#: squirrelmail/src/options_highlight.php:85
-#: squirrelmail/src/options_highlight.php:374
-#: squirrelmail/src/read_body.php:326 squirrelmail/src/search.php:415
+#: squirrelmail/plugins/filters/options.php:150
+#: squirrelmail/src/addrbook_search_html.php:124
+#: squirrelmail/src/compose.php:507 squirrelmail/src/options_highlight.php:360
+#: squirrelmail/src/search.php:384
 msgid "Cc"
 msgstr "CC"
 
 # squirrelmail/src/addrbook_search_html.php:86
-#: squirrelmail/src/addrbook_search_html.php:111
-#: squirrelmail/src/read_body.php:327
+#: squirrelmail/src/addrbook_search_html.php:126
 msgid "Bcc"
 msgstr "BCC"
 
 # squirrelmail/src/addrbook_search_html.php:99
-#: squirrelmail/src/addrbook_search_html.php:127
+#: squirrelmail/src/addrbook_search_html.php:139
 msgid "Use Addresses"
 msgstr "Gebruik adressen"
 
 # squirrelmail/src/addrbook_search_html.php:122
-#: squirrelmail/src/addrbook_search_html.php:151
+#: squirrelmail/src/addrbook_search_html.php:161
 msgid "Address Book Search"
 msgstr "Zoek in adresboek"
 
 # squirrelmail/src/addrbook_search.php:174
 # squirrelmail/src/addrbook_search_html.php:131
-#: squirrelmail/src/addrbook_search.php:181
-#: squirrelmail/src/addrbook_search_html.php:163
+#: squirrelmail/src/addrbook_search.php:192
+#: squirrelmail/src/addrbook_search_html.php:170
 msgid "Search for"
 msgstr "Zoek naar"
 
 # squirrelmail/src/addrbook_search.php:180
 # squirrelmail/src/addrbook_search_html.php:141
-#: squirrelmail/src/addrbook_search.php:188
-#: squirrelmail/src/addrbook_search_html.php:173
+#: squirrelmail/src/addrbook_search.php:198
+#: squirrelmail/src/addrbook_search_html.php:180
 msgid "in"
 msgstr "in"
 
 # squirrelmail/src/addrbook_search.php:181
 # squirrelmail/src/addrbook_search_html.php:144
-#: squirrelmail/src/addrbook_search.php:189
-#: squirrelmail/src/addrbook_search_html.php:176
+#: squirrelmail/src/addrbook_search.php:199
+#: squirrelmail/src/addrbook_search_html.php:183
 msgid "All address books"
 msgstr "Alle adresboeken"
 
@@ -136,49 +133,49 @@ msgstr "Alle adresboeken"
 # squirrelmail/src/search.php:211 squirrelmail/src/search.php:355
 # squirrelmail/src/search.php:386 squirrelmail/src/search.php:407
 # squirrelmail/src/search.php:417
-#: squirrelmail/functions/page_header.php:225
-#: squirrelmail/src/addrbook_search.php:203
-#: squirrelmail/src/addrbook_search_html.php:191
-#: squirrelmail/src/search.php:226 squirrelmail/src/search.php:230
-#: squirrelmail/src/search.php:249 squirrelmail/src/search.php:419
-#: squirrelmail/src/search.php:449 squirrelmail/src/search.php:471
-#: squirrelmail/src/search.php:486
+#: squirrelmail/functions/page_header.php:239
+#: squirrelmail/src/addrbook_search.php:210
+#: squirrelmail/src/addrbook_search_html.php:198
+#: squirrelmail/src/search.php:220 squirrelmail/src/search.php:224
+#: squirrelmail/src/search.php:244 squirrelmail/src/search.php:389
+#: squirrelmail/src/search.php:420 squirrelmail/src/search.php:441
+#: squirrelmail/src/search.php:451
 msgid "Search"
 msgstr "Zoek"
 
 # squirrelmail/src/addrbook_search.php:193
 # squirrelmail/src/addrbook_search_html.php:156
-#: squirrelmail/src/addrbook_search.php:204
-#: squirrelmail/src/addrbook_search_html.php:192
+#: squirrelmail/src/addrbook_search.php:211
+#: squirrelmail/src/addrbook_search_html.php:199
 msgid "List all"
 msgstr "Toon alles"
 
 # squirrelmail/src/addrbook_search.php:214
 # squirrelmail/src/addrbook_search_html.php:186
-#: squirrelmail/src/addrbook_search.php:227
-#: squirrelmail/src/addrbook_search_html.php:222
+#: squirrelmail/src/addrbook_search.php:232
+#: squirrelmail/src/addrbook_search_html.php:229
 #, c-format
 msgid "Unable to list addresses from %s"
 msgstr "Niet mogelijk om adressen te tonen van %s"
 
 # squirrelmail/src/addrbook_search.php:240
 # squirrelmail/src/addrbook_search_html.php:211
-#: squirrelmail/src/addrbook_search.php:253
-#: squirrelmail/src/addrbook_search_html.php:247
+#: squirrelmail/src/addrbook_search.php:258
+#: squirrelmail/src/addrbook_search_html.php:254
 msgid "Your search failed with the following error(s)"
 msgstr "Uw zoekopdracht is mislukt door de volgende fouten"
 
 # squirrelmail/src/addrbook_search.php:160
 # squirrelmail/src/addrbook_search.php:247
 # squirrelmail/src/addrbook_search_html.php:216
-#: squirrelmail/src/addrbook_search.php:166
-#: squirrelmail/src/addrbook_search.php:262
-#: squirrelmail/src/addrbook_search_html.php:254
+#: squirrelmail/src/addrbook_search.php:178
+#: squirrelmail/src/addrbook_search.php:265
+#: squirrelmail/src/addrbook_search_html.php:259
 msgid "No persons matching your search was found"
 msgstr "Geen personen gevonden die voldoen aan de zoekopdracht."
 
 # squirrelmail/src/addrbook_search_html.php:229
-#: squirrelmail/src/addrbook_search_html.php:268
+#: squirrelmail/src/addrbook_search_html.php:272
 msgid "Return"
 msgstr "Terug"
 
@@ -187,67 +184,61 @@ msgstr "Terug"
 # squirrelmail/plugins/squirrelspell/modules/check_me.mod:427
 # squirrelmail/plugins/squirrelspell/modules/forget_me_not.mod:70
 # squirrelmail/src/addrbook_search.php:195 squirrelmail/src/compose.php:603
-#: squirrelmail/plugins/newmail/testsound.php:36
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:119
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:427
-#: squirrelmail/plugins/squirrelspell/modules/forget_me_not.mod:70
-#: squirrelmail/src/addrbook_search.php:206 squirrelmail/src/compose.php:756
-#: squirrelmail/src/printer_friendly_top.php:39
+#: squirrelmail/plugins/newmail/testsound.php:35
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:121
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:429
+#: squirrelmail/plugins/squirrelspell/modules/forget_me_not.mod:74
+#: squirrelmail/src/addrbook_search.php:213 squirrelmail/src/compose.php:671
 msgid "Close"
 msgstr "Sluit"
 
 # squirrelmail/src/addressbook.php:39 squirrelmail/src/addressbook.php:285
-#: squirrelmail/plugins/abook_take/take.php:35
-#: squirrelmail/src/addressbook.php:40 squirrelmail/src/addressbook.php:304
+#: squirrelmail/src/addressbook.php:68 squirrelmail/src/addressbook.php:314
+#: squirrelmail/src/vcard.php:145
 msgid "Nickname"
 msgstr "Bijnaam"
 
 # squirrelmail/src/addressbook.php:40
-#: squirrelmail/plugins/abook_take/take.php:37
-#: squirrelmail/src/addressbook.php:41
+#: squirrelmail/src/addressbook.php:69
 msgid "Must be unique"
 msgstr "Moet uniek zijn"
 
 # squirrelmail/src/addressbook.php:41
-#: squirrelmail/plugins/abook_take/take.php:41
-#: squirrelmail/src/addressbook.php:42
+#: squirrelmail/src/addressbook.php:70
 msgid "E-mail address"
 msgstr "E-mailadres"
 
 # squirrelmail/src/addressbook.php:42
-#: squirrelmail/plugins/abook_take/take.php:60
-#: squirrelmail/src/addressbook.php:43
+#: squirrelmail/src/addressbook.php:71
 msgid "First name"
 msgstr "Voornaam"
 
 # squirrelmail/src/addressbook.php:43
-#: squirrelmail/plugins/abook_take/take.php:64
-#: squirrelmail/src/addressbook.php:44
+#: squirrelmail/src/addressbook.php:72
 msgid "Last name"
 msgstr "Achternaam"
 
 # squirrelmail/src/addressbook.php:44
-#: squirrelmail/plugins/abook_take/take.php:68
-#: squirrelmail/src/addressbook.php:45
+#: squirrelmail/src/addressbook.php:73
 msgid "Additional info"
 msgstr "Meer informatie"
 
 # squirrelmail/src/addressbook.php:58
-#: squirrelmail/src/addressbook.php:61
+#: squirrelmail/src/addressbook.php:87
 msgid "No personal address book is defined. Contact administrator."
 msgstr ""
 "Geen persoonlijk adresboek gedefinieerd. Neem contact op met de "
 "systeembeheerder."
 
 # squirrelmail/src/addressbook.php:154
-#: squirrelmail/src/addressbook.php:157
+#: squirrelmail/src/addressbook.php:183
 msgid "You can only edit one address at the time"
 msgstr "U mag maar &eacute;&eacute;n adres tegelijk bewerken"
 
 # squirrelmail/src/addressbook.php:168 squirrelmail/src/addressbook.php:170
 # squirrelmail/src/addressbook.php:200 squirrelmail/src/addressbook.php:202
-#: squirrelmail/src/addressbook.php:171 squirrelmail/src/addressbook.php:175
-#: squirrelmail/src/addressbook.php:208 squirrelmail/src/addressbook.php:212
+#: squirrelmail/src/addressbook.php:197 squirrelmail/src/addressbook.php:199
+#: squirrelmail/src/addressbook.php:229 squirrelmail/src/addressbook.php:231
 msgid "Update address"
 msgstr "Werk adresgegevens bij"
 
@@ -260,38 +251,53 @@ msgstr "Werk adresgegevens bij"
 #: squirrelmail/functions/display_messages.php:89
 #: squirrelmail/functions/display_messages.php:106
 #: squirrelmail/functions/display_messages.php:172
-#: squirrelmail/src/addressbook.php:197 squirrelmail/src/addressbook.php:251
+#: squirrelmail/src/addressbook.php:220 squirrelmail/src/addressbook.php:268
 msgid "ERROR"
 msgstr "FOUT"
 
 # squirrelmail/src/addressbook.php:214
-#: squirrelmail/src/addressbook.php:224
+#: squirrelmail/src/addressbook.php:243
 msgid "Unknown error"
 msgstr "Onbekende fout"
 
 # squirrelmail/src/addressbook.php:258 squirrelmail/src/addressbook.php:344
-#: squirrelmail/plugins/abook_take/take.php:73
-#: squirrelmail/src/addressbook.php:271 squirrelmail/src/addressbook.php:374
+#: squirrelmail/src/addressbook.php:287 squirrelmail/src/addressbook.php:375
 msgid "Add address"
 msgstr "Voeg adres toe"
 
 # squirrelmail/src/addressbook.php:270 squirrelmail/src/addressbook.php:326
-#: squirrelmail/src/addressbook.php:285 squirrelmail/src/addressbook.php:352
+#: squirrelmail/src/addressbook.php:299 squirrelmail/src/addressbook.php:357
 msgid "Edit selected"
 msgstr "Wijzig geselecteerd adres"
 
 # squirrelmail/src/addressbook.php:272 squirrelmail/src/addressbook.php:328
-#: squirrelmail/src/addressbook.php:287 squirrelmail/src/addressbook.php:354
+#: squirrelmail/src/addressbook.php:301 squirrelmail/src/addressbook.php:359
 msgid "Delete selected"
 msgstr "Verwijder geselecteerd adres"
 
 # squirrelmail/src/addressbook.php:341
-#: squirrelmail/plugins/abook_take/take.php:29
-#: squirrelmail/src/addressbook.php:369
+#: squirrelmail/src/addressbook.php:372
 #, c-format
 msgid "Add to %s"
 msgstr "Voeg toe aan %s"
 
+# squirrelmail/src/compose.php:97
+#: squirrelmail/src/compose.php:140
+msgid "Draft Email Saved"
+msgstr "Concept e-mail bewaard"
+
+# squirrelmail/src/compose.php:200 squirrelmail/src/compose.php:244
+# squirrelmail/src/compose.php:254
+#: squirrelmail/src/compose.php:243 squirrelmail/src/compose.php:287
+#: squirrelmail/src/compose.php:297
+msgid "Could not move/copy file. File not attached"
+msgstr "Kan het bestand niet verplaatsen/kopieren. Bestand niet toegevoegd."
+
+# squirrelmail/src/compose.php:431
+#: squirrelmail/src/compose.php:495
+msgid "Original Message"
+msgstr "Oorspronkelijk bericht"
+
 # squirrelmail/functions/mailbox_display.php:759
 # squirrelmail/plugins/filters/options.php:129
 # squirrelmail/src/compose.php:432 squirrelmail/src/download.php:309
@@ -300,13 +306,14 @@ msgstr "Voeg toe aan %s"
 # squirrelmail/src/options_order.php:40
 # squirrelmail/src/printer_friendly_bottom.php:101
 # squirrelmail/src/search.php:348
-#: squirrelmail/functions/mailbox_display.php:837
-#: squirrelmail/plugins/filters/options.php:133
-#: squirrelmail/src/compose.php:83 squirrelmail/src/compose.php:95
-#: squirrelmail/src/options_highlight.php:380
-#: squirrelmail/src/options_order.php:40
-#: squirrelmail/src/printer_friendly_bottom.php:97
-#: squirrelmail/src/read_body.php:315 squirrelmail/src/search.php:413
+#: squirrelmail/functions/mailbox_display.php:769
+#: squirrelmail/plugins/filters/options.php:156
+#: squirrelmail/src/compose.php:496 squirrelmail/src/download.php:361
+#: squirrelmail/src/download.php:366
+#: squirrelmail/src/options_highlight.php:366
+#: squirrelmail/src/options_order.php:64
+#: squirrelmail/src/printer_friendly_bottom.php:111
+#: squirrelmail/src/search.php:382
 msgid "Subject"
 msgstr "Onderwerp"
 
@@ -318,14 +325,14 @@ msgstr "Onderwerp"
 # squirrelmail/src/options_order.php:38
 # squirrelmail/src/printer_friendly_bottom.php:95
 # squirrelmail/src/search.php:349
-#: squirrelmail/functions/mailbox_display.php:820
-#: squirrelmail/plugins/filters/options.php:121
-#: squirrelmail/src/compose.php:84 squirrelmail/src/compose.php:96
-#: squirrelmail/src/options_highlight.php:79
-#: squirrelmail/src/options_highlight.php:368
-#: squirrelmail/src/options_order.php:38
-#: squirrelmail/src/printer_friendly_bottom.php:93
-#: squirrelmail/src/read_body.php:323 squirrelmail/src/search.php:414
+#: squirrelmail/functions/mailbox_display.php:754
+#: squirrelmail/plugins/filters/options.php:144
+#: squirrelmail/src/compose.php:497 squirrelmail/src/download.php:150
+#: squirrelmail/src/download.php:362 squirrelmail/src/download.php:368
+#: squirrelmail/src/options_highlight.php:354
+#: squirrelmail/src/options_order.php:62
+#: squirrelmail/src/printer_friendly_bottom.php:105
+#: squirrelmail/src/search.php:383
 msgid "From"
 msgstr "Van"
 
@@ -333,302 +340,326 @@ msgstr "Van"
 # squirrelmail/src/compose.php:434 squirrelmail/src/download.php:312
 # squirrelmail/src/download.php:320 squirrelmail/src/options_order.php:39
 # squirrelmail/src/printer_friendly_bottom.php:100
-#: squirrelmail/functions/mailbox_display.php:829
-#: squirrelmail/src/compose.php:85 squirrelmail/src/compose.php:97
-#: squirrelmail/src/options_order.php:39
-#: squirrelmail/src/printer_friendly_bottom.php:101
-#: squirrelmail/src/read_body.php:324
+#: squirrelmail/functions/mailbox_display.php:762
+#: squirrelmail/src/compose.php:498 squirrelmail/src/download.php:364
+#: squirrelmail/src/download.php:372 squirrelmail/src/options_order.php:63
+#: squirrelmail/src/printer_friendly_bottom.php:110
 msgid "Date"
 msgstr "Datum"
 
-# squirrelmail/src/compose.php:431
-#: squirrelmail/src/compose.php:94
-msgid "Original Message"
-msgstr "Oorspronkelijk bericht"
-
-# squirrelmail/src/compose.php:97
-#: squirrelmail/src/compose.php:184
-msgid "Draft Email Saved"
-msgstr "Concept e-mail bewaard"
-
-# squirrelmail/src/compose.php:200 squirrelmail/src/compose.php:244
-# squirrelmail/src/compose.php:254
-#: squirrelmail/src/compose.php:287 squirrelmail/src/compose.php:330
-#: squirrelmail/src/compose.php:340
-msgid "Could not move/copy file. File not attached"
-msgstr "Kan het bestand niet verplaatsen/kopieren. Bestand niet toegevoegd."
-
 # squirrelmail/src/compose.php:595
-#: squirrelmail/src/compose.php:748
+#: squirrelmail/src/compose.php:663
 msgid "Draft Saved"
 msgstr "Concept e-mail bewaard"
 
 # squirrelmail/src/compose.php:598
-#: squirrelmail/src/compose.php:751
+#: squirrelmail/src/compose.php:666
 msgid "Your Message has been sent"
 msgstr "Uw bericht is verzonden"
 
 # squirrelmail/plugins/listcommands/mailout.php:50
 # squirrelmail/src/compose.php:614 squirrelmail/src/read_body.php:808
-#: squirrelmail/plugins/listcommands/mailout.php:54
-#: squirrelmail/src/compose.php:767
+#: squirrelmail/plugins/listcommands/mailout.php:57
+#: squirrelmail/src/compose.php:682 squirrelmail/src/read_body.php:905
 msgid "From:"
 msgstr "Van:"
 
 # squirrelmail/src/compose.php:642 squirrelmail/src/download.php:110
 # squirrelmail/src/read_body.php:220 squirrelmail/src/read_body.php:825
-#: squirrelmail/src/compose.php:795 squirrelmail/src/read_body.php:183
+#: squirrelmail/src/compose.php:710 squirrelmail/src/download.php:162
+#: squirrelmail/src/read_body.php:222 squirrelmail/src/read_body.php:924
 msgid "To:"
 msgstr "Aan:"
 
 # squirrelmail/src/compose.php:650
-#: squirrelmail/src/compose.php:803
+#: squirrelmail/src/compose.php:718
 msgid "CC:"
 msgstr "CC:"
 
 # squirrelmail/src/compose.php:658
-#: squirrelmail/src/compose.php:811
+#: squirrelmail/src/compose.php:726
 msgid "BCC:"
 msgstr "BCC:"
 
 # squirrelmail/src/compose.php:665 squirrelmail/src/download.php:103
 # squirrelmail/src/read_body.php:221 squirrelmail/src/read_body.php:779
-#: squirrelmail/src/compose.php:818 squirrelmail/src/read_body.php:184
+#: squirrelmail/src/compose.php:733 squirrelmail/src/download.php:155
+#: squirrelmail/src/read_body.php:223 squirrelmail/src/read_body.php:876
 msgid "Subject:"
 msgstr "Onderwerp:"
 
 # squirrelmail/src/compose.php:727 squirrelmail/src/compose.php:818
-#: squirrelmail/src/compose.php:868 squirrelmail/src/compose.php:978
+#: squirrelmail/src/compose.php:795 squirrelmail/src/compose.php:887
 msgid "Send"
 msgstr "Zend"
 
 # squirrelmail/src/compose.php:733
-#: squirrelmail/src/compose.php:883
+#: squirrelmail/src/compose.php:801
 msgid "Attach:"
 msgstr "Bijlage:"
 
 # squirrelmail/src/compose.php:738 squirrelmail/src/options_order.php:126
-#: squirrelmail/src/compose.php:888 squirrelmail/src/options_order.php:132
+#: squirrelmail/src/compose.php:806 squirrelmail/src/options_order.php:150
 msgid "Add"
 msgstr "Voeg toe"
 
 # squirrelmail/src/compose.php:757
-#: squirrelmail/src/compose.php:908
+#: squirrelmail/src/compose.php:826
 msgid "Delete selected attachments"
 msgstr "Verwijder geselecteerde bijlage(n)"
 
 # squirrelmail/src/compose.php:787 squirrelmail/src/read_body.php:854
-#: squirrelmail/src/compose.php:942 squirrelmail/src/read_body.php:329
+#: squirrelmail/src/compose.php:856 squirrelmail/src/read_body.php:953
 msgid "Priority"
 msgstr "Prioriteit"
 
 # squirrelmail/plugins/administrator/defines.php:201
 # squirrelmail/plugins/calendar/functions.php:98
 # squirrelmail/src/compose.php:788 squirrelmail/src/read_body.php:626
-#: squirrelmail/functions/mime.php:244
-#: squirrelmail/plugins/administrator/defines.php:202
-#: squirrelmail/plugins/calendar/functions.php:99
-#: squirrelmail/src/compose.php:943
+#: squirrelmail/plugins/administrator/defines.php:201
+#: squirrelmail/plugins/calendar/functions.php:102
+#: squirrelmail/src/compose.php:857 squirrelmail/src/read_body.php:693
 msgid "High"
 msgstr "Hoog"
 
 # squirrelmail/plugins/calendar/functions.php:97
 # squirrelmail/src/compose.php:789 squirrelmail/src/read_body.php:639
-#: squirrelmail/functions/mime.php:257
-#: squirrelmail/plugins/calendar/functions.php:98
-#: squirrelmail/src/compose.php:944
+#: squirrelmail/plugins/calendar/functions.php:101
+#: squirrelmail/src/compose.php:858 squirrelmail/src/read_body.php:706
 msgid "Normal"
 msgstr "Normaal"
 
 # squirrelmail/plugins/administrator/defines.php:198
 # squirrelmail/src/compose.php:790 squirrelmail/src/read_body.php:632
-#: squirrelmail/functions/mime.php:250
-#: squirrelmail/plugins/administrator/defines.php:199
-#: squirrelmail/src/compose.php:945
+#: squirrelmail/plugins/administrator/defines.php:198
+#: squirrelmail/src/compose.php:859 squirrelmail/src/read_body.php:699
 msgid "Low"
 msgstr "Laag"
 
 # squirrelmail/src/compose.php:796
-#: squirrelmail/src/compose.php:951
+#: squirrelmail/src/compose.php:865
 msgid "Receipt"
 msgstr "Bevestiging"
 
 # squirrelmail/src/compose.php:798
-#: squirrelmail/src/compose.php:953
-msgid "On Read"
+#: squirrelmail/src/compose.php:867
+msgid "On read"
 msgstr "Bij lezen"
 
 # squirrelmail/src/compose.php:800
-#: squirrelmail/src/compose.php:955
+#: squirrelmail/src/compose.php:869
 msgid "On Delivery"
 msgstr "Bij ontvangst"
 
 # squirrelmail/src/compose.php:805
 # squirrelmail/src/options_identities.php:329
 # squirrelmail/src/options_personal.php:99
-#: squirrelmail/src/compose.php:960
-#: squirrelmail/src/options_identities.php:314
-#: squirrelmail/src/options_personal.php:99
+#: squirrelmail/src/compose.php:874
+#: squirrelmail/src/options_identities.php:338
+#: squirrelmail/src/options_personal.php:104
 msgid "Signature"
 msgstr "Handtekening"
 
 # squirrelmail/functions/page_header.php:136 squirrelmail/src/compose.php:808
 # squirrelmail/src/compose.php:812 squirrelmail/src/compose.php:816
-#: squirrelmail/functions/page_header.php:219 squirrelmail/src/compose.php:963
-#: squirrelmail/src/compose.php:967 squirrelmail/src/compose.php:971
+#: squirrelmail/functions/page_header.php:233 squirrelmail/src/compose.php:877
+#: squirrelmail/src/compose.php:881 squirrelmail/src/compose.php:885
 msgid "Addresses"
 msgstr "Adressen"
 
 # squirrelmail/src/compose.php:821
-#: squirrelmail/src/compose.php:975
+#: squirrelmail/src/compose.php:890
 msgid "Save Draft"
 msgstr "Bewaar concept"
 
 # squirrelmail/src/compose.php:840
-#: squirrelmail/src/compose.php:995
+#: squirrelmail/src/compose.php:909
 msgid "You have not filled in the \"To:\" field."
 msgstr "U heeft het \"Aan:\" veld niet ingevuld."
 
 # squirrelmail/src/compose.php:932
-#: squirrelmail/src/compose.php:1083
+#: squirrelmail/src/compose.php:1005
 msgid "said"
 msgstr "zei"
 
 # squirrelmail/src/compose.php:935
-#: squirrelmail/src/compose.php:1086
+#: squirrelmail/src/compose.php:1008
 msgid "quote"
 msgstr "citaat"
 
 # squirrelmail/src/compose.php:935
-#: squirrelmail/src/compose.php:1086
+#: squirrelmail/src/compose.php:1008
 msgid "who"
 msgstr "van"
 
-# squirrelmail/functions/imap_search.php:202
-# squirrelmail/functions/mailbox_display.php:675
-# squirrelmail/functions/page_header.php:109
-# squirrelmail/plugins/delete_move_next/setup.php:218
-# squirrelmail/plugins/mail_fetch/options.php:137
-# squirrelmail/plugins/mail_fetch/options.php:214
-# squirrelmail/src/left_main.php:73 squirrelmail/src/search.php:312
-#: squirrelmail/functions/mailbox_display.php:1218
-#: squirrelmail/functions/page_header.php:193
-#: squirrelmail/plugins/delete_move_next/setup.php:227
-#: squirrelmail/plugins/mail_fetch/options.php:172
-#: squirrelmail/plugins/mail_fetch/options.php:290
-#: squirrelmail/src/download.php:29 squirrelmail/src/left_main.php:74
-#: squirrelmail/src/search.php:168 squirrelmail/src/search.php:382
-msgid "INBOX"
-msgstr "INBOX"
+# squirrelmail/src/download.php:31
+#: squirrelmail/src/download.php:73
+msgid "Viewing a text attachment"
+msgstr "Bekijk een tekst bijlage"
+
+# squirrelmail/src/download.php:34 squirrelmail/src/download.php:36
+# squirrelmail/src/download.php:72 squirrelmail/src/image.php:31
+# squirrelmail/src/image.php:35 squirrelmail/src/read_body.php:438
+# squirrelmail/src/vcard.php:35 squirrelmail/src/vcard.php:39
+#: squirrelmail/src/download.php:79 squirrelmail/src/download.php:84
+#: squirrelmail/src/download.php:128 squirrelmail/src/image.php:47
+#: squirrelmail/src/image.php:51 squirrelmail/src/read_body.php:505
+#: squirrelmail/src/vcard.php:51 squirrelmail/src/vcard.php:55
+msgid "View message"
+msgstr "Bekijk bericht"
+
+# squirrelmail/functions/mime.php:788 squirrelmail/src/download.php:41
+# squirrelmail/src/download.php:77 squirrelmail/src/image.php:44
+# squirrelmail/src/vcard.php:196
+#: squirrelmail/functions/mime.php:793 squirrelmail/src/download.php:105
+#: squirrelmail/src/image.php:60 squirrelmail/src/vcard.php:212
+msgid "Download this as a file"
+msgstr "Download dit als een bestand"
+
+# squirrelmail/src/download.php:70
+#: squirrelmail/src/download.php:125
+msgid "Viewing a message attachment"
+msgstr "Bekijk een tekst bijlage"
+
+# squirrelmail/plugins/calendar/event_create.php:112
+# squirrelmail/plugins/calendar/event_delete.php:32
+# squirrelmail/plugins/calendar/event_edit.php:35
+# squirrelmail/plugins/calendar/event_edit.php:93
+# squirrelmail/plugins/calendar/event_edit.php:106
+# squirrelmail/src/download.php:116 squirrelmail/src/read_body.php:816
+#: squirrelmail/plugins/calendar/event_create.php:168
+#: squirrelmail/plugins/calendar/event_delete.php:90
+#: squirrelmail/plugins/calendar/event_edit.php:116
+#: squirrelmail/plugins/calendar/event_edit.php:182
+#: squirrelmail/plugins/calendar/event_edit.php:195
+#: squirrelmail/src/download.php:168 squirrelmail/src/read_body.php:915
+msgid "Date:"
+msgstr "Datum:"
+
+# squirrelmail/src/download.php:124
+#: squirrelmail/src/download.php:176
+msgid "Cc:"
+msgstr "CC"
+
+# squirrelmail/src/download.php:132
+#: squirrelmail/src/download.php:184
+msgid "Bcc:"
+msgstr "BCC"
+
+# squirrelmail/src/download.php:149 squirrelmail/src/read_body.php:590
+#: squirrelmail/src/download.php:201 squirrelmail/src/read_body.php:657
+msgid "more"
+msgstr "meer"
+
+# squirrelmail/src/download.php:150 squirrelmail/src/read_body.php:591
+#: squirrelmail/src/download.php:202 squirrelmail/src/read_body.php:658
+msgid "less"
+msgstr "minder"
 
 # squirrelmail/src/folders_create.php:29
-#: squirrelmail/src/folders_create.php:29
+#: squirrelmail/src/folders_create.php:42
 msgid "Illegal folder name.  Please select a different name."
 msgstr "Deze naam is niet toegestaan, gebruik een andere naam."
 
 # squirrelmail/src/folders_create.php:29
 # squirrelmail/src/folders_delete.php:29
 # squirrelmail/src/folders_rename_getname.php:23
-#: squirrelmail/src/folders_create.php:29
-#: squirrelmail/src/folders_delete.php:30
-#: squirrelmail/src/folders_rename_getname.php:24
+#: squirrelmail/src/folders_create.php:42
+#: squirrelmail/src/folders_delete.php:39
+#: squirrelmail/src/folders_rename_getname.php:32
 msgid "Click here to go back"
 msgstr "Klik hier om terug te gaan"
 
 # squirrelmail/src/folders_delete.php:29
-#: squirrelmail/src/folders_delete.php:30
+#: squirrelmail/src/folders_delete.php:39
 msgid "You have not selected a folder to delete. Please do so."
 msgstr ""
 "U heeft geen map geselecteerd om te verwijderen. Selecteer een map a.u.b."
 
 # squirrelmail/functions/page_header.php:138 squirrelmail/src/folders.php:29
 # squirrelmail/src/left_main.php:241
-#: squirrelmail/functions/page_header.php:221 squirrelmail/src/folders.php:28
-#: squirrelmail/src/left_main.php:754
+#: squirrelmail/functions/page_header.php:235 squirrelmail/src/folders.php:41
+#: squirrelmail/src/left_main.php:250
 msgid "Folders"
 msgstr "Mappen"
 
 # squirrelmail/src/folders.php:42
-#: squirrelmail/src/folders.php:37
+#: squirrelmail/src/folders.php:54
 msgid "Subscribed successfully!"
 msgstr "Succesvol aangemeld!"
 
 # squirrelmail/src/folders.php:44
-#: squirrelmail/src/folders.php:39
+#: squirrelmail/src/folders.php:56
 msgid "Unsubscribed successfully!"
 msgstr "Succesvol afgemeld!"
 
 # squirrelmail/src/folders.php:46
-#: squirrelmail/src/folders.php:41
+#: squirrelmail/src/folders.php:58
 msgid "Deleted folder successfully!"
 msgstr "Map succesvol verwijderd!"
 
 # squirrelmail/src/folders.php:48
-#: squirrelmail/src/folders.php:43
+#: squirrelmail/src/folders.php:60
 msgid "Created folder successfully!"
 msgstr "Map succesvol aangemaakt!"
 
 # squirrelmail/src/folders.php:50
-#: squirrelmail/src/folders.php:45
+#: squirrelmail/src/folders.php:62
 msgid "Renamed successfully!"
 msgstr "Succesvol hernoemd!"
 
-#: squirrelmail/src/folders.php:48
-msgid "Subscription Unsuccessful - Folder does not exist."
-msgstr "Aanmelding niet gelukt - Map bestaat niet."
-
 # squirrelmail/src/folders.php:53 squirrelmail/src/left_main.php:280
-#: squirrelmail/src/folders.php:55 squirrelmail/src/left_main.php:793
+#: squirrelmail/src/folders.php:65 squirrelmail/src/left_main.php:289
 msgid "refresh folder list"
 msgstr "vernieuw mappenlijst"
 
 # squirrelmail/src/folders.php:65
-#: squirrelmail/src/folders.php:68
+#: squirrelmail/src/folders.php:77
 msgid "Create Folder"
 msgstr "Maak map aan"
 
 # squirrelmail/src/folders.php:70
-#: squirrelmail/src/folders.php:75
+#: squirrelmail/src/folders.php:82
 msgid "as a subfolder of"
 msgstr "als een submap van"
 
 # squirrelmail/src/folders.php:74 squirrelmail/src/folders.php:76
-#: squirrelmail/src/folders.php:79 squirrelmail/src/folders.php:81
+#: squirrelmail/src/folders.php:86 squirrelmail/src/folders.php:88
 msgid "None"
 msgstr "Geen"
 
 # squirrelmail/src/folders.php:98
-#: squirrelmail/src/folders.php:106
+#: squirrelmail/src/folders.php:113
 msgid "Let this folder contain subfolders"
 msgstr "Deze map mag submappen hebben"
 
 # squirrelmail/src/folders.php:101
-#: squirrelmail/src/folders.php:109
+#: squirrelmail/src/folders.php:116
 msgid "Create"
 msgstr "Aanmaken"
 
 # squirrelmail/src/folders.php:136
-#: squirrelmail/src/folders.php:145
+#: squirrelmail/src/folders.php:151
 msgid "Rename a Folder"
 msgstr "Hernoem een map"
 
 # squirrelmail/src/folders.php:142 squirrelmail/src/folders.php:179
-#: squirrelmail/src/folders.php:153 squirrelmail/src/folders.php:194
+#: squirrelmail/src/folders.php:157 squirrelmail/src/folders.php:194
 msgid "Select a folder"
 msgstr "Selecteer een map"
 
 # squirrelmail/src/folders.php:160
-#: squirrelmail/src/folders.php:172
+#: squirrelmail/src/folders.php:175
 msgid "Rename"
 msgstr "Hernoem"
 
 # squirrelmail/src/folders.php:164 squirrelmail/src/folders.php:200
-#: squirrelmail/src/folders.php:176 squirrelmail/src/folders.php:216
+#: squirrelmail/src/folders.php:179 squirrelmail/src/folders.php:216
 msgid "No folders found"
 msgstr "Geen mappen gevonden"
 
 # squirrelmail/src/folders.php:172
-#: squirrelmail/src/folders.php:186
+#: squirrelmail/src/folders.php:187
 msgid "Delete Folder"
 msgstr "Verwijder map"
 
@@ -639,59 +670,52 @@ msgstr "Verwijder map"
 # squirrelmail/src/folders.php:196 squirrelmail/src/options_highlight.php:76
 # squirrelmail/src/options_identities.php:341
 # squirrelmail/src/read_body.php:691
-#: squirrelmail/functions/mailbox_display.php:725
-#: squirrelmail/plugins/filters/options.php:194
+#: squirrelmail/functions/mailbox_display.php:703
+#: squirrelmail/plugins/filters/options.php:216
+#: squirrelmail/plugins/mail_fetch/options.php:207
 #: squirrelmail/plugins/mail_fetch/options.php:214
-#: squirrelmail/plugins/mail_fetch/options.php:221
-#: squirrelmail/src/folders.php:212 squirrelmail/src/options_highlight.php:100
-#: squirrelmail/src/options_identities.php:328
-#: squirrelmail/src/read_body.php:414
+#: squirrelmail/src/folders.php:212 squirrelmail/src/options_highlight.php:103
+#: squirrelmail/src/options_identities.php:350
+#: squirrelmail/src/read_body.php:758
 msgid "Delete"
 msgstr "Verwijder"
 
 # squirrelmail/plugins/listcommands/setup.php:34
 # squirrelmail/src/folders.php:207 squirrelmail/src/folders.php:226
 #: squirrelmail/plugins/listcommands/setup.php:34
-#: squirrelmail/src/folders.php:227 squirrelmail/src/folders.php:249
+#: squirrelmail/src/folders.php:223 squirrelmail/src/folders.php:243
 msgid "Unsubscribe"
 msgstr "Afmelden"
 
 # squirrelmail/plugins/listcommands/setup.php:33
 # squirrelmail/src/folders.php:207 squirrelmail/src/folders.php:267
 #: squirrelmail/plugins/listcommands/setup.php:33
-#: squirrelmail/src/folders.php:227 squirrelmail/src/folders.php:292
-#: squirrelmail/src/folders.php:302
+#: squirrelmail/src/folders.php:223 squirrelmail/src/folders.php:284
 msgid "Subscribe"
 msgstr "Aanmelden"
 
 # squirrelmail/src/folders.php:230
-#: squirrelmail/src/folders.php:253
+#: squirrelmail/src/folders.php:247
 msgid "No folders were found to unsubscribe from!"
 msgstr "Geen mappen gevonden om bij af te melden!"
 
 # squirrelmail/src/folders.php:270
-#: squirrelmail/src/folders.php:295
+#: squirrelmail/src/folders.php:287
 msgid "No folders were found to subscribe to!"
 msgstr "Geen mappen gevonden om bij aan te melden!"
 
-# squirrelmail/plugins/listcommands/setup.php:33
-# squirrelmail/src/folders.php:207 squirrelmail/src/folders.php:267
-#: squirrelmail/src/folders.php:300
-msgid "Subscribe to:"
-msgstr "Aanmelden bij:"
-
 # squirrelmail/src/folders_rename_getname.php:23
-#: squirrelmail/src/folders_rename_getname.php:24
+#: squirrelmail/src/folders_rename_getname.php:32
 msgid "You have not selected a folder to rename. Please do so."
-msgstr "U heeft geen map geselecteerd om te hernoemen. Selecteer een map."
+msgstr ""
 
 # squirrelmail/src/folders_rename_getname.php:48
-#: squirrelmail/src/folders_rename_getname.php:50
+#: squirrelmail/src/folders_rename_getname.php:57
 msgid "Rename a folder"
 msgstr "Hernoem een map"
 
 # squirrelmail/src/folders_rename_getname.php:52
-#: squirrelmail/src/folders_rename_getname.php:55
+#: squirrelmail/src/folders_rename_getname.php:61
 msgid "New name:"
 msgstr "Nieuwe naam:"
 
@@ -701,24 +725,24 @@ msgstr "Nieuwe naam:"
 # squirrelmail/plugins/translate/options.php:160
 # squirrelmail/src/folders_rename_getname.php:59
 # squirrelmail/src/options_highlight.php:352
-#: squirrelmail/functions/options.php:419
-#: squirrelmail/plugins/filters/options.php:173
-#: squirrelmail/plugins/newmail/newmail_opt.php:154
-#: squirrelmail/plugins/translate/options.php:159
-#: squirrelmail/src/folders_rename_getname.php:62
-#: squirrelmail/src/options_highlight.php:393
+#: squirrelmail/functions/options.php:421
+#: squirrelmail/plugins/filters/options.php:200
+#: squirrelmail/plugins/newmail/newmail_opt.php:146
+#: squirrelmail/plugins/translate/options.php:164
+#: squirrelmail/src/folders_rename_getname.php:68
+#: squirrelmail/src/options_highlight.php:379
 msgid "Submit"
 msgstr "Verstuur"
 
 # squirrelmail/functions/page_header.php:144
 # squirrelmail/plugins/listcommands/setup.php:37 squirrelmail/src/help.php:91
-#: squirrelmail/functions/page_header.php:227
-#: squirrelmail/plugins/listcommands/setup.php:37 squirrelmail/src/help.php:89
+#: squirrelmail/functions/page_header.php:241
+#: squirrelmail/plugins/listcommands/setup.php:37 squirrelmail/src/help.php:91
 msgid "Help"
 msgstr "Help"
 
 # squirrelmail/src/help.php:131
-#: squirrelmail/src/help.php:128
+#: squirrelmail/src/help.php:131
 #, c-format
 msgid ""
 "The help has not been translated to %s.  It will be displayed in English "
@@ -728,12 +752,12 @@ msgstr ""
 "het Engels."
 
 # squirrelmail/src/help.php:137
-#: squirrelmail/src/help.php:134
+#: squirrelmail/src/help.php:137
 msgid "Some or all of the help documents are not present!"
 msgstr "Sommige of alle helppagina's zijn niet aanwezig!"
 
 # squirrelmail/src/help.php:169 squirrelmail/src/help.php:191
-#: squirrelmail/src/help.php:168 squirrelmail/src/help.php:190
+#: squirrelmail/src/help.php:171 squirrelmail/src/help.php:193
 msgid "Table of Contents"
 msgstr "Inhoudsopgave"
 
@@ -744,11 +768,13 @@ msgstr "Inhoudsopgave"
 # squirrelmail/plugins/delete_move_next/setup.php:168
 # squirrelmail/src/help.php:185 squirrelmail/src/help.php:189
 # squirrelmail/src/read_body.php:725 squirrelmail/src/read_body.php:727
-#: squirrelmail/functions/mailbox_display.php:1013
-#: squirrelmail/functions/mailbox_display.php:1016
-#: squirrelmail/functions/mailbox_display.php:1019
-#: squirrelmail/src/help.php:184 squirrelmail/src/help.php:188
-#: squirrelmail/src/read_body.php:448 squirrelmail/src/read_body.php:450
+#: squirrelmail/functions/mailbox_display.php:934
+#: squirrelmail/functions/mailbox_display.php:937
+#: squirrelmail/functions/mailbox_display.php:940
+#: squirrelmail/plugins/delete_move_next/setup.php:171
+#: squirrelmail/plugins/delete_move_next/setup.php:173
+#: squirrelmail/src/help.php:187 squirrelmail/src/help.php:191
+#: squirrelmail/src/read_body.php:804 squirrelmail/src/read_body.php:806
 msgid "Previous"
 msgstr "Vorige"
 
@@ -759,66 +785,62 @@ msgstr "Vorige"
 # squirrelmail/plugins/delete_move_next/setup.php:173
 # squirrelmail/src/help.php:193 squirrelmail/src/help.php:196
 # squirrelmail/src/read_body.php:731 squirrelmail/src/read_body.php:733
-#: squirrelmail/functions/mailbox_display.php:1014
-#: squirrelmail/functions/mailbox_display.php:1017
-#: squirrelmail/functions/mailbox_display.php:1020
-#: squirrelmail/src/help.php:192 squirrelmail/src/help.php:195
-#: squirrelmail/src/read_body.php:457 squirrelmail/src/read_body.php:459
+#: squirrelmail/functions/mailbox_display.php:935
+#: squirrelmail/functions/mailbox_display.php:938
+#: squirrelmail/functions/mailbox_display.php:941
+#: squirrelmail/plugins/delete_move_next/setup.php:176
+#: squirrelmail/plugins/delete_move_next/setup.php:178
+#: squirrelmail/src/help.php:195 squirrelmail/src/help.php:198
+#: squirrelmail/src/read_body.php:810 squirrelmail/src/read_body.php:812
 msgid "Next"
 msgstr "Volgende"
 
 # squirrelmail/src/help.php:219
-#: squirrelmail/src/help.php:216
+#: squirrelmail/src/help.php:221
 msgid "Top"
 msgstr "Top"
 
 # squirrelmail/src/image.php:26
-#: squirrelmail/src/image.php:27
+#: squirrelmail/src/image.php:42
 msgid "Viewing an image attachment"
 msgstr "Bekijk een tekst bijlage"
 
-# squirrelmail/src/download.php:34 squirrelmail/src/download.php:36
-# squirrelmail/src/download.php:72 squirrelmail/src/image.php:31
-# squirrelmail/src/image.php:35 squirrelmail/src/read_body.php:438
-# squirrelmail/src/vcard.php:35 squirrelmail/src/vcard.php:39
-#: squirrelmail/src/image.php:31 squirrelmail/src/vcard.php:36
-#: squirrelmail/src/vcard.php:40 squirrelmail/src/view_header.php:84
-#: squirrelmail/src/view_text.php:36
-msgid "View message"
-msgstr "Bekijk bericht"
-
-# squirrelmail/functions/mime.php:788 squirrelmail/src/download.php:41
-# squirrelmail/src/download.php:77 squirrelmail/src/image.php:44
-# squirrelmail/src/vcard.php:196
-#: squirrelmail/plugins/abook_take/setup.php:91 squirrelmail/src/image.php:40
-#: squirrelmail/src/vcard.php:213 squirrelmail/src/view_text.php:40
-msgid "Download this as a file"
-msgstr "Download dit als een bestand"
+# squirrelmail/functions/imap_search.php:202
+# squirrelmail/functions/mailbox_display.php:675
+# squirrelmail/functions/page_header.php:109
+# squirrelmail/plugins/delete_move_next/setup.php:218
+# squirrelmail/plugins/mail_fetch/options.php:137
+# squirrelmail/plugins/mail_fetch/options.php:214
+# squirrelmail/src/left_main.php:73 squirrelmail/src/search.php:312
+#: squirrelmail/functions/imap_search.php:218
+#: squirrelmail/functions/mailbox_display.php:680
+#: squirrelmail/functions/page_header.php:207
+#: squirrelmail/plugins/delete_move_next/setup.php:222
+#: squirrelmail/plugins/mail_fetch/options.php:181
+#: squirrelmail/plugins/mail_fetch/options.php:258
+#: squirrelmail/src/left_main.php:73 squirrelmail/src/search.php:346
+msgid "INBOX"
+msgstr "INBOX"
 
 # squirrelmail/src/left_main.php:97
-#: squirrelmail/src/left_main.php:98 squirrelmail/src/left_main.php:251
-#: squirrelmail/src/left_main.php:326
+#: squirrelmail/src/left_main.php:97
 msgid "purge"
 msgstr "legen"
 
 # squirrelmail/src/left_main.php:274
-#: squirrelmail/src/left_main.php:787
+#: squirrelmail/src/left_main.php:283
 msgid "Last Refresh"
 msgstr "Laatste vernieuwing"
 
-#: squirrelmail/src/left_main.php:867
-msgid "Save folder tree"
-msgstr ""
-
 # squirrelmail/src/login.php:102 squirrelmail/src/login.php:156
-#: squirrelmail/src/login.php:62 squirrelmail/src/login.php:124
+#: squirrelmail/src/login.php:106 squirrelmail/src/login.php:160
 msgid "Login"
 msgstr "Aanmelden"
 
 # squirrelmail/functions/display_messages.php:143
 # squirrelmail/src/login.php:124
 #: squirrelmail/functions/display_messages.php:164
-#: squirrelmail/src/login.php:87
+#: squirrelmail/src/login.php:128
 #, c-format
 msgid "%s Logo"
 msgstr "%s Logo"
@@ -826,7 +848,7 @@ msgstr "%s Logo"
 # squirrelmail/functions/display_messages.php:146
 # squirrelmail/src/login.php:127
 #: squirrelmail/functions/display_messages.php:167
-#: squirrelmail/src/login.php:90
+#: squirrelmail/src/login.php:131
 #, c-format
 msgid "SquirrelMail version %s"
 msgstr "SquirrelMail versie %s"
@@ -834,36 +856,41 @@ msgstr "SquirrelMail versie %s"
 # squirrelmail/functions/display_messages.php:147
 # squirrelmail/src/login.php:128
 #: squirrelmail/functions/display_messages.php:168
-#: squirrelmail/src/login.php:91
+#: squirrelmail/src/login.php:132
 msgid "By the SquirrelMail Development Team"
 msgstr "Door het Squirrelmail ontwikkelingsteam"
 
 # squirrelmail/src/login.php:134
-#: squirrelmail/src/login.php:95
+#: squirrelmail/src/login.php:138
 #, c-format
 msgid "%s Login"
 msgstr "%s Webmail - Aanmelden"
 
 # squirrelmail/src/login.php:138
-#: squirrelmail/src/login.php:103
+#: squirrelmail/src/login.php:142
 msgid "Name:"
 msgstr "Gebruikersnaam:"
 
 # squirrelmail/plugins/mail_fetch/options.php:126
 # squirrelmail/plugins/mail_fetch/options.php:202
 # squirrelmail/src/login.php:144
-#: squirrelmail/plugins/mail_fetch/options.php:157
-#: squirrelmail/plugins/mail_fetch/options.php:274
-#: squirrelmail/src/login.php:111
+#: squirrelmail/plugins/mail_fetch/options.php:170
+#: squirrelmail/plugins/mail_fetch/options.php:246
+#: squirrelmail/src/login.php:148
 msgid "Password:"
 msgstr "Wachtwoord:"
 
+# squirrelmail/src/move_messages.php:94
+#: squirrelmail/src/move_messages.php:96
+msgid "<No subject>"
+msgstr "<geen onderwerp>"
+
 # squirrelmail/src/move_messages.php:163
 # squirrelmail/src/move_messages.php:207
 # squirrelmail/src/move_messages.php:236
-#: squirrelmail/src/move_messages.php:158
-#: squirrelmail/src/move_messages.php:200
-#: squirrelmail/src/move_messages.php:224
+#: squirrelmail/src/move_messages.php:236
+#: squirrelmail/src/move_messages.php:289
+#: squirrelmail/src/move_messages.php:317
 msgid "No messages were selected."
 msgstr "Geen berichten geselecteerd."
 
@@ -914,7 +941,7 @@ msgstr "Altijd"
 # squirrelmail/src/options_display.php:99
 # squirrelmail/src/options_folder.php:122
 #: squirrelmail/src/options_display.php:99
-#: squirrelmail/src/options_folder.php:122
+#: squirrelmail/src/options_folder.php:132
 msgid "Never"
 msgstr "Nooit"
 
@@ -998,255 +1025,253 @@ msgstr "HTML"
 msgid "Show HTML Version by Default"
 msgstr "Toon HTML versie standaard"
 
+# squirrelmail/src/options_display.php:199
 #: squirrelmail/src/options_display.php:199
-msgid "Enable Forward as Attachment"
-msgstr "Activeer doorsturen als bijlage"
+msgid "Include Me in CC when I Reply All"
+msgstr "Voeg Mij toe in CC als ik allen beantwoord"
 
 # squirrelmail/src/options_display.php:206
 #: squirrelmail/src/options_display.php:206
-msgid "Include CCs when Forwarding Messages"
+msgid "Include CCs when forwarding messages"
 msgstr "Voeg CCs toe bij forwarden berichten"
 
-# squirrelmail/src/options_display.php:199
-#: squirrelmail/src/options_display.php:213
-msgid "Include Me in CC when I Reply All"
-msgstr "Voeg Mij toe in CC als ik allen beantwoord"
-
 # squirrelmail/src/options_display.php:213
-#: squirrelmail/src/options_display.php:220
+#: squirrelmail/src/options_display.php:213
 msgid "Enable Mailer Display"
 msgstr "Activeer weergave mailprogramma"
 
 # squirrelmail/src/options_display.php:220
-#: squirrelmail/src/options_display.php:227
+#: squirrelmail/src/options_display.php:220
 msgid "Display Attached Images with Message"
 msgstr "Geef bijgevoegde afbeeldingen weer bij bericht"
 
 # squirrelmail/src/options_display.php:227
-#: squirrelmail/src/options_display.php:234
+#: squirrelmail/src/options_display.php:227
 msgid "Enable Subtle Printer Friendly Link"
 msgstr "Activeer subtiele printervriendelijke link"
 
 # squirrelmail/src/options_display.php:234
-#: squirrelmail/src/options_display.php:241
+#: squirrelmail/src/options_display.php:234
 msgid "Enable Printer Friendly Clean Display"
 msgstr "Activeer printervriendelijk schoon scherm"
 
-# squirrelmail/src/options_folder.php:142
-#: squirrelmail/src/options_display.php:249
-msgid "Enable Mail Delivery Notification"
-msgstr "Activeer Ongelezen bericht notificatie"
+# squirrelmail/src/options_display.php:242
+#: squirrelmail/src/options_display.php:242
+msgid "Enable request/confirm reading"
+msgstr "Activeer ontvangst-/leesbevestiging"
 
 # squirrelmail/src/options_display.php:250
-#: squirrelmail/src/options_display.php:257
-msgid "Compose Messages in New Window"
+#: squirrelmail/src/options_display.php:250
+msgid "Always compose in a new window"
 msgstr "Altijd bericht opstellen in nieuw venster"
 
 # squirrelmail/src/options_display.php:257
-#: squirrelmail/src/options_display.php:264
-msgid "Width of Compose Window"
+#: squirrelmail/src/options_display.php:257
+msgid "Width of compose window"
 msgstr "Breedte van berichtvenster"
 
 # squirrelmail/src/options_display.php:265
-#: squirrelmail/src/options_display.php:272
-msgid "Height of Compose Window"
+#: squirrelmail/src/options_display.php:265
+msgid "Height of compose window"
 msgstr "Hoogte van berichtvenster"
 
 # squirrelmail/src/options_display.php:273
-#: squirrelmail/src/options_display.php:280
-msgid "Append Signature before Reply/Forward Text"
+#: squirrelmail/src/options_display.php:273
+msgid "Append signature before reply/forward text"
 msgstr "Voeg handtekening toe _voor_ de beantwoorde/geforwarde tekst"
 
-#: squirrelmail/src/options_display.php:287
-msgid "Enable Sort by of Receive Date"
-msgstr "Activeer sorteren op datum van ontvangst"
+# squirrelmail/src/options_display.php:280
+#: squirrelmail/src/options_display.php:280
+msgid "Use receive date for sort"
+msgstr "Gebruik datum van ontvangst voor sorteren"
 
-#: squirrelmail/src/options_display.php:294
-msgid "Enable Thread Sort by References Header"
-msgstr "Activeer sorteren op referenties in berichtinformatie"
+# squirrelmail/src/options_display.php:287
+#: squirrelmail/src/options_display.php:287
+msgid "Use References header for thread sort"
+msgstr "Gebruik referentie berichtkop voor sorteren in threads"
 
 # squirrelmail/src/options_folder.php:40
-#: squirrelmail/src/options_folder.php:40
+#: squirrelmail/src/options_folder.php:50
 msgid "Special Folder Options"
 msgstr "Speciale mapopties"
 
 # squirrelmail/src/options_folder.php:47
-#: squirrelmail/src/options_folder.php:47
+#: squirrelmail/src/options_folder.php:57
 msgid "Folder Path"
 msgstr "Mappenpad"
 
 # squirrelmail/src/options_folder.php:63
-#: squirrelmail/src/options_folder.php:63
+#: squirrelmail/src/options_folder.php:73
 msgid "Do not use Trash"
 msgstr "Gebruik Verwijderde Items niet"
 
 # squirrelmail/plugins/administrator/defines.php:135
 # squirrelmail/src/options_folder.php:67
 #: squirrelmail/plugins/administrator/defines.php:135
-#: squirrelmail/src/options_folder.php:67
+#: squirrelmail/src/options_folder.php:77
 msgid "Trash Folder"
 msgstr "Verwijderde Items:"
 
 # squirrelmail/src/options_folder.php:74
-#: squirrelmail/src/options_folder.php:74
+#: squirrelmail/src/options_folder.php:84
 msgid "Do not use Sent"
 msgstr "Gebruik Verzonden Items niet"
 
 # squirrelmail/plugins/administrator/defines.php:138
 # squirrelmail/src/options_folder.php:78
 #: squirrelmail/plugins/administrator/defines.php:138
-#: squirrelmail/src/options_folder.php:78
+#: squirrelmail/src/options_folder.php:88
 msgid "Sent Folder"
 msgstr "Verzonden Items:"
 
 # squirrelmail/src/options_folder.php:85
-#: squirrelmail/src/options_folder.php:85
+#: squirrelmail/src/options_folder.php:95
 msgid "Do not use Drafts"
 msgstr "Gebruik Concept map niet"
 
 # squirrelmail/plugins/administrator/defines.php:141
 # squirrelmail/src/options_folder.php:89
 #: squirrelmail/plugins/administrator/defines.php:141
-#: squirrelmail/src/options_folder.php:89
+#: squirrelmail/src/options_folder.php:99
 msgid "Draft Folder"
 msgstr "Concept map"
 
 # squirrelmail/src/options_folder.php:97
-#: squirrelmail/src/options_folder.php:97
+#: squirrelmail/src/options_folder.php:107
 msgid "Folder List Options"
 msgstr "Speciale mapopties"
 
 # squirrelmail/src/options_folder.php:102
-#: squirrelmail/src/options_folder.php:102
+#: squirrelmail/src/options_folder.php:112
 msgid "Location of Folder List"
 msgstr "Positie van de mappenlijst"
 
 # squirrelmail/src/options_folder.php:105
-#: squirrelmail/src/options_folder.php:105
+#: squirrelmail/src/options_folder.php:115
 msgid "Left"
 msgstr "Links"
 
 # squirrelmail/src/options_folder.php:106
-#: squirrelmail/src/options_folder.php:106
+#: squirrelmail/src/options_folder.php:116
 msgid "Right"
 msgstr "Rechts"
 
 # squirrelmail/plugins/administrator/defines.php:45
 # squirrelmail/src/options_folder.php:111
 #: squirrelmail/plugins/administrator/defines.php:45
-#: squirrelmail/src/options_folder.php:111
+#: squirrelmail/src/options_folder.php:121
 msgid "pixels"
 msgstr "pixels"
 
 # squirrelmail/src/options_folder.php:115
-#: squirrelmail/src/options_folder.php:115
+#: squirrelmail/src/options_folder.php:125
 msgid "Width of Folder List"
 msgstr "Breedte van mappenlijst"
 
 # squirrelmail/src/options_folder.php:121
-#: squirrelmail/src/options_folder.php:121
+#: squirrelmail/src/options_folder.php:131
 msgid "Minutes"
 msgstr "Minuten"
 
 # squirrelmail/src/options_folder.php:125
-#: squirrelmail/src/options_folder.php:125
+#: squirrelmail/src/options_folder.php:135
 msgid "Seconds"
 msgstr "Seconden"
 
 # squirrelmail/src/options_folder.php:127
-#: squirrelmail/src/options_folder.php:127
+#: squirrelmail/src/options_folder.php:137
 msgid "Minute"
 msgstr "Minuut"
 
 # squirrelmail/src/options_folder.php:134
-#: squirrelmail/src/options_folder.php:134
+#: squirrelmail/src/options_folder.php:144
 msgid "Auto Refresh Folder List"
 msgstr "Automatisch verversen mappenlijst om de"
 
 # squirrelmail/src/options_folder.php:142
-#: squirrelmail/src/options_folder.php:142
+#: squirrelmail/src/options_folder.php:152
 msgid "Enable Unread Message Notification"
 msgstr "Activeer Ongelezen bericht notificatie"
 
 # squirrelmail/plugins/administrator/defines.php:162
 # squirrelmail/src/options_folder.php:145
 #: squirrelmail/plugins/administrator/defines.php:162
-#: squirrelmail/src/options_folder.php:145
+#: squirrelmail/src/options_folder.php:155
 msgid "No Notification"
 msgstr "Geen notificatie"
 
 # squirrelmail/plugins/administrator/defines.php:163
 # squirrelmail/src/options_folder.php:146
 #: squirrelmail/plugins/administrator/defines.php:163
-#: squirrelmail/src/options_folder.php:146
+#: squirrelmail/src/options_folder.php:156
 msgid "Only INBOX"
 msgstr "Alleen INBOX"
 
 # squirrelmail/plugins/administrator/defines.php:164
 # squirrelmail/src/options_folder.php:147
 #: squirrelmail/plugins/administrator/defines.php:164
-#: squirrelmail/src/options_folder.php:147
+#: squirrelmail/src/options_folder.php:157
 msgid "All Folders"
 msgstr "Alle mappen"
 
 # squirrelmail/src/options_folder.php:152
-#: squirrelmail/src/options_folder.php:152
+#: squirrelmail/src/options_folder.php:162
 msgid "Unread Message Notification Type"
 msgstr "Ongelezen bericht notificatie type"
 
 # squirrelmail/plugins/administrator/defines.php:167
 # squirrelmail/src/options_folder.php:155
 #: squirrelmail/plugins/administrator/defines.php:167
-#: squirrelmail/src/options_folder.php:155
+#: squirrelmail/src/options_folder.php:165
 msgid "Only Unseen"
 msgstr "Alleen ongelezen"
 
 # squirrelmail/plugins/administrator/defines.php:168
 # squirrelmail/src/options_folder.php:156
 #: squirrelmail/plugins/administrator/defines.php:168
-#: squirrelmail/src/options_folder.php:156
+#: squirrelmail/src/options_folder.php:166
 msgid "Unseen and Total"
 msgstr "Ongelezen en Totaal"
 
 # squirrelmail/src/options_folder.php:161
-#: squirrelmail/src/options_folder.php:161
+#: squirrelmail/src/options_folder.php:171
 msgid "Enable Collapsable Folders"
 msgstr "Maak uitklapbare mappen mogelijk"
 
 # squirrelmail/src/options_folder.php:168
-#: squirrelmail/src/options_folder.php:168
+#: squirrelmail/src/options_folder.php:178
 msgid "Show Clock on Folders Panel"
 msgstr "Toon klok in mappenbalk"
 
 # squirrelmail/src/options_folder.php:176
-#: squirrelmail/src/options_folder.php:176
+#: squirrelmail/src/options_folder.php:186
 msgid "No Clock"
 msgstr "Geen klok"
 
 # squirrelmail/src/options_folder.php:181
-#: squirrelmail/src/options_folder.php:181
+#: squirrelmail/src/options_folder.php:191
 msgid "Hour Format"
 msgstr "Uur formaat"
 
 # squirrelmail/src/options_folder.php:184
-#: squirrelmail/src/options_folder.php:184
+#: squirrelmail/src/options_folder.php:194
 msgid "12-hour clock"
 msgstr "12-uurs klok"
 
 # squirrelmail/src/options_folder.php:185
-#: squirrelmail/src/options_folder.php:185
+#: squirrelmail/src/options_folder.php:195
 msgid "24-hour clock"
 msgstr "24-uurs klok"
 
 # squirrelmail/src/options_folder.php:190
-#: squirrelmail/src/options_folder.php:190
+#: squirrelmail/src/options_folder.php:200
 msgid "Memory Search"
 msgstr "Onthoud aantal zoekopdrachten"
 
 # squirrelmail/plugins/sent_subfolders/setup.php:102
 # squirrelmail/src/options_folder.php:193
-#: squirrelmail/plugins/sent_subfolders/setup.php:102
-#: squirrelmail/src/options_folder.php:193
+#: squirrelmail/plugins/sent_subfolders/setup.php:116
+#: squirrelmail/src/options_folder.php:203
 msgid "Disabled"
 msgstr "Uitgeschakeld"
 
@@ -1257,27 +1282,27 @@ msgstr "Uitgeschakeld"
 # squirrelmail/src/options.php:198 squirrelmail/src/options_highlight.php:62
 # squirrelmail/src/options_identities.php:44
 # squirrelmail/src/options_order.php:31
-#: squirrelmail/functions/page_header.php:223
-#: squirrelmail/plugins/filters/options.php:70
+#: squirrelmail/functions/page_header.php:237
+#: squirrelmail/plugins/filters/options.php:94
 #: squirrelmail/plugins/newmail/newmail_opt.php:37
-#: squirrelmail/plugins/translate/options.php:93
-#: squirrelmail/src/options.php:201 squirrelmail/src/options_highlight.php:64
-#: squirrelmail/src/options_identities.php:57
-#: squirrelmail/src/options_order.php:32 squirrelmail/src/read_body.php:523
+#: squirrelmail/plugins/translate/options.php:94
+#: squirrelmail/src/options.php:218 squirrelmail/src/options_highlight.php:89
+#: squirrelmail/src/options_identities.php:53
+#: squirrelmail/src/options_order.php:55
 msgid "Options"
 msgstr "Opties"
 
 # squirrelmail/src/options.php:146 squirrelmail/src/options.php:297
 # squirrelmail/src/options_highlight.php:62
-#: squirrelmail/src/options.php:149 squirrelmail/src/options.php:301
-#: squirrelmail/src/options_highlight.php:64
+#: squirrelmail/src/options.php:166 squirrelmail/src/options.php:317
+#: squirrelmail/src/options_highlight.php:89
 msgid "Message Highlighting"
 msgstr "Berichten weergave"
 
 # squirrelmail/plugins/filters/options.php:96
 # squirrelmail/src/options_highlight.php:66
-#: squirrelmail/plugins/filters/options.php:99
-#: squirrelmail/src/options_highlight.php:71
+#: squirrelmail/plugins/filters/options.php:120
+#: squirrelmail/src/options_highlight.php:93
 msgid "New"
 msgstr "Nieuw"
 
@@ -1285,39 +1310,19 @@ msgstr "Nieuw"
 # squirrelmail/plugins/filters/spamoptions.php:159
 # squirrelmail/plugins/mail_fetch/fetch.php:225
 # squirrelmail/src/options_highlight.php:67
-#: squirrelmail/plugins/filters/options.php:100
-#: squirrelmail/plugins/filters/spamoptions.php:180
-#: squirrelmail/plugins/mail_fetch/fetch.php:283
-#: squirrelmail/src/options_highlight.php:72
+#: squirrelmail/plugins/filters/options.php:121
+#: squirrelmail/plugins/filters/spamoptions.php:168
+#: squirrelmail/plugins/mail_fetch/fetch.php:239
+#: squirrelmail/src/options_highlight.php:94
 msgid "Done"
 msgstr "Klaar"
 
-# squirrelmail/plugins/filters/options.php:126
-# squirrelmail/src/options_highlight.php:336
-#: squirrelmail/plugins/filters/options.php:130
-#: squirrelmail/src/options_highlight.php:88
-#: squirrelmail/src/options_highlight.php:377
-msgid "To or Cc"
-msgstr "To of CC"
-
-# squirrelmail/functions/mailbox_display.php:759
-# squirrelmail/plugins/filters/options.php:129
-# squirrelmail/src/compose.php:432 squirrelmail/src/download.php:309
-# squirrelmail/src/download.php:314
-# squirrelmail/src/options_highlight.php:339
-# squirrelmail/src/options_order.php:40
-# squirrelmail/src/printer_friendly_bottom.php:101
-# squirrelmail/src/search.php:348
-#: squirrelmail/src/options_highlight.php:91
-msgid "subject"
-msgstr "onderwerp"
-
 # squirrelmail/plugins/filters/options.php:187
 # squirrelmail/plugins/filters/spamoptions.php:158
 # squirrelmail/src/options_highlight.php:74
-#: squirrelmail/plugins/filters/options.php:189
-#: squirrelmail/plugins/filters/spamoptions.php:179
-#: squirrelmail/src/options_highlight.php:98
+#: squirrelmail/plugins/filters/options.php:214
+#: squirrelmail/plugins/filters/spamoptions.php:167
+#: squirrelmail/src/options_highlight.php:101
 msgid "Edit"
 msgstr "Wijzig"
 
@@ -1327,183 +1332,190 @@ msgid "No highlighting is defined"
 msgstr "Geen speciale weergave ingesteld"
 
 # squirrelmail/src/options_highlight.php:259
-#: squirrelmail/src/options_highlight.php:307
+#: squirrelmail/src/options_highlight.php:286
 msgid "Identifying name"
 msgstr "Naam voor deze weergave"
 
 # squirrelmail/src/options_highlight.php:273
-#: squirrelmail/src/options_highlight.php:320
+#: squirrelmail/src/options_highlight.php:300
 msgid "Color"
 msgstr "Kleur"
 
 # squirrelmail/src/options_highlight.php:277
-#: squirrelmail/src/options_highlight.php:323
+#: squirrelmail/src/options_highlight.php:304
 msgid "Dark Blue"
 msgstr "Donkerblauw"
 
 # squirrelmail/src/options_highlight.php:278
-#: squirrelmail/src/options_highlight.php:324
+#: squirrelmail/src/options_highlight.php:305
 msgid "Dark Green"
 msgstr "Donkergroen"
 
 # squirrelmail/src/options_highlight.php:279
-#: squirrelmail/src/options_highlight.php:325
+#: squirrelmail/src/options_highlight.php:306
 msgid "Dark Yellow"
 msgstr "Oker"
 
 # squirrelmail/src/options_highlight.php:280
-#: squirrelmail/src/options_highlight.php:326
+#: squirrelmail/src/options_highlight.php:307
 msgid "Dark Cyan"
 msgstr "Donker cyaan"
 
 # squirrelmail/src/options_highlight.php:281
-#: squirrelmail/src/options_highlight.php:327
+#: squirrelmail/src/options_highlight.php:308
 msgid "Dark Magenta"
 msgstr "Paars"
 
 # squirrelmail/src/options_highlight.php:282
-#: squirrelmail/src/options_highlight.php:328
+#: squirrelmail/src/options_highlight.php:309
 msgid "Light Blue"
 msgstr "Lila"
 
 # squirrelmail/src/options_highlight.php:283
-#: squirrelmail/src/options_highlight.php:329
+#: squirrelmail/src/options_highlight.php:310
 msgid "Light Green"
 msgstr "Lichtgroen"
 
 # squirrelmail/src/options_highlight.php:284
-#: squirrelmail/src/options_highlight.php:330
+#: squirrelmail/src/options_highlight.php:311
 msgid "Light Yellow"
 msgstr "Lichtgeel"
 
 # squirrelmail/src/options_highlight.php:285
-#: squirrelmail/src/options_highlight.php:331
+#: squirrelmail/src/options_highlight.php:312
 msgid "Light Cyan"
 msgstr "Licht cyaan"
 
 # squirrelmail/src/options_highlight.php:286
-#: squirrelmail/src/options_highlight.php:332
+#: squirrelmail/src/options_highlight.php:313
 msgid "Light Magenta"
 msgstr "Roze"
 
 # squirrelmail/src/options_highlight.php:287
-#: squirrelmail/src/options_highlight.php:333
+#: squirrelmail/src/options_highlight.php:314
 msgid "Dark Gray"
 msgstr "Donkergrijs"
 
 # squirrelmail/src/options_highlight.php:288
-#: squirrelmail/src/options_highlight.php:334
+#: squirrelmail/src/options_highlight.php:315
 msgid "Medium Gray"
 msgstr "Middelgrijs"
 
 # squirrelmail/src/options_highlight.php:289
-#: squirrelmail/src/options_highlight.php:335
+#: squirrelmail/src/options_highlight.php:316
 msgid "Light Gray"
 msgstr "Lichtgrijs"
 
 # squirrelmail/src/options_highlight.php:290
-#: squirrelmail/src/options_highlight.php:336
+#: squirrelmail/src/options_highlight.php:317
 msgid "White"
 msgstr "Wit"
 
 # squirrelmail/src/options_highlight.php:292
-#: squirrelmail/src/options_highlight.php:338
+#: squirrelmail/src/options_highlight.php:319
 msgid "Other:"
 msgstr "Anders:"
 
 # squirrelmail/src/options_highlight.php:294
-#: squirrelmail/src/options_highlight.php:340
+#: squirrelmail/src/options_highlight.php:321
 msgid "Ex: 63aa7f"
 msgstr "Bijv: 63aa7f"
 
+# squirrelmail/plugins/filters/options.php:126
+# squirrelmail/src/options_highlight.php:336
+#: squirrelmail/plugins/filters/options.php:153
+#: squirrelmail/src/options_highlight.php:363
+msgid "To or Cc"
+msgstr "To of CC"
+
 # squirrelmail/src/options_highlight.php:341
-#: squirrelmail/src/options_highlight.php:382
+#: squirrelmail/src/options_highlight.php:368
 msgid "Matches"
 msgstr "Selecteer"
 
-# squirrelmail/src/options_identities.php:66
-#: squirrelmail/src/options_identities.php:47
-#, c-format
-msgid "Alternate Identity %d"
-msgstr "Identiteit %d"
-
 # squirrelmail/src/options_identities.php:44
-#: squirrelmail/src/options_identities.php:57
+#: squirrelmail/src/options_identities.php:53
 msgid "Advanced Identities"
 msgstr "Geavanceerde identiteiten"
 
 # squirrelmail/src/options_identities.php:55
-#: squirrelmail/src/options_identities.php:63
+#: squirrelmail/src/options_identities.php:64
 msgid "Default Identity"
 msgstr "Standaard identiteit"
 
+# squirrelmail/src/options_identities.php:66
+#: squirrelmail/src/options_identities.php:75
+#, c-format
+msgid "Alternate Identity %d"
+msgstr "Identiteit %d"
+
 # squirrelmail/src/options_identities.php:76
-#: squirrelmail/src/options_identities.php:67
+#: squirrelmail/src/options_identities.php:85
 msgid "Add a New Identity"
 msgstr "Voeg een nieuwe identiteit toe"
 
 # squirrelmail/src/options_identities.php:326
 # squirrelmail/src/options_personal.php:56
 # squirrelmail/src/options_personal.php:64
-#: squirrelmail/src/options_identities.php:311
-#: squirrelmail/src/options_personal.php:56
-#: squirrelmail/src/options_personal.php:64
+#: squirrelmail/src/options_identities.php:335
+#: squirrelmail/src/options_personal.php:61
+#: squirrelmail/src/options_personal.php:69
 msgid "Full Name"
 msgstr "Volledige naam"
 
 # squirrelmail/src/options_identities.php:327
-#: squirrelmail/src/options_identities.php:312
+#: squirrelmail/src/options_identities.php:336
 msgid "E-Mail Address"
 msgstr "E-Mailadres"
 
 # squirrelmail/src/options_identities.php:328
 # squirrelmail/src/options_personal.php:91
-#: squirrelmail/src/options_identities.php:313
-#: squirrelmail/src/options_personal.php:91
+#: squirrelmail/src/options_identities.php:337
+#: squirrelmail/src/options_personal.php:96
 msgid "Reply To"
 msgstr "Antwoordadres"
 
 # squirrelmail/src/options_identities.php:336
-#: squirrelmail/src/options_identities.php:321
+#: squirrelmail/src/options_identities.php:345
 msgid "Save / Update"
 msgstr "Bewaar / Verander"
 
 # squirrelmail/src/options_identities.php:339
-#: squirrelmail/src/options_identities.php:326
+#: squirrelmail/src/options_identities.php:348
 msgid "Make Default"
 msgstr "Maak standaard"
 
 # squirrelmail/src/options_identities.php:345
-#: squirrelmail/src/options_identities.php:332
+#: squirrelmail/src/options_identities.php:354
 msgid "Move Up"
 msgstr "Verplaats omhoog"
 
 # squirrelmail/src/options.php:158 squirrelmail/src/options.php:313
 # squirrelmail/src/options_order.php:31
-#: squirrelmail/src/options.php:161 squirrelmail/src/options.php:317
-#: squirrelmail/src/options_order.php:32
+#: squirrelmail/src/options.php:178 squirrelmail/src/options.php:333
+#: squirrelmail/src/options_order.php:55
 msgid "Index Order"
 msgstr "Kolomvolgorde"
 
 # squirrelmail/src/options_order.php:37
-#: squirrelmail/src/options_order.php:37
+#: squirrelmail/src/options_order.php:61
 msgid "Checkbox"
 msgstr "Aankruisvak"
 
 # squirrelmail/src/options_order.php:41
-#: squirrelmail/src/options_order.php:41
+#: squirrelmail/src/options_order.php:65
 msgid "Flags"
 msgstr "Vlaggen"
 
 # squirrelmail/functions/mailbox_display.php:766
 # squirrelmail/src/options_order.php:42
-#: squirrelmail/functions/mailbox_display.php:844
-#: squirrelmail/src/options_order.php:42
+#: squirrelmail/functions/mailbox_display.php:776
+#: squirrelmail/src/options_order.php:66
 msgid "Size"
 msgstr "Omvang"
 
 # squirrelmail/src/options_order.php:85
-#: squirrelmail/src/options_order.php:87
+#: squirrelmail/src/options_order.php:109
 msgid ""
 "The index order is the order that the columns are arranged in the message "
 "index.  You can add, remove, and move columns around to customize them to "
@@ -1513,154 +1525,154 @@ msgstr ""
 "berichtenoverzicht. U kunt kolommen toevoegen, verplaatsen en verwijderen."
 
 # squirrelmail/src/options_order.php:94
-#: squirrelmail/src/options_order.php:98
+#: squirrelmail/src/options_order.php:118
 msgid "up"
 msgstr "omhoog"
 
 # squirrelmail/src/options_order.php:96
-#: squirrelmail/src/options_order.php:100
+#: squirrelmail/src/options_order.php:120
 msgid "down"
 msgstr "omlaag"
 
 # squirrelmail/src/options_order.php:101
-#: squirrelmail/src/options_order.php:105
+#: squirrelmail/src/options_order.php:125
 msgid "remove"
 msgstr "verwijder"
 
 # squirrelmail/src/options_order.php:130
-#: squirrelmail/src/options_order.php:136
+#: squirrelmail/src/options_order.php:154
 msgid "Return to options page"
 msgstr "Terug naar Opties"
 
 # squirrelmail/src/options_personal.php:43
-#: squirrelmail/src/options_personal.php:43
+#: squirrelmail/src/options_personal.php:48
 msgid "Name and Address Options"
 msgstr "Naam en adres opties"
 
 # squirrelmail/src/options_personal.php:74
 # squirrelmail/src/options_personal.php:82
-#: squirrelmail/src/options_personal.php:74
-#: squirrelmail/src/options_personal.php:82
+#: squirrelmail/src/options_personal.php:79
+#: squirrelmail/src/options_personal.php:87
 msgid "Email Address"
 msgstr "E-mailadres"
 
 # squirrelmail/src/options_personal.php:108
-#: squirrelmail/src/options_personal.php:108
+#: squirrelmail/src/options_personal.php:113
 msgid "Edit Advanced Identities"
 msgstr "Wijzig geavanceerde identiteiten"
 
 # squirrelmail/src/options_personal.php:110
-#: squirrelmail/src/options_personal.php:110
+#: squirrelmail/src/options_personal.php:115
 msgid "(discards changes made on this form so far)"
 msgstr "(negeer de veranderingen in dit formulier)"
 
 # squirrelmail/src/options_personal.php:113
-#: squirrelmail/src/options_personal.php:113
+#: squirrelmail/src/options_personal.php:118
 msgid "Multiple Identities"
 msgstr "Meerdere identiteiten"
 
 # squirrelmail/src/options_personal.php:120
-#: squirrelmail/src/options_personal.php:121
+#: squirrelmail/src/options_personal.php:126
 msgid "Same as server"
 msgstr "Zelfde als server"
 
 # squirrelmail/src/options_personal.php:131
-#: squirrelmail/src/options_personal.php:132
+#: squirrelmail/src/options_personal.php:137
 msgid "Timezone Options"
 msgstr "Tijdzone opties"
 
 # squirrelmail/src/options_personal.php:136
-#: squirrelmail/src/options_personal.php:137
+#: squirrelmail/src/options_personal.php:142
 msgid "Your current timezone"
 msgstr "Uw huidige tijdzone"
 
 # squirrelmail/src/options_personal.php:143
-#: squirrelmail/src/options_personal.php:145
+#: squirrelmail/src/options_personal.php:150
 msgid "Reply Citation Options"
 msgstr "Antwoordstijl citering"
 
 # squirrelmail/src/options_personal.php:148
-#: squirrelmail/src/options_personal.php:150
+#: squirrelmail/src/options_personal.php:155
 msgid "Reply Citation Style"
 msgstr "Antwoordstijl citering"
 
 # squirrelmail/src/options_personal.php:151
-#: squirrelmail/src/options_personal.php:153
+#: squirrelmail/src/options_personal.php:158
 msgid "No Citation"
 msgstr "Geen citering"
 
 # squirrelmail/src/options_personal.php:152
-#: squirrelmail/src/options_personal.php:154
+#: squirrelmail/src/options_personal.php:159
 msgid "AUTHOR Said"
 msgstr "Schrijver zei"
 
 # squirrelmail/src/options_personal.php:153
-#: squirrelmail/src/options_personal.php:155
+#: squirrelmail/src/options_personal.php:160
 msgid "Quote Who XML"
 msgstr "Citaat van XML"
 
 # squirrelmail/src/options_personal.php:154
-#: squirrelmail/src/options_personal.php:156
+#: squirrelmail/src/options_personal.php:161
 msgid "User-Defined"
 msgstr "Gedefinieerd door gebruiker"
 
 # squirrelmail/src/options_personal.php:159
-#: squirrelmail/src/options_personal.php:161
+#: squirrelmail/src/options_personal.php:166
 msgid "User-Defined Citation Start"
 msgstr "Door gebruiker gedefinieerde citering start"
 
 # squirrelmail/src/options_personal.php:167
-#: squirrelmail/src/options_personal.php:169
+#: squirrelmail/src/options_personal.php:174
 msgid "User-Defined Citation End"
 msgstr "Door gebruiker gedefinieerde citering eind"
 
 # squirrelmail/src/options_personal.php:174
-#: squirrelmail/src/options_personal.php:176
+#: squirrelmail/src/options_personal.php:181
 msgid "Signature Options"
 msgstr "Handtekening opties"
 
 # squirrelmail/src/options_personal.php:179
-#: squirrelmail/src/options_personal.php:181
+#: squirrelmail/src/options_personal.php:186
 msgid "Use Signature"
 msgstr "Voeg een handtekening toe"
 
 # squirrelmail/src/options_personal.php:186
-#: squirrelmail/src/options_personal.php:188
+#: squirrelmail/src/options_personal.php:193
 msgid "Prefix Signature with '-- ' Line"
 msgstr "Laat handtekening voorafgaan door '-- '"
 
 # squirrelmail/src/options.php:134 squirrelmail/src/options.php:281
-#: squirrelmail/src/options.php:137 squirrelmail/src/options.php:285
+#: squirrelmail/src/options.php:154 squirrelmail/src/options.php:301
 msgid "Personal Information"
 msgstr "Persoonlijke informatie"
 
 # squirrelmail/src/options.php:140 squirrelmail/src/options.php:289
-#: squirrelmail/src/options.php:143 squirrelmail/src/options.php:293
+#: squirrelmail/src/options.php:160 squirrelmail/src/options.php:309
 msgid "Display Preferences"
 msgstr "Weergavevoorkeuren"
 
 # squirrelmail/src/options.php:152 squirrelmail/src/options.php:305
-#: squirrelmail/src/options.php:155 squirrelmail/src/options.php:309
+#: squirrelmail/src/options.php:172 squirrelmail/src/options.php:325
 msgid "Folder Preferences"
 msgstr "Mapvoorkeuren"
 
 # squirrelmail/src/options.php:264
-#: squirrelmail/src/options.php:268
+#: squirrelmail/src/options.php:284
 msgid "Successfully Saved Options"
 msgstr "Persoonlijke informatie is opgeslagen!"
 
 # squirrelmail/src/options.php:269
-#: squirrelmail/src/options.php:273
+#: squirrelmail/src/options.php:289
 msgid "Refresh Folder List"
 msgstr "Vernieuw mappenlijst"
 
 # squirrelmail/src/options.php:271
-#: squirrelmail/src/options.php:275
+#: squirrelmail/src/options.php:291
 msgid "Refresh Page"
 msgstr "Vernieuw pagina"
 
 # squirrelmail/src/options.php:283
-#: squirrelmail/src/options.php:287
+#: squirrelmail/src/options.php:303
 msgid ""
 "This contains personal information about yourself such as your name, your "
 "email address, etc."
@@ -1669,7 +1681,7 @@ msgstr ""
 "etc."
 
 # squirrelmail/src/options.php:291
-#: squirrelmail/src/options.php:295
+#: squirrelmail/src/options.php:311
 msgid ""
 "You can change the way that SquirrelMail looks and displays information to "
 "you, such as the colors, the language, and other settings."
@@ -1678,7 +1690,7 @@ msgstr ""
 "onder andere kleuren en de taal ingesteld worden."
 
 # squirrelmail/src/options.php:299
-#: squirrelmail/src/options.php:303
+#: squirrelmail/src/options.php:319
 msgid ""
 "Based upon given criteria, incoming messages can have different background "
 "colors in the message list.  This helps to easily distinguish who the "
@@ -1689,351 +1701,314 @@ msgstr ""
 "kunt houden."
 
 # squirrelmail/src/options.php:307
-#: squirrelmail/src/options.php:311
+#: squirrelmail/src/options.php:327
 msgid ""
 "These settings change the way your folders are displayed and manipulated."
 msgstr "Deze opties bepalen hoe uw mappen worden gebruikt en weergegeven."
 
 # squirrelmail/src/options.php:315
-#: squirrelmail/src/options.php:319
+#: squirrelmail/src/options.php:335
 msgid ""
 "The order of the message index can be rearranged and changed to contain the "
 "headers in any order you want."
 msgstr "De kolomvolgorde van het berichtenoverzicht kan hier worden veranderd."
 
 # squirrelmail/src/printer_friendly_bottom.php:61
-#: squirrelmail/src/printer_friendly_bottom.php:58
+#: squirrelmail/src/printer_friendly_bottom.php:71
 msgid "Message not printable"
 msgstr "Bericht niet printbaar"
 
 # squirrelmail/src/printer_friendly_bottom.php:90
 # squirrelmail/src/printer_friendly_main.php:15
 # squirrelmail/src/printer_friendly_top.php:21
-#: squirrelmail/src/printer_friendly_bottom.php:87
+#: squirrelmail/src/printer_friendly_bottom.php:100
 #: squirrelmail/src/printer_friendly_main.php:15
-#: squirrelmail/src/printer_friendly_top.php:22
+#: squirrelmail/src/printer_friendly_top.php:21
 msgid "Printer Friendly"
 msgstr "Printer vriendelijk"
 
 # squirrelmail/src/printer_friendly_bottom.php:98
-#: squirrelmail/src/printer_friendly_bottom.php:110
+#: squirrelmail/src/printer_friendly_bottom.php:108
 msgid "CC"
 msgstr "CC:"
 
 # squirrelmail/src/printer_friendly_top.php:36
-#: squirrelmail/src/printer_friendly_top.php:38
+#: squirrelmail/src/printer_friendly_top.php:36
 msgid "Print"
 msgstr "Print"
 
+# squirrelmail/src/printer_friendly_top.php:37
+#: squirrelmail/src/printer_friendly_top.php:37
+msgid "Close Window"
+msgstr "Sluit venster"
+
 # squirrelmail/src/read_body.php:155
-#: squirrelmail/src/read_body.php:131
+#: squirrelmail/src/read_body.php:156
 msgid "View Printable Version"
 msgstr "Bekijk printervriendelijke versie"
 
 # squirrelmail/src/read_body.php:219
-#: squirrelmail/src/read_body.php:182
+#: squirrelmail/src/read_body.php:221
 msgid "Your message"
 msgstr "Uw bericht:"
 
 # squirrelmail/src/read_body.php:222
-#: squirrelmail/src/read_body.php:185
+#: squirrelmail/src/read_body.php:224
 msgid "Sent:"
 msgstr "Gezonden:"
 
 # squirrelmail/src/read_body.php:224
-#: squirrelmail/src/read_body.php:187
+#: squirrelmail/src/read_body.php:226
 #, c-format
 msgid "Was displayed on %s"
 msgstr "Is gelezen op %s"
 
 # squirrelmail/src/read_body.php:256
-#: squirrelmail/src/read_body.php:217
+#: squirrelmail/src/read_body.php:258
 msgid "Read:"
 msgstr "Gelezen:"
 
-# squirrelmail/src/download.php:150 squirrelmail/src/read_body.php:591
-#: squirrelmail/src/read_body.php:291
-msgid "less"
-msgstr "minder"
+# squirrelmail/src/read_body.php:427
+#: squirrelmail/src/read_body.php:494
+msgid "Viewing Full Header"
+msgstr "Bekijk volledige berichtinformatie"
 
-# squirrelmail/src/download.php:149 squirrelmail/src/read_body.php:590
-#: squirrelmail/src/read_body.php:293
-msgid "more"
-msgstr "meer"
+# squirrelmail/src/read_body.php:683
+#: squirrelmail/src/read_body.php:750
+msgid "Message List"
+msgstr "Berichtenlijst"
 
-# squirrelmail/functions/imap_messages.php:397
-#: squirrelmail/functions/mime.php:408 squirrelmail/src/read_body.php:320
-msgid "Unknown sender"
-msgstr "Onbekende afzender"
+# squirrelmail/src/read_body.php:699
+#: squirrelmail/src/read_body.php:772
+msgid "Resume Draft"
+msgstr "Hervat Concept"
+
+# squirrelmail/src/read_body.php:708
+#: squirrelmail/src/read_body.php:787
+msgid "Edit Message as New"
+msgstr "Bewerk als nieuw bericht"
+
+# squirrelmail/functions/mailbox_display.php:682
+# squirrelmail/src/read_body.php:748
+#: squirrelmail/functions/mailbox_display.php:692
+#: squirrelmail/src/read_body.php:833
+msgid "Forward"
+msgstr "Doorsturen"
+
+# squirrelmail/src/read_body.php:757
+#: squirrelmail/src/read_body.php:848
+msgid "Reply"
+msgstr "Beantwoorden"
+
+# squirrelmail/src/read_body.php:766
+#: squirrelmail/src/read_body.php:863
+msgid "Reply All"
+msgstr "Allen&nbsp;beantwoorden"
+
+# squirrelmail/src/read_body.php:790 squirrelmail/src/read_body.php:793
+#: squirrelmail/src/read_body.php:887 squirrelmail/src/read_body.php:890
+msgid "View Full Header"
+msgstr "Bekijk volledige berichtinformatie"
 
 # squirrelmail/src/read_body.php:868
-#: squirrelmail/src/read_body.php:332
+#: squirrelmail/src/read_body.php:967
 msgid "Mailer"
 msgstr "Mailprogramma"
 
 # squirrelmail/src/read_body.php:918 squirrelmail/src/read_body.php:931
 # squirrelmail/src/read_body.php:943 squirrelmail/src/read_body.php:968
 # squirrelmail/src/read_body.php:1012 squirrelmail/src/read_body.php:1028
-#: squirrelmail/src/read_body.php:338 squirrelmail/src/read_body.php:357
-#: squirrelmail/src/read_body.php:360
+#: squirrelmail/src/read_body.php:1016 squirrelmail/src/read_body.php:1029
+#: squirrelmail/src/read_body.php:1041 squirrelmail/src/read_body.php:1065
+#: squirrelmail/src/read_body.php:1110 squirrelmail/src/read_body.php:1126
 msgid "Read receipt"
 msgstr "Leesbevestiging"
 
 # squirrelmail/src/read_body.php:920 squirrelmail/src/read_body.php:1014
-#: squirrelmail/src/read_body.php:338
+#: squirrelmail/src/read_body.php:1018 squirrelmail/src/read_body.php:1112
 msgid "send"
 msgstr "verzonden"
 
-# squirrelmail/src/read_body.php:958
-#: squirrelmail/src/read_body.php:349
-msgid ""
-"The message sender has requested a response to indicate that you have read "
-"this message. Would you like to send a receipt?"
-msgstr ""
-"De afzender van dit bericht heeft u om een antwoord gevraagd, zodat hij kan "
-"zien dat u dit bericht heeft gelezen. Wilt u een leesbevestiging verzenden?"
-
 # squirrelmail/src/read_body.php:933 squirrelmail/src/read_body.php:945
 # squirrelmail/src/read_body.php:970 squirrelmail/src/read_body.php:1030
-#: squirrelmail/src/read_body.php:357 squirrelmail/src/read_body.php:360
+#: squirrelmail/src/read_body.php:1031 squirrelmail/src/read_body.php:1043
+#: squirrelmail/src/read_body.php:1067 squirrelmail/src/read_body.php:1128
 msgid "requested"
 msgstr "gevraagd"
 
 # squirrelmail/src/read_body.php:946 squirrelmail/src/read_body.php:971
 # squirrelmail/src/read_body.php:1031
-#: squirrelmail/src/read_body.php:358
+#: squirrelmail/src/read_body.php:1044 squirrelmail/src/read_body.php:1068
+#: squirrelmail/src/read_body.php:1129
 msgid "Send read receipt now"
 msgstr "Verzend leesbevestiging nu"
 
-# squirrelmail/src/search.php:380 squirrelmail/src/search.php:409
-#: squirrelmail/src/read_body.php:397
-msgid "Search results"
-msgstr "Zoek resultaten:"
-
-# squirrelmail/src/read_body.php:683
-#: squirrelmail/src/read_body.php:401
-msgid "Message List"
-msgstr "Berichtenlijst"
-
-# squirrelmail/src/read_body.php:699
-#: squirrelmail/src/read_body.php:424
-msgid "Resume Draft"
-msgstr "Hervat Concept"
-
-# squirrelmail/src/read_body.php:708
-#: squirrelmail/src/read_body.php:427
-msgid "Edit Message as New"
-msgstr "Bewerk als nieuw bericht"
-
-# squirrelmail/src/download.php:34 squirrelmail/src/download.php:36
-# squirrelmail/src/download.php:72 squirrelmail/src/image.php:31
-# squirrelmail/src/image.php:35 squirrelmail/src/read_body.php:438
-# squirrelmail/src/vcard.php:35 squirrelmail/src/vcard.php:39
-#: squirrelmail/src/read_body.php:464
-msgid "View Message"
-msgstr "Bekijk bericht"
-
-# squirrelmail/plugins/filters/options.php:199
-#: squirrelmail/plugins/filters/options.php:206
-#: squirrelmail/src/read_body.php:470
-msgid "Up"
-msgstr "Omhoog"
-
-# squirrelmail/functions/mailbox_display.php:682
-# squirrelmail/src/read_body.php:748
-#: squirrelmail/functions/mailbox_display.php:713
-#: squirrelmail/src/read_body.php:478 squirrelmail/src/read_body.php:480
-msgid "Forward"
-msgstr "Doorsturen"
-
-# squirrelmail/functions/mime.php:822
-#: squirrelmail/src/read_body.php:488 squirrelmail/src/read_body.php:490
-msgid "Forward as Attachment"
-msgstr "Doorsturen als bijlage"
-
-# squirrelmail/src/read_body.php:757
-#: squirrelmail/src/read_body.php:499 squirrelmail/src/read_body.php:501
-msgid "Reply"
-msgstr "Beantwoorden"
-
-# squirrelmail/src/read_body.php:766
-#: squirrelmail/src/read_body.php:508 squirrelmail/src/read_body.php:510
-msgid "Reply All"
-msgstr "Allen&nbsp;beantwoorden"
-
-# squirrelmail/functions/mime.php:822
-#: squirrelmail/src/read_body.php:670
-msgid "Attachments"
-msgstr "Bijlagen"
+# squirrelmail/src/read_body.php:958
+#: squirrelmail/src/read_body.php:1056
+msgid ""
+"The message sender has requested a response to indicate that you have read "
+"this message. Would you like to send a receipt?"
+msgstr ""
+"De afzender van dit bericht heeft u om een antwoord gevraagd, zodat hij kan "
+"zien dat u dit bericht heeft gelezen. Wilt u een leesbevestiging verzenden?"
 
 # squirrelmail/functions/auth.php:20 squirrelmail/src/redirect.php:64
 # squirrelmail/src/redirect.php:86
-#: squirrelmail/functions/auth.php:34 squirrelmail/src/redirect.php:65
-#: squirrelmail/src/redirect.php:87
+#: squirrelmail/functions/auth.php:20 squirrelmail/src/redirect.php:80
+#: squirrelmail/src/redirect.php:102
 msgid "You must be logged in to access this page."
 msgstr ""
 "U heeft een geldige gebruikersnaam en wachtwoord nodig voor deze pagina!"
 
 # squirrelmail/src/redirect.php:82
-#: squirrelmail/src/redirect.php:83
+#: squirrelmail/src/redirect.php:98
 msgid "There was an error contacting the mail server."
 msgstr "Er is een fout opgetreden bij het verbinden met de mailserver"
 
 # squirrelmail/src/redirect.php:84
-#: squirrelmail/src/redirect.php:85
+#: squirrelmail/src/redirect.php:100
 msgid "Contact your administrator for help."
 msgstr "Neem contact op met uw systeembeheerder voor hulp."
 
-# squirrelmail/functions/imap_search.php:206
-#: squirrelmail/src/search.php:172
-msgid "Folder:"
-msgstr "Map:"
-
 # squirrelmail/src/search.php:241
-#: squirrelmail/src/search.php:283
+#: squirrelmail/src/search.php:274
 msgid "edit"
 msgstr "Wijzig"
 
 # squirrelmail/src/search.php:248 squirrelmail/src/search.php:290
-#: squirrelmail/src/search.php:290 squirrelmail/src/search.php:335
+#: squirrelmail/src/search.php:281 squirrelmail/src/search.php:323
 msgid "search"
 msgstr "Zoek"
 
 # squirrelmail/src/search.php:251
-#: squirrelmail/src/search.php:293
+#: squirrelmail/src/search.php:284
 msgid "delete"
 msgstr "Verwijder"
 
 # squirrelmail/src/search.php:262
-#: squirrelmail/src/search.php:304
+#: squirrelmail/src/search.php:295
 msgid "Recent Searches"
 msgstr "Recente zoekopdrachten"
 
 # squirrelmail/src/search.php:282
-#: squirrelmail/src/search.php:327
+#: squirrelmail/src/search.php:315
 msgid "save"
 msgstr "Bewaar"
 
 # squirrelmail/src/search.php:293
-#: squirrelmail/src/search.php:338
+#: squirrelmail/src/search.php:326
 msgid "forget"
 msgstr "vergeet"
 
 # squirrelmail/src/search.php:302
-#: squirrelmail/src/search.php:370
+#: squirrelmail/src/search.php:335
 msgid "Current Search"
 msgstr "Huidige map"
 
 # squirrelmail/src/search.php:346
-#: squirrelmail/src/search.php:411
+#: squirrelmail/src/search.php:380
 msgid "Body"
 msgstr "Inhoud"
 
 # squirrelmail/src/search.php:347
-#: squirrelmail/src/search.php:412
+#: squirrelmail/src/search.php:381
 msgid "Everywhere"
 msgstr "Overal"
 
 # squirrelmail/src/search.php:380 squirrelmail/src/search.php:409
-#: squirrelmail/src/search.php:443 squirrelmail/src/search.php:473
+#: squirrelmail/src/search.php:414 squirrelmail/src/search.php:443
 msgid "Search Results"
 msgstr "Zoek resultaten:"
 
-# squirrelmail/functions/imap_search.php:83
-#: squirrelmail/src/search.php:465 squirrelmail/src/search.php:480
-msgid "No Messages Found"
-msgstr "Bekijk bericht"
+# squirrelmail/src/search.php:400
+#: squirrelmail/src/search.php:434
+msgid "No Messages found"
+msgstr "Geen berichten gevonden"
 
 # squirrelmail/functions/page_header.php:122 squirrelmail/src/signout.php:74
-#: squirrelmail/functions/page_header.php:206 squirrelmail/src/signout.php:76
+#: squirrelmail/functions/page_header.php:220 squirrelmail/src/signout.php:76
 msgid "Sign Out"
 msgstr "Afmelden"
 
 # squirrelmail/src/signout.php:80
-#: squirrelmail/src/signout.php:79
+#: squirrelmail/src/signout.php:82
 msgid "You have been successfully signed out."
 msgstr "U bent succesvol afgemeld."
 
 # squirrelmail/src/signout.php:82
-#: squirrelmail/src/signout.php:81
+#: squirrelmail/src/signout.php:84
 msgid "Click here to log back in."
 msgstr "Klik hier om opnieuw aan te melden."
 
 # squirrelmail/src/vcard.php:30
-#: squirrelmail/src/vcard.php:31
+#: squirrelmail/src/vcard.php:46
 msgid "Viewing a Business Card"
 msgstr "Bekijk een visitekaartje"
 
 # squirrelmail/src/vcard.php:86 squirrelmail/src/vcard.php:146
-#: squirrelmail/src/vcard.php:90 squirrelmail/src/vcard.php:160
+#: squirrelmail/src/vcard.php:102 squirrelmail/src/vcard.php:162
 msgid "Title"
 msgstr "Titel"
 
 # squirrelmail/src/vcard.php:87
-#: squirrelmail/src/vcard.php:91
+#: squirrelmail/src/vcard.php:103
 msgid "Email"
 msgstr "E-mail"
 
 # squirrelmail/src/vcard.php:88 squirrelmail/src/vcard.php:138
-#: squirrelmail/src/vcard.php:92 squirrelmail/src/vcard.php:152
+#: squirrelmail/src/vcard.php:104 squirrelmail/src/vcard.php:154
 msgid "Web Page"
 msgstr "Webpagina"
 
 # squirrelmail/src/vcard.php:89 squirrelmail/src/vcard.php:150
-#: squirrelmail/src/vcard.php:93 squirrelmail/src/vcard.php:164
+#: squirrelmail/src/vcard.php:105 squirrelmail/src/vcard.php:166
 msgid "Organization / Department"
 msgstr "Organisatie / Afdeling"
 
 # squirrelmail/src/vcard.php:90 squirrelmail/src/vcard.php:142
-#: squirrelmail/src/vcard.php:94 squirrelmail/src/vcard.php:156
+#: squirrelmail/src/vcard.php:106 squirrelmail/src/vcard.php:158
 msgid "Address"
 msgstr "Adres"
 
 # squirrelmail/src/vcard.php:91 squirrelmail/src/vcard.php:159
-#: squirrelmail/src/vcard.php:95 squirrelmail/src/vcard.php:173
+#: squirrelmail/src/vcard.php:107 squirrelmail/src/vcard.php:175
 msgid "Work Phone"
 msgstr "Telefoon Werk"
 
 # squirrelmail/src/vcard.php:92 squirrelmail/src/vcard.php:163
-#: squirrelmail/src/vcard.php:96 squirrelmail/src/vcard.php:177
+#: squirrelmail/src/vcard.php:108 squirrelmail/src/vcard.php:179
 msgid "Home Phone"
 msgstr "Telefoon Thuis"
 
 # squirrelmail/src/vcard.php:93 squirrelmail/src/vcard.php:167
-#: squirrelmail/src/vcard.php:97 squirrelmail/src/vcard.php:181
+#: squirrelmail/src/vcard.php:109 squirrelmail/src/vcard.php:183
 msgid "Cellular Phone"
 msgstr "Mobiel"
 
 # squirrelmail/src/vcard.php:94 squirrelmail/src/vcard.php:171
-#: squirrelmail/src/vcard.php:98 squirrelmail/src/vcard.php:185
+#: squirrelmail/src/vcard.php:110 squirrelmail/src/vcard.php:187
 msgid "Fax"
 msgstr "Fax"
 
 # squirrelmail/src/vcard.php:95 squirrelmail/src/vcard.php:175
-#: squirrelmail/src/vcard.php:99 squirrelmail/src/vcard.php:189
+#: squirrelmail/src/vcard.php:111 squirrelmail/src/vcard.php:191
 msgid "Note"
 msgstr "Aantekening"
 
 # squirrelmail/src/vcard.php:124
-#: squirrelmail/src/vcard.php:129
+#: squirrelmail/src/vcard.php:140 squirrelmail/src/vcard.php:203
 msgid "Add to Addressbook"
 msgstr "Voeg toe aan adresboek"
 
+#: squirrelmail/src/vcard.php:149
+msgid "Note Field Contains"
+msgstr "Aantekeningveld bevat"
+
 # squirrelmail/src/vcard.php:155
-#: squirrelmail/src/vcard.php:169
+#: squirrelmail/src/vcard.php:171
 msgid "Title & Org. / Dept."
 msgstr "Titel & Org. / Afd."
 
-# squirrelmail/src/read_body.php:427
-#: squirrelmail/src/view_header.php:81
-msgid "Viewing Full Header"
-msgstr "Bekijk volledige berichtinformatie"
-
-# squirrelmail/src/download.php:31
-#: squirrelmail/src/view_text.php:35
-msgid "Viewing a text attachment"
-msgstr "Bekijk een tekst bijlage"
-
 # squirrelmail/functions/abook_database.php:50
 # squirrelmail/functions/abook_local_file.php:37
 # squirrelmail/functions/addressbook.php:155
@@ -2078,9 +2053,9 @@ msgstr "Databasefout: %s"
 #: squirrelmail/functions/abook_local_file.php:267
 #: squirrelmail/functions/abook_local_file.php:292
 #: squirrelmail/functions/abook_local_file.php:324
-#: squirrelmail/functions/addressbook.php:371
-#: squirrelmail/functions/addressbook.php:406
-#: squirrelmail/functions/addressbook.php:459
+#: squirrelmail/functions/addressbook.php:351
+#: squirrelmail/functions/addressbook.php:386
+#: squirrelmail/functions/addressbook.php:439
 msgid "Addressbook is read-only"
 msgstr "Adresboek is alleen-lezen"
 
@@ -2173,29 +2148,29 @@ msgstr "Fout: kan LDAP server %s niet initialiseren"
 
 # squirrelmail/functions/addressbook.php:329
 # squirrelmail/functions/addressbook.php:416
-#: squirrelmail/functions/addressbook.php:349
-#: squirrelmail/functions/addressbook.php:436
+#: squirrelmail/functions/addressbook.php:329
+#: squirrelmail/functions/addressbook.php:416
 msgid "Invalid input data"
 msgstr "Invoerde datum is niet toegestaan"
 
 # squirrelmail/functions/addressbook.php:333
 # squirrelmail/functions/addressbook.php:420
-#: squirrelmail/functions/addressbook.php:353
-#: squirrelmail/functions/addressbook.php:440
+#: squirrelmail/functions/addressbook.php:333
+#: squirrelmail/functions/addressbook.php:420
 msgid "Name is missing"
 msgstr "Naam ontbreekt"
 
 # squirrelmail/functions/addressbook.php:337
 # squirrelmail/functions/addressbook.php:424
-#: squirrelmail/functions/addressbook.php:357
-#: squirrelmail/functions/addressbook.php:444
+#: squirrelmail/functions/addressbook.php:337
+#: squirrelmail/functions/addressbook.php:424
 msgid "E-mail address is missing"
 msgstr "E-mailadres ontbreekt"
 
 # squirrelmail/functions/addressbook.php:345
 # squirrelmail/functions/addressbook.php:429
-#: squirrelmail/functions/addressbook.php:365
-#: squirrelmail/functions/addressbook.php:449
+#: squirrelmail/functions/addressbook.php:345
+#: squirrelmail/functions/addressbook.php:429
 msgid "Nickname contains illegal characters"
 msgstr "Bijnaam bevat illegale karakters"
 
@@ -2203,161 +2178,161 @@ msgstr "Bijnaam bevat illegale karakters"
 # squirrelmail/functions/attachment_common.php:128
 # squirrelmail/functions/attachment_common.php:143
 # squirrelmail/functions/attachment_common.php:168
-#: squirrelmail/functions/attachment_common.php:105
-#: squirrelmail/functions/attachment_common.php:125
-#: squirrelmail/functions/attachment_common.php:142
-#: squirrelmail/functions/attachment_common.php:163
+#: squirrelmail/functions/attachment_common.php:107
+#: squirrelmail/functions/attachment_common.php:128
+#: squirrelmail/functions/attachment_common.php:143
+#: squirrelmail/functions/attachment_common.php:168
 msgid "view"
 msgstr "bekijk"
 
 # squirrelmail/functions/attachment_common.php:185
-#: squirrelmail/functions/attachment_common.php:178
+#: squirrelmail/functions/attachment_common.php:185
 msgid "Business Card"
 msgstr "Visitekaartje"
 
 # squirrelmail/functions/date.php:91
 # squirrelmail/plugins/calendar/calendar.php:49
-#: squirrelmail/functions/date.php:113
-#: squirrelmail/plugins/calendar/calendar.php:59
+#: squirrelmail/functions/date.php:91
+#: squirrelmail/plugins/calendar/calendar.php:68
 msgid "Sunday"
 msgstr "Zondag"
 
 # squirrelmail/functions/date.php:94
 # squirrelmail/plugins/calendar/calendar.php:50
-#: squirrelmail/functions/date.php:116
-#: squirrelmail/plugins/calendar/calendar.php:60
+#: squirrelmail/functions/date.php:94
+#: squirrelmail/plugins/calendar/calendar.php:69
 msgid "Monday"
 msgstr "Maandag"
 
 # squirrelmail/functions/date.php:97
 # squirrelmail/plugins/calendar/calendar.php:51
-#: squirrelmail/functions/date.php:119
-#: squirrelmail/plugins/calendar/calendar.php:61
+#: squirrelmail/functions/date.php:97
+#: squirrelmail/plugins/calendar/calendar.php:70
 msgid "Tuesday"
 msgstr "Dinsdag"
 
 # squirrelmail/functions/date.php:100
 # squirrelmail/plugins/calendar/calendar.php:52
-#: squirrelmail/functions/date.php:122
-#: squirrelmail/plugins/calendar/calendar.php:62
+#: squirrelmail/functions/date.php:100
+#: squirrelmail/plugins/calendar/calendar.php:71
 msgid "Wednesday"
 msgstr "Woensdag"
 
 # squirrelmail/functions/date.php:103
 # squirrelmail/plugins/calendar/calendar.php:53
-#: squirrelmail/functions/date.php:125
-#: squirrelmail/plugins/calendar/calendar.php:63
+#: squirrelmail/functions/date.php:103
+#: squirrelmail/plugins/calendar/calendar.php:72
 msgid "Thursday"
 msgstr "Donderdag"
 
 # squirrelmail/functions/date.php:106
 # squirrelmail/plugins/calendar/calendar.php:54
-#: squirrelmail/functions/date.php:128
-#: squirrelmail/plugins/calendar/calendar.php:64
+#: squirrelmail/functions/date.php:106
+#: squirrelmail/plugins/calendar/calendar.php:73
 msgid "Friday"
 msgstr "Vrijdag"
 
 # squirrelmail/functions/date.php:109
 # squirrelmail/plugins/calendar/calendar.php:55
-#: squirrelmail/functions/date.php:131
-#: squirrelmail/plugins/calendar/calendar.php:65
+#: squirrelmail/functions/date.php:109
+#: squirrelmail/plugins/calendar/calendar.php:74
 msgid "Saturday"
 msgstr "Zaterdag"
 
 # squirrelmail/functions/date.php:120
-#: squirrelmail/functions/date.php:142
+#: squirrelmail/functions/date.php:120
 msgid "January"
 msgstr "januari"
 
 # squirrelmail/functions/date.php:123
-#: squirrelmail/functions/date.php:145
+#: squirrelmail/functions/date.php:123
 msgid "February"
 msgstr "februari"
 
 # squirrelmail/functions/date.php:126
-#: squirrelmail/functions/date.php:148
+#: squirrelmail/functions/date.php:126
 msgid "March"
 msgstr "maart"
 
 # squirrelmail/functions/date.php:129
-#: squirrelmail/functions/date.php:151
+#: squirrelmail/functions/date.php:129
 msgid "April"
 msgstr "april"
 
 # squirrelmail/functions/date.php:132
-#: squirrelmail/functions/date.php:154
+#: squirrelmail/functions/date.php:132
 msgid "May"
 msgstr "mei"
 
 # squirrelmail/functions/date.php:135
-#: squirrelmail/functions/date.php:157
+#: squirrelmail/functions/date.php:135
 msgid "June"
 msgstr "juni"
 
 # squirrelmail/functions/date.php:138
-#: squirrelmail/functions/date.php:160
+#: squirrelmail/functions/date.php:138
 msgid "July"
 msgstr "juli"
 
 # squirrelmail/functions/date.php:141
-#: squirrelmail/functions/date.php:163
+#: squirrelmail/functions/date.php:141
 msgid "August"
 msgstr "augustus"
 
 # squirrelmail/functions/date.php:144
-#: squirrelmail/functions/date.php:166
+#: squirrelmail/functions/date.php:144
 msgid "September"
 msgstr "september"
 
 # squirrelmail/functions/date.php:147
-#: squirrelmail/functions/date.php:169
+#: squirrelmail/functions/date.php:147
 msgid "October"
 msgstr "oktober"
 
 # squirrelmail/functions/date.php:150
-#: squirrelmail/functions/date.php:172
+#: squirrelmail/functions/date.php:150
 msgid "November"
 msgstr "november"
 
 # squirrelmail/functions/date.php:153
-#: squirrelmail/functions/date.php:175
+#: squirrelmail/functions/date.php:153
 msgid "December"
 msgstr "december"
 
 # squirrelmail/functions/date.php:182
-#: squirrelmail/functions/date.php:208
+#: squirrelmail/functions/date.php:182
 msgid "D, F j, Y g:i a"
-msgstr "D, F j, Y g:i a"
+msgstr "D, j F, Y g:i a"
 
 # squirrelmail/functions/date.php:184
-#: squirrelmail/functions/date.php:210
+#: squirrelmail/functions/date.php:184
 msgid "D, F j, Y G:i"
-msgstr "D, F j, Y G:i"
+msgstr "D, j F, Y G:i"
 
 # squirrelmail/functions/date.php:206
-#: squirrelmail/functions/date.php:236
+#: squirrelmail/functions/date.php:206
 msgid "g:i a"
 msgstr "g:i a"
 
 # squirrelmail/functions/date.php:208
-#: squirrelmail/functions/date.php:238
+#: squirrelmail/functions/date.php:208
 msgid "G:i"
 msgstr "G:i"
 
 # squirrelmail/functions/date.php:213
-#: squirrelmail/functions/date.php:243
+#: squirrelmail/functions/date.php:213
 msgid "D, g:i a"
 msgstr "D, g:i a"
 
 # squirrelmail/functions/date.php:215
-#: squirrelmail/functions/date.php:245
+#: squirrelmail/functions/date.php:215
 msgid "D, G:i"
 msgstr "D, G:i"
 
 # squirrelmail/functions/date.php:219
-#: squirrelmail/functions/date.php:249
+#: squirrelmail/functions/date.php:219
 msgid "M j, Y"
-msgstr "M j, Y"
+msgstr "j M, Y"
 
 # squirrelmail/functions/db_prefs.php:56
 # squirrelmail/functions/db_prefs.php:63
@@ -2376,7 +2351,7 @@ msgstr "Bestand met voorkeuren (%s) niet gevonden. Programma afgebroken."
 # squirrelmail/functions/display_messages.php:52
 # squirrelmail/functions/imap_general.php:252
 #: squirrelmail/functions/display_messages.php:73
-#: squirrelmail/functions/imap_general.php:214
+#: squirrelmail/functions/imap_general.php:226
 msgid "Unknown user or password incorrect."
 msgstr "Onbekende gebruiker of verkeerd wachtwoord"
 
@@ -2397,7 +2372,7 @@ msgid "Go to the login page"
 msgstr "Ga naar de aanmeldpagina"
 
 # squirrelmail/functions/file_prefs.php:39
-#: squirrelmail/functions/file_prefs.php:39
+#: squirrelmail/functions/file_prefs.php:37
 #, c-format
 msgid ""
 "Preference file, %s, does not exist. Log out, and log back in to create a "
@@ -2409,41 +2384,42 @@ msgstr ""
 # squirrelmail/functions/file_prefs.php:166
 # squirrelmail/functions/file_prefs.php:176
 # squirrelmail/functions/prefs.php:94
-#: squirrelmail/functions/file_prefs.php:47
-#: squirrelmail/functions/file_prefs.php:107
+#: squirrelmail/functions/file_prefs.php:43
+#: squirrelmail/functions/file_prefs.php:102
 #, c-format
 msgid ""
 "Preference file, %s, could not be opened. Contact your system administrator "
 "to resolve this issue."
-msgstr "De file, %s, kan niet worden geopend. Neem contact op met uw systeembeheerder."
+msgstr "Bestand met voorkeuren, %s, kan niet worden geopend. Neem contact op met uw "
+"systeembeheerder voor hulp."
 
 # squirrelmail/functions/file_prefs.php:162
-#: squirrelmail/functions/file_prefs.php:175
+#: squirrelmail/functions/file_prefs.php:170
 #, c-format
 msgid "Error opening %s"
 msgstr "Fout bij openen %s"
 
 # squirrelmail/functions/file_prefs.php:165
-#: squirrelmail/functions/file_prefs.php:178
+#: squirrelmail/functions/file_prefs.php:173
 msgid "Default preference file not found!"
-msgstr "Standaard voorkeursbestand niet gevonden!"
+msgstr "Standaard bestand met voorkeuren niet gevonden!"
 
 # squirrelmail/functions/file_prefs.php:166
 # squirrelmail/functions/file_prefs.php:176
 # squirrelmail/functions/prefs.php:94
-#: squirrelmail/functions/file_prefs.php:179
-#: squirrelmail/functions/file_prefs.php:192
-#: squirrelmail/functions/prefs.php:94
+#: squirrelmail/functions/file_prefs.php:174
+#: squirrelmail/functions/file_prefs.php:187
+#: squirrelmail/functions/prefs.php:102
 msgid "Please contact your system administrator and report this error."
 msgstr "Neem contact op met uw systeembeheerder voor hulp."
 
 # squirrelmail/functions/file_prefs.php:174
-#: squirrelmail/functions/file_prefs.php:190
+#: squirrelmail/functions/file_prefs.php:185
 msgid "Could not create initial preference file!"
-msgstr "Kan initieel voorkeursbestand niet aanmaken!"
+msgstr "Kan bestand met voorkeuren niet aanmaken!"
 
 # squirrelmail/functions/file_prefs.php:175
-#: squirrelmail/functions/file_prefs.php:191
+#: squirrelmail/functions/file_prefs.php:186
 #, c-format
 msgid "%s should be writable by user %s"
 msgstr "%s moet schrijfbaar zijn voor gebruiker %s"
@@ -2451,101 +2427,88 @@ msgstr "%s moet schrijfbaar zijn voor gebruiker %s"
 # squirrelmail/functions/file_prefs.php:166
 # squirrelmail/functions/file_prefs.php:176
 # squirrelmail/functions/prefs.php:94
-#: squirrelmail/functions/file_prefs.php:209
-#: squirrelmail/functions/file_prefs.php:227
+#: squirrelmail/functions/file_prefs.php:203
+#: squirrelmail/functions/file_prefs.php:221
 #, c-format
 msgid ""
 "Signature file, %s, could not be opened. Contact your system administrator "
 "to resolve this issue."
-msgstr "Bestand met handtekeningen, %s, kan niet worden geopend. Neem contact op met uw systeembeheerder "
-
-#: squirrelmail/functions/i18n.php:751
-msgid ""
-"You need to have php4 installed with the multibyte string function enabled "
-"(using configure option --with-mbstring)."
-msgstr ""
-"U moet php4 hebben geinstalleerd met de multibyte string functie geactiveerd "
-"(gebruik de configuratieoptie --with-mbstring)."
+msgstr "Bestand met handtekeningen, %s, kan niet worden geopend. "
+"Neem contact op met uw systeembeheerder voor hulp."
 
 # squirrelmail/functions/imap_general.php:163
 # squirrelmail/functions/imap_messages.php:366
 # squirrelmail/functions/imap_messages.php:374
 # squirrelmail/functions/imap_messages.php:567
 # squirrelmail/plugins/filters/filters.php:227
-#: squirrelmail/functions/imap_general.php:121
-#: squirrelmail/functions/imap_messages.php:427
-#: squirrelmail/functions/imap_messages.php:434
-#: squirrelmail/functions/imap_messages.php:445
-#: squirrelmail/functions/imap_messages.php:452
-#: squirrelmail/functions/imap_messages.php:652
-#: squirrelmail/functions/imap_messages.php:663
+#: squirrelmail/functions/imap_general.php:115
+#: squirrelmail/functions/imap_messages.php:367
+#: squirrelmail/functions/imap_messages.php:375
+#: squirrelmail/functions/imap_messages.php:573
 #: squirrelmail/plugins/filters/filters.php:227
 msgid "ERROR : Could not complete request."
 msgstr "FOUT: Kan opdracht niet verwerken."
 
 # squirrelmail/functions/imap_general.php:165
 # squirrelmail/functions/imap_general.php:176
-#: squirrelmail/functions/imap_general.php:123
-#: squirrelmail/functions/imap_general.php:135
+#: squirrelmail/functions/imap_general.php:117
+#: squirrelmail/functions/imap_general.php:129
 msgid "Query:"
 msgstr "Verzoek:"
 
 # squirrelmail/functions/imap_general.php:167
 # squirrelmail/plugins/filters/filters.php:229
-#: squirrelmail/functions/imap_general.php:125
+#: squirrelmail/functions/imap_general.php:119
 #: squirrelmail/plugins/filters/filters.php:229
 msgid "Reason Given: "
 msgstr "Reden: "
 
 # squirrelmail/functions/imap_general.php:174
 # squirrelmail/plugins/filters/filters.php:236
-#: squirrelmail/functions/imap_general.php:133
+#: squirrelmail/functions/imap_general.php:127
 #: squirrelmail/plugins/filters/filters.php:236
 msgid "ERROR : Bad or malformed request."
 msgstr "FOUT: Foute of corrupte aanvraag."
 
 # squirrelmail/functions/imap_general.php:178
 # squirrelmail/plugins/filters/filters.php:238
-#: squirrelmail/functions/imap_general.php:137
+#: squirrelmail/functions/imap_general.php:131
 #: squirrelmail/plugins/filters/filters.php:238
 msgid "Server responded: "
 msgstr "Server reageerde: "
 
 # squirrelmail/functions/imap_general.php:211
-#: squirrelmail/functions/imap_general.php:173
+#: squirrelmail/functions/imap_general.php:185
 #, c-format
 msgid "Error connecting to IMAP server: %s."
 msgstr "FOUT: kan IMAP server %s niet initialiseren:"
 
 # squirrelmail/functions/imap_general.php:227
-#: squirrelmail/functions/imap_general.php:189
+#: squirrelmail/functions/imap_general.php:201
 #, c-format
 msgid "Bad request: %s"
 msgstr "Ongeldige opdracht: %s"
 
 # squirrelmail/functions/imap_general.php:229
-#: squirrelmail/functions/imap_general.php:191
+#: squirrelmail/functions/imap_general.php:203
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Onbekende fout: %s"
 
 # squirrelmail/functions/imap_general.php:231
-#: squirrelmail/functions/imap_general.php:193
+#: squirrelmail/functions/imap_general.php:205
 msgid "Read data:"
 msgstr "Lees data:"
 
 # squirrelmail/functions/imap_messages.php:368
 # squirrelmail/functions/imap_messages.php:569
-#: squirrelmail/functions/imap_messages.php:429
-#: squirrelmail/functions/imap_messages.php:447
-#: squirrelmail/functions/imap_messages.php:654
-#: squirrelmail/functions/imap_messages.php:665
+#: squirrelmail/functions/imap_messages.php:369
+#: squirrelmail/functions/imap_messages.php:575
 msgid "Unknown response from IMAP server: "
 msgstr "Onbekend antwoord van IMAP server: "
 
 # squirrelmail/functions/imap_messages.php:376
-#: squirrelmail/functions/imap_messages.php:436
-#: squirrelmail/functions/imap_messages.php:454
+#: squirrelmail/functions/imap_messages.php:377
 msgid "Unknown message number in reply from server: "
 msgstr "Onbekend berichtnummer in antwoord van server"
 
@@ -2554,138 +2517,162 @@ msgstr "Onbekend berichtnummer in antwoord van server"
 # squirrelmail/functions/imap_messages.php:760
 # squirrelmail/functions/imap_messages.php:824
 # squirrelmail/functions/mailbox_display.php:1087
-#: squirrelmail/functions/imap_messages.php:476
-#: squirrelmail/functions/imap_messages.php:579
-#: squirrelmail/functions/imap_parse.php:183
-#: squirrelmail/functions/imap_parse.php:205
-#: squirrelmail/functions/mailbox_display.php:1177
+#: squirrelmail/functions/imap_messages.php:397
+#: squirrelmail/functions/imap_messages.php:498
+#: squirrelmail/functions/imap_messages.php:766
+#: squirrelmail/functions/imap_messages.php:830
+#: squirrelmail/functions/mailbox_display.php:1097
 msgid "(no subject)"
 msgstr "(geen onderwerp)"
 
 # squirrelmail/functions/imap_messages.php:397
-#: squirrelmail/functions/imap_messages.php:477
+#: squirrelmail/functions/imap_messages.php:398
 msgid "Unknown Sender"
 msgstr "Onbekende afzender"
 
+# squirrelmail/functions/imap_messages.php:515
+#: squirrelmail/functions/imap_messages.php:521
+msgid "No To Address"
+msgstr "Geen AAN adres"
+
 # squirrelmail/functions/imap_messages.php:827
-#: squirrelmail/functions/imap_parse.php:208
+#: squirrelmail/functions/imap_messages.php:833
 msgid "(unknown sender)"
 msgstr "(onbekende afzender)"
 
+# squirrelmail/functions/imap_search.php:83
+#: squirrelmail/functions/imap_search.php:99
+msgid "No Messages Found"
+msgstr "Bekijk bericht"
+
+# squirrelmail/functions/imap_search.php:191
+# squirrelmail/functions/imap_search.php:199
+#: squirrelmail/functions/imap_search.php:207
+#: squirrelmail/functions/imap_search.php:215
+msgid "Found"
+msgstr "Gevonden"
+
+# squirrelmail/functions/imap_search.php:191
+# squirrelmail/functions/imap_search.php:199
+#: squirrelmail/functions/imap_search.php:207
+#: squirrelmail/functions/imap_search.php:215
+msgid "messages"
+msgstr "berichten"
+
+# squirrelmail/functions/imap_search.php:206
+#: squirrelmail/functions/imap_search.php:222
+msgid "Folder:"
+msgstr "Map:"
+
 # squirrelmail/functions/mailbox_display.php:185
-#: squirrelmail/functions/mailbox_display.php:203
+#: squirrelmail/functions/mailbox_display.php:186
 msgid "A"
 msgstr "A"
 
-#: squirrelmail/functions/mailbox_display.php:388
-msgid ""
-"Thread sorting is not supported by your IMAP server.<br>Please report this "
-"to the system administrator."
-msgstr ""
-"Sorteren met boomstructuur wordt niet ondersteund door uw IMAP-server.<br>Neem contact "
-"op met uw systeembeheerder."
-
-#: squirrelmail/functions/mailbox_display.php:407
+#: squirrelmail/functions/mailbox_display.php:278
 msgid ""
 "Server-side sorting is not supported by your IMAP server.<br>Please report "
-"this to the system administrator."
+"this to the system administrator"
 msgstr ""
-"Sorteren door de server (server-side sorting) wordt niet ondersteund door uw IMAP-server.<br>Neem "
-"contact op met uw systeembeheerder."
 
 # squirrelmail/functions/mailbox_display.php:568
-#: squirrelmail/functions/mailbox_display.php:608
+#: squirrelmail/functions/mailbox_display.php:570
 msgid "THIS FOLDER IS EMPTY"
 msgstr "DEZE MAP IS LEEG"
 
 # squirrelmail/functions/mailbox_display.php:658
-#: squirrelmail/functions/mailbox_display.php:706
-msgid "Move Selected To"
+#: squirrelmail/functions/mailbox_display.php:663
+msgid "Move Selected To:"
 msgstr "Verplaats geselecteerde naar:"
 
 # squirrelmail/functions/mailbox_display.php:661
-#: squirrelmail/functions/mailbox_display.php:707
+#: squirrelmail/functions/mailbox_display.php:666
 msgid "Transform Selected Messages"
 msgstr "Wijzig geselecteerde berichten"
 
 # squirrelmail/functions/mailbox_display.php:681
 # squirrelmail/plugins/delete_move_next/setup.php:244
 # squirrelmail/plugins/delete_move_next/setup.php:268
-#: squirrelmail/functions/mailbox_display.php:712
-#: squirrelmail/plugins/delete_move_next/setup.php:253
-#: squirrelmail/plugins/delete_move_next/setup.php:277
+#: squirrelmail/functions/mailbox_display.php:691
+#: squirrelmail/plugins/delete_move_next/setup.php:258
+#: squirrelmail/plugins/delete_move_next/setup.php:282
 msgid "Move"
 msgstr "Verplaats"
 
 # squirrelmail/functions/mailbox_display.php:688
-#: squirrelmail/functions/mailbox_display.php:719
+#: squirrelmail/functions/mailbox_display.php:698
 msgid "Expunge"
 msgstr "Legen"
 
 # squirrelmail/functions/mailbox_display.php:689
-#: squirrelmail/functions/mailbox_display.php:720
+#: squirrelmail/functions/mailbox_display.php:699
 msgid "mailbox"
 msgstr "postvak"
 
 # squirrelmail/functions/mailbox_display.php:691
-#: squirrelmail/functions/mailbox_display.php:723
+#: squirrelmail/functions/mailbox_display.php:701
 msgid "Read"
 msgstr "Gelezen"
 
 # squirrelmail/functions/mailbox_display.php:692
-#: squirrelmail/functions/mailbox_display.php:724
+#: squirrelmail/functions/mailbox_display.php:702
 msgid "Unread"
 msgstr "Ongelezen"
 
 # squirrelmail/functions/mailbox_display.php:701
-#: squirrelmail/functions/mailbox_display.php:739
+#: squirrelmail/functions/mailbox_display.php:711
 msgid "Unthread View"
 msgstr "Verberg boomstructuur"
 
 # squirrelmail/functions/mailbox_display.php:705
-#: squirrelmail/functions/mailbox_display.php:743
+#: squirrelmail/functions/mailbox_display.php:715
 msgid "Thread View"
 msgstr "Weergave boomstructuur"
 
 # squirrelmail/functions/mailbox_display.php:820
-#: squirrelmail/functions/mailbox_display.php:900
+#: squirrelmail/functions/mailbox_display.php:830
 msgid "Toggle All"
 msgstr "(de)Selecteer alles"
 
 # squirrelmail/functions/mailbox_display.php:844
-#: squirrelmail/functions/mailbox_display.php:924
+#: squirrelmail/functions/mailbox_display.php:854
 msgid "Unselect All"
 msgstr "Alles deselecteren"
 
 # squirrelmail/functions/mailbox_display.php:846
-#: squirrelmail/functions/mailbox_display.php:926
+#: squirrelmail/functions/mailbox_display.php:856
 msgid "Select All"
 msgstr "Alles selecteren"
 
 # squirrelmail/functions/mailbox_display.php:863
-#: squirrelmail/functions/mailbox_display.php:943
+#: squirrelmail/functions/mailbox_display.php:873
 #, c-format
 msgid "Viewing Messages: <B>%s</B> to <B>%s</B> (%s total)"
 msgstr "Bekijk berichten: <B>%s</B> t/m <B>%s</B> (%s totaal)"
 
 # squirrelmail/functions/mailbox_display.php:866
-#: squirrelmail/functions/mailbox_display.php:946
+#: squirrelmail/functions/mailbox_display.php:876
 #, c-format
 msgid "Viewing Message: <B>%s</B> (1 total)"
 msgstr "Bekijk bericht: <B>%s</B> (1 totaal)"
 
 # squirrelmail/functions/mailbox_display.php:1050
-#: squirrelmail/functions/mailbox_display.php:1139
+#: squirrelmail/functions/mailbox_display.php:1060
 msgid "Paginate"
 msgstr "Pagineer"
 
 # squirrelmail/functions/mailbox_display.php:1057
-#: squirrelmail/functions/mailbox_display.php:1146
+#: squirrelmail/functions/mailbox_display.php:1067
 msgid "Show All"
 msgstr "Toon alle"
 
+# squirrelmail/functions/mime.php:425
+#: squirrelmail/functions/mime.php:425
+msgid "Error decoding mime structure.  Report this as a bug!"
+msgstr "Fout decoderen mime structuur. Raporteer dit als een bug!"
+
 # squirrelmail/functions/mime.php:499
-#: squirrelmail/functions/mime.php:127
+#: squirrelmail/functions/mime.php:499
 msgid ""
 "Body retrieval error. The reason for this is most probably that the message "
 "is malformed. Please help us making future versions better by submitting "
@@ -2697,17 +2684,17 @@ msgstr ""
 "te laten in de developers knowledgebase!"
 
 # squirrelmail/functions/mime.php:501
-#: squirrelmail/functions/mime.php:129
+#: squirrelmail/functions/mime.php:501
 msgid "Submit message"
 msgstr "Voeg bericht toe"
 
 # squirrelmail/functions/mime.php:503
-#: squirrelmail/functions/mime.php:131
+#: squirrelmail/functions/mime.php:503
 msgid "Command:"
 msgstr "Commando:"
 
 # squirrelmail/functions/mime.php:504
-#: squirrelmail/functions/mime.php:132
+#: squirrelmail/functions/mime.php:504
 msgid "Response:"
 msgstr "Antwoord:"
 
@@ -2716,41 +2703,46 @@ msgstr "Antwoord:"
 # squirrelmail/plugins/calendar/event_delete.php:38
 # squirrelmail/plugins/calendar/event_edit.php:101
 # squirrelmail/plugins/calendar/event_edit.php:114
-#: squirrelmail/functions/mime.php:133
-#: squirrelmail/plugins/calendar/event_create.php:137
-#: squirrelmail/plugins/calendar/event_delete.php:47
-#: squirrelmail/plugins/calendar/event_edit.php:119
-#: squirrelmail/plugins/calendar/event_edit.php:143
+#: squirrelmail/functions/mime.php:505
+#: squirrelmail/plugins/calendar/event_create.php:174
+#: squirrelmail/plugins/calendar/event_delete.php:96
+#: squirrelmail/plugins/calendar/event_edit.php:190
+#: squirrelmail/plugins/calendar/event_edit.php:203
 msgid "Message:"
 msgstr "Bericht:"
 
 # squirrelmail/functions/mime.php:506
-#: squirrelmail/functions/mime.php:134
+#: squirrelmail/functions/mime.php:506
 msgid "FETCH line:"
 msgstr "FETCH regel:"
 
 # squirrelmail/functions/mime.php:791
-#: squirrelmail/functions/mime.php:366
+#: squirrelmail/functions/mime.php:796
 msgid "Hide Unsafe Images"
 msgstr "Verberg onveilige figuren"
 
 # squirrelmail/functions/mime.php:793
-#: squirrelmail/functions/mime.php:368
+#: squirrelmail/functions/mime.php:798
 msgid "View Unsafe Images"
 msgstr "Bekijk onveilige figuren"
 
+# squirrelmail/functions/mime.php:822
+#: squirrelmail/functions/mime.php:827
+msgid "Attachments"
+msgstr "Bijlagen"
+
 # squirrelmail/functions/mime.php:858 squirrelmail/functions/mime.php:936
-#: squirrelmail/functions/mime.php:395
+#: squirrelmail/functions/mime.php:863 squirrelmail/functions/mime.php:941
 msgid "download"
 msgstr "download"
 
 # squirrelmail/functions/mime.php:1662 squirrelmail/functions/mime.php:1969
-#: squirrelmail/functions/mime.php:1176 squirrelmail/functions/mime.php:1497
+#: squirrelmail/functions/mime.php:1670 squirrelmail/functions/mime.php:1989
 msgid "sec_remove_eng.png"
 msgstr "sec_remove_eng.png"
 
 # squirrelmail/functions/options.php:168
-#: squirrelmail/functions/options.php:168
+#: squirrelmail/functions/options.php:169
 #, c-format
 msgid "Option Type '%s' Not Found"
 msgstr "Optie Type '%s' Niet gevonden"
@@ -2759,10 +2751,10 @@ msgstr "Optie Type '%s' Niet gevonden"
 # squirrelmail/plugins/administrator/options.php:357
 # squirrelmail/plugins/calendar/event_delete.php:51
 # squirrelmail/plugins/calendar/event_edit.php:134
-#: squirrelmail/functions/options.php:263
-#: squirrelmail/plugins/administrator/options.php:357
-#: squirrelmail/plugins/calendar/event_delete.php:62
-#: squirrelmail/plugins/calendar/event_edit.php:165
+#: squirrelmail/functions/options.php:264
+#: squirrelmail/plugins/administrator/options.php:364
+#: squirrelmail/plugins/calendar/event_delete.php:109
+#: squirrelmail/plugins/calendar/event_edit.php:223
 msgid "Yes"
 msgstr "Ja"
 
@@ -2770,15 +2762,15 @@ msgstr "Ja"
 # squirrelmail/plugins/administrator/options.php:358
 # squirrelmail/plugins/calendar/event_delete.php:58
 # squirrelmail/plugins/calendar/event_edit.php:141
-#: squirrelmail/functions/options.php:268
-#: squirrelmail/plugins/administrator/options.php:358
-#: squirrelmail/plugins/calendar/event_delete.php:70
-#: squirrelmail/plugins/calendar/event_edit.php:173
+#: squirrelmail/functions/options.php:269
+#: squirrelmail/plugins/administrator/options.php:365
+#: squirrelmail/plugins/calendar/event_delete.php:116
+#: squirrelmail/plugins/calendar/event_edit.php:230
 msgid "No"
 msgstr "Nee"
 
 # squirrelmail/functions/page_header.php:116
-#: squirrelmail/functions/page_header.php:200
+#: squirrelmail/functions/page_header.php:214
 msgid "Current Folder"
 msgstr "Huidige map"
 
@@ -2786,26 +2778,26 @@ msgstr "Huidige map"
 # squirrelmail/functions/page_header.php:133
 # squirrelmail/functions/page_header.php:175
 # squirrelmail/functions/page_header.php:202
-#: squirrelmail/functions/page_header.php:213
-#: squirrelmail/functions/page_header.php:216
-#: squirrelmail/functions/page_header.php:259
-#: squirrelmail/functions/page_header.php:286
+#: squirrelmail/functions/page_header.php:227
+#: squirrelmail/functions/page_header.php:230
+#: squirrelmail/functions/page_header.php:272
+#: squirrelmail/functions/page_header.php:299
 msgid "Compose"
 msgstr "Nieuw bericht"
 
 # squirrelmail/functions/prefs.php:92
-#: squirrelmail/functions/prefs.php:92
+#: squirrelmail/functions/prefs.php:100
 #, c-format
 msgid "Error creating directory %s."
 msgstr "Fout bij aanmaken directory %s."
 
 # squirrelmail/functions/prefs.php:93
-#: squirrelmail/functions/prefs.php:93
+#: squirrelmail/functions/prefs.php:101
 msgid "Could not create hashed directory structure!"
 msgstr "Kan geen hashed directory structuur aanmaken!"
 
 # squirrelmail/plugins/filters/filters.php:554
-#: squirrelmail/plugins/filters/filters.php:560
+#: squirrelmail/plugins/filters/filters.php:557
 msgid ""
 "COMMERCIAL - This list contains servers that are verified spam senders. It "
 "is a pretty reliable list to scan spam from."
@@ -2815,7 +2807,7 @@ msgstr ""
 "detecteren."
 
 # squirrelmail/plugins/filters/filters.php:562
-#: squirrelmail/plugins/filters/filters.php:568
+#: squirrelmail/plugins/filters/filters.php:565
 msgid ""
 "COMMERCIAL - Servers that are configured (or misconfigured) to allow spam to "
 "be relayed through their system will be banned with this.  Another good one "
@@ -2825,7 +2817,7 @@ msgstr ""
 "worden geblokkeerd met dit."
 
 # squirrelmail/plugins/filters/filters.php:570
-#: squirrelmail/plugins/filters/filters.php:576
+#: squirrelmail/plugins/filters/filters.php:573
 msgid ""
 "COMMERCIAL - Dial-up users are often filtered out since they should use "
 "their ISP's mail servers to send mail.  Spammers typically get a dial-up "
@@ -2836,22 +2828,22 @@ msgstr ""
 "inbelaccount om spam te verzenden."
 
 # squirrelmail/plugins/filters/filters.php:578
-#: squirrelmail/plugins/filters/filters.php:584
+#: squirrelmail/plugins/filters/filters.php:581
 msgid "COMMERCIAL - RBL+ Blackhole entries."
 msgstr "COMMERCIAL - RBL+ Blackhole entries."
 
 # squirrelmail/plugins/filters/filters.php:586
-#: squirrelmail/plugins/filters/filters.php:592
+#: squirrelmail/plugins/filters/filters.php:589
 msgid "COMMERCIAL - RBL+ OpenRelay entries."
 msgstr "COMMERCIAL - RBL+ OpenRelay entries."
 
 # squirrelmail/plugins/filters/filters.php:594
-#: squirrelmail/plugins/filters/filters.php:600
+#: squirrelmail/plugins/filters/filters.php:597
 msgid "COMMERCIAL - RBL+ Dial-up entries."
 msgstr "COMMERCIAL - RBL+ Dial-up entries."
 
 # squirrelmail/plugins/filters/filters.php:603
-#: squirrelmail/plugins/filters/filters.php:609
+#: squirrelmail/plugins/filters/filters.php:606
 msgid ""
 "FREE - Osirusoft Relays - Osirusofts list of verified open relays. Seems to "
 "include servers used by abuse@uunet.net auto-replies too."
@@ -2860,12 +2852,12 @@ msgstr ""
 "Lijkt ook servers gebruikt door abuse@uunet.net auto-replies te bevatten."
 
 # squirrelmail/plugins/filters/filters.php:611
-#: squirrelmail/plugins/filters/filters.php:617
+#: squirrelmail/plugins/filters/filters.php:614
 msgid "FREE - Osirusoft Dialups - Osirusofts Dialup Spam Source list."
 msgstr "FREE - Osirusoft Dialups - Osirusofts Dialup Spam Source list."
 
 # squirrelmail/plugins/filters/filters.php:619
-#: squirrelmail/plugins/filters/filters.php:625
+#: squirrelmail/plugins/filters/filters.php:622
 msgid ""
 "FREE - Osirusoft Confirmed Spam Source - Sites that continually spam and "
 "have been manually added after multiple nominations. Use with caution. Seems "
@@ -2876,7 +2868,7 @@ msgstr ""
 "Lijkt abuse auto-replies van ISPs ook te weren."
 
 # squirrelmail/plugins/filters/filters.php:627
-#: squirrelmail/plugins/filters/filters.php:633
+#: squirrelmail/plugins/filters/filters.php:630
 msgid ""
 "FREE - Osirusoft Smart Hosts - List of hosts that are secure but relay for "
 "other mail servers that are not secure."
@@ -2885,7 +2877,7 @@ msgstr ""
 "relayen voor andere mailservers die niet beveiligd zijn."
 
 # squirrelmail/plugins/filters/filters.php:635
-#: squirrelmail/plugins/filters/filters.php:641
+#: squirrelmail/plugins/filters/filters.php:638
 msgid ""
 "FREE - Osirusoft Spamware Developers - It is believed that these are IP "
 "ranges of companies that are known to produce spam software. Seems to catch "
@@ -2896,7 +2888,7 @@ msgstr ""
 "sommige ISPs te weren."
 
 # squirrelmail/plugins/filters/filters.php:643
-#: squirrelmail/plugins/filters/filters.php:649
+#: squirrelmail/plugins/filters/filters.php:646
 msgid ""
 "FREE - Osirusoft Unconfirmed OptIn Servers - List of listservers that opt "
 "users in without confirmation."
@@ -2905,7 +2897,7 @@ msgstr ""
 "gebruikers accepteren zonder bevestiging."
 
 # squirrelmail/plugins/filters/filters.php:651
-#: squirrelmail/plugins/filters/filters.php:657
+#: squirrelmail/plugins/filters/filters.php:654
 msgid ""
 "FREE - Osirusoft Insecure formmail.cgi scripts - List of insecure "
 "formmail.cgi scripts. (planned)."
@@ -2914,12 +2906,12 @@ msgstr ""
 "formmail.cgi scripts. (geplanned)."
 
 # squirrelmail/plugins/filters/filters.php:659
-#: squirrelmail/plugins/filters/filters.php:665
+#: squirrelmail/plugins/filters/filters.php:662
 msgid "FREE - Osirusoft Open Proxy Servers - List of Open Proxy Servers."
 msgstr "FREE - Osirusoft Open Proxy Servers - Lijst van Open Proxy Servers."
 
 # squirrelmail/plugins/filters/filters.php:667
-#: squirrelmail/plugins/filters/filters.php:673
+#: squirrelmail/plugins/filters/filters.php:670
 msgid ""
 "FREE - ORDB was born when ORBS went off the air. It seems to have fewer "
 "false positives than ORBS did though."
@@ -2928,44 +2920,44 @@ msgstr ""
 "matches te hebben dan ORBS."
 
 # squirrelmail/plugins/filters/filters.php:675
-#: squirrelmail/plugins/filters/filters.php:681
+#: squirrelmail/plugins/filters/filters.php:678
 msgid "FREE - Five-Ten-sg.com - Direct SPAM sources."
 msgstr "FREE - Five-Ten-sg.com - Direct SPAM sources."
 
 # squirrelmail/plugins/filters/filters.php:683
-#: squirrelmail/plugins/filters/filters.php:689
+#: squirrelmail/plugins/filters/filters.php:686
 msgid "FREE - Five-Ten-sg.com - Dial-up lists - includes some DSL IPs."
 msgstr "FREE - Five-Ten-sg.com - Dial-up lists - bevat enkele DSL IPs."
 
 # squirrelmail/plugins/filters/filters.php:691
-#: squirrelmail/plugins/filters/filters.php:697
+#: squirrelmail/plugins/filters/filters.php:694
 msgid "FREE - Five-Ten-sg.com - Bulk mailers that do not use confirmed opt-in."
 msgstr ""
 "FREE - Five-Ten-sg.com - Bulk mailers die geen bevestiging van gebruikers "
 "gebruiken."
 
 # squirrelmail/plugins/filters/filters.php:699
-#: squirrelmail/plugins/filters/filters.php:705
+#: squirrelmail/plugins/filters/filters.php:702
 msgid "FREE - Five-Ten-sg.com - Other misc. servers."
 msgstr "FREE - Five-Ten-sg.com - Andere servers."
 
 # squirrelmail/plugins/filters/filters.php:707
-#: squirrelmail/plugins/filters/filters.php:713
+#: squirrelmail/plugins/filters/filters.php:710
 msgid "FREE - Five-Ten-sg.com - Single Stage servers."
 msgstr "FREE - Five-Ten-sg.com - Single Stage servers."
 
 # squirrelmail/plugins/filters/filters.php:715
-#: squirrelmail/plugins/filters/filters.php:721
+#: squirrelmail/plugins/filters/filters.php:718
 msgid "FREE - Five-Ten-sg.com - SPAM Support servers."
 msgstr "FREE - Five-Ten-sg.com - SPAM Support servers."
 
 # squirrelmail/plugins/filters/filters.php:723
-#: squirrelmail/plugins/filters/filters.php:729
+#: squirrelmail/plugins/filters/filters.php:726
 msgid "FREE - Five-Ten-sg.com - Web Form IPs."
 msgstr "FREE - Five-Ten-sg.com - Web Form IPs."
 
 # squirrelmail/plugins/filters/filters.php:731
-#: squirrelmail/plugins/filters/filters.php:737
+#: squirrelmail/plugins/filters/filters.php:734
 msgid ""
 "FREE - Dorkslayers appears to include only really bad open relays outside "
 "the US to avoid being sued. Interestingly enough, their website recommends "
@@ -2976,12 +2968,12 @@ msgstr ""
 "service NIET te gebruiken."
 
 # squirrelmail/plugins/filters/filters.php:739
-#: squirrelmail/plugins/filters/filters.php:745
+#: squirrelmail/plugins/filters/filters.php:742
 msgid "FREE - SPAMhaus - A list of well-known SPAM sources."
 msgstr "FREE - SPAMhaus - Een lijst van bekende SPAM bronnen."
 
 # squirrelmail/plugins/filters/filters.php:747
-#: squirrelmail/plugins/filters/filters.php:753
+#: squirrelmail/plugins/filters/filters.php:750
 #, c-format
 msgid ""
 "FREE, for now - SPAMCOP - An interesting solution that lists servers that "
@@ -2991,33 +2983,33 @@ msgstr ""
 "hoge spam - e-mail ratio hebben. (85% of meer)"
 
 # squirrelmail/plugins/filters/filters.php:755
-#: squirrelmail/plugins/filters/filters.php:761
+#: squirrelmail/plugins/filters/filters.php:758
 msgid "FREE - dev.null.dk - I don't have any detailed info on this list."
 msgstr ""
 "FREE - dev.null.dk - Ik heb geen gedetailleerde informatie over deze lijst."
 
 # squirrelmail/plugins/filters/filters.php:763
-#: squirrelmail/plugins/filters/filters.php:769
+#: squirrelmail/plugins/filters/filters.php:766
 msgid "FREE - visi.com - Relay Stop List. Very conservative OpenRelay List."
 msgstr "FREE - visi.com - Relay Stop Lijst. Erg conservatieve OpenRelay List."
 
 # squirrelmail/plugins/filters/filters.php:771
-#: squirrelmail/plugins/filters/filters.php:777
+#: squirrelmail/plugins/filters/filters.php:774
 msgid "FREE - 2mbit.com Open Relays - Another list of Open Relays."
 msgstr "FREE - 2mbit.com Open Relays - Andere lijst van Open Relays."
 
 # squirrelmail/plugins/filters/filters.php:779
-#: squirrelmail/plugins/filters/filters.php:785
+#: squirrelmail/plugins/filters/filters.php:782
 msgid "FREE - 2mbit.com SPAM Source - List of Direct SPAM Sources."
 msgstr "FREE - 2mbit.com SPAM Source - Lijst van Direct SPAM sources."
 
 # squirrelmail/plugins/filters/filters.php:787
-#: squirrelmail/plugins/filters/filters.php:793
+#: squirrelmail/plugins/filters/filters.php:790
 msgid "FREE - 2mbit.com SPAM ISPs - List of SPAM-friendly ISPs."
 msgstr "FREE - 2mbit.com SPAM ISPs - Lijst van SPAM-vriendelijke ISPs."
 
 # squirrelmail/plugins/filters/filters.php:795
-#: squirrelmail/plugins/filters/filters.php:801
+#: squirrelmail/plugins/filters/filters.php:798
 msgid ""
 "FREE - Leadmon DUL - Another list of Dial-up or otherwise dynamically "
 "assigned IPs."
@@ -3026,7 +3018,7 @@ msgstr ""
 "IPs."
 
 # squirrelmail/plugins/filters/filters.php:803
-#: squirrelmail/plugins/filters/filters.php:809
+#: squirrelmail/plugins/filters/filters.php:806
 msgid ""
 "FREE - Leadmon SPAM Source - List of IPs Leadmon.net has received SPAM "
 "directly from."
@@ -3035,7 +3027,7 @@ msgstr ""
 "heeft gekregen."
 
 # squirrelmail/plugins/filters/filters.php:811
-#: squirrelmail/plugins/filters/filters.php:817
+#: squirrelmail/plugins/filters/filters.php:814
 msgid ""
 "FREE - Leadmon Bulk Mailers - Bulk mailers that do not require confirmed "
 "opt-in or that have allowed known spammers to become clients and abuse their "
@@ -3046,7 +3038,7 @@ msgstr ""
 "services te misbruiken."
 
 # squirrelmail/plugins/filters/filters.php:819
-#: squirrelmail/plugins/filters/filters.php:825
+#: squirrelmail/plugins/filters/filters.php:822
 msgid ""
 "FREE - Leadmon Open Relays - Single Stage Open Relays that are not listed on "
 "other active RBLs."
@@ -3055,7 +3047,7 @@ msgstr ""
 "staan van andere actieve RBLs."
 
 # squirrelmail/plugins/filters/filters.php:827
-#: squirrelmail/plugins/filters/filters.php:833
+#: squirrelmail/plugins/filters/filters.php:830
 msgid ""
 "FREE - Leadmon Multi-stage - Multi-Stage Open Relays that are not listed on "
 "other active RBLs and that have sent SPAM to Leadmon.net."
@@ -3064,7 +3056,7 @@ msgstr ""
 "staan van andere actieve RBLs en die SPAM hebben verzonden aan Leadmon.net."
 
 # squirrelmail/plugins/filters/filters.php:835
-#: squirrelmail/plugins/filters/filters.php:841
+#: squirrelmail/plugins/filters/filters.php:838
 msgid ""
 "FREE - Leadmon SpamBlock - Sites on this listing have sent Leadmon.net "
 "direct SPAM from IPs in netblocks where the entire block has no DNS "
@@ -3077,7 +3069,7 @@ msgstr ""
 "mensen die Leadmon.net hebben geSPAMmed"
 
 # squirrelmail/plugins/filters/filters.php:843
-#: squirrelmail/plugins/filters/filters.php:849
+#: squirrelmail/plugins/filters/filters.php:846
 msgid ""
 "FREE, for now - Not Just Another Blacklist - Both Open Relays and Direct "
 "SPAM Sources."
@@ -3085,102 +3077,95 @@ msgstr ""
 "FREE - Een andere Blacklist - Beide Open Relays en Direct SPAM Sources."
 
 # squirrelmail/plugins/filters/filters.php:851
-#: squirrelmail/plugins/filters/filters.php:857
+#: squirrelmail/plugins/filters/filters.php:854
 msgid "FREE, for now - Not Just Another Blacklist - Dial-up IPs."
 msgstr "FREE - Een andere Blacklist - Dial-up IPs."
 
-#: squirrelmail/plugins/filters/filters.php:865
-msgid "FREE - Distributed Sender Boycott List - Confirmed Relays"
-msgstr ""
-
-#: squirrelmail/plugins/filters/filters.php:873
-msgid "FREE - Distributed Sender Boycott List - Confirmed Multi-stage Relays"
-msgstr ""
-
-#: squirrelmail/plugins/filters/filters.php:881
-msgid "FREE - Distributed Sender Boycott List - UN-Confirmed Relays"
-msgstr ""
-
 # squirrelmail/plugins/filters/options.php:60
-#: squirrelmail/plugins/filters/options.php:60
+#: squirrelmail/plugins/filters/options.php:85
 msgid "Saved Scan type"
 msgstr "Bewaarde scan type"
 
 # squirrelmail/plugins/filters/options.php:70
-#: squirrelmail/plugins/filters/options.php:70
+#: squirrelmail/plugins/filters/options.php:94
 msgid "Message Filtering"
 msgstr "Bericht filtering"
 
 # squirrelmail/plugins/filters/options.php:77
 # squirrelmail/plugins/filters/spamoptions.php:105
-#: squirrelmail/plugins/filters/options.php:79
-#: squirrelmail/plugins/filters/spamoptions.php:115
+#: squirrelmail/plugins/filters/options.php:101
+#: squirrelmail/plugins/filters/spamoptions.php:114
 msgid "What to Scan:"
 msgstr "Wat te scannen:"
 
 # squirrelmail/plugins/filters/options.php:83
 # squirrelmail/plugins/filters/spamoptions.php:111
-#: squirrelmail/plugins/filters/options.php:86
-#: squirrelmail/plugins/filters/spamoptions.php:122
+#: squirrelmail/plugins/filters/options.php:107
+#: squirrelmail/plugins/filters/spamoptions.php:120
 msgid "All messages"
 msgstr "Alle berichten"
 
 # squirrelmail/plugins/filters/options.php:88
 # squirrelmail/plugins/filters/spamoptions.php:116
-#: squirrelmail/plugins/filters/options.php:91
-#: squirrelmail/plugins/filters/spamoptions.php:127
+#: squirrelmail/plugins/filters/options.php:112
+#: squirrelmail/plugins/filters/spamoptions.php:125
 msgid "Only unread messages"
 msgstr "Alleen ongelezen berichten"
 
 # squirrelmail/plugins/filters/options.php:91
 # squirrelmail/plugins/filters/spamoptions.php:149
-#: squirrelmail/plugins/filters/options.php:94
-#: squirrelmail/plugins/filters/spamoptions.php:168
+#: squirrelmail/plugins/filters/options.php:115
+#: squirrelmail/plugins/filters/spamoptions.php:158
 msgid "Save"
 msgstr "Bewaar"
 
 # squirrelmail/plugins/filters/options.php:110
-#: squirrelmail/plugins/filters/options.php:114
+#: squirrelmail/plugins/filters/options.php:137
 msgid "Match:"
 msgstr "Selecteer op:"
 
 # squirrelmail/plugins/filters/options.php:132
-#: squirrelmail/plugins/filters/options.php:136
+#: squirrelmail/plugins/filters/options.php:159
 msgid "Header"
 msgstr "Berichtkop"
 
 # squirrelmail/plugins/filters/options.php:139
-#: squirrelmail/plugins/filters/options.php:142
+#: squirrelmail/plugins/filters/options.php:166
 msgid "Contains:"
 msgstr "Bevat:"
 
 # squirrelmail/plugins/delete_move_next/setup.php:240
 # squirrelmail/plugins/delete_move_next/setup.php:264
 # squirrelmail/plugins/filters/options.php:151
-#: squirrelmail/plugins/delete_move_next/setup.php:249
-#: squirrelmail/plugins/delete_move_next/setup.php:273
-#: squirrelmail/plugins/filters/options.php:152
+#: squirrelmail/plugins/delete_move_next/setup.php:254
+#: squirrelmail/plugins/delete_move_next/setup.php:278
+#: squirrelmail/plugins/filters/options.php:178
 msgid "Move to:"
 msgstr "Verplaats:"
 
 # squirrelmail/plugins/filters/options.php:193
-#: squirrelmail/plugins/filters/options.php:200
+#: squirrelmail/plugins/filters/options.php:220
 msgid "Down"
 msgstr "Omlaag"
 
+# squirrelmail/plugins/filters/options.php:199
+#: squirrelmail/plugins/filters/options.php:226
+msgid "Up"
+msgstr "Omhoog"
+
 # squirrelmail/plugins/filters/options.php:202
-#: squirrelmail/plugins/filters/options.php:211
+#: squirrelmail/plugins/filters/options.php:229
 #, c-format
 msgid "If <b>%s</b> contains <b>%s</b> then move to <b>%s</b>"
 msgstr "Als <b>%s</b> bevat <b>%s</b> verplaats dan naar <b>%s</b>"
 
 # squirrelmail/plugins/filters/setup.php:128
-#: squirrelmail/plugins/filters/setup.php:128
+#: squirrelmail/plugins/filters/setup.php:137
 msgid "Message Filters"
 msgstr "Berichtfilters"
 
 # squirrelmail/plugins/filters/setup.php:130
-#: squirrelmail/plugins/filters/setup.php:130
+#: squirrelmail/plugins/filters/setup.php:139
 msgid ""
 "Filtering enables messages with different criteria to be automatically "
 "filtered into different folders for easier organization."
@@ -3189,12 +3174,12 @@ msgstr ""
 "worden geplaatst in verschillende mappen."
 
 # squirrelmail/plugins/filters/setup.php:136
-#: squirrelmail/plugins/filters/setup.php:136
+#: squirrelmail/plugins/filters/setup.php:145
 msgid "SPAM Filters"
 msgstr "SPAM filters"
 
 # squirrelmail/plugins/filters/setup.php:138
-#: squirrelmail/plugins/filters/setup.php:138
+#: squirrelmail/plugins/filters/setup.php:147
 msgid ""
 "SPAM filters allow you to select from various DNS based blacklists to detect "
 "junk email in your INBOX and move it to another folder (like Trash)."
@@ -3204,19 +3189,19 @@ msgstr ""
 "verplaatsen naar een andere map (bijv. Verwijderde Items)."
 
 # squirrelmail/plugins/filters/spamoptions.php:57
-#: squirrelmail/plugins/filters/spamoptions.php:59
+#: squirrelmail/plugins/filters/spamoptions.php:66
 msgid "Spam Filtering"
 msgstr "Spam Filtering"
 
 # squirrelmail/plugins/filters/spamoptions.php:62
-#: squirrelmail/plugins/filters/spamoptions.php:66
+#: squirrelmail/plugins/filters/spamoptions.php:71
 msgid "WARNING! Tell your admin to set the SpamFilters_YourHop variable"
 msgstr ""
 "WAARSCHUWING! Vraag uw administrator om de SpamFilters_YourHop variabele te "
 "activeren"
 
 # squirrelmail/plugins/filters/spamoptions.php:84
-#: squirrelmail/plugins/filters/spamoptions.php:90
+#: squirrelmail/plugins/filters/spamoptions.php:93
 msgid "Move spam to:"
 msgstr "Verplaats spam naar:"
 
@@ -3236,7 +3221,7 @@ msgstr ""
 "blijft."
 
 # squirrelmail/plugins/filters/spamoptions.php:122
-#: squirrelmail/plugins/filters/spamoptions.php:134
+#: squirrelmail/plugins/filters/spamoptions.php:131
 msgid ""
 "The more messages you scan, the longer it takes.  I would suggest that you "
 "scan only new messages.  If you make a change to your filters, I would set "
@@ -3252,39 +3237,39 @@ msgstr ""
 "leest met de nieuwe spamfilters."
 
 # squirrelmail/plugins/filters/spamoptions.php:160
-#: squirrelmail/plugins/filters/spamoptions.php:181
+#: squirrelmail/plugins/filters/spamoptions.php:169
 #, c-format
 msgid "Spam is sent to <b>%s</b>"
 msgstr "Spam wordt verplaatst naar <b>%s</b>"
 
 # squirrelmail/plugins/filters/spamoptions.php:160
-#: squirrelmail/plugins/filters/spamoptions.php:181
+#: squirrelmail/plugins/filters/spamoptions.php:169
 msgid "[<i>not set yet</i>]"
 msgstr "[<i>not set yet</i>]"
 
 # squirrelmail/plugins/filters/spamoptions.php:162
-#: squirrelmail/plugins/filters/spamoptions.php:183
+#: squirrelmail/plugins/filters/spamoptions.php:171
 #, c-format
 msgid "Spam scan is limited to <b>%s</b>"
 msgstr "Spam scan wordt beperkt tot <b>%s</b>"
 
 # squirrelmail/plugins/filters/spamoptions.php:162
-#: squirrelmail/plugins/filters/spamoptions.php:183
+#: squirrelmail/plugins/filters/spamoptions.php:171
 msgid "New Messages Only"
 msgstr "Alleen ongelezen berichten"
 
 # squirrelmail/plugins/filters/spamoptions.php:162
-#: squirrelmail/plugins/filters/spamoptions.php:183
+#: squirrelmail/plugins/filters/spamoptions.php:171
 msgid "All Messages"
 msgstr "Alle berichten"
 
 # squirrelmail/plugins/filters/spamoptions.php:172
-#: squirrelmail/plugins/filters/spamoptions.php:194
+#: squirrelmail/plugins/filters/spamoptions.php:181
 msgid "ON"
 msgstr "AAN"
 
 # squirrelmail/plugins/filters/spamoptions.php:174
-#: squirrelmail/plugins/filters/spamoptions.php:196
+#: squirrelmail/plugins/filters/spamoptions.php:183
 msgid "OFF"
 msgstr "UIT"
 
@@ -3309,17 +3294,17 @@ msgid "Check Spelling"
 msgstr "Controleer spelling"
 
 # squirrelmail/plugins/squirrelspell/sqspell_functions.php:54
-#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:58
+#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:67
 msgid "Back to &quot;SpellChecker Options&quot; page"
 msgstr "Terug naar &quot;Spellingscontrole Opties&quot; pagina"
 
 # squirrelmail/plugins/squirrelspell/sqspell_functions.php:356
-#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:361
+#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:373
 msgid "ATTENTION:"
 msgstr "LET OP:"
 
 # squirrelmail/plugins/squirrelspell/sqspell_functions.php:357
-#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:362
+#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:374
 msgid ""
 "SquirrelSpell was unable to decrypt your personal dictionary. This is most "
 "likely due to the fact that you have changed your mailbox password. In order "
@@ -3340,208 +3325,208 @@ msgstr ""
 "wachtwoord is uw data niet toegankelijk."
 
 # squirrelmail/plugins/squirrelspell/sqspell_functions.php:363
-#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:369
+#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:380
 msgid "Delete my dictionary and start a new one"
 msgstr "Verwijder mijn woordenboek en start een nieuwe"
 
 # squirrelmail/plugins/squirrelspell/sqspell_functions.php:364
-#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:370
+#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:381
 msgid "Decrypt my dictionary with my old password:"
 msgstr "Ontcijfer mijn woordenboek met mijn oude wachtwoord:"
 
 # squirrelmail/plugins/squirrelspell/sqspell_functions.php:368
-#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:376
+#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:385
 msgid "Proceed"
 msgstr "Doorgaan"
 
 # squirrelmail/plugins/squirrelspell/sqspell_functions.php:374
-#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:383
+#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:391
 msgid "You must make a choice"
 msgstr "U moet een keuze maken"
 
 # squirrelmail/plugins/squirrelspell/sqspell_functions.php:375
-#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:384
+#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:392
 msgid ""
 "You can either delete your dictionary or type in the old password. Not both."
 msgstr ""
 "U kunt uw woordenboek verwijderen of het oude wachtwoord intypen, niet beide."
 
 # squirrelmail/plugins/squirrelspell/sqspell_functions.php:376
-#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:385
+#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:393
 msgid "This will delete your personal dictionary file. Proceed?"
 msgstr "Dit zal de file met uw persoonlijk woordenboek verwijderen. Doorgaan?"
 
 # squirrelmail/plugins/squirrelspell/sqspell_functions.php:385
 # squirrelmail/plugins/squirrelspell/sqspell_functions.php:388
-#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:394
-#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:397
+#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:402
+#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:405
 msgid "Error Decrypting Dictionary"
 msgstr "Fout ontcijferen woordenboek"
 
 # squirrelmail/plugins/squirrelspell/sqspell_functions.php:506
-#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:515
+#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:525
 msgid "Cute."
 msgstr "Cute."
 
 # squirrelmail/plugins/squirrelspell/modules/check_me.mod:115
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:115
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:117
 #, c-format
 msgid "I tried to execute '%s', but it returned:"
 msgstr "Er is geprobeerd om '%s' te starten, maar het gaf de melding:"
 
 # squirrelmail/plugins/squirrelspell/modules/check_me.mod:121
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:121
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:123
 msgid "SquirrelSpell is misconfigured."
 msgstr "SquirrelSpell is onjuist geconfigureerd."
 
 # squirrelmail/plugins/squirrelspell/modules/check_me.mod:211
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:211
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:213
 msgid "SquirrelSpell Results"
 msgstr "SquirrelSpell resultaten"
 
 # squirrelmail/plugins/squirrelspell/modules/check_me.mod:271
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:271
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:273
 msgid "Spellcheck completed. Commit changes?"
 msgstr "Spellingscontrole voltooid. Wijzigingen toevoegen?"
 
 # squirrelmail/plugins/squirrelspell/modules/check_me.mod:273
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:273
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:275
 msgid "No changes were made."
 msgstr "Er zijn geen veranderingen gemaakt."
 
 # squirrelmail/plugins/squirrelspell/modules/check_me.mod:275
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:275
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:277
 msgid "Now saving your personal dictionary... Please wait."
 msgstr "Opslaan van  uw persoonlijk woordenboek ... even geduld a.u.b."
 
 # squirrelmail/plugins/squirrelspell/modules/check_me.mod:296
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:296
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:298
 #, c-format
 msgid "Found %s errors"
 msgstr "%s fouten gevonden"
 
 # squirrelmail/plugins/squirrelspell/modules/check_me.mod:317
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:317
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:319
 msgid "Line with an error:"
 msgstr "Regel met fout:"
 
 # squirrelmail/plugins/squirrelspell/modules/check_me.mod:327
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:327
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:329
 msgid "Error:"
 msgstr "Fout:"
 
 # squirrelmail/plugins/squirrelspell/modules/check_me.mod:336
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:336
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:338
 msgid "Suggestions:"
 msgstr "Suggesties:"
 
 # squirrelmail/plugins/squirrelspell/modules/check_me.mod:343
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:343
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:345
 msgid "Suggestions"
 msgstr "Suggesties"
 
 # squirrelmail/plugins/squirrelspell/modules/check_me.mod:351
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:351
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:353
 msgid "Change to:"
 msgstr "Verander in:"
 
 # squirrelmail/plugins/squirrelspell/modules/check_me.mod:360
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:360
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:362
 msgid "Occurs times:"
 msgstr "Komt voor:"
 
 # squirrelmail/plugins/squirrelspell/modules/check_me.mod:377
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:377
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:379
 msgid "Change this word"
 msgstr "Verander dit woord"
 
 # squirrelmail/plugins/squirrelspell/modules/check_me.mod:378
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:378
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:380
 msgid "Change"
 msgstr "Verander"
 
 # squirrelmail/plugins/squirrelspell/modules/check_me.mod:380
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:380
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:382
 msgid "Change ALL occurances of this word"
 msgstr "Verander ALLE plaatsen waar dit woord voorkomt"
 
 # squirrelmail/plugins/squirrelspell/modules/check_me.mod:381
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:381
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:383
 msgid "Change All"
 msgstr "Verander alles"
 
 # squirrelmail/plugins/squirrelspell/modules/check_me.mod:383
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:383
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:385
 msgid "Ignore this word"
 msgstr "Negeer dit woord"
 
 # squirrelmail/plugins/squirrelspell/modules/check_me.mod:384
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:384
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:386
 msgid "Ignore"
 msgstr "Negeer"
 
 # squirrelmail/plugins/squirrelspell/modules/check_me.mod:386
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:386
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:388
 msgid "Ignore ALL occurances this word"
 msgstr "Negeer ALLE plaatsen waar dit woord voorkomt"
 
 # squirrelmail/plugins/squirrelspell/modules/check_me.mod:387
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:387
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:389
 msgid "Ignore All"
 msgstr "Negeer alles"
 
 # squirrelmail/plugins/squirrelspell/modules/check_me.mod:389
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:389
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:391
 msgid "Add this word to your personal dictionary"
 msgstr "Voeg dit woord to aan uw persoonlijk woordenboek"
 
 # squirrelmail/plugins/squirrelspell/modules/check_me.mod:390
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:390
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:392
 msgid "Add to Dic"
 msgstr "Voeg toe aan wb"
 
 # squirrelmail/plugins/squirrelspell/modules/check_me.mod:403
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:403
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:405
 msgid "Close and Commit"
 msgstr "Sluit en voeg toe"
 
 # squirrelmail/plugins/squirrelspell/modules/check_me.mod:405
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:405
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:407
 msgid "The spellcheck is not finished. Really close and commit changes?"
 msgstr ""
 "De spellingscontrole is niet klaar. Echt afsluiten en toevoegen "
 "veranderingen?"
 
 # squirrelmail/plugins/squirrelspell/modules/check_me.mod:408
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:408
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:410
 msgid "Close and Cancel"
 msgstr "Afsluiten en annuleren"
 
 # squirrelmail/plugins/squirrelspell/modules/check_me.mod:410
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:410
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:412
 msgid "The spellcheck is not finished. Really close and discard changes?"
 msgstr ""
 "De spellingscontrole is niet klaar. Echt afsluiten en negeren veranderingen?"
 
 # squirrelmail/plugins/squirrelspell/modules/check_me.mod:429
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:429
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:431
 msgid "No errors found"
 msgstr "Geen fouten gevonden"
 
 # squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod:33
-#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod:33
+#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod:39
 msgid "Your personal dictionary was erased."
 msgstr "Uw persoonlijk woordenboek is verwijderd"
 
 # squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod:34
 # squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod:47
-#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod:34
-#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod:47
+#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod:40
+#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod:53
 msgid "Dictionary Erased"
 msgstr "Woordenboek verwijderd"
 
 # squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod:41
-#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod:41
+#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod:47
 msgid ""
 "Your personal dictionary was erased. Please close this window and click "
 "\"Check Spelling\" button again to start your spellcheck over."
@@ -3551,13 +3536,13 @@ msgstr ""
 
 # squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod:45
 # squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod:77
-#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod:45
-#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod:77
+#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod:51
+#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod:83
 msgid "Close this Window"
 msgstr "Sluit dit venster"
 
 # squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod:70
-#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod:70
+#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod:76
 msgid ""
 "Your personal dictionary was re-encrypted successfully. Now return to the "
 "&quot;SpellChecker options&quot; menu and make your selection again."
@@ -3566,12 +3551,12 @@ msgstr ""
 "&quot;Spellingscontrole opties&quot; menu en selecteer opnieuw."
 
 # squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod:72
-#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod:72
+#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod:78
 msgid "Successful Re-encryption"
 msgstr "Succesvolle beveiliging"
 
 # squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod:75
-#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod:75
+#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod:81
 msgid ""
 "Your personal dictionary was re-encrypted successfully. Please close this "
 "window and click \"Check Spelling\" button again to start your spellcheck "
@@ -3581,12 +3566,12 @@ msgstr ""
 "opnieuw op de \"Controleer spelling\" knop om uw spelling te controleren."
 
 # squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod:79
-#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod:79
+#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod:85
 msgid "Dictionary re-encrypted"
 msgstr "Woordenboek beveiligd"
 
 # squirrelmail/plugins/squirrelspell/modules/crypto.mod:39
-#: squirrelmail/plugins/squirrelspell/modules/crypto.mod:39
+#: squirrelmail/plugins/squirrelspell/modules/crypto.mod:42
 msgid ""
 "Your personal dictionary has been <strong>encrypted</strong> and is now "
 "stored in an <strong>encrypted format</strong>."
@@ -3595,7 +3580,7 @@ msgstr ""
 "opgeslagen in <strong>beveiligd formaat</strong>."
 
 # squirrelmail/plugins/squirrelspell/modules/crypto.mod:54
-#: squirrelmail/plugins/squirrelspell/modules/crypto.mod:54
+#: squirrelmail/plugins/squirrelspell/modules/crypto.mod:57
 msgid ""
 "Your personal dictionary has been <strong>decrypted</strong> and is now "
 "stored as <strong>clear text</strong>."
@@ -3605,7 +3590,7 @@ msgstr ""
 
 # squirrelmail/plugins/squirrelspell/modules/crypto.mod:65
 # squirrelmail/plugins/squirrelspell/modules/enc_setup.mod:76
-#: squirrelmail/plugins/squirrelspell/modules/crypto.mod:65
+#: squirrelmail/plugins/squirrelspell/modules/crypto.mod:68
 #: squirrelmail/plugins/squirrelspell/modules/enc_setup.mod:76
 msgid "Personal Dictionary Crypto Settings"
 msgstr "Persoonlijk woordenboek beveiligingsinstellingen"
@@ -3613,7 +3598,7 @@ msgstr "Persoonlijk woordenboek beveiligingsinstellingen"
 # squirrelmail/plugins/squirrelspell/modules/edit_dic.mod:28
 # squirrelmail/plugins/squirrelspell/modules/forget_me.mod:77
 #: squirrelmail/plugins/squirrelspell/modules/edit_dic.mod:28
-#: squirrelmail/plugins/squirrelspell/modules/forget_me.mod:77
+#: squirrelmail/plugins/squirrelspell/modules/forget_me.mod:81
 msgid "Personal Dictionary"
 msgstr "Persoonlijk woordenboek"
 
@@ -3743,25 +3728,25 @@ msgstr ""
 "Beveilig mijn persoonlijk woordenboek en sla het op in beveiligd formaat."
 
 # squirrelmail/plugins/squirrelspell/modules/forget_me.mod:28
-#: squirrelmail/plugins/squirrelspell/modules/forget_me.mod:28
+#: squirrelmail/plugins/squirrelspell/modules/forget_me.mod:32
 #, c-format
 msgid "Deleting the following entries from <strong>%s</strong> dictionary:"
 msgstr "Verwijder de volgende selecties van <strong>%s</strong> woordenboek:"
 
 # squirrelmail/plugins/squirrelspell/modules/forget_me.mod:71
-#: squirrelmail/plugins/squirrelspell/modules/forget_me.mod:71
+#: squirrelmail/plugins/squirrelspell/modules/forget_me.mod:75
 msgid "All done!"
 msgstr "Klaar!"
 
 # squirrelmail/plugins/squirrelspell/modules/forget_me.mod:72
 # squirrelmail/plugins/squirrelspell/modules/forget_me_not.mod:71
-#: squirrelmail/plugins/squirrelspell/modules/forget_me.mod:72
-#: squirrelmail/plugins/squirrelspell/modules/forget_me_not.mod:71
+#: squirrelmail/plugins/squirrelspell/modules/forget_me.mod:76
+#: squirrelmail/plugins/squirrelspell/modules/forget_me_not.mod:75
 msgid "Personal Dictionary Updated"
 msgstr "Persoonlijk woordenboek bijgewerkt"
 
 # squirrelmail/plugins/squirrelspell/modules/forget_me.mod:78
-#: squirrelmail/plugins/squirrelspell/modules/forget_me.mod:78
+#: squirrelmail/plugins/squirrelspell/modules/forget_me.mod:82
 msgid "No changes requested."
 msgstr "Geen veranderingen gemaakt."
 
@@ -3781,7 +3766,7 @@ msgstr ""
 
 # squirrelmail/plugins/calendar/calendar.php:113
 # squirrelmail/plugins/squirrelspell/modules/init.mod:53
-#: squirrelmail/plugins/calendar/calendar.php:125
+#: squirrelmail/plugins/calendar/calendar.php:132
 #: squirrelmail/plugins/squirrelspell/modules/init.mod:53
 msgid "Go"
 msgstr "Ga"
@@ -3792,7 +3777,7 @@ msgid "SquirrelSpell Initiating"
 msgstr "Opstarten SquirrelSpell"
 
 # squirrelmail/plugins/squirrelspell/modules/lang_change.mod:72
-#: squirrelmail/plugins/squirrelspell/modules/lang_change.mod:72
+#: squirrelmail/plugins/squirrelspell/modules/lang_change.mod:76
 #, c-format
 msgid ""
 "Settings adjusted to: <strong>%s</strong> with <strong>%s</strong> as "
@@ -3802,7 +3787,7 @@ msgstr ""
 "standaard woordenboek."
 
 # squirrelmail/plugins/squirrelspell/modules/lang_change.mod:79
-#: squirrelmail/plugins/squirrelspell/modules/lang_change.mod:79
+#: squirrelmail/plugins/squirrelspell/modules/lang_change.mod:83
 #, c-format
 msgid "Using <strong>%s</strong> dictionary (system default) for spellcheck."
 msgstr ""
@@ -3810,7 +3795,7 @@ msgstr ""
 "spellingscontrole."
 
 # squirrelmail/plugins/squirrelspell/modules/lang_change.mod:90
-#: squirrelmail/plugins/squirrelspell/modules/lang_change.mod:90
+#: squirrelmail/plugins/squirrelspell/modules/lang_change.mod:94
 msgid "International Dictionaries Preferences Updated"
 msgstr "Instellingen voor internationale woordenboeken bijgewerkt"
 
@@ -3871,34 +3856,39 @@ msgid "SquirrelSpell Options Menu"
 msgstr "SquirrelSpell Opties Menu"
 
 # squirrelmail/plugins/translate/options.php:94
-#: squirrelmail/plugins/translate/options.php:93
+#: squirrelmail/plugins/translate/options.php:94
 msgid "Translator"
 msgstr "Vertaler"
 
+# squirrelmail/plugins/translate/setup.php:104
+#: squirrelmail/plugins/translate/options.php:98
+msgid "Saved Translation Options"
+msgstr "Vertaalopties opgeslagen"
+
 # squirrelmail/plugins/translate/options.php:97
-#: squirrelmail/plugins/translate/options.php:96
+#: squirrelmail/plugins/translate/options.php:101
 msgid "Your server options are as follows:"
 msgstr "Uw server opties zijn:"
 
 # squirrelmail/plugins/translate/options.php:102
-#: squirrelmail/plugins/translate/options.php:101
+#: squirrelmail/plugins/translate/options.php:106
 msgid ""
 "13 language pairs, maximum of 1000 characters translated, powered by Systran"
 msgstr "13 talen paren, maximum van 1000 tekens vertaald, powered by Systran "
 
 # squirrelmail/plugins/translate/options.php:105
-#: squirrelmail/plugins/translate/options.php:104
+#: squirrelmail/plugins/translate/options.php:109
 msgid ""
 "10 language pairs, maximum of 25 kilobytes translated, powered by Systran"
 msgstr "10 talen paren, maximum van 25 kilobytes vertaald, powered by Systran "
 
 # squirrelmail/plugins/translate/options.php:108
-#: squirrelmail/plugins/translate/options.php:107
+#: squirrelmail/plugins/translate/options.php:112
 msgid "12 language pairs, no known limits, powered by Systran"
 msgstr "12 talen paren, geen limieten bekend, powered by Systran "
 
 # squirrelmail/plugins/translate/options.php:111
-#: squirrelmail/plugins/translate/options.php:110
+#: squirrelmail/plugins/translate/options.php:115
 msgid ""
 "767 language pairs, no known limits, powered by Translation Experts's "
 "InterTran"
@@ -3907,61 +3897,61 @@ msgstr ""
 "InterTran "
 
 # squirrelmail/plugins/translate/options.php:114
-#: squirrelmail/plugins/translate/options.php:113
+#: squirrelmail/plugins/translate/options.php:118
 msgid ""
 "8 language pairs, no known limits, powered by GPLTrans (free, open source)"
 msgstr ""
 "8 talen paren, geen limieten bekend, powered by GPLTrans (free, open source) "
 
 # squirrelmail/plugins/translate/options.php:120
-#: squirrelmail/plugins/translate/options.php:119
+#: squirrelmail/plugins/translate/options.php:124
 msgid ""
 "You also decide if you want the translation box displayed, and where it will "
 "be located."
 msgstr "Waar en wanneer wilt u het vertaalkader weergegeven hebben?"
 
 # squirrelmail/plugins/translate/options.php:124
-#: squirrelmail/plugins/translate/options.php:123
+#: squirrelmail/plugins/translate/options.php:128
 msgid "Select your translator:"
 msgstr "Selecteer uw vertaler"
 
 # squirrelmail/plugins/translate/options.php:136
-#: squirrelmail/plugins/translate/options.php:135
+#: squirrelmail/plugins/translate/options.php:140
 msgid "When reading:"
 msgstr "Tijdens lezen:"
 
 # squirrelmail/plugins/translate/options.php:141
-#: squirrelmail/plugins/translate/options.php:140
+#: squirrelmail/plugins/translate/options.php:145
 msgid "Show translation box"
 msgstr "Toon vertaalkader"
 
 # squirrelmail/plugins/translate/options.php:143
-#: squirrelmail/plugins/translate/options.php:142
+#: squirrelmail/plugins/translate/options.php:147
 msgid "to the left"
 msgstr "links"
 
 # squirrelmail/plugins/translate/options.php:144
-#: squirrelmail/plugins/translate/options.php:143
+#: squirrelmail/plugins/translate/options.php:148
 msgid "in the center"
 msgstr "in het midden"
 
 # squirrelmail/plugins/translate/options.php:145
-#: squirrelmail/plugins/translate/options.php:144
+#: squirrelmail/plugins/translate/options.php:149
 msgid "to the right"
 msgstr "rechts"
 
 # squirrelmail/plugins/translate/options.php:150
-#: squirrelmail/plugins/translate/options.php:149
+#: squirrelmail/plugins/translate/options.php:154
 msgid "Translate inside the SquirrelMail frames"
 msgstr "Vertaal in de SquirrelMail frames"
 
 # squirrelmail/plugins/translate/options.php:153
-#: squirrelmail/plugins/translate/options.php:152
+#: squirrelmail/plugins/translate/options.php:157
 msgid "When composing:"
 msgstr "Tijdens schrijven:"
 
 # squirrelmail/plugins/translate/options.php:157
-#: squirrelmail/plugins/translate/options.php:156
+#: squirrelmail/plugins/translate/options.php:161
 msgid "Not yet functional, currently does nothing"
 msgstr "Nog niet functioneel, doet momenteel niets"
 
@@ -4425,7 +4415,7 @@ msgid "New Mail Notification"
 msgstr "Geen notificatie nieuw bericht"
 
 # squirrelmail/plugins/newmail/newmail_opt.php:41
-#: squirrelmail/plugins/newmail/newmail_opt.php:43
+#: squirrelmail/plugins/newmail/newmail_opt.php:41
 msgid ""
 "Select <b>Enable Media Playing</b> to turn on playing a media file when "
 "unseen mail is in your folders. When enabled, you can specify the media file "
@@ -4436,7 +4426,7 @@ msgstr ""
 "zal zijn zelf specificeren."
 
 # squirrelmail/plugins/newmail/newmail_opt.php:45
-#: squirrelmail/plugins/newmail/newmail_opt.php:47
+#: squirrelmail/plugins/newmail/newmail_opt.php:45
 msgid ""
 "The <b>Check all boxes, not just INBOX</b> option will check ALL of your "
 "folders for unseen mail, not just the inbox for notification."
@@ -4445,7 +4435,7 @@ msgstr ""
 "nieuwe berichten controleren en niet alleen de INBOX."
 
 # squirrelmail/plugins/newmail/newmail_opt.php:47
-#: squirrelmail/plugins/newmail/newmail_opt.php:50
+#: squirrelmail/plugins/newmail/newmail_opt.php:47
 msgid ""
 "Selecting the <b>Show popup</b> option will enable the showing of a popup "
 "window when unseen mail is in your folders (requires JavaScript)."
@@ -4455,7 +4445,7 @@ msgstr ""
 "verschijnt (Javascript is nodig!)."
 
 # squirrelmail/plugins/newmail/newmail_opt.php:49
-#: squirrelmail/plugins/newmail/newmail_opt.php:53
+#: squirrelmail/plugins/newmail/newmail_opt.php:49
 msgid ""
 "Use the <b>Check RECENT</b> to only check for messages that are recent. "
 "Recent messages are those that have just recently showed up and have not "
@@ -4469,7 +4459,7 @@ msgstr ""
 "nieuw bericht."
 
 # squirrelmail/plugins/newmail/newmail_opt.php:51
-#: squirrelmail/plugins/newmail/newmail_opt.php:56
+#: squirrelmail/plugins/newmail/newmail_opt.php:51
 msgid ""
 "Selecting the <b>Change title</b> option will change the title in some "
 "browsers to let you know when you have new mail (requires JavaScript, and "
@@ -4485,7 +4475,7 @@ msgstr ""
 "geactiveerd."
 
 # squirrelmail/plugins/newmail/newmail_opt.php:55
-#: squirrelmail/plugins/newmail/newmail_opt.php:60
+#: squirrelmail/plugins/newmail/newmail_opt.php:55
 msgid ""
 "Select from the list of <b>server files</b> the media file to play when new "
 "mail arrives.  Selecting <b>local media</b> will play the file specified in "
@@ -4499,59 +4489,59 @@ msgstr ""
 "standaardgeluid gebruiken van de server."
 
 # squirrelmail/plugins/newmail/newmail_opt.php:67
-#: squirrelmail/plugins/newmail/newmail_opt.php:73
+#: squirrelmail/plugins/newmail/newmail_opt.php:67
 msgid "Enable Media Playing"
 msgstr "Activeer afspelen geluid"
 
 # squirrelmail/plugins/newmail/newmail_opt.php:76
-#: squirrelmail/plugins/newmail/newmail_opt.php:83
+#: squirrelmail/plugins/newmail/newmail_opt.php:76
 msgid "Check all boxes, not just INBOX"
 msgstr "Controleer alle mappen, niet alleen INBOX"
 
 # squirrelmail/plugins/newmail/newmail_opt.php:84
-#: squirrelmail/plugins/newmail/newmail_opt.php:92
+#: squirrelmail/plugins/newmail/newmail_opt.php:84
 msgid "Count only messages that are RECENT"
 msgstr "Controleer alleen RECENT"
 
 # squirrelmail/plugins/newmail/newmail_opt.php:92
-#: squirrelmail/plugins/newmail/newmail_opt.php:101
+#: squirrelmail/plugins/newmail/newmail_opt.php:92
 msgid "Change title on supported browsers."
 msgstr "Verander titelaanduiding"
 
 # squirrelmail/plugins/newmail/newmail_opt.php:92
 # squirrelmail/plugins/newmail/newmail_opt.php:100
-#: squirrelmail/plugins/newmail/newmail_opt.php:101
-#: squirrelmail/plugins/newmail/newmail_opt.php:110
+#: squirrelmail/plugins/newmail/newmail_opt.php:92
+#: squirrelmail/plugins/newmail/newmail_opt.php:100
 msgid "requires JavaScript to work"
 msgstr "Javascript is nodig"
 
 # squirrelmail/plugins/newmail/newmail_opt.php:100
-#: squirrelmail/plugins/newmail/newmail_opt.php:110
+#: squirrelmail/plugins/newmail/newmail_opt.php:100
 msgid "Show popup window on new mail"
 msgstr "Toon popupvenster bij nieuw bericht"
 
 # squirrelmail/plugins/newmail/newmail_opt.php:104
-#: squirrelmail/plugins/newmail/newmail_opt.php:114
+#: squirrelmail/plugins/newmail/newmail_opt.php:104
 msgid "Select server file:"
 msgstr "Selecteer bestand van server:"
 
 # squirrelmail/plugins/newmail/newmail_opt.php:106
-#: squirrelmail/plugins/newmail/newmail_opt.php:117
+#: squirrelmail/plugins/newmail/newmail_opt.php:106
 msgid "(local media)"
 msgstr "(lokaal geluid)"
 
 # squirrelmail/plugins/newmail/newmail_opt.php:123
-#: squirrelmail/plugins/newmail/newmail_opt.php:134
+#: squirrelmail/plugins/newmail/newmail_opt.php:123
 msgid "Try"
 msgstr "Test"
 
 # squirrelmail/plugins/newmail/newmail_opt.php:131
-#: squirrelmail/plugins/newmail/newmail_opt.php:142
+#: squirrelmail/plugins/newmail/newmail_opt.php:131
 msgid "Local Media File:"
 msgstr "Lokaal geluidsbestand:"
 
 # squirrelmail/plugins/newmail/newmail_opt.php:137
-#: squirrelmail/plugins/newmail/newmail_opt.php:146
+#: squirrelmail/plugins/newmail/newmail_opt.php:137
 msgid "Current File:"
 msgstr "Huidig bestand:"
 
@@ -4561,7 +4551,7 @@ msgid "New Mail"
 msgstr "Nieuw bericht"
 
 # squirrelmail/plugins/newmail/newmail.php:27
-#: squirrelmail/plugins/newmail/newmail.php:26
+#: squirrelmail/plugins/newmail/newmail.php:27
 msgid "SquirrelMail Notice:"
 msgstr "SquirrelMail notificatie"
 
@@ -4570,18 +4560,13 @@ msgstr "SquirrelMail notificatie"
 msgid "You have new mail!"
 msgstr "U heeft een nieuw bericht!"
 
-# squirrelmail/src/printer_friendly_top.php:37
-#: squirrelmail/plugins/newmail/newmail.php:33
-msgid "Close Window"
-msgstr "Sluit venster"
-
 # squirrelmail/plugins/newmail/setup.php:78
-#: squirrelmail/plugins/newmail/setup.php:79
+#: squirrelmail/plugins/newmail/setup.php:78
 msgid "NewMail Options"
 msgstr "Nieuw bericht opties"
 
 # squirrelmail/plugins/newmail/setup.php:80
-#: squirrelmail/plugins/newmail/setup.php:81
+#: squirrelmail/plugins/newmail/setup.php:80
 msgid ""
 "This configures settings for playing sounds and/or showing popup windows "
 "when new mail arrives."
@@ -4590,29 +4575,29 @@ msgstr ""
 "wanneer u een nieuw bericht ontvangt."
 
 # squirrelmail/plugins/newmail/setup.php:129
-#: squirrelmail/plugins/newmail/setup.php:130
+#: squirrelmail/plugins/newmail/setup.php:126
 msgid "New Mail Notification options saved"
 msgstr "Nieuw bericht opties opgeslagen"
 
 # squirrelmail/plugins/newmail/setup.php:202
-#: squirrelmail/plugins/newmail/setup.php:211
+#: squirrelmail/plugins/newmail/setup.php:198
 #, c-format
 msgid "%s New Messages"
 msgstr "%s Nieuwe berichten"
 
 # squirrelmail/plugins/newmail/setup.php:206
-#: squirrelmail/plugins/newmail/setup.php:215
+#: squirrelmail/plugins/newmail/setup.php:202
 #, c-format
 msgid "%s New Message"
 msgstr "%s Nieuwe berichten"
 
 # squirrelmail/plugins/newmail/testsound.php:24
-#: squirrelmail/plugins/newmail/testsound.php:25
+#: squirrelmail/plugins/newmail/testsound.php:26
 msgid "Test Sound"
 msgstr "Test geluid"
 
 # squirrelmail/plugins/newmail/testsound.php:30
-#: squirrelmail/plugins/newmail/testsound.php:33
+#: squirrelmail/plugins/newmail/testsound.php:32
 msgid "Loading the sound..."
 msgstr "Geluid wordt geladen ..."
 
@@ -4878,174 +4863,150 @@ msgid "Command failed "
 msgstr "Commando mislukt"
 
 # squirrelmail/plugins/mail_fetch/fetch.php:54
-#: squirrelmail/plugins/mail_fetch/fetch.php:58
+#: squirrelmail/plugins/mail_fetch/fetch.php:68
 msgid "Remote POP server Fetching Mail"
 msgstr "Ophalen mail van externe POP-servers"
 
 # squirrelmail/plugins/mail_fetch/fetch.php:63
-#: squirrelmail/plugins/mail_fetch/fetch.php:68
+#: squirrelmail/plugins/mail_fetch/fetch.php:77
 msgid "Select Server:"
 msgstr "Selecteer server:"
 
 # squirrelmail/plugins/mail_fetch/fetch.php:78
-#: squirrelmail/plugins/mail_fetch/fetch.php:85
+#: squirrelmail/plugins/mail_fetch/fetch.php:92
 msgid "Password for"
 msgstr "Wachtwoord voor"
 
 # squirrelmail/plugins/mail_fetch/fetch.php:85
-#: squirrelmail/plugins/mail_fetch/fetch.php:95
+#: squirrelmail/plugins/mail_fetch/fetch.php:99
 msgid "Fetch Mail"
 msgstr "Ophalen berichten"
 
 # squirrelmail/plugins/mail_fetch/fetch.php:117
-#: squirrelmail/plugins/mail_fetch/fetch.php:130
+#: squirrelmail/plugins/mail_fetch/fetch.php:131
 msgid "Fetching from "
 msgstr "Ophalen van "
 
 # squirrelmail/plugins/mail_fetch/fetch.php:124
 # squirrelmail/plugins/mail_fetch/fetch.php:184
-#: squirrelmail/plugins/mail_fetch/fetch.php:140
-#: squirrelmail/plugins/mail_fetch/fetch.php:200
-#: squirrelmail/plugins/mail_fetch/fetch.php:206
+#: squirrelmail/plugins/mail_fetch/fetch.php:138
+#: squirrelmail/plugins/mail_fetch/fetch.php:198
 msgid "Oops, "
 msgstr "Oops, "
 
 # squirrelmail/plugins/mail_fetch/fetch.php:128
-#: squirrelmail/plugins/mail_fetch/fetch.php:144
+#: squirrelmail/plugins/mail_fetch/fetch.php:142
 msgid "Opening IMAP server"
 msgstr "Openen IMAP-server"
 
 # squirrelmail/plugins/mail_fetch/fetch.php:131
-#: squirrelmail/plugins/mail_fetch/fetch.php:147
+#: squirrelmail/plugins/mail_fetch/fetch.php:145
 msgid "Opening POP server"
 msgstr "Openen POP-server"
 
 # squirrelmail/plugins/mail_fetch/fetch.php:134
 # squirrelmail/plugins/mail_fetch/setup.php:123
-#: squirrelmail/plugins/mail_fetch/fetch.php:150
-#: squirrelmail/plugins/mail_fetch/fetch.php:214
-#: squirrelmail/plugins/mail_fetch/setup.php:123
+#: squirrelmail/plugins/mail_fetch/fetch.php:148
+#: squirrelmail/plugins/mail_fetch/setup.php:135
 msgid "Login Failed:"
 msgstr "Aanmelden mislukt:"
 
 # squirrelmail/plugins/mail_fetch/fetch.php:151
-#: squirrelmail/plugins/mail_fetch/fetch.php:167
+#: squirrelmail/plugins/mail_fetch/fetch.php:165
 msgid "Login OK: No new messages"
 msgstr "Aanmelden OK: Geen nieuwe berichten"
 
 # squirrelmail/plugins/mail_fetch/fetch.php:156
-#: squirrelmail/plugins/mail_fetch/fetch.php:172
+#: squirrelmail/plugins/mail_fetch/fetch.php:170
 msgid "Login OK: Inbox EMPTY"
 msgstr "Aanmelden OK: Inbox LEEG"
 
 # squirrelmail/plugins/mail_fetch/fetch.php:161
-#: squirrelmail/plugins/mail_fetch/fetch.php:177
+#: squirrelmail/plugins/mail_fetch/fetch.php:175
 msgid "Login OK: Inbox contains ["
 msgstr "Aanmelden OK: Inbox bevat ["
 
 # squirrelmail/plugins/mail_fetch/fetch.php:161
-#: squirrelmail/plugins/mail_fetch/fetch.php:177
+#: squirrelmail/plugins/mail_fetch/fetch.php:175
 msgid "] messages"
 msgstr "] berichten"
 
 # squirrelmail/plugins/mail_fetch/fetch.php:164
-#: squirrelmail/plugins/mail_fetch/fetch.php:180
+#: squirrelmail/plugins/mail_fetch/fetch.php:178
 msgid "Fetching UIDL..."
 msgstr "Ophalen UIDL ..."
 
 # squirrelmail/plugins/mail_fetch/fetch.php:169
 # squirrelmail/plugins/mail_fetch/setup.php:154
-#: squirrelmail/plugins/mail_fetch/fetch.php:185
-#: squirrelmail/plugins/mail_fetch/setup.php:154
+#: squirrelmail/plugins/mail_fetch/fetch.php:183
+#: squirrelmail/plugins/mail_fetch/setup.php:166
 msgid "Server does not support UIDL."
 msgstr "Server ondersteunt geen UIDL."
 
 # squirrelmail/plugins/mail_fetch/fetch.php:172
-#: squirrelmail/plugins/mail_fetch/fetch.php:188
+#: squirrelmail/plugins/mail_fetch/fetch.php:186
 msgid "Leaving Mail on Server..."
 msgstr "Bewaren mail op server ..."
 
 # squirrelmail/plugins/mail_fetch/fetch.php:174
-#: squirrelmail/plugins/mail_fetch/fetch.php:190
+#: squirrelmail/plugins/mail_fetch/fetch.php:188
 msgid "Deleting messages from server..."
 msgstr "Verwijderen berichten van server ..."
 
 # squirrelmail/plugins/mail_fetch/fetch.php:178
-#: squirrelmail/plugins/mail_fetch/fetch.php:194
+#: squirrelmail/plugins/mail_fetch/fetch.php:192
 msgid "Fetching message "
 msgstr "Ophalen bericht "
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:202
-msgid "Server error...Disconnect"
-msgstr "Server fout ... connectie verbroken"
+# squirrelmail/plugins/mail_fetch/fetch.php:201
+#: squirrelmail/plugins/mail_fetch/fetch.php:215
+msgid "Message appended to mailbox"
+msgstr "Bericht toegevoegd aan mailbox"
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:204
-msgid "Re-connect from dead connectoin"
-msgstr "Herstel verbroken connectie"
+# squirrelmail/plugins/mail_fetch/fetch.php:205
+#: squirrelmail/plugins/mail_fetch/fetch.php:219
+msgid "Message "
+msgstr "Bericht "
 
-# squirrelmail/plugins/mail_fetch/fetch.php:221
-#: squirrelmail/plugins/mail_fetch/fetch.php:207
-#: squirrelmail/plugins/mail_fetch/fetch.php:215
-#: squirrelmail/plugins/mail_fetch/fetch.php:245
-#: squirrelmail/plugins/mail_fetch/fetch.php:268
-#: squirrelmail/plugins/mail_fetch/fetch.php:279
-msgid "Saving UIDL"
-msgstr "UIDL opslaan"
+# squirrelmail/plugins/mail_fetch/fetch.php:205
+#: squirrelmail/plugins/mail_fetch/fetch.php:219
+msgid " deleted from Remote Server!"
+msgstr " verwijderd van externe server!"
 
-# squirrelmail/plugins/mail_fetch/fetch.php:178
-#: squirrelmail/plugins/mail_fetch/fetch.php:220
-msgid "Re-fetching message "
-msgstr "Opnieuw ophalen bericht "
+# squirrelmail/plugins/mail_fetch/fetch.php:207
+#: squirrelmail/plugins/mail_fetch/fetch.php:221
+msgid "Delete failed:"
+msgstr "Verwijderen mislukt:"
 
 # squirrelmail/plugins/mail_fetch/fetch.php:212
 # squirrelmail/plugins/mail_fetch/setup.php:185
-#: squirrelmail/plugins/mail_fetch/fetch.php:239
-#: squirrelmail/plugins/mail_fetch/fetch.php:261
-#: squirrelmail/plugins/mail_fetch/setup.php:185
+#: squirrelmail/plugins/mail_fetch/fetch.php:226
+#: squirrelmail/plugins/mail_fetch/setup.php:197
 msgid "Error Appending Message!"
 msgstr "Fout bij het toevoegen van het bericht! "
 
 # squirrelmail/plugins/mail_fetch/fetch.php:216
-#: squirrelmail/plugins/mail_fetch/fetch.php:240
-#: squirrelmail/plugins/mail_fetch/fetch.php:262
-#: squirrelmail/plugins/mail_fetch/fetch.php:274
+#: squirrelmail/plugins/mail_fetch/fetch.php:230
 msgid "Closing POP"
 msgstr "Sluiten POP"
 
 # squirrelmail/plugins/mail_fetch/fetch.php:218
-#: squirrelmail/plugins/mail_fetch/fetch.php:242
-#: squirrelmail/plugins/mail_fetch/fetch.php:264
-#: squirrelmail/plugins/mail_fetch/fetch.php:276
+#: squirrelmail/plugins/mail_fetch/fetch.php:232
 msgid "Logging out from IMAP"
 msgstr "Aanmelden van IMAP"
 
-# squirrelmail/plugins/mail_fetch/fetch.php:201
-#: squirrelmail/plugins/mail_fetch/fetch.php:249
-msgid "Message appended to mailbox"
-msgstr "Bericht toegevoegd aan mailbox"
-
-# squirrelmail/plugins/mail_fetch/fetch.php:205
-#: squirrelmail/plugins/mail_fetch/fetch.php:254
-msgid "Message "
-msgstr "Bericht "
-
-# squirrelmail/plugins/mail_fetch/fetch.php:205
-#: squirrelmail/plugins/mail_fetch/fetch.php:254
-msgid " deleted from Remote Server!"
-msgstr " verwijderd van externe server!"
-
-# squirrelmail/plugins/mail_fetch/fetch.php:207
-#: squirrelmail/plugins/mail_fetch/fetch.php:256
-msgid "Delete failed:"
-msgstr "Verwijderen mislukt:"
+# squirrelmail/plugins/mail_fetch/fetch.php:221
+#: squirrelmail/plugins/mail_fetch/fetch.php:235
+msgid "Saving UIDL"
+msgstr "UIDL opslaan"
 
 # squirrelmail/plugins/mail_fetch/options.php:105
-#: squirrelmail/plugins/mail_fetch/options.php:108
+#: squirrelmail/plugins/mail_fetch/options.php:149
 msgid "Remote POP server settings"
 msgstr "Externe POP-server instellingen"
 
 # squirrelmail/plugins/mail_fetch/options.php:107
-#: squirrelmail/plugins/mail_fetch/options.php:115
+#: squirrelmail/plugins/mail_fetch/options.php:151
 msgid ""
 "You should be aware that the encryption used to store your password is not "
 "perfectly secure.  However, if you are using pop, there is inherently no "
@@ -5059,165 +5020,165 @@ msgstr ""
 "door een hacker door de bron van dit bestand te lezen."
 
 # squirrelmail/plugins/mail_fetch/options.php:109
-#: squirrelmail/plugins/mail_fetch/options.php:120
+#: squirrelmail/plugins/mail_fetch/options.php:153
 msgid "If you leave password empty, it will be required when you fetch mail."
 msgstr ""
 "Als u uw wachtwoord leeg laat, zal het worden gevraagd wanneer u uw mail "
 "ophaalt."
 
 # squirrelmail/plugins/mail_fetch/options.php:113
-#: squirrelmail/plugins/mail_fetch/options.php:127
+#: squirrelmail/plugins/mail_fetch/options.php:157
 msgid "Encrypt passwords (informative only)"
 msgstr "Beveilig wachtwoorden (alleen informatief)"
 
 # squirrelmail/plugins/mail_fetch/options.php:119
 # squirrelmail/plugins/mail_fetch/options.php:146
-#: squirrelmail/plugins/mail_fetch/options.php:136
-#: squirrelmail/plugins/mail_fetch/options.php:192
+#: squirrelmail/plugins/mail_fetch/options.php:163
+#: squirrelmail/plugins/mail_fetch/options.php:190
 msgid "Add Server"
 msgstr "Voeg server toe"
 
 # squirrelmail/plugins/mail_fetch/options.php:123
 # squirrelmail/plugins/mail_fetch/options.php:196
-#: squirrelmail/plugins/mail_fetch/options.php:145
-#: squirrelmail/plugins/mail_fetch/options.php:262
+#: squirrelmail/plugins/mail_fetch/options.php:167
+#: squirrelmail/plugins/mail_fetch/options.php:240
 msgid "Server:"
 msgstr "Server:"
 
 # squirrelmail/plugins/mail_fetch/options.php:124
 # squirrelmail/plugins/mail_fetch/options.php:198
-#: squirrelmail/plugins/mail_fetch/options.php:149
-#: squirrelmail/plugins/mail_fetch/options.php:266
+#: squirrelmail/plugins/mail_fetch/options.php:168
+#: squirrelmail/plugins/mail_fetch/options.php:242
 msgid "Alias:"
 msgstr "Alias:"
 
 # squirrelmail/plugins/mail_fetch/options.php:125
 # squirrelmail/plugins/mail_fetch/options.php:200
-#: squirrelmail/plugins/mail_fetch/options.php:153
-#: squirrelmail/plugins/mail_fetch/options.php:270
+#: squirrelmail/plugins/mail_fetch/options.php:169
+#: squirrelmail/plugins/mail_fetch/options.php:244
 msgid "Username:"
 msgstr "Gebruikersnaam:"
 
 # squirrelmail/plugins/mail_fetch/options.php:127
 # squirrelmail/plugins/mail_fetch/options.php:204
-#: squirrelmail/plugins/mail_fetch/options.php:161
-#: squirrelmail/plugins/mail_fetch/options.php:278
+#: squirrelmail/plugins/mail_fetch/options.php:171
+#: squirrelmail/plugins/mail_fetch/options.php:248
 msgid "Store in Folder:"
 msgstr "Sla op in folder:"
 
 # squirrelmail/plugins/mail_fetch/options.php:143
 # squirrelmail/plugins/mail_fetch/options.php:224
-#: squirrelmail/plugins/mail_fetch/options.php:180
-#: squirrelmail/plugins/mail_fetch/options.php:303
+#: squirrelmail/plugins/mail_fetch/options.php:187
+#: squirrelmail/plugins/mail_fetch/options.php:268
 msgid "Leave Mail on Server"
 msgstr "Bewaar mail op server"
 
 # squirrelmail/plugins/mail_fetch/options.php:144
 # squirrelmail/plugins/mail_fetch/options.php:226
-#: squirrelmail/plugins/mail_fetch/options.php:184
-#: squirrelmail/plugins/mail_fetch/options.php:310
+#: squirrelmail/plugins/mail_fetch/options.php:188
+#: squirrelmail/plugins/mail_fetch/options.php:270
 msgid "Check mail during login"
 msgstr "Check mail tijdens aanmelden"
 
 # squirrelmail/plugins/mail_fetch/options.php:145
 # squirrelmail/plugins/mail_fetch/options.php:228
-#: squirrelmail/plugins/mail_fetch/options.php:188
-#: squirrelmail/plugins/mail_fetch/options.php:317
+#: squirrelmail/plugins/mail_fetch/options.php:189
+#: squirrelmail/plugins/mail_fetch/options.php:272
 msgid "Check mail during folder refresh"
 msgstr "Check mail tijdens vernieuwing mappen"
 
 # squirrelmail/plugins/mail_fetch/options.php:152
 # squirrelmail/plugins/mail_fetch/options.php:229
-#: squirrelmail/plugins/mail_fetch/options.php:201
-#: squirrelmail/plugins/mail_fetch/options.php:322
+#: squirrelmail/plugins/mail_fetch/options.php:196
+#: squirrelmail/plugins/mail_fetch/options.php:273
 msgid "Modify Server"
 msgstr "Bewerk server"
 
 # squirrelmail/plugins/mail_fetch/options.php:156
-#: squirrelmail/plugins/mail_fetch/options.php:207
+#: squirrelmail/plugins/mail_fetch/options.php:200
 msgid "Server Name:"
 msgstr "Servernaam: "
 
 # squirrelmail/plugins/mail_fetch/options.php:162
 # squirrelmail/plugins/mail_fetch/options.php:185
-#: squirrelmail/plugins/mail_fetch/options.php:213
-#: squirrelmail/plugins/mail_fetch/options.php:244
+#: squirrelmail/plugins/mail_fetch/options.php:206
+#: squirrelmail/plugins/mail_fetch/options.php:229
 msgid "Modify"
 msgstr "Bewerk"
 
 # squirrelmail/plugins/mail_fetch/options.php:166
-#: squirrelmail/plugins/mail_fetch/options.php:217
+#: squirrelmail/plugins/mail_fetch/options.php:210
 msgid "No-one server in use. Try to add."
 msgstr "Geen server in gebruik. Voeg er een toe."
 
 # squirrelmail/plugins/mail_fetch/options.php:172
 # squirrelmail/plugins/mail_fetch/options.php:187
 # squirrelmail/plugins/mail_fetch/options.php:234
-#: squirrelmail/plugins/mail_fetch/options.php:224
-#: squirrelmail/plugins/mail_fetch/options.php:247
-#: squirrelmail/plugins/mail_fetch/options.php:332
+#: squirrelmail/plugins/mail_fetch/options.php:216
+#: squirrelmail/plugins/mail_fetch/options.php:231
+#: squirrelmail/plugins/mail_fetch/options.php:278
 msgid "Fetching Servers"
 msgstr "Ophalen servers"
 
 # squirrelmail/plugins/mail_fetch/options.php:176
-#: squirrelmail/plugins/mail_fetch/options.php:230
+#: squirrelmail/plugins/mail_fetch/options.php:220
 msgid "Confirm Deletion of a Server"
 msgstr "Bevestig verwijdering van een server"
 
 # squirrelmail/plugins/mail_fetch/options.php:180
-#: squirrelmail/plugins/mail_fetch/options.php:236
+#: squirrelmail/plugins/mail_fetch/options.php:224
 msgid "Selected Server:"
 msgstr "Selecteerde server:"
 
 # squirrelmail/plugins/mail_fetch/options.php:181
-#: squirrelmail/plugins/mail_fetch/options.php:237
+#: squirrelmail/plugins/mail_fetch/options.php:225
 msgid "Confirm delete of selected server?"
 msgstr "Bevestig de verwijdering van de geselecteerde server"
 
 # squirrelmail/plugins/mail_fetch/options.php:182
-#: squirrelmail/plugins/mail_fetch/options.php:238
+#: squirrelmail/plugins/mail_fetch/options.php:226
 msgid "Confirm Delete"
 msgstr "Bevestig verwijdering"
 
 # squirrelmail/plugins/mail_fetch/options.php:191
-#: squirrelmail/plugins/mail_fetch/options.php:253
+#: squirrelmail/plugins/mail_fetch/options.php:235
 msgid "Mofify a Server"
 msgstr "Bewerk een server"
 
 # squirrelmail/plugins/mail_fetch/options.php:237
-#: squirrelmail/plugins/mail_fetch/options.php:338
+#: squirrelmail/plugins/mail_fetch/options.php:281
 msgid "Undefined Function"
 msgstr "Niet gedefinieerde functie"
 
 # squirrelmail/plugins/mail_fetch/options.php:239
-#: squirrelmail/plugins/mail_fetch/options.php:339
+#: squirrelmail/plugins/mail_fetch/options.php:283
 msgid "Hey! Wath do You are looking for?"
 msgstr "Hey! Wat zoekt u?"
 
 # squirrelmail/plugins/mail_fetch/setup.php:30
-#: squirrelmail/plugins/mail_fetch/setup.php:30
+#: squirrelmail/plugins/mail_fetch/setup.php:29
 msgid "Fetch"
 msgstr "Ophalen"
 
 # squirrelmail/plugins/mail_fetch/setup.php:115
 # squirrelmail/plugins/mail_fetch/setup.php:162
-#: squirrelmail/plugins/mail_fetch/setup.php:115
-#: squirrelmail/plugins/mail_fetch/setup.php:162
+#: squirrelmail/plugins/mail_fetch/setup.php:127
+#: squirrelmail/plugins/mail_fetch/setup.php:174
 msgid "Warning, "
 msgstr "Waarschuwing, "
 
 # squirrelmail/plugins/mail_fetch/setup.php:198
-#: squirrelmail/plugins/mail_fetch/setup.php:198
+#: squirrelmail/plugins/mail_fetch/setup.php:210
 msgid "Mail Fetch Result:"
 msgstr "Resultaten:"
 
 # squirrelmail/plugins/mail_fetch/setup.php:223
-#: squirrelmail/plugins/mail_fetch/setup.php:223
+#: squirrelmail/plugins/mail_fetch/setup.php:238
 msgid "Simple POP3 Fetch Mail"
 msgstr "POP3-toegang externe e-mailaccounts"
 
 # squirrelmail/plugins/mail_fetch/setup.php:225
-#: squirrelmail/plugins/mail_fetch/setup.php:225
+#: squirrelmail/plugins/mail_fetch/setup.php:240
 msgid ""
 "This configures settings for downloading email from a pop3 mailbox to your "
 "account on this server."
@@ -5226,82 +5187,81 @@ msgstr ""
 "uw account op deze server."
 
 # squirrelmail/plugins/bug_report/setup.php:65
-#: squirrelmail/plugins/bug_report/setup.php:65
+#: squirrelmail/plugins/bug_report/setup.php:64
 msgid "Bug Reports:"
 msgstr "Fout rapportage:"
 
 # squirrelmail/plugins/bug_report/setup.php:70
-#: squirrelmail/plugins/bug_report/setup.php:70
+#: squirrelmail/plugins/bug_report/setup.php:69
 msgid "Show button in toolbar"
 msgstr "Toon knop in menu"
 
 # squirrelmail/plugins/sent_subfolders/setup.php:94
-#: squirrelmail/plugins/sent_subfolders/setup.php:94
+#: squirrelmail/plugins/sent_subfolders/setup.php:108
 msgid "Sent Subfolders Options"
 msgstr "Verzonden Items submap opties "
 
 # squirrelmail/plugins/sent_subfolders/setup.php:99
-#: squirrelmail/plugins/sent_subfolders/setup.php:99
+#: squirrelmail/plugins/sent_subfolders/setup.php:113
 msgid "Use Sent Subfolders"
 msgstr "Gebruik Verzonden Items submappen"
 
 # squirrelmail/plugins/sent_subfolders/setup.php:103
-#: squirrelmail/plugins/sent_subfolders/setup.php:103
+#: squirrelmail/plugins/sent_subfolders/setup.php:117
 msgid "Monthly"
 msgstr "Maandelijks"
 
 # squirrelmail/plugins/sent_subfolders/setup.php:104
-#: squirrelmail/plugins/sent_subfolders/setup.php:104
+#: squirrelmail/plugins/sent_subfolders/setup.php:118
 msgid "Quarterly"
 msgstr "Driemaandelijks"
 
 # squirrelmail/plugins/sent_subfolders/setup.php:105
-#: squirrelmail/plugins/sent_subfolders/setup.php:105
+#: squirrelmail/plugins/sent_subfolders/setup.php:119
 msgid "Yearly"
 msgstr "Jaarlijks"
 
 # squirrelmail/plugins/sent_subfolders/setup.php:120
-#: squirrelmail/plugins/sent_subfolders/setup.php:120
+#: squirrelmail/plugins/sent_subfolders/setup.php:134
 msgid "Base Sent Folder"
 msgstr "Verzonden Items basismap"
 
 # squirrelmail/plugins/calendar/calendar.php:75
-#: squirrelmail/plugins/calendar/calendar.php:86
+#: squirrelmail/plugins/calendar/calendar.php:94
 msgid "TODAY"
 msgstr "VANDAAG"
 
 # squirrelmail/functions/date.php:184
-#: squirrelmail/plugins/calendar/day.php:37
-#: squirrelmail/plugins/calendar/event_create.php:101
-#: squirrelmail/plugins/calendar/event_delete.php:98
-#: squirrelmail/plugins/calendar/event_edit.php:204
+#: squirrelmail/plugins/calendar/day.php:58
+#: squirrelmail/plugins/calendar/event_create.php:145
+#: squirrelmail/plugins/calendar/event_delete.php:143
 msgid "l, F j Y"
-msgstr "l, F j, Y"
+msgstr "l, j F Y"
 
 # squirrelmail/plugins/calendar/day.php:79
-#: squirrelmail/plugins/calendar/day.php:89
+#: squirrelmail/plugins/calendar/day.php:104
 msgid "ADD"
 msgstr "VOEG TOE"
 
 # squirrelmail/plugins/calendar/day.php:93
-#: squirrelmail/plugins/calendar/day.php:108
+#: squirrelmail/plugins/calendar/day.php:118
 msgid "EDIT"
 msgstr "WIJZIG"
 
 # squirrelmail/plugins/calendar/day.php:95
-#: squirrelmail/plugins/calendar/day.php:110
+#: squirrelmail/plugins/calendar/day.php:120
 msgid "DEL"
 msgstr "VERWIJDER"
 
 # squirrelmail/plugins/calendar/event_create.php:31
-#: squirrelmail/plugins/calendar/event_create.php:33
+#: squirrelmail/plugins/calendar/event_create.php:79
 msgid "Start time:"
 msgstr "Aanvang:"
 
 # squirrelmail/plugins/calendar/event_create.php:41
 # squirrelmail/plugins/calendar/event_edit.php:59
-#: squirrelmail/plugins/calendar/event_create.php:44
-#: squirrelmail/plugins/calendar/event_edit.php:63
+#: squirrelmail/plugins/calendar/event_create.php:89
+#: squirrelmail/plugins/calendar/event_edit.php:140
 msgid "Length:"
 msgstr "Duur:"
 
@@ -5309,61 +5269,53 @@ msgstr "Duur:"
 # squirrelmail/plugins/calendar/event_edit.php:65
 # squirrelmail/plugins/calendar/event_edit.php:97
 # squirrelmail/plugins/calendar/event_edit.php:110
-#: squirrelmail/plugins/calendar/event_create.php:51
-#: squirrelmail/plugins/calendar/event_edit.php:70
-#: squirrelmail/plugins/calendar/event_edit.php:111
-#: squirrelmail/plugins/calendar/event_edit.php:135
+#: squirrelmail/plugins/calendar/event_create.php:96
+#: squirrelmail/plugins/calendar/event_edit.php:146
+#: squirrelmail/plugins/calendar/event_edit.php:186
+#: squirrelmail/plugins/calendar/event_edit.php:199
 msgid "Priority:"
 msgstr "Prioriteit"
 
+# squirrelmail/plugins/mail_fetch/options.php:162
+# squirrelmail/plugins/mail_fetch/options.php:185
+#: squirrelmail/plugins/calendar/event_create.php:103
+#: squirrelmail/plugins/calendar/event_edit.php:153
+msgid "Notify:"
+msgstr "Waarschuwing:"
+
 # squirrelmail/plugins/calendar/event_create.php:53
 # squirrelmail/plugins/calendar/event_create.php:116
 # squirrelmail/plugins/calendar/event_delete.php:36
 # squirrelmail/plugins/calendar/event_edit.php:71
 # squirrelmail/plugins/calendar/event_edit.php:99
 # squirrelmail/plugins/calendar/event_edit.php:112
-#: squirrelmail/plugins/calendar/event_create.php:58
-#: squirrelmail/plugins/calendar/event_create.php:133
-#: squirrelmail/plugins/calendar/event_delete.php:43
-#: squirrelmail/plugins/calendar/event_edit.php:77
-#: squirrelmail/plugins/calendar/event_edit.php:115
-#: squirrelmail/plugins/calendar/event_edit.php:139
+#: squirrelmail/plugins/calendar/event_create.php:109
+#: squirrelmail/plugins/calendar/event_create.php:172
+#: squirrelmail/plugins/calendar/event_delete.php:94
+#: squirrelmail/plugins/calendar/event_edit.php:160
+#: squirrelmail/plugins/calendar/event_edit.php:188
+#: squirrelmail/plugins/calendar/event_edit.php:201
 msgid "Title:"
 msgstr "Titel:"
 
 # squirrelmail/plugins/calendar/event_create.php:61
-#: squirrelmail/plugins/calendar/event_create.php:70
+#: squirrelmail/plugins/calendar/event_create.php:117
 msgid "Set Event"
 msgstr "Voeg afspraak toe"
 
 # squirrelmail/plugins/calendar/event_create.php:111
-#: squirrelmail/plugins/calendar/event_create.php:122
+#: squirrelmail/plugins/calendar/event_create.php:167
 msgid "Event Has been added!"
 msgstr "Afspraak is toegevoegd!"
 
-# squirrelmail/plugins/calendar/event_create.php:112
-# squirrelmail/plugins/calendar/event_delete.php:32
-# squirrelmail/plugins/calendar/event_edit.php:35
-# squirrelmail/plugins/calendar/event_edit.php:93
-# squirrelmail/plugins/calendar/event_edit.php:106
-# squirrelmail/src/download.php:116 squirrelmail/src/read_body.php:816
-#: squirrelmail/plugins/calendar/event_create.php:125
-#: squirrelmail/plugins/calendar/event_delete.php:35
-#: squirrelmail/plugins/calendar/event_edit.php:37
-#: squirrelmail/plugins/calendar/event_edit.php:103
-#: squirrelmail/plugins/calendar/event_edit.php:127
-msgid "Date:"
-msgstr "Datum:"
-
 # squirrelmail/plugins/calendar/event_create.php:114
 # squirrelmail/plugins/calendar/event_delete.php:34
 # squirrelmail/plugins/calendar/event_edit.php:49
 # squirrelmail/plugins/calendar/event_edit.php:95
-#: squirrelmail/plugins/calendar/event_create.php:129
-#: squirrelmail/plugins/calendar/event_delete.php:39
-#: squirrelmail/plugins/calendar/event_edit.php:52
-#: squirrelmail/plugins/calendar/event_edit.php:107
-#: squirrelmail/plugins/calendar/event_edit.php:131
+#: squirrelmail/plugins/calendar/event_create.php:170
+#: squirrelmail/plugins/calendar/event_delete.php:92
+#: squirrelmail/plugins/calendar/event_edit.php:130
+#: squirrelmail/plugins/calendar/event_edit.php:184
 msgid "Time:"
 msgstr "Tijd:"
 
@@ -5371,130 +5323,167 @@ msgstr "Tijd:"
 # squirrelmail/plugins/calendar/event_delete.php:91
 # squirrelmail/plugins/calendar/event_edit.php:189
 # squirrelmail/plugins/calendar/functions.php:23
-#: squirrelmail/plugins/calendar/event_create.php:142
-#: squirrelmail/plugins/calendar/event_delete.php:104
-#: squirrelmail/plugins/calendar/event_edit.php:227
-#: squirrelmail/plugins/calendar/functions.php:24
+#: squirrelmail/plugins/calendar/event_create.php:177
+#: squirrelmail/plugins/calendar/event_delete.php:149
+#: squirrelmail/plugins/calendar/event_edit.php:278
+#: squirrelmail/plugins/calendar/functions.php:26
 msgid "Day View"
 msgstr "Dag weergave"
 
 # squirrelmail/plugins/calendar/event_delete.php:31
-#: squirrelmail/plugins/calendar/event_delete.php:32
+#: squirrelmail/plugins/calendar/event_delete.php:89
 msgid "Do you really want to delete this event?"
 msgstr "Wilt u deze afspraak echt verwijderen?"
 
 # squirrelmail/plugins/calendar/event_delete.php:89
-#: squirrelmail/plugins/calendar/event_delete.php:102
+#: squirrelmail/plugins/calendar/event_delete.php:147
 msgid "Event deleted!"
 msgstr "Afspraak verwijderd!"
 
 # squirrelmail/plugins/calendar/event_delete.php:97
-#: squirrelmail/plugins/calendar/event_delete.php:110
+#: squirrelmail/plugins/calendar/event_delete.php:155
 msgid "Nothing to delete!"
 msgstr "Niets te verwijderen!"
 
 # squirrelmail/plugins/calendar/event_edit.php:79
-#: squirrelmail/plugins/calendar/event_edit.php:87
+#: squirrelmail/plugins/calendar/event_edit.php:168
 msgid "Update Event"
 msgstr "Wijzig afspraak"
 
 # squirrelmail/plugins/calendar/event_edit.php:91
-#: squirrelmail/plugins/calendar/event_edit.php:100
+#: squirrelmail/plugins/calendar/event_edit.php:180
 msgid "Do you really want to change this event from:"
 msgstr "Wilt u deze afspraak echt als volgt wijzigen? Van:"
 
 # squirrelmail/plugins/calendar/event_edit.php:104
-#: squirrelmail/plugins/calendar/event_edit.php:123
+#: squirrelmail/plugins/calendar/event_edit.php:193
 msgid "to:"
 msgstr "naar:"
 
+#: squirrelmail/plugins/calendar/event_edit.php:258
+msgid "l, F d Y"
+msgstr "l, d F Y"
+
 # squirrelmail/plugins/calendar/event_edit.php:187
-#: squirrelmail/plugins/calendar/event_edit.php:222
+#: squirrelmail/plugins/calendar/event_edit.php:276
 msgid "Event updated!"
 msgstr "Afspraak gewijzigd!"
 
 # squirrelmail/plugins/calendar/functions.php:21
-#: squirrelmail/plugins/calendar/functions.php:22
+#: squirrelmail/plugins/calendar/functions.php:24
 msgid "Month View"
 msgstr "Maand weergave"
 
 # squirrelmail/plugins/calendar/functions.php:34
-#: squirrelmail/plugins/calendar/functions.php:35
+#: squirrelmail/plugins/calendar/functions.php:37
 msgid "0 min."
 msgstr "0 min."
 
 # squirrelmail/plugins/calendar/functions.php:35
-#: squirrelmail/plugins/calendar/functions.php:36
+#: squirrelmail/plugins/calendar/functions.php:38
 msgid "15 min."
 msgstr "15 min."
 
-# squirrelmail/plugins/calendar/functions.php:36
-#: squirrelmail/plugins/calendar/functions.php:37
-msgid "35 min."
-msgstr "35 min."
+# squirrelmail/plugins/calendar/functions.php:34
+#: squirrelmail/plugins/calendar/functions.php:39
+msgid "30 min."
+msgstr "30 min."
 
 # squirrelmail/plugins/calendar/functions.php:37
-#: squirrelmail/plugins/calendar/functions.php:38
+#: squirrelmail/plugins/calendar/functions.php:40
 msgid "45 min."
 msgstr "45 min."
 
 # squirrelmail/plugins/calendar/functions.php:38
-#: squirrelmail/plugins/calendar/functions.php:39
+#: squirrelmail/plugins/calendar/functions.php:41
 msgid "1 hr."
 msgstr "1 uur"
 
 # squirrelmail/plugins/calendar/functions.php:39
-#: squirrelmail/plugins/calendar/functions.php:40
+#: squirrelmail/plugins/calendar/functions.php:42
 msgid "1.5 hr."
 msgstr "1,5 uur"
 
 # squirrelmail/plugins/calendar/functions.php:40
-#: squirrelmail/plugins/calendar/functions.php:41
+#: squirrelmail/plugins/calendar/functions.php:43
 msgid "2 hr."
 msgstr "2 uur"
 
 # squirrelmail/plugins/calendar/functions.php:41
-#: squirrelmail/plugins/calendar/functions.php:42
+#: squirrelmail/plugins/calendar/functions.php:44
 msgid "2.5 hr."
 msgstr "2,5 uur"
 
 # squirrelmail/plugins/calendar/functions.php:42
-#: squirrelmail/plugins/calendar/functions.php:43
+#: squirrelmail/plugins/calendar/functions.php:45
 msgid "3 hr."
 msgstr "3 uur"
 
 # squirrelmail/plugins/calendar/functions.php:43
-#: squirrelmail/plugins/calendar/functions.php:44
+#: squirrelmail/plugins/calendar/functions.php:46
 msgid "3.5 hr."
 msgstr "3,5 uur"
 
 # squirrelmail/plugins/calendar/functions.php:44
-#: squirrelmail/plugins/calendar/functions.php:45
+#: squirrelmail/plugins/calendar/functions.php:47
 msgid "4 hr."
 msgstr "4 uur"
 
 # squirrelmail/plugins/calendar/functions.php:45
-#: squirrelmail/plugins/calendar/functions.php:46
+#: squirrelmail/plugins/calendar/functions.php:48
 msgid "5 hr."
 msgstr "5 uur"
 
 # squirrelmail/plugins/calendar/functions.php:46
-#: squirrelmail/plugins/calendar/functions.php:47
+#: squirrelmail/plugins/calendar/functions.php:49
 msgid "6 hr."
 msgstr "6 uur"
 
+# squirrelmail/src/compose.php:97
+#: squirrelmail/plugins/calendar/functions.php:187
+msgid "Don't Email Me"
+msgstr "E-mail mij niet"
+
+#: squirrelmail/plugins/calendar/functions.php:188
+msgid "Email Me - 0m prior"
+msgstr "E-mail mij 0 min. van tevoren"
+
+#: squirrelmail/plugins/calendar/functions.php:189
+msgid "Email Me - 5m prior"
+msgstr "E-mail mij 5 min. van tevoren"
+
+#: squirrelmail/plugins/calendar/functions.php:190
+msgid "Email Me - 15m prior"
+msgstr "E-mail mij 15 min. van tevoren"
+
+#: squirrelmail/plugins/calendar/functions.php:191
+msgid "Email Me - 30m prior"
+msgstr "E-mail mij 30 min. van tevoren"
+
+#: squirrelmail/plugins/calendar/functions.php:192
+msgid "Email Me - 1h prior"
+msgstr "E-mail mij 1 uur van tevoren"
+
+#: squirrelmail/plugins/calendar/functions.php:193
+msgid "Email Me - 4h prior"
+msgstr "E-mail mij 4 uur van tevoren"
+
+#: squirrelmail/plugins/calendar/functions.php:194
+msgid "Email Me - 1d prior"
+msgstr "E-mail mij 1 dag van tevoren"
+
 # squirrelmail/plugins/calendar/setup.php:21
-#: squirrelmail/plugins/calendar/setup.php:21
+#: squirrelmail/plugins/calendar/setup.php:24
 msgid "Calendar"
 msgstr "Kalender"
 
 # squirrelmail/plugins/listcommands/mailout.php:19
-#: squirrelmail/plugins/listcommands/mailout.php:22
+#: squirrelmail/plugins/listcommands/mailout.php:26
 msgid "Mailinglist"
 msgstr "Mailinglist"
 
 # squirrelmail/plugins/listcommands/mailout.php:25
-#: squirrelmail/plugins/listcommands/mailout.php:29
+#: squirrelmail/plugins/listcommands/mailout.php:32
 #, c-format
 msgid ""
 "This will send a message to %s requesting help for this list. You will "
@@ -5504,27 +5493,27 @@ msgstr ""
 "automatisch een antwoord ontvangen op het onderstaande e-mailadres."
 
 # squirrelmail/plugins/listcommands/mailout.php:28
-#: squirrelmail/plugins/listcommands/mailout.php:32
+#: squirrelmail/plugins/listcommands/mailout.php:35
 #, c-format
 msgid ""
 "This will send a message to %s requesting that you will be subscribed to "
 "this list. You will be subscribed with the address below."
 msgstr ""
-"Dit zal een bericht naar %s sturen voor aanmelding bij deze lijst. U zal met "
+"Dit zal een bericht naar %s sturen voor aanmelding bij deze lijst.U zal met "
 "het onderstaande e-mailadres worden aangemeld."
 
 # squirrelmail/plugins/listcommands/mailout.php:31
-#: squirrelmail/plugins/listcommands/mailout.php:35
+#: squirrelmail/plugins/listcommands/mailout.php:38
 #, c-format
 msgid ""
 "This will send a message to %s requesting that you will be unsubscribed from "
 "this list. It will try to unsubscribe the adress below."
 msgstr ""
-"Dit zal een bericht naar %s sturen voor afmelding van deze lijst. Het "
+"Dit zal een bericht naar %s sturen voor afmelding van deze lijst.Het "
 "onderstaande e-mailadres zal worden afgemeld."
 
 # squirrelmail/plugins/listcommands/mailout.php:79
-#: squirrelmail/plugins/listcommands/mailout.php:83
+#: squirrelmail/plugins/listcommands/mailout.php:86
 msgid "Send Mail"
 msgstr "Verstuur bericht"
 
@@ -5549,43 +5538,43 @@ msgid "Contact Listowner"
 msgstr "Neem contact op met lijsteigenaar"
 
 # squirrelmail/plugins/listcommands/setup.php:113
-#: squirrelmail/plugins/listcommands/setup.php:85
-msgid "Mailing List"
+#: squirrelmail/plugins/listcommands/setup.php:113
+msgid "Mailing List:"
 msgstr "Mailinglist"
 
 # squirrelmail/plugins/delete_move_next/setup.php:176
 # squirrelmail/plugins/delete_move_next/setup.php:179
-#: squirrelmail/plugins/delete_move_next/setup.php:185
-#: squirrelmail/plugins/delete_move_next/setup.php:188
+#: squirrelmail/plugins/delete_move_next/setup.php:181
+#: squirrelmail/plugins/delete_move_next/setup.php:184
 msgid "Delete & Prev"
 msgstr "Verwijder & Vorige"
 
 # squirrelmail/plugins/delete_move_next/setup.php:182
 # squirrelmail/plugins/delete_move_next/setup.php:184
-#: squirrelmail/plugins/delete_move_next/setup.php:191
-#: squirrelmail/plugins/delete_move_next/setup.php:193
+#: squirrelmail/plugins/delete_move_next/setup.php:187
+#: squirrelmail/plugins/delete_move_next/setup.php:189
 msgid "Delete & Next"
 msgstr "Verwijder & Volgende"
 
 # squirrelmail/plugins/delete_move_next/setup.php:305
-#: squirrelmail/plugins/delete_move_next/setup.php:314
+#: squirrelmail/plugins/delete_move_next/setup.php:322
 msgid "Delete/Move/Next Buttons:"
 msgstr "Verwijder/Verplaats/Volgende knoppen:"
 
 # squirrelmail/plugins/delete_move_next/setup.php:311
-#: squirrelmail/plugins/delete_move_next/setup.php:320
+#: squirrelmail/plugins/delete_move_next/setup.php:328
 msgid "Display at top"
 msgstr "toon boven"
 
 # squirrelmail/plugins/delete_move_next/setup.php:317
 # squirrelmail/plugins/delete_move_next/setup.php:329
-#: squirrelmail/plugins/delete_move_next/setup.php:326
-#: squirrelmail/plugins/delete_move_next/setup.php:338
+#: squirrelmail/plugins/delete_move_next/setup.php:334
+#: squirrelmail/plugins/delete_move_next/setup.php:346
 msgid "with move option"
 msgstr "met verplaats optie"
 
 # squirrelmail/plugins/delete_move_next/setup.php:323
-#: squirrelmail/plugins/delete_move_next/setup.php:332
+#: squirrelmail/plugins/delete_move_next/setup.php:340
 msgid "Display at bottom"
 msgstr "toon onder"
 
@@ -5835,154 +5824,154 @@ msgid "Default Charset"
 msgstr "Standaard set van karakters"
 
 # squirrelmail/plugins/administrator/defines.php:189
-#: squirrelmail/plugins/administrator/defines.php:190
+#: squirrelmail/plugins/administrator/defines.php:189
 msgid "Data Directory"
 msgstr "Data directory"
 
 # squirrelmail/plugins/administrator/defines.php:192
-#: squirrelmail/plugins/administrator/defines.php:193
+#: squirrelmail/plugins/administrator/defines.php:192
 msgid "Temp Directory"
 msgstr "Temp directory"
 
 # squirrelmail/plugins/administrator/defines.php:195
-#: squirrelmail/plugins/administrator/defines.php:196
+#: squirrelmail/plugins/administrator/defines.php:195
 msgid "Hash Level"
 msgstr "Graad van onderverdeling data directory"
 
 # squirrelmail/plugins/administrator/defines.php:197
-#: squirrelmail/plugins/administrator/defines.php:198
+#: squirrelmail/plugins/administrator/defines.php:197
 msgid "Hash Disabled"
 msgstr "Onderverdeling uitgeschakeld"
 
 # squirrelmail/plugins/administrator/defines.php:199
-#: squirrelmail/plugins/administrator/defines.php:200
+#: squirrelmail/plugins/administrator/defines.php:199
 msgid "Moderate"
 msgstr "Medium 1"
 
 # squirrelmail/plugins/administrator/defines.php:200
-#: squirrelmail/plugins/administrator/defines.php:201
+#: squirrelmail/plugins/administrator/defines.php:200
 msgid "Medium"
 msgstr "Medium 2"
 
 # squirrelmail/plugins/administrator/defines.php:202
-#: squirrelmail/plugins/administrator/defines.php:203
+#: squirrelmail/plugins/administrator/defines.php:202
 msgid "Default Left Size"
 msgstr "Standaard linkerafmeting"
 
 # squirrelmail/plugins/administrator/defines.php:205
-#: squirrelmail/plugins/administrator/defines.php:206
+#: squirrelmail/plugins/administrator/defines.php:205
 msgid "Usernames in Lowercase"
 msgstr "Gebruikersnamen in kleine letters"
 
 # squirrelmail/plugins/administrator/defines.php:207
-#: squirrelmail/plugins/administrator/defines.php:208
+#: squirrelmail/plugins/administrator/defines.php:207
 msgid "Allow use of priority"
 msgstr "Sta het gebruik van prioriteit toe"
 
 # squirrelmail/plugins/administrator/defines.php:209
-#: squirrelmail/plugins/administrator/defines.php:210
+#: squirrelmail/plugins/administrator/defines.php:209
 msgid "Hide SM attributions"
 msgstr "Verberg SM eigenschappen"
 
 # squirrelmail/plugins/administrator/defines.php:211
-#: squirrelmail/plugins/administrator/defines.php:212
+#: squirrelmail/plugins/administrator/defines.php:211
 msgid "Enable use of delivery receipts"
 msgstr "Sta gebruik van ontvangstbevestigingen toe"
 
 # squirrelmail/plugins/administrator/defines.php:213
-#: squirrelmail/plugins/administrator/defines.php:214
+#: squirrelmail/plugins/administrator/defines.php:213
 msgid "Allow editing of identities"
 msgstr "Sta wijzigen van identiteiten toe"
 
 # squirrelmail/plugins/administrator/defines.php:215
-#: squirrelmail/plugins/administrator/defines.php:216
+#: squirrelmail/plugins/administrator/defines.php:215
 msgid "Allow editing of full name"
 msgstr "Sta wijzigen volledige naam toe"
 
 # squirrelmail/plugins/administrator/defines.php:218
 # squirrelmail/plugins/administrator/defines.php:220
-#: squirrelmail/plugins/administrator/defines.php:219
-#: squirrelmail/plugins/administrator/defines.php:221
+#: squirrelmail/plugins/administrator/defines.php:218
+#: squirrelmail/plugins/administrator/defines.php:220
 msgid "Message of the Day"
 msgstr "Bericht van de dag"
 
 # squirrelmail/plugins/administrator/defines.php:224
-#: squirrelmail/plugins/administrator/defines.php:225
+#: squirrelmail/plugins/administrator/defines.php:224
 msgid "Database"
 msgstr "Database"
 
 # squirrelmail/plugins/administrator/defines.php:226
-#: squirrelmail/plugins/administrator/defines.php:227
+#: squirrelmail/plugins/administrator/defines.php:226
 msgid "Address book DSN"
 msgstr "Adresboek DSN"
 
 # squirrelmail/plugins/administrator/defines.php:229
-#: squirrelmail/plugins/administrator/defines.php:230
+#: squirrelmail/plugins/administrator/defines.php:229
 msgid "Address book table"
 msgstr "Adresboek tabel"
 
 # squirrelmail/plugins/administrator/defines.php:233
-#: squirrelmail/plugins/administrator/defines.php:234
+#: squirrelmail/plugins/administrator/defines.php:233
 msgid "Preferences DSN"
 msgstr "Voorkeuren DSN"
 
 # squirrelmail/plugins/administrator/defines.php:236
-#: squirrelmail/plugins/administrator/defines.php:237
+#: squirrelmail/plugins/administrator/defines.php:236
 msgid "Preferences table"
 msgstr "Voorkeuren tabel"
 
 # squirrelmail/plugins/administrator/defines.php:240
-#: squirrelmail/plugins/administrator/defines.php:241
+#: squirrelmail/plugins/administrator/defines.php:240
 msgid "Preferences username field"
 msgstr "Voorkeuren veld gebruikersnaam"
 
 # squirrelmail/plugins/administrator/defines.php:244
-#: squirrelmail/plugins/administrator/defines.php:245
+#: squirrelmail/plugins/administrator/defines.php:244
 msgid "Preferences key field"
 msgstr "Voorkeuren veld sleutel"
 
 # squirrelmail/plugins/administrator/defines.php:248
-#: squirrelmail/plugins/administrator/defines.php:249
+#: squirrelmail/plugins/administrator/defines.php:248
 msgid "Preferences value field"
 msgstr "Voorkeuren veld waarde"
 
 # squirrelmail/plugins/administrator/defines.php:253
-#: squirrelmail/plugins/administrator/defines.php:254
+#: squirrelmail/plugins/administrator/defines.php:253
 msgid "Themes"
 msgstr "Thema's"
 
 # squirrelmail/plugins/administrator/defines.php:255
-#: squirrelmail/plugins/administrator/defines.php:256
+#: squirrelmail/plugins/administrator/defines.php:255
 msgid "Style Sheet URL (css)"
 msgstr "Stijl sjabloon URL (css)"
 
 # squirrelmail/plugins/administrator/options.php:186
-#: squirrelmail/plugins/administrator/options.php:186
+#: squirrelmail/plugins/administrator/options.php:193
 msgid "Configuration Administrator"
 msgstr "Configuratie Administrator"
 
 # squirrelmail/plugins/administrator/options.php:379
-#: squirrelmail/plugins/administrator/options.php:379
+#: squirrelmail/plugins/administrator/options.php:386
 msgid "Theme Name"
 msgstr "Thema naam"
 
 # squirrelmail/plugins/administrator/options.php:380
-#: squirrelmail/plugins/administrator/options.php:380
+#: squirrelmail/plugins/administrator/options.php:387
 msgid "Theme Path"
 msgstr "Thema path"
 
 # squirrelmail/plugins/administrator/options.php:418
-#: squirrelmail/plugins/administrator/options.php:420
+#: squirrelmail/plugins/administrator/options.php:425
 msgid "Plugins"
 msgstr "Plugins"
 
 # squirrelmail/plugins/administrator/options.php:480
-#: squirrelmail/plugins/administrator/options.php:482
+#: squirrelmail/plugins/administrator/options.php:487
 msgid "Change Settings"
 msgstr "Verander instellingen"
 
 # squirrelmail/plugins/administrator/options.php:531
-#: squirrelmail/plugins/administrator/options.php:510
+#: squirrelmail/plugins/administrator/options.php:538
 msgid "Config file can't be opened. Please check config.php."
 msgstr "Configuratie file kan niet worden geopend. Check config.php."
 
@@ -6000,41 +5989,6 @@ msgstr ""
 "Deze module maakt het administrators mogelijk de basisconfiguratie van "
 "SquirrelMail op afstand te wijzigen."
 
-# squirrelmail/src/vcard.php:90 squirrelmail/src/vcard.php:142
-#: squirrelmail/plugins/abook_take/setup.php:109
-msgid "Take Address"
-msgstr "Sla e-mailadres op"
-
-# squirrelmail/src/addrbook_popup.php:22
-#: squirrelmail/plugins/abook_take/setup.php:140
-msgid "Address Book Take"
-msgstr "Knop direct opslaan e-mailadres"
-
-#: squirrelmail/plugins/abook_take/setup.php:146
-msgid "Left aligned"
-msgstr "Links uitgelijnd"
-
-#: squirrelmail/plugins/abook_take/setup.php:150
-msgid "Centered"
-msgstr "Gecentreerd"
-
-# squirrelmail/src/options_highlight.php:286
-#: squirrelmail/plugins/abook_take/setup.php:154
-msgid "Right aligned"
-msgstr "Rechts uitgelijnd"
-
-#: squirrelmail/plugins/abook_take/setup.php:155
-msgid "on the Read screen"
-msgstr "op het berichtscherm"
-
-#: squirrelmail/plugins/abook_take/setup.php:159
-msgid "Hide the box"
-msgstr "Verberg de knop"
-
-#: squirrelmail/plugins/abook_take/setup.php:163
-msgid "Try to verify addresses"
-msgstr "Probeer adressen te verifieren"
-
 # squirrelmail/po/independent_strings.txt:18
 #: squirrelmail/po/independent_strings.txt:18
 msgid "Delivery error report"
@@ -6045,9 +5999,16 @@ msgstr "Bezorgingsfout rapportage"
 msgid "Undelivered Message Headers"
 msgstr "Berichtkoppen onbestelbaar bericht"
 
-# squirrelmail/src/download.php:70
-#~ msgid "Viewing a message attachment"
-#~ msgstr "Bekijk een tekst bijlage"
+# squirrelmail/functions/imap_general.php:132
+#~ msgid ""
+#~ "Please contact your system administrator and report the following error:"
+#~ msgstr ""
+#~ "Neem a.u.b. contact op met uw systeembeheerder en rapporteer de volgende "
+#~ "foutmelding:"
+
+# squirrelmail/plugins/calendar/functions.php:36
+#~ msgid "35 min."
+#~ msgstr "35 min."
 
 # squirrelmail/plugins/delete_move_next/setup.php:240
 # squirrelmail/plugins/delete_move_next/setup.php:264
@@ -6058,62 +6019,53 @@ msgstr "Berichtkoppen onbestelbaar bericht"
 #~ msgid "Extract"
 #~ msgstr "Uitpakken"
 
-# squirrelmail/src/download.php:124
-#~ msgid "Cc:"
-#~ msgstr "CC"
-
-# squirrelmail/src/download.php:132
-#~ msgid "Bcc:"
-#~ msgstr "BCC"
+# squirrelmail/functions/mailbox_display.php:759
+# squirrelmail/plugins/filters/options.php:129
+# squirrelmail/src/compose.php:432 squirrelmail/src/download.php:309
+# squirrelmail/src/download.php:314
+# squirrelmail/src/options_highlight.php:339
+# squirrelmail/src/options_order.php:40
+# squirrelmail/src/printer_friendly_bottom.php:101
+# squirrelmail/src/search.php:348
+#~ msgid "subject"
+#~ msgstr "onderwerp"
 
-# squirrelmail/src/move_messages.php:94
-#~ msgid "<No subject>"
-#~ msgstr "<geen onderwerp>"
+#~ msgid "Server error...Disconnect"
+#~ msgstr "Server fout ... connectie verbroken"
 
-# squirrelmail/src/options_display.php:242
-#~ msgid "Enable request/confirm reading"
-#~ msgstr "Activeer ontvangst-/leesbevestiging"
+#~ msgid "Re-connect from dead connectoin"
+#~ msgstr "Herstel verbroken connectie"
 
-# squirrelmail/src/options_display.php:280
-#~ msgid "Use receive date for sort"
-#~ msgstr "Gebruik datum van ontvangst voor sorteren"
+# squirrelmail/plugins/mail_fetch/fetch.php:178
+#~ msgid "Re-fetching message "
+#~ msgstr "Opnieuw ophalen bericht "
 
-# squirrelmail/src/options_display.php:287
-#~ msgid "Use References header for thread sort"
-#~ msgstr "Gebruik referentie berichtkop voor sorteren in threads"
+# squirrelmail/src/vcard.php:90 squirrelmail/src/vcard.php:142
+#~ msgid "Take Address"
+#~ msgstr "Sla e-mailadres op"
 
-# squirrelmail/src/read_body.php:790 squirrelmail/src/read_body.php:793
-#~ msgid "View Full Header"
-#~ msgstr "Bekijk volledige berichtinformatie"
+# squirrelmail/src/addrbook_popup.php:22
+#~ msgid "Address Book Take"
+#~ msgstr "Knop direct opslaan e-mailadres"
 
-# squirrelmail/src/search.php:400
-#~ msgid "No Messages found"
-#~ msgstr "Geen berichten gevonden"
+#~ msgid "Left aligned"
+#~ msgstr "Links uitgelijnd"
 
-# squirrelmail/functions/imap_general.php:132
-#~ msgid ""
-#~ "Please contact your system administrator and report the following error:"
-#~ msgstr ""
-#~ "Neem a.u.b. contact op met uw systeembeheerder en rapporteer de volgende "
-#~ "foutmelding:"
+#~ msgid "Centered"
+#~ msgstr "Gecentreerd"
 
-# squirrelmail/functions/imap_messages.php:515
-#~ msgid "No To Address"
-#~ msgstr "Geen AAN adres"
+# squirrelmail/src/options_highlight.php:286
+#~ msgid "Right aligned"
+#~ msgstr "Rechts uitgelijnd"
 
-# squirrelmail/functions/imap_search.php:191
-# squirrelmail/functions/imap_search.php:199
-#~ msgid "Found"
-#~ msgstr "Gevonden"
+#~ msgid "on the Read screen"
+#~ msgstr "op het berichtscherm"
 
-# squirrelmail/functions/imap_search.php:191
-# squirrelmail/functions/imap_search.php:199
-#~ msgid "messages"
-#~ msgstr "berichten"
+#~ msgid "Hide the box"
+#~ msgstr "Verberg de knop"
 
-# squirrelmail/functions/mime.php:425
-#~ msgid "Error decoding mime structure.  Report this as a bug!"
-#~ msgstr "Fout decoderen mime structuur. Raporteer dit als een bug!"
+#~ msgid "Try to verify addresses"
+#~ msgstr "Probeer adressen te verifieren"
 
 #~ msgid "Unknown messagenumber in reply from server: "
 #~ msgstr "Onbekend berichtnummer in antwoord van server"