[Commits] [SCM] claws branch, gtk3, updated. 3.16.0-930-g675e2663a

paul at claws-mail.org paul at claws-mail.org
Tue Feb 18 18:25:16 CET 2020


The branch, gtk3 has been updated
       via  675e2663af0cbd6cc1f2a0b30ee6044bc04d4e8c (commit)
      from  3774d68613b9b50062947b2551000af05dd4e085 (commit)

Summary of changes:
 po/nl.po | 8187 ++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 4258 insertions(+), 3929 deletions(-)


- Log -----------------------------------------------------------------
commit 675e2663af0cbd6cc1f2a0b30ee6044bc04d4e8c
Author: Paul <paul at claws-mail.org>
Date:   Tue Feb 18 17:23:46 2020 +0000

    nl.po updated by Marcel Pol

diff --git a/po/nl.po b/po/nl.po
index 1ce7274a9..983d30294 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,5 +1,5 @@
 # Dutch translation of Claws Mail.
-# Copyright © 2001-2017 The Claws Mail team.
+# Copyright © 2001 - 2020 The Claws Mail team.
 # This file is distributed under the same license
 # as the Claws Mail package, see COPYING file.
 #
@@ -7,18 +7,17 @@
 # Claws merge by Alfons Hoogervorst <alfons at proteus.demon.nl>
 # Claws maintenance 2002 by Wilbert Berendsen <wbsoft at xs4all.nl>
 # Claws maintenance 2006-2007 by Tim Dijkstra <tim at famdijkstra.org>
-# Claws maintenance 2008-2017 by Marcel Pol <marcel at timelord.nl>
+# Claws maintenance 2008-2020 by Marcel Pol <marcel at timelord.nl>
 #
 # TODO:
 # Snelkoppelingen nalopen.
-# Dubbele Engelse woorden zijn een enkel woord.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Claws Mail 3.15.1\n"
+"Project-Id-Version: Claws Mail 3.17.2\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2017-12-10 00:07+0000\n"
-"PO-Revision-Date: 2017-12-10 17:54+0100\n"
+"POT-Creation-Date: 2020-02-11 15:14+0000\n"
+"PO-Revision-Date: 2020-02-18 16:30+0100\n"
 "Last-Translator: Marcel Pol <marcel at timelord.nl>\n"
 "Language-Team: translators at lists.claws-mail.org\n"
 "Language: nl\n"
@@ -26,9 +25,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
-"X-Generator: Poedit 2.0.4\n"
+"X-Generator: Poedit 2.2.3\n"
 
-#: src/account.c:395 src/account.c:462
+#: src/account.c:402 src/account.c:469
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing accounts."
@@ -37,15 +36,15 @@ msgstr ""
 "Deze moeten gesloten worden voordat je de accountinstellingen kunt "
 "veranderen."
 
-#: src/account.c:440
+#: src/account.c:447
 msgid "Can't create folder."
 msgstr "Kan map niet aanmaken."
 
-#: src/account.c:727
+#: src/account.c:735
 msgid "Edit accounts"
 msgstr "Accountbeheer"
 
-#: src/account.c:744
+#: src/account.c:752
 msgid ""
 "Using 'Get Mail' will retrieve messages from your Accounts in the order "
 "given, the checkbox indicates which accounts will be included. Bold text "
@@ -55,60 +54,61 @@ msgstr ""
 "in de kolom 'O' geeft aan voor welke accounts dit wordt gedaan. Vetgedrukte "
 "tekst geeft het standaardaccount aan."
 
-#: src/account.c:815
+#: src/account.c:823
 msgid " _Set as default account "
 msgstr " _Instellen als standaard account "
 
-#: src/account.c:907
+#: src/account.c:915
 msgid "Accounts with remote folders cannot be copied."
 msgstr "Accounts met mappen op de server kunnen niet worden gekopieerd."
 
-#: src/account.c:914
+#: src/account.c:922
 #, c-format
 msgid "Copy of %s"
 msgstr "Kopie van %s"
 
-#: src/account.c:1097
+#: src/account.c:1119
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Wil je werkelijk het account '%s' verwijderen?"
 
-#: src/account.c:1099
+#: src/account.c:1121
 msgid "(Untitled)"
 msgstr "(Geen titel)"
 
-#: src/account.c:1100
+#: src/account.c:1122
 msgid "Delete account"
 msgstr "Verwijder account"
 
-#: src/account.c:1590
+#: src/account.c:1596
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "O"
 
-#: src/account.c:1596
+#: src/account.c:1602
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "'Ophalen' haalt berichten op voor de aangevinkte accounts"
 
-#: src/account.c:1603 src/addrduplicates.c:471 src/addressadd.c:215
-#: src/addressbook.c:125 src/compose.c:7424 src/editaddress.c:1264
-#: src/editaddress.c:1321 src/editaddress.c:1341
-#: src/editaddress_other_attributes_ldap.c:302
-#: src/editaddress_other_attributes_ldap.c:350 src/editbook.c:170
-#: src/editgroup.c:288 src/editjpilot.c:257 src/editldap.c:428
-#: src/editvcard.c:173 src/importmutt.c:222 src/importpine.c:221
-#: src/mimeview.c:274 src/plugins/managesieve/sieve_manager.c:465
-#: src/plugins/pdf_viewer/poppler_viewer.c:1803
-#: src/plugins/pgpcore/select-keys.c:409 src/prefs_filtering.c:384
-#: src/prefs_filtering.c:1870 src/prefs_template.c:79
+#: src/account.c:1609 src/addrduplicates.c:472 src/addressadd.c:223
+#: src/addressbook.c:128 src/compose.c:7473 src/editaddress.c:1474
+#: src/editaddress.c:1503 src/editaddress.c:1519
+#: src/editaddress_other_attributes_ldap.c:371
+#: src/editaddress_other_attributes_ldap.c:392 src/editbook.c:171
+#: src/editgroup.c:290 src/editjpilot.c:257 src/editldap.c:428
+#: src/editvcard.c:174 src/importmutt.c:223 src/importpine.c:222
+#: src/mimeview.c:304 src/plugins/managesieve/sieve_manager.c:470
+#: src/plugins/pdf_viewer/poppler_viewer.c:1846
+#: src/plugins/pgpcore/select-keys.c:464 src/prefs_filtering.c:385
+#: src/prefs_filtering.c:1875 src/prefs_summaries.c:477 src/prefs_template.c:79
+#: src/prefs_themes.c:990
 msgid "Name"
 msgstr "Naam"
 
-#: src/account.c:1611 src/prefs_account.c:1108 src/prefs_account.c:4241
+#: src/account.c:1617 src/prefs_account.c:1199 src/prefs_account.c:4624
 msgid "Protocol"
 msgstr "Protocol"
 
-#: src/account.c:1619 src/ssl_manager.c:100
+#: src/account.c:1625 src/ssl_manager.c:109
 msgid "Server"
 msgstr "Server"
 
@@ -135,11 +135,11 @@ msgstr ""
 "De geselecteerde actie kan niet worden gebruikt in het\n"
 "opstelvenster omdat het %%f, %%F, %%as of %%p bevat."
 
-#: src/action.c:719
+#: src/action.c:728
 msgid "There is no filtering action set"
 msgstr "Er is geen filteractie ingesteld"
 
-#: src/action.c:721
+#: src/action.c:730
 #, c-format
 msgid ""
 "Invalid filtering action(s):\n"
@@ -148,7 +148,7 @@ msgstr ""
 "Ongeldige filteractie(s):\n"
 "%s"
 
-#: src/action.c:986
+#: src/action.c:997
 #, c-format
 msgid ""
 "Could not fork to execute the following command:\n"
@@ -159,34 +159,35 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:988 src/ldaputil.c:323 src/plugins/bogofilter/bogofilter.c:857
-#: src/plugins/tnef_parse/tnef_parse.c:75
-#: src/plugins/vcalendar/vcal_folder.c:1823
+#: src/action.c:999 src/compose.c:5262 src/compose.c:5267 src/ldaputil.c:333
+#: src/plugins/bogofilter/bogofilter.c:858
+#: src/plugins/tnef_parse/tnef_parse.c:76
 #: src/plugins/vcalendar/vcal_folder.c:1827
-#: src/plugins/vcalendar/vcal_folder.c:1840
-#: src/plugins/vcalendar/vcal_folder.c:1843 src/privacy.c:62
+#: src/plugins/vcalendar/vcal_folder.c:1831
+#: src/plugins/vcalendar/vcal_folder.c:1849
+#: src/plugins/vcalendar/vcal_folder.c:1852 src/privacy.c:62
 msgid "Unknown error"
 msgstr "Onbekende fout"
 
-#: src/action.c:1206 src/action.c:1371
+#: src/action.c:1218 src/action.c:1390
 msgid "Completed"
 msgstr "Voltooid"
 
-#: src/action.c:1242
+#: src/action.c:1254
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- Starten: %s\n"
 
-#: src/action.c:1246
+#: src/action.c:1258
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Beëindigd: %s\n"
 
-#: src/action.c:1279
+#: src/action.c:1304
 msgid "Action's input/output"
 msgstr "Invoer en uitvoer van actie"
 
-#: src/action.c:1607
+#: src/action.c:1636
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -197,11 +198,11 @@ msgstr ""
 "('%%h' zal vervangen worden door het argument)\n"
 "  %s"
 
-#: src/action.c:1612
+#: src/action.c:1641
 msgid "Action's hidden user argument"
 msgstr "Verborgen gebruikersargument van actie"
 
-#: src/action.c:1616
+#: src/action.c:1645
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -211,24 +212,24 @@ msgstr ""
 "Geef het argument van de volgende actie:\n"
 "('%%u' zal vervangen worden door het argument)  %s"
 
-#: src/action.c:1621
+#: src/action.c:1650
 msgid "Action's user argument"
 msgstr "Gebruikersargument van actie"
 
-#: src/addrclip.c:480
+#: src/addrclip.c:481
 msgid "Cannot copy a folder to itself or to its sub-structure."
 msgstr "Kan een map niet kopiëren naar zichzelf of één van z'n submappen."
 
-#: src/addrclip.c:503
+#: src/addrclip.c:504
 msgid "Cannot copy an address book to itself."
 msgstr "Kan adresboek niet naar zichzelf kopiëren."
 
-#: src/addrclip.c:594
+#: src/addrclip.c:595
 msgid "Cannot move a folder to itself or to its sub-structure."
 msgstr "Kan een map niet verplaatsen naar zichzelf of één van z'n submappen."
 
-#: src/addr_compl.c:689 src/addressbook.c:4945
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:308
+#: src/addr_compl.c:689 src/addressbook.c:5018
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:309
 msgid "Group"
 msgstr "Groep"
 
@@ -268,31 +269,31 @@ msgstr "fax"
 msgid "website"
 msgstr "website"
 
-#: src/addrcustomattr.c:141
+#: src/addrcustomattr.c:146
 msgid "Attribute name"
 msgstr "Eigenschapnaam"
 
-#: src/addrcustomattr.c:156
+#: src/addrcustomattr.c:161
 msgid "Delete all attribute names"
 msgstr "Alle eigenschapnamen verwijderen"
 
-#: src/addrcustomattr.c:157
+#: src/addrcustomattr.c:162
 msgid "Do you really want to delete all attribute names?"
 msgstr "Wil je deze eigenschapnamen werkelijk verwijderen?"
 
-#: src/addrcustomattr.c:181
+#: src/addrcustomattr.c:186
 msgid "Delete attribute name"
 msgstr "Verwijder eigenschapnaam"
 
-#: src/addrcustomattr.c:182
+#: src/addrcustomattr.c:187
 msgid "Do you really want to delete this attribute name?"
 msgstr "Wil je werkelijk deze eigenschapnaam verwijderen?"
 
-#: src/addrcustomattr.c:191
+#: src/addrcustomattr.c:196
 msgid "Reset to default"
 msgstr "Terugzetten naar standaard"
 
-#: src/addrcustomattr.c:192
+#: src/addrcustomattr.c:197
 msgid ""
 "Do you really want to replace all attribute names\n"
 "with the default set?"
@@ -300,36 +301,36 @@ msgstr ""
 "Wil je werkelijk alle eigenschapnamen vervangen door\n"
 "de standaard set?"
 
-#: src/addrcustomattr.c:212 src/addressbook.c:438 src/addressbook.c:466
-#: src/addressbook.c:483 src/edittags.c:279
-#: src/plugins/archive/archiver_gtk.c:1307 src/prefs_actions.c:1084
-#: src/prefs_filtering.c:1697 src/prefs_template.c:1111
+#: src/addrcustomattr.c:217 src/addressbook.c:438 src/addressbook.c:467
+#: src/addressbook.c:484 src/edittags.c:286
+#: src/plugins/archive/archiver_gtk.c:1313 src/prefs_actions.c:1086
+#: src/prefs_filtering.c:1700 src/prefs_template.c:1112
 msgid "_Delete"
 msgstr "Ver_wijderen"
 
-#: src/addrcustomattr.c:213 src/edittags.c:280 src/prefs_actions.c:1085
-#: src/prefs_filtering.c:1698 src/prefs_template.c:1112
+#: src/addrcustomattr.c:218 src/edittags.c:287 src/prefs_actions.c:1087
+#: src/prefs_filtering.c:1701 src/prefs_template.c:1113
 msgid "Delete _all"
 msgstr "_Alles verwijderen"
 
-#: src/addrcustomattr.c:214
+#: src/addrcustomattr.c:219
 msgid "_Reset to default"
 msgstr "_Terugzetten naar standaard"
 
-#: src/addrcustomattr.c:403
+#: src/addrcustomattr.c:410
 msgid "Attribute name is not set."
 msgstr "Eigenschapnaam is niet ingesteld."
 
-#: src/addrcustomattr.c:462
+#: src/addrcustomattr.c:469
 msgctxt "Dialog title"
 msgid "Edit attribute names"
 msgstr "Bewerk eigenschapnamen"
 
-#: src/addrcustomattr.c:476
+#: src/addrcustomattr.c:483
 msgid "New attribute name:"
 msgstr "Nieuwe eigenschapnaam:"
 
-#: src/addrcustomattr.c:513
+#: src/addrcustomattr.c:520
 msgid ""
 "Adding or removing attribute names won't affect attributes already set for "
 "contacts."
@@ -352,69 +353,70 @@ msgstr "Vind dubbele e-mailadressen in adresboek"
 #: src/addrduplicates.c:145
 msgid ""
 "Claws Mail will now search for duplicate email addresses in the address book."
-msgstr "Claws Mail zal nu dubbele e-mailadressen zoeken in het adresboek"
+msgstr "Claws Mail zal nu dubbele e-mailadressen zoeken in het adresboek."
 
 #: src/addrduplicates.c:315
 msgid "No duplicate email addresses found in the address book"
 msgstr "Geen dubbele e-mailadressen gevonden in adresboek"
 
-#: src/addrduplicates.c:346
+#: src/addrduplicates.c:347
 msgid "Duplicate email addresses"
 msgstr "Dubbele e-mailadressen"
 
-#: src/addrduplicates.c:442 src/addressadd.c:227
-#: src/plugins/pgpcore/select-keys.c:410 src/toolbar.c:529
+#: src/addrduplicates.c:443 src/addressadd.c:235
+#: src/plugins/pgpcore/select-keys.c:470 src/prefs_summaries.c:478
+#: src/toolbar.c:529
 msgid "Address"
 msgstr "Adres"
 
-#: src/addrduplicates.c:464
+#: src/addrduplicates.c:465
 msgid "Address book path"
 msgstr "Pad naar adresboek"
 
-#: src/addrduplicates.c:793 src/addressbook.c:1439 src/addressbook.c:1492
+#: src/addrduplicates.c:791 src/addressbook.c:1445 src/addressbook.c:1498
 msgid "Delete address(es)"
 msgstr "Verwijder adres(sen)"
 
-#: src/addrduplicates.c:794 src/addressbook.c:1493
+#: src/addrduplicates.c:792 src/addressbook.c:1499
 msgid "Really delete the address(es)?"
 msgstr "Wil je de adressen echt verwijderen?"
 
-#: src/addrduplicates.c:842
+#: src/addrduplicates.c:841
 msgid "Delete address"
 msgstr "Verwijder adres"
 
-#: src/addrduplicates.c:843 src/addressbook.c:1440
+#: src/addrduplicates.c:842 src/addressbook.c:1446
 msgid "This address data is readonly and cannot be deleted."
 msgstr "Deze adresgegevens zijn alleen-lezen en kunnen niet worden verwijderd."
 
-#: src/addressadd.c:185 src/prefs_filtering_action.c:201
+#: src/addressadd.c:192 src/prefs_filtering_action.c:195
 msgid "Add to address book"
 msgstr "Toevoegen aan adresboek"
 
-#: src/addressadd.c:207
+#: src/addressadd.c:215
 msgid "Contact"
 msgstr "Contact"
 
-#: src/addressadd.c:238 src/addressbook.c:127 src/editaddress.c:1056
-#: src/editaddress.c:1131 src/editgroup.c:290
+#: src/addressadd.c:246 src/addressbook.c:130 src/editaddress.c:1258
+#: src/editaddress.c:1302 src/editgroup.c:292
 msgid "Remarks"
 msgstr "Opmerkingen"
 
-#: src/addressadd.c:257 src/addressbook_foldersel.c:158
+#: src/addressadd.c:289 src/addressbook_foldersel.c:158
 msgid "Select Address Book Folder"
 msgstr "Selecteer adresboekmap"
 
-#: src/addressadd.c:534 src/addressbook.c:3214 src/addressbook.c:3265
+#: src/addressadd.c:599 src/addressbook.c:3268 src/addressbook.c:3319
 msgid "Add address(es)"
 msgstr "Voeg adres(sen) toe"
 
-#: src/addressadd.c:535
+#: src/addressadd.c:600
 msgid "Can't add the specified address"
 msgstr "Kan het opgegeven adres niet toevoegen"
 
-#: src/addressbook.c:126 src/addressbook.c:4933 src/editaddress.c:1053
-#: src/editaddress.c:1114 src/editgroup.c:289 src/expldifdlg.c:517
-#: src/exporthtml.c:600 src/exporthtml.c:764 src/ldif.c:762
+#: src/addressbook.c:129 src/addressbook.c:5006 src/editaddress.c:1247
+#: src/editaddress.c:1285 src/editgroup.c:291 src/expldifdlg.c:517
+#: src/exporthtml.c:601 src/exporthtml.c:765 src/ldif.c:763
 msgid "Email Address"
 msgstr "E-mailadres"
 
@@ -422,27 +424,27 @@ msgstr "E-mailadres"
 msgid "_Book"
 msgstr "_Boek"
 
-#: src/addressbook.c:406 src/addressbook.c:437 src/addressbook.c:465
-#: src/addressbook.c:482 src/compose.c:600 src/mainwindow.c:514
-#: src/messageview.c:209 src/plugins/managesieve/sieve_editor.c:82
+#: src/addressbook.c:406 src/addressbook.c:437 src/addressbook.c:466
+#: src/addressbook.c:483 src/compose.c:607 src/mainwindow.c:523
+#: src/messageview.c:212 src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
 msgstr "B_ewerken"
 
-#: src/addressbook.c:407 src/compose.c:605 src/mainwindow.c:517
-#: src/messageview.c:212
+#: src/addressbook.c:407 src/compose.c:612 src/mainwindow.c:526
+#: src/messageview.c:215
 msgid "_Tools"
 msgstr "_Gereedschap"
 
-#: src/addressbook.c:408 src/compose.c:606 src/mainwindow.c:519
-#: src/messageview.c:213
+#: src/addressbook.c:408 src/compose.c:613 src/mainwindow.c:528
+#: src/messageview.c:216
 msgid "_Help"
 msgstr "_Help"
 
-#: src/addressbook.c:411 src/addressbook.c:468
+#: src/addressbook.c:411 src/addressbook.c:469
 msgid "New _Book"
 msgstr "Nieuw _Boek"
 
-#: src/addressbook.c:412 src/addressbook.c:469
+#: src/addressbook.c:412 src/addressbook.c:470
 msgid "New _Folder"
 msgstr "Nieuwe _Map"
 
@@ -466,209 +468,213 @@ msgstr "_Bewerk boek"
 msgid "_Delete book"
 msgstr "_Verwijder boek"
 
-#: src/addressbook.c:427 src/compose.c:617
+#: src/addressbook.c:427 src/compose.c:624
 #: src/plugins/managesieve/sieve_editor.c:85
-#: src/plugins/managesieve/sieve_editor.c:433
-#: src/plugins/managesieve/sieve_editor.c:631
+#: src/plugins/managesieve/sieve_editor.c:434
+#: src/plugins/managesieve/sieve_editor.c:633
 msgid "_Save"
 msgstr "_Opslaan"
 
-#: src/addressbook.c:428 src/compose.c:621 src/messageview.c:222
+#: src/addressbook.c:428 src/compose.c:628 src/messageview.c:225
 #: src/plugins/managesieve/sieve_editor.c:88
-#: src/plugins/managesieve/sieve_editor.c:629
+#: src/plugins/managesieve/sieve_editor.c:631
 msgid "_Close"
 msgstr "_Sluiten"
 
-#: src/addressbook.c:431 src/addressbook.c:480 src/messageview.c:226
+#: src/addressbook.c:431 src/addressbook.c:481 src/messageview.c:229
 msgid "_Select all"
 msgstr "_Alles selecteren"
 
-#: src/addressbook.c:433 src/addressbook.c:472 src/addressbook.c:488
+#: src/addressbook.c:433 src/addressbook.c:473 src/addressbook.c:489
 msgid "C_ut"
 msgstr "K_nippen"
 
-#: src/addressbook.c:434 src/addressbook.c:473 src/addressbook.c:489
-#: src/compose.c:629 src/mainwindow.c:548 src/messageview.c:225
+#: src/addressbook.c:434 src/addressbook.c:474 src/addressbook.c:490
+#: src/compose.c:636 src/mainwindow.c:557 src/messageview.c:228
 #: src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr "_Kopiëren"
 
-#: src/addressbook.c:435 src/addressbook.c:474 src/addressbook.c:490
-#: src/compose.c:630 src/plugins/managesieve/sieve_editor.c:97
+#: src/addressbook.c:435 src/addressbook.c:475 src/addressbook.c:491
+#: src/compose.c:637 src/plugins/managesieve/sieve_editor.c:97
 msgid "_Paste"
 msgstr "_Plakken"
 
-#: src/addressbook.c:440 src/addressbook.c:485
+#: src/addressbook.c:440 src/addressbook.c:486
 msgid "New _Address"
 msgstr "Nieuw _Adres"
 
-#: src/addressbook.c:441 src/addressbook.c:470 src/addressbook.c:486
+#: src/addressbook.c:441 src/addressbook.c:471 src/addressbook.c:487
 msgid "New _Group"
 msgstr "Nieuwe _Groep"
 
-#: src/addressbook.c:443 src/addressbook.c:492
+#: src/addressbook.c:443 src/addressbook.c:493
 msgid "_Mail To"
 msgstr "_Verzenden Aan"
 
-#: src/addressbook.c:447
+#: src/addressbook.c:444 src/addressbook.c:497
+msgid "_Merge"
+msgstr "_Samenvoegen"
+
+#: src/addressbook.c:448
 msgid "Import _LDIF file..."
 msgstr "_LDIF-bestand importeren..."
 
-#: src/addressbook.c:448
+#: src/addressbook.c:449
 msgid "Import M_utt file..."
 msgstr "_Mutt-bestand importeren..."
 
-#: src/addressbook.c:449
+#: src/addressbook.c:450
 msgid "Import _Pine file..."
 msgstr "_Pine-bestand importeren..."
 
-#: src/addressbook.c:451
+#: src/addressbook.c:452
 msgid "Export _HTML..."
 msgstr "_HTML-bestand exporteren..."
 
-#: src/addressbook.c:452
+#: src/addressbook.c:453
 msgid "Export LDI_F..."
 msgstr "LDI_F-bestand exporteren..."
 
-#: src/addressbook.c:454
+#: src/addressbook.c:455
 msgid "Find duplicates..."
 msgstr "Vind dubbele adressen..."
 
-#: src/addressbook.c:455
+#: src/addressbook.c:456
 msgid "Edit custom attributes..."
 msgstr "Bewerk aangepaste eigenschappen..."
 
-#: src/addressbook.c:458 src/compose.c:707 src/mainwindow.c:813
-#: src/messageview.c:337
+#: src/addressbook.c:459 src/compose.c:714 src/mainwindow.c:825
+#: src/messageview.c:340
 msgid "_About"
 msgstr "_Over"
 
-#: src/addressbook.c:494
+#: src/addressbook.c:495
 msgid "_Browse Entry"
 msgstr "_Bekijk item"
 
-#: src/addressbook.c:507 src/crash.c:456 src/crash.c:475 src/importldif.c:114
-#: src/plugins/pgpcore/select-keys.c:253 src/plugins/pgpcore/sgpgme.c:143
-#: src/plugins/pgpcore/sgpgme.c:171 src/plugins/vcalendar/day-view.c:402
+#: src/addressbook.c:509 src/crash.c:457 src/crash.c:476 src/importldif.c:114
+#: src/plugins/pgpcore/select-keys.c:247 src/plugins/pgpcore/sgpgme.c:144
+#: src/plugins/pgpcore/sgpgme.c:172 src/plugins/vcalendar/day-view.c:403
 #: src/plugins/vcalendar/month-view.c:428 src/prefs_themes.c:819
 #: src/prefs_themes.c:851 src/prefs_themes.c:852
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: src/addressbook.c:514 src/addressbook.c:533 src/importldif.c:121
+#: src/addressbook.c:516 src/addressbook.c:535 src/importldif.c:121
 msgid "Success"
 msgstr "Gelukt"
 
-#: src/addressbook.c:515 src/importldif.c:122
+#: src/addressbook.c:517 src/importldif.c:122
 msgid "Bad arguments"
 msgstr "Fout argument"
 
-#: src/addressbook.c:516 src/importldif.c:123
+#: src/addressbook.c:518 src/importldif.c:123
 msgid "File not specified"
-msgstr "Bestand niet opgegeven."
+msgstr "Bestand niet opgegeven"
 
-#: src/addressbook.c:517 src/importldif.c:124
+#: src/addressbook.c:519 src/importldif.c:124
 msgid "Error opening file"
 msgstr "Fout bij openen bestand"
 
-#: src/addressbook.c:518 src/importldif.c:125
+#: src/addressbook.c:520 src/importldif.c:125
 msgid "Error reading file"
 msgstr "Fout bij lezen bestand"
 
-#: src/addressbook.c:519 src/importldif.c:126
+#: src/addressbook.c:521 src/importldif.c:126
 msgid "End of file encountered"
 msgstr "Einde van bestand tegengekomen"
 
-#: src/addressbook.c:520 src/importldif.c:127
+#: src/addressbook.c:522 src/importldif.c:127
 msgid "Error allocating memory"
-msgstr "Fout bij geheugen reserveren"
+msgstr "Fout bij reserveren van geheugen"
 
-#: src/addressbook.c:521 src/importldif.c:128
+#: src/addressbook.c:523 src/importldif.c:128
 msgid "Bad file format"
-msgstr "Fout bestandsformaat"
+msgstr "Fout bestandsformat"
 
-#: src/addressbook.c:522 src/importldif.c:129
+#: src/addressbook.c:524 src/importldif.c:129
 msgid "Error writing to file"
-msgstr "Fout bij schrijven naar bestand."
+msgstr "Fout bij schrijven naar bestand"
 
-#: src/addressbook.c:523 src/importldif.c:130
+#: src/addressbook.c:525 src/importldif.c:130
 msgid "Error opening directory"
 msgstr "Fout openen map"
 
-#: src/addressbook.c:524 src/importldif.c:131
+#: src/addressbook.c:526 src/importldif.c:131
 msgid "No path specified"
-msgstr "Geen pad opgegeven."
+msgstr "Geen pad opgegeven"
 
-#: src/addressbook.c:534
+#: src/addressbook.c:536
 msgid "Error connecting to LDAP server"
 msgstr "Fout bij verbinding maken met POP3-server"
 
-#: src/addressbook.c:535
+#: src/addressbook.c:537
 msgid "Error initializing LDAP"
 msgstr "Fout bij opstarten LDAP"
 
-#: src/addressbook.c:536
+#: src/addressbook.c:538
 msgid "Error binding to LDAP server"
 msgstr "Fout bij binden aan LDAP-server"
 
-#: src/addressbook.c:537
+#: src/addressbook.c:539
 msgid "Error searching LDAP database"
 msgstr "Fout bij zoeken in LDAP-gegevensbank"
 
-#: src/addressbook.c:538
+#: src/addressbook.c:540
 msgid "Timeout performing LDAP operation"
 msgstr "LDAP-operatie niet gelukt binnen de tijdslimiet"
 
-#: src/addressbook.c:539
+#: src/addressbook.c:541
 msgid "Error in LDAP search criteria"
 msgstr "Fout in LDAP-zoekcriteria"
 
-#: src/addressbook.c:540
+#: src/addressbook.c:542
 msgid "No LDAP entries found for search criteria"
 msgstr "Geen LDAP-ingangen gevonden voor zoekcriteria"
 
-#: src/addressbook.c:541
+#: src/addressbook.c:543
 msgid "LDAP search terminated on request"
 msgstr "LDAP-zoekopdracht op verzoek afgebroken"
 
-#: src/addressbook.c:542
+#: src/addressbook.c:544
 msgid "Error starting STARTTLS connection"
 msgstr "Fout bij starten STARTTLS-verbinding"
 
-#: src/addressbook.c:543
+#: src/addressbook.c:545
 msgid "Distinguished Name (dn) is missing"
 msgstr "Distinguished Name (dn) mist"
 
-#: src/addressbook.c:544
+#: src/addressbook.c:546
 msgid "Missing required information"
 msgstr "Benodigde informatie mist"
 
-#: src/addressbook.c:545
+#: src/addressbook.c:547
 msgid "Another contact exists with that key"
 msgstr "Een ander contact bestaat met die sleutel"
 
-#: src/addressbook.c:546
+#: src/addressbook.c:548
 msgid "Strong(er) authentication required"
 msgstr "Sterkere authenticatie vereist"
 
-#: src/addressbook.c:914
+#: src/addressbook.c:916
 msgid "Sources"
 msgstr "Bronnen"
 
-#: src/addressbook.c:918 src/prefs_matcher.c:632 src/prefs_other.c:492
-#: src/toolbar.c:268 src/toolbar.c:2519
+#: src/addressbook.c:920 src/prefs_matcher.c:643 src/prefs_other.c:493
+#: src/toolbar.c:268 src/toolbar.c:2522
 msgid "Address book"
 msgstr "Adresboek"
 
-#: src/addressbook.c:1113 src/editldap.c:798
+#: src/addressbook.c:1118 src/editldap.c:794
 msgid "Search"
 msgstr "Zoek"
 
-#: src/addressbook.c:1484
+#: src/addressbook.c:1490
 msgid "Delete group"
 msgstr "Verwijder groep"
 
-#: src/addressbook.c:1485
+#: src/addressbook.c:1491
 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."
@@ -676,26 +682,26 @@ msgstr ""
 "Wil je deze groep(en) echt verwijderen?\n"
 "De adressen die het bevat zullen niet verloren gaan."
 
-#: src/addressbook.c:2193
+#: src/addressbook.c:2218
 msgid "Cannot paste. Target address book is readonly."
 msgstr "Kan niet plakken. Bedoeld adresboek is alleen-lezen."
 
-#: src/addressbook.c:2203
+#: src/addressbook.c:2228
 msgid "Cannot paste into an address group."
 msgstr "Kan niet plakken in een adresgroep."
 
-#: src/addressbook.c:2911
+#: src/addressbook.c:2965
 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s'?"
 msgstr "Wil je de zoekresultaten en adressen in '%s' verwijderen?"
 
-#: src/addressbook.c:2914 src/addressbook.c:2940 src/addressbook.c:2947
-#: src/plugins/archive/archiver_prefs.c:431 src/prefs_filtering_action.c:177
+#: src/addressbook.c:2968 src/addressbook.c:2994 src/addressbook.c:3001
+#: src/plugins/archive/archiver_prefs.c:431 src/prefs_filtering_action.c:173
 #: src/toolbar.c:497
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: src/addressbook.c:2923
+#: src/addressbook.c:2977
 #, c-format
 msgid ""
 "Do you want to delete '%s'? If you delete the folder only, the addresses it "
@@ -704,20 +710,20 @@ msgstr ""
 "Wil je '%s' verwijderen? Als je alleen de map verwijdert zullen de adressen "
 "die het bevat verplaatst worden naar de bovenliggende map."
 
-#: src/addressbook.c:2926 src/imap_gtk.c:368 src/mh_gtk.c:206
-#: src/plugins/mailmbox/plugin_gtk.c:332 src/plugins/rssyl/rssyl_cb_menu.c:155
+#: src/addressbook.c:2980 src/imap_gtk.c:368 src/mh_gtk.c:206
+#: src/plugins/mailmbox/plugin_gtk.c:332 src/plugins/rssyl/rssyl_cb_menu.c:156
 msgid "Delete folder"
 msgstr "Verwijder map"
 
-#: src/addressbook.c:2927
+#: src/addressbook.c:2981
 msgid "Delete _folder only"
 msgstr "Verwijder alleen _map"
 
-#: src/addressbook.c:2927
+#: src/addressbook.c:2981
 msgid "Delete folder and _addresses"
 msgstr "Verwijder map en _adressen"
 
-#: src/addressbook.c:2938
+#: src/addressbook.c:2992
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -726,7 +732,7 @@ msgstr ""
 "Wil je '%s' verwijderen?\n"
 "De adressen die het bevat zullen niet verloren gaan."
 
-#: src/addressbook.c:2945
+#: src/addressbook.c:2999
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -735,28 +741,28 @@ msgstr ""
 "Wil je '%s' verwijderen?\n"
 "De adressen die het bevat zullen verloren gaan."
 
-#: src/addressbook.c:3059
+#: src/addressbook.c:3113
 #, c-format
 msgid "Search '%s'"
 msgstr "Zoek '%s'"
 
-#: src/addressbook.c:3197 src/addressbook.c:3246
+#: src/addressbook.c:3251 src/addressbook.c:3300
 msgid "New Contacts"
 msgstr "Nieuwe contacten"
 
-#: src/addressbook.c:4085
+#: src/addressbook.c:4137
 msgid "New user, could not save index file."
-msgstr "Nieuwe gebruiker, kon indexbestand niet bewaren"
+msgstr "Nieuwe gebruiker, kon indexbestand niet bewaren."
 
-#: src/addressbook.c:4089
+#: src/addressbook.c:4141
 msgid "New user, could not save address book files."
 msgstr "Nieuwe gebruiker, kon adresboekbestanden niet bewaren."
 
-#: src/addressbook.c:4099
+#: src/addressbook.c:4151
 msgid "Old address book converted successfully."
 msgstr "Oud adresboek is geconverteerd."
 
-#: src/addressbook.c:4104
+#: src/addressbook.c:4156
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
@@ -764,7 +770,7 @@ msgstr ""
 "Oud adresboek geconverteerd,\n"
 "nieuw indexbestand kon niet worden opgeslagen."
 
-#: src/addressbook.c:4117
+#: src/addressbook.c:4169
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -772,7 +778,7 @@ msgstr ""
 "Kon adresboek niet converteren, \n"
 "maar heb lege adresboekbestanden aangemaakt."
 
-#: src/addressbook.c:4123
+#: src/addressbook.c:4175
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
@@ -780,7 +786,7 @@ msgstr ""
 "Kon adresboek niet converteren,\n"
 "nieuw indexbestand kon niet worden aangemaakt."
 
-#: src/addressbook.c:4128
+#: src/addressbook.c:4180
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -788,256 +794,239 @@ msgstr ""
 "Kon adresboek niet converteren\n"
 "en kon nieuwe adresboekbestanden niet aanmaken."
 
-#: src/addressbook.c:4135 src/addressbook.c:4141
+#: src/addressbook.c:4187 src/addressbook.c:4193
 msgid "Addressbook conversion error"
 msgstr "Conversiefout adresboek"
 
-#: src/addressbook.c:4256
+#: src/addressbook.c:4308
 msgid "Addressbook Error"
 msgstr "Adresboekfout"
 
-#: src/addressbook.c:4257
+#: src/addressbook.c:4309
 msgid "Could not read address index"
-msgstr "Kon adresindexbestand niet lezen."
+msgstr "Kon adresindexbestand niet lezen"
 
-#: src/addressbook.c:4588
+#: src/addressbook.c:4640
 msgid "Busy searching..."
 msgstr "Bezig met zoeken..."
 
-#: src/addressbook.c:4897 src/prefs_send.c:216
+#: src/addressbook.c:4970 src/prefs_send.c:220
 msgid "Interface"
 msgstr "Interface"
 
-#: src/addressbook.c:4909
+#: src/addressbook.c:4982
 msgid "Address Books"
 msgstr "Adresboeken"
 
-#: src/addressbook.c:4921
+#: src/addressbook.c:4994
 msgid "Person"
 msgstr "Persoon"
 
-#: src/addressbook.c:4957 src/exporthtml.c:884 src/folderview.c:355
-#: src/folderview.c:443 src/prefs_account.c:2860 src/prefs_folder_column.c:77
+#: src/addressbook.c:5030 src/exporthtml.c:885 src/folderview.c:361
+#: src/folderview.c:449 src/prefs_account.c:3149 src/prefs_folder_column.c:77
 msgid "Folder"
 msgstr "Map"
 
-#: src/addressbook.c:4969
+#: src/addressbook.c:5042
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4981 src/addressbook.c:4993
+#: src/addressbook.c:5054 src/addressbook.c:5066
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:5005
+#: src/addressbook.c:5078
 msgid "LDAP servers"
 msgstr "LDAP-servers"
 
-#: src/addressbook.c:5017
+#: src/addressbook.c:5090
 msgid "LDAP Query"
 msgstr "LDAP-verzoek"
 
-#: src/addressbook_foldersel.c:182 src/exphtmldlg.c:371 src/expldifdlg.c:388
-#: src/exporthtml.c:984 src/importldif.c:657
+#: src/addressbook_foldersel.c:203 src/exphtmldlg.c:371 src/expldifdlg.c:388
+#: src/exporthtml.c:985 src/importldif.c:541
 msgid "Address Book"
 msgstr "Adresboek"
 
-#: src/addressbook_foldersel.c:387 src/plugins/bogofilter/bogofilter.c:107
-#: src/plugins/bogofilter/bogofilter_gtk.c:274
-#: src/plugins/bogofilter/bogofilter_gtk.c:347
-#: src/plugins/bogofilter/bogofilter_gtk.c:424
-#: src/plugins/bsfilter/bsfilter.c:107 src/plugins/bsfilter/bsfilter_gtk.c:197
-#: src/plugins/bsfilter/bsfilter_gtk.c:266
-#: src/plugins/bsfilter/bsfilter_gtk.c:326
-#: src/plugins/spamassassin/spamassassin.c:117
-#: src/plugins/spamassassin/spamassassin_gtk.c:443
-#: src/plugins/spamassassin/spamassassin_gtk.c:490
-#: src/plugins/spamassassin/spamassassin_gtk.c:613 src/prefs_matcher.c:675
-#: src/prefs_matcher.c:710 src/prefs_matcher.c:1621 src/prefs_matcher.c:1628
-#: src/prefs_matcher.c:1636 src/prefs_matcher.c:1638 src/prefs_matcher.c:2522
-#: src/prefs_matcher.c:2526
-msgid "Any"
-msgstr "Elke"
-
-#: src/addrgather.c:173
+#: src/addrgather.c:179
 msgid "Please specify name for address book."
 msgstr "Geef naam voor adresboek."
 
-#: src/addrgather.c:180
+#: src/addrgather.c:186
 msgid "No available address book."
 msgstr "Geen adresboek beschikbaar."
 
-#: src/addrgather.c:201
+#: src/addrgather.c:207
 msgid "Please select the mail headers to search."
 msgstr "Selecteer de headers die doorzocht moeten worden."
 
-#: src/addrgather.c:208
+#: src/addrgather.c:214
 msgid "Collecting addresses..."
 msgstr "Bezig adressen te verzamelen..."
 
-#: src/addrgather.c:248
-msgid "address added by claws-mail"
-msgstr "adres toegevoegd door claws-mail"
+#: src/addrgather.c:254
+msgid "address added by Claws Mail"
+msgstr "adres toegevoegd door Claws Mail"
 
-#: src/addrgather.c:276
+#: src/addrgather.c:285
 msgid "Addresses collected successfully."
 msgstr "Adressen verzameld."
 
-#: src/addrgather.c:351
+#: src/addrgather.c:360
 msgid "Current folder:"
 msgstr "Huidige map:"
 
-#: src/addrgather.c:362
+#: src/addrgather.c:371
 msgid "Address book name:"
 msgstr "Adresboek:"
 
-#: src/addrgather.c:389
+#: src/addrgather.c:398
 msgid "Address book folder size:"
 msgstr "Grootte map van adresboek:"
 
-#: src/addrgather.c:393 src/addrgather.c:403
+#: src/addrgather.c:402 src/addrgather.c:411
 msgid ""
 "Maximum amount of entries per folder within the newly created address book"
 msgstr "Maximum aantal ingangen per map in het nieuwe adresboek"
 
-#: src/addrgather.c:407
+#: src/addrgather.c:415
 msgid "Process these mail header fields"
 msgstr "Deze headers doorzoeken"
 
-#: src/addrgather.c:426
+#: src/addrgather.c:434
 msgid "Include subfolders"
 msgstr "Doorzoek submappen"
 
-#: src/addrgather.c:450 src/prefs_filtering_action.c:1429
+#: src/addrgather.c:492 src/prefs_filtering_action.c:1384
 msgid "Header Name"
 msgstr "Header-naam"
 
-#: src/addrgather.c:451
+#: src/addrgather.c:498
 msgid "Address Count"
 msgstr "Aantal Adressen"
 
-#: src/addrgather.c:561
+#: src/addrgather.c:586
 msgid "Header Fields"
 msgstr "Header-velden"
 
-#: src/addrgather.c:562 src/exphtmldlg.c:658 src/expldifdlg.c:722
-#: src/importldif.c:1022
+#: src/addrgather.c:587 src/exphtmldlg.c:659 src/expldifdlg.c:723
+#: src/importldif.c:982
 msgid "Finish"
 msgstr "Voltooien"
 
-#: src/addrgather.c:620
+#: src/addrgather.c:645
 msgid "Collect email addresses from selected messages"
 msgstr "Verzamel e-mailadressen uit geselecteerde berichten"
 
-#: src/addrgather.c:624
+#: src/addrgather.c:649
 msgid "Collect email addresses from folder"
 msgstr "Verzamel e-mailadressen uit map"
 
-#: src/addrindex.c:124
+#: src/addrindex.c:125
 msgid "Common addresses"
 msgstr "Veel voorkomende adressen"
 
-#: src/addrindex.c:125
+#: src/addrindex.c:126
 msgid "Personal addresses"
 msgstr "Persoonlijke adressen"
 
-#: src/addrindex.c:131
+#: src/addrindex.c:132
 msgid "Common address"
 msgstr "Standaardadressen"
 
-#: src/addrindex.c:132
+#: src/addrindex.c:133
 msgid "Personal address"
 msgstr "Persoonlijke adressen"
 
-#: src/addrindex.c:1829
+#: src/addrindex.c:1834
 msgid "Address(es) update"
 msgstr "Adressen update"
 
-#: src/addrindex.c:1830
+#: src/addrindex.c:1835
 msgid "Update failed. Changes not written to Directory."
 msgstr "Update mislukt. Wijzigingen niet opgeslagen naar map."
 
-#: src/alertpanel.c:146 src/compose.c:9761
+#: src/alertpanel.c:144 src/compose.c:9795
 msgid "Notice"
 msgstr "Bericht"
 
-#: src/alertpanel.c:159 src/compose.c:5848 src/compose.c:6376
-#: src/compose.c:12218 src/file_checker.c:78 src/file_checker.c:100
-#: src/messageview.c:855 src/messageview.c:882 src/plugins/pgpcore/sgpgme.c:806
-#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:4937
+#: src/alertpanel.c:157 src/compose.c:5856 src/compose.c:6401
+#: src/compose.c:12258 src/file_checker.c:84 src/file_checker.c:108
+#: src/messageview.c:858 src/plugins/pgpcore/sgpgme.c:811
+#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:5091
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5785 src/inc.c:663
-#: src/plugins/pgpcore/sgpgme.c:155 src/plugins/pgpcore/sgpgme.c:310
+#: src/alertpanel.c:170 src/alertpanel.c:193 src/compose.c:5793 src/inc.c:726
+#: src/plugins/pgpcore/sgpgme.c:156 src/plugins/pgpcore/sgpgme.c:311
 msgid "Error"
 msgstr "Fout"
 
-#: src/alertpanel.c:196 src/gtk/progressdialog.c:94
+#: src/alertpanel.c:194 src/gtk/progressdialog.c:94
 msgid "_View log"
 msgstr "_Bekijk log"
 
-#: src/alertpanel.c:347
+#: src/alertpanel.c:346
 msgid "Show this message next time"
 msgstr "Deze waarschuwing volgende keer herhalen"
 
-#: src/browseldap.c:218
+#: src/browseldap.c:223
 msgid "Browse Directory Entry"
 msgstr "Bekijk LDAP-ingang"
 
-#: src/browseldap.c:237
+#: src/browseldap.c:243
 msgid "Server Name:"
 msgstr "Servernaam:"
 
-#: src/browseldap.c:247
+#: src/browseldap.c:253
 msgid "Distinguished Name (dn):"
 msgstr "Distinguished Name (dn):"
 
-#: src/browseldap.c:270
+#: src/browseldap.c:284
 msgid "LDAP Name"
 msgstr "LDAP-naam"
 
-#: src/browseldap.c:272
+#: src/browseldap.c:290
 msgid "Attribute Value"
 msgstr "Eigenschapwaarde"
 
-#: src/common/plugin.c:69
+#: src/common/plugin.c:70
 msgid "Nothing"
 msgstr "Niets"
 
-#: src/common/plugin.c:70
+#: src/common/plugin.c:71
 msgid "a viewer"
 msgstr "een weergever"
 
-#: src/common/plugin.c:71
+#: src/common/plugin.c:72
 msgid "a MIME parser"
 msgstr "een MIME-verwerker"
 
-#: src/common/plugin.c:72
+#: src/common/plugin.c:73
 msgid "folders"
 msgstr "mappen"
 
-#: src/common/plugin.c:73
+#: src/common/plugin.c:74
 msgid "filtering"
 msgstr "filteren"
 
-#: src/common/plugin.c:74
+#: src/common/plugin.c:75
 msgid "a privacy interface"
 msgstr "privacy-bescherming"
 
-#: src/common/plugin.c:75
+#: src/common/plugin.c:76
 msgid "a notifier"
 msgstr "een aankondiger"
 
-#: src/common/plugin.c:76
+#: src/common/plugin.c:77
 msgid "an utility"
 msgstr "een utility"
 
-#: src/common/plugin.c:77
+#: src/common/plugin.c:78
 msgid "things"
 msgstr "dingen"
 
-#: src/common/plugin.c:334
+#: src/common/plugin.c:335
 #, c-format
 msgid ""
 "This plugin provides %s (%s), which is already provided by the %s plugin."
@@ -1045,24 +1034,24 @@ msgstr ""
 "Deze plugin levert ondersteuning voor %s (%s), dat reeds ondersteund wordt "
 "door de plugin %s."
 
-#: src/common/plugin.c:437
+#: src/common/plugin.c:438
 msgid "Plugin already loaded"
 msgstr "Plugin is reeds geladen"
 
-#: src/common/plugin.c:448
+#: src/common/plugin.c:449
 msgid "Failed to allocate memory for Plugin"
 msgstr "Geheugen reserveren voor plugin mislukt"
 
-#: src/common/plugin.c:482
+#: src/common/plugin.c:483
 msgid "This module is not licensed under a GPL v3 or later compatible license."
 msgstr ""
 "Deze module heeft geen licentie die verenigbaar is met de GPL v3 of nieuwer."
 
-#: src/common/plugin.c:491
+#: src/common/plugin.c:492
 msgid "This module is for Claws Mail GTK1."
 msgstr "Deze module is voor Claws Mail GTK1."
 
-#: src/common/plugin.c:769
+#: src/common/plugin.c:770
 #, c-format
 msgid ""
 "Your version of Claws Mail is newer than the version the '%s' plugin was "
@@ -1071,7 +1060,7 @@ msgstr ""
 "Je versie van Claws Mail is nieuwer dan de versie waarmee de plugin '%s' "
 "gecompileerd is."
 
-#: src/common/plugin.c:772
+#: src/common/plugin.c:773
 msgid ""
 "Your version of Claws Mail is newer than the version the plugin was built "
 "with."
@@ -1079,16 +1068,16 @@ msgstr ""
 "Je versie van Claws Mail is nieuwer dan de versie waarmee de plugin "
 "gecompileerd is."
 
-#: src/common/plugin.c:781
+#: src/common/plugin.c:782
 #, c-format
 msgid "Your version of Claws Mail is too old for the '%s' plugin."
 msgstr "Je versie van Claws Mail is te oud voor de '%s'-plugin."
 
-#: src/common/plugin.c:783
+#: src/common/plugin.c:784
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "Je versie van Claws Mail is te oud voor de plugin."
 
-#: src/common/session.c:183 src/imap.c:1207
+#: src/common/session.c:201 src/imap.c:1233
 msgid "SSL/TLS handshake failed\n"
 msgstr "SSL/TLS-handdruk mislukt\n"
 
@@ -1108,7 +1097,7 @@ msgstr "verkeerd SMTP-antwoord\n"
 msgid "error occurred on SMTP session\n"
 msgstr "er is een fout opgetreden tijdens de SMTP-sessie\n"
 
-#: src/common/smtp.c:535 src/pop.c:905
+#: src/common/smtp.c:535 src/pop.c:907
 msgid "error occurred on authentication\n"
 msgstr "er is een fout opgetreden tijdens de authenticatie\n"
 
@@ -1117,7 +1106,7 @@ msgstr "er is een fout opgetreden tijdens de authenticatie\n"
 msgid "Message is too big (Maximum size is %s)\n"
 msgstr "Bericht is te groot (Maximum grootte is %s)\n"
 
-#: src/common/smtp.c:617 src/pop.c:898
+#: src/common/smtp.c:617 src/pop.c:900
 msgid "couldn't start STARTTLS session\n"
 msgstr "kan de STARTTLS-sessie niet tot stand brengen\n"
 
@@ -1129,104 +1118,104 @@ msgstr "Socket-IO tijdslimiet bereikt.\n"
 msgid "Connection timed out.\n"
 msgstr "Verbinding niet binnen tijdslimiet tot stand gekomen.\n"
 
-#: src/common/socket.c:734
+#: src/common/socket.c:740
 #, c-format
 msgid "%s:%d: connection failed (%s).\n"
 msgstr "%s:%d: verbinding maken mislukt (%s).\n"
 
-#: src/common/socket.c:974
+#: src/common/socket.c:980
 #, c-format
 msgid "%s:%d: unknown host.\n"
 msgstr "%s:%d: onbekende host.\n"
 
-#: src/common/socket.c:1066
+#: src/common/socket.c:1072
 #, c-format
 msgid "%s:%s: host lookup failed (%s).\n"
 msgstr "%s:%s: host opzoeken mislukt (%s).\n"
 
-#: src/common/socket.c:1370
+#: src/common/socket.c:1385
 #, c-format
 msgid "write on fd%d: %s\n"
 msgstr "schrijf op fd%d: %s\n"
 
-#: src/common/ssl_certificate.c:326
+#: src/common/ssl_certificate.c:338
 #, c-format
 msgid "Cannot stat P12 certificate file (%s)\n"
 msgstr "Kan P12-certificaat-bestand niet vinden (%s)\n"
 
-#: src/common/ssl_certificate.c:334
+#: src/common/ssl_certificate.c:346
 #, c-format
 msgid "Cannot read P12 certificate file (%s)\n"
 msgstr "Kan P12-certificaat-bestand niet lezen (%s)\n"
 
-#: src/common/ssl_certificate.c:343
+#: src/common/ssl_certificate.c:355
 #, c-format
 msgid "Cannot import P12 certificate file (%s)\n"
 msgstr "Kan P12-certificaat-bestand niet importeren (%s)\n"
 
-#: src/common/ssl_certificate.c:628
+#: src/common/ssl_certificate.c:640
 msgid "Internal error"
 msgstr "Interne fout"
 
-#: src/common/ssl_certificate.c:633
+#: src/common/ssl_certificate.c:645
 msgid "Uncheckable"
 msgstr "Niet verifieerbaar"
 
-#: src/common/ssl_certificate.c:637
+#: src/common/ssl_certificate.c:649
 msgid "Self-signed certificate"
 msgstr "Zelfondertekend certificaat"
 
-#: src/common/ssl_certificate.c:640
+#: src/common/ssl_certificate.c:652
 msgid "Revoked certificate"
 msgstr "Ingetrokken certificaat"
 
-#: src/common/ssl_certificate.c:642
+#: src/common/ssl_certificate.c:654
 msgid "No certificate issuer found"
 msgstr "Geen uitgever van certificaat gevonden"
 
-#: src/common/ssl_certificate.c:644
+#: src/common/ssl_certificate.c:656
 msgid "Certificate issuer is not a CA"
 msgstr "Uitgever van certificaat is geen CA"
 
-#: src/common/ssl_certificate.c:869
+#: src/common/ssl_certificate.c:881
 #, c-format
 msgid "Cannot open certificate file %s: %s\n"
 msgstr "Kan certificaat-bestand %s niet openen: %s\n"
 
-#: src/common/ssl_certificate.c:873
+#: src/common/ssl_certificate.c:885
 #, c-format
 msgid "Certificate file %s missing (%s)\n"
 msgstr "Certificaat-bestand %s mist (%s)\n"
 
-#: src/common/ssl_certificate.c:892
+#: src/common/ssl_certificate.c:904
 #, c-format
 msgid "Cannot open key file %s (%s)\n"
 msgstr "Kan sleutel-bestand %s niet openen (%s)\n"
 
-#: src/common/ssl_certificate.c:896
+#: src/common/ssl_certificate.c:908
 #, c-format
 msgid "Key file %s missing (%s)\n"
 msgstr "Sleutel-bestand %s mist (%s)\n"
 
-#: src/common/ssl_certificate.c:1044
+#: src/common/ssl_certificate.c:1056
 #, c-format
 msgid "Failed to read P12 certificate file %s\n"
 msgstr "Kan P12-certificaat bestand niet lezen %s\n"
 
-#: src/common/ssl_certificate.c:1047
+#: src/common/ssl_certificate.c:1059
 #, c-format
 msgid "Cannot open P12 certificate file %s (%s)\n"
 msgstr "Kan P12-certificaat bestand niet openen %s (%s)\n"
 
-#: src/common/ssl_certificate.c:1051
+#: src/common/ssl_certificate.c:1063
 #, c-format
 msgid "P12 Certificate file %s missing (%s)\n"
 msgstr "P12-Certificaat bestand %s mist (%s)\n"
 
-#: src/common/ssl_certificate.c:1076 src/gtk/sslcertwindow.c:85
-#: src/gtk/sslcertwindow.c:92 src/gtk/sslcertwindow.c:107
-#: src/gtk/sslcertwindow.c:112 src/gtk/sslcertwindow.c:119
-#: src/gtk/sslcertwindow.c:134
+#: src/common/ssl_certificate.c:1088 src/gtk/sslcertwindow.c:87
+#: src/gtk/sslcertwindow.c:94 src/gtk/sslcertwindow.c:109
+#: src/gtk/sslcertwindow.c:114 src/gtk/sslcertwindow.c:121
+#: src/gtk/sslcertwindow.c:136
 msgid "<not in certificate>"
 msgstr "<niet in certificaat>"
 
@@ -1234,582 +1223,596 @@ msgstr "<niet in certificaat>"
 msgid "(Subject cleared by RegExp)"
 msgstr "(Onderwerp gewist door RegExp)"
 
-#: src/common/utils.c:256
+#: src/common/utils.c:200
 #, c-format
 msgid "%dB"
 msgstr "%dB"
 
-#: src/common/utils.c:257
+#: src/common/utils.c:201
 #, c-format
 msgid "%d.%02dKB"
 msgstr "%d,%02dKB"
 
-#: src/common/utils.c:258
+#: src/common/utils.c:202
 #, c-format
 msgid "%d.%02dMB"
 msgstr "%d,%02dMB"
 
-#: src/common/utils.c:259
+#: src/common/utils.c:203
 #, c-format
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: src/common/utils.c:4781
+#: src/common/utils.c:4028
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "zondag"
 
-#: src/common/utils.c:4782
+#: src/common/utils.c:4029
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "maandag"
 
-#: src/common/utils.c:4783
+#: src/common/utils.c:4030
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "dinsdag"
 
-#: src/common/utils.c:4784
+#: src/common/utils.c:4031
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "woensdag"
 
-#: src/common/utils.c:4785
+#: src/common/utils.c:4032
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "donderdag"
 
-#: src/common/utils.c:4786
+#: src/common/utils.c:4033
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "vrijdag"
 
-#: src/common/utils.c:4787
+#: src/common/utils.c:4034
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "zaterdag"
 
-#: src/common/utils.c:4789
+#: src/common/utils.c:4036
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "januari"
 
-#: src/common/utils.c:4790
+#: src/common/utils.c:4037
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "februari"
 
-#: src/common/utils.c:4791
+#: src/common/utils.c:4038
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "maart"
 
-#: src/common/utils.c:4792
+#: src/common/utils.c:4039
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "april"
 
-#: src/common/utils.c:4793
+#: src/common/utils.c:4040
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "mei"
 
-#: src/common/utils.c:4794
+#: src/common/utils.c:4041
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "juni"
 
-#: src/common/utils.c:4795
+#: src/common/utils.c:4042
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "juli"
 
-#: src/common/utils.c:4796
+#: src/common/utils.c:4043
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "augustus"
 
-#: src/common/utils.c:4797
+#: src/common/utils.c:4044
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "september"
 
-#: src/common/utils.c:4798
+#: src/common/utils.c:4045
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "oktober"
 
-#: src/common/utils.c:4799
+#: src/common/utils.c:4046
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "november"
 
-#: src/common/utils.c:4800
+#: src/common/utils.c:4047
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "december"
 
-#: src/common/utils.c:4802
+#: src/common/utils.c:4049
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "zo"
 
-#: src/common/utils.c:4803
+#: src/common/utils.c:4050
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "ma"
 
-#: src/common/utils.c:4804
+#: src/common/utils.c:4051
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "di"
 
-#: src/common/utils.c:4805
+#: src/common/utils.c:4052
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "wo"
 
-#: src/common/utils.c:4806
+#: src/common/utils.c:4053
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "do"
 
-#: src/common/utils.c:4807
+#: src/common/utils.c:4054
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "vr"
 
-#: src/common/utils.c:4808
+#: src/common/utils.c:4055
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "za"
 
-#: src/common/utils.c:4810
+#: src/common/utils.c:4057
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "jan"
 
-#: src/common/utils.c:4811
+#: src/common/utils.c:4058
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "feb"
 
-#: src/common/utils.c:4812
+#: src/common/utils.c:4059
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "mar"
 
-#: src/common/utils.c:4813
+#: src/common/utils.c:4060
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "apr"
 
-#: src/common/utils.c:4814
+#: src/common/utils.c:4061
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "mei"
 
-#: src/common/utils.c:4815
+#: src/common/utils.c:4062
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "jun"
 
-#: src/common/utils.c:4816
+#: src/common/utils.c:4063
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "jul"
 
-#: src/common/utils.c:4817
+#: src/common/utils.c:4064
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "aug"
 
-#: src/common/utils.c:4818
+#: src/common/utils.c:4065
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "sep"
 
-#: src/common/utils.c:4819
+#: src/common/utils.c:4066
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "okt"
 
-#: src/common/utils.c:4820
+#: src/common/utils.c:4067
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "nov"
 
-#: src/common/utils.c:4821
+#: src/common/utils.c:4068
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "dec"
 
-#: src/common/utils.c:4832
+#: src/common/utils.c:4079
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "a.m."
 
-#: src/common/utils.c:4833
+#: src/common/utils.c:4080
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "p.m."
 
-#: src/common/utils.c:4834
+#: src/common/utils.c:4081
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "a.m."
 
-#: src/common/utils.c:4835
+#: src/common/utils.c:4082
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "p.m."
 
-#: src/compose.c:589
+#: src/compose.c:596
 msgid "_Add..."
 msgstr "_Toevoegen..."
 
-#: src/compose.c:590 src/mh_gtk.c:375 src/plugins/mailmbox/plugin_gtk.c:301
-#: src/plugins/rssyl/rssyl_cb_menu.c:316
+#: src/compose.c:597 src/mh_gtk.c:375 src/plugins/mailmbox/plugin_gtk.c:301
+#: src/plugins/rssyl/rssyl_cb_menu.c:323
 msgid "_Remove"
 msgstr "_Verwijderen"
 
-#: src/compose.c:592 src/folderview.c:254
+#: src/compose.c:599 src/folderview.c:254
 msgid "_Properties..."
 msgstr "_Eigenschappen..."
 
-#: src/compose.c:599 src/mainwindow.c:516 src/messageview.c:211
+#: src/compose.c:606 src/mainwindow.c:525 src/messageview.c:214
 msgid "_Message"
 msgstr "Be_richt"
 
-#: src/compose.c:602
+#: src/compose.c:609
 msgid "_Spelling"
 msgstr "_Spelling"
 
-#: src/compose.c:604 src/compose.c:671
+#: src/compose.c:611 src/compose.c:678
 msgid "_Options"
 msgstr "_Opties"
 
-#: src/compose.c:608
+#: src/compose.c:615
 msgid "S_end"
 msgstr "_Verzenden"
 
-#: src/compose.c:609
+#: src/compose.c:616
 msgid "Send _later"
 msgstr "_Wachtrij"
 
-#: src/compose.c:612
+#: src/compose.c:619
 msgid "_Attach file"
 msgstr "Bestand _bijvoegen"
 
-#: src/compose.c:613
+#: src/compose.c:620
 msgid "_Insert file"
 msgstr "Bestand _invoegen"
 
-#: src/compose.c:614
+#: src/compose.c:621
 msgid "Insert si_gnature"
-msgstr "_Handtekening invoegen"
+msgstr "Ondertekening _invoegen"
 
-#: src/compose.c:615
+#: src/compose.c:622
 msgid "_Replace signature"
-msgstr "_Vervang ondertekening"
+msgstr "Ondertekening _vervangen"
 
-#: src/compose.c:619
+#: src/compose.c:626
 msgid "_Print"
 msgstr "_Afdrukken"
 
-#: src/compose.c:624 src/plugins/managesieve/sieve_editor.c:91
+#: src/compose.c:631 src/plugins/managesieve/sieve_editor.c:91
 msgid "_Undo"
 msgstr "_Ongedaan maken"
 
-#: src/compose.c:625 src/plugins/managesieve/sieve_editor.c:92
+#: src/compose.c:632 src/plugins/managesieve/sieve_editor.c:92
 msgid "_Redo"
 msgstr "Op_nieuw"
 
-#: src/compose.c:628 src/plugins/managesieve/sieve_editor.c:95
+#: src/compose.c:635 src/plugins/managesieve/sieve_editor.c:95
 msgid "Cu_t"
 msgstr "K_nippen"
 
-#: src/compose.c:632
+#: src/compose.c:639
 msgid "_Special paste"
 msgstr "_Plakken speciaal"
 
-#: src/compose.c:633
+#: src/compose.c:640
 msgid "As _quotation"
 msgstr "Als _citaten"
 
-#: src/compose.c:634
+#: src/compose.c:641
 msgid "_Wrapped"
 msgstr "Afge_broken"
 
-#: src/compose.c:635
+#: src/compose.c:642
 msgid "_Unwrapped"
 msgstr "Niet afgeb_roken"
 
-#: src/compose.c:637 src/mainwindow.c:549
+#: src/compose.c:644 src/mainwindow.c:558
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "_Alles selecteren"
 
-#: src/compose.c:639
+#: src/compose.c:646
 msgid "A_dvanced"
 msgstr "_Geavanceerd"
 
-#: src/compose.c:640
+#: src/compose.c:647
 msgid "Move a character backward"
 msgstr "Ga een teken terug"
 
-#: src/compose.c:641
+#: src/compose.c:648
 msgid "Move a character forward"
 msgstr "Ga een teken verder"
 
-#: src/compose.c:642
+#: src/compose.c:649
 msgid "Move a word backward"
 msgstr "Ga een woord terug"
 
-#: src/compose.c:643
+#: src/compose.c:650
 msgid "Move a word forward"
 msgstr "Ga een woord verder"
 
-#: src/compose.c:644
+#: src/compose.c:651
 msgid "Move to beginning of line"
 msgstr "Ga naar begin van regel"
 
-#: src/compose.c:645
+#: src/compose.c:652
 msgid "Move to end of line"
 msgstr "Ga naar eind van regel"
 
-#: src/compose.c:646
+#: src/compose.c:653
 msgid "Move to previous line"
 msgstr "Ga een regel terug"
 
-#: src/compose.c:647
+#: src/compose.c:654
 msgid "Move to next line"
 msgstr "Ga een regel verder"
 
-#: src/compose.c:648
+#: src/compose.c:655
 msgid "Delete a character backward"
 msgstr "Verwijder vorige teken"
 
-#: src/compose.c:649
+#: src/compose.c:656
 msgid "Delete a character forward"
 msgstr "Verwijder volgende teken"
 
-#: src/compose.c:650
+#: src/compose.c:657
 msgid "Delete a word backward"
 msgstr "Verwijder vorig woord"
 
-#: src/compose.c:651
+#: src/compose.c:658
 msgid "Delete a word forward"
 msgstr "Verwijder volgend woord"
 
-#: src/compose.c:652
+#: src/compose.c:659
 msgid "Delete line"
 msgstr "Verwijder deze regel"
 
-#: src/compose.c:653
+#: src/compose.c:660
 msgid "Delete to end of line"
 msgstr "Verwijder tot eind van regel"
 
-#: src/compose.c:656 src/messageview.c:228
+#: src/compose.c:663 src/messageview.c:231
 #: src/plugins/managesieve/sieve_editor.c:102
 msgid "_Find"
 msgstr "_Vinden"
 
-#: src/compose.c:659
+#: src/compose.c:666
 msgid "_Wrap current paragraph"
 msgstr "Regels afbreken in _huidige paragraaf"
 
-#: src/compose.c:660
+#: src/compose.c:667
 msgid "Wrap all long _lines"
 msgstr "Regelterugloop voor alle regels"
 
-#: src/compose.c:662
+#: src/compose.c:669
 msgid "Edit with e_xternal editor"
 msgstr "Aanpassen met e_xterne editor"
 
-#: src/compose.c:665
+#: src/compose.c:672
 msgid "_Check all or check selection"
 msgstr "_Controleer alles of selectie"
 
-#: src/compose.c:666
+#: src/compose.c:673
 msgid "_Highlight all misspelled words"
 msgstr "Toon alle _onjuist gespelde woorden"
 
-#: src/compose.c:667
+#: src/compose.c:674
 msgid "Check _backwards misspelled word"
 msgstr "Controleer _vorig onjuist gespeld woord"
 
-#: src/compose.c:668
+#: src/compose.c:675
 msgid "_Forward to next misspelled word"
 msgstr "Ga naar _volgend onjuist gespeld woord"
 
-#: src/compose.c:675
+#: src/compose.c:682
 msgid "Reply _mode"
 msgstr "_Beantwoord afzender"
 
-#: src/compose.c:677
+#: src/compose.c:684
 msgid "Privacy _System"
 msgstr "Privacy-_systeem"
 
-#: src/compose.c:681
+#: src/compose.c:688
 msgid "_Priority"
 msgstr "_Prioriteit"
 
-#: src/compose.c:683 src/mainwindow.c:611 src/messageview.c:264
+#: src/compose.c:690 src/mainwindow.c:620 src/messageview.c:267
 msgid "Character _encoding"
 msgstr "Tekenset_codering"
 
-#: src/compose.c:688 src/mainwindow.c:616 src/messageview.c:269
+#: src/compose.c:695 src/mainwindow.c:625 src/messageview.c:272
 msgid "Western European"
 msgstr "West-Europees"
 
-#: src/compose.c:689 src/mainwindow.c:617 src/messageview.c:270
+#: src/compose.c:696 src/mainwindow.c:626 src/messageview.c:273
 msgid "Baltic"
 msgstr "Baltisch"
 
-#: src/compose.c:690 src/mainwindow.c:618 src/messageview.c:271
+#: src/compose.c:697 src/mainwindow.c:627 src/messageview.c:274
 msgid "Hebrew"
 msgstr "Hebreeuws"
 
-#: src/compose.c:691 src/mainwindow.c:619 src/messageview.c:272
+#: src/compose.c:698 src/mainwindow.c:628 src/messageview.c:275
 msgid "Arabic"
 msgstr "Arabisch"
 
-#: src/compose.c:692 src/mainwindow.c:620 src/messageview.c:273
+#: src/compose.c:699 src/mainwindow.c:629 src/messageview.c:276
 msgid "Cyrillic"
 msgstr "Cyrillisch"
 
-#: src/compose.c:693 src/mainwindow.c:621 src/messageview.c:274
+#: src/compose.c:700 src/mainwindow.c:630 src/messageview.c:277
 msgid "Japanese"
 msgstr "Japans"
 
-#: src/compose.c:694 src/mainwindow.c:622 src/messageview.c:275
+#: src/compose.c:701 src/mainwindow.c:631 src/messageview.c:278
 msgid "Chinese"
 msgstr "Chinees"
 
-#: src/compose.c:695 src/mainwindow.c:623 src/messageview.c:276
+#: src/compose.c:702 src/mainwindow.c:632 src/messageview.c:279
 msgid "Korean"
 msgstr "Koreaans"
 
-#: src/compose.c:696 src/mainwindow.c:624 src/messageview.c:277
+#: src/compose.c:703 src/mainwindow.c:633 src/messageview.c:280
 msgid "Thai"
 msgstr "Thai"
 
-#: src/compose.c:699 src/mainwindow.c:734 src/messageview.c:313
+#: src/compose.c:706 src/mainwindow.c:743 src/messageview.c:316
 msgid "_Address book"
 msgstr "_Adresboek"
 
-#: src/compose.c:701
+#: src/compose.c:708
 msgid "_Template"
 msgstr "_Sjabloon"
 
-#: src/compose.c:703 src/mainwindow.c:762 src/messageview.c:333
+#: src/compose.c:710 src/mainwindow.c:771 src/messageview.c:336
 msgid "Actio_ns"
 msgstr "Ac_ties"
 
-#: src/compose.c:712
+#: src/compose.c:719
 msgid "Aut_o wrapping"
 msgstr "Aut_omatisch afbreken"
 
-#: src/compose.c:713
+#: src/compose.c:720
 msgid "Auto _indent"
 msgstr "Automatisch _inspringen"
 
-#: src/compose.c:714
+#: src/compose.c:721
 msgid "Si_gn"
 msgstr "_Ondertekenen"
 
-#: src/compose.c:715
+#: src/compose.c:722
 msgid "_Encrypt"
 msgstr "_Versleutelen"
 
-#: src/compose.c:716
+#: src/compose.c:723
 msgid "_Request Return Receipt"
 msgstr "_Ontvangstbevestiging"
 
-#: src/compose.c:717
+#: src/compose.c:724
 msgid "Remo_ve references"
-msgstr "Ver_wijder verwijzingen..."
+msgstr "Ver_wijder verwijzingen"
 
-#: src/compose.c:718
+#: src/compose.c:725
 msgid "Show _ruler"
 msgstr "_Lineaal weergeven"
 
-#: src/compose.c:723 src/compose.c:733
+#: src/compose.c:730 src/compose.c:740
 msgid "_Normal"
 msgstr "_Normaal"
 
-#: src/compose.c:724 src/mainwindow.c:665 src/messageview.c:302
+#: src/compose.c:731 src/mainwindow.c:674 src/messageview.c:305
+#: src/summaryview.c:433
 msgid "_All"
 msgstr "_Allen"
 
-#: src/compose.c:725 src/mainwindow.c:666 src/messageview.c:303
+#: src/compose.c:732 src/mainwindow.c:675 src/messageview.c:306
+#: src/summaryview.c:434
 msgid "_Sender"
 msgstr "_Afzender"
 
-#: src/compose.c:726
+#: src/compose.c:733
 msgid "_Mailing-list"
 msgstr "_Mailing-lijst"
 
-#: src/compose.c:731
+#: src/compose.c:738
 msgid "_Highest"
 msgstr "_Hoogste"
 
-#: src/compose.c:732
+#: src/compose.c:739
 msgid "Hi_gh"
 msgstr "H_oog"
 
-#: src/compose.c:734
+#: src/compose.c:741
 msgid "Lo_w"
 msgstr "Laa_g"
 
-#: src/compose.c:735
+#: src/compose.c:742
 msgid "_Lowest"
 msgstr "_Laagste"
 
-#: src/compose.c:740 src/mainwindow.c:878 src/messageview.c:350
+#: src/compose.c:747 src/mainwindow.c:890 src/messageview.c:353
 msgid "_Automatic"
 msgstr "_Automatisch"
 
-#: src/compose.c:741 src/mainwindow.c:879 src/messageview.c:351
+#: src/compose.c:748 src/mainwindow.c:891 src/messageview.c:354
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "7bit ASCII (US-ASC_II)"
 
-#: src/compose.c:742 src/mainwindow.c:880 src/messageview.c:352
+#: src/compose.c:749 src/mainwindow.c:892 src/messageview.c:355
 msgid "Unicode (_UTF-8)"
 msgstr "Unicode (_UTF-8)"
 
-#: src/compose.c:746 src/mainwindow.c:884 src/messageview.c:356
+#: src/compose.c:753 src/mainwindow.c:896 src/messageview.c:359
 msgid "Central European (ISO-8859-_2)"
 msgstr "Centraal-Europees (ISO-8859-_2)"
 
-#: src/compose.c:749 src/mainwindow.c:887 src/messageview.c:359
+#: src/compose.c:756 src/mainwindow.c:899 src/messageview.c:362
 msgid "Greek (ISO-8859-_7)"
 msgstr "Grieks (ISO-8859-_7)"
 
-#: src/compose.c:754 src/mainwindow.c:892 src/messageview.c:364
+#: src/compose.c:761 src/mainwindow.c:904 src/messageview.c:367
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Turks (ISO-8859-_9)"
 
-#: src/compose.c:1083
+#: src/compose.c:1015 src/compose.c:1697
+msgid ""
+"You have opted to sign and/or encrypt this message but have not selected a "
+"privacy system.\n"
+"\n"
+"Signing and encrypting have been disabled for this message."
+msgstr ""
+"Je hebt ervoor gekozen dit bericht te ondertekenen en/of te versleutelen, "
+"maar je hebt geen privacy-systeem geselecteerd.\n"
+"\n"
+"Ondertekenen en versleutelen is uitgeschakeld voor dit bericht."
+
+#: src/compose.c:1051
 msgid "New message From format error."
 msgstr "Opmaakfout in Van-header van nieuw bericht."
 
-#: src/compose.c:1176
+#: src/compose.c:1144
 msgid "New message subject format error."
 msgstr "Opmaakfout in onderwerp van nieuw bericht."
 
-#: src/compose.c:1208 src/quote_fmt.c:570
+#: src/compose.c:1176 src/quote_fmt.c:563
 #, c-format
 msgid "The body of the \"New message\" template has an error at line %d."
 msgstr "Opmaakfout in berichttekst van \"Nieuw bericht\" op regel %d."
 
-#: src/compose.c:1473
+#: src/compose.c:1445
 msgid "Unable to reply. The original email probably doesn't exist."
 msgstr ""
 "Niet mogelijk te antwoorden. De originele e-mail bestaat waarschijnlijk niet."
 
-#: src/compose.c:1656 src/quote_fmt.c:587
+#: src/compose.c:1630 src/quote_fmt.c:580
 msgid ""
 "The \"From\" field of the \"Reply\" template contains an invalid email "
 "address."
@@ -1817,12 +1820,12 @@ msgstr ""
 "Het \"Van\" veld van het \"Antwoord\" sjabloon bevat een ongeldig e-"
 "mailadres."
 
-#: src/compose.c:1705 src/quote_fmt.c:590
+#: src/compose.c:1679 src/quote_fmt.c:583
 #, c-format
 msgid "The body of the \"Reply\" template has an error at line %d."
 msgstr "Opmaakfout in berichttekst van het \"Antwoord\" sjabloon op regel %d."
 
-#: src/compose.c:1839 src/compose.c:2031 src/quote_fmt.c:607
+#: src/compose.c:1822 src/compose.c:2016 src/quote_fmt.c:600
 msgid ""
 "The \"From\" field of the \"Forward\" template contains an invalid email "
 "address."
@@ -1830,56 +1833,56 @@ msgstr ""
 "Het \"Van\" veld van het \"Doorsturen\" sjabloon bevat een ongeldig e-"
 "mailadres."
 
-#: src/compose.c:1900 src/quote_fmt.c:610
+#: src/compose.c:1883 src/quote_fmt.c:603
 #, c-format
 msgid "The body of the \"Forward\" template has an error at line %d."
 msgstr "De tekst van het \"Doorsturen\" sjabloon heeft een fout op regel %d."
 
-#: src/compose.c:2074
+#: src/compose.c:2059
 msgid "Fw: multiple emails"
 msgstr "Doorsturen: meerdere e-mails"
 
 # TPTD
-#: src/compose.c:2576
+#: src/compose.c:2566
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr "De tekst van het \"Herverwijzen\" sjabloon heeft en fout op regel %d."
 
-#: src/compose.c:2643 src/gtk/headers.h:14
+#: src/compose.c:2633 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/compose.c:2646 src/gtk/headers.h:15
+#: src/compose.c:2636 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: src/compose.c:2649 src/gtk/headers.h:12
+#: src/compose.c:2639 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "Reply-To:"
 
-#: src/compose.c:2652 src/compose.c:5019 src/compose.c:5021
+#: src/compose.c:2642 src/compose.c:5011 src/compose.c:5013
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "Nieuwsgroepen:"
 
-#: src/compose.c:2655 src/gtk/headers.h:34
+#: src/compose.c:2645 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "Followup-To:"
 
-#: src/compose.c:2658 src/gtk/headers.h:17
+#: src/compose.c:2648 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "In antwoord aan:"
 
-#: src/compose.c:2662 src/compose.c:5016 src/compose.c:5024
-#: src/gtk/headers.h:13 src/summary_search.c:481
+#: src/compose.c:2652 src/compose.c:5008 src/compose.c:5016
+#: src/gtk/headers.h:13 src/summary_search.c:422
 msgid "To:"
 msgstr "Aan:"
 
-#: src/compose.c:2852
+#: src/compose.c:2842
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr "Kan bestand niet bijvoegen (omzetten van de tekenset is mislukt)."
 
-#: src/compose.c:2858
+#: src/compose.c:2848
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -1887,19 +1890,23 @@ msgid ""
 msgid_plural ""
 "The following files have been attached: \n"
 "%s"
-msgstr[0] "Het bestand '%s' is bijgevoegd:"
-msgstr[1] "De bestanden '%s' zijn bijgevoegd:"
+msgstr[0] ""
+"Het volgende bestand is bijgevoegd: \n"
+"%s"
+msgstr[1] ""
+"De volgende bestanden zijn bijgevoegd: \n"
+"%s"
 
-#: src/compose.c:3138
+#: src/compose.c:3128
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "De \"Citatie-markering\" van het sjabloon is ongeldig."
 
-#: src/compose.c:3667
+#: src/compose.c:3657
 #, c-format
 msgid "Could not get size of file '%s'."
-msgstr "Kon grootte van bestand '%s' niet opvragen"
+msgstr "Kon grootte van bestand '%s' niet opvragen."
 
-#: src/compose.c:3685
+#: src/compose.c:3675
 #, c-format
 msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
@@ -1908,57 +1915,57 @@ msgstr ""
 "Je staat op het punt een bestand van %s in de berichttekst in te voegen. Wil "
 "je doorgaan?"
 
-#: src/compose.c:3688
+#: src/compose.c:3678
 msgid "Are you sure?"
 msgstr "Wil je doorgaan?"
 
-#: src/compose.c:3689 src/compose.c:10817 src/compose.c:11695
+#: src/compose.c:3679 src/compose.c:10844 src/compose.c:11738
 msgid "_Insert"
 msgstr "_Invoegen"
 
-#: src/compose.c:3813
+#: src/compose.c:3804
 #, c-format
 msgid "File %s is empty."
 msgstr "Bestand %s is leeg."
 
-#: src/compose.c:3814
+#: src/compose.c:3805
 msgid "Empty file"
 msgstr "Leeg bestand"
 
-#: src/compose.c:3815
+#: src/compose.c:3806
 msgid "_Attach anyway"
 msgstr "Toch bijvoegen"
 
-#: src/compose.c:3824
+#: src/compose.c:3815
 #, c-format
 msgid "Can't read %s."
 msgstr "Kan %s niet lezen."
 
-#: src/compose.c:3851
+#: src/compose.c:3842
 #, c-format
 msgid "Message: %s"
 msgstr "Bericht: %s"
 
-#: src/compose.c:4856 src/plugins/managesieve/sieve_editor.c:694
+#: src/compose.c:4852 src/plugins/managesieve/sieve_editor.c:696
 #: src/plugins/python/composewindowtype.c:498
 msgid " [Edited]"
 msgstr " [Aangepast]"
 
-#: src/compose.c:4863 src/plugins/python/composewindowtype.c:501
+#: src/compose.c:4859 src/plugins/python/composewindowtype.c:501
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Bericht opstellen%s"
 
-#: src/compose.c:4866 src/plugins/python/composewindowtype.c:504
+#: src/compose.c:4862 src/plugins/python/composewindowtype.c:504
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[geen onderwerp] - Bericht opstellen%s"
 
-#: src/compose.c:4868 src/plugins/python/composewindowtype.c:492
+#: src/compose.c:4864 src/plugins/python/composewindowtype.c:492
 msgid "Compose message"
 msgstr "Bericht opstellen"
 
-#: src/compose.c:4895 src/messageview.c:903
+#: src/compose.c:4891 src/messageview.c:887
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1966,103 +1973,112 @@ msgstr ""
 "Geen account opgegeven voor het verzenden van berichten.\n"
 "Selecteer eerst een account."
 
-#: src/compose.c:5116 src/compose.c:5153
+#: src/compose.c:5108 src/compose.c:5145
 #, c-format
 msgid "The only recipient is the default '%s' address. Send anyway?"
 msgstr "De enige ontvanger is het standaard '%s'-adres. Toch verzenden?"
 
-#: src/compose.c:5118 src/compose.c:5155 src/compose.c:5198 src/compose.c:5247
-#: src/prefs_account.c:3405 src/toolbar.c:487 src/toolbar.c:519
+#: src/compose.c:5110 src/compose.c:5147 src/compose.c:5185 src/compose.c:5228
+#: src/prefs_account.c:3758 src/toolbar.c:487 src/toolbar.c:519
 msgid "Send"
 msgstr "Verzenden"
 
-#: src/compose.c:5120 src/compose.c:5157 src/compose.c:5191 src/compose.c:5240
-#: src/compose.c:5786 src/folderview.c:2543 src/messageview.c:856
-#: src/messageview.c:884 src/plugins/attachwarner/attachwarner.c:210
-#: src/toolbar.c:3030
+#: src/compose.c:5112 src/compose.c:5149 src/compose.c:5186 src/compose.c:5229
+#: src/compose.c:5794 src/folderview.c:2546 src/messageview.c:859
+#: src/plugins/attachwarner/attachwarner.c:218 src/toolbar.c:3054
 msgid "_Send"
 msgstr "_Verzenden"
 
-#: src/compose.c:5174
+#: src/compose.c:5166
 msgid "Recipient is not specified."
 msgstr "Geen ontvanger opgegeven."
 
-#: src/compose.c:5193 src/compose.c:5242
-#: src/plugins/attachwarner/attachwarner.c:212
-msgid "_Queue"
-msgstr "_Wachtrij"
-
-#: src/compose.c:5194
+#: src/compose.c:5181
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "Het onderwerp is leeg. %s"
 
-#: src/compose.c:5195 src/compose.c:5244
-#: src/plugins/attachwarner/attachwarner.c:222
+#: src/compose.c:5182 src/compose.c:5225
+#: src/plugins/attachwarner/attachwarner.c:215
 msgid "Send it anyway?"
 msgstr "Toch verzenden?"
 
-#: src/compose.c:5196 src/compose.c:5245
-#: src/plugins/attachwarner/attachwarner.c:222
+#: src/compose.c:5183 src/compose.c:5226
+#: src/plugins/attachwarner/attachwarner.c:215
 msgid "Queue it anyway?"
 msgstr "Toch in de wachtrij zetten?"
 
-#: src/compose.c:5198 src/compose.c:5247 src/toolbar.c:520
+#: src/compose.c:5185 src/compose.c:5228 src/toolbar.c:520
 msgid "Send later"
 msgstr "Wachtrij"
 
-#: src/compose.c:5243
+#: src/compose.c:5186 src/compose.c:5229
+msgid "_Queue"
+msgstr "_Wachtrij"
+
+#: src/compose.c:5224
 #, c-format
 msgid "Sending to %d recipients. %s"
 msgstr "Verzenden aan %d ontvangers. %s"
 
-#: src/compose.c:5300 src/compose.c:10259
+#: src/compose.c:5253
+msgid "Could not queue message."
+msgstr "Kon bericht niet in de wachtrij zetten."
+
+#: src/compose.c:5256
+#, c-format
 msgid ""
-"Could not queue message for sending:\n"
+"Could not queue message:\n"
 "\n"
-"Charset conversion failed."
+"%s."
 msgstr ""
 "Kon bericht niet in de wachtrij zetten:\n"
 "\n"
-"Omzetten van de tekenset mislukt."
+"%s."
 
-#: src/compose.c:5303 src/compose.c:10262
+#: src/compose.c:5260
+#, c-format
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
-"Couldn't get recipient encryption key."
+"Signature failed: %s"
 msgstr ""
 "Kon bericht niet in de wachtrij zetten:\n"
 "\n"
-"Kon de sleutel van de ontvanger, nodig voor versleutelen, niet vinden."
+"Ondertekenen mislukt: %s"
 
-#: src/compose.c:5309 src/compose.c:10256
+#: src/compose.c:5265
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
-"Signature failed: %s"
+"Encryption failed: %s"
 msgstr ""
 "Kon bericht niet in de wachtrij zetten:\n"
 "\n"
-"Ondertekenen mislukt: %s"
+"Versleuteling mislukt: %s"
 
-#: src/compose.c:5312
-#, c-format
+#: src/compose.c:5270
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
-"%s."
+"Charset conversion failed."
 msgstr ""
 "Kon bericht niet in de wachtrij zetten:\n"
 "\n"
-"%s."
+"Omzetten van de tekenset mislukt."
 
-#: src/compose.c:5314
-msgid "Could not queue message for sending."
-msgstr "Kon bericht niet in de wachtrij zetten."
+#: src/compose.c:5274
+msgid ""
+"Could not queue message for sending:\n"
+"\n"
+"Couldn't get recipient encryption key."
+msgstr ""
+"Kon bericht niet in de wachtrij zetten:\n"
+"\n"
+"Kon de sleutel van de ontvanger, nodig voor versleutelen, niet vinden."
 
-#: src/compose.c:5329 src/compose.c:5389
+#: src/compose.c:5337 src/compose.c:5397
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -2071,7 +2087,7 @@ msgstr ""
 "Gebruik \"Verzend berichten uit de wachtrij\" van het hoofdvenster om het "
 "opnieuw te proberen."
 
-#: src/compose.c:5385
+#: src/compose.c:5393
 #, c-format
 msgid ""
 "%s\n"
@@ -2081,7 +2097,7 @@ msgstr ""
 "Gebruik \"Verzend berichten uit de wachtrij\" van het hoofdvenster om het "
 "opnieuw te proberen."
 
-#: src/compose.c:5782
+#: src/compose.c:5790
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2092,7 +2108,7 @@ msgstr ""
 "naar de opgegeven tekenset '%s'.\n"
 "Verzenden met tekenset %s?"
 
-#: src/compose.c:5844
+#: src/compose.c:5852
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2105,103 +2121,98 @@ msgstr ""
 "worden.\n"
 "Toch verzenden?"
 
-#: src/compose.c:5955
-#, c-format
-msgid "Couldn't encrypt the email: %s"
-msgstr "Decoderen van e-mail mislukt: %s"
-
-#: src/compose.c:6076
+#: src/compose.c:6087
 msgid "Encryption warning"
 msgstr "Versleutel-waarschuwing"
 
-#: src/compose.c:6077
+#: src/compose.c:6088
 msgid "C_ontinue"
 msgstr "Ga _door met bewerken"
 
-#: src/compose.c:6126
+#: src/compose.c:6137
 msgid "No account for sending mails available!"
 msgstr "Geen account beschikbaar voor het verzenden."
 
-#: src/compose.c:6135
+#: src/compose.c:6146
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "Geselecteerd account is geen NNTP: Plaatsen is niet mogelijk."
 
-#: src/compose.c:6375
+#: src/compose.c:6400
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
-msgstr "Bijvoegsel %s bestaat niet meer. Negeren?"
+msgstr "Bijlage %s bestaat niet meer. Negeren?"
 
-#: src/compose.c:6376 src/mainwindow.c:656 src/toolbar.c:276 src/toolbar.c:2560
+#: src/compose.c:6402 src/mainwindow.c:665 src/toolbar.c:276 src/toolbar.c:2563
 msgid "Cancel sending"
 msgstr "Verzenden annuleren"
 
-#: src/compose.c:6376
+#: src/compose.c:6402
 msgid "Ignore attachment"
-msgstr "Negeer bijvoegsel"
+msgstr "Negeer bijlage"
 
-#: src/compose.c:6432
+#: src/compose.c:6458
 #, c-format
 msgid "Original %s part"
 msgstr "Origineel %s gedeelte"
 
-#: src/compose.c:7032
+#: src/compose.c:7058
 msgid "Add to address _book"
 msgstr "Toevoegen aan adres_boek"
 
-#: src/compose.c:7193
+#: src/compose.c:7225
 msgid "Delete entry contents"
 msgstr "Verwijder inhoud"
 
-#: src/compose.c:7197 src/plugins/vcalendar/vcal_meeting_gtk.c:289
+#: src/compose.c:7229 src/plugins/vcalendar/vcal_meeting_gtk.c:290
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Gebruik <tab> om adressen automatisch af te maken"
 
-#: src/compose.c:7412
+#: src/compose.c:7461
 msgid "Mime type"
 msgstr "MIME-type"
 
-#: src/compose.c:7418 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:407
-#: src/prefs_matcher.c:630 src/prefs_summaries.c:441
-#: src/prefs_summary_column.c:84 src/summaryview.c:447
+#: src/compose.c:7467 src/mimeview.c:303 src/plugins/pgpcore/select-keys.c:452
+#: src/prefs_matcher.c:641 src/prefs_summaries.c:633
+#: src/prefs_summary_column.c:84 src/summaryview.c:472
 msgid "Size"
 msgstr "Grootte"
 
-#: src/compose.c:7481
+#: src/compose.c:7529
 msgid "Save Message to "
-msgstr "Bericht bewaren in"
+msgstr "Bericht bewaren in "
 
-#: src/compose.c:7518 src/editjpilot.c:276 src/editldap.c:519
-#: src/editvcard.c:192 src/export.c:164 src/import.c:163 src/importmutt.c:238
-#: src/importpine.c:237 src/plugins/archive/archiver_gtk.c:1075
-#: src/plugins/bogofilter/bogofilter_gtk.c:229
-#: src/plugins/bogofilter/bogofilter_gtk.c:252
+#: src/compose.c:7560 src/editjpilot.c:276 src/editldap.c:518
+#: src/editvcard.c:193 src/export.c:166 src/import.c:164 src/importmutt.c:239
+#: src/importpine.c:238 src/plugins/archive/archiver_gtk.c:1081
+#: src/plugins/bogofilter/bogofilter_gtk.c:213
+#: src/plugins/bogofilter/bogofilter_gtk.c:236
 #: src/plugins/bsfilter/bsfilter_gtk.c:181
-#: src/plugins/clamd/clamav_plugin_gtk.c:300
-#: src/plugins/spamassassin/spamassassin_gtk.c:418
+#: src/plugins/clamd/clamav_plugin_gtk.c:295
+#: src/plugins/spamassassin/spamassassin_gtk.c:434
 msgid "_Browse"
 msgstr "_Bladeren"
 
-#: src/compose.c:7540
+#: src/compose.c:7576
 msgid "Select folder to save message to"
 msgstr "Selecteer map om bericht in op te slaan"
 
-#: src/compose.c:7997
+#: src/compose.c:8033
 msgid "Hea_der"
 msgstr "Hea_der"
 
-#: src/compose.c:8002
+#: src/compose.c:8038
 msgid "_Attachments"
-msgstr "_Bijvoegsels"
+msgstr "_Bijlages"
 
-#: src/compose.c:8016
+#: src/compose.c:8052
 msgid "Othe_rs"
 msgstr "Anderen"
 
-#: src/compose.c:8031
+#: src/compose.c:8067
 msgid "S_ubject:"
 msgstr "_Onderwerp:"
 
-#: src/compose.c:8255
+#: src/compose.c:8291
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2210,19 +2221,19 @@ msgstr ""
 "Spellingcontrole kon niet gestart worden.\n"
 "%s"
 
-#: src/compose.c:8402
+#: src/compose.c:8438
 msgid "_From:"
 msgstr "_Van:"
 
-#: src/compose.c:8419
+#: src/compose.c:8455
 msgid "Account to use for this email"
 msgstr "Te gebruiken account voor dit bericht"
 
-#: src/compose.c:8421
+#: src/compose.c:8457
 msgid "Sender address to be used"
-msgstr "Een afzender-adres is verplicht."
+msgstr "Een afzender-adres is verplicht"
 
-#: src/compose.c:8603
+#: src/compose.c:8639
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2231,50 +2242,50 @@ msgstr ""
 "Het privacy-systeem '%s' kon niet worden geladen. Het zal niet mogelijk zijn "
 "om dit bericht te ondertekenen of te versleutelen."
 
-#: src/compose.c:8714 src/plugins/archive/archiver_gtk.c:1174
+#: src/compose.c:8750 src/plugins/archive/archiver_gtk.c:1180
 msgid "_None"
 msgstr "G_een"
 
-#: src/compose.c:8815 src/prefs_template.c:752
+#: src/compose.c:8851 src/prefs_template.c:752
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "Opmaakfout in berichttekst-sjabloon op regel %d."
 
-#: src/compose.c:8912
+#: src/compose.c:8948
 #, c-format
 msgctxt "'%s' stands for a header name"
 msgid "Template '%s' format error."
 msgstr "Opmaakfout in '%s'-sjabloon."
 
-#: src/compose.c:9331
+#: src/compose.c:9372
 msgid "Invalid MIME type."
 msgstr "Ongeldig MIME-type."
 
-#: src/compose.c:9346
+#: src/compose.c:9387
 msgid "File doesn't exist or is empty."
 msgstr "Bestand bestaat niet of is leeg."
 
-#: src/compose.c:9420
+#: src/compose.c:9461
 msgid "Properties"
 msgstr "Eigenschappen"
 
-#: src/compose.c:9437
+#: src/compose.c:9479
 msgid "MIME type"
 msgstr "MIME-type"
 
-#: src/compose.c:9478
+#: src/compose.c:9512
 msgid "Encoding"
 msgstr "Codering"
 
-#: src/compose.c:9498
+#: src/compose.c:9532
 msgid "Path"
 msgstr "Pad"
 
-#: src/compose.c:9499
+#: src/compose.c:9533
 msgid "File name"
 msgstr "Bestandsnaam"
 
-#: src/compose.c:9758
+#: src/compose.c:9792
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2285,35 +2296,20 @@ msgstr ""
 "Zal ik het programma afbreken?\n"
 "procesgroep id: %d"
 
-#: src/compose.c:10225 src/messageview.c:1105
+#: src/compose.c:10265 src/messageview.c:1088
 msgid "Claws Mail needs network access in order to send this email."
 msgstr ""
 "Claws Mail heeft netwerktoegang nodig voor het verzenden van deze e-mail."
 
-#: src/compose.c:10251
-msgid "Could not queue message."
-msgstr "Kon bericht niet in de wachtrij zetten."
-
-#: src/compose.c:10253
-#, c-format
-msgid ""
-"Could not queue message:\n"
-"\n"
-"%s."
-msgstr ""
-"Kon bericht niet in de wachtrij zetten:\n"
-"\n"
-"%s."
-
-#: src/compose.c:10431
+#: src/compose.c:10458
 msgid "Could not save draft."
 msgstr "Kon klad niet opslaan."
 
-#: src/compose.c:10435
+#: src/compose.c:10462
 msgid "Could not save draft"
 msgstr "Kon klad niet opslaan"
 
-#: src/compose.c:10436
+#: src/compose.c:10463
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2321,24 +2317,24 @@ msgstr ""
 "Kon klad niet opslaan.\n"
 "Wil je deze e-mail annuleren of weggooien?"
 
-#: src/compose.c:10438
+#: src/compose.c:10465
 msgid "_Cancel exit"
 msgstr "_Annuleren"
 
-#: src/compose.c:10438
+#: src/compose.c:10465
 msgid "_Discard email"
-msgstr "_Gooi e-mail weg"
+msgstr "E-mail _weggooien"
 
-#: src/compose.c:10628 src/compose.c:10642
+#: src/compose.c:10654 src/compose.c:10668
 msgid "Select file"
 msgstr "Selecteer bestand"
 
-#: src/compose.c:10656
+#: src/compose.c:10682
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Bestand '%s' kon niet gelezen worden."
 
-#: src/compose.c:10658
+#: src/compose.c:10684
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2347,50 +2343,50 @@ msgstr ""
 "Bestand '%s' bevat ongeldige characters\n"
 "voor de huidige codering, invoeging kan onjuist zijn."
 
-#: src/compose.c:10737
+#: src/compose.c:10763
 msgid "Discard message"
-msgstr "Gooi bericht weg"
+msgstr "Bericht weggooien"
 
-#: src/compose.c:10738
+#: src/compose.c:10764
 msgid "This message has been modified. Discard it?"
 msgstr "Bericht is gewijzigd, veranderingen laten vervallen?"
 
-#: src/compose.c:10739 src/plugins/managesieve/sieve_editor.c:433
+#: src/compose.c:10765 src/plugins/managesieve/sieve_editor.c:434
 msgid "_Discard"
-msgstr "_Gooi weg"
+msgstr "_Weggooien"
 
-#: src/compose.c:10739 src/compose.c:10743
+#: src/compose.c:10765 src/compose.c:10770
 msgid "_Save to Drafts"
 msgstr "Opslaan als _klad"
 
-#: src/compose.c:10741 src/plugins/managesieve/sieve_editor.c:431
+#: src/compose.c:10768 src/plugins/managesieve/sieve_editor.c:432
 msgid "Save changes"
 msgstr "Veranderingen opslaan"
 
-#: src/compose.c:10742
+#: src/compose.c:10769
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Bericht is gewijzigd. Veranderingen opslaan?"
 
-#: src/compose.c:10743
+#: src/compose.c:10770
 msgid "_Don't save"
 msgstr "_Niet opslaan"
 
-#: src/compose.c:10814
+#: src/compose.c:10841
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Wil je sjabloon '%s' toepassen?"
 
-#: src/compose.c:10816
+#: src/compose.c:10843
 msgid "Apply template"
 msgstr "Sjabloon toepassen"
 
-#: src/compose.c:10817 src/prefs_actions.c:329 src/prefs_filtering_action.c:610
-#: src/prefs_filtering.c:477 src/prefs_matcher.c:774 src/prefs_template.c:311
-#: src/prefs_toolbar.c:1063
+#: src/compose.c:10844 src/prefs_actions.c:331 src/prefs_filtering_action.c:583
+#: src/prefs_filtering.c:478 src/prefs_matcher.c:798 src/prefs_template.c:311
+#: src/prefs_toolbar.c:1018
 msgid "_Replace"
-msgstr "_Vervang"
+msgstr "_Vervangen"
 
-#: src/compose.c:11688
+#: src/compose.c:11731
 #, c-format
 msgid ""
 "Do you want to insert the contents of the file into the message body, or "
@@ -2405,20 +2401,20 @@ msgstr[1] ""
 "Wil je de inhoud van de bestanden invoegen in de tekst van de %d berichten "
 "of bijvoegen wanneer het verstuurd wordt?"
 
-#: src/compose.c:11694
+#: src/compose.c:11737
 msgid "Insert or attach?"
-msgstr "In- of Bijvoegen"
+msgstr "In- of bijvoegen?"
 
-#: src/compose.c:11695
+#: src/compose.c:11738
 msgid "_Attach"
 msgstr "_Bijvoegen"
 
-#: src/compose.c:11915
+#: src/compose.c:11956
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Opmaakfout in citaat op regel %d."
 
-#: src/compose.c:12212
+#: src/compose.c:12252
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2437,7 +2433,7 @@ msgid "Claws Mail has crashed"
 msgstr "Claws Mail is gecrashed"
 
 # , c-format
-#: src/crash.c:202
+#: src/crash.c:203
 #, c-format
 msgid ""
 "%s.\n"
@@ -2446,31 +2442,31 @@ msgstr ""
 "%s.\n"
 "Rapporteer een bug-verslag, vermeld onderstaande informatie in je bericht."
 
-#: src/crash.c:207
+#: src/crash.c:208
 msgid "Debug log"
 msgstr "Debuglog"
 
-#: src/crash.c:251 src/toolbar.c:539
+#: src/crash.c:252 src/toolbar.c:539
 msgid "Close"
 msgstr "Sluiten"
 
-#: src/crash.c:256
+#: src/crash.c:257
 msgid "Save..."
 msgstr "Opslaan..."
 
-#: src/crash.c:261
+#: src/crash.c:262
 msgid "Create bug report"
 msgstr "Maak een bug-verslag"
 
-#: src/crash.c:311
+#: src/crash.c:312
 msgid "Save crash information"
 msgstr "Sla crash-informatie op"
 
-#: src/editaddress.c:155 src/editaddress.c:231
+#: src/editaddress.c:150 src/editaddress.c:288
 msgid "Add New Person"
 msgstr "Toevoegen nieuw persoon"
 
-#: src/editaddress.c:157
+#: src/editaddress.c:152
 msgid ""
 "Adding a new person requires at least one of the\n"
 "following values to be set:\n"
@@ -2497,7 +2493,7 @@ msgstr ""
 "Klik op OK om dit contact te blijven bewerken.\n"
 "Klik op Annuleren om af te sluiten zonder op te slaan."
 
-#: src/editaddress.c:168
+#: src/editaddress.c:163
 msgid ""
 "Adding a new person requires at least one of the\n"
 "following values to be set:\n"
@@ -2519,35 +2515,35 @@ msgstr ""
 "Klik op OK om dit contact te blijven bewerken.\n"
 "Klik op Annuleren om af te sluiten zonder op te slaan."
 
-#: src/editaddress.c:232
+#: src/editaddress.c:289
 msgid "Edit Person Details"
 msgstr "Bewerken persoonlijke informatie"
 
-#: src/editaddress.c:410
+#: src/editaddress.c:507
 msgid "An Email address must be supplied."
 msgstr "Een e-mailadres is verplicht."
 
-#: src/editaddress.c:586 src/editaddress_other_attributes_ldap.c:198
+#: src/editaddress.c:710 src/editaddress_other_attributes_ldap.c:205
 msgid "A Name and Value must be supplied."
 msgstr "Naam en waarde verplicht."
 
-#: src/editaddress.c:675 src/prefs_folder_item.c:1694
+#: src/editaddress.c:820 src/prefs_folder_item.c:1784
 msgid "Discard"
-msgstr "Gooi weg"
+msgstr "Weggooien"
 
-#: src/editaddress.c:676
+#: src/editaddress.c:821
 msgid "Apply"
 msgstr "Pas toe"
 
-#: src/editaddress.c:706 src/editaddress.c:755
+#: src/editaddress.c:851 src/editaddress.c:901
 msgid "Edit Person Data"
 msgstr "Wijzig persoonlijke gegevens"
 
-#: src/editaddress.c:784
+#: src/editaddress.c:930
 msgid "Choose a picture"
 msgstr "Kies een afbeelding"
 
-#: src/editaddress.c:803
+#: src/editaddress.c:949
 #, c-format
 msgid ""
 "Failed to import image: \n"
@@ -2556,58 +2552,58 @@ msgstr ""
 "Afbeelding importeren mislukt: \n"
 "%s"
 
-#: src/editaddress.c:845
+#: src/editaddress.c:991
 msgid "_Set picture"
 msgstr "_Stel afbeelding in"
 
-#: src/editaddress.c:846
+#: src/editaddress.c:992
 msgid "_Unset picture"
 msgstr "_Afbeelding verwijderen"
 
-#: src/editaddress.c:904
+#: src/editaddress.c:1050
 msgid "Photo"
 msgstr "Foto"
 
-#: src/editaddress.c:951 src/editaddress.c:953 src/expldifdlg.c:516
-#: src/exporthtml.c:761 src/ldif.c:746
+#: src/editaddress.c:1097 src/editaddress.c:1099 src/expldifdlg.c:516
+#: src/exporthtml.c:762 src/ldif.c:747
 msgid "Display Name"
 msgstr "Weergegeven naam"
 
-#: src/editaddress.c:962 src/editaddress.c:966 src/ldif.c:754
+#: src/editaddress.c:1108 src/editaddress.c:1112 src/ldif.c:755
 msgid "Last Name"
 msgstr "Achternaam"
 
-#: src/editaddress.c:963 src/editaddress.c:965 src/ldif.c:750
+#: src/editaddress.c:1109 src/editaddress.c:1111 src/ldif.c:751
 msgid "First Name"
 msgstr "Voornaam"
 
-#: src/editaddress.c:969 src/editaddress.c:971
+#: src/editaddress.c:1115 src/editaddress.c:1117
 msgid "Nickname"
 msgstr "Bijnaam"
 
-#: src/editaddress.c:1055 src/editaddress.c:1123
+#: src/editaddress.c:1253 src/editaddress.c:1294
 msgid "Alias"
 msgstr "Alias"
 
-#: src/editaddress.c:1265 src/editaddress.c:1334 src/editaddress.c:1354
-#: src/editaddress_other_attributes_ldap.c:303
-#: src/editaddress_other_attributes_ldap.c:371 src/prefs_customheader.c:222
+#: src/editaddress.c:1479 src/editaddress.c:1512 src/editaddress.c:1528
+#: src/editaddress_other_attributes_ldap.c:376
+#: src/editaddress_other_attributes_ldap.c:413 src/prefs_customheader.c:223
 msgid "Value"
 msgstr "Waarde"
 
-#: src/editaddress.c:1425
+#: src/editaddress.c:1594
 msgid "_User Data"
 msgstr "_Gebruikersgegevens"
 
-#: src/editaddress.c:1426
+#: src/editaddress.c:1595
 msgid "_Email Addresses"
 msgstr "_E-mailadres"
 
-#: src/editaddress.c:1429 src/editaddress.c:1432
+#: src/editaddress.c:1598 src/editaddress.c:1601
 msgid "O_ther Attributes"
 msgstr "O_verige Eigenschappen"
 
-#: src/editaddress.c:1583
+#: src/editaddress.c:1769
 #, c-format
 msgid ""
 "Failed to save image: \n"
@@ -2622,27 +2618,27 @@ msgstr "Bestand lijkt OK."
 
 #: src/editbook.c:112
 msgid "File does not appear to be a valid address book format."
-msgstr "Bestand heeft geen geldig adresboekformaat."
+msgstr "Bestand heeft geen geldig adresboekformat."
 
 #: src/editbook.c:115 src/editjpilot.c:191 src/editvcard.c:98
 msgid "Could not read file."
 msgstr "Kon bestand niet lezen."
 
-#: src/editbook.c:149 src/editbook.c:262
+#: src/editbook.c:149 src/editbook.c:263
 msgid "Edit Addressbook"
 msgstr "Bewerken adresboek"
 
-#: src/editbook.c:177 src/editjpilot.c:264 src/editvcard.c:180
+#: src/editbook.c:178 src/editjpilot.c:264 src/editvcard.c:181
 msgid " Check File "
-msgstr " Controleer bestand"
+msgstr " Controleer bestand "
 
-#: src/editbook.c:182 src/editjpilot.c:269 src/editvcard.c:185
-#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:2023
-#: src/wizard.c:1196 src/wizard.c:1616
+#: src/editbook.c:183 src/editjpilot.c:269 src/editvcard.c:186
+#: src/importmutt.c:232 src/importpine.c:231 src/prefs_account.c:2158
+#: src/wizard.c:1198 src/wizard.c:1618
 msgid "File"
 msgstr "Bestand"
 
-#: src/editbook.c:281
+#: src/editbook.c:282
 msgid "Add New Addressbook"
 msgstr "Nieuw adresboek toevoegen"
 
@@ -2650,31 +2646,31 @@ msgstr "Nieuw adresboek toevoegen"
 msgid "A Group Name must be supplied."
 msgstr "Een groepnaam is verplicht."
 
-#: src/editgroup.c:294
+#: src/editgroup.c:296
 msgid "Edit Group Data"
 msgstr "Bewerken Groep"
 
-#: src/editgroup.c:323 src/exporthtml.c:597
+#: src/editgroup.c:326 src/exporthtml.c:598
 msgid "Group Name"
 msgstr "Groepnaam"
 
-#: src/editgroup.c:342
+#: src/editgroup.c:345
 msgid "Addresses in Group"
 msgstr "Adressen in groep"
 
-#: src/editgroup.c:377
+#: src/editgroup.c:379
 msgid "Available Addresses"
 msgstr "Beschikbare adressen"
 
-#: src/editgroup.c:452
+#: src/editgroup.c:453
 msgid "Move Email Addresses to or from Group with arrow buttons"
 msgstr "Verplaats adressen van/naar Groep met de pijltjestoetsen"
 
-#: src/editgroup.c:500
+#: src/editgroup.c:501
 msgid "Edit Group Details"
 msgstr "Bewerken groepdetails"
 
-#: src/editgroup.c:503
+#: src/editgroup.c:504
 msgid "Add New Group"
 msgstr "Toevoegen nieuwe groep"
 
@@ -2684,21 +2680,21 @@ msgstr "Bewerken map"
 
 #: src/editgroup.c:553
 msgid "Input the new name of folder:"
-msgstr "Geef de naam van de nieuwe map:"
+msgstr "Geef de nieuwe naam op van de  map:"
 
-#: src/editgroup.c:556 src/foldersel.c:571 src/imap_gtk.c:193 src/mh_gtk.c:144
-#: src/plugins/mailmbox/plugin_gtk.c:244 src/plugins/rssyl/rssyl_cb_menu.c:91
+#: src/editgroup.c:556 src/foldersel.c:572 src/imap_gtk.c:193 src/mh_gtk.c:144
+#: src/plugins/mailmbox/plugin_gtk.c:244 src/plugins/rssyl/rssyl_cb_menu.c:92
 msgid "New folder"
 msgstr "Nieuwe map"
 
-#: src/editgroup.c:557 src/foldersel.c:572 src/mh_gtk.c:145
-#: src/plugins/mailmbox/plugin_gtk.c:245 src/plugins/rssyl/rssyl_cb_menu.c:92
+#: src/editgroup.c:557 src/foldersel.c:573 src/mh_gtk.c:145
+#: src/plugins/mailmbox/plugin_gtk.c:245 src/plugins/rssyl/rssyl_cb_menu.c:93
 msgid "Input the name of new folder:"
-msgstr "Geef de naam van de nieuwe map:"
+msgstr "Geef de naam op van de nieuwe map:"
 
 #: src/editjpilot.c:188
 msgid "File does not appear to be JPilot format."
-msgstr "Bestand heeft geen JPilot formaat"
+msgstr "Bestand heeft geen JPilot-format."
 
 #: src/editjpilot.c:200
 msgid "Select JPilot File"
@@ -2716,32 +2712,34 @@ msgstr "Andere e-mail-adres(sen)"
 msgid "Add New JPilot Entry"
 msgstr "Nieuwe JPilot invoer"
 
-#: src/editldap_basedn.c:137
+#: src/editldap_basedn.c:153
 msgid "Edit LDAP - Select Search Base"
 msgstr "Wijzig LDAP - Selecteer zoekbasis"
 
-#: src/editldap_basedn.c:156 src/editldap.c:441
+#: src/editldap_basedn.c:173 src/editldap.c:441 src/prefs_account.c:2910
+#: src/prefs_proxy.c:98
 msgid "Hostname"
 msgstr "Hostnaam"
 
-#: src/editldap_basedn.c:166 src/editldap.c:458
-#: src/plugins/clamd/clamav_plugin_gtk.c:390 src/ssl_manager.c:108
+#: src/editldap_basedn.c:183 src/editldap.c:458
+#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:2917
+#: src/prefs_proxy.c:105 src/ssl_manager.c:117
 msgid "Port"
 msgstr "Poort"
 
-#: src/editldap_basedn.c:176 src/editldap.c:503
+#: src/editldap_basedn.c:193 src/editldap.c:502
 msgid "Search Base"
 msgstr "Zoek base"
 
-#: src/editldap_basedn.c:197
+#: src/editldap_basedn.c:221
 msgid "Available Search Base(s)"
 msgstr "Beschikbare zoekbase"
 
-#: src/editldap_basedn.c:287
+#: src/editldap_basedn.c:327
 msgid "Could not read Search Base(s) from server - please set manually"
-msgstr "Zoekbases niet gevonden - zet handmatig"
+msgstr "Zoekbasis niet gevonden - stel handmatig in"
 
-#: src/editldap_basedn.c:291 src/editldap.c:281
+#: src/editldap_basedn.c:331 src/editldap.c:281
 msgid "Could not connect to server"
 msgstr "Geen verbinding met server"
 
@@ -2761,13 +2759,13 @@ msgstr "Je dient op z'n minst één LDAP-eigenschap op te geven."
 msgid "Connected successfully to server"
 msgstr "Verbonden met server"
 
-#: src/editldap.c:336 src/editldap.c:995
+#: src/editldap.c:335 src/editldap.c:991
 msgid "Edit LDAP Server"
 msgstr "Wijzig LDAP-server"
 
 #: src/editldap.c:437
 msgid "A name that you wish to call the server."
-msgstr "De LDAP-servernaam"
+msgstr "De LDAP-servernaam."
 
 #: src/editldap.c:450
 msgid ""
@@ -2781,15 +2779,15 @@ msgstr ""
 "opgeven. Je kunt \"localhost\" opgeven als de LDAP-server op dezelfde "
 "computer draait als Claws Mail."
 
-#: src/editldap.c:470
+#: src/editldap.c:469
 msgid "STARTTLS"
-msgstr " STARTTLS"
+msgstr "STARTTLS"
 
-#: src/editldap.c:471 src/prefs_account.c:3478
+#: src/editldap.c:470 src/prefs_account.c:3831
 msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
-#: src/editldap.c:475
+#: src/editldap.c:474
 msgid ""
 "Enable secure connection to the LDAP server via STARTTLS. Connection starts "
 "unencrypted and is secured by STARTTLS command. If connection fails, be sure "
@@ -2800,7 +2798,7 @@ msgstr ""
 "Controleer, als het niet lukt om een verbinding te maken, de instellingen in "
 "ldap.conf (de velden TLS_CACERTDIR en TLS_REQCERT)."
 
-#: src/editldap.c:480
+#: src/editldap.c:479
 msgid ""
 "Enable secure connection to the LDAP server via SSL/TLS. If connection "
 "fails, be sure to check the correct configuration in ldap.conf "
@@ -2810,21 +2808,21 @@ msgstr ""
 "Controleer, als het niet lukt om een verbinding te maken, de instellingen in "
 "ldap.conf (de velden TLS_CACERTDIR en TLS_REQCERT)."
 
-#: src/editldap.c:492
+#: src/editldap.c:491
 msgid "The port number that the server listens on. Port 389 is the default."
 msgstr ""
 "Het poortnummer waar de server naar luistert. Poort 389 is de "
 "standaardwaarde."
 
-#: src/editldap.c:495
+#: src/editldap.c:494
 msgid " Check Server "
 msgstr " Controleer server "
 
-#: src/editldap.c:499
+#: src/editldap.c:498
 msgid "Press this button to test the connection to the server."
 msgstr "Klik op deze knop om de verbinding met de server te testen."
 
-#: src/editldap.c:512
+#: src/editldap.c:511
 msgid ""
 "This specifies the name of the directory to be searched on the server. "
 "Examples include:\n"
@@ -2838,17 +2836,17 @@ msgstr ""
 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 
-#: src/editldap.c:523
+#: src/editldap.c:522
 msgid ""
 "Press this button to lookup the name of available directory names on the "
 "server."
 msgstr "Klik op deze knop om de op de server beschikbare mapnamen op te halen."
 
-#: src/editldap.c:579
+#: src/editldap.c:578
 msgid "Search Attributes"
 msgstr "Zoekgegevens"
 
-#: src/editldap.c:588
+#: src/editldap.c:587
 msgid ""
 "A list of LDAP attribute names that should be searched when attempting to "
 "find a name or address."
@@ -2856,24 +2854,24 @@ msgstr ""
 "Een lijst van LDAP-eigenschappen waarin moet worden gekeken als een naam of "
 "adres gezocht wordt."
 
-#: src/editldap.c:591
+#: src/editldap.c:590
 msgid " Defaults "
 msgstr " Standaardwaarden "
 
-#: src/editldap.c:595
+#: src/editldap.c:594
 msgid ""
 "This resets the attribute names to a default value that should find most "
 "names and addresses during a name or address search process."
 msgstr ""
 "Dit zet de eigenschapnamen terug naar een standaardwaarde die, gebruikt in "
 "een zoekopdracht naar namen en adressen, waarschijnlijk de meeste records "
-"wel zal vinden"
+"wel zal vinden."
 
-#: src/editldap.c:601
+#: src/editldap.c:600
 msgid "Max Query Age (secs)"
 msgstr "Maximale duur van verzoek (secs)"
 
-#: src/editldap.c:616
+#: src/editldap.c:614
 msgid ""
 "This defines the maximum period of time (in seconds) that an address search "
 "result is valid for address completion purposes. Search results are stored "
@@ -2897,11 +2895,11 @@ msgstr ""
 "verder verkleinen. Dit is handig voor langzame servers, maar dat kost wel "
 "meer geheugen om de resultaten op te slaan."
 
-#: src/editldap.c:633
+#: src/editldap.c:631
 msgid "Include server in dynamic search"
 msgstr "Gebruik server bij dynamisch zoeken"
 
-#: src/editldap.c:638
+#: src/editldap.c:636
 msgid ""
 "Check this option to include this server for dynamic searches when using "
 "address completion."
@@ -2909,11 +2907,11 @@ msgstr ""
 "Vink deze optie aan als je deze server wilt gebruiken voor dynamisch zoeken "
 "tijdens het automatisch aanvullen van adressen."
 
-#: src/editldap.c:644
+#: src/editldap.c:642
 msgid "Match names 'containing' search term"
 msgstr "Vergelijk namen met een 'bevat'-zoekterm"
 
-#: src/editldap.c:649
+#: src/editldap.c:647
 msgid ""
 "Searches for names and addresses can be performed either using \"begins-with"
 "\" or \"contains\" search term. Check this option to perform a \"contains\" "
@@ -2928,11 +2926,11 @@ msgstr ""
 "gebruikt automatisch adres-aanvullen altijd een 'begint-met'-zoekterm voor "
 "zoeken in andere adresdatabases."
 
-#: src/editldap.c:712
+#: src/editldap.c:710
 msgid "Bind DN"
 msgstr "Bind DN"
 
-#: src/editldap.c:721
+#: src/editldap.c:719
 msgid ""
 "The LDAP user account name to be used to connect to the server. This is "
 "usually only used for protected servers. This name is typically formatted "
@@ -2944,107 +2942,108 @@ msgstr ""
 "heeft typisch een vorm als: \"cn=user,dc=claws-mail,dc=com\". Dit is "
 "gewoonlijk leeg voor gebruik bij een zoekopdracht."
 
-#: src/editldap.c:728
+#: src/editldap.c:726
 msgid "Bind Password"
 msgstr "Wachtwoord"
 
-#: src/editldap.c:738
+#: src/editldap.c:736
 msgid "The password to be used when connecting as the \"Bind DN\" user."
 msgstr ""
 "Het te gebruiken wachtwoord bij het maken van een verbinding als de \"Bind DN"
 "\" gebruiker."
 
-#: src/editldap.c:741 src/prefs_account.c:1314 src/prefs_account.c:1868
-#: src/prefs_account.c:2587 src/prefs_account.c:2615
+#: src/editldap.c:739 src/prefs_account.c:1405 src/prefs_account.c:2003
+#: src/prefs_account.c:2722 src/prefs_account.c:2750 src/prefs_account.c:2955
+#: src/prefs_proxy.c:146
 msgid "Show password"
 msgstr "Wachtwoord weergeven"
 
-#: src/editldap.c:750
+#: src/editldap.c:748
 msgid "Timeout (secs)"
 msgstr "Tijdslimiet (sec)"
 
-#: src/editldap.c:764
+#: src/editldap.c:761
 msgid "The timeout period in seconds."
 msgstr "De tijdslimiet in seconden."
 
-#: src/editldap.c:768
+#: src/editldap.c:765
 msgid "Maximum Entries"
 msgstr "Maximum aantal ingangen"
 
-#: src/editldap.c:782
+#: src/editldap.c:778
 msgid ""
 "The maximum number of entries that should be returned in the search result."
 msgstr ""
 "Het maximaal aantal ingangen dat moet worden teruggegeven in een "
 "zoekresultaat."
 
-#: src/editldap.c:797 src/prefs_account.c:3369
+#: src/editldap.c:793 src/prefs_account.c:3722
 msgid "Basic"
 msgstr "Algemeen"
 
-#: src/editldap.c:799 src/gtk/quicksearch.c:708
+#: src/editldap.c:795 src/gtk/quicksearch.c:706
 msgid "Extended"
 msgstr "Uitgebreid"
 
-#: src/editldap.c:1000
+#: src/editldap.c:996
 msgid "Add New LDAP Server"
 msgstr "Nieuwe LDAP-server"
 
-#: src/edittags.c:187 src/prefs_filtering_action.c:1450
-#: src/prefs_summaries.c:448
+#: src/edittags.c:192 src/prefs_filtering_action.c:1403
+#: src/prefs_summaries.c:640
 msgid "Tag"
 msgstr "Tag"
 
-#: src/edittags.c:216
+#: src/edittags.c:221
 msgid "Delete tag"
 msgstr "Verwijder tag"
 
-#: src/edittags.c:217
+#: src/edittags.c:222
 msgid "Do you really want to delete this tag?"
 msgstr "Wil je deze tag werkelijk verwijderen?"
 
-#: src/edittags.c:251
+#: src/edittags.c:257
 msgid "Delete all tags"
 msgstr "Verwijder alle tags"
 
-#: src/edittags.c:252
+#: src/edittags.c:258
 msgid "Do you really want to delete all tags?"
 msgstr "Wil je alle tags werkelijk verwijderen?"
 
-#: src/edittags.c:423
+#: src/edittags.c:430
 msgid "You entered a reserved tag name, please choose another instead."
 msgstr "Je voerde een gereserveerde tag naam in, kies een andere naam."
 
-#: src/edittags.c:465
+#: src/edittags.c:472
 msgid "Tag is not set."
 msgstr "Tag is niet ingesteld."
 
-#: src/edittags.c:530
+#: src/edittags.c:550
 msgctxt "Dialog title"
 msgid "Apply tags"
 msgstr "Pas tags toe"
 
-#: src/edittags.c:544
+#: src/edittags.c:567
 msgid "New tag:"
 msgstr "Nieuwe tag:"
 
-#: src/edittags.c:577
+#: src/edittags.c:600
 msgid "Please select tags to apply/remove. Changes are immediate."
 msgstr "Selecteer tags om onmiddelijk toe te passen of te verwijderen."
 
 #: src/editvcard.c:95
 msgid "File does not appear to be vCard format."
-msgstr "Bestand heeft geen VCard-formaat."
+msgstr "Bestand heeft geen VCard-format."
 
 #: src/editvcard.c:107
 msgid "Select vCard File"
 msgstr "Selecteer VCard-bestand"
 
-#: src/editvcard.c:152 src/editvcard.c:256
+#: src/editvcard.c:152 src/editvcard.c:257
 msgid "Edit vCard Entry"
 msgstr "Wijzig VCard"
 
-#: src/editvcard.c:261
+#: src/editvcard.c:262
 msgid "Add New vCard Entry"
 msgstr "Toevoegen nieuwe VCard"
 
@@ -3052,13 +3051,13 @@ msgstr "Toevoegen nieuwe VCard"
 msgid "Impossible to set the client certificate.\n"
 msgstr "Niet mogelijk om client-certificaat in te stellen.\n"
 
-#: src/etpan/nntp-thread.c:865
+#: src/etpan/nntp-thread.c:949
 msgid "couldn't get xover range\n"
-msgstr "Kan xover-bereik niet ophalen\n"
+msgstr "kan xover-bereik niet ophalen\n"
 
-#: src/etpan/nntp-thread.c:963
+#: src/etpan/nntp-thread.c:1048
 msgid "couldn't get xhdr range\n"
-msgstr "Kan xhdr-bereik niet ophalen\n"
+msgstr "kan xhdr-bereik niet ophalen\n"
 
 #: src/exphtmldlg.c:105
 msgid "Please specify output directory and file to create."
@@ -3066,7 +3065,7 @@ msgstr "Geef uitvoermap en bestandsnaam op."
 
 #: src/exphtmldlg.c:108
 msgid "Select stylesheet and formatting."
-msgstr "Kies stijlblad en formattering"
+msgstr "Kies stijlblad en formattering."
 
 #: src/exphtmldlg.c:111 src/expldifdlg.c:113
 msgid "File exported successfully."
@@ -3083,7 +3082,7 @@ msgstr ""
 
 #: src/exphtmldlg.c:180
 msgid "Create directory"
-msgstr "Maak directory aan"
+msgstr "Map aanmaken"
 
 #: src/exphtmldlg.c:189
 #, c-format
@@ -3091,16 +3090,16 @@ msgid ""
 "Could not create output directory for HTML file:\n"
 "%s"
 msgstr ""
-"Kon uitvoerdirectory voor HTML-bestand niet aanmaken:\n"
+"Kon uitvoermap voor HTML-bestand niet aanmaken:\n"
 "%s"
 
 #: src/exphtmldlg.c:191 src/expldifdlg.c:201
 msgid "Failed to Create Directory"
-msgstr "Directory aanmaken mislukt"
+msgstr "Map aanmaken mislukt"
 
 #: src/exphtmldlg.c:233
 msgid "Error creating HTML file"
-msgstr "Fout bij het aanmaken van HTML-bestand"
+msgstr "Fout bij aanmaken HTML-bestand"
 
 #: src/exphtmldlg.c:319
 msgid "Select HTML output file"
@@ -3110,30 +3109,31 @@ msgstr "Selecteer HTML-uitvoerbestand"
 msgid "HTML Output File"
 msgstr "HTML-uitvoerbestand"
 
-#: src/exphtmldlg.c:392 src/expldifdlg.c:409 src/export.c:171 src/import.c:170
-#: src/importldif.c:684
+#: src/exphtmldlg.c:392 src/expldifdlg.c:409 src/export.c:173 src/import.c:171
+#: src/importldif.c:568
 msgid "B_rowse"
 msgstr "_Bekijk"
 
-#: src/exphtmldlg.c:445 src/plugins/fancy/fancy_prefs.c:300
+#: src/exphtmldlg.c:445 src/plugins/fancy/fancy_prefs.c:301
 msgid "Stylesheet"
 msgstr "Stijlblad"
 
-#: src/exphtmldlg.c:453 src/gtk/colorlabel.c:387 src/gtk/gtkaspell.c:1571
-#: src/gtk/gtkaspell.c:2225 src/gtk/menu.c:125 src/mainwindow.c:1188
+#: src/exphtmldlg.c:453 src/gtk/colorlabel.c:369 src/gtk/gtkaspell.c:1577
+#: src/gtk/gtkaspell.c:2232 src/gtk/menu.c:127 src/mainwindow.c:1181
 #: src/plugins/archive/archiver_prefs.c:313
-#: src/plugins/libravatar/libravatar_prefs.c:304 src/prefs_account.c:949
-#: src/prefs_toolbar.c:790 src/prefs_toolbar.c:1479 src/summaryview.c:6061
+#: src/plugins/libravatar/libravatar_prefs.c:304 src/prefs_account.c:1040
+#: src/prefs_toolbar.c:769 src/prefs_toolbar.c:1435 src/summaryview.c:6269
 msgid "None"
 msgstr "Geen"
 
-#: src/exphtmldlg.c:454 src/prefs_folder_item.c:520 src/prefs_other.c:126
-#: src/prefs_other.c:418
+#: src/exphtmldlg.c:454 src/prefs_folder_item.c:523
+#: src/prefs_folder_item.c:1198 src/prefs_folder_item.c:1230
+#: src/prefs_other.c:129 src/prefs_other.c:417
 msgid "Default"
 msgstr "Standaard"
 
-#: src/exphtmldlg.c:455 src/plugins/pgpcore/select-keys.c:246
-#: src/plugins/pgpcore/sgpgme.c:151 src/plugins/pgpcore/sgpgme.c:167
+#: src/exphtmldlg.c:455 src/plugins/pgpcore/select-keys.c:240
+#: src/plugins/pgpcore/sgpgme.c:152 src/plugins/pgpcore/sgpgme.c:168
 msgid "Full"
 msgstr "Volledig"
 
@@ -3177,11 +3177,11 @@ msgstr "Format van E-mail-koppeling"
 msgid "Format User Attributes"
 msgstr "Gebruikerseigenschappen toevoegen"
 
-#: src/exphtmldlg.c:539 src/expldifdlg.c:612 src/importldif.c:891
+#: src/exphtmldlg.c:539 src/expldifdlg.c:612 src/importldif.c:850
 msgid "Address Book:"
 msgstr "Adresboekboek:"
 
-#: src/exphtmldlg.c:549 src/expldifdlg.c:622 src/importldif.c:901
+#: src/exphtmldlg.c:549 src/expldifdlg.c:622 src/importldif.c:860
 msgid "File Name:"
 msgstr "Bestandsnaam:"
 
@@ -3193,13 +3193,13 @@ msgstr "Openen met Webbrowser"
 msgid "Export Address Book to HTML File"
 msgstr "Exporteren Adresboek naar HTML-bestand"
 
-#: src/exphtmldlg.c:656 src/expldifdlg.c:720 src/importldif.c:1020
+#: src/exphtmldlg.c:657 src/expldifdlg.c:721 src/importldif.c:980
 msgid "File Info"
 msgstr "Bestandsinfo"
 
-#: src/exphtmldlg.c:657
+#: src/exphtmldlg.c:658
 msgid "Format"
-msgstr "Formaat"
+msgstr "Format"
 
 #: src/expldifdlg.c:107
 msgid "Please specify output directory and LDIF filename to create."
@@ -3220,7 +3220,7 @@ msgstr ""
 
 #: src/expldifdlg.c:190
 msgid "Create Directory"
-msgstr "Maak Directory"
+msgstr "Map aanmaken"
 
 #: src/expldifdlg.c:199
 #, c-format
@@ -3344,7 +3344,7 @@ msgstr ""
 
 #: src/expldifdlg.c:558
 msgid "Exclude record if no Email Address"
-msgstr "Sla ingang zonder e-mailadres over."
+msgstr "Sla ingang zonder e-mailadres over"
 
 #: src/expldifdlg.c:563
 msgid ""
@@ -3358,86 +3358,86 @@ msgstr ""
 msgid "Export Address Book to LDIF File"
 msgstr "Exporteren Adresboek naar LDIF-bestand"
 
-#: src/expldifdlg.c:721
+#: src/expldifdlg.c:722
 msgid "Distinguished Name"
 msgstr "Distinguished Name"
 
-#: src/export.c:113 src/summaryview.c:8233
+#: src/export.c:113 src/summaryview.c:8482
 msgid "Export to mbox file"
 msgstr "Exporteer naar mbox-bestand"
 
-#: src/export.c:131
+#: src/export.c:132
 msgid "Locate the folder to export and specify the mbox file."
 msgstr "Vind de map om te exporteren en geef het mbox-bestand op."
 
-#: src/export.c:142
+#: src/export.c:143
 msgid "Source folder:"
 msgstr "Bronmap:"
 
-#: src/export.c:148 src/import.c:142
+#: src/export.c:149 src/import.c:143
 msgid "Mbox file:"
 msgstr "Mbox-bestand:"
 
-#: src/export.c:203
+#: src/export.c:205
 msgid "Target mbox filename can't be left empty."
 msgstr "Doelmap kan niet leeg gelaten worden."
 
-#: src/export.c:208
+#: src/export.c:210
 msgid "Source folder can't be left empty."
-msgstr "Bronmap kan niet leeg gelaten worden"
+msgstr "Bronmap kan niet leeg gelaten worden."
 
-#: src/export.c:221
+#: src/export.c:223
 msgid "Couldn't find the source folder."
 msgstr "Kan de bronmap niet vinden."
 
-#: src/export.c:245
+#: src/export.c:247
 msgid "Select exporting file"
 msgstr "Selecteer doelbestand"
 
-#: src/export.c:268
+#: src/export.c:270
 msgid "Select folder to export"
 msgstr "Selecteer map om te exporteren"
 
-#: src/exporthtml.c:767
+#: src/exporthtml.c:768
 msgid "Full Name"
 msgstr "Volledige naam"
 
-#: src/exporthtml.c:771 src/importldif.c:1021
-#: src/plugins/archive/archiver_gtk.c:769
+#: src/exporthtml.c:772 src/importldif.c:981
+#: src/plugins/archive/archiver_gtk.c:772
 msgid "Attributes"
 msgstr "Eigenschappen"
 
-#: src/exporthtml.c:974
+#: src/exporthtml.c:975
 msgid "Claws Mail Address Book"
 msgstr "Claws Mail Adresboek"
 
-#: src/exporthtml.c:1069 src/exportldif.c:606
+#: src/exporthtml.c:1070 src/exportldif.c:607
 msgid "Name already exists but is not a directory."
-msgstr "Bestand bestaat al maar is geen directory."
+msgstr "Bestand bestaat al maar is geen map."
 
-#: src/exporthtml.c:1072 src/exportldif.c:609
+#: src/exporthtml.c:1073 src/exportldif.c:610
 msgid "No permissions to create directory."
-msgstr "Geen toegang om directory aan te maken."
+msgstr "Geen rechten om map aan te maken."
 
-#: src/exporthtml.c:1075 src/exportldif.c:612
+#: src/exporthtml.c:1076 src/exportldif.c:613
 msgid "Name is too long."
 msgstr "De naam is te lang."
 
-#: src/exporthtml.c:1078 src/exportldif.c:615
+#: src/exporthtml.c:1079 src/exportldif.c:616
 msgid "Not specified."
 msgstr "Niet aangegeven."
 
-#: src/file_checker.c:76
+#: src/file_checker.c:82
 #, c-format
 msgid "The file %s is missing! Do you want to use the backup file from %s?"
 msgstr "Het bestand %s mist. Wil je het backup-bestand gebruiken van %s?"
 
-#: src/file_checker.c:84 src/file_checker.c:106
+#: src/file_checker.c:91 src/file_checker.c:115
 #, c-format
 msgid "Could not copy %s to %s"
 msgstr "Kon %s niet kopiëren naar %s"
 
-#: src/file_checker.c:98
+#: src/file_checker.c:106
 #, c-format
 msgid ""
 "The file %s is empty or corrupted! Do you want to use the backup file from "
@@ -3448,7 +3448,7 @@ msgstr ""
 
 #: src/filtering.c:603 src/filtering.c:678 src/filtering.c:707
 msgid "rule is not account-based\n"
-msgstr "Regel is niet verbonden met een account\n"
+msgstr "regel is niet verbonden met een account\n"
 
 #: src/filtering.c:607
 #, c-format
@@ -3547,51 +3547,51 @@ msgstr "actie kon niet toegepast worden\n"
 msgid "no further processing after action [ %s ]\n"
 msgstr "geen verdere verwerking na actie [ %s ]\n"
 
-#: src/filtering.c:810
+#: src/filtering.c:809
 #, c-format
 msgid "processing rule '%s' [ %s ]\n"
 msgstr "verwerking van regel '%s' [ %s ]\n"
 
-#: src/filtering.c:814
+#: src/filtering.c:813
 #, c-format
 msgid "processing rule <unnamed> [ %s ]\n"
 msgstr "verwerken van regel <onbekend> [ %s ]\n"
 
-#: src/filtering.c:832
+#: src/filtering.c:831
 #, c-format
 msgid "disabled rule '%s' [ %s ]\n"
 msgstr "regel uitgezet '%s' [ %s ]\n"
 
-#: src/filtering.c:836
+#: src/filtering.c:835
 #, c-format
 msgid "disabled rule <unnamed> [ %s ]\n"
 msgstr "regel uitgezet <onbekend> [ %s ]\n"
 
-#: src/filtering.c:874
+#: src/filtering.c:873
 msgid "undetermined"
-msgstr "Niet gedefiniëerd"
+msgstr "niet gedefiniëerd"
 
-#: src/filtering.c:878
+#: src/filtering.c:877
 msgid "incorporation"
 msgstr "bij ontvangen"
 
-#: src/filtering.c:882
+#: src/filtering.c:881
 msgid "manually"
 msgstr "handmatig"
 
-#: src/filtering.c:886
+#: src/filtering.c:885
 msgid "folder processing"
 msgstr "verwerken van map"
 
-#: src/filtering.c:890
+#: src/filtering.c:889
 msgid "pre-processing"
 msgstr "voorverwerken"
 
-#: src/filtering.c:894
+#: src/filtering.c:893
 msgid "post-processing"
 msgstr "naverwerken"
 
-#: src/filtering.c:909
+#: src/filtering.c:908
 #, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
@@ -3608,11 +3608,11 @@ msgstr ""
 "%s%s %s\n"
 "%s%s %s\n"
 
-#: src/filtering.c:911 src/filtering.c:920
+#: src/filtering.c:910 src/filtering.c:919
 msgid ": "
 msgstr ": "
 
-#: src/filtering.c:918
+#: src/filtering.c:917
 #, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
@@ -3621,60 +3621,61 @@ msgstr ""
 "filteren van bericht (%s%s%s)\n"
 "%sberichtbestand: %s\n"
 
-#: src/folder.c:1570 src/prefs_folder_item.c:315
+#: src/folder.c:1595 src/prefs_folder_item.c:319
 msgid "Inbox"
 msgstr "Inbox"
 
-#: src/folder.c:1574
+#: src/folder.c:1599
 msgid "Sent"
 msgstr "Verzonden"
 
-#: src/folder.c:1578 src/prefs_folder_item.c:318
+#: src/folder.c:1603 src/plugins/attachwarner/attachwarner.c:218
+#: src/prefs_folder_item.c:322
 msgid "Queue"
 msgstr "Wachtrij"
 
-#: src/folder.c:1582 src/prefs_folder_item.c:319
+#: src/folder.c:1607 src/prefs_folder_item.c:323
 msgid "Trash"
 msgstr "Prullenbak"
 
-#: src/folder.c:1586 src/prefs_folder_item.c:317
+#: src/folder.c:1611 src/prefs_folder_item.c:321
 msgid "Drafts"
 msgstr "Klad"
 
-#: src/folder.c:2017
+#: src/folder.c:2042
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Bezig met verwerken (%s)...\n"
 
-#: src/folder.c:3262
+#: src/folder.c:3289
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "Bezig met kopiëren van %s naar %s...\n"
 
-#: src/folder.c:3262
+#: src/folder.c:3289
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Bezig met verplaatsen van %s naar %s...\n"
 
-#: src/folder.c:3572
+#: src/folder.c:3599
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Cache voor %s wordt bijgewerkt..."
 
-#: src/folder.c:4434
+#: src/folder.c:4461
 msgid "Processing messages..."
 msgstr "Berichten verwerken..."
 
-#: src/folder.c:4569
+#: src/folder.c:4596
 #, c-format
 msgid "Synchronising %s for offline use...\n"
 msgstr "Synchroniseren %s voor offline gebruik... \n"
 
-#: src/folder.c:4828
+#: src/folder.c:4855
 msgid "A folder name cannot begin or end with a dot."
 msgstr "Een mapnaam kan niet beginnen of eindigen met een punt."
 
-#: src/folder.c:4832
+#: src/folder.c:4859
 msgid "A folder name can not end with a space."
 msgstr "Een mapnaam kan niet eindigen met een spatie."
 
@@ -3682,31 +3683,31 @@ msgstr "Een mapnaam kan niet eindigen met een spatie."
 msgid "Select folder"
 msgstr "Selecteer map"
 
-#: src/foldersel.c:573 src/imap_gtk.c:197 src/mh_gtk.c:146
-#: src/plugins/mailmbox/plugin_gtk.c:246 src/plugins/rssyl/rssyl_cb_menu.c:93
+#: src/foldersel.c:574 src/imap_gtk.c:197 src/mh_gtk.c:146
+#: src/plugins/mailmbox/plugin_gtk.c:246 src/plugins/rssyl/rssyl_cb_menu.c:94
 msgid "NewFolder"
 msgstr "NieuweMap"
 
-#: src/foldersel.c:581 src/imap_gtk.c:208 src/imap_gtk.c:214 src/imap_gtk.c:270
+#: src/foldersel.c:582 src/imap_gtk.c:208 src/imap_gtk.c:214 src/imap_gtk.c:270
 #: src/imap_gtk.c:275 src/mh_gtk.c:154 src/mh_gtk.c:262 src/news_gtk.c:299
 #: src/plugins/mailmbox/plugin_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:430
-#: src/plugins/rssyl/rssyl_cb_menu.c:204
-#: src/plugins/vcalendar/vcal_folder.c:2059
+#: src/plugins/rssyl/rssyl_cb_menu.c:202
+#: src/plugins/vcalendar/vcal_folder.c:2068
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "'%c' mag niet in de naam van een map voorkomen."
 
-#: src/foldersel.c:596 src/imap_gtk.c:224 src/imap_gtk.c:282 src/mh_gtk.c:167
+#: src/foldersel.c:597 src/imap_gtk.c:224 src/imap_gtk.c:282 src/mh_gtk.c:167
 #: src/mh_gtk.c:272 src/news_gtk.c:306 src/plugins/mailmbox/plugin_gtk.c:269
-#: src/plugins/mailmbox/plugin_gtk.c:442 src/plugins/rssyl/rssyl_cb_menu.c:217
-#: src/plugins/vcalendar/vcal_folder.c:2066
+#: src/plugins/mailmbox/plugin_gtk.c:442 src/plugins/rssyl/rssyl_cb_menu.c:214
+#: src/plugins/vcalendar/vcal_folder.c:2075
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "De map '%s' bestaat al."
 
-#: src/foldersel.c:603 src/imap_gtk.c:230 src/mh_gtk.c:173
+#: src/foldersel.c:604 src/imap_gtk.c:230 src/mh_gtk.c:173
 #: src/plugins/mailmbox/plugin_gtk.c:276 src/plugins/rssyl/opml_import.c:91
-#: src/plugins/rssyl/rssyl_cb_menu.c:124
+#: src/plugins/rssyl/rssyl_cb_menu.c:125
 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr "Kan map '%s' niet aanmaken."
@@ -3731,7 +3732,7 @@ msgstr "Markeer alles ongelezen, recursie_f"
 msgid "R_un processing rules"
 msgstr "_Verwerkingsregel draaien"
 
-#: src/folderview.c:253 src/mainwindow.c:553
+#: src/folderview.c:253 src/mainwindow.c:562
 msgid "_Search folder..."
 msgstr "_Map doorzoeken..."
 
@@ -3747,38 +3748,42 @@ msgstr "Prullenbak leegmaken..."
 msgid "Send _queue..."
 msgstr "Verzend wacht_rij..."
 
-#: src/folderview.c:397 src/folderview.c:444
+#: src/folderview.c:264
+msgid "Set Displayed columns"
+msgstr "Weergegeven kolommen instellen"
+
+#: src/folderview.c:403 src/folderview.c:450
 #: src/plugins/notification/notification_lcdproc.c:141
-#: src/prefs_folder_column.c:78 src/prefs_matcher.c:393 src/summaryview.c:6335
+#: src/prefs_folder_column.c:78 src/prefs_matcher.c:402 src/summaryview.c:6543
 msgid "New"
 msgstr "Nieuw"
 
-#: src/folderview.c:398 src/folderview.c:445
+#: src/folderview.c:404 src/folderview.c:451
 #: src/plugins/notification/notification_lcdproc.c:145
-#: src/prefs_folder_column.c:79 src/prefs_matcher.c:392 src/summaryview.c:6337
+#: src/prefs_folder_column.c:79 src/prefs_matcher.c:401 src/summaryview.c:6545
 #: src/toolbar.c:512
 msgid "Unread"
 msgstr "Ongelezen"
 
-#: src/folderview.c:399 src/plugins/notification/notification_lcdproc.c:149
+#: src/folderview.c:405 src/plugins/notification/notification_lcdproc.c:149
 #: src/prefs_folder_column.c:80
 msgid "Total"
 msgstr "Totaal"
 
 #. TRANSLATORS: This in Number sign in American style
-#: src/folderview.c:447 src/summaryview.c:448
+#: src/folderview.c:453 src/summaryview.c:473
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:782
+#: src/folderview.c:783
 msgid "Setting folder info..."
 msgstr "Mapinfo wordt ingesteld..."
 
-#: src/folderview.c:867 src/summaryview.c:4182
+#: src/folderview.c:868 src/summaryview.c:4288
 msgid "Mark all as read"
 msgstr "Markeer alles als gelezen"
 
-#: src/folderview.c:868
+#: src/folderview.c:869
 msgid ""
 "Do you really want to mark all mails in this folder and its sub-folders as "
 "read?"
@@ -3786,15 +3791,15 @@ msgstr ""
 "Wil je werkelijk alle berichten in deze map en zijn submappen als gelezen "
 "markeren?"
 
-#: src/folderview.c:870 src/summaryview.c:4183
+#: src/folderview.c:871 src/summaryview.c:4289
 msgid "Do you really want to mark all mails in this folder as read?"
 msgstr "Wil je werkelijk alle berichten in deze map als gelezen markeren?"
 
-#: src/folderview.c:873 src/summaryview.c:4221
+#: src/folderview.c:874 src/summaryview.c:4334
 msgid "Mark all as unread"
 msgstr "Markeer alles als ongelezen"
 
-#: src/folderview.c:874
+#: src/folderview.c:875
 msgid ""
 "Do you really want to mark all mails in this folder and its sub-folders as "
 "unread?"
@@ -3802,94 +3807,94 @@ msgstr ""
 "Wil je werkelijk alle berichten in deze map en zijn submappen als ongelezen "
 "markeren?"
 
-#: src/folderview.c:876 src/summaryview.c:4222
+#: src/folderview.c:877 src/summaryview.c:4335
 msgid "Do you really want to mark all mails in this folder as unread?"
 msgstr "Wil je werkelijk alle berichten in deze map als ongelezen markeren?"
 
-#: src/folderview.c:1066 src/imap.c:4606
+#: src/folderview.c:1067 src/imap.c:4643
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "Map wordt ingelezen %s/%s..."
 
-#: src/folderview.c:1069 src/imap.c:4610 src/mainwindow.c:5245 src/setup.c:96
+#: src/folderview.c:1070 src/imap.c:4647 src/mainwindow.c:5280 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Map wordt ingelezen %s..."
 
-#: src/folderview.c:1100
+#: src/folderview.c:1101
 msgid "Rebuild folder tree"
 msgstr "Vernieuw mappenboom"
 
-#: src/folderview.c:1101
+#: src/folderview.c:1102
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr "Mappenboom vernieuwen verwijdert lokale caches. Wil je doorgaan?"
 
-#: src/folderview.c:1111
+#: src/folderview.c:1112
 msgid "Rebuilding folder tree..."
 msgstr "Mappenboom wordt opnieuw aangemaakt..."
 
-#: src/folderview.c:1113
+#: src/folderview.c:1114
 msgid "Scanning folder tree..."
 msgstr "Mappenboom wordt ingelezen..."
 
-#: src/folderview.c:1204
+#: src/folderview.c:1205
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "Kan map '%s' niet inlezen\n"
 
-#: src/folderview.c:1258
+#: src/folderview.c:1259
 msgid "Checking for new messages in all folders..."
 msgstr "Alle mappen worden gecontroleerd op nieuwe berichten..."
 
-#: src/folderview.c:2229
+#: src/folderview.c:2233
 #, c-format
 msgid "Closing folder %s..."
 msgstr "Map %s wordt gesloten..."
 
-#: src/folderview.c:2324
+#: src/folderview.c:2328
 #, c-format
 msgid "Opening folder %s..."
 msgstr "Map %s wordt geopend..."
 
-#: src/folderview.c:2342
+#: src/folderview.c:2346
 msgid "Folder could not be opened."
 msgstr "Map kon niet worden geopend."
 
-#: src/folderview.c:2484 src/mainwindow.c:2902 src/mainwindow.c:2906
+#: src/folderview.c:2486 src/mainwindow.c:2896 src/mainwindow.c:2901
 msgid "Empty trash"
 msgstr "Prullenbak leegmaken"
 
-#: src/folderview.c:2485
+#: src/folderview.c:2487
 msgid "Delete all messages in trash?"
 msgstr "Alle berichten in de prullenbak weggooien?"
 
-#: src/folderview.c:2486
+#: src/folderview.c:2488
 msgid "_Empty trash"
 msgstr "_Prullenbak legen"
 
-#: src/folderview.c:2529 src/inc.c:1533 src/toolbar.c:3008
+#: src/folderview.c:2532 src/inc.c:1661 src/toolbar.c:3032
 msgid "Offline warning"
 msgstr "Offline waarschuwing"
 
-#: src/folderview.c:2530 src/toolbar.c:3009
+#: src/folderview.c:2533 src/toolbar.c:3033
 msgid "You're working offline. Override?"
 msgstr "Je bent momenteel niet online. Toch doorgaan?"
 
-#: src/folderview.c:2541 src/toolbar.c:3028
+#: src/folderview.c:2544 src/toolbar.c:3052
 msgid "Send queued messages"
 msgstr "Verzend berichten uit de wachtrij"
 
-#: src/folderview.c:2542 src/toolbar.c:3029
+#: src/folderview.c:2545 src/toolbar.c:3053
 msgid "Send all queued messages?"
 msgstr "Alle berichten uit de wachtrij verzenden?"
 
-#: src/folderview.c:2551 src/toolbar.c:3048
+#: src/folderview.c:2554 src/toolbar.c:3072
 msgid "Some errors occurred while sending queued messages."
 msgstr ""
-"Er is een fout opgetreden bij het verzenden van berichten in de wachtrij."
+"Er zijn fouten opgetreden bij het verzenden van berichten in de wachtrij."
 
-#: src/folderview.c:2554 src/main.c:2780 src/toolbar.c:3051
+#: src/folderview.c:2557 src/main.c:2812 src/toolbar.c:3075
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -3898,66 +3903,66 @@ msgstr ""
 "Er zijn fouten opgetreden bij het verzenden van berichten in de wachtrij:\n"
 "%s"
 
-#: src/folderview.c:2629
+#: src/folderview.c:2632
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr "Wil je werkelijk map '%s' kopiëren naar '%s'?"
 
-#: src/folderview.c:2630
+#: src/folderview.c:2633
 #, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
 msgstr "Wil je werkelijk van map '%s' een submap maken van '%s'?"
 
-#: src/folderview.c:2632
+#: src/folderview.c:2635
 msgid "Copy folder"
 msgstr "Kopieer map"
 
-#: src/folderview.c:2632
+#: src/folderview.c:2635
 msgid "Move folder"
 msgstr "Verplaats map"
 
-#: src/folderview.c:2643
+#: src/folderview.c:2646
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Bezig %s te kopiëren naar %s..."
 
-#: src/folderview.c:2643
+#: src/folderview.c:2646
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Bezig %s te verplaatsen naar %s..."
 
-#: src/folderview.c:2677
+#: src/folderview.c:2680
 msgid "Source and destination are the same."
 msgstr "Bron en bestemming zijn hetzelfde."
 
-#: src/folderview.c:2680
+#: src/folderview.c:2683
 msgid "Can't copy a folder to one of its children."
 msgstr "Kan een map niet kopiëren naar één van z'n submappen."
 
-#: src/folderview.c:2681
+#: src/folderview.c:2684
 msgid "Can't move a folder to one of its children."
 msgstr "Kan een map niet verplaatsen naar één van z'n submappen."
 
-#: src/folderview.c:2684
+#: src/folderview.c:2687
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "Kan een map niet naar een ander postvak verplaatsen."
 
-#: src/folderview.c:2687
+#: src/folderview.c:2690
 msgid "Copy failed!"
 msgstr "Kopiëren mislukt."
 
-#: src/folderview.c:2687
+#: src/folderview.c:2690
 msgid "Move failed!"
 msgstr "Verplaatsen mislukt."
 
-#: src/folderview.c:2737
+#: src/folderview.c:2740
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Instellingen voor map '%s' wordt verwerkt"
 
-#: src/folderview.c:3177 src/summaryview.c:4618 src/summaryview.c:4724
+#: src/folderview.c:3175 src/summaryview.c:4743 src/summaryview.c:4849
 msgid "The destination folder can only be used to store subfolders."
-msgstr "Doel-map kan alleen gebruikt worden om submappen op te slaan."
+msgstr "Doelmap kan alleen gebruikt worden om submappen op te slaan."
 
 #: src/grouplistdialog.c:161
 msgid "Newsgroup subscription"
@@ -3979,7 +3984,7 @@ msgstr " Zoek "
 msgid "Newsgroup name"
 msgstr "Naam nieuwsgroep"
 
-#: src/grouplistdialog.c:205 src/prefs_send.c:184
+#: src/grouplistdialog.c:205 src/prefs_send.c:188
 msgid "Messages"
 msgstr "Berichten"
 
@@ -3987,50 +3992,50 @@ msgstr "Berichten"
 msgid "Type"
 msgstr "Type"
 
-#: src/grouplistdialog.c:347
+#: src/grouplistdialog.c:346
 msgid "moderated"
 msgstr "gemodereerd"
 
-#: src/grouplistdialog.c:349
+#: src/grouplistdialog.c:348
 msgid "readonly"
 msgstr "alleen-lezen"
 
-#: src/grouplistdialog.c:351 src/plugins/att_remover/att_remover.c:302
-#: src/plugins/vcalendar/vcal_manager.c:114
-#: src/plugins/vcalendar/vcal_manager.c:148
+#: src/grouplistdialog.c:350 src/plugins/att_remover/att_remover.c:302
+#: src/plugins/vcalendar/vcal_manager.c:115
+#: src/plugins/vcalendar/vcal_manager.c:149
 msgid "unknown"
 msgstr "onbekend"
 
-#: src/grouplistdialog.c:422
+#: src/grouplistdialog.c:424
 msgid "Can't retrieve newsgroup list."
 msgstr "Kan groeplijst niet ophalen."
 
-#: src/grouplistdialog.c:459 src/gtk/gtkutils.c:1934 src/summaryview.c:1600
+#: src/grouplistdialog.c:461 src/gtk/gtkutils.c:1857 src/summaryview.c:1683
 msgid "Done."
 msgstr "Klaar."
 
-#: src/grouplistdialog.c:492
+#: src/grouplistdialog.c:494
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "%d nieuwsgroepen ontvangen (%s gelezen)"
 
-#: src/gtk/about.c:132
+#: src/gtk/about.c:133
 msgid "Claws Mail is a lightweight, fast and highly-configurable email client."
 msgstr ""
 "Claws Mail is een lichtgewicht, snelle en zeer configureerbare e-maillezer."
 
-#: src/gtk/about.c:135
+#: src/gtk/about.c:136
 msgid "For further information visit the Claws Mail website:"
 msgstr "Voor meer informatie ga naar de Claws Mail website:"
 
-#: src/gtk/about.c:140
+#: src/gtk/about.c:141
 msgid ""
 "For support and discussion subscribe to the Claws Mail users' mailing list:"
 msgstr ""
 "Voor ondersteuning en discussie kun je je inschrijven voor de Claws Mail "
 "gebruikers-mailinglijst:"
 
-#: src/gtk/about.c:146
+#: src/gtk/about.c:147
 msgid ""
 "Claws Mail is free software released under the GPL. If you wish to donate to "
 "the Claws Mail project you can do so at:"
@@ -4038,21 +4043,21 @@ msgstr ""
 "Claws Mail is vrije software uitgegeven onder de GPL licentie. Als je een "
 "donatie wenst te maken aan het Claws Mail project, kan dat hier:"
 
-#: src/gtk/about.c:162 src/gtk/about.c:850
+#: src/gtk/about.c:163 src/gtk/about.c:852
 msgid ""
-"Copyright (C) 1999-2017\n"
+"Copyright (C) 1999-2020\n"
 "The Claws Mail Team\n"
 "and Hiroyuki Yamamoto"
 msgstr ""
-"Auteursrecht (C) 1999-2017\n"
+"Auteursrecht (C) 1999-2020\n"
 "Het Claws Mail Team\n"
 "en Hiroyuki Yamamoto"
 
-#: src/gtk/about.c:167
+#: src/gtk/about.c:168
 msgid "System Information\n"
 msgstr "Systeem-informatie\n"
 
-#: src/gtk/about.c:173
+#: src/gtk/about.c:174
 #, c-format
 msgid ""
 "Locale: %s (charset: %s)\n"
@@ -4061,7 +4066,7 @@ msgstr ""
 "Taaldefinitie: %s (tekenset: %s)\n"
 "Besturingssysteem: %s %s (%s)"
 
-#: src/gtk/about.c:182
+#: src/gtk/about.c:183
 #, c-format
 msgid ""
 "Locale: %s (charset: %s)\n"
@@ -4070,7 +4075,7 @@ msgstr ""
 "Taaldefinitie: %s (tekenset: %s)\n"
 "Besturingssysteem: %s"
 
-#: src/gtk/about.c:191
+#: src/gtk/about.c:192
 #, c-format
 msgid ""
 "Locale: %s (charset: %s)\n"
@@ -4079,95 +4084,95 @@ msgstr ""
 "Taaldefinitie: %s (tekenset: %s)\n"
 "Besturingssysteem: unknown"
 
-#: src/gtk/about.c:247 src/prefs_themes.c:842 src/wizard.c:527
+#: src/gtk/about.c:248 src/prefs_themes.c:842 src/wizard.c:529
 msgid "The Claws Mail Team"
 msgstr "Het Claws Mail Team"
 
-#: src/gtk/about.c:266
+#: src/gtk/about.c:267
 msgid "Previous team members"
 msgstr "Voormalige teamleden"
 
-#: src/gtk/about.c:285
+#: src/gtk/about.c:286
 msgid "The translation team"
 msgstr "Het vertaalteam"
 
-#: src/gtk/about.c:304
+#: src/gtk/about.c:305
 msgid "Documentation team"
 msgstr "Documentatieteam"
 
-#: src/gtk/about.c:322
+#: src/gtk/about.c:323
 msgid "Logo"
 msgstr "Logo"
 
-#: src/gtk/about.c:341
+#: src/gtk/about.c:342
 msgid "Icons"
 msgstr "Pictogrammen"
 
-#: src/gtk/about.c:360
+#: src/gtk/about.c:361
 msgid "Contributors"
 msgstr "Medewerkers"
 
-#: src/gtk/about.c:408
+#: src/gtk/about.c:409
 msgid "Compiled-in Features"
 msgstr "Ingebouwde eigenschappen"
 
-#: src/gtk/about.c:425
+#: src/gtk/about.c:426
 msgctxt "compface"
 msgid "adds support for the X-Face header\n"
 msgstr "ondersteuning voor de X-Face-header\n"
 
-#: src/gtk/about.c:435
+#: src/gtk/about.c:436
 msgctxt "Enchant"
 msgid "adds support for spell checking\n"
 msgstr "ondersteuning voor spellingcontrole\n"
 
-#: src/gtk/about.c:445
+#: src/gtk/about.c:446
 msgctxt "GnuTLS"
 msgid "adds support for encrypted connections to servers\n"
 msgstr "ondersteuning voor beveiligde verbindingen met servers\n"
 
-#: src/gtk/about.c:455
+#: src/gtk/about.c:456
 msgctxt "IPv6"
 msgid "adds support for IPv6 addresses, the new Internet addressing protocol\n"
 msgstr "ondersteuning voor IPv6, het nieuwe internet-adressering-protocol\n"
 
-#: src/gtk/about.c:466
+#: src/gtk/about.c:467
 msgctxt "iconv"
 msgid "allows converting to and from different character sets\n"
 msgstr ""
 "ondersteuning voor het converteren van en naar verschillende tekensets\n"
 
-#: src/gtk/about.c:476
+#: src/gtk/about.c:477
 msgctxt "JPilot"
 msgid "adds support for PalmOS addressbooks\n"
 msgstr "ondersteuning voor PalmOS-adresboeken\n"
 
-#: src/gtk/about.c:486
+#: src/gtk/about.c:487
 msgctxt "LDAP"
 msgid "adds support for LDAP shared addressbooks\n"
 msgstr "ondersteuning voor gedeelde LDAP-adresboeken\n"
 
-#: src/gtk/about.c:496
+#: src/gtk/about.c:497
 msgctxt "libetpan"
 msgid "adds support for IMAP and NNTP servers\n"
 msgstr "ondersteuning voor IMAP en NNTP-servers\n"
 
-#: src/gtk/about.c:506
+#: src/gtk/about.c:507
 msgctxt "libSM"
 msgid "adds support for session handling\n"
 msgstr "ondersteuning voor sessiebeheer\n"
 
-#: src/gtk/about.c:516
+#: src/gtk/about.c:517
 msgctxt "NetworkManager"
 msgid "adds support for detection of network connection changes\n"
 msgstr "ondersteuning voor veranderingen in netwerkverbinding\n"
 
-#: src/gtk/about.c:526
+#: src/gtk/about.c:527
 msgctxt "librSVG"
 msgid "adds support for SVG themes\n"
 msgstr "ondersteuning voor SVG-thema's\n"
 
-#: src/gtk/about.c:558
+#: src/gtk/about.c:559
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -4178,7 +4183,7 @@ msgstr ""
 "Je mag zelf kiezen of je versie 3 of (als je dat wenst) iedere latere versie "
 "van de GPL hanteert."
 
-#: src/gtk/about.c:565
+#: src/gtk/about.c:566
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -4190,7 +4195,7 @@ msgstr ""
 "of GESCHIKTHEID VOOR ENIG DOEL. Lees de GNU General Public License voor "
 "verdere details."
 
-#: src/gtk/about.c:584
+#: src/gtk/about.c:585
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program. If not, see "
@@ -4198,147 +4203,147 @@ msgstr ""
 "Je zou een kopie van de GNU General Public License ontvangen moeten hebben "
 "bij dit programma. Als dit niet het geval is, zie "
 
-#: src/gtk/about.c:717 src/main.c:2604
+#: src/gtk/about.c:718 src/main.c:2636
 msgid "Session statistics\n"
 msgstr "Sessie-statistieken\n"
 
-#: src/gtk/about.c:727 src/gtk/about.c:730 src/main.c:2614 src/main.c:2617
+#: src/gtk/about.c:728 src/gtk/about.c:731 src/main.c:2646 src/main.c:2649
 #, c-format
 msgid "Started: %s\n"
 msgstr "Gestart: %s\n"
 
-#: src/gtk/about.c:737 src/main.c:2623
+#: src/gtk/about.c:738 src/main.c:2655
 msgid "Incoming traffic\n"
 msgstr "Inkomend verkeer\n"
 
-#: src/gtk/about.c:740 src/main.c:2626
+#: src/gtk/about.c:741 src/main.c:2658
 #, c-format
 msgid "Received messages: %d\n"
 msgstr "Ontvangen berichten: %d\n"
 
-#: src/gtk/about.c:747 src/main.c:2632
+#: src/gtk/about.c:748 src/main.c:2664
 msgid "Outgoing traffic\n"
 msgstr "Uitgaand verkeer\n"
 
-#: src/gtk/about.c:750 src/main.c:2635
+#: src/gtk/about.c:751 src/main.c:2667
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr "Nieuwe/doorverwezen berichten: %d\n"
 
-#: src/gtk/about.c:755 src/main.c:2639
+#: src/gtk/about.c:756 src/main.c:2671
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr "Beantwoorde berichten: %d\n"
 
-#: src/gtk/about.c:760 src/main.c:2643
+#: src/gtk/about.c:761 src/main.c:2675
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr "Doorgestuurde berichten: %d\n"
 
-#: src/gtk/about.c:765 src/main.c:2647
+#: src/gtk/about.c:766 src/main.c:2679
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr "Totaal uitgaande berichten: %d\n"
 
-#: src/gtk/about.c:792
+#: src/gtk/about.c:793
 msgid "About Claws Mail"
 msgstr "Over Claws Mail"
 
-#: src/gtk/about.c:864
+#: src/gtk/about.c:866
 msgid "_Info"
 msgstr "_Info"
 
-#: src/gtk/about.c:870
+#: src/gtk/about.c:872
 msgid "_Authors"
 msgstr "_Auteurs"
 
-#: src/gtk/about.c:876
+#: src/gtk/about.c:878
 msgid "_Features"
 msgstr "_Kenmerken"
 
-#: src/gtk/about.c:882
+#: src/gtk/about.c:884
 msgid "_License"
 msgstr "_Licentie"
 
-#: src/gtk/about.c:890
+#: src/gtk/about.c:892
 msgid "_Release Notes"
 msgstr "_Opmerkingen bij deze uitgave"
 
-#: src/gtk/about.c:896
+#: src/gtk/about.c:898
 msgid "_Statistics"
 msgstr "_Statistieken"
 
-#: src/gtk/colorlabel.c:38 src/prefs_common.c:362
+#: src/gtk/colorlabel.c:38 src/prefs_common.c:365
 msgid "Orange"
 msgstr "Oranje"
 
-#: src/gtk/colorlabel.c:39 src/prefs_common.c:366
+#: src/gtk/colorlabel.c:39 src/prefs_common.c:369
 msgid "Red"
 msgstr "Rood"
 
-#: src/gtk/colorlabel.c:40 src/prefs_common.c:370
+#: src/gtk/colorlabel.c:40 src/prefs_common.c:373
 msgid "Pink"
 msgstr "Roze"
 
-#: src/gtk/colorlabel.c:41 src/prefs_common.c:374
+#: src/gtk/colorlabel.c:41 src/prefs_common.c:377
 msgid "Sky blue"
 msgstr "Hemelsblauw"
 
-#: src/gtk/colorlabel.c:42 src/prefs_common.c:378
+#: src/gtk/colorlabel.c:42 src/prefs_common.c:381
 msgid "Blue"
 msgstr "Blauw"
 
-#: src/gtk/colorlabel.c:43 src/prefs_common.c:382
+#: src/gtk/colorlabel.c:43 src/prefs_common.c:385
 msgid "Green"
 msgstr "Groen"
 
-#: src/gtk/colorlabel.c:44 src/prefs_common.c:386
+#: src/gtk/colorlabel.c:44 src/prefs_common.c:389
 msgid "Brown"
 msgstr "Bruin"
 
-#: src/gtk/colorlabel.c:45 src/prefs_common.c:390
+#: src/gtk/colorlabel.c:45 src/prefs_common.c:393
 msgid "Grey"
 msgstr "Grijs"
 
-#: src/gtk/colorlabel.c:46 src/prefs_common.c:394
+#: src/gtk/colorlabel.c:46 src/prefs_common.c:397
 msgid "Light brown"
 msgstr "Lichtbruin"
 
-#: src/gtk/colorlabel.c:47 src/prefs_common.c:398
+#: src/gtk/colorlabel.c:47 src/prefs_common.c:401
 msgid "Dark red"
 msgstr "Donkerrood"
 
-#: src/gtk/colorlabel.c:48 src/prefs_common.c:402
+#: src/gtk/colorlabel.c:48 src/prefs_common.c:405
 msgid "Dark pink"
 msgstr "Donkerroze"
 
-#: src/gtk/colorlabel.c:49 src/prefs_common.c:406
+#: src/gtk/colorlabel.c:49 src/prefs_common.c:409
 msgid "Steel blue"
 msgstr "Staalblauw"
 
-#: src/gtk/colorlabel.c:50 src/prefs_common.c:410
+#: src/gtk/colorlabel.c:50 src/prefs_common.c:413
 msgid "Gold"
 msgstr "Goud"
 
-#: src/gtk/colorlabel.c:51 src/prefs_common.c:414
+#: src/gtk/colorlabel.c:51 src/prefs_common.c:417
 msgid "Bright green"
 msgstr "Heldergroen"
 
-#: src/gtk/colorlabel.c:52 src/prefs_common.c:418
+#: src/gtk/colorlabel.c:52 src/prefs_common.c:421
 msgid "Magenta"
 msgstr "Magenta"
 
-#: src/gtk/foldersort.c:156
+#: src/gtk/foldersort.c:241
 msgid "Set mailbox order"
 msgstr "Bepaal postvakvolgorde"
 
-#: src/gtk/foldersort.c:190
+#: src/gtk/foldersort.c:277
 msgid "Move mailboxes up or down to change the sort order in the Folder list."
 msgstr ""
 "Versleep postvakken naar boven of beneden om de sorteervolgorde in de "
 "mappenboom te veranderen."
 
-#: src/gtk/foldersort.c:216
+#: src/gtk/foldersort.c:311
 msgid "Mailboxes"
 msgstr "Postvakken"
 
@@ -4358,22 +4363,22 @@ msgstr "Kon Enchant verdeler niet initialiseren."
 #: src/gtk/gtkaspell.c:713
 #, c-format
 msgid "Couldn't initialize %s dictionary:"
-msgstr "Kon woordenboek %s niet initialiseren."
+msgstr "Kon woordenboek %s niet initialiseren:"
 
 #: src/gtk/gtkaspell.c:1070
 msgid "No misspelled word found."
 msgstr "Geen onjuist gespelde woorden gevonden."
 
-#: src/gtk/gtkaspell.c:1443
+#: src/gtk/gtkaspell.c:1451
 msgid "Replace unknown word"
 msgstr "Vervang onbekend woord"
 
-#: src/gtk/gtkaspell.c:1460
+#: src/gtk/gtkaspell.c:1467
 #, c-format
 msgid "Replace \"%s\" with: "
-msgstr "Vervang \"%s\" met:"
+msgstr "Vervang \"%s\" met: "
 
-#: src/gtk/gtkaspell.c:1503
+#: src/gtk/gtkaspell.c:1510
 msgid ""
 "Holding down Control key while pressing Enter\n"
 "will learn from mistake.\n"
@@ -4381,55 +4386,55 @@ msgstr ""
 "Houd Control ingedrukt en druk op Enter\n"
 "om woord te leren.\n"
 
-#: src/gtk/gtkaspell.c:1805 src/gtk/gtkaspell.c:1943
+#: src/gtk/gtkaspell.c:1811 src/gtk/gtkaspell.c:1949
 msgid "More..."
 msgstr "Verder..."
 
-#: src/gtk/gtkaspell.c:1861
+#: src/gtk/gtkaspell.c:1867
 #, c-format
 msgid "\"%s\" unknown in dictionary '%s'"
 msgstr "\"%s\" onbekend in woordenboek '%s'"
 
-#: src/gtk/gtkaspell.c:1877
+#: src/gtk/gtkaspell.c:1883
 msgid "Accept in this session"
 msgstr "Accepteren in deze sessie"
 
-#: src/gtk/gtkaspell.c:1887
+#: src/gtk/gtkaspell.c:1893
 msgid "Add to personal dictionary"
 msgstr "Toevoegen aan persoonlijk woordenboek"
 
-#: src/gtk/gtkaspell.c:1897
+#: src/gtk/gtkaspell.c:1903
 msgid "Replace with..."
 msgstr "Vervangen door..."
 
-#: src/gtk/gtkaspell.c:1910
+#: src/gtk/gtkaspell.c:1916
 #, c-format
 msgid "Check with %s"
 msgstr "Controleren met %s"
 
-#: src/gtk/gtkaspell.c:1932
+#: src/gtk/gtkaspell.c:1938
 msgid "(no suggestions)"
 msgstr "(geen suggesties)"
 
-#: src/gtk/gtkaspell.c:2006
+#: src/gtk/gtkaspell.c:2012
 #, c-format
 msgid "Dictionary: %s"
 msgstr "Woordenboek: %s"
 
-#: src/gtk/gtkaspell.c:2021
+#: src/gtk/gtkaspell.c:2027
 #, c-format
 msgid "Use alternate (%s)"
 msgstr "Gebruik andere (%s)"
 
-#: src/gtk/gtkaspell.c:2032
+#: src/gtk/gtkaspell.c:2038
 msgid "Use both dictionaries"
 msgstr "Gebruik beide woordenlijsten"
 
-#: src/gtk/gtkaspell.c:2048 src/prefs_spelling.c:143
+#: src/gtk/gtkaspell.c:2054 src/prefs_spelling.c:143
 msgid "Check while typing"
 msgstr "Controleer tijdens typen"
 
-#: src/gtk/gtkaspell.c:2147
+#: src/gtk/gtkaspell.c:2154
 #, c-format
 msgid ""
 "The spell checker could not change dictionary.\n"
@@ -4438,7 +4443,7 @@ msgstr ""
 "De spellingcontrole kon de woordenlijst niet veranderen.\n"
 "%s"
 
-#: src/gtk/gtkaspell.c:2203
+#: src/gtk/gtkaspell.c:2210
 #, c-format
 msgid ""
 "The spell checker could not change the alternate dictionary.\n"
@@ -4447,26 +4452,26 @@ msgstr ""
 "De spellingcontrole kon de alternatieve woordenlijst niet veranderen.\n"
 "%s"
 
-#: src/gtk/gtkutils.c:1939
+#: src/gtk/gtkutils.c:1862
 msgid "Failed: no service record found."
 msgstr "Mislukt: geen service ingang gevonden."
 
-#: src/gtk/gtkutils.c:1942
+#: src/gtk/gtkutils.c:1865
 msgid "Failed: network error."
 msgstr "Mislukt: netwerkfout."
 
-#: src/gtk/gtkutils.c:1945
+#: src/gtk/gtkutils.c:1868
 #, c-format
 msgid "Failed: unknown error (%d)."
 msgstr "Mislukt: onbekende fout (%d)."
 
-#: src/gtk/gtkutils.c:2015
+#: src/gtk/gtkutils.c:1938
 msgid "Configuring..."
 msgstr "Instellen..."
 
-#: src/gtk/headers.h:9 src/prefs_filtering_action.c:1262
-#: src/prefs_matcher.c:2168 src/prefs_summaries.c:442
-#: src/prefs_summary_column.c:83 src/quote_fmt.c:49 src/summaryview.c:446
+#: src/gtk/headers.h:9 src/prefs_filtering_action.c:1225
+#: src/prefs_matcher.c:646 src/prefs_matcher.c:2217 src/prefs_summaries.c:634
+#: src/prefs_summary_column.c:83 src/quote_fmt.c:49 src/summaryview.c:471
 msgid "Date"
 msgstr "Datum"
 
@@ -4474,13 +4479,13 @@ msgstr "Datum"
 msgid "Date:"
 msgstr "Datum:"
 
-#: src/gtk/headers.h:10 src/prefs_filtering_action.c:1259
-#: src/prefs_matcher.c:2165 src/prefs_summaries.c:444
-#: src/prefs_summary_column.c:81 src/quote_fmt.c:50 src/summaryview.c:444
+#: src/gtk/headers.h:10 src/prefs_filtering_action.c:1222
+#: src/prefs_matcher.c:2214 src/prefs_summaries.c:636
+#: src/prefs_summary_column.c:81 src/quote_fmt.c:50 src/summaryview.c:469
 msgid "From"
 msgstr "Afzender"
 
-#: src/gtk/headers.h:10 src/summary_search.c:474
+#: src/gtk/headers.h:10 src/summary_search.c:415
 msgid "From:"
 msgstr "Afzender:"
 
@@ -4496,14 +4501,14 @@ msgstr "Afzender:"
 msgid "Reply-To"
 msgstr "Antwoord aan"
 
-#: src/gtk/headers.h:13 src/prefs_filtering_action.c:1260
-#: src/prefs_matcher.c:2166 src/prefs_summaries.c:445
-#: src/prefs_summary_column.c:82 src/quote_fmt.c:57 src/summaryview.c:445
+#: src/gtk/headers.h:13 src/prefs_filtering_action.c:1223
+#: src/prefs_matcher.c:2215 src/prefs_summaries.c:637
+#: src/prefs_summary_column.c:82 src/quote_fmt.c:57 src/summaryview.c:470
 msgid "To"
 msgstr "Aan"
 
-#: src/gtk/headers.h:14 src/prefs_filtering_action.c:1261
-#: src/prefs_matcher.c:2167 src/quote_fmt.c:58
+#: src/gtk/headers.h:14 src/prefs_filtering_action.c:1224
+#: src/prefs_matcher.c:2216 src/quote_fmt.c:58
 msgid "Cc"
 msgstr "Cc"
 
@@ -4511,8 +4516,8 @@ msgstr "Cc"
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/gtk/headers.h:16 src/prefs_filtering_action.c:1263
-#: src/prefs_matcher.c:2169 src/quote_fmt.c:61
+#: src/gtk/headers.h:16 src/prefs_filtering_action.c:1226
+#: src/prefs_matcher.c:2218 src/quote_fmt.c:61
 msgid "Message-ID"
 msgstr "Bericht-ID"
 
@@ -4524,8 +4529,8 @@ msgstr "Bericht-ID:"
 msgid "In-Reply-To"
 msgstr "In antwoord aan"
 
-#: src/gtk/headers.h:18 src/prefs_filtering_action.c:1265
-#: src/prefs_matcher.c:2171 src/quote_fmt.c:60
+#: src/gtk/headers.h:18 src/prefs_filtering_action.c:1228
+#: src/prefs_matcher.c:2220 src/quote_fmt.c:60
 msgid "References"
 msgstr "Verwijzingen"
 
@@ -4533,18 +4538,18 @@ msgstr "Verwijzingen"
 msgid "References:"
 msgstr "Verwijzingen:"
 
-#: src/gtk/headers.h:19 src/prefs_filtering_action.c:1258
-#: src/prefs_matcher.c:2164 src/prefs_summaries.c:446
-#: src/prefs_summary_column.c:80 src/quote_fmt.c:56 src/summaryview.c:443
+#: src/gtk/headers.h:19 src/prefs_filtering_action.c:1221
+#: src/prefs_matcher.c:2213 src/prefs_summaries.c:638
+#: src/prefs_summary_column.c:80 src/quote_fmt.c:56 src/summaryview.c:468
 msgid "Subject"
 msgstr "Onderwerp"
 
-#: src/gtk/headers.h:19 src/plugins/pdf_viewer/poppler_viewer.c:702
-#: src/summary_search.c:488
+#: src/gtk/headers.h:19 src/plugins/pdf_viewer/poppler_viewer.c:705
+#: src/summary_search.c:429
 msgid "Subject:"
 msgstr "Onderwerp:"
 
-#: src/gtk/headers.h:20 src/plugins/rssyl/rssyl_feed_props.c:431
+#: src/gtk/headers.h:20 src/plugins/rssyl/rssyl_feed_props.c:421
 msgid "Comments"
 msgstr "Opmerkingen"
 
@@ -4556,7 +4561,7 @@ msgstr "Opmerkingen:"
 msgid "Keywords"
 msgstr "Sleutelwoorden"
 
-#: src/gtk/headers.h:21 src/plugins/pdf_viewer/poppler_viewer.c:704
+#: src/gtk/headers.h:21 src/plugins/pdf_viewer/poppler_viewer.c:707
 msgid "Keywords:"
 msgstr "Sleutelwoorden:"
 
@@ -4582,7 +4587,7 @@ msgstr "Herzonden-Afzender"
 
 #: src/gtk/headers.h:24
 msgid "Resent-Sender:"
-msgstr "Herzonden-Afzender"
+msgstr "Herzonden-Afzender:"
 
 #: src/gtk/headers.h:25
 msgid "Resent-To"
@@ -4632,8 +4637,8 @@ msgstr "Ontvangen"
 msgid "Received:"
 msgstr "Ontvangen:"
 
-#: src/gtk/headers.h:33 src/prefs_filtering_action.c:1264
-#: src/prefs_matcher.c:2170 src/quote_fmt.c:59
+#: src/gtk/headers.h:33 src/prefs_filtering_action.c:1227
+#: src/prefs_matcher.c:2219 src/quote_fmt.c:59
 msgid "Newsgroups"
 msgstr "Nieuwsgroepen"
 
@@ -4658,12 +4663,13 @@ msgid "Seen:"
 msgstr "Gezien:"
 
 #: src/gtk/headers.h:37 src/gtk/progressdialog.c:149
-#: src/gtk/sslcertwindow.c:164 src/prefs_summaries.c:450
-#: src/prefs_summary_column.c:78 src/summaryview.c:2823
+#: src/gtk/sslcertwindow.c:190 src/prefs_summaries.c:642
+#: src/prefs_summary_column.c:78 src/prefs_themes.c:1034 src/ssl_manager.c:124
+#: src/summaryview.c:2898
 msgid "Status"
 msgstr "Status"
 
-#: src/gtk/headers.h:37 src/prefs_themes.c:1033
+#: src/gtk/headers.h:37
 msgid "Status:"
 msgstr "Status:"
 
@@ -4703,7 +4709,7 @@ msgstr "Applicatie:"
 msgid "Content-Type"
 msgstr "Inhoud-Type"
 
-#: src/gtk/headers.h:42 src/image_viewer.c:327
+#: src/gtk/headers.h:42 src/image_viewer.c:340
 msgid "Content-Type:"
 msgstr "Inhoud-Type:"
 
@@ -4731,7 +4737,7 @@ msgstr "Voorrang"
 msgid "Precedence:"
 msgstr "Voorrang:"
 
-#: src/gtk/headers.h:46 src/prefs_account.c:1078
+#: src/gtk/headers.h:46 src/prefs_account.c:1169
 msgid "Organization"
 msgstr "Organisatie"
 
@@ -4893,7 +4899,7 @@ msgstr "Bericht is spam"
 
 #: src/gtk/icon_legend.c:76
 msgid "Message has attachment(s)"
-msgstr "Bericht heeft bijvoegsel(s)"
+msgstr "Bericht heeft bijlage(s)"
 
 #: src/gtk/icon_legend.c:77
 msgid "Digitally signed message"
@@ -4905,11 +4911,11 @@ msgstr "Bericht is versleuteld"
 
 #: src/gtk/icon_legend.c:79
 msgid "Message is signed and has attachment(s)"
-msgstr "Bericht is ondertekend en heeft bijvoegsel(s)"
+msgstr "Bericht is ondertekend en heeft bijlage(s)"
 
 #: src/gtk/icon_legend.c:80
 msgid "Message is encrypted and has attachment(s)"
-msgstr "Bericht is versleuteld en heeft bijvoegsel(s)"
+msgstr "Bericht is versleuteld en heeft bijlage(s)"
 
 #: src/gtk/icon_legend.c:82
 msgid "Marked message"
@@ -4955,50 +4961,54 @@ msgstr "IMAP-mailbox toont alleen ge-abonneerde mappen"
 msgid "Icon Legend"
 msgstr "Pictogramlegenda"
 
-#: src/gtk/icon_legend.c:145
+#: src/gtk/icon_legend.c:146
 msgid ""
 "The following icons are used to show the status of messages and folders:"
 msgstr ""
 "De volgende pictogrammen worden gebruikt om de status van een bericht of map "
 "weer te geven:"
 
-#: src/gtk/inputdialog.c:233 src/gtk/inputdialog.c:255
+#: src/gtk/inputdialog.c:228 src/gtk/inputdialog.c:250
 #, c-format
 msgid "Input password for %s on %s:"
 msgstr "Geef wachtwoord voor %s op %s:"
 
-#: src/gtk/inputdialog.c:236 src/gtk/inputdialog.c:239
-#: src/gtk/inputdialog.c:258 src/gtk/inputdialog.c:261
+#: src/gtk/inputdialog.c:231 src/gtk/inputdialog.c:234
+#: src/gtk/inputdialog.c:253 src/gtk/inputdialog.c:256
 #, c-format
 msgid "Input password for %s:"
 msgstr "Geef wachtwoord voor %s:"
 
-#: src/gtk/inputdialog.c:242 src/gtk/inputdialog.c:264
+#: src/gtk/inputdialog.c:237 src/gtk/inputdialog.c:259
 msgid "Input password:"
 msgstr "Geef wachtwoord:"
 
-#: src/gtk/inputdialog.c:243 src/gtk/inputdialog.c:271
-#: src/gtk/inputdialog.c:283
+#: src/gtk/inputdialog.c:238 src/gtk/inputdialog.c:266
+#: src/gtk/inputdialog.c:278
 msgid "Input password"
 msgstr "Geef wachtwoord"
 
-#: src/gtk/inputdialog.c:273
+#: src/gtk/inputdialog.c:268
 msgid "Remember password for this session"
 msgstr "Onthoud wachtwoord voor deze sessie"
 
-#: src/gtk/inputdialog.c:372 src/gtk/inputdialog.c:419
+#: src/gtk/inputdialog.c:363 src/gtk/inputdialog.c:410
 msgid "Remember this"
 msgstr "Onthoud dit"
 
-#: src/gtk/logwindow.c:447
+#: src/gtk/logwindow.c:450
+msgid "_Go to last error"
+msgstr "_Ga naar laatste fout"
+
+#: src/gtk/logwindow.c:457
 msgid "Clear _Log"
 msgstr "Leeg _Log"
 
-#: src/gtk/menu.c:137
+#: src/gtk/menu.c:139
 msgid "Warning:"
 msgstr "Waarschuwing:"
 
-#: src/gtk/menu.c:138
+#: src/gtk/menu.c:140
 msgid ""
 "This URL was too long for displaying and\n"
 "has been truncated for safety. This message could be\n"
@@ -5041,18 +5051,18 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: src/gtk/pluginwindow.c:303 src/plugins/acpi_notifier/acpi_notifier.c:790
+#: src/gtk/pluginwindow.c:303 src/plugins/acpi_notifier/acpi_notifier.c:792
 #: src/plugins/address_keeper/address_keeper_prefs.c:273
 #: src/plugins/archive/archiver_prefs.c:106
 #: src/plugins/attachwarner/attachwarner_prefs.c:229
-#: src/plugins/bogofilter/bogofilter_gtk.c:498
+#: src/plugins/bogofilter/bogofilter_gtk.c:482
 #: src/plugins/bsfilter/bsfilter_gtk.c:400
-#: src/plugins/clamd/clamav_plugin_gtk.c:549
-#: src/plugins/fancy/fancy_prefs.c:114
+#: src/plugins/clamd/clamav_plugin_gtk.c:537
+#: src/plugins/fancy/fancy_prefs.c:115
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:181
 #: src/plugins/gdata/cm_gdata_prefs.c:137
 #: src/plugins/libravatar/libravatar_prefs.c:545
-#: src/plugins/managesieve/sieve_prefs.c:427
+#: src/plugins/managesieve/sieve_prefs.c:423
 #: src/plugins/notification/notification_prefs.c:398
 #: src/plugins/notification/notification_prefs.c:413
 #: src/plugins/notification/notification_prefs.c:432
@@ -5061,253 +5071,261 @@ msgstr ""
 #: src/plugins/notification/notification_prefs.c:486
 #: src/plugins/notification/notification_prefs.c:504
 #: src/plugins/notification/notification_prefs.c:522
-#: src/plugins/pgpcore/prefs_gpg.c:686 src/plugins/pgpcore/prefs_gpg.c:706
+#: src/plugins/pgpcore/prefs_gpg.c:687 src/plugins/pgpcore/prefs_gpg.c:707
 #: src/plugins/rssyl/rssyl_prefs.c:70
 #: src/plugins/spam_report/spam_report_prefs.c:82
-#: src/plugins/spamassassin/spamassassin_gtk.c:648
-#: src/plugins/vcalendar/vcal_prefs.c:774 src/prefs_toolbar.c:957
+#: src/plugins/spamassassin/spamassassin_gtk.c:670
+#: src/plugins/vcalendar/vcal_prefs.c:774 src/prefs_toolbar.c:924
 msgid "Plugins"
 msgstr "Plugins"
 
-#: src/gtk/pluginwindow.c:336
+#: src/gtk/pluginwindow.c:337
 msgid "_Load..."
 msgstr "_Laden..."
 
-#: src/gtk/pluginwindow.c:337
+#: src/gtk/pluginwindow.c:338
 msgid "_Unload"
 msgstr "_Verwijderen"
 
-#: src/gtk/pluginwindow.c:351 src/prefs_summaries.c:229
+#: src/gtk/pluginwindow.c:352 src/prefs_summaries.c:237
 msgid "Description"
 msgstr "Beschrijving"
 
-#: src/gtk/pluginwindow.c:375
+#: src/gtk/pluginwindow.c:376
 #, c-format
 msgid "For more information about plugins see the %sClaws Mail website%s."
 msgstr "Voor meer informatie over plugins ga naar de %sClaws Mail website%s."
 
-#: src/gtk/pluginwindow.c:416
+#: src/gtk/pluginwindow.c:417
 msgid "Click here to load one or more plugins"
 msgstr "Klik hier om één of meerdere plugins te laden"
 
-#: src/gtk/pluginwindow.c:419
+#: src/gtk/pluginwindow.c:420
 msgid "Unload the selected plugin"
 msgstr "Ontlaad de geselecteerde plugins"
 
-#: src/gtk/pluginwindow.c:484
+#: src/gtk/pluginwindow.c:485
 msgid "Loaded plugins"
 msgstr "Plugins geladen"
 
-#: src/gtk/prefswindow.c:639
+#: src/gtk/prefswindow.c:640
 msgid "Page Index"
 msgstr "Pagina Inhoudsopgave"
 
-#: src/gtk/progressdialog.c:91 src/mainwindow.c:841
+#: src/gtk/progressdialog.c:91 src/mainwindow.c:853
 msgid "_Hide"
 msgstr "_Verberg"
 
-#: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:688
-#: src/prefs_account.c:3368 src/prefs_account.c:3386 src/prefs_account.c:3404
-#: src/prefs_account.c:3422 src/prefs_account.c:3440 src/prefs_account.c:3458
-#: src/prefs_account.c:3477 src/prefs_account.c:3570
-#: src/prefs_filtering_action.c:1425 src/prefs_filtering.c:397
-#: src/prefs_filtering.c:1879
+#: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:694
+#: src/prefs_account.c:3721 src/prefs_account.c:3739 src/prefs_account.c:3757
+#: src/prefs_account.c:3775 src/prefs_account.c:3793 src/prefs_account.c:3811
+#: src/prefs_account.c:3830 src/prefs_account.c:3923 src/prefs_account.c:3941
+#: src/prefs_filtering_action.c:1380 src/prefs_filtering.c:398
+#: src/prefs_filtering.c:1884
 msgid "Account"
 msgstr "Account"
 
-#: src/gtk/quicksearch.c:478
+#: src/gtk/quicksearch.c:472
 msgid "all messages"
 msgstr "alle berichten"
 
-#: src/gtk/quicksearch.c:479
+#: src/gtk/quicksearch.c:473
 msgid "messages whose age is greater than # days"
 msgstr "berichten die ouder zijn dan # dagen"
 
-#: src/gtk/quicksearch.c:480
+#: src/gtk/quicksearch.c:474
 msgid "messages whose age is less than # days"
 msgstr "berichten die jonger zijn dan # dagen"
 
-#: src/gtk/quicksearch.c:481
+#: src/gtk/quicksearch.c:475
 msgid "messages whose age is greater than # hours"
 msgstr "berichten die ouder zijn dan # uur"
 
-#: src/gtk/quicksearch.c:482
+#: src/gtk/quicksearch.c:476
 msgid "messages whose age is less than # hours"
 msgstr "berichten die jonger zijn dan # uur"
 
-#: src/gtk/quicksearch.c:483
+#: src/gtk/quicksearch.c:477
 msgid "messages which contain S in the message body"
 msgstr "berichten waarvan de berichttekst S bevat"
 
-#: src/gtk/quicksearch.c:484
+#: src/gtk/quicksearch.c:478
 msgid "messages which contain S in the whole message"
 msgstr "berichten waarin S voorkomt (in berichttekst of headers)"
 
-#: src/gtk/quicksearch.c:485
+#: src/gtk/quicksearch.c:479
 msgid "messages carbon-copied to S"
 msgstr "berichten waarvan S een kopie (cc) onving"
 
-#: src/gtk/quicksearch.c:486
+#: src/gtk/quicksearch.c:480
 msgid "message is either To: or Cc: to S"
 msgstr "bericht is Aan: of CC: aan S"
 
-#: src/gtk/quicksearch.c:487
+#: src/gtk/quicksearch.c:481
 msgid "deleted messages"
 msgstr "verwijderde berichten"
 
-#: src/gtk/quicksearch.c:488
+#: src/gtk/quicksearch.c:482
+msgid "messages whose date is after requested date (time is optional)"
+msgstr "berichten van na de opgevraagde datum (tijd is optioneel)"
+
+#: src/gtk/quicksearch.c:484
+msgid "messages whose date is before requested date (time is optional)"
+msgstr "berichten van voor de opgevraagde datum (tijd is optioneel)"
+
+#: src/gtk/quicksearch.c:486
 msgid "messages which contain S in the Sender field"
 msgstr "berichten waarin S voorkomt in het veld 'Afzender'"
 
-#: src/gtk/quicksearch.c:489
+#: src/gtk/quicksearch.c:487
 msgid "true if execute \"S\" succeeds"
-msgstr "waar als de uitvoer van \"S\" geukt is"
+msgstr "waar als de uitvoer van \"S\" gelukt is"
 
-#: src/gtk/quicksearch.c:490
+#: src/gtk/quicksearch.c:488
 msgid "messages originating from user S"
 msgstr "berichten die komen van gebruiker S"
 
-#: src/gtk/quicksearch.c:491
+#: src/gtk/quicksearch.c:489
 msgid "forwarded messages"
 msgstr "doorgestuurde berichten"
 
-#: src/gtk/quicksearch.c:492
+#: src/gtk/quicksearch.c:490
 msgid "messages which have attachments"
-msgstr "berichten die bijvoegsels hebben"
+msgstr "berichten die bijlages hebben"
 
-#: src/gtk/quicksearch.c:493
+#: src/gtk/quicksearch.c:491
 msgid "messages which contain S in any header name or value"
 msgstr "berichten waarin S in een header-naam of waarde voorkomt"
 
-#: src/gtk/quicksearch.c:494
+#: src/gtk/quicksearch.c:492
 msgid "messages which contain S in the value of any header"
 msgstr "berichten waarin S in een header-waarde voorkomt"
 
-#: src/gtk/quicksearch.c:495
+#: src/gtk/quicksearch.c:493
 msgid "messages which contain S in Message-ID header"
 msgstr "berichten waarin S in de header 'Bericht-ID' voorkomt"
 
-#: src/gtk/quicksearch.c:496
+#: src/gtk/quicksearch.c:494
 msgid "messages which contain S in In-Reply-To header"
 msgstr "berichten waarin S in de header In-Reply-To voorkomt"
 
-#: src/gtk/quicksearch.c:497
+#: src/gtk/quicksearch.c:495
 msgid "messages which are marked with color #"
 msgstr "berichten die zijn gemarkeerd met kleur #"
 
-#: src/gtk/quicksearch.c:498
+#: src/gtk/quicksearch.c:496
 msgid "locked messages"
 msgstr "berichten die op slot zitten"
 
-#: src/gtk/quicksearch.c:499
+#: src/gtk/quicksearch.c:497
 msgid "messages which are in newsgroup S"
 msgstr "berichten in newsgroup S"
 
-#: src/gtk/quicksearch.c:500
+#: src/gtk/quicksearch.c:498
 msgid "new messages"
 msgstr "nieuwe berichten"
 
-#: src/gtk/quicksearch.c:501
+#: src/gtk/quicksearch.c:499
 msgid "old messages"
 msgstr "oude berichten"
 
-#: src/gtk/quicksearch.c:502
+#: src/gtk/quicksearch.c:500
 msgid "incomplete messages (not entirely downloaded)"
 msgstr "niet complete berichten (niet geheel opgehaald)"
 
-#: src/gtk/quicksearch.c:503
+#: src/gtk/quicksearch.c:501
 msgid "messages which you have replied to"
 msgstr "berichten waar je op hebt geantwoord"
 
-#: src/gtk/quicksearch.c:504
+#: src/gtk/quicksearch.c:502
 msgid "read messages"
 msgstr "gelezen berichten"
 
-#: src/gtk/quicksearch.c:505
+#: src/gtk/quicksearch.c:503
 msgid "messages which contain S in subject"
 msgstr "berichten waarin S voorkomt in het onderwerp"
 
-#: src/gtk/quicksearch.c:506
+#: src/gtk/quicksearch.c:504
 msgid "messages whose score is equal to # points"
 msgstr "berichten waarvan de score gelijk is aan # punten"
 
-#: src/gtk/quicksearch.c:507
+#: src/gtk/quicksearch.c:505
 msgid "messages whose score is greater than # points"
 msgstr "berichten waarvan de score hoger is dan # punten"
 
-#: src/gtk/quicksearch.c:508
+#: src/gtk/quicksearch.c:506
 msgid "messages whose score is lower than # points"
 msgstr "berichten waarvan de score lager is dan # punten"
 
-#: src/gtk/quicksearch.c:509
+#: src/gtk/quicksearch.c:507
 msgid "messages whose size is equal to # bytes"
 msgstr "berichten met grootte gelijk is aan # bytes"
 
-#: src/gtk/quicksearch.c:510
+#: src/gtk/quicksearch.c:508
 msgid "messages whose size is greater than # bytes"
 msgstr "berichten die groter zijn dan # bytes"
 
-#: src/gtk/quicksearch.c:511
+#: src/gtk/quicksearch.c:509
 msgid "messages whose size is smaller than # bytes"
 msgstr "berichten die kleiner zijn dan # bytes"
 
-#: src/gtk/quicksearch.c:512
+#: src/gtk/quicksearch.c:510
 msgid "messages which have been sent to S"
 msgstr "berichten die zijn gestuurd aan S"
 
-#: src/gtk/quicksearch.c:513
+#: src/gtk/quicksearch.c:511
 msgid "messages which tags contain S"
 msgstr "berichten die tags met S bevatten"
 
-#: src/gtk/quicksearch.c:514
+#: src/gtk/quicksearch.c:512
 msgid "messages which have tag(s)"
 msgstr "berichten die getagged zijn"
 
-#: src/gtk/quicksearch.c:515
+#: src/gtk/quicksearch.c:513
 msgid "marked messages"
 msgstr "gemarkeerde berichten"
 
-#: src/gtk/quicksearch.c:516
+#: src/gtk/quicksearch.c:514
 msgid "unread messages"
 msgstr "ongelezen berichten"
 
-#: src/gtk/quicksearch.c:517
+#: src/gtk/quicksearch.c:515
 msgid "messages which contain S in References header"
 msgstr "berichten waarin S in de header 'References' voorkomt"
 
-#: src/gtk/quicksearch.c:518
+#: src/gtk/quicksearch.c:516
 #, c-format
 msgid "messages returning 0 when passed to command - %F is message file"
 msgstr ""
 "berichten die 0 teruggeven als ze aan opdracht worden doorgegeven - %F is "
 "bestand met het bericht"
 
-#: src/gtk/quicksearch.c:519
+#: src/gtk/quicksearch.c:517
 msgid "messages which contain S in X-Label header"
 msgstr "berichten waarin S in de header 'X-label' voorkomt"
 
-#: src/gtk/quicksearch.c:521
+#: src/gtk/quicksearch.c:519
 msgid "logical AND operator"
 msgstr "logische EN operator"
 
-#: src/gtk/quicksearch.c:522
+#: src/gtk/quicksearch.c:520
 msgid "logical OR operator"
 msgstr "logische OF-operator"
 
-#: src/gtk/quicksearch.c:523
+#: src/gtk/quicksearch.c:521
 msgid "logical NOT operator"
 msgstr "logische NIET-operator"
 
-#: src/gtk/quicksearch.c:524
+#: src/gtk/quicksearch.c:522
 msgid "case sensitive search"
 msgstr "hoofdlettergevoelig zoeken"
 
-#: src/gtk/quicksearch.c:525
+#: src/gtk/quicksearch.c:523
 msgid "match using regular expressions instead of substring search"
 msgstr ""
-"Overeenkomsten zoeken met reguliere expressies in plaats van substring zoeken"
+"overeenkomsten zoeken met reguliere expressies in plaats van substring zoeken"
 
-#: src/gtk/quicksearch.c:527
+#: src/gtk/quicksearch.c:525
 msgid ""
 "all filtering expressions are allowed, but cannot be mixed through logical "
 "operators with the expressions above"
@@ -5315,11 +5333,11 @@ msgstr ""
 "alle filterexpressies zijn toegestaan, maar kunnen niet gemixt worden via "
 "logische operatoren met de bovenstaande expressies"
 
-#: src/gtk/quicksearch.c:537 src/summary_search.c:521
+#: src/gtk/quicksearch.c:535 src/summary_search.c:462
 msgid "Extended Search"
 msgstr "Uitgebreid Zoeken"
 
-#: src/gtk/quicksearch.c:538
+#: src/gtk/quicksearch.c:536
 msgid ""
 "Extended Search allows the user to define criteria that messages must have "
 "in order to match and be displayed in the message list.\n"
@@ -5329,99 +5347,107 @@ msgstr ""
 "voldoen alvorens ze zichtbaar worden in de berichtenlijst.\n"
 "De volgende speciale tekens kunnen worden gebruikt:"
 
-#: src/gtk/quicksearch.c:638
+#: src/gtk/quicksearch.c:640
 msgid "Something went wrong during search. Please check your logs."
 msgstr "Er ging iets mis tijdens het zoeken. Controleer de logs."
 
-#: src/gtk/quicksearch.c:704
+#: src/gtk/quicksearch.c:702
 msgid "From/To/Cc/Subject/Tag"
 msgstr "Van/Aan/Cc/Onderwerp/Vlag"
 
-#: src/gtk/quicksearch.c:715 src/plugins/archive/archiver_prefs.c:416
+#: src/gtk/quicksearch.c:713 src/plugins/archive/archiver_prefs.c:416
 msgid "Recursive"
 msgstr "Recursief"
 
-#: src/gtk/quicksearch.c:724
+#: src/gtk/quicksearch.c:722
 msgid "Sticky"
 msgstr "Plakkend"
 
-#: src/gtk/quicksearch.c:734
+#: src/gtk/quicksearch.c:732
 msgid "Type-ahead"
 msgstr "Aanvullen"
 
-#: src/gtk/quicksearch.c:746
+#: src/gtk/quicksearch.c:744
 msgid "Run on select"
 msgstr "Draai bij het selecteren"
 
-#: src/gtk/quicksearch.c:788
+#: src/gtk/quicksearch.c:780
 msgid "Clear the current search"
 msgstr "Wis de huidige zoekopdracht"
 
-#: src/gtk/quicksearch.c:798 src/summary_search.c:472
+#: src/gtk/quicksearch.c:790 src/summary_search.c:413
 msgid "Edit search criteria"
 msgstr "Bewerk zoekcriterie"
 
-#: src/gtk/quicksearch.c:807
+#: src/gtk/quicksearch.c:799
 msgid "Information about extended symbols"
 msgstr "Informatie over uitgebreide speciale tekens"
 
-#: src/gtk/quicksearch.c:845 src/gtk/quicksearch.c:869
+#: src/gtk/quicksearch.c:837 src/gtk/quicksearch.c:861
 msgid "_Information"
 msgstr "_Informatie"
 
-#: src/gtk/quicksearch.c:846 src/gtk/quicksearch.c:870
+#: src/gtk/quicksearch.c:838 src/gtk/quicksearch.c:862
 msgid "E_dit"
 msgstr "_Wijzigen"
 
-#: src/gtk/quicksearch.c:847 src/gtk/quicksearch.c:871 src/prefs_actions.c:347
-#: src/prefs_filtering.c:495 src/prefs_template.c:330
+#: src/gtk/quicksearch.c:839 src/gtk/quicksearch.c:863 src/prefs_actions.c:349
+#: src/prefs_filtering.c:496 src/prefs_template.c:330
 msgid "C_lear"
 msgstr "Leeg _Log"
 
-#: src/gtk/sslcertwindow.c:157 src/gtk/sslcertwindow.c:348
-#: src/gtk/sslcertwindow.c:398 src/gtk/sslcertwindow.c:462
-msgid "Correct"
-msgstr "Correct"
+#: src/gtk/sslcertwindow.c:181 src/ssl_manager.c:301
+#, c-format
+msgid "Correct%s"
+msgstr "Correct%s"
+
+#: src/gtk/sslcertwindow.c:181 src/gtk/sslcertwindow.c:183
+#: src/ssl_manager.c:301 src/ssl_manager.c:305
+msgid " (expired)"
+msgstr " (verlopen)"
 
-#: src/gtk/sslcertwindow.c:162
+#: src/gtk/sslcertwindow.c:188
 msgid "Owner"
 msgstr "Eigenaar"
 
-#: src/gtk/sslcertwindow.c:163
+#: src/gtk/sslcertwindow.c:189
 msgid "Signer"
 msgstr "Ondergetekende"
 
-#: src/gtk/sslcertwindow.c:170 src/gtk/sslcertwindow.c:194
-#: src/prefs_themes.c:989
+#: src/gtk/sslcertwindow.c:196 src/gtk/sslcertwindow.c:220
 msgid "Name: "
 msgstr "Naam: "
 
-#: src/gtk/sslcertwindow.c:178 src/gtk/sslcertwindow.c:202
+#: src/gtk/sslcertwindow.c:204 src/gtk/sslcertwindow.c:228
 msgid "Organization: "
 msgstr "Organisatie: "
 
-#: src/gtk/sslcertwindow.c:186 src/gtk/sslcertwindow.c:210
+#: src/gtk/sslcertwindow.c:212 src/gtk/sslcertwindow.c:236
 msgid "Location: "
 msgstr "Locatie: "
 
-#: src/gtk/sslcertwindow.c:218
+#: src/gtk/sslcertwindow.c:244
 msgid "Fingerprint: \n"
 msgstr "Sleutel-vingerafdruk: \n"
 
-#: src/gtk/sslcertwindow.c:228
+#: src/gtk/sslcertwindow.c:254
 msgid "Signature status: "
 msgstr "Status van ondertekening: "
 
-#: src/gtk/sslcertwindow.c:235
+#: src/gtk/sslcertwindow.c:261
+msgid "Expired on: "
+msgstr "Verlopen op: "
+
+#: src/gtk/sslcertwindow.c:261
 msgid "Expires on: "
 msgstr "Verloopt op: "
 
-#: src/gtk/sslcertwindow.c:302
+#: src/gtk/sslcertwindow.c:328
 #, c-format
 msgid "SSL/TLS certificate for %s"
 msgstr "SSL/TLS-certificaat voor %s"
 
-#: src/gtk/sslcertwindow.c:318
+#: src/gtk/sslcertwindow.c:344
 #, c-format
 msgid ""
 "Certificate is for %s, but connection is to %s.\n"
@@ -5432,7 +5458,7 @@ msgstr ""
 "Mogelijk verbind je met een onbetrouwbare server.\n"
 "\n"
 
-#: src/gtk/sslcertwindow.c:338
+#: src/gtk/sslcertwindow.c:364
 #, c-format
 msgid ""
 "Certificate for %s is unknown.\n"
@@ -5441,34 +5467,39 @@ msgstr ""
 "Certificaat voor %s is onbekend.\n"
 "%sWil je het accepteren?"
 
-#: src/gtk/sslcertwindow.c:350 src/gtk/sslcertwindow.c:400
-#: src/gtk/sslcertwindow.c:464
+#: src/gtk/sslcertwindow.c:374 src/gtk/sslcertwindow.c:424
+#: src/gtk/sslcertwindow.c:488
+msgid "Correct"
+msgstr "Correct"
+
+#: src/gtk/sslcertwindow.c:376 src/gtk/sslcertwindow.c:426
+#: src/gtk/sslcertwindow.c:490
 #, c-format
 msgid "Signature status: %s"
 msgstr "Status van ondertekening: %s"
 
-#: src/gtk/sslcertwindow.c:358 src/gtk/sslcertwindow.c:408
+#: src/gtk/sslcertwindow.c:384 src/gtk/sslcertwindow.c:434
 msgid "_View certificate"
 msgstr "_Bekijk certificaat"
 
-#: src/gtk/sslcertwindow.c:364
+#: src/gtk/sslcertwindow.c:390
 msgid "SSL/TLS certificate is invalid"
 msgstr "SSL/TLS-Certificaat is ongeldig"
 
-#: src/gtk/sslcertwindow.c:366
+#: src/gtk/sslcertwindow.c:392
 msgid "SSL/TLS certificate is unknown"
 msgstr "SSL/TLS-certificaat is onbekend"
 
-#: src/gtk/sslcertwindow.c:369 src/gtk/sslcertwindow.c:419
-#: src/gtk/sslcertwindow.c:481
+#: src/gtk/sslcertwindow.c:395 src/gtk/sslcertwindow.c:445
+#: src/gtk/sslcertwindow.c:507
 msgid "_Cancel connection"
 msgstr "Verbinding afbreken"
 
-#: src/gtk/sslcertwindow.c:369 src/gtk/sslcertwindow.c:481
+#: src/gtk/sslcertwindow.c:395 src/gtk/sslcertwindow.c:507
 msgid "_Accept and save"
 msgstr "_Accepteren en opslaan"
 
-#: src/gtk/sslcertwindow.c:387
+#: src/gtk/sslcertwindow.c:413
 #, c-format
 msgid ""
 "Certificate for %s is expired.\n"
@@ -5477,27 +5508,27 @@ msgstr ""
 "Certificaat voor %s is verlopen.\n"
 "%sWil je doorgaan?"
 
-#: src/gtk/sslcertwindow.c:414
+#: src/gtk/sslcertwindow.c:440
 msgid "SSL/TLS certificate is invalid and expired"
 msgstr "SSL/TLS-certificaat is ongeldig en verlopen"
 
-#: src/gtk/sslcertwindow.c:416
+#: src/gtk/sslcertwindow.c:442
 msgid "SSL/TLS certificate is expired"
 msgstr "SSL/TLS-certificaat is verlopen"
 
-#: src/gtk/sslcertwindow.c:419
+#: src/gtk/sslcertwindow.c:445
 msgid "_Accept"
 msgstr "_Accepteren"
 
-#: src/gtk/sslcertwindow.c:439
+#: src/gtk/sslcertwindow.c:465
 msgid "New certificate:"
 msgstr "Nieuw certificaat:"
 
-#: src/gtk/sslcertwindow.c:444
+#: src/gtk/sslcertwindow.c:470
 msgid "Known certificate:"
 msgstr "Bekend certificaat:"
 
-#: src/gtk/sslcertwindow.c:451
+#: src/gtk/sslcertwindow.c:477
 #, c-format
 msgid ""
 "Certificate for %s has changed.\n"
@@ -5506,15 +5537,15 @@ msgstr ""
 "Certificaat voor %s is veranderd.\n"
 "%sWil je het accepteren?"
 
-#: src/gtk/sslcertwindow.c:472
+#: src/gtk/sslcertwindow.c:498
 msgid "_View certificates"
 msgstr "_Bekijk certificaten"
 
-#: src/gtk/sslcertwindow.c:477
+#: src/gtk/sslcertwindow.c:503
 msgid "SSL/TLS certificate changed and is invalid"
 msgstr "SSL/TLS-certificaat is veranderd en ongeldig"
 
-#: src/gtk/sslcertwindow.c:479
+#: src/gtk/sslcertwindow.c:505
 msgid "SSL/TLS certificate changed"
 msgstr "SSL/TLS-certificaat is veranderd"
 
@@ -5524,223 +5555,223 @@ msgstr "Tags:"
 
 #: src/headerview.c:192 src/plugins/notification/notification_popup.c:313
 #: src/plugins/notification/notification_popup.c:620
-#: src/plugins/notification/notification_trayicon.c:886 src/summaryview.c:3423
-#: src/summaryview.c:3441 src/summaryview.c:3462
+#: src/plugins/notification/notification_trayicon.c:886 src/summaryview.c:3499
+#: src/summaryview.c:3517 src/summaryview.c:3556
 msgid "(No From)"
 msgstr "(Geen afzender)"
 
 #: src/headerview.c:207 src/plugins/notification/notification_popup.c:315
 #: src/plugins/notification/notification_popup.c:624
-#: src/plugins/notification/notification_trayicon.c:889 src/summaryview.c:3474
-#: src/summaryview.c:3477
+#: src/plugins/notification/notification_trayicon.c:889 src/summaryview.c:3568
+#: src/summaryview.c:3571
 msgid "(No Subject)"
 msgstr "(Geen onderwerp)"
 
-#: src/image_viewer.c:100
+#: src/image_viewer.c:127
 msgid "Error:"
 msgstr "Fout:"
 
-#: src/image_viewer.c:299 src/mimeview.c:2611
+#: src/image_viewer.c:312 src/mimeview.c:2666
 #: src/plugins/att_remover/att_remover.c:306
-#: src/plugins/pdf_viewer/poppler_viewer.c:698
+#: src/plugins/pdf_viewer/poppler_viewer.c:701
 msgid "Filename:"
 msgstr "Bestandsnaam:"
 
-#: src/image_viewer.c:306
+#: src/image_viewer.c:319
 msgid "Filesize:"
 msgstr "Bestandsgrootte:"
 
-#: src/image_viewer.c:355
+#: src/image_viewer.c:368
 msgid "Load Image"
 msgstr "Laad afbeelding"
 
-#: src/imap.c:576
+#: src/imap.c:577
 msgid "IMAP connection broken\n"
 msgstr "IMAP-verbinding verbroken\n"
 
-#: src/imap.c:615 src/imap.c:618 src/imap.c:621 src/imap.c:624 src/imap.c:627
-#: src/imap.c:631 src/imap.c:634 src/imap.c:637 src/imap.c:640 src/imap.c:644
-#: src/imap.c:647 src/imap.c:650 src/imap.c:653 src/imap.c:656 src/imap.c:659
-#: src/imap.c:662 src/imap.c:665 src/imap.c:668 src/imap.c:671 src/imap.c:674
-#: src/imap.c:677 src/imap.c:680 src/imap.c:683 src/imap.c:686 src/imap.c:689
-#: src/imap.c:692 src/imap.c:695 src/imap.c:698 src/imap.c:701 src/imap.c:704
-#: src/imap.c:707 src/imap.c:710 src/imap.c:713 src/imap.c:716 src/imap.c:719
-#: src/imap.c:722 src/imap.c:725 src/imap.c:728 src/imap.c:731 src/imap.c:734
-#: src/imap.c:738 src/imap.c:742
+#: src/imap.c:622 src/imap.c:625 src/imap.c:628 src/imap.c:631 src/imap.c:634
+#: src/imap.c:638 src/imap.c:641 src/imap.c:644 src/imap.c:647 src/imap.c:651
+#: src/imap.c:654 src/imap.c:657 src/imap.c:660 src/imap.c:663 src/imap.c:666
+#: src/imap.c:669 src/imap.c:672 src/imap.c:675 src/imap.c:678 src/imap.c:681
+#: src/imap.c:684 src/imap.c:687 src/imap.c:690 src/imap.c:693 src/imap.c:696
+#: src/imap.c:699 src/imap.c:702 src/imap.c:705 src/imap.c:708 src/imap.c:711
+#: src/imap.c:714 src/imap.c:717 src/imap.c:720 src/imap.c:723 src/imap.c:726
+#: src/imap.c:729 src/imap.c:732 src/imap.c:735 src/imap.c:738 src/imap.c:741
+#: src/imap.c:745 src/imap.c:749
 #, c-format
 msgid "IMAP error on %s:"
 msgstr "IMAP-fout op %s:"
 
-#: src/imap.c:615
+#: src/imap.c:622
 msgid "authenticated"
-msgstr " geauthenticeerd"
+msgstr "geauthenticeerd"
 
-#: src/imap.c:618
+#: src/imap.c:625
 msgid "not authenticated"
-msgstr " niet geauthenticeerd"
+msgstr "niet geauthenticeerd"
 
-#: src/imap.c:621
+#: src/imap.c:628
 msgid "bad state"
-msgstr " bad state (er is iets mis)"
+msgstr "bad state (er is iets mis)"
 
-#: src/imap.c:624
+#: src/imap.c:631
 msgid "stream error"
-msgstr " stream leesfout"
+msgstr "stream leesfout"
 
-#: src/imap.c:627
+#: src/imap.c:634
 msgid "parse error (very probably non-RFC compliance from the server)"
-msgstr " verwerkingsfout (waarschijnlijk niet-RFC overeenkomende server)"
+msgstr "verwerkingsfout (waarschijnlijk niet-RFC overeenkomende server)"
 
-#: src/imap.c:631
+#: src/imap.c:638
 msgid "connection refused"
-msgstr " verbinding geweigerd"
+msgstr "verbinding geweigerd"
 
-#: src/imap.c:634
+#: src/imap.c:641
 msgid "memory error"
-msgstr " geheugen-fout"
+msgstr "geheugen-fout"
 
-#: src/imap.c:637
+#: src/imap.c:644
 msgid "fatal error"
-msgstr " fatale fout"
+msgstr "fatale fout"
 
-#: src/imap.c:640
+#: src/imap.c:647
 msgid "protocol error (very probably non-RFC compliance from the server)"
-msgstr " protocolfout (waarschijnlijk niet-RFC overeenkomende "
+msgstr "protocolfout (waarschijnlijk niet-RFC overeenkomend)"
 
-#: src/imap.c:644
+#: src/imap.c:651
 msgid "connection not accepted"
-msgstr " verbinding geweigerd"
+msgstr "verbinding geweigerd"
 
-#: src/imap.c:647
+#: src/imap.c:654
 msgid "APPEND error"
-msgstr " APPEND-fout"
+msgstr "APPEND-fout"
 
-#: src/imap.c:650
+#: src/imap.c:657
 msgid "NOOP error"
-msgstr " NOOP-fout"
+msgstr "NOOP-fout"
 
-#: src/imap.c:653
+#: src/imap.c:660
 msgid "LOGOUT error"
-msgstr " LOGOUT-fout"
+msgstr "LOGOUT-fout"
 
-#: src/imap.c:656
+#: src/imap.c:663
 msgid "CAPABILITY error"
-msgstr " CAPABILITY-fout"
+msgstr "CAPABILITY-fout"
 
-#: src/imap.c:659
+#: src/imap.c:666
 msgid "CHECK error"
-msgstr " CHECK-fout"
+msgstr "CHECK-fout"
 
-#: src/imap.c:662
+#: src/imap.c:669
 msgid "CLOSE error"
-msgstr " CLOSE-fout"
+msgstr "CLOSE-fout"
 
-#: src/imap.c:665
+#: src/imap.c:672
 msgid "EXPUNGE error"
-msgstr " EXPUNGE-fout"
+msgstr "EXPUNGE-fout"
 
-#: src/imap.c:668
+#: src/imap.c:675
 msgid "COPY error"
-msgstr " UID COPY-fout"
+msgstr "UID COPY-fout"
 
-#: src/imap.c:671
+#: src/imap.c:678
 msgid "UID COPY error"
-msgstr " UID COPY-fout"
+msgstr "UID COPY-fout"
 
-#: src/imap.c:674
+#: src/imap.c:681
 msgid "CREATE error"
-msgstr " CREATE-fout"
+msgstr "CREATE-fout"
 
-#: src/imap.c:677
+#: src/imap.c:684
 msgid "DELETE error"
-msgstr " DELETE-fout"
+msgstr "DELETE-fout"
 
-#: src/imap.c:680
+#: src/imap.c:687
 msgid "EXAMINE error"
-msgstr " EXAMINE-fout"
+msgstr "EXAMINE-fout"
 
-#: src/imap.c:683
+#: src/imap.c:690
 msgid "FETCH error"
-msgstr " FETCH-fout"
+msgstr "FETCH-fout"
 
-#: src/imap.c:686
+#: src/imap.c:693
 msgid "UID FETCH error"
-msgstr " UID FETCH-fout"
+msgstr "UID FETCH-fout"
 
-#: src/imap.c:689
+#: src/imap.c:696
 msgid "LIST error"
-msgstr " LIST-fout"
+msgstr "LIST-fout"
 
-#: src/imap.c:692
+#: src/imap.c:699
 msgid "LOGIN error"
-msgstr " LOGIN-fout"
+msgstr "LOGIN-fout"
 
-#: src/imap.c:695
+#: src/imap.c:702
 msgid "LSUB error"
-msgstr " LSUB-fout"
+msgstr "LSUB-fout"
 
-#: src/imap.c:698
+#: src/imap.c:705
 msgid "RENAME error"
-msgstr " RENAME-fout"
+msgstr "RENAME-fout"
 
-#: src/imap.c:701
+#: src/imap.c:708
 msgid "SEARCH error"
-msgstr " SEARCH-fout"
+msgstr "SEARCH-fout"
 
-#: src/imap.c:704
+#: src/imap.c:711
 msgid "UID SEARCH error"
-msgstr " UID SEARCH-fout"
+msgstr "UID SEARCH-fout"
 
-#: src/imap.c:707
+#: src/imap.c:714
 msgid "SELECT error"
-msgstr " SELECT-fout"
+msgstr "SELECT-fout"
 
-#: src/imap.c:710
+#: src/imap.c:717
 msgid "STATUS error"
-msgstr " STATUS-fout"
+msgstr "STATUS-fout"
 
-#: src/imap.c:713
+#: src/imap.c:720
 msgid "STORE error"
-msgstr " STORE-fout"
+msgstr "STORE-fout"
 
-#: src/imap.c:716
+#: src/imap.c:723
 msgid "UID STORE error"
-msgstr " UID STORE-fout"
+msgstr "UID STORE-fout"
 
-#: src/imap.c:719
+#: src/imap.c:726
 msgid "SUBSCRIBE error"
-msgstr " SUBSCRIBE-fout"
+msgstr "SUBSCRIBE-fout"
 
-#: src/imap.c:722
+#: src/imap.c:729
 msgid "UNSUBSCRIBE error"
-msgstr " UNSUBSCRIBE-fout"
+msgstr "UNSUBSCRIBE-fout"
 
-#: src/imap.c:725
+#: src/imap.c:732
 msgid "STARTTLS error"
-msgstr " STARTTLS-fout"
+msgstr "STARTTLS-fout"
 
-#: src/imap.c:728
+#: src/imap.c:735
 msgid "INVAL error"
-msgstr " INVAL-fout"
+msgstr "INVAL-fout"
 
-#: src/imap.c:731
+#: src/imap.c:738
 msgid "EXTENSION error"
-msgstr " EXTENSION-fout"
+msgstr "EXTENSION-fout"
 
-#: src/imap.c:734
+#: src/imap.c:741
 msgid "SASL error"
-msgstr " SASL-fout"
+msgstr "SASL-fout"
 
-#: src/imap.c:738
+#: src/imap.c:745
 msgid "SSL/TLS error"
-msgstr " SSL/TLS-fout"
+msgstr "SSL/TLS-fout"
 
-#: src/imap.c:742
+#: src/imap.c:749
 #, c-format
 msgid "Unknown error [%d]"
-msgstr " Onbekende fout [%d]"
+msgstr "Onbekende fout [%d]"
 
-#: src/imap.c:946
+#: src/imap.c:955
 msgid ""
 "\n"
 "\n"
@@ -5752,7 +5783,7 @@ msgstr ""
 "CRAM-MD5 logins werken alleen als libetpan gecompileerd is met SASL-"
 "ondersteuning en de CRFAM-MD5 SASL plugin geïnstalleerd is."
 
-#: src/imap.c:952
+#: src/imap.c:961
 msgid ""
 "\n"
 "\n"
@@ -5764,7 +5795,7 @@ msgstr ""
 "DIGEST-MD5 logins werken alleen als libetpan gecompileerd is met SASL-"
 "ondersteuning en de DIGEST-MD5 SASL plugin geïnstalleerd is."
 
-#: src/imap.c:958
+#: src/imap.c:967
 msgid ""
 "\n"
 "\n"
@@ -5776,7 +5807,7 @@ msgstr ""
 "CRAM-SHA-1 logins werken alleen als libetpan gecompileerd is met SASL-"
 "ondersteuning en de CRFAM SASL plugin geïnstalleerd is."
 
-#: src/imap.c:964
+#: src/imap.c:973
 msgid ""
 "\n"
 "\n"
@@ -5788,7 +5819,7 @@ msgstr ""
 "PLAIN logins werken alleen als libetpan gecompileerd is met SASL-"
 "ondersteuning en de PLAIN SASL plugin geïnstalleerd is."
 
-#: src/imap.c:970
+#: src/imap.c:979
 msgid ""
 "\n"
 "\n"
@@ -5800,37 +5831,37 @@ msgstr ""
 "LOGIN logins werken alleen als libetpan gecompileerd is met SASL-"
 "ondersteuning en de LOGIN SASL plugin geïnstalleerd is."
 
-#: src/imap.c:977
+#: src/imap.c:986
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Verbinding maken met %s mislukt: login geweigerd.%s"
 
-#: src/imap.c:981
+#: src/imap.c:990
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "Verbinding maken met %s mislukt: login geweigerd.%s\n"
 
-#: src/imap.c:999
+#: src/imap.c:1008
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Verbinding maken met %s mislukt"
 
-#: src/imap.c:1006 src/imap.c:1009
+#: src/imap.c:1015 src/imap.c:1018
 #, c-format
 msgid "IMAP connection to %s has been disconnected. Reconnecting...\n"
 msgstr ""
 "IMAP-verbinding naar %s is verbroken. Contact wordt opnieuw gelegd...\n"
 
-#: src/imap.c:1039 src/imap.c:3656 src/imap.c:4315 src/imap.c:4409
-#: src/imap.c:4587 src/imap.c:5398
+#: src/imap.c:1048 src/imap.c:3693 src/imap.c:4352 src/imap.c:4446
+#: src/imap.c:4624 src/imap.c:5435
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr "Claws Mail heeft netwerktoegang nodig voor toegang tot de IMAP-server."
 
-#: src/imap.c:1148 src/inc.c:811 src/news.c:388 src/send_message.c:282
+#: src/imap.c:1158 src/inc.c:876 src/news.c:402 src/send_message.c:286
 msgid "Insecure connection"
 msgstr "Onveilige verbinding"
 
-#: src/imap.c:1149 src/inc.c:812 src/news.c:389 src/send_message.c:283
+#: src/imap.c:1159 src/inc.c:877 src/news.c:403 src/send_message.c:287
 msgid ""
 "This connection is configured to be secured using SSL/TLS, but SSL/TLS is "
 "not available in this build of Claws Mail. \n"
@@ -5844,104 +5875,108 @@ msgstr ""
 "Wil je de verbinding met deze server toch maken? De communicatie is dan niet "
 "beveiligd."
 
-#: src/imap.c:1155 src/inc.c:818 src/news.c:395 src/send_message.c:289
+#: src/imap.c:1165 src/inc.c:883 src/news.c:409 src/send_message.c:293
 msgid "Con_tinue connecting"
 msgstr "Verbinding _hervatten"
 
-#: src/imap.c:1165
+#: src/imap.c:1174
 #, c-format
 msgid "Account '%s': Connecting to IMAP server: %s:%d..."
 msgstr "Account '%s': Verbinden met IMAP-server: %s:%d..."
 
-#: src/imap.c:1213
+#: src/imap.c:1239
 #, c-format
 msgid "Can't connect to IMAP server: %s:%d"
 msgstr "Kan geen verbinding maken met de IMAP-server: %s:%d"
 
-#: src/imap.c:1216
+#: src/imap.c:1242
 #, c-format
 msgid "Can't connect to IMAP server: %s:%d\n"
 msgstr "Kan geen verbinding maken met de IMAP-server: %s:%d\n"
 
-#: src/imap.c:1249 src/imap.c:4077
+#: src/imap.c:1274 src/imap.c:4114
 msgid "Can't start STARTTLS session.\n"
 msgstr "Kan STARTTLS-sessie niet tot stand brengen.\n"
 
-#: src/imap.c:1316
+#: src/imap.c:1343
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Kon niet inloggen op IMAP-server %s.\n"
 
-#: src/imap.c:1319
+#: src/imap.c:1346
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Kon niet inloggen op IMAP-server %s."
 
-#: src/imap.c:1747
+#: src/imap.c:1774
 msgid "Adding messages..."
 msgstr "Berichten worden toegevoegd..."
 
-#: src/imap.c:1952 src/mh.c:529
+#: src/imap.c:1979 src/mh.c:530
 msgid "Copying messages..."
 msgstr "Berichten worden gekopieerd..."
 
-#: src/imap.c:2545
+#: src/imap.c:2504
+msgid "Search failed due to server error."
+msgstr "Zoeken mislukt vanwege netwerkfout."
+
+#: src/imap.c:2586
 msgid "can't set deleted flags\n"
 msgstr "kan \"verwijderd\" vlaggen niet instellen\n"
 
-#: src/imap.c:2552 src/imap.c:5028
+#: src/imap.c:2593 src/imap.c:5065
 msgid "can't expunge\n"
 msgstr "kan niet wissen\n"
 
-#: src/imap.c:2903
+#: src/imap.c:2944
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Zoeken naar niet-geabonneerde mappen in %s..."
 
-#: src/imap.c:2906
+#: src/imap.c:2947
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Zoeken naar submappen van %s..."
 
-#: src/imap.c:3196
+#: src/imap.c:3235
 msgid "can't create mailbox: LIST failed\n"
 msgstr "LIST mislukt: kan postvak niet aanmaken\n"
 
-#: src/imap.c:3211
+#: src/imap.c:3248
 msgid "can't create mailbox\n"
 msgstr "kan postvak niet aanmaken\n"
 
-#: src/imap.c:3342
+#: src/imap.c:3379
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "kan postvak niet hernoemen: %s naar %s\n"
 
-#: src/imap.c:3455
+#: src/imap.c:3492
 msgid "can't delete mailbox\n"
 msgstr "kan postvak niet verwijderen\n"
 
-#: src/imap.c:3734
+#: src/imap.c:3771
 msgid "LIST failed\n"
 msgstr "LIST mislukt\n"
 
-#: src/imap.c:3819
+#: src/imap.c:3856
 msgid "Flagging messages..."
 msgstr "Berichten afvlaggen..."
 
-#: src/imap.c:3922
+#: src/imap.c:3959
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "kan map niet selecteren: %s\n"
 
-#: src/imap.c:4074
+#: src/imap.c:4111
 msgid "Server requires STARTTLS to log in.\n"
 msgstr "Server vereist STARTTLS om in te loggen.\n"
 
-#: src/imap.c:4084
+#: src/imap.c:4121
 msgid "Can't refresh capabilities.\n"
 msgstr "Kan 'capabilities' niet verversen.\n"
 
-#: src/imap.c:4089
+#: src/imap.c:4126
 #, c-format
 msgid ""
 "Connection to %s failed: server requires STARTTLS, but Claws Mail has been "
@@ -5950,20 +5985,20 @@ msgstr ""
 "Verbinden met %s mislukt: de server vereist STARTTLS, maar Claws Mail is "
 "gecompileerd zonder STARTTLS-ondersteuning.\n"
 
-#: src/imap.c:4097
+#: src/imap.c:4134
 msgid "Server logins are disabled.\n"
 msgstr "Inloggen op servers staat uit.\n"
 
-#: src/imap.c:4320
+#: src/imap.c:4357
 msgid "Fetching message..."
 msgstr "Berichten worden opgehaald..."
 
-#: src/imap.c:5021
+#: src/imap.c:5058
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "kan \"verwijderd\" vlaggen: %d niet instellen\n"
 
-#: src/imap.c:6056
+#: src/imap.c:6093
 msgid ""
 "You have one or more IMAP accounts defined. However this version of Claws "
 "Mail has been built without IMAP support; your IMAP accounts are disabled.\n"
@@ -6015,7 +6050,7 @@ msgstr "_Abonnementen"
 msgid "_Subscribe..."
 msgstr "_Abonneren..."
 
-#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:169
+#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:171
 msgid "_Unsubscribe..."
 msgstr "_Afmelden..."
 
@@ -6047,25 +6082,25 @@ msgstr ""
 " voeg een `/' toe aan het eind van de naam)"
 
 #: src/imap_gtk.c:198 src/mh_gtk.c:147
-msgid "Inherit properties from parent folder"
-msgstr "Neem eigenschappen over van bovenliggende map"
+msgid "Inherit properties and processing rules from parent folder"
+msgstr "Neem eigenschappen en verwerkregels over van bovenliggende map"
 
 #: src/imap_gtk.c:259 src/mh_gtk.c:252 src/news_gtk.c:290
-#: src/plugins/mailmbox/plugin_gtk.c:419 src/plugins/rssyl/rssyl_cb_menu.c:197
-#: src/plugins/vcalendar/vcal_folder.c:2051
+#: src/plugins/mailmbox/plugin_gtk.c:419 src/plugins/rssyl/rssyl_cb_menu.c:196
+#: src/plugins/vcalendar/vcal_folder.c:2060
 #, c-format
 msgid "Input new name for '%s':"
 msgstr "Geef een nieuwe naam voor '%s':"
 
 #: src/imap_gtk.c:261 src/mh_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:420
-#: src/plugins/rssyl/rssyl_cb_menu.c:198
-#: src/plugins/vcalendar/vcal_folder.c:2052
+#: src/plugins/rssyl/rssyl_cb_menu.c:197
+#: src/plugins/vcalendar/vcal_folder.c:2061
 msgid "Rename folder"
 msgstr "Hernoem map"
 
 #: src/imap_gtk.c:290 src/mh_gtk.c:280 src/news_gtk.c:312
-#: src/plugins/mailmbox/plugin_gtk.c:450 src/plugins/rssyl/rssyl_cb_menu.c:224
-#: src/plugins/vcalendar/vcal_folder.c:2072
+#: src/plugins/mailmbox/plugin_gtk.c:450 src/plugins/rssyl/rssyl_cb_menu.c:220
+#: src/plugins/vcalendar/vcal_folder.c:2081
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -6083,7 +6118,7 @@ msgstr "Selecteer map om map '%s' heen te verplaatsen"
 msgid "Select folder to copy folder '%s' to"
 msgstr "Selecteer map om map '%s' heen te kopiëren"
 
-#: src/imap_gtk.c:365 src/mh_gtk.c:203 src/plugins/rssyl/rssyl_cb_menu.c:152
+#: src/imap_gtk.c:365 src/mh_gtk.c:203 src/plugins/rssyl/rssyl_cb_menu.c:153
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted. Recovery "
@@ -6096,8 +6131,8 @@ msgstr ""
 "Wil je werkelijk verwijderen?"
 
 #: src/imap_gtk.c:384 src/news_gtk.c:265 src/plugins/mailmbox/plugin_gtk.c:347
-#: src/plugins/rssyl/rssyl_cb_menu.c:171
-#: src/plugins/vcalendar/vcal_folder.c:2005
+#: src/plugins/rssyl/rssyl_cb_menu.c:172
+#: src/plugins/vcalendar/vcal_folder.c:2014
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Kan map '%s' niet verwijderen."
@@ -6124,7 +6159,7 @@ msgstr "_Zoeken"
 msgid "Choose a subfolder of %s to subscribe to: "
 msgstr "Kies een submap van %s om op te abonneren: "
 
-#: src/imap_gtk.c:536 src/mainwindow.c:680
+#: src/imap_gtk.c:536 src/mainwindow.c:689
 msgid "Subscribe"
 msgstr "Abonneren"
 
@@ -6157,8 +6192,8 @@ msgstr "abonneren"
 msgid "unsubscribe"
 msgstr "afmelden"
 
-#: src/imap_gtk.c:568 src/prefs_folder_item.c:1447 src/prefs_folder_item.c:1475
-#: src/prefs_folder_item.c:1503
+#: src/imap_gtk.c:568 src/prefs_folder_item.c:1537 src/prefs_folder_item.c:1565
+#: src/prefs_folder_item.c:1593
 msgid "Apply to subfolders"
 msgstr "Pas toe op submappen"
 
@@ -6166,43 +6201,43 @@ msgstr "Pas toe op submappen"
 msgid "_Subscribe"
 msgstr "_Abonneren"
 
-#: src/imap_gtk.c:575 src/news_gtk.c:252
+#: src/imap_gtk.c:574 src/news_gtk.c:252
 msgid "_Unsubscribe"
 msgstr "_Afmelden"
 
-#: src/import.c:113 src/import.c:207
+#: src/import.c:113 src/import.c:208
 msgid "Import mbox file"
 msgstr "Importeer mbox-bestand"
 
-#: src/import.c:131
+#: src/import.c:132
 msgid "Locate the mbox file and specify the destination folder."
 msgstr "Geef het mbox-bestand en de doelmap op."
 
-#: src/import.c:148
+#: src/import.c:149
 msgid "Destination folder:"
 msgstr "Doelmap:"
 
-#: src/import.c:202
+#: src/import.c:203
 msgid "Source mbox filename can't be left empty."
 msgstr "Het bron-mboxbestand mag niet leeg blijven."
 
-#: src/import.c:207
+#: src/import.c:208
 msgid ""
 "Destination folder is not set.\n"
 "Import mbox file to the Inbox folder?"
 msgstr ""
-"Doel-map is niet opgegeven.\n"
+"Doelmap is niet opgegeven.\n"
 "Mbox-bestand naar de inbox-map importeren?"
 
-#: src/import.c:229
+#: src/import.c:230
 msgid "Can't find the destination folder."
 msgstr "Kan de doelmap niet vinden."
 
-#: src/import.c:254
+#: src/import.c:263
 msgid "Select importing file"
 msgstr "Selecteer het te importeren bestand"
 
-#: src/import.c:272
+#: src/import.c:281
 msgid "Select folder to import to"
 msgstr "Selecteer map om naar te importeren"
 
@@ -6218,23 +6253,23 @@ msgstr "Selecteer en hernoem te importeren LDIF-veldnamen."
 msgid "File imported."
 msgstr "Bestand geïmporteerd."
 
-#: src/importldif.c:450 src/importmutt.c:122 src/importpine.c:121
+#: src/importldif.c:334 src/importmutt.c:122 src/importpine.c:121
 msgid "Please select a file."
 msgstr "Selecteer een bestand."
 
-#: src/importldif.c:456 src/importmutt.c:127 src/importpine.c:126
+#: src/importldif.c:340 src/importmutt.c:127 src/importpine.c:126
 msgid "Address book name must be supplied."
 msgstr "Naam voor adresboek is verplicht."
 
-#: src/importldif.c:496
+#: src/importldif.c:380
 msgid "LDIF file imported successfully."
 msgstr "LDIF-bestand ingelezen."
 
-#: src/importldif.c:581
+#: src/importldif.c:465
 msgid "Select LDIF File"
 msgstr "Selecteer LDIF-bestand"
 
-#: src/importldif.c:667
+#: src/importldif.c:551
 msgid ""
 "Specify the name for the address book that will be created from the LDIF "
 "file data."
@@ -6242,43 +6277,43 @@ msgstr ""
 "Geef de naam voor het adresboek dat wordt gemaakt van de gegevens in het "
 "LDIF-bestand."
 
-#: src/importldif.c:672
+#: src/importldif.c:556
 msgid "File Name"
 msgstr "Bestandsnaam"
 
-#: src/importldif.c:682
+#: src/importldif.c:566
 msgid "The full file specification of the LDIF file to import."
 msgstr "De volledige bestandsspecificatie van het te importeren LDIF-bestand."
 
-#: src/importldif.c:689
+#: src/importldif.c:573
 msgid "Select the LDIF file to import."
 msgstr "Selecteer het te importeren LDIF-bestand."
 
-#: src/importldif.c:725
+#: src/importldif.c:705
 msgid "R"
 msgstr "R"
 
-#: src/importldif.c:726 src/summaryview.c:441
+#: src/importldif.c:710 src/summaryview.c:466
 msgid "S"
 msgstr "S"
 
-#: src/importldif.c:727
+#: src/importldif.c:716
 msgid "LDIF Field Name"
 msgstr "Naam van LDIF-veld"
 
-#: src/importldif.c:728
+#: src/importldif.c:721
 msgid "Attribute Name"
 msgstr "Eigenschapnaam"
 
-#: src/importldif.c:783
+#: src/importldif.c:740
 msgid "LDIF Field"
 msgstr "LDIF-veld"
 
-#: src/importldif.c:795
+#: src/importldif.c:752
 msgid "Attribute"
 msgstr "Eigenschap"
 
-#: src/importldif.c:807
+#: src/importldif.c:764
 msgid ""
 "Choose the LDIF field that will be renamed or selected for import in the "
 "list above. Reserved fields (marked with a tick in the \"R\" column), are "
@@ -6296,37 +6331,37 @@ msgstr ""
 "klik ergens in de rij selecteert de rij voor hernoemen en brengt je in het "
 "hernoem-gedeelte onderin het venster."
 
-#: src/importldif.c:822
+#: src/importldif.c:779
 msgid "The LDIF field can be renamed to the User Attribute name."
 msgstr ""
 "Het LDIF-veld kan als eigenschap, geïmporteerd in het adresboek, een andere "
 "naam krijgen."
 
-#: src/importldif.c:827
+#: src/importldif.c:784
 msgid "Select for Import"
 msgstr "Selecteer voor importeren"
 
-#: src/importldif.c:832
+#: src/importldif.c:789
 msgid "Select the LDIF field for import into the address book."
 msgstr "Selecteer het LDIF-veld dat in het adresboek geïmporteerd moet worden."
 
-#: src/importldif.c:834
+#: src/importldif.c:791
 msgid " Modify "
 msgstr " Wijzigen "
 
-#: src/importldif.c:839
+#: src/importldif.c:796
 msgid "This button will update the list above with the data supplied."
 msgstr "Deze knop zal bovenstaande lijst bijwerken met de geleverde gegevens."
 
-#: src/importldif.c:911
+#: src/importldif.c:870
 msgid "Records Imported:"
 msgstr "Records importeren:"
 
-#: src/importldif.c:943
+#: src/importldif.c:902
 msgid "Import LDIF file into Address Book"
 msgstr "Importeren LDIF-bestand in adresboek"
 
-#: src/importldif.c:980
+#: src/importldif.c:940
 msgid "Proceed"
 msgstr "Ga door"
 
@@ -6342,7 +6377,7 @@ msgstr "Selecteer MUTT-bestand"
 msgid "Import MUTT file into Address Book"
 msgstr "Importeren MUTT-bestand in adresboek"
 
-#: src/importmutt.c:288 src/importpine.c:288
+#: src/importmutt.c:289 src/importpine.c:289
 msgid "Please select a file to import."
 msgstr "Selecteer een bestand."
 
@@ -6358,142 +6393,142 @@ msgstr "Selecteer Pine-bestand"
 msgid "Import Pine file into Address Book"
 msgstr "Importeren Pine-bestand in adresboek"
 
-#: src/inc.c:186 src/inc.c:294 src/inc.c:321
+#: src/inc.c:191 src/inc.c:299 src/inc.c:325
 msgid "Claws Mail needs network access in order to get mails."
 msgstr "Claws Mail heeft netwerktoegang nodig voor het onvangen van e-mail."
 
-#: src/inc.c:343
+#: src/inc.c:344
 #, c-format
 msgid "%s failed\n"
 msgstr "%s mislukt\n"
 
-#: src/inc.c:416
+#: src/inc.c:476
 msgid "Retrieving new messages"
 msgstr "Nieuwe berichten worden opgehaald"
 
-#: src/inc.c:474
+#: src/inc.c:534
 msgid "Standby"
 msgstr "Een ogenblik geduld alstublieft"
 
-#: src/inc.c:615 src/inc.c:669
+#: src/inc.c:678 src/inc.c:732
 msgid "Cancelled"
 msgstr "Afgebroken"
 
-#: src/inc.c:626
+#: src/inc.c:689
 msgid "Retrieving"
 msgstr "Bezig met ophalen"
 
-#: src/inc.c:635
+#: src/inc.c:698
 #, c-format
 msgid "Done (%d message (%s) received)"
 msgid_plural "Done (%d messages (%s) received)"
 msgstr[0] "Klaar (%d bericht (%s) ontvangen)"
 msgstr[1] "Klaar (%d berichten (%s) ontvangen)"
 
-#: src/inc.c:641
+#: src/inc.c:704
 msgid "Done (no new messages)"
 msgstr "Klaar (geen nieuwe berichten)"
 
-#: src/inc.c:646
+#: src/inc.c:709
 msgid "Connection failed"
 msgstr "Verbinding mislukt"
 
-#: src/inc.c:649 src/plugins/managesieve/managesieve.c:887
+#: src/inc.c:712 src/plugins/managesieve/managesieve.c:888
 msgid "Auth failed"
 msgstr "Authenticatie mislukt"
 
-#: src/inc.c:656 src/prefs_matcher.c:398 src/prefs_summaries.c:453
-#: src/prefs_summary_column.c:87 src/summaryview.c:2819 src/summaryview.c:6361
+#: src/inc.c:719 src/prefs_matcher.c:407 src/prefs_summaries.c:645
+#: src/prefs_summary_column.c:87 src/summaryview.c:2894 src/summaryview.c:6569
 msgid "Locked"
 msgstr "Op slot"
 
-#: src/inc.c:666 src/plugins/spamassassin/spamassassin_gtk.c:378
+#: src/inc.c:729 src/plugins/spamassassin/spamassassin_gtk.c:394
 msgid "Timeout"
 msgstr "Tijdslimiet"
 
-#: src/inc.c:752
+#: src/inc.c:815
 #, c-format
 msgid "Finished (%d new message)"
 msgid_plural "Finished (%d new messages)"
 msgstr[0] "Klaar (%d nieuw bericht)"
 msgstr[1] "Klaar (%d nieuwe berichten)"
 
-#: src/inc.c:756
+#: src/inc.c:819
 msgid "Finished (no new messages)"
 msgstr "Klaar (geen nieuwe berichten)"
 
-#: src/inc.c:795
+#: src/inc.c:860
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Nieuwe berichten worden opgehaald"
 
-#: src/inc.c:825
+#: src/inc.c:889
 #, c-format
 msgid "Account '%s': Connecting to POP3 server: %s:%d..."
 msgstr "Account '%s': Verbinden met POP3-server: %s:%d..."
 
-#: src/inc.c:843
+#: src/inc.c:923
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "Kan geen verbinding maken met POP3-server: %s:%d"
 
-#: src/inc.c:847
+#: src/inc.c:927
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Kan geen verbinding maken met POP3-server: %s:%d\n"
 
-#: src/inc.c:927 src/plugins/managesieve/managesieve.c:423
-#: src/send_message.c:496
+#: src/inc.c:1007 src/plugins/managesieve/managesieve.c:424
+#: src/send_message.c:515
 msgid "Authenticating..."
 msgstr "Authenticatie..."
 
-#: src/inc.c:929
+#: src/inc.c:1009
 #, c-format
 msgid "Retrieving messages from %s (%s)..."
 msgstr "Berichten ophalen van %s (%s)..."
 
-#: src/inc.c:935
+#: src/inc.c:1015
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Opvragen van het aantal nieuwe berichten (STAT)..."
 
-#: src/inc.c:939
+#: src/inc.c:1019
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Opvragen van het aantal nieuwe berichten (LAST)..."
 
-#: src/inc.c:943
+#: src/inc.c:1023
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Opvragen van het aantal nieuwe berichten (UIDL)..."
 
-#: src/inc.c:947
+#: src/inc.c:1027
 msgid "Getting the size of messages (LIST)..."
 msgstr "Opvragen van de grootte van de nieuwe berichten (LIST)..."
 
-#: src/inc.c:954 src/send_message.c:514
+#: src/inc.c:1034 src/send_message.c:533
 msgid "Quitting"
 msgstr "Bezig met afsluiten"
 
-#: src/inc.c:979
+#: src/inc.c:1059
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Bericht wordt opgehaald (%d / %d) (%s / %s)"
 
-#: src/inc.c:992
+#: src/inc.c:1072
 #, c-format
 msgid "Retrieving (%d message (%s) received)"
 msgid_plural "Retrieving (%d messages (%s) received)"
 msgstr[0] "Bezig met ophalen (%d bericht (%s) ontvangen)"
 msgstr[1] "Bezig met ophalen (%d berichten (%s) ontvangen)"
 
-#: src/inc.c:1151
+#: src/inc.c:1227
 #, c-format
 msgid "Connection to %s:%d failed."
 msgstr "Verbinding maken met %s:%d mislukt."
 
-#: src/inc.c:1156
+#: src/inc.c:1232
 msgid "Error occurred while processing mail."
 msgstr "Fout bij het verwerken van de e-mail."
 
-#: src/inc.c:1162
+#: src/inc.c:1238
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -6502,37 +6537,37 @@ msgstr ""
 "Fout bij het verwerken van e-mail:\n"
 "%s"
 
-#: src/inc.c:1168
+#: src/inc.c:1244
 msgid "No disk space left."
 msgstr "De schijf is vol."
 
-#: src/inc.c:1173
+#: src/inc.c:1249
 msgid "Can't write file."
 msgstr "Het bestand is niet beschrijfbaar."
 
-#: src/inc.c:1178
+#: src/inc.c:1254
 msgid "Socket error."
 msgstr "Socket-fout."
 
-#: src/inc.c:1181
+#: src/inc.c:1257
 #, c-format
 msgid "Socket error on connection to %s:%d."
 msgstr "Socket-fout bij verbinding met %s:%d."
 
-#: src/inc.c:1186 src/send_message.c:425 src/send_message.c:688
+#: src/inc.c:1262 src/send_message.c:444 src/send_message.c:707
 msgid "Connection closed by the remote host."
 msgstr "Verbinding gesloten door de server."
 
-#: src/inc.c:1189
+#: src/inc.c:1265
 #, c-format
 msgid "Connection to %s:%d closed by the remote host."
 msgstr "Verbinding met %s:%d gesloten door de server."
 
-#: src/inc.c:1194
+#: src/inc.c:1270
 msgid "Mailbox is locked."
 msgstr "Postvak zit op slot."
 
-#: src/inc.c:1198
+#: src/inc.c:1274
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -6541,11 +6576,11 @@ msgstr ""
 "Postvak zit op slot:\n"
 "%s"
 
-#: src/inc.c:1204 src/send_message.c:673
+#: src/inc.c:1280 src/send_message.c:692
 msgid "Authentication failed."
 msgstr "Authenticatie mislukt."
 
-#: src/inc.c:1210 src/send_message.c:676
+#: src/inc.c:1286 src/send_message.c:695
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -6554,7 +6589,7 @@ msgstr ""
 "Authenticatie mislukt:\n"
 "%s"
 
-#: src/inc.c:1215 src/send_message.c:692
+#: src/inc.c:1291 src/send_message.c:711
 msgid ""
 "Session timed out. You may be able to recover by increasing the timeout "
 "value in Preferences/Other/Miscellaneous."
@@ -6562,38 +6597,83 @@ msgstr ""
 "Sessie verlopen. Mogelijk kun je herstellen door de tijdslimiet te verhogen "
 "in Voorkeuren/Diversen/Overige."
 
-#: src/inc.c:1220
+#: src/inc.c:1296
 #, c-format
 msgid "Connection to %s:%d timed out."
 msgstr "Verbinding met %s:%d niet binnen tijdslimiet tot stand gekomen."
 
-#: src/inc.c:1258
+#: src/inc.c:1334
 msgid "Incorporation cancelled\n"
 msgstr "Het inbedden is afgelast\n"
 
-#: src/inc.c:1523
+#: src/inc.c:1626 src/plugins/notification/notification_prefs.c:1072
+#: src/plugins/notification/notification_prefs.c:1367
+#: src/plugins/notification/notification_prefs.c:1673
+#: src/plugins/spamassassin/spamassassin_gtk.c:407 src/prefs_account.c:1766
+#: src/prefs_other.c:578 src/prefs_receive.c:203 src/prefs_summaries.c:551
+msgid "seconds"
+msgstr "seconden"
+
+#: src/inc.c:1636 src/inc.c:1646
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "minuut"
+msgstr[1] "minuten"
+
+#: src/inc.c:1639
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] "uur"
+msgstr[1] "uur"
+
+#: src/inc.c:1651
 #, c-format
-msgid "%s%sYou're working offline. Override for %d minutes?"
-msgstr "%s%sJe bent nu offline. Toch doorgaan gedurende %d minuten?"
+msgid "%s%sYou're working offline. Override for %d %s?"
+msgstr "%s%sJe werkt nu offline. Toch doorgaan voor %d %s?"
 
-#: src/inc.c:1529
+#: src/inc.c:1657
 #, c-format
 msgid "%s%sYou're working offline. Override?"
 msgstr "%s%sJe bent momenteel niet online. Toch doorgaan?"
 
-#: src/inc.c:1536
+#: src/inc.c:1664
 msgid "On_ly once"
 msgstr "_Eenmalig"
 
-#: src/ldapupdate.c:1044
+#: src/ldapupdate.c:680
+#, c-format
+msgid "LDAP error (search): for attribute '%s': %d (%s)\n"
+msgstr "LDAP-fout (zoeken): naar eigenschap '%s': %d (%s)\n"
+
+#: src/ldapupdate.c:918 src/ldapupdate.c:1061 src/ldapupdate.c:1289
+#: src/ldapupdate.c:1330
+#, c-format
+msgid "LDAP error (modify): for DN '%s': %d (%s)\n"
+msgstr "LDAP-fout (wijzigen): voor DN '%s': %d (%s)\n"
+
+#: src/ldapupdate.c:1046
 msgid "Some SN"
 msgstr "Een SN"
 
-#: src/ldif.c:758
+#: src/ldapupdate.c:1133
+#, c-format
+msgid "LDAP error (rename): from '%s' to '%s': %d (%s)\n"
+msgstr "LDAP-fout (hernoemen): van '%s' naar '%s': %d (%s)\n"
+
+#: src/ldaputil.c:81 src/ldaputil.c:156
+msgid "LDAP (search): successful\n"
+msgstr "LDAP (zoeken): voltooid\n"
+
+#: src/ldaputil.c:112 src/ldaputil.c:200
+#, c-format
+msgid "LDAP error (search): %d (%s)\n"
+msgstr "LDAP-fout (zoeken): %d (%s)\n"
+
+#: src/ldif.c:759
 msgid "Nick Name"
 msgstr "Bijnaam"
 
-#: src/main.c:249
+#: src/main.c:250
 #, c-format
 msgid ""
 "File '%s' already exists.\n"
@@ -6602,7 +6682,7 @@ msgstr ""
 "Bestand '%s' bestaat al.\n"
 "Kan geen map aanmaken."
 
-#: src/main.c:370
+#: src/main.c:375
 #, c-format
 msgid ""
 "Configuration for %s found.\n"
@@ -6611,7 +6691,7 @@ msgstr ""
 "Er is een configuratiebestand %s gevonden.\n"
 "Wil je dit configuratiebestand overzetten?"
 
-#: src/main.c:372
+#: src/main.c:377
 #, c-format
 msgid ""
 "\n"
@@ -6624,11 +6704,11 @@ msgstr ""
 "Je Sylpheed filterregels kunnen omgezet worden door\n"
 "een script beschikbaar op %s."
 
-#: src/main.c:384
+#: src/main.c:389
 msgid "Keep old configuration"
 msgstr "Oude configuratie behouden"
 
-#: src/main.c:387
+#: src/main.c:392
 msgid ""
 "Keeping a backup will allow you to go back to an older version, but may take "
 "a while if you have cached IMAP or News data, and will take some extra room "
@@ -6638,31 +6718,31 @@ msgstr ""
 "maar kan even duren als je veel IMAP- of Nieuwsgegevens gecached hebt, en "
 "zal wat extra schijfruimte gebruiken."
 
-#: src/main.c:395
+#: src/main.c:400
 msgid "Migration of configuration"
 msgstr "Configuratiebestand overzetten"
 
-#: src/main.c:406
+#: src/main.c:411
 msgid "Copying configuration... This may take a while..."
 msgstr "Configuratiebestand wordt gekopiëerd... Dit kan even duren..."
 
-#: src/main.c:415
+#: src/main.c:420
 msgid "Migration failed!"
 msgstr "Overzetten mislukt."
 
-#: src/main.c:424
+#: src/main.c:429
 msgid "Migrating configuration..."
 msgstr "Configuratiebestand overzetten..."
 
-#: src/main.c:1138
+#: src/main.c:1141
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread niet ondersteund door glib.\n"
 
-#: src/main.c:1158 src/main.c:1162 src/main.c:1166
+#: src/main.c:1161 src/main.c:1165 src/main.c:1169
 msgid "(or older)"
 msgstr "(of ouder)"
 
-#: src/main.c:1483
+#: src/main.c:1510
 #, c-format
 msgid ""
 "The following plugin failed to load. Check the Plugins configuration for "
@@ -6681,7 +6761,7 @@ msgstr[1] ""
 "instellingen voor meer informatie:\n"
 "%s"
 
-#: src/main.c:1525
+#: src/main.c:1552
 msgid ""
 "Claws Mail has detected a configured mailbox, but it is incomplete. It is "
 "possibly due to a failing IMAP account. Use \"Rebuild folder tree\" on the "
@@ -6692,7 +6772,7 @@ msgstr ""
 "Gebruik \"Ververs mappenboom\" in het contextmenu van deze map om dit "
 "proberen te repareren."
 
-#: src/main.c:1531
+#: src/main.c:1558
 msgid ""
 "Claws Mail has detected a configured mailbox, but could not load it. It is "
 "probably provided by an out-of-date external plugin. Please reinstall the "
@@ -6702,36 +6782,36 @@ msgstr ""
 "laden. Het postvak komt waarschijnlijk van een oude en externe plugin. "
 "Herinstalleer alstublieft deze plugin en probeer het nogmaals."
 
-#: src/main.c:1776
+#: src/main.c:1799
 msgid "Missing filename\n"
 msgstr "Bestandsnaam mist\n"
 
-#: src/main.c:1783
+#: src/main.c:1806
 msgid "Cannot open filename for reading\n"
 msgstr "Kan bestandsnaam niet openen om te lezen\n"
 
-#: src/main.c:1794
+#: src/main.c:1817
 msgid "Malformed header\n"
 msgstr "Vervormde header\n"
 
-#: src/main.c:1801
+#: src/main.c:1824
 msgid "Duplicated 'To:' header\n"
 msgstr "Gedupliceerde 'Aan:' header\n"
 
-#: src/main.c:1812
+#: src/main.c:1835
 msgid "Missing required 'To:' header\n"
 msgstr "Benodigde header 'Aan:' mist\n"
 
-#: src/main.c:1958
+#: src/main.c:1980
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Gebruik: %s [OPTIES]...\n"
 
-#: src/main.c:1960
+#: src/main.c:1982
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adres]      open venster \"Bericht opstellen\""
 
-#: src/main.c:1961
+#: src/main.c:1983
 msgid ""
 "  --compose-from-file file\n"
 "                         open composition window with data from given file;\n"
@@ -6746,16 +6826,16 @@ msgstr ""
 "bestand;\n"
 "                         gebruik - als bestandsnaam voor lezen van standaard "
 "invoer;\n"
-"                         inhoud formaat: headers eerst (Aan: verplicht) tot "
+"                         inhoud-format: headers eerst (Aan: verplicht) tot "
 "een\n"
-"                         lege regel, daarna de e-mail inhoud tot het einde "
+"                         lege regel, daarna de e-mail-inhoud tot het einde "
 "van het bestand."
 
-#: src/main.c:1966
-msgid "  --subscribe [uri]      subscribe to the given URI if possible"
-msgstr "  --subscribe [uri]      abonneer indien mogelijk op gegeven URI"
+#: src/main.c:1988
+msgid "  --subscribe uri        subscribe to the given URI if possible"
+msgstr "  --subscribe uri      abonneer indien mogelijk op gegeven URI"
 
-#: src/main.c:1967
+#: src/main.c:1989
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -6765,7 +6845,7 @@ msgstr ""
 "                         open venster \"Bericht opstellen\" met gegeven "
 "bestanden bijgevoegd"
 
-#: src/main.c:1970
+#: src/main.c:1992
 msgid ""
 "  --insert file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -6775,23 +6855,23 @@ msgstr ""
 "                         open venster \"Bericht opstellen\" met gegeven "
 "bestanden ingevoegd"
 
-#: src/main.c:1973
+#: src/main.c:1995
 msgid "  --receive              receive new messages"
 msgstr "  --receive              haal nieuwe berichten op"
 
-#: src/main.c:1974
+#: src/main.c:1996
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          haal nieuwe berichten op van alle accounts"
 
-#: src/main.c:1975
+#: src/main.c:1997
 msgid "  --cancel-receiving     cancel receiving of messages"
 msgstr "  --cancel-receiving     annuleer het ophalen van berichten"
 
-#: src/main.c:1976
+#: src/main.c:1998
 msgid "  --cancel-sending       cancel sending of messages"
 msgstr "  --cancel-sending       annuleer het verzenden van berichten"
 
-#: src/main.c:1977
+#: src/main.c:1999
 msgid ""
 "  --search folder type request [recursive]\n"
 "                         searches mail\n"
@@ -6809,29 +6889,29 @@ msgstr ""
 "                         aanvraag: zoekstring\n"
 "                         recursief: false als arg. start met 0, n, N, f or F"
 
-#: src/main.c:1984
+#: src/main.c:2006
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 verzend alle berichten in de wachtrij"
 
-#: src/main.c:1985
+#: src/main.c:2007
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [map]...      geef totaal aantal berichten weer"
 
-#: src/main.c:1986
+#: src/main.c:2008
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr "  --status-full [map]... geef status van mappen weer"
 
-#: src/main.c:1988
+#: src/main.c:2010
 msgid "  --statistics           show session statistics"
 msgstr "  --statistics           toon statistieken van de sessie"
 
-#: src/main.c:1989
+#: src/main.c:2011
 msgid "  --reset-statistics     reset session statistics"
 msgstr "  --reset-statistics     sessie-statistieken terugzetten"
 
-#: src/main.c:1990
+#: src/main.c:2012
 msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"
 "                         folder is a folder id like 'folder/sub_folder'"
@@ -6839,35 +6919,35 @@ msgstr ""
 "  --select map[/bericht] ga naar opgegeven map/bericht\n"
 "                         map is een map-ID zoals 'map/submap'"
 
-#: src/main.c:1992
+#: src/main.c:2014
 msgid "  --online               switch to online mode"
 msgstr "  --online               schakel over naar online-modus"
 
-#: src/main.c:1993
+#: src/main.c:2015
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              schakel over naar offline-modus"
 
-#: src/main.c:1994
+#: src/main.c:2016
 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr "  --exit --quit -q       sluit Claws Mail af"
 
-#: src/main.c:1995
+#: src/main.c:2017
 msgid "  --debug                debug mode"
 msgstr "  --debug                debug modus"
 
-#: src/main.c:1996
+#: src/main.c:2018
 msgid "  --toggle-debug         toggle debug mode"
 msgstr "  --toggle-debug         debug modus aan of uit zetten"
 
-#: src/main.c:1997
+#: src/main.c:2019
 msgid "  --help -h              display this help and exit"
 msgstr "  --help -h              geef deze hulp weer"
 
-#: src/main.c:1998
+#: src/main.c:2020
 msgid "  --version -v           output version information and exit"
 msgstr "  --version -v           geef versie-informatie en sluit af"
 
-#: src/main.c:1999
+#: src/main.c:2021
 msgid ""
 "  --version-full -V      output version and built-in features information "
 "and exit"
@@ -6875,19 +6955,19 @@ msgstr ""
 "  --version-full -V      geef versie-informatie en ingebouwde mogelijkheden "
 "en sluit af"
 
-#: src/main.c:2000
+#: src/main.c:2022
 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           print configuratiemap"
 
-#: src/main.c:2001
+#: src/main.c:2023
 msgid ""
-"  --alternate-config-dir [dir]\n"
+"  --alternate-config-dir directory\n"
 "                         use specified configuration directory"
 msgstr ""
-"  --alternate-config-dir [dir]\n"
+"  --alternate-config-dir directory\n"
 "                         gebruik opgegeven configuratiemap"
 
-#: src/main.c:2003
+#: src/main.c:2025
 msgid ""
 "  --geometry -geometry WxH+X+Y\n"
 "                         set geometry for main window"
@@ -6895,924 +6975,935 @@ msgstr ""
 "  --geometry -geometry WxH+X+Y\n"
 "                         stel geometrie in voor hoofdscherm"
 
-#: src/main.c:2056
-msgid "Unknown option\n"
-msgstr "Onbekende optie\n"
+#: src/main.c:2078
+msgid "Unknown option. Try -h or --help for usage.\n"
+msgstr "Onbekende optie. Probeer -h of --help voor het gebruik.\n"
 
-#: src/main.c:2074
+#: src/main.c:2096
 #, c-format
 msgid "Processing (%s)..."
 msgstr "Verwerken (%s)..."
 
-#: src/main.c:2077
+#: src/main.c:2099
 msgid "top level folder"
 msgstr "map op hoogste niveaux"
 
-#: src/main.c:2160
+#: src/main.c:2181
 msgid "Queued messages"
 msgstr "Berichten zijn in de wachtrij gezet"
 
-#: src/main.c:2161
+#: src/main.c:2182
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Er staan nog berichten in de wachtrij. Toch afsluiten?"
 
-#: src/main.c:2908
+#: src/main.c:2940
 msgid "NetworkManager: network is online.\n"
 msgstr "NetworkManager: netwerk is beschikbaar.\n"
 
-#: src/main.c:2914
+#: src/main.c:2946
 msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: netwerk is niet beschikbaar.\n"
 
-#: src/mainwindow.c:513 src/messageview.c:208
+#: src/mainwindow.c:522 src/messageview.c:211
 msgid "_File"
 msgstr "_Bestand"
 
-#: src/mainwindow.c:515 src/messageview.c:210 src/summaryview.c:436
+#: src/mainwindow.c:524 src/messageview.c:213 src/summaryview.c:447
 msgid "_View"
 msgstr "Beel_d"
 
-#: src/mainwindow.c:518
+#: src/mainwindow.c:527
 msgid "_Configuration"
 msgstr "_Instellingen"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:531
 msgid "_Add mailbox"
 msgstr "_Postvak toevoegen"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:532
 msgid "MH..."
 msgstr "MH..."
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:535
 msgid "Change mailbox order..."
 msgstr "Verander postvakvolgorde..."
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:538
 msgid "_Import mbox file..."
-msgstr "_Importeer mbox-bestand"
+msgstr "_Importeer mbox-bestand..."
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:539
 msgid "_Export to mbox file..."
-msgstr "_Exporteer naar mbox-bestand"
+msgstr "_Exporteer naar mbox-bestand..."
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:540
 msgid "_Export selected to mbox file..."
 msgstr "E_xporteer selectie naar mbox-bestand..."
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:542
 msgid "Empty all _Trash folders"
 msgstr "Alle prullenbakken _leegmaken"
 
-#: src/mainwindow.c:536 src/messageview.c:217
+#: src/mainwindow.c:545 src/messageview.c:220
 msgid "_Save email as..."
 msgstr "_Opslaan e-mail als..."
 
-#: src/mainwindow.c:537 src/messageview.c:218
+#: src/mainwindow.c:546 src/messageview.c:221
 msgid "_Save part as..."
 msgstr "Opslaan _deel als..."
 
-#: src/mainwindow.c:540 src/messageview.c:219
+#: src/mainwindow.c:549 src/messageview.c:222
 msgid "Page setup..."
 msgstr "Pagina-instellingen..."
 
-#: src/mainwindow.c:541 src/messageview.c:220
+#: src/mainwindow.c:550 src/messageview.c:223
 msgid "_Print..."
 msgstr "Af_drukken..."
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:552
 msgid "Synchronise folders"
 msgstr "Synchroniseer mappen"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:554
 msgid "E_xit"
 msgstr "Af_sluiten"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:559
 msgid "Select _thread"
 msgstr "_Discussiedraad selecteren"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:561
 msgid "_Find in current message..."
-msgstr "_Zoek in huidige bericht"
+msgstr "_Zoek in huidige bericht..."
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:563
 msgid "_Quick search"
 msgstr "_Snelzoeken"
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:566
 msgid "Show or hi_de"
 msgstr "_Toon of verberg"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:567
 msgid "_Toolbar"
 msgstr "_Werkbalk"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:569
 msgid "Set displayed _columns"
 msgstr "Weergegeven _kolommen instellen"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:570
 msgid "In _folder list..."
-msgstr "in _mappenlijst..."
+msgstr "In _mappenlijst..."
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:571
 msgid "In _message list..."
-msgstr "in _berichtenlijst..."
+msgstr "In _berichtenlijst..."
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:576
 msgid "La_yout"
 msgstr "_Weergave"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:578
 msgid "_Sort"
 msgstr "_Sorteer"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:580
 msgid "_Attract by subject"
 msgstr "Ge_lijksoortige onderwerpen bij elkaar"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:582
 msgid "E_xpand all threads"
 msgstr "Berichtenboom _uitklappen"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:583
 msgid "Co_llapse all threads"
 msgstr "Berichtenboom _inklappen"
 
-#: src/mainwindow.c:576 src/messageview.c:231
+#: src/mainwindow.c:585 src/messageview.c:234
 msgid "_Go to"
 msgstr "_Ga naar"
 
-#: src/mainwindow.c:577 src/messageview.c:232
+#: src/mainwindow.c:586 src/messageview.c:235
 msgid "_Previous message"
 msgstr "_Vorige bericht"
 
-#: src/mainwindow.c:578 src/messageview.c:233
+#: src/mainwindow.c:587 src/messageview.c:236
 msgid "_Next message"
 msgstr "V_olgende bericht"
 
-#: src/mainwindow.c:580 src/messageview.c:235
+#: src/mainwindow.c:589 src/messageview.c:238
 msgid "P_revious unread message"
 msgstr "Vo_rige ongelezen bericht"
 
-#: src/mainwindow.c:581 src/messageview.c:236
+#: src/mainwindow.c:590 src/messageview.c:239
 msgid "N_ext unread message"
 msgstr "Volgende o_ngelezen bericht"
 
-#: src/mainwindow.c:583 src/messageview.c:238
+#: src/mainwindow.c:592 src/messageview.c:241
 msgid "Previous ne_w message"
 msgstr "Vo_rige nieuwe bericht"
 
-#: src/mainwindow.c:584 src/messageview.c:239
+#: src/mainwindow.c:593 src/messageview.c:242
 msgid "Ne_xt new message"
 msgstr "Volge_nde nieuwe bericht"
 
-#: src/mainwindow.c:586 src/messageview.c:241
+#: src/mainwindow.c:595 src/messageview.c:244
 msgid "Previous _marked message"
 msgstr "Vorige ge_markeerde bericht"
 
-#: src/mainwindow.c:587 src/messageview.c:242
+#: src/mainwindow.c:596 src/messageview.c:245
 msgid "Next m_arked message"
 msgstr "Volgende gem_arkeerde bericht"
 
-#: src/mainwindow.c:589 src/messageview.c:244
+#: src/mainwindow.c:598 src/messageview.c:247
 msgid "Previous _labeled message"
 msgstr "Vorige bericht met _label"
 
-#: src/mainwindow.c:590 src/messageview.c:245
+#: src/mainwindow.c:599 src/messageview.c:248
 msgid "Next la_beled message"
 msgstr "Volgende bericht met l_abel"
 
-#: src/mainwindow.c:592 src/messageview.c:247
+#: src/mainwindow.c:601 src/messageview.c:250
 msgid "Previous opened message"
 msgstr "Vorige geopende bericht"
 
-#: src/mainwindow.c:593 src/messageview.c:248
+#: src/mainwindow.c:602 src/messageview.c:251
 msgid "Next opened message"
 msgstr "Volgende geopende bericht"
 
-#: src/mainwindow.c:595 src/messageview.c:250
+#: src/mainwindow.c:604 src/messageview.c:253
 msgid "Parent message"
 msgstr "Bovenliggende bericht"
 
-#: src/mainwindow.c:597 src/messageview.c:252
+#: src/mainwindow.c:606 src/messageview.c:255
 msgid "Next unread _folder"
 msgstr "Volgende _ongelezen bericht"
 
-#: src/mainwindow.c:598 src/messageview.c:253
+#: src/mainwindow.c:607 src/messageview.c:256
 msgid "F_older..."
 msgstr "_Map..."
 
-#: src/mainwindow.c:600 src/messageview.c:255 src/mimeview.c:200
+#: src/mainwindow.c:609 src/messageview.c:258 src/mimeview.c:230
 msgid "Next part"
 msgstr "Volgende deel"
 
-#: src/mainwindow.c:601 src/messageview.c:256 src/mimeview.c:201
+#: src/mainwindow.c:610 src/messageview.c:259 src/mimeview.c:231
 msgid "Previous part"
 msgstr "Vorige deel"
 
-#: src/mainwindow.c:604 src/messageview.c:257
+#: src/mainwindow.c:613 src/messageview.c:260
 msgid "Message scroll"
 msgstr "Berichten schuiven"
 
-#: src/mainwindow.c:605 src/messageview.c:258
+#: src/mainwindow.c:614 src/messageview.c:261
 msgid "Previous line"
 msgstr "Vorige regel"
 
-#: src/mainwindow.c:606 src/messageview.c:259
+#: src/mainwindow.c:615 src/messageview.c:262
 msgid "Next line"
 msgstr "Volgende regel"
 
-#: src/mainwindow.c:607 src/messageview.c:260 src/printing.c:481
+#: src/mainwindow.c:616 src/messageview.c:263 src/printing.c:476
 msgid "Previous page"
 msgstr "Vorige pagina"
 
-#: src/mainwindow.c:608 src/messageview.c:261 src/printing.c:488
+#: src/mainwindow.c:617 src/messageview.c:264 src/printing.c:482
 msgid "Next page"
 msgstr "Volgende pagina"
 
-#: src/mainwindow.c:626 src/messageview.c:279
+#: src/mainwindow.c:635 src/messageview.c:282
 msgid "Decode"
 msgstr "Decodeer"
 
-#: src/mainwindow.c:633
+#: src/mainwindow.c:642
 msgid "Open in new _window"
 msgstr "_Nieuw venster"
 
-#: src/mainwindow.c:634 src/messageview.c:286
+#: src/mainwindow.c:643 src/messageview.c:289
 msgid "Mess_age source"
 msgstr "Br_on weergeven"
 
-#: src/mainwindow.c:636 src/messageview.c:287
+#: src/mainwindow.c:645 src/messageview.c:290
 msgid "Message part"
 msgstr "Berichtendeel"
 
-#: src/mainwindow.c:637 src/messageview.c:288
+#: src/mainwindow.c:646 src/messageview.c:291
 msgid "View as text"
 msgstr "Als tekst weergeven"
 
-#: src/mainwindow.c:638 src/messageview.c:289 src/toolbar.c:494
+#: src/mainwindow.c:647 src/messageview.c:292 src/toolbar.c:494
 msgid "Open"
 msgstr "Openen"
 
-#: src/mainwindow.c:640 src/messageview.c:291
+#: src/mainwindow.c:649 src/messageview.c:294
 msgid "Open with..."
 msgstr "Openen met..."
 
-#: src/mainwindow.c:644 src/messageview.c:294
+#: src/mainwindow.c:653 src/messageview.c:297
 msgid "Quotes"
 msgstr "Citaten"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:655
 msgid "_Update summary"
 msgstr "Berichtenlijst v_erversen"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:658
 msgid "Recei_ve"
 msgstr "Ont_vangen"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:659
 msgid "Get from _current account"
 msgstr "Ophalen van _huidige account"
 
-#: src/mainwindow.c:651
+#: src/mainwindow.c:660
 msgid "Get from _all accounts"
 msgstr "Ophalen van _alle accounts"
 
-#: src/mainwindow.c:652
+#: src/mainwindow.c:661
 msgid "Cancel receivin_g"
 msgstr "Ophalen ann_uleren"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:664
 msgid "_Send queued messages"
 msgstr "Verzend berichten uit de _wachtrij"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:669
 msgid "Compose a_n email message"
 msgstr "Nieuw _e-mailbericht opstellen"
 
-#: src/mainwindow.c:661
+#: src/mainwindow.c:670
 msgid "Compose a news message"
 msgstr "Nieuw _Nieuwsbericht opstellen"
 
-#: src/mainwindow.c:663 src/messageview.c:300
-#: src/plugins/notification/notification_banner.c:95
+#: src/mainwindow.c:672 src/messageview.c:303
+#: src/plugins/notification/notification_banner.c:95 src/summaryview.c:431
 msgid "_Reply"
 msgstr "_Beantwoorden"
 
-#: src/mainwindow.c:664 src/messageview.c:301 src/summaryview.c:428
+#: src/mainwindow.c:673 src/messageview.c:304 src/summaryview.c:432
 msgid "Repl_y to"
 msgstr "Be_antwoord"
 
-#: src/mainwindow.c:667 src/messageview.c:304
+#: src/mainwindow.c:676 src/messageview.c:307 src/summaryview.c:435
 msgid "Mailing _list"
 msgstr "Mailing-_lijst"
 
-#: src/mainwindow.c:668
+#: src/mainwindow.c:677
 msgid "Follow-up and reply to"
 msgstr "Beantwoorden en _opvolgen"
 
-#: src/mainwindow.c:671 src/messageview.c:307 src/toolbar.c:2446
+#: src/mainwindow.c:680 src/messageview.c:310 src/summaryview.c:437
+#: src/toolbar.c:2449
 msgid "_Forward"
 msgstr "_Doorsturen"
 
-#: src/mainwindow.c:672 src/messageview.c:308 src/toolbar.c:2447
+#: src/mainwindow.c:681 src/messageview.c:311 src/summaryview.c:438
+#: src/toolbar.c:2450
 msgid "For_ward as attachment"
-msgstr "Doorsturen als bijvoegsel"
+msgstr "Doorsturen als bijlage"
 
-#: src/mainwindow.c:673 src/messageview.c:309 src/toolbar.c:2448
+#: src/mainwindow.c:682 src/messageview.c:312 src/summaryview.c:439
+#: src/toolbar.c:2451
 msgid "Redirec_t"
 msgstr "Herverwi_jzen"
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:684
 msgid "Mailing-_List"
 msgstr "Mailing-_Lijst"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:685
 msgid "Post"
 msgstr "Plaatsen"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:687
 msgid "Help"
 msgstr "Help"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:691
 msgid "Unsubscribe"
 msgstr "Afmelden"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:693
 msgid "View archive"
 msgstr "Bekijk archief"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:695
 msgid "Contact owner"
 msgstr "Contact eigenaar"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:699
 msgid "M_ove..."
 msgstr "Ver_plaatsen..."
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:700
 msgid "_Copy..."
 msgstr "K_opiëren..."
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:701
 msgid "Move to _trash"
 msgstr "Naar _prullenbak"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:702
 msgid "_Delete..."
 msgstr "Ver_wijderen..."
 
-#: src/mainwindow.c:694
+#: src/mainwindow.c:703
 msgid "Move thread to tr_ash"
 msgstr "Draad naar _prullenbak"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:704
 msgid "Delete t_hread"
 msgstr "_Verwijder draad"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:705
 msgid "Cancel a news message"
 msgstr "Trek nieuwsartikel in"
 
-#: src/mainwindow.c:699 src/mainwindow.c:700 src/summaryview.c:429
+#: src/mainwindow.c:708 src/mainwindow.c:709 src/summaryview.c:440
 msgid "_Mark"
 msgstr "_Markeren"
 
-#: src/mainwindow.c:701
+#: src/mainwindow.c:710
 msgid "_Unmark"
 msgstr "_Demarkeren"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:713
 msgid "Mark as rea_d"
 msgstr "Markeer _gelezen"
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:714
 msgid "Mark as unr_ead"
 msgstr "Markeer _ongelezen"
 
-#: src/mainwindow.c:707
-msgid "Mark all read"
-msgstr "Alles gelezen"
+#: src/mainwindow.c:716
+msgid "Mark all read in folder"
+msgstr "Markeer alles gelezen in map"
 
-#: src/mainwindow.c:708
-msgid "Mark all unread"
-msgstr "Alles ongelezen"
+#: src/mainwindow.c:717
+msgid "Mark all unread in folder"
+msgstr "Markeer alles ongelezen in map"
 
-#: src/mainwindow.c:710 src/prefs_filtering_action.c:199 src/toolbar.c:242
+#: src/mainwindow.c:719 src/prefs_filtering_action.c:193 src/toolbar.c:242
 #: src/toolbar.c:503
 msgid "Ignore thread"
 msgstr "Draad negeren"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:720
 msgid "Unignore thread"
 msgstr "Draad niet meer negeren"
 
-#: src/mainwindow.c:712 src/prefs_filtering_action.c:200 src/toolbar.c:243
+#: src/mainwindow.c:721 src/prefs_filtering_action.c:194 src/toolbar.c:243
 #: src/toolbar.c:504
 msgid "Watch thread"
 msgstr "Volg draad"
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:722
 msgid "Unwatch thread"
 msgstr "Volg draad niet meer"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:725
 msgid "Mark as _spam"
 msgstr "Markeer als _spam"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:726
 msgid "Mark as _ham"
 msgstr "Markeer als _ham"
 
-#: src/mainwindow.c:720 src/prefs_filtering_action.c:181 src/toolbar.c:507
+#: src/mainwindow.c:729 src/prefs_filtering_action.c:177 src/toolbar.c:507
 msgid "Lock"
 msgstr "Op slot"
 
-#: src/mainwindow.c:721 src/prefs_filtering_action.c:182 src/toolbar.c:508
+#: src/mainwindow.c:730 src/prefs_filtering_action.c:178 src/toolbar.c:508
 msgid "Unlock"
 msgstr "Van slot"
 
-#: src/mainwindow.c:723 src/summaryview.c:430
+#: src/mainwindow.c:732 src/summaryview.c:441
 msgid "Color la_bel"
 msgstr "_Kleurlabel"
 
-#: src/mainwindow.c:724 src/summaryview.c:431
+#: src/mainwindow.c:733 src/summaryview.c:442
 msgid "Ta_gs"
 msgstr "Ta_gs"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:736
 msgid "Re-_edit"
 msgstr "_Wijzigen"
 
-#: src/mainwindow.c:730 src/messageview.c:310 src/mimeview.c:1021
+#: src/mainwindow.c:739 src/messageview.c:313 src/mimeview.c:1048
 msgid "Check signature"
 msgstr "Verifieer ondertekening"
 
-#: src/mainwindow.c:735 src/messageview.c:314
+#: src/mainwindow.c:744 src/messageview.c:317
 msgid "Add sender to address boo_k"
 msgstr "A_fzender toevoegen aan adresboek"
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:746
 msgid "C_ollect addresses"
 msgstr "_Verzamel adressen"
 
-#: src/mainwindow.c:738
+#: src/mainwindow.c:747
 msgid "From current _folder..."
 msgstr "Van huidige _map..."
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:748
 msgid "From selected _messages..."
 msgstr "Van geselecteerde _berichten..."
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:751
 msgid "_Filter all messages in folder"
 msgstr "Alle berichten _filteren"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:752
 msgid "Filter _selected messages"
 msgstr "Selectie _filteren"
 
-#: src/mainwindow.c:744
+#: src/mainwindow.c:753
 msgid "Run folder pr_ocessing rules"
 msgstr "_Verwerkingsregels draaien voor map"
 
-#: src/mainwindow.c:746 src/messageview.c:317
+#: src/mainwindow.c:755 src/messageview.c:320
 msgid "_Create filter rule"
 msgstr "_Filterregel aanmaken"
 
-#: src/mainwindow.c:747 src/mainwindow.c:753 src/messageview.c:318
-#: src/messageview.c:324
+#: src/mainwindow.c:756 src/mainwindow.c:762 src/messageview.c:321
+#: src/messageview.c:327
 msgid "_Automatically"
 msgstr "_Automatisch"
 
-#: src/mainwindow.c:748 src/mainwindow.c:754 src/mainwindow.c:858
-#: src/messageview.c:319 src/messageview.c:325
+#: src/mainwindow.c:757 src/mainwindow.c:763 src/mainwindow.c:870
+#: src/messageview.c:322 src/messageview.c:328
 msgid "By _From"
 msgstr "A_fzender"
 
-#: src/mainwindow.c:749 src/mainwindow.c:755 src/mainwindow.c:859
-#: src/messageview.c:320 src/messageview.c:326
+#: src/mainwindow.c:758 src/mainwindow.c:764 src/mainwindow.c:871
+#: src/messageview.c:323 src/messageview.c:329
 msgid "By _To"
 msgstr "Aan"
 
-#: src/mainwindow.c:750 src/mainwindow.c:756 src/messageview.c:321
-#: src/messageview.c:327
+#: src/mainwindow.c:759 src/mainwindow.c:765 src/messageview.c:324
+#: src/messageview.c:330
 msgid "By _Subject"
 msgstr "_Onderwerp"
 
-#: src/mainwindow.c:752 src/messageview.c:323 src/summaryview.c:434
+#: src/mainwindow.c:761 src/messageview.c:326 src/summaryview.c:445
 msgid "Create processing rule"
 msgstr "Verwerkingsregel aanmaken"
 
-#: src/mainwindow.c:759 src/messageview.c:330
+#: src/mainwindow.c:768 src/messageview.c:333
 msgid "List _URLs..."
 msgstr "Geef _URLs weer..."
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:775
 msgid "Ch_eck for new messages in all folders"
 msgstr "Alle mappen worden gecontroleerd op nieuwe berichten"
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:776
 msgid "Delete du_plicated messages"
 msgstr "Verwijder _dubbele berichten"
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:777
 msgid "In selected folder"
 msgstr "In geselecteerde map"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:778
 msgid "In all folders"
 msgstr "In alle mappen"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:781
 msgid "E_xecute"
-msgstr "_Doen"
+msgstr "_Uitvoeren"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:782
 msgid "Exp_unge"
-msgstr "Gooi _weg"
+msgstr "_Weggooien"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:785
 msgid "SSL/TLS cer_tificates"
 msgstr "SSL/TLS-cer_tificaten"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:788
 msgid "Filtering Lo_g"
 msgstr "Filterlo_g"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:789
 msgid "Network _Log"
 msgstr "Netwerk_log"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:791
+msgid "Debug _Log"
+msgstr "Fouten_logboek"
+
+#: src/mainwindow.c:794
 msgid "_Forget all session passwords"
 msgstr "_Vergeet alle wachtwoorden van de sessie"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:796
 msgid "Forget _master passphrase"
 msgstr "Vergeet _hoofdwachtwoord"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:800
 msgid "C_hange current account"
 msgstr "_Huidig account veranderen"
 
-#: src/mainwindow.c:790
+#: src/mainwindow.c:802
 msgid "_Preferences for current account..."
 msgstr "V_oorkeuren huidig account..."
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:803
 msgid "Create _new account..."
 msgstr "_Nieuw account aanmaken..."
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:804
 msgid "_Edit accounts..."
 msgstr "Account_beheer..."
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:807
 msgid "P_references..."
 msgstr "_Voorkeuren..."
 
-#: src/mainwindow.c:796
+#: src/mainwindow.c:808
 msgid "Pre-pr_ocessing..."
 msgstr "_Voorverwerken..."
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:809
 msgid "Post-pro_cessing..."
 msgstr "_Naverwerken..."
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:810
 msgid "_Filtering..."
 msgstr "_Filteren..."
 
-#: src/mainwindow.c:799
+#: src/mainwindow.c:811
 msgid "_Templates..."
 msgstr "_Sjablonen..."
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:812
 msgid "_Actions..."
 msgstr "_Acties..."
 
-#: src/mainwindow.c:801
+#: src/mainwindow.c:813
 msgid "Tag_s..."
 msgstr "Tag_s..."
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:815
 msgid "Plu_gins..."
 msgstr "Plu_gins..."
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:818
 msgid "_Manual"
 msgstr "_Handboek"
 
-#: src/mainwindow.c:807
+#: src/mainwindow.c:819
 msgid "_Online User-contributed FAQ"
 msgstr "_Online FAQ met bijdragen van gebruikers"
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:820
 msgid "Icon _Legend"
 msgstr "Pictogram_legenda"
 
-#: src/mainwindow.c:810
+#: src/mainwindow.c:822
 msgid "Set as default client"
 msgstr "Instellen als standaard mailprogramma"
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:829
 msgid "Offline _mode"
 msgstr "_Werk offline"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:830
 msgid "Men_ubar"
 msgstr "Men_ubalk"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:831
 msgid "_Message view"
 msgstr "_Berichtweergave"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:833
 msgid "Status _bar"
 msgstr "_Statusbalk"
 
-#: src/mainwindow.c:823
+#: src/mainwindow.c:835
 msgid "Column headers"
 msgstr "Kolomkoppen"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:836
 msgid "Th_read view"
 msgstr "Toon berichtenlijst in _boomvorm"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:837 src/prefs_summaries.c:667
 msgid "Hide read threads"
 msgstr "Gelezen draden verbergen"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:838
 msgid "_Hide read messages"
 msgstr "Gelezen berichten _verbergen"
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:839 src/prefs_summaries.c:673
 msgid "Hide deleted messages"
 msgstr "Verberg verwijderde berichten"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:840
 msgid "_Fullscreen"
 msgstr "_Volledig venster"
 
-#: src/mainwindow.c:829 src/messageview.c:342
+#: src/mainwindow.c:841 src/messageview.c:345
 msgid "Show all _headers"
 msgstr "Vo_lledige header weergeven"
 
-#: src/mainwindow.c:830 src/messageview.c:343
+#: src/mainwindow.c:842 src/messageview.c:346
 msgid "_Collapse all"
 msgstr "Alles _opvouwen"
 
-#: src/mainwindow.c:831 src/messageview.c:344
+#: src/mainwindow.c:843 src/messageview.c:347
 msgid "Collapse from level _2"
 msgstr "Opvouwen vanaf niveau _2"
 
-#: src/mainwindow.c:832 src/messageview.c:345
+#: src/mainwindow.c:844 src/messageview.c:348
 msgid "Collapse from level _3"
 msgstr "Opvouwen vanaf niveau _3"
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:848
 msgid "Text _below icons"
 msgstr "Tekst _onder pictogrammen"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:849
 msgid "Text be_side icons"
 msgstr "Tekst _naast pictogrammen"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:850
 msgid "_Icons only"
 msgstr "Alleen _pictogrammen"
 
-#: src/mainwindow.c:839
+#: src/mainwindow.c:851
 msgid "_Text only"
 msgstr "Alleen _tekst"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:858
 msgid "_Standard"
 msgstr "_Standaard"
 
-#: src/mainwindow.c:847
+#: src/mainwindow.c:859
 msgid "_Three columns"
 msgstr "3 _Kolommen"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:860
 msgid "_Wide message"
 msgstr "_Hele bericht"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:861
 msgid "W_ide message list"
 msgstr "_Brede berichtenlijst"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:862
 msgid "S_mall screen"
 msgstr "K_lein venster"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:866
 msgid "By _number"
 msgstr "Volgens _nummer"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:867
 msgid "By s_ize"
 msgstr "Volgens _grootte"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:868
 msgid "By _date"
 msgstr "Op _datum"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:869
 msgid "By thread date"
 msgstr "Volgens datum van draad"
 
-#: src/mainwindow.c:860
+#: src/mainwindow.c:872
 msgid "By s_ubject"
 msgstr "Volgens _onderwerp"
 
-#: src/mainwindow.c:861
+#: src/mainwindow.c:873
 msgid "By _color label"
 msgstr "Volgens _kleurlabel"
 
-#: src/mainwindow.c:862
+#: src/mainwindow.c:874
 msgid "By tag"
 msgstr "Volgens tag"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:875
 msgid "By _mark"
 msgstr "Volgens _markering"
 
-#: src/mainwindow.c:864
+#: src/mainwindow.c:876
 msgid "By _status"
 msgstr "Volgens _status"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:877
 msgid "By a_ttachment"
-msgstr "Volgens _bijvoegsel"
+msgstr "Volgens _bijlage"
 
-#: src/mainwindow.c:866
+#: src/mainwindow.c:878
 msgid "By score"
 msgstr "Volgens sc_ore"
 
-#: src/mainwindow.c:867
+#: src/mainwindow.c:879
 msgid "By locked"
 msgstr "Volgens op slot"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:880
 msgid "D_on't sort"
 msgstr "Ni_et sorteren"
 
-#: src/mainwindow.c:872 src/prefs_summaries.c:462
+#: src/mainwindow.c:884 src/prefs_summaries.c:654
 msgid "Ascending"
 msgstr "Oplopend"
 
-#: src/mainwindow.c:873 src/prefs_summaries.c:463
+#: src/mainwindow.c:885 src/prefs_summaries.c:655
 msgid "Descending"
 msgstr "Aflopend"
 
-#: src/mainwindow.c:915 src/messageview.c:387
+#: src/mainwindow.c:927 src/messageview.c:390
 msgid "_Auto detect"
 msgstr "_Automatisch detecteren"
 
-#: src/mainwindow.c:1312 src/summaryview.c:6287
+#: src/mainwindow.c:1305 src/summaryview.c:6495
 msgid "Apply tags..."
 msgstr "Tags toepassen..."
 
-#: src/mainwindow.c:1958
+#: src/mainwindow.c:1961
 msgid "Some error(s) happened. Click here to view log."
 msgstr "Fout(en) voorgekomen. Klik hier om het log te zien."
 
-#: src/mainwindow.c:1973
+#: src/mainwindow.c:1976
 msgid "You are online. Click the icon to go offline"
 msgstr "Je bent online. Klik op het pictogram om offline te gaan"
 
-#: src/mainwindow.c:1976
+#: src/mainwindow.c:1979
 msgid "You are offline. Click the icon to go online"
 msgstr "Je bent offline. Klik op het pictogram om online te gaan"
 
-#: src/mainwindow.c:1990
+#: src/mainwindow.c:1993
 msgid "Select account"
 msgstr "Selecteer account"
 
-#: src/mainwindow.c:2017 src/prefs_logging.c:136
+#: src/mainwindow.c:2020 src/prefs_logging.c:136
 msgid "Network log"
 msgstr "Netwerklog"
 
-#: src/mainwindow.c:2021
+#: src/mainwindow.c:2024
 msgid "Filtering/Processing debug log"
 msgstr "Filteren/Verwerken debuglog"
 
-#: src/mainwindow.c:2040 src/prefs_logging.c:378
+#: src/mainwindow.c:2043 src/prefs_logging.c:378
 msgid "filtering log enabled\n"
 msgstr "filterlog staat aan\n"
 
-#: src/mainwindow.c:2042 src/prefs_logging.c:380
+#: src/mainwindow.c:2045 src/prefs_logging.c:380
 msgid "filtering log disabled\n"
 msgstr "filterlog staat uit\n"
 
-#: src/mainwindow.c:2485 src/mainwindow.c:2492 src/mainwindow.c:2535
-#: src/mainwindow.c:2568 src/mainwindow.c:2600 src/mainwindow.c:2645
+#: src/mainwindow.c:2479 src/mainwindow.c:2486 src/mainwindow.c:2529
+#: src/mainwindow.c:2562 src/mainwindow.c:2594 src/mainwindow.c:2639
 #: src/plugins/notification/notification_trayicon.c:372
-#: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1077
+#: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1087
 msgid "Untitled"
 msgstr "Naamloos"
 
-#: src/mainwindow.c:2646 src/prefs_summary_open.c:114
+#: src/mainwindow.c:2640 src/prefs_summary_open.c:114
 msgid "none"
 msgstr "niets"
 
-#: src/mainwindow.c:2903 src/mainwindow.c:2907
+#: src/mainwindow.c:2897 src/mainwindow.c:2902
 msgid "Delete all messages in trash folders?"
 msgstr "Alle berichten in de prullenbakken weggooien?"
 
-#: src/mainwindow.c:2904
+#: src/mainwindow.c:2898
 msgid "Don't quit"
 msgstr "Niet afsluiten"
 
-#: src/mainwindow.c:2933 src/plugins/mailmbox/plugin_gtk.c:189
+#: src/mainwindow.c:2929 src/plugins/mailmbox/plugin_gtk.c:189
 msgid "Add mailbox"
 msgstr "Postvak toevoegen"
 
-#: src/mainwindow.c:2934
+#: src/mainwindow.c:2930
 msgid ""
-"Input the location of mailbox.\n"
-"If an existing mailbox is specified, it will be\n"
+"Input the location of the mailbox.\n"
+"The location can be either the full path or relative to the \n"
+"home directory.\n"
+"If the location of an existing mailbox is specified, it will be\n"
 "scanned automatically."
 msgstr ""
-"Geef de locatie van het postvak.\n"
+"Geef de locatie van het postvak op.\n"
+"De locatie kan het volledige pad zijn of een \n"
+"relatief pad naar de home-map.\n"
 "Als een bestaand postvak wordt ingevuld,\n"
 "dan wordt hij automatisch gescand."
 
-#: src/mainwindow.c:2940 src/plugins/mailmbox/plugin_gtk.c:196
+#: src/mainwindow.c:2938 src/plugins/mailmbox/plugin_gtk.c:196
 #: src/plugins/rssyl/rssyl_gtk.c:132
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Het postvak '%s' bestaat al."
 
-#: src/mainwindow.c:2945 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
-#: src/wizard.c:740
+#: src/mainwindow.c:2943 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
+#: src/wizard.c:742
 msgid "Mailbox"
 msgstr "Postvak"
 
-#: src/mainwindow.c:2950 src/plugins/mailmbox/plugin_gtk.c:215 src/setup.c:55
+#: src/mainwindow.c:2948 src/plugins/mailmbox/plugin_gtk.c:215 src/setup.c:55
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
 "there."
 msgstr ""
 "Het postvak kon niet aangemaakt worden.\n"
-"Misschien bestaan er al wat bestanden, of heb je geen toestemming om er te "
+"Misschien bestaan er al wat bestanden, of heb je geen rechten om er te "
 "schrijven."
 
-#: src/mainwindow.c:3419
+#: src/mainwindow.c:3415
 msgid "No posting allowed"
 msgstr "Versturen niet toegestaan"
 
-#: src/mainwindow.c:4002
+#: src/mainwindow.c:3997
 msgid "Mbox import has failed."
 msgstr "Fout bij importeren mbox-bestand."
 
-#: src/mainwindow.c:4011 src/mainwindow.c:4020
+#: src/mainwindow.c:4006 src/mainwindow.c:4015
 msgid "Export to mbox has failed."
 msgstr "Exporteren naar mbox-bestand mislukt."
 
-#: src/mainwindow.c:4061 src/plugins/notification/notification_trayicon.c:550
+#: src/mainwindow.c:4056 src/plugins/notification/notification_trayicon.c:550
 msgid "Exit"
 msgstr "Afsluiten"
 
-#: src/mainwindow.c:4061 src/plugins/notification/notification_trayicon.c:550
+#: src/mainwindow.c:4056 src/plugins/notification/notification_trayicon.c:550
 msgid "Exit Claws Mail?"
 msgstr "Claws Mail afsluiten?"
 
-#: src/mainwindow.c:4252
+#: src/mainwindow.c:4257
 msgid "Folder synchronisation"
 msgstr "Map synchronisatie"
 
-#: src/mainwindow.c:4253
+#: src/mainwindow.c:4258
 msgid "Do you want to synchronise your folders now?"
 msgstr "Wil je alle mappen nu synchroniseren?"
 
-#: src/mainwindow.c:4254
+#: src/mainwindow.c:4259
 msgid "_Synchronise"
 msgstr "_Synchroniseren"
 
-#: src/mainwindow.c:4702
+#: src/mainwindow.c:4737
 msgid "Deleting duplicated messages..."
 msgstr "Dubbele berichten worden verwijderd..."
 
-#: src/mainwindow.c:4712
+#: src/mainwindow.c:4747
 msgid "No duplicate message found in selected folder.\n"
 msgstr "Geen dubbel bericht gevonden in geselecteerde map.\n"
 
-#: src/mainwindow.c:4718
+#: src/mainwindow.c:4753
 #, c-format
 msgid "Deleted %d duplicate message in selected folder.\n"
 msgid_plural "Deleted %d duplicate messages in selected folder.\n"
 msgstr[0] "%d dubbel bericht verwijderd in geselecteerde map.\n"
 msgstr[1] "%d dubbele berichten verwijderd in geselecteerde map.\n"
 
-#: src/mainwindow.c:4722
+#: src/mainwindow.c:4757
 #, c-format
 msgid "Marked %d duplicate message for deletion in selected folder.\n"
 msgid_plural "Marked %d duplicate messages for deletion in selected folder.\n"
@@ -7821,117 +7912,126 @@ msgstr[0] ""
 msgstr[1] ""
 "%d dubbele berichten gemarkeerd voor verwijderen in geselecteerde map.\n"
 
-#: src/mainwindow.c:4760
+#: src/mainwindow.c:4795
 msgid "Deleting duplicated messages in all folders..."
 msgstr "Dubbele berichten worden verwijderd in alle mappen..."
 
-#: src/mainwindow.c:4766
+#: src/mainwindow.c:4801
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 msgstr[0] "%d dubbel bericht verwijderd in %d mappen.\n"
 msgstr[1] "%d dubbele berichten verwijderd in %d mappen.\n"
 
-#: src/mainwindow.c:4771
+#: src/mainwindow.c:4806
 #, c-format
 msgid "No duplicate message found in %d folders.\n"
 msgstr "Geen dubbel bericht gevonden in %d mappen.\n"
 
-#: src/mainwindow.c:4933 src/messageview.c:2657
+#: src/mainwindow.c:4968 src/messageview.c:2634
 msgid "Select folder to go to"
 msgstr "Selecteer map om heen te gaan"
 
-#: src/mainwindow.c:5034 src/summaryview.c:5778
+#: src/mainwindow.c:5069 src/summaryview.c:5938
 msgid "Processing rules to apply before folder rules"
 msgstr "Verwerkingsregels toepassen voor mapregels"
 
-#: src/mainwindow.c:5042
+#: src/mainwindow.c:5077
 msgid "Processing rules to apply after folder rules"
 msgstr "Verwerkingsregels toepassen na mapregels"
 
-#: src/mainwindow.c:5050 src/summaryview.c:5789
+#: src/mainwindow.c:5085 src/summaryview.c:5949
 msgid "Filtering configuration"
 msgstr "Filters instellen"
 
-#: src/mainwindow.c:5165
+#: src/mainwindow.c:5200
 msgid "Can not register as default client: impossible to get executable path."
 msgstr ""
 "Kan niet registreren als standaard mailprogramma: niet mogelijk om het "
 "uitvoerpad te vinden."
 
-#: src/mainwindow.c:5224
+#: src/mainwindow.c:5259
 msgid "Claws Mail has been registered as default client."
 msgstr "Claws Mail is geregistreerd als standaard mailprogramma."
 
-#: src/mainwindow.c:5226
+#: src/mainwindow.c:5261
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr ""
 "Kan niet registreren als standaard mailprogramma: niet mogelijk om te "
 "schrijven naar het register."
 
-#: src/mainwindow.c:5240 src/setup.c:91
+#: src/mainwindow.c:5275 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Map wordt ingelezen %s%c%s..."
 
-#: src/mainwindow.c:5384
+#: src/mainwindow.c:5419
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
 msgstr[0] "%d Vergeten wachtwoord van %d accounts.\n"
 msgstr[1] "%d Vergeten wachtwoorden van %d accounts.\n"
 
-#: src/matcher.c:214 src/matcher.c:215 src/matcher.c:216 src/matcher.c:217
-#: src/matcher.c:218 src/matcher.c:219 src/matcher.c:220 src/matcher.c:221
+#: src/matcher.c:217 src/matcher.c:218 src/matcher.c:219 src/matcher.c:220
+#: src/matcher.c:221 src/matcher.c:222 src/matcher.c:223 src/matcher.c:224
 #, c-format
 msgid "%s header"
 msgstr "%s header"
 
-#: src/matcher.c:222
+#: src/matcher.c:225
 msgid "header"
 msgstr "header"
 
-#: src/matcher.c:223
+#: src/matcher.c:226
 msgid "header line"
 msgstr "header-regel"
 
-#: src/matcher.c:224
+#: src/matcher.c:227
 msgid "body line"
 msgstr "inhoud-regel"
 
-#: src/matcher.c:225
+#: src/matcher.c:228
 msgid "tag"
 msgstr "tag"
 
-#: src/matcher.c:528 src/matcher.c:533 src/matcher.c:552 src/matcher.c:557
-#: src/message_search.c:212 src/prefs_matcher.c:743 src/summary_search.c:514
+#: src/matcher.c:538 src/matcher.c:543 src/matcher.c:562 src/matcher.c:567
+#: src/message_search.c:215 src/prefs_matcher.c:752 src/summary_search.c:455
 msgid "Case sensitive"
 msgstr "Hoofd / kleine letters onderscheiden"
 
-#: src/matcher.c:528 src/matcher.c:533 src/matcher.c:552 src/matcher.c:557
+#: src/matcher.c:538 src/matcher.c:543 src/matcher.c:562 src/matcher.c:567
 msgid "Case insensitive"
 msgstr "Hoofd / kleine letters niet onderscheiden"
 
-#: src/matcher.c:1859
+#: src/matcher.c:1903
 #, c-format
 msgid "checking if message matches [ %s ]\n"
-msgstr "Controleren of bericht overeenkomt met [ %s ]\n"
+msgstr "controleren of bericht overeenkomt met [ %s ]\n"
 
-#: src/matcher.c:1930 src/matcher.c:1949 src/matcher.c:1962
+#: src/matcher.c:1976 src/matcher.c:1995 src/matcher.c:2008
 msgid "message matches\n"
 msgstr "bericht komt overeen\n"
 
-#: src/matcher.c:1937 src/matcher.c:1955 src/matcher.c:1964
+#: src/matcher.c:1983 src/matcher.c:2001 src/matcher.c:2010
 msgid "message does not match\n"
 msgstr "bericht komt niet overeen\n"
 
-#: src/matcher.c:2227 src/matcher.c:2228 src/matcher.c:2229 src/matcher.c:2230
-#: src/matcher.c:2231 src/matcher.c:2232 src/matcher.c:2233 src/matcher.c:2234
+#: src/matcher.c:2275 src/matcher.c:2276 src/matcher.c:2277 src/matcher.c:2278
+#: src/matcher.c:2279 src/matcher.c:2280 src/matcher.c:2281 src/matcher.c:2282
 msgid "(none)"
 msgstr "(geen)"
 
-#: src/mbox.c:107
+#: src/mbox.c:98
+#, c-format
+msgid ""
+"Could not stat mbox file:\n"
+"%s\n"
+msgstr ""
+"Kon mbox-bestand niet vinden:\n"
+"%s\n"
+
+#: src/mbox.c:104
 #, c-format
 msgid ""
 "Could not open mbox file:\n"
@@ -7940,27 +8040,26 @@ msgstr ""
 "Kon mbox-bestand niet openen:\n"
 "%s\n"
 
-#: src/mbox.c:144
+#: src/mbox.c:142
 #, c-format
-msgid "Importing from mbox... (%d mail imported)"
-msgid_plural "Importing from mbox... (%d mails imported)"
-msgstr[0] "Importeren van mbox... (%d berichten geïmporteerd)"
-msgstr[1] "Importeren van mbox... (%d berichten geïmporteerd)"
+msgid "Importing from mbox... (%ld MB imported)"
+msgid_plural "Importing from mbox... (%ld MB imported)"
+msgstr[0] "Importeren van mbox... (%ld MB geïmporteerd)"
+msgstr[1] "Importeren van mbox... (%ld MB geïmporteerd)"
 
-#: src/mbox.c:549
+#: src/mbox.c:550
 msgid "Overwrite mbox file"
 msgstr "Mbox-bestand overschrijven"
 
-#: src/mbox.c:550
+#: src/mbox.c:551
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Dit bestand bestaat reeds. Wil je het overschrijven?"
 
-#: src/mbox.c:551 src/messageview.c:1864 src/mimeview.c:1843
-#: src/prefs_themes.c:598 src/textview.c:3095
+#: src/mbox.c:552 src/mimeview.c:1897 src/prefs_themes.c:596
 msgid "Overwrite"
 msgstr "Overschrijven"
 
-#: src/mbox.c:560
+#: src/mbox.c:561
 #, c-format
 msgid ""
 "Could not create mbox file:\n"
@@ -7969,51 +8068,51 @@ msgstr ""
 "Kon mbox-bestand niet aanmaken:\n"
 "%s\n"
 
-#: src/mbox.c:568
+#: src/mbox.c:565
 msgid "Exporting to mbox..."
 msgstr "Bezig met exporteren naar mbox-bestand..."
 
-#: src/message_search.c:162
+#: src/message_search.c:173
 msgid "Find in current message"
 msgstr "Zoek in huidige bericht"
 
-#: src/message_search.c:180
+#: src/message_search.c:192
 msgid "Find text:"
 msgstr "Zoek tekst:"
 
-#: src/message_search.c:328 src/summary_search.c:838
+#: src/message_search.c:318 src/summary_search.c:779
 msgid "Search failed"
 msgstr "Zoeken mislukt"
 
-#: src/message_search.c:329 src/summary_search.c:839
+#: src/message_search.c:319 src/summary_search.c:780
 msgid "Search string not found."
 msgstr "Opgegeven tekst niet gevonden."
 
-#: src/message_search.c:338
+#: src/message_search.c:328
 msgid "Beginning of message reached; continue from end?"
 msgstr "Begin van bericht bereikt, verdergaan vanaf het einde?"
 
-#: src/message_search.c:341
+#: src/message_search.c:331
 msgid "End of message reached; continue from beginning?"
 msgstr "Einde van bericht bereikt, verdergaan vanaf het begin?"
 
-#: src/message_search.c:344 src/summary_search.c:850
+#: src/message_search.c:334 src/summary_search.c:791
 msgid "Search finished"
 msgstr "Zoeken voltooid"
 
-#: src/messageview.c:297 src/textview.c:252
+#: src/messageview.c:300 src/textview.c:249
 msgid "Compose _new message"
 msgstr "Nieuw bericht opstellen"
 
-#: src/messageview.c:712 src/messageview.c:1455 src/messageview.c:1606
+#: src/messageview.c:715 src/messageview.c:1436 src/messageview.c:1587
 msgid "Claws Mail - Message View"
 msgstr "Claws Mail - Berichtenvenster"
 
-#: src/messageview.c:842
+#: src/messageview.c:845
 msgid "<No Return-Path found>"
 msgstr "<Geen Return-Path gevonden>"
 
-#: src/messageview.c:849
+#: src/messageview.c:852
 #, c-format
 msgid ""
 "The notification address to which the return receipt is\n"
@@ -8028,66 +8127,36 @@ msgstr ""
 "Return path: %s\n"
 "Je wordt afgeraden een onvangstbevestiging te versturen."
 
-#: src/messageview.c:856 src/messageview.c:884
+#: src/messageview.c:859
 msgid "_Don't Send"
 msgstr "_Niet versturen"
 
-#: src/messageview.c:875
-#, c-format
-msgctxt "'%s' stands for 'To' then 'Cc'"
-msgid ""
-"This message is asking for a return receipt notification\n"
-"but according to its '%s' and '%s' headers it was not\n"
-"officially addressed to you.\n"
-"It is advised to not send the return receipt."
-msgstr ""
-"Dit bericht vraagt om een ontvangstbevestiging,\n"
-"maar volgens de '%s'- en '%s'-headers was het niet\n"
-"officieel aan je gericht.\n"
-"Je wordt afgeraden een onvangstbevestiging te versturen."
-
-#: src/messageview.c:1385
+#: src/messageview.c:1366
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "Ophalen van bericht (%s)..."
 
-#: src/messageview.c:1421 src/procmime.c:1009
+#: src/messageview.c:1402 src/procmime.c:957
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Decoderen mislukt: %s"
 
-#: src/messageview.c:1502 src/messageview.c:1510
+#: src/messageview.c:1483 src/messageview.c:1491
 msgid "Message doesn't conform to MIME standard. It may render wrongly."
 msgstr ""
 "Bericht is niet conform de MIME-standaard. Het zou verkeerd weergegeven "
 "kunnen worden."
 
-#: src/messageview.c:1856 src/messageview.c:1859 src/mimeview.c:2048
-#: src/plugins/fancy/fancy_viewer.c:709 src/summaryview.c:4882
-#: src/summaryview.c:4885 src/textview.c:3083
-msgid "Save as"
-msgstr "Opslaan als"
-
-#: src/messageview.c:1865
-msgid "Overwrite existing file?"
-msgstr "Bestaand bestand overschrijven?"
-
-#: src/messageview.c:1873 src/summaryview.c:4902 src/summaryview.c:4905
-#: src/summaryview.c:4920
-#, c-format
-msgid "Couldn't save the file '%s'."
-msgstr "Kan bestand '%s' niet opslaan."
-
-#: src/messageview.c:1926
+#: src/messageview.c:1868
 #, c-format
 msgid "Show all %s."
 msgstr "Geef alle %s weer."
 
-#: src/messageview.c:1928
+#: src/messageview.c:1870
 msgid "Only the first megabyte of text is shown."
 msgstr "Alleen de eersste megabyte tekst is weergegeven."
 
-#: src/messageview.c:1959
+#: src/messageview.c:1901
 msgid ""
 "You got a return receipt for this message: it has been displayed by the "
 "recipient."
@@ -8095,19 +8164,19 @@ msgstr ""
 "Je kreeg een ontvangstbevestiging in dit bericht: het is gezien door de "
 "ontvanger."
 
-#: src/messageview.c:1962
+#: src/messageview.c:1904
 msgid "You asked for a return receipt in this message."
 msgstr "Je hebt om een ontvangstbevestiging gevraagd voor dit bericht."
 
-#: src/messageview.c:1968
+#: src/messageview.c:1910
 msgid "This message asks for a return receipt."
 msgstr "Dit bericht vraagt om een ontvangstbevestiging."
 
-#: src/messageview.c:1969
+#: src/messageview.c:1911
 msgid "Send receipt"
 msgstr "Ontvangstbevestiging versturen"
 
-#: src/messageview.c:2012
+#: src/messageview.c:1954
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -8115,7 +8184,7 @@ msgstr ""
 "Dit bericht was gedeeltelijk opgehaald,\n"
 "en is verwijderd van de server."
 
-#: src/messageview.c:2018
+#: src/messageview.c:1960
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8124,15 +8193,15 @@ msgstr ""
 "Dit bericht was gedeeltelijk opgehaald,\n"
 "het is %s."
 
-#: src/messageview.c:2022 src/messageview.c:2044
+#: src/messageview.c:1964 src/messageview.c:1986
 msgid "Mark for download"
 msgstr "Markeer voor ophalen"
 
-#: src/messageview.c:2023 src/messageview.c:2035
+#: src/messageview.c:1965 src/messageview.c:1977
 msgid "Mark for deletion"
 msgstr "Gemarkeerd om te verwijderen"
 
-#: src/messageview.c:2028
+#: src/messageview.c:1970
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8141,12 +8210,12 @@ msgstr ""
 "Dit bericht was gedeeltelijk opgehaald,\n"
 "het is %s en zal worden opgehaald."
 
-#: src/messageview.c:2033 src/messageview.c:2046
-#: src/prefs_filtering_action.c:180 src/toolbar.c:506
+#: src/messageview.c:1975 src/messageview.c:1988
+#: src/prefs_filtering_action.c:176 src/toolbar.c:506
 msgid "Unmark"
 msgstr "Demarkeer"
 
-#: src/messageview.c:2039
+#: src/messageview.c:1981
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8155,11 +8224,34 @@ msgstr ""
 "Dit bericht was gedeeltelijk opgehaald,\n"
 "het is %s en zal worden verwijderd."
 
-#: src/messageview.c:2112
+#: src/messageview.c:2058
+#, c-format
+msgctxt "'%s' stands for 'To' then 'Cc'"
+msgid ""
+"This message is asking for a return receipt notification\n"
+"but according to its '%s' and '%s' headers it was not\n"
+"officially addressed to you.\n"
+"It is advised to not send the return receipt."
+msgstr ""
+"Dit bericht vraagt om een ontvangstbevestiging,\n"
+"maar volgens de '%s'- en '%s'-headers was het niet\n"
+"officieel aan je gericht.\n"
+"Je wordt afgeraden een onvangstbevestiging te versturen."
+
+#: src/messageview.c:2066 src/messageview.c:2074
 msgid "Return Receipt Notification"
-msgstr "Verstuur Ontvangstbevestiging"
+msgstr "Verstuur ontvangstbevestiging"
 
-#: src/messageview.c:2113
+#: src/messageview.c:2068 src/messageview.c:2079
+#: src/plugins/rssyl/rssyl_feed_props.c:496
+msgid "_Cancel"
+msgstr "_Annuleren"
+
+#: src/messageview.c:2068 src/messageview.c:2079
+msgid "_Send Notification"
+msgstr "_Stuur bevestiging"
+
+#: src/messageview.c:2075
 msgid ""
 "More than one of your accounts uses the address that this message was sent "
 "to.\n"
@@ -8170,19 +8262,11 @@ msgstr ""
 "gebruiken.\n"
 "Kies het account vanaf welke je de ontvangstbevestiging wilt versturen:"
 
-#: src/messageview.c:2117 src/plugins/rssyl/rssyl_feed_props.c:506
-msgid "_Cancel"
-msgstr "_Annuleren"
-
-#: src/messageview.c:2117
-msgid "_Send Notification"
-msgstr "_Stuur Bevestiging"
-
-#: src/messageview.c:2206
+#: src/messageview.c:2171 src/messageview.c:2190
 msgid "Cannot print: the message doesn't contain text."
 msgstr "Kan niet afdrukken: het bericht bevat geen tekst."
 
-#: src/messageview.c:2967
+#: src/messageview.c:2944
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -8190,7 +8274,7 @@ msgstr ""
 "\n"
 " Er zijn geen berichten in deze map"
 
-#: src/messageview.c:2975
+#: src/messageview.c:2952
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -8198,7 +8282,7 @@ msgstr ""
 "\n"
 " Bericht is verwijderd"
 
-#: src/messageview.c:2976
+#: src/messageview.c:2953
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -8206,16 +8290,16 @@ msgstr ""
 "\n"
 "  Bericht is verplaatst naar de prullenbak of naar een andere map"
 
-#: src/messageview.c:3009 src/messageview.c:3015 src/summaryview.c:4295
-#: src/summaryview.c:7054
+#: src/messageview.c:2986 src/messageview.c:2992 src/summaryview.c:4420
+#: src/summaryview.c:7298
 msgid "An error happened while learning.\n"
 msgstr "Er is een fout opgetreden tijdens het leren.\n"
 
-#: src/mh.c:527
+#: src/mh.c:528
 msgid "Moving messages..."
 msgstr "Berichten worden verplaatst..."
 
-#: src/mh.c:671 src/plugins/mailmbox/mailmbox_folder.c:838
+#: src/mh.c:672 src/plugins/mailmbox/mailmbox_folder.c:839
 msgid "Deleting messages..."
 msgstr "Berichten worden verwijderd..."
 
@@ -8247,60 +8331,64 @@ msgstr ""
 msgid "Remove mailbox"
 msgstr "Verwijder postvak"
 
-#: src/mimeview.c:192
+#: src/mimeview.c:221
 msgid "_Open"
 msgstr "_Openen"
 
-#: src/mimeview.c:194
+#: src/mimeview.c:223
 msgid "Open _with..."
 msgstr "Openen met..."
 
-#: src/mimeview.c:196
+#: src/mimeview.c:225 src/prefs_filtering_action.c:172
+msgid "Copy"
+msgstr "Kopieer"
+
+#: src/mimeview.c:226
 msgid "Send to..."
 msgstr "Verzenden naar..."
 
-#: src/mimeview.c:197
+#: src/mimeview.c:227
 msgid "_Display as text"
 msgstr "Als _tekst weergeven"
 
-#: src/mimeview.c:198
+#: src/mimeview.c:228
 msgid "_Save as..."
 msgstr "_Opslaan als..."
 
-#: src/mimeview.c:199
+#: src/mimeview.c:229
 msgid "Save _all..."
 msgstr "_Alles op_slaan..."
 
-#: src/mimeview.c:272
+#: src/mimeview.c:302
 msgid "MIME Type"
 msgstr "MIME-Type"
 
-#: src/mimeview.c:1026 src/mimeview.c:1031 src/mimeview.c:1036
-#: src/mimeview.c:1041
+#: src/mimeview.c:1053 src/mimeview.c:1058 src/mimeview.c:1063
+#: src/mimeview.c:1068
 msgid "View full information"
 msgstr "Bekijk volledige informatie"
 
-#: src/mimeview.c:1047
+#: src/mimeview.c:1074
 msgid "Check again"
 msgstr "Opnieuw controleren"
 
-#: src/mimeview.c:1059
+#: src/mimeview.c:1086
 #, c-format
 msgid "%s Click the icon to check it."
 msgstr "%s Klik het pictogram om te controleren."
 
-#: src/mimeview.c:1061
+#: src/mimeview.c:1088
 #, c-format
 msgid "%s Click the icon or hit '%s' to check it."
 msgstr "%s Klik het pictogram of klik op '%s' om te controleren."
 
-#: src/mimeview.c:1071
+#: src/mimeview.c:1098
 msgid "Timeout checking the signature. Click the icon to try again."
 msgstr ""
 "Controleren van ondertekening niet gelukt binnen de tijdslimiet. Klik het "
 "pictogram om het opnieuw te proberen."
 
-#: src/mimeview.c:1073
+#: src/mimeview.c:1100
 #, c-format
 msgid ""
 "Timeout checking the signature. Click the icon or hit '%s' to try again."
@@ -8308,26 +8396,26 @@ msgstr ""
 "Controleren van ondertekening niet gelukt binnen de tijdslimiet. Klik het "
 "pictogram of klik op '%s' om het opnieuw te proberen."
 
-#: src/mimeview.c:1313
+#: src/mimeview.c:1345
 msgid "Checking signature..."
 msgstr "Ondertekening wordt geverifieerd..."
 
-#: src/mimeview.c:1354
+#: src/mimeview.c:1386
 msgid "Go back to email"
 msgstr "Ga terug naar bericht"
 
-#: src/mimeview.c:1761 src/mimeview.c:1853 src/mimeview.c:2095
-#: src/mimeview.c:2131 src/mimeview.c:2243 src/plugins/fancy/fancy_viewer.c:449
+#: src/mimeview.c:1815 src/mimeview.c:1907 src/mimeview.c:2149
+#: src/mimeview.c:2185 src/mimeview.c:2297 src/plugins/fancy/fancy_viewer.c:440
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "Kan het deel van een meerdelig bericht niet opslaan: %s"
 
-#: src/mimeview.c:1840 src/textview.c:3093
+#: src/mimeview.c:1894
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "Bestaand bestand '%s' overschrijven?"
 
-#: src/mimeview.c:1864
+#: src/mimeview.c:1918
 #, c-format
 msgid ""
 "An error has occurred while saving message part #%d. Do you want to cancel "
@@ -8336,54 +8424,59 @@ msgstr ""
 "Er kwam een fout voor tijdens het opslaan van berichtdeel #%d. Wil je de "
 "handeling stoppen of de fout overslaan en doorgaan?"
 
-#: src/mimeview.c:1867
+#: src/mimeview.c:1921
 msgid "Error saving all message parts"
 msgstr "Fout bij opslaan van alle berichtdelen"
 
-#: src/mimeview.c:1868
+#: src/mimeview.c:1922
 msgid "Skip"
 msgstr "Overslaan"
 
-#: src/mimeview.c:1868
+#: src/mimeview.c:1922
 msgid "Skip all"
 msgstr "Alles overslaan"
 
-#: src/mimeview.c:1878
+#: src/mimeview.c:1932
 #, c-format
 msgid "%d file saved successfully."
 msgid_plural "%d files saved successfully."
 msgstr[0] "%d bestand opgeslagen."
 msgstr[1] "%d bestanden opgeslagen."
 
-#: src/mimeview.c:1886
+#: src/mimeview.c:1940
 #, c-format
 msgid "%d file saved successfully"
 msgid_plural "%d files saved successfully"
-msgstr[0] "%d bestand opgeslagen."
-msgstr[1] "%d bestanden opgeslagen."
+msgstr[0] "%d bestand opgeslagen"
+msgstr[1] "%d bestanden opgeslagen"
 
-#: src/mimeview.c:1891
+#: src/mimeview.c:1945
 #, c-format
 msgid "%s, %d file failed."
 msgid_plural "%s, %d files failed."
 msgstr[0] "%s, %d bestand mislukt."
 msgstr[1] "%s, %d bestanden mislukt."
 
-#: src/mimeview.c:1924 src/plugins/archive/archiver_prefs.c:142
-#: src/prefs_filtering_action.c:1300
+#: src/mimeview.c:1978 src/plugins/archive/archiver_prefs.c:142
+#: src/prefs_filtering_action.c:1263
 msgid "Select destination folder"
 msgstr "Selecteer doelmap"
 
-#: src/mimeview.c:1931 src/plugins/archive/archiver_prefs.c:148
+#: src/mimeview.c:1985 src/plugins/archive/archiver_prefs.c:148
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "'%s' is geen map."
 
-#: src/mimeview.c:2178 src/mimeview.c:2185 src/textview.c:3010
+#: src/mimeview.c:2102 src/plugins/fancy/fancy_viewer.c:693
+#: src/summaryview.c:5032
+msgid "Save as"
+msgstr "Opslaan als"
+
+#: src/mimeview.c:2232 src/mimeview.c:2239
 msgid "Open with"
 msgstr "Open met"
 
-#: src/mimeview.c:2179 src/mimeview.c:2186 src/textview.c:3011
+#: src/mimeview.c:2233 src/mimeview.c:2240
 #, c-format
 msgid ""
 "Enter the command-line to open file:\n"
@@ -8392,126 +8485,126 @@ msgstr ""
 "Geef de opdracht om het bestand mee te openen:\n"
 "('%s' zal vervangen worden door de bestandsnaam)"
 
-#: src/mimeview.c:2281
+#: src/mimeview.c:2335
 #, c-format
 msgid ""
 "Could not convert attachment name to UTF-16:\n"
 "\n"
 "%s"
 msgstr ""
-"Kon bijvoegsel-naam niet converteren naar UTF-16:\n"
+"Kon bijlage-naam niet converteren naar UTF-16:\n"
 "\n"
 "%s"
 
-#: src/mimeview.c:2289
+#: src/mimeview.c:2343
 msgid "Execute untrusted binary?"
 msgstr "Onbekend programma uitvoeren?"
 
-#: src/mimeview.c:2290
+#: src/mimeview.c:2344
 msgid ""
 "This attachment is an executable file. Executing untrusted binaries is "
-"dangerous and could probably lead to compromission of your computer.\n"
+"dangerous and could compromise your computer.\n"
 "\n"
 "Do you want to run this file?"
 msgstr ""
-"Dit bijvoegsel is een uitvoerbaar bestand. Uitvoeren van onbekende "
-"programma's is gevaarlijk en kan mogelijk leiden tot het onveilig maken van "
-"je computer.\n"
+"Deze bijlage is een uitvoerbaar bestand. Uitvoeren van onbekende programma's "
+"is gevaarlijk en kan mogelijk leiden tot het onveilig maken van je "
+"computer.\n"
 "\n"
 "Wil je dit programma uitvoeren?"
 
-#: src/mimeview.c:2294
+#: src/mimeview.c:2348
 msgid "Run binary"
 msgstr "Draai programma"
 
-#: src/mimeview.c:2596 src/plugins/att_remover/att_remover.c:304
+#: src/mimeview.c:2651 src/plugins/att_remover/att_remover.c:304
 msgid "Type:"
 msgstr "Type:"
 
-#: src/mimeview.c:2597 src/plugins/att_remover/att_remover.c:305
-#: src/plugins/pdf_viewer/poppler_viewer.c:699 src/summaryview.c:2713
+#: src/mimeview.c:2652 src/plugins/att_remover/att_remover.c:305
+#: src/plugins/pdf_viewer/poppler_viewer.c:702 src/summaryview.c:2788
 msgid "Size:"
 msgstr "Grootte:"
 
-#: src/mimeview.c:2611 src/plugins/vcalendar/vcalendar.c:1265
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1709
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1719
+#: src/mimeview.c:2666 src/plugins/vcalendar/vcalendar.c:1240
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1595
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1605
 msgid "Description:"
 msgstr "Beschrijving:"
 
-#: src/news.c:303
+#: src/news.c:300
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected.\n"
 msgstr "De NNTP-verbinding naar %s:%d is verbroken.\n"
 
-#: src/news.c:336
+#: src/news.c:335
 #, c-format
 msgid "Account '%s': Connecting to NNTP server: %s:%d...\n"
 msgstr "Account '%s': Verbinden met NNTP-server: %s:%d...\n"
 
-#: src/news.c:357
+#: src/news.c:372
 #, c-format
 msgid "Error logging in to %s:%d...\n"
 msgstr "Fout tijdens inloggen op %s:%d...\n"
 
-#: src/news.c:438
+#: src/news.c:451
 msgid ""
 "Libetpan does not support return code 480 so for now we choose to continue\n"
 msgstr ""
 "Libetpan ondersteunt return-code 480 niet dus voor nu kunnen we doorgaan\n"
 
-#: src/news.c:447
+#: src/news.c:460
 msgid "Mode reader failed, continuing nevertheless\n"
 msgstr "Modus lezer mislukt, gaat toch door\n"
 
-#: src/news.c:451
+#: src/news.c:464
 #, c-format
 msgid "Error creating session with %s:%d\n"
 msgstr "Fout bij aanmaken sessie met %s:%d\n"
 
-#: src/news.c:466
+#: src/news.c:479
 #, c-format
 msgid "Error authenticating to %s:%d...\n"
 msgstr "Fout tijdens authenticatie met %s:%d...\n"
 
-#: src/news.c:491
+#: src/news.c:504
 msgid "Claws Mail needs network access in order to access the News server."
 msgstr ""
 "Claws Mail heeft voor contact met de Nieuwsserver netwerktoegang nodig."
 
-#: src/news.c:862
+#: src/news.c:875
 #, c-format
 msgid "couldn't select group: %s\n"
 msgstr "kan groep '%s' niet selecteren\n"
 
-#: src/news.c:1054 src/news.c:1232
+#: src/news.c:1067 src/news.c:1253
 #, c-format
 msgid "couldn't set group: %s\n"
 msgstr "kan groep niet instellen: %s\n"
 
-#: src/news.c:1063
+#: src/news.c:1076
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "ongeldig artikelbereik: %d - %d\n"
 
-#: src/news.c:1133 src/news.c:1160 src/news.c:1187
+#: src/news.c:1154 src/news.c:1181 src/news.c:1208
 msgid "couldn't get xhdr\n"
-msgstr "Kan xhdr niet ophalen\n"
+msgstr "kan xhdr niet ophalen\n"
 
-#: src/news.c:1225
+#: src/news.c:1246
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "xover %d - %d uit %s wordt opgehaald...\n"
 
-#: src/news.c:1240
+#: src/news.c:1261
 msgid "couldn't get xover\n"
-msgstr "Kan xover niet ophalen\n"
+msgstr "kan xover niet ophalen\n"
 
-#: src/news.c:1257
+#: src/news.c:1278
 msgid "invalid xover line\n"
 msgstr "ongeldige xover regel\n"
 
-#: src/news.c:1459
+#: src/news.c:1480
 msgid ""
 "You have one or more News accounts defined. However this version of Claws "
 "Mail has been built without News support; your News accounts are disabled.\n"
@@ -8527,7 +8620,7 @@ msgstr ""
 
 #: src/news_gtk.c:56
 msgid "_Subscribe to newsgroup..."
-msgstr "_Abonneren op nieuwsgroep"
+msgstr "_Abonneren op nieuwsgroep..."
 
 #: src/news_gtk.c:57
 msgid "_Unsubscribe newsgroup"
@@ -8586,11 +8679,11 @@ msgstr "Nieuw wachtwoord:"
 msgid "Confirm passphrase:"
 msgstr "Bevestig wachtwoord:"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:51
+#: src/plugins/acpi_notifier/acpi_notifier.c:53
 msgid "Acpi Notifier"
 msgstr "Acpi Verwittiger"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:67
+#: src/plugins/acpi_notifier/acpi_notifier.c:69
 msgid ""
 "Make sure that the kernel module 'acerhk' is loaded.\n"
 "You can get it from http://www.cakey.de/acerhk/"
@@ -8598,7 +8691,7 @@ msgstr ""
 "Controleer dat de kernel-module 'acerhk' geladen is.\n"
 "Je kunt het verkrijgen op http://www.cakey.de/acerhk/"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:69
+#: src/plugins/acpi_notifier/acpi_notifier.c:71
 msgid ""
 "Make sure that the kernel module 'acer_acpi' is loaded.\n"
 "You can get it from http://code.google.com/p/aceracpi/"
@@ -8606,19 +8699,19 @@ msgstr ""
 "Controleer dat de kernel-module 'acer_acpi' geladen is.\n"
 "Je kunt het verkrijgen op http://code.google.com/p/aceracpi/"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:71
+#: src/plugins/acpi_notifier/acpi_notifier.c:73
 msgid "Make sure that the kernel module 'asus_laptop' is loaded."
 msgstr "Controleer dat de kernel-module 'asus_laptop' geladen is."
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:72
+#: src/plugins/acpi_notifier/acpi_notifier.c:74
 msgid "Make sure that the kernel module 'asus_acpi' is loaded."
 msgstr "Controleer dat de kernel-module 'asus_acpi' geladen is."
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:73
+#: src/plugins/acpi_notifier/acpi_notifier.c:75
 msgid "Make sure that the kernel module 'ibm_acpi' is loaded."
 msgstr "Controleer dat de kernel-module 'ibm_acpi' geladen is."
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:74
+#: src/plugins/acpi_notifier/acpi_notifier.c:76
 msgid ""
 "Make sure that you have apanelc installed.\n"
 "You can get it from http://apanel.sourceforge.net/"
@@ -8626,78 +8719,78 @@ msgstr ""
 "Controleer dat apanelc geinstalleerd is.\n"
 "Je kunt het verkrijgen op http://apanel.sourceforge.net/"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:207
-#: src/plugins/acpi_notifier/acpi_notifier.c:213
-#: src/plugins/acpi_notifier/acpi_notifier.c:425
+#: src/plugins/acpi_notifier/acpi_notifier.c:209
+#: src/plugins/acpi_notifier/acpi_notifier.c:215
+#: src/plugins/acpi_notifier/acpi_notifier.c:427
 msgid "Control file doesn't exist."
 msgstr "Beheer bestand bestaat niet."
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:305
+#: src/plugins/acpi_notifier/acpi_notifier.c:307
 msgid " : no new or unread mail"
 msgstr " : geen nieuwe of ongelezen mail"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:306
+#: src/plugins/acpi_notifier/acpi_notifier.c:308
 msgid " : unread mail"
 msgstr " : ongelezen mail"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:307
+#: src/plugins/acpi_notifier/acpi_notifier.c:309
 msgid " : new mail"
 msgstr " : nieuwe mail"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:309
-#: src/plugins/acpi_notifier/acpi_notifier.c:315
-#: src/plugins/acpi_notifier/acpi_notifier.c:321
-msgid "off"
-msgstr "uit"
-
 #: src/plugins/acpi_notifier/acpi_notifier.c:311
 #: src/plugins/acpi_notifier/acpi_notifier.c:317
 #: src/plugins/acpi_notifier/acpi_notifier.c:323
-msgid "blinking"
-msgstr "knipperend"
-
+msgid "off"
+msgstr "uit"
+
 #: src/plugins/acpi_notifier/acpi_notifier.c:313
 #: src/plugins/acpi_notifier/acpi_notifier.c:319
 #: src/plugins/acpi_notifier/acpi_notifier.c:325
+msgid "blinking"
+msgstr "knipperend"
+
+#: src/plugins/acpi_notifier/acpi_notifier.c:315
+#: src/plugins/acpi_notifier/acpi_notifier.c:321
+#: src/plugins/acpi_notifier/acpi_notifier.c:327
 msgid "on"
 msgstr "aan"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:347
-#: src/plugins/acpi_notifier/acpi_notifier.c:356
-#: src/plugins/acpi_notifier/acpi_notifier.c:371
+#: src/plugins/acpi_notifier/acpi_notifier.c:349
+#: src/plugins/acpi_notifier/acpi_notifier.c:358
+#: src/plugins/acpi_notifier/acpi_notifier.c:373
 msgid "LED "
 msgstr "LED "
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:386
+#: src/plugins/acpi_notifier/acpi_notifier.c:388
 msgid "ACPI type: "
 msgstr "ACPI-type: "
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:395
+#: src/plugins/acpi_notifier/acpi_notifier.c:397
 msgid "ACPI file: "
 msgstr "ACPI-bestand: "
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:406
+#: src/plugins/acpi_notifier/acpi_notifier.c:408
 msgid "values - On: "
 msgstr "waardes - Aan: "
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:411
+#: src/plugins/acpi_notifier/acpi_notifier.c:413
 msgid " - Off: "
 msgstr " - Uit: "
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:433
+#: src/plugins/acpi_notifier/acpi_notifier.c:435
 msgid "Blink when user interaction is required"
 msgstr "Knipperen wanneer interactie gevraagd wordt"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:867
+#: src/plugins/acpi_notifier/acpi_notifier.c:869
 msgid "This plugin handles various ACPI mail LEDs."
 msgstr "Deze plugin regelt verschillende ACPI-mail-LEDs."
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:888
+#: src/plugins/acpi_notifier/acpi_notifier.c:890
 msgid "Laptop LED"
 msgstr "Laptop-LED"
 
 #: src/plugins/address_keeper/address_keeper.c:252
-#: src/plugins/attachwarner/attachwarner.c:257
+#: src/plugins/attachwarner/attachwarner.c:252
 msgid "Failed to register check before send hook"
 msgstr "Registreren van 'check before send'-hook is mislukt"
 
@@ -8724,11 +8817,11 @@ msgid "Address book path where addresses are kept"
 msgstr "Adresboek pad waar adressen opgeslagen worden"
 
 #: src/plugins/address_keeper/address_keeper_prefs.c:123
-#: src/plugins/bogofilter/bogofilter_gtk.c:278
+#: src/plugins/bogofilter/bogofilter_gtk.c:262
 #: src/plugins/bsfilter/bsfilter_gtk.c:201
-#: src/plugins/spamassassin/spamassassin_gtk.c:447
-#: src/prefs_filtering_action.c:573 src/prefs_filtering_action.c:580
-#: src/prefs_matcher.c:679
+#: src/plugins/spamassassin/spamassassin_gtk.c:463
+#: src/prefs_filtering_action.c:546 src/prefs_filtering_action.c:553
+#: src/prefs_matcher.c:690
 msgid "Select..."
 msgstr "Selecteren..."
 
@@ -8786,7 +8879,7 @@ msgstr ""
 "Deze plugin voegt archiveringsmogelijkheden toe aan Claws Mail.\n"
 "\n"
 "Het biedt de mogelijkheid om een mail-map te selecteren die je gearchiveerd "
-"wilt hebben, en dan een naam, formaat en locatie te kiezen voor het archief. "
+"wilt hebben, en dan een naam, format en locatie te kiezen voor het archief. "
 "Submappen kunnen bijgevoegd worden en MD5-checksums kunnen toegevoegd worden "
 "voor elk bestand in het archief. Meerdere archiveringsopties zijn verder nog "
 "beschikbaar.\n"
@@ -8796,7 +8889,7 @@ msgstr ""
 "Het archief kan gecomprimeerd worden met:\n"
 "%s\n"
 "De archieven kunnen teruggehaald worden met iedere standaard tool dat het "
-"gekozen formaat en compressie ondersteunt.\n"
+"gekozen format en compressie ondersteunt.\n"
 "\n"
 "De ondersteunde map-typen zijn MH, IMAP, RSSyl and vCalendar.\n"
 "\n"
@@ -8809,19 +8902,19 @@ msgstr ""
 msgid "Archiver"
 msgstr "Archiveerder"
 
-#: src/plugins/archive/archiver_gtk.c:107
+#: src/plugins/archive/archiver_gtk.c:108
 msgid "Archiving"
 msgstr "Archiveren"
 
-#: src/plugins/archive/archiver_gtk.c:125
+#: src/plugins/archive/archiver_gtk.c:127
 msgid "Press Cancel button to stop archiving"
 msgstr "Klik op Annuleren om het archiveren te stoppen"
 
-#: src/plugins/archive/archiver_gtk.c:141
+#: src/plugins/archive/archiver_gtk.c:143
 msgid "Archiving:"
 msgstr "Archiveren:"
 
-#: src/plugins/archive/archiver_gtk.c:525
+#: src/plugins/archive/archiver_gtk.c:527
 #, c-format
 msgid ""
 "Some uninitialized data prevents from starting\n"
@@ -8832,7 +8925,7 @@ msgstr ""
 "dat het archiveringsproces niet kan starten:\n"
 "%s%s"
 
-#: src/plugins/archive/archiver_gtk.c:528
+#: src/plugins/archive/archiver_gtk.c:530
 msgid ""
 "\n"
 "- the folder to archive is not set"
@@ -8840,7 +8933,7 @@ msgstr ""
 "\n"
 "- de map om te archiveren is niet ingesteld"
 
-#: src/plugins/archive/archiver_gtk.c:529
+#: src/plugins/archive/archiver_gtk.c:531
 msgid ""
 "\n"
 "- the name for archive is not set"
@@ -8848,37 +8941,37 @@ msgstr ""
 "\n"
 "- de naam van het archief is niet ingesteld"
 
-#: src/plugins/archive/archiver_gtk.c:552
+#: src/plugins/archive/archiver_gtk.c:554
 #, c-format
 msgid "%s: Exists. Continue anyway?"
 msgstr "%s: Bestaat. Toch doorgaan?"
 
-#: src/plugins/archive/archiver_gtk.c:555
+#: src/plugins/archive/archiver_gtk.c:557
 #, c-format
 msgid "%s: Is a link. Cannot continue"
 msgstr "%s: Is een link. Kan niet doorgaan"
 
-#: src/plugins/archive/archiver_gtk.c:558
+#: src/plugins/archive/archiver_gtk.c:560
 #, c-format
 msgid "%s: Is a directory. Cannot continue"
 msgstr "%s: Is een map. Kan niet doorgaan"
 
-#: src/plugins/archive/archiver_gtk.c:561
+#: src/plugins/archive/archiver_gtk.c:563
 #, c-format
 msgid "%s: Missing permissions. Cannot continue"
-msgstr "%s: Geen toegang. Kan niet doorgaan"
+msgstr "%s: Geen rechten. Kan niet doorgaan"
 
-#: src/plugins/archive/archiver_gtk.c:564
+#: src/plugins/archive/archiver_gtk.c:566
 #, c-format
 msgid "%s: Unknown error. Cannot continue"
 msgstr "%s: Onbekende fout. Kan niet doorgaan"
 
-#: src/plugins/archive/archiver_gtk.c:572
-#: src/plugins/archive/archiver_gtk.c:619
+#: src/plugins/archive/archiver_gtk.c:574
+#: src/plugins/archive/archiver_gtk.c:621
 msgid "Creating archive"
 msgstr "Aanmaken archief"
 
-#: src/plugins/archive/archiver_gtk.c:585
+#: src/plugins/archive/archiver_gtk.c:587
 #, c-format
 msgid ""
 "Not a valid file name:\n"
@@ -8887,7 +8980,7 @@ msgstr ""
 "Geen geldige bestandsnaam:\n"
 "%s."
 
-#: src/plugins/archive/archiver_gtk.c:590
+#: src/plugins/archive/archiver_gtk.c:592
 #, c-format
 msgid ""
 "Not a valid Claws Mail folder:\n"
@@ -8896,7 +8989,7 @@ msgstr ""
 "Geen geldige Claws Mail map:\n"
 "%s."
 
-#: src/plugins/archive/archiver_gtk.c:614
+#: src/plugins/archive/archiver_gtk.c:616
 #, c-format
 msgid ""
 "Adding files in folder failed\n"
@@ -8911,185 +9004,187 @@ msgstr ""
 "\n"
 "Toch doorgaan?"
 
-#: src/plugins/archive/archiver_gtk.c:631
+#: src/plugins/archive/archiver_gtk.c:633
 #, c-format
 msgid ""
 "Archive creation error:\n"
 "%s"
 msgstr ""
-"Fout bij archief aanmaken:\n"
+"Fout bij aanmaken archief:\n"
 "%s"
 
-#: src/plugins/archive/archiver_gtk.c:743
+#: src/plugins/archive/archiver_gtk.c:746
 msgid "Archive result"
 msgstr "Archiveer resultaat"
 
-#: src/plugins/archive/archiver_gtk.c:773
+#: src/plugins/archive/archiver_gtk.c:776
 msgid "Values"
 msgstr "Waardes"
 
-#: src/plugins/archive/archiver_gtk.c:782
+#: src/plugins/archive/archiver_gtk.c:786
 msgid "Archive"
 msgstr "Archief"
 
-#: src/plugins/archive/archiver_gtk.c:788
+#: src/plugins/archive/archiver_gtk.c:792
 msgid "Archive format"
-msgstr "Archiefformaat"
+msgstr "Archiefformat"
 
-#: src/plugins/archive/archiver_gtk.c:795
+#: src/plugins/archive/archiver_gtk.c:799
 msgid "Compression method"
 msgstr "Compressiemethode"
 
-#: src/plugins/archive/archiver_gtk.c:803
+#: src/plugins/archive/archiver_gtk.c:807
 msgid "Number of files"
 msgstr "Aantal bestanden"
 
-#: src/plugins/archive/archiver_gtk.c:811
+#: src/plugins/archive/archiver_gtk.c:815
 msgid "Archive Size"
 msgstr "Archiefgrootte"
 
-#: src/plugins/archive/archiver_gtk.c:819
+#: src/plugins/archive/archiver_gtk.c:823
 msgid "Folder Size"
 msgstr "Map Grootte"
 
-#: src/plugins/archive/archiver_gtk.c:828
+#: src/plugins/archive/archiver_gtk.c:832
 msgid "Compression level"
 msgstr "Compressieniveau"
 
-#: src/plugins/archive/archiver_gtk.c:833
-#: src/plugins/archive/archiver_gtk.c:841
-#: src/plugins/archive/archiver_gtk.c:849
-#: src/plugins/pdf_viewer/poppler_viewer.c:718 src/prefs_folder_item.c:522
+#: src/plugins/archive/archiver_gtk.c:837
+#: src/plugins/archive/archiver_gtk.c:845
+#: src/plugins/archive/archiver_gtk.c:853
+#: src/plugins/pdf_viewer/poppler_viewer.c:721 src/prefs_folder_item.c:525
+#: src/prefs_folder_item.c:1200 src/prefs_folder_item.c:1232
 msgid "Yes"
 msgstr "Ja"
 
-#: src/plugins/archive/archiver_gtk.c:833
-#: src/plugins/archive/archiver_gtk.c:841
-#: src/plugins/archive/archiver_gtk.c:849
-#: src/plugins/pdf_viewer/poppler_viewer.c:721 src/prefs_folder_item.c:521
-#: src/prefs_summaries.c:380
+#: src/plugins/archive/archiver_gtk.c:837
+#: src/plugins/archive/archiver_gtk.c:845
+#: src/plugins/archive/archiver_gtk.c:853
+#: src/plugins/pdf_viewer/poppler_viewer.c:724 src/prefs_folder_item.c:524
+#: src/prefs_folder_item.c:1199 src/prefs_folder_item.c:1231
+#: src/prefs_summaries.c:409
 msgid "No"
 msgstr "Geen"
 
-#: src/plugins/archive/archiver_gtk.c:836
+#: src/plugins/archive/archiver_gtk.c:840
 msgid "MD5 checksum"
 msgstr "MD5 checksum"
 
-#: src/plugins/archive/archiver_gtk.c:844
+#: src/plugins/archive/archiver_gtk.c:848
 msgid "Descriptive names"
 msgstr "Beschrijvende namen"
 
-#: src/plugins/archive/archiver_gtk.c:852
+#: src/plugins/archive/archiver_gtk.c:856
 msgid "Delete selected files"
 msgstr "Verwijder geselecteerd bestand"
 
-#: src/plugins/archive/archiver_gtk.c:861
-#: src/plugins/archive/archiver_gtk.c:1324
+#: src/plugins/archive/archiver_gtk.c:865
+#: src/plugins/archive/archiver_gtk.c:1330
 msgid "Select mails before"
 msgstr "Selecteer e-mails voor"
 
-#: src/plugins/archive/archiver_gtk.c:917
+#: src/plugins/archive/archiver_gtk.c:921
 msgid "Select folder to archive"
 msgstr "Selecteer map om te archiveren"
 
-#: src/plugins/archive/archiver_gtk.c:938
+#: src/plugins/archive/archiver_gtk.c:942
 msgid "Select file name for archive [suffix should reflect archive like .tgz]"
 msgstr ""
 "Selecteer bestandsnaam voor archief [achtervoegsel moet overeenkomen met "
 "archief zoals .tgz]"
 
-#: src/plugins/archive/archiver_gtk.c:986
+#: src/plugins/archive/archiver_gtk.c:990
 #, c-format
 msgid "%ld of %ld"
 msgstr "%ld van %ld"
 
-#: src/plugins/archive/archiver_gtk.c:1038
+#: src/plugins/archive/archiver_gtk.c:1043
 msgid "Create Archive"
 msgstr "Maak archief aan"
 
-#: src/plugins/archive/archiver_gtk.c:1053
+#: src/plugins/archive/archiver_gtk.c:1058
 msgid "Enter Archiver arguments"
 msgstr "Voer Archiveerder argumenten in"
 
-#: src/plugins/archive/archiver_gtk.c:1066
+#: src/plugins/archive/archiver_gtk.c:1072
 msgid "Folder to archive"
 msgstr "Map om te archiveren"
 
-#: src/plugins/archive/archiver_gtk.c:1073
+#: src/plugins/archive/archiver_gtk.c:1079
 msgid "Folder which is the root of the archive"
 msgstr "Bovenste map van het archief"
 
-#: src/plugins/archive/archiver_gtk.c:1078
+#: src/plugins/archive/archiver_gtk.c:1084
 msgid "Click this button to select a folder which is to be root of the archive"
 msgstr ""
 "Klik hier om een map te selecteren wat de bovenste map van het archief is"
 
-#: src/plugins/archive/archiver_gtk.c:1084
+#: src/plugins/archive/archiver_gtk.c:1090
 msgid "Name for archive"
 msgstr "Naam van het archief"
 
-#: src/plugins/archive/archiver_gtk.c:1090
+#: src/plugins/archive/archiver_gtk.c:1096
 msgid "Archive location and name"
 msgstr "Locatie en naam van het archief"
 
-#: src/plugins/archive/archiver_gtk.c:1092
+#: src/plugins/archive/archiver_gtk.c:1098
 #: src/plugins/archive/archiver_prefs.c:225
-#: src/plugins/pgpcore/select-keys.c:435
+#: src/plugins/pgpcore/select-keys.c:494
 msgid "_Select"
 msgstr "_Selecteren"
 
-#: src/plugins/archive/archiver_gtk.c:1095
+#: src/plugins/archive/archiver_gtk.c:1101
 msgid "Click this button to select a name and location for the archive"
 msgstr "Klik hier om een naam en locatie voor het archief te selecteren"
 
-#: src/plugins/archive/archiver_gtk.c:1097
+#: src/plugins/archive/archiver_gtk.c:1103
 msgid "Choose compression"
 msgstr "Kies compressie"
 
-#: src/plugins/archive/archiver_gtk.c:1109
 #: src/plugins/archive/archiver_gtk.c:1115
 #: src/plugins/archive/archiver_gtk.c:1121
-#: src/plugins/archive/archiver_gtk.c:1128
+#: src/plugins/archive/archiver_gtk.c:1127
 #: src/plugins/archive/archiver_gtk.c:1134
-#: src/plugins/archive/archiver_gtk.c:1142
-#: src/plugins/archive/archiver_gtk.c:1150
+#: src/plugins/archive/archiver_gtk.c:1140
+#: src/plugins/archive/archiver_gtk.c:1148
 #: src/plugins/archive/archiver_gtk.c:1156
 #: src/plugins/archive/archiver_gtk.c:1162
-#: src/plugins/archive/archiver_gtk.c:1170
-#: src/plugins/archive/archiver_gtk.c:1177
+#: src/plugins/archive/archiver_gtk.c:1168
+#: src/plugins/archive/archiver_gtk.c:1176
+#: src/plugins/archive/archiver_gtk.c:1183
 #, c-format
 msgid "Choose this option to use %s compression for the archive"
 msgstr "Kies deze optie om %s-compressie te gebruiken voor het archief"
 
-#: src/plugins/archive/archiver_gtk.c:1226
+#: src/plugins/archive/archiver_gtk.c:1232
 msgid "Choose format"
-msgstr "Kies formaat"
+msgstr "Kies format"
 
-#: src/plugins/archive/archiver_gtk.c:1238
 #: src/plugins/archive/archiver_gtk.c:1244
 #: src/plugins/archive/archiver_gtk.c:1250
 #: src/plugins/archive/archiver_gtk.c:1256
+#: src/plugins/archive/archiver_gtk.c:1262
 #, c-format
 msgid "Choose this to use %s as format for the archive"
-msgstr "Kies deze optie om %s te gebruiken als formaat voor het archief"
+msgstr "Kies deze optie om %s te gebruiken als format voor het archief"
 
-#: src/plugins/archive/archiver_gtk.c:1276
+#: src/plugins/archive/archiver_gtk.c:1282
 msgid "Miscellaneous options"
 msgstr "Overige opties"
 
-#: src/plugins/archive/archiver_gtk.c:1285
+#: src/plugins/archive/archiver_gtk.c:1291
 msgid "_Recursive"
 msgstr "_Recursief"
 
-#: src/plugins/archive/archiver_gtk.c:1289
+#: src/plugins/archive/archiver_gtk.c:1295
 msgid "Choose this option to include subfolders in the archive"
 msgstr "Kies deze optie om submappen in het archief te voegen"
 
-#: src/plugins/archive/archiver_gtk.c:1291
+#: src/plugins/archive/archiver_gtk.c:1297
 msgid "_MD5sum"
 msgstr "_MD5sum"
 
-#: src/plugins/archive/archiver_gtk.c:1295
+#: src/plugins/archive/archiver_gtk.c:1301
 msgid ""
 "Choose this option to add MD5 checksums for each file in the archive.\n"
 "Be aware though, that this dramatically increases the time it\n"
@@ -9099,11 +9194,11 @@ msgstr ""
 "Wees je ervan bewust dat dit de tijd die het duurt om het archief aan te "
 "maken drastisch verhoogt"
 
-#: src/plugins/archive/archiver_gtk.c:1299
+#: src/plugins/archive/archiver_gtk.c:1305
 msgid "R_ename"
 msgstr "_Hernoemen"
 
-#: src/plugins/archive/archiver_gtk.c:1303
+#: src/plugins/archive/archiver_gtk.c:1309
 #: src/plugins/archive/archiver_prefs.c:427
 msgid ""
 "Choose this option to use descriptive names for each file in the archive.\n"
@@ -9114,7 +9209,7 @@ msgstr ""
 "Dit volgens het schema: datum_van at onderwerp.\n"
 "Namen worden verkort tot max 96 karakters"
 
-#: src/plugins/archive/archiver_gtk.c:1311
+#: src/plugins/archive/archiver_gtk.c:1317
 msgid ""
 "Choose this option to delete mails after archiving\n"
 "At this point only handles IMAP4, Local mbox and POP3"
@@ -9122,11 +9217,11 @@ msgstr ""
 "Kies deze optie om e-mails te verwijderen na het archiveren\n"
 "Op dit moment kan dit alleen bij IMAP4, Lokale mbox en POP3"
 
-#: src/plugins/archive/archiver_gtk.c:1315
+#: src/plugins/archive/archiver_gtk.c:1321
 msgid "Selection options"
 msgstr "Selecteer opties"
 
-#: src/plugins/archive/archiver_gtk.c:1331
+#: src/plugins/archive/archiver_gtk.c:1337
 msgid ""
 "Select emails before a certain date\n"
 "Date must comply to ISO-8601 [YYYY-MM-DD]"
@@ -9165,7 +9260,7 @@ msgstr "Kies deze optie om standaard %s-compressie te gebruiken"
 
 #: src/plugins/archive/archiver_prefs.c:363
 msgid "Default format"
-msgstr "Standaard formaat"
+msgstr "Standaard format"
 
 #: src/plugins/archive/archiver_prefs.c:374
 #: src/plugins/archive/archiver_prefs.c:380
@@ -9173,7 +9268,7 @@ msgstr "Standaard formaat"
 #: src/plugins/archive/archiver_prefs.c:392
 #, c-format
 msgid "Choose this option to use the %s as format by default"
-msgstr "Kies deze optie om standaard het %s-formaat te gebruiken"
+msgstr "Kies deze optie om standaard het %s-format te gebruiken"
 
 #: src/plugins/archive/archiver_prefs.c:409
 msgid "Default miscellaneous options"
@@ -9200,7 +9295,7 @@ msgstr ""
 "maken drastisch verhoogt"
 
 #: src/plugins/archive/archiver_prefs.c:425
-#: src/plugins/managesieve/sieve_manager.c:765
+#: src/plugins/managesieve/sieve_manager.c:771
 msgid "Rename"
 msgstr "Hernoemen"
 
@@ -9210,63 +9305,76 @@ msgstr "Kies deze optie om e-mails te verwijderen na het archiveren"
 
 #: src/plugins/att_remover/att_remover.c:337
 msgid "Remove attachments"
-msgstr "Verwijder bijvoegsels"
+msgstr "Verwijder bijlages"
 
-#: src/plugins/att_remover/att_remover.c:362
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:324 src/prefs_themes.c:1097
+#: src/plugins/att_remover/att_remover.c:363
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:325 src/prefs_themes.c:1099
 msgid "Remove"
 msgstr "Verwijderen"
 
-#: src/plugins/att_remover/att_remover.c:370 src/prefs_summaries.c:451
-#: src/prefs_summary_column.c:79 src/summaryview.c:2807
+#: src/plugins/att_remover/att_remover.c:371 src/prefs_summaries.c:643
+#: src/prefs_summary_column.c:79 src/summaryview.c:2882
 msgid "Attachment"
-msgstr "Bijvoegsel"
+msgstr "Bijlage"
 
-#: src/plugins/att_remover/att_remover.c:422
+#: src/plugins/att_remover/att_remover.c:425
 msgid "Destroy attachments"
-msgstr "Vernietig bijvoegsels"
+msgstr "Vernietig bijlages"
 
-#: src/plugins/att_remover/att_remover.c:423
+#: src/plugins/att_remover/att_remover.c:426
 msgid ""
 "Do you really want to remove all attachments from the selected messages?\n"
 "\n"
 "The deleted data will be unrecoverable."
 msgstr ""
-"Wil je werkelijk alle bijvoegsels verwijderen van de geselecteerde "
-"berichten?\n"
+"Wil je werkelijk alle bijlages verwijderen van de geselecteerde berichten?\n"
 "\n"
 "De verwijderde gegevens kunnen niet teruggehaald worden."
 
-#: src/plugins/att_remover/att_remover.c:484
+#: src/plugins/att_remover/att_remover.c:469
+msgid "The selected messages don't have any attachments."
+msgstr "Het geselecteerde bericht bevat geen bijlages."
+
+#: src/plugins/att_remover/att_remover.c:472
+#, c-format
+msgid "Attachments removed from %d of the %d selected messages."
+msgstr "Bijlages verwijderd van %d van de %d geselecteerde berichten."
+
+#: src/plugins/att_remover/att_remover.c:475
+#, c-format
+msgid "Attachments removed from all %d selected messages."
+msgstr "Bijlages verwijderd van alle %d geselecteerde berichten."
+
+#: src/plugins/att_remover/att_remover.c:504
 msgid "This message doesn't have any attachments."
-msgstr "Dit bericht bevat geen bijvoegsels."
+msgstr "Dit bericht bevat geen bijlages."
 
-#: src/plugins/att_remover/att_remover.c:499
+#: src/plugins/att_remover/att_remover.c:517
 msgid "Remove attachments..."
-msgstr "Verwijderen bijvoegsels..."
+msgstr "Verwijderen bijlages..."
 
-#: src/plugins/att_remover/att_remover.c:511
-#: src/plugins/att_remover/att_remover.c:571
+#: src/plugins/att_remover/att_remover.c:529
+#: src/plugins/att_remover/att_remover.c:589
 msgid "AttRemover"
-msgstr "Bijvoegsel Verwijderaar"
+msgstr "Bijlage verwijderaar"
 
-#: src/plugins/att_remover/att_remover.c:576
+#: src/plugins/att_remover/att_remover.c:594
 msgid ""
 "This plugin removes attachments from mails.\n"
 "\n"
 "Warning: this operation will be completely un-cancellable and the deleted "
 "attachments will be lost forever, and ever, and ever."
 msgstr ""
-"Deze plugin verwijdert bijvoegsels van e-mails.\n"
+"Deze plugin verwijdert bijlages van e-mails.\n"
 "\n"
 "Waarschuwing: deze operatie is volledig onomkeerbaar en de verwijderde "
-"bijvoegsels zijn voor eeuwig en altijd verloren."
+"bijlages zijn voor eeuwig en altijd verloren."
 
-#: src/plugins/att_remover/att_remover.c:600
+#: src/plugins/att_remover/att_remover.c:618
 msgid "Attachment handling"
-msgstr "Bijvoegsel-afhandeling"
+msgstr "Bijlage-afhandeling"
 
-#: src/plugins/attachwarner/attachwarner.c:217
+#: src/plugins/attachwarner/attachwarner.c:210
 #, c-format
 msgid ""
 "An attachment is mentioned in the mail you're sending, but no file was "
@@ -9274,29 +9382,29 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-"Een bijvoegsel wordt vermeld in de e-mail die je verstuurt, maar er was geen "
+"Een bijlage wordt vermeld in de e-mail die je verstuurt, maar er was geen "
 "bestand bijgevoegd. De melding verschijnt op regel %d, die begint met de "
 "tekst: %s\n"
 "\n"
 "%s"
 
-#: src/plugins/attachwarner/attachwarner.c:223
+#: src/plugins/attachwarner/attachwarner.c:216
 msgid "Attachment warning"
-msgstr "Bijvoegsel-waarschuwing"
+msgstr "Bijlage-waarschuwing"
 
-#: src/plugins/attachwarner/attachwarner.c:250
-#: src/plugins/attachwarner/attachwarner.c:287
-#: src/plugins/attachwarner/attachwarner.c:339
+#: src/plugins/attachwarner/attachwarner.c:245
+#: src/plugins/attachwarner/attachwarner.c:282
+#: src/plugins/attachwarner/attachwarner.c:334
 msgid "Attach warner"
-msgstr "Voeg waarschuwing bij"
+msgstr "Bijlage waarschuwingen"
 
-#: src/plugins/attachwarner/attachwarner.c:297
+#: src/plugins/attachwarner/attachwarner.c:292
 msgid ""
 "Warns user if some reference to attachments is found in the message text and "
 "no file is attached."
 msgstr ""
-"Waarschuw gebruiker als er een referentie naar bijvoegsels is gevonden in de "
-"berichttekst en er is geen bestand bijgevoegd"
+"Waarschuw gebruiker als er een referentie naar bijlages is gevonden in de "
+"berichttekst en er geen bestand is bijgevoegd."
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:52
 msgid "attach"
@@ -9337,19 +9445,19 @@ msgstr "Doorgestuurde of herverwezen berichten"
 msgid ""
 "Don't check for missing attachments when forwarding or redirecting messages"
 msgstr ""
-"Controleer niet op missende bijvoegsels bij doorgestuurde of herverwezen "
+"Controleer niet op missende bijlages bij doorgestuurde of herverwezen "
 "berichten"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:135 src/prefs_msg_colors.c:353
+#: src/plugins/attachwarner/attachwarner_prefs.c:135 src/prefs_msg_colors.c:310
 msgid "Signatures"
-msgstr "Handtekeningen"
+msgstr "Ondertekeningen"
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:142
 msgid ""
 "Exclude lines from the first signature-separator onwards from checking for "
 "the regular expressions above"
 msgstr ""
-"Negeer regels van de eerste handtekening-scheiding en verder bij het "
+"Negeer regels van de eerste ondertekening-scheiding en verder bij het "
 "controleren op de reguliere expressie hierboven"
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:148
@@ -9362,22 +9470,39 @@ msgstr "Uitsluiten"
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:230
 msgid "Attach Warner"
-msgstr "Attach Warner"
+msgstr "Bijlage waarschuwingen"
 
-#: src/plugins/bogofilter/bogofilter.c:81
-#: src/plugins/bogofilter/bogofilter_gtk.c:499
+#: src/plugins/bogofilter/bogofilter.c:82
+#: src/plugins/bogofilter/bogofilter_gtk.c:483
 msgid "Bogofilter"
 msgstr "Bogofilter"
 
-#: src/plugins/bogofilter/bogofilter.c:456
+#: src/plugins/bogofilter/bogofilter.c:108
+#: src/plugins/bogofilter/bogofilter_gtk.c:258
+#: src/plugins/bogofilter/bogofilter_gtk.c:331
+#: src/plugins/bogofilter/bogofilter_gtk.c:408
+#: src/plugins/bsfilter/bsfilter.c:107 src/plugins/bsfilter/bsfilter_gtk.c:197
+#: src/plugins/bsfilter/bsfilter_gtk.c:266
+#: src/plugins/bsfilter/bsfilter_gtk.c:326
+#: src/plugins/spamassassin/spamassassin.c:118
+#: src/plugins/spamassassin/spamassassin_gtk.c:459
+#: src/plugins/spamassassin/spamassassin_gtk.c:508
+#: src/plugins/spamassassin/spamassassin_gtk.c:635 src/prefs_matcher.c:686
+#: src/prefs_matcher.c:719 src/prefs_matcher.c:1661 src/prefs_matcher.c:1668
+#: src/prefs_matcher.c:1676 src/prefs_matcher.c:1678 src/prefs_matcher.c:2586
+#: src/prefs_matcher.c:2590
+msgid "Any"
+msgstr "Elke"
+
+#: src/plugins/bogofilter/bogofilter.c:457
 msgid "Bogofilter: fetching bodies..."
 msgstr "Bogofilter: ophalen van berichten..."
 
-#: src/plugins/bogofilter/bogofilter.c:469
+#: src/plugins/bogofilter/bogofilter.c:470
 msgid "Bogofilter: filtering messages..."
 msgstr "Bogofilter: berichten sorteren..."
 
-#: src/plugins/bogofilter/bogofilter.c:585
+#: src/plugins/bogofilter/bogofilter.c:586
 msgid ""
 "The Bogofilter plugin couldn't filter a message. The probable cause of the "
 "error is that it didn't learn from any mail.\n"
@@ -9389,7 +9514,7 @@ msgstr ""
 "Gebruik \"/Markeer/Markeer als spam\" en \"/Markeer/Markeer als ham\" om "
 "Bogofilter te trainen met enkele honderden spam en ham berichten."
 
-#: src/plugins/bogofilter/bogofilter.c:592
+#: src/plugins/bogofilter/bogofilter.c:593
 #, c-format
 msgid ""
 "The Bogofilter plugin couldn't filter a message. The command `%s %s %s` "
@@ -9398,21 +9523,21 @@ msgstr ""
 "De Bogofilter-plugin kon een bericht niet filteren. De opdracht `%s %s %s` "
 "kon niet uitgevoerd worden."
 
-#: src/plugins/bogofilter/bogofilter.c:739
+#: src/plugins/bogofilter/bogofilter.c:740
 msgid "Bogofilter: learning from message..."
 msgstr "Bogofilter: leren van bericht..."
 
-#: src/plugins/bogofilter/bogofilter.c:752
-#: src/plugins/bogofilter/bogofilter.c:799 src/plugins/bsfilter/bsfilter.c:486
+#: src/plugins/bogofilter/bogofilter.c:753
+#: src/plugins/bogofilter/bogofilter.c:800 src/plugins/bsfilter/bsfilter.c:486
 #, c-format
 msgid "Learning failed; `%s` returned with status %d."
 msgstr "Leren mislukt: `%s` gaf status %d terug."
 
-#: src/plugins/bogofilter/bogofilter.c:767
+#: src/plugins/bogofilter/bogofilter.c:768
 msgid "Bogofilter: learning from messages..."
 msgstr "Bogofilter: leren van berichten..."
 
-#: src/plugins/bogofilter/bogofilter.c:855
+#: src/plugins/bogofilter/bogofilter.c:856
 #, c-format
 msgid ""
 "Learning failed; `%s %s %s` returned with error:\n"
@@ -9421,7 +9546,7 @@ msgstr ""
 "Leren mislukt, `%s %s %s` gaf een foutmelding:\n"
 "%s"
 
-#: src/plugins/bogofilter/bogofilter.c:983
+#: src/plugins/bogofilter/bogofilter.c:984
 msgid ""
 "This plugin can check all messages that are received from an IMAP, LOCAL or "
 "POP account for spam using Bogofilter. You will need Bogofilter installed "
@@ -9449,72 +9574,72 @@ msgstr ""
 "\n"
 "Opties kunnen worden gevonden in /Instellingen/Voorkeuren/Plugins/Bogofilter"
 
-#: src/plugins/bogofilter/bogofilter.c:1016 src/plugins/bsfilter/bsfilter.c:649
-#: src/plugins/spamassassin/spamassassin.c:624
+#: src/plugins/bogofilter/bogofilter.c:1017 src/plugins/bsfilter/bsfilter.c:649
+#: src/plugins/spamassassin/spamassassin.c:643
 msgid "Spam detection"
 msgstr "Spam detecteren"
 
-#: src/plugins/bogofilter/bogofilter.c:1017 src/plugins/bsfilter/bsfilter.c:650
-#: src/plugins/spamassassin/spamassassin.c:625
+#: src/plugins/bogofilter/bogofilter.c:1018 src/plugins/bsfilter/bsfilter.c:650
+#: src/plugins/spamassassin/spamassassin.c:644
 msgid "Spam learning"
 msgstr "Spam leren"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:161
 #: src/plugins/bsfilter/bsfilter_gtk.c:143
-#: src/plugins/spamassassin/spamassassin_gtk.c:400
+#: src/plugins/spamassassin/spamassassin_gtk.c:416
 msgid "Process messages on receiving"
 msgstr "Verwerk de berichten bij het ophalen"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:169
 #: src/plugins/bsfilter/bsfilter_gtk.c:151
-#: src/plugins/spamassassin/spamassassin_gtk.c:358
+#: src/plugins/spamassassin/spamassassin_gtk.c:374
 msgid "Maximum size"
 msgstr "Maximale grootte"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:178
 #: src/plugins/bsfilter/bsfilter_gtk.c:160
-#: src/plugins/spamassassin/spamassassin_gtk.c:367
+#: src/plugins/spamassassin/spamassassin_gtk.c:383
 msgid "Messages larger than this will not be checked"
 msgstr "Berichten groter dan dit zullen niet worden gecontroleerd"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:181
 #: src/plugins/bsfilter/bsfilter_gtk.c:163
-#: src/plugins/spamassassin/spamassassin_gtk.c:370 src/prefs_account.c:1544
+#: src/plugins/spamassassin/spamassassin_gtk.c:386 src/prefs_account.c:1616
 msgid "KB"
 msgstr "KB"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:200
+#: src/plugins/bogofilter/bogofilter_gtk.c:192
 msgid "Delete spam"
 msgstr "Verwijder spam"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:207
+#: src/plugins/bogofilter/bogofilter_gtk.c:195
 msgid "Save spam in..."
 msgstr "Spam opslaan in..."
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:214
+#: src/plugins/bogofilter/bogofilter_gtk.c:198
 msgid "Only mark as spam"
 msgstr "Markeer alleen als spam"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:227
+#: src/plugins/bogofilter/bogofilter_gtk.c:211
 #: src/plugins/bsfilter/bsfilter_gtk.c:179
-#: src/plugins/spamassassin/spamassassin_gtk.c:416
+#: src/plugins/spamassassin/spamassassin_gtk.c:432
 msgid ""
 "Folder for storing identified spam. Leave empty to use the trash folder."
 msgstr ""
 "Map om spam in op te slaan. Laat leeg om de standaard prullenbak te "
 "gebruiken."
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:233
+#: src/plugins/bogofilter/bogofilter_gtk.c:217
 #: src/plugins/bsfilter/bsfilter_gtk.c:185
-#: src/plugins/spamassassin/spamassassin_gtk.c:422
+#: src/plugins/spamassassin/spamassassin_gtk.c:438
 msgid "Click this button to select a folder for storing spam"
 msgstr "Klik op deze knop om een map te selecteren voor het opslaan van spam"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:242
+#: src/plugins/bogofilter/bogofilter_gtk.c:226
 msgid "When unsure, move to"
 msgstr "Wanneer niet zeker, verplaats naar"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:250
+#: src/plugins/bogofilter/bogofilter_gtk.c:234
 msgid ""
 "Folder for storing mail for which spam status is Unsure. Leave empty to use "
 "the Inbox folder."
@@ -9522,29 +9647,29 @@ msgstr ""
 "Map om mogelijke spam in op te slaan. Laat leeg om de standaard Inbox te "
 "gebruiken."
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:256
+#: src/plugins/bogofilter/bogofilter_gtk.c:240
 msgid "Click this button to select a folder for storing Unsure mails."
 msgstr ""
 "Klik op deze knop om een map te selecteren voor het opslaan van mogelijke "
 "spam."
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:258
+#: src/plugins/bogofilter/bogofilter_gtk.c:242
 msgid "Insert X-Bogosity header"
 msgstr "Voeg X-Bogosity-header in"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:262
+#: src/plugins/bogofilter/bogofilter_gtk.c:246
 msgid "Only done for messages in MH folders"
 msgstr "Alleen voor berichten in MH-mappen"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:268
+#: src/plugins/bogofilter/bogofilter_gtk.c:252
 #: src/plugins/bsfilter/bsfilter_gtk.c:191
-#: src/plugins/spamassassin/spamassassin_gtk.c:437
+#: src/plugins/spamassassin/spamassassin_gtk.c:453
 msgid "Whitelist senders found in address book/folder"
 msgstr "'Whitelist' afzenders gevonden in adresboek/map"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:272
+#: src/plugins/bogofilter/bogofilter_gtk.c:256
 #: src/plugins/bsfilter/bsfilter_gtk.c:195
-#: src/plugins/spamassassin/spamassassin_gtk.c:441
+#: src/plugins/spamassassin/spamassassin_gtk.c:457
 msgid ""
 "Messages coming from your address book contacts will be received in the "
 "normal folder even if detected as spam"
@@ -9552,18 +9677,18 @@ msgstr ""
 "Berichten komend vanaf contacten in het adresboek zullen worden geplaatst in "
 "de gewone map zelfs als ze als spam herkend worden"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:282
+#: src/plugins/bogofilter/bogofilter_gtk.c:266
 #: src/plugins/bsfilter/bsfilter_gtk.c:205
-#: src/plugins/spamassassin/spamassassin_gtk.c:451
+#: src/plugins/spamassassin/spamassassin_gtk.c:467
 msgid "Click this button to select a book or folder in the address book"
 msgstr "Klik op deze knop om een boek of map te selecteren in het adresboek"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:284
+#: src/plugins/bogofilter/bogofilter_gtk.c:268
 #: src/plugins/bsfilter/bsfilter_gtk.c:207
 msgid "Learn whitelisted emails as ham"
 msgstr "Leer 'whitelisted' e-mails als ham"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:286
+#: src/plugins/bogofilter/bogofilter_gtk.c:270
 msgid ""
 "If Bogofilter thought an email was spam or unsure, but it was whitelisted, "
 "learn it as ham."
@@ -9571,17 +9696,17 @@ msgstr ""
 "Als Bogofilter dacht dat een e-mail spam was, of niet zeker was, maar het "
 "was wel 'whitelisted', leer het als ham."
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:295
+#: src/plugins/bogofilter/bogofilter_gtk.c:279
 msgid "Bogofilter call"
 msgstr "Bogofilter aanroep"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:303
+#: src/plugins/bogofilter/bogofilter_gtk.c:287
 msgid "Path to bogofilter executable"
 msgstr "Pad naar bogofilter-programma"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:309
+#: src/plugins/bogofilter/bogofilter_gtk.c:293
 #: src/plugins/bsfilter/bsfilter_gtk.c:232
-#: src/plugins/spamassassin/spamassassin_gtk.c:429
+#: src/plugins/spamassassin/spamassassin_gtk.c:445
 msgid "Mark spam as read"
 msgstr "Markeer spam als gelezen"
 
@@ -9651,7 +9776,7 @@ msgstr ""
 "Opties kunnen gevonden worden in /Instellingen/Voorkeuren/Plugins/Bsfilter"
 
 #: src/plugins/bsfilter/bsfilter_gtk.c:171
-#: src/plugins/spamassassin/spamassassin_gtk.c:408
+#: src/plugins/spamassassin/spamassassin_gtk.c:424
 msgid "Save spam in"
 msgstr "Spam opslaan in"
 
@@ -9672,7 +9797,7 @@ msgid "Path to bsfilter executable"
 msgstr "Pad naar het bsfilter-programma"
 
 #: src/plugins/clamd/clamav_plugin.c:47
-#: src/plugins/clamd/clamav_plugin_gtk.c:550
+#: src/plugins/clamd/clamav_plugin_gtk.c:538
 msgid "Clam AntiVirus"
 msgstr "Clam AntiVirus"
 
@@ -9768,7 +9893,7 @@ msgstr ""
 "Deze plugin gebruikt Clam AntiVirus om alle berichten te scannen die "
 "ontvangen zijn via een IMAP, LOKAAL of POP-account.\n"
 "\n"
-"Wanneer in een bijvoegsel een virus is gevonden kan het verwijderd worden of "
+"Wanneer in een bijlage een virus is gevonden kan het verwijderd worden of "
 "opgeslagen in een speciaal daarvoor bestemde map.\n"
 "\n"
 "Omdat deze plugin communiceert met clamd via een \n"
@@ -9776,10 +9901,10 @@ msgstr ""
 "je home-map en de .claws-mail-map wanneer de\n"
 "clamav-daemon geconfigureerd is om te communiceren\n"
 "via een unix-socket.\n"
-"Alle gebruikers moeten minstens uitvoer-permissies geven op\n"
+"Alle gebruikers moeten minstens uitvoerrechten hebben op\n"
 "deze mappen.\n"
 "\n"
-"Om het wijzigen van de permissies te vermijden kun je ook\n"
+"Om het wijzigen van de rechten te vermijden kun je ook\n"
 "de clamav-daemon configureren om te communiceren via een\n"
 "TCP-socket en handmatige configuratie kiezen voor clamd.\n"
 "\n"
@@ -9794,56 +9919,56 @@ msgstr "Virus detecteren"
 msgid "Select folder to store infected messages in"
 msgstr "Selecteer map om geïnfecteerde berichten in op te slaan"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:250
+#: src/plugins/clamd/clamav_plugin_gtk.c:248
 msgid "Enable virus scanning"
 msgstr "Zet virus scannen aan"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:260
+#: src/plugins/clamd/clamav_plugin_gtk.c:258
 msgid "Maximum attachment size"
-msgstr "Maximale grootte bijvoegsel"
+msgstr "Maximale grootte bijlage"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:271
+#: src/plugins/clamd/clamav_plugin_gtk.c:269
 msgid "Message attachments larger than this will not be scanned"
 msgstr "Berichten groter dan dit zullen niet worden gecontroleerd"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:275
+#: src/plugins/clamd/clamav_plugin_gtk.c:272
 msgid "MB"
 msgstr "MB"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:284
+#: src/plugins/clamd/clamav_plugin_gtk.c:281
 msgid "Save infected mail in"
 msgstr "Geïnfecteerde e-mail opslaan in"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:288
+#: src/plugins/clamd/clamav_plugin_gtk.c:285
 msgid "Save mail that contains viruses"
 msgstr "Bewaar e-mail die virussen bevat"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:296
+#: src/plugins/clamd/clamav_plugin_gtk.c:292
 msgid ""
 "Folder for storing infected mail. Leave empty to use the default trash folder"
 msgstr ""
 "Map om geïnfecteerde e-mail in op te slaan. Laat leeg om de standaard "
 "prullenbak te gebruiken"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:304
+#: src/plugins/clamd/clamav_plugin_gtk.c:299
 msgid "Click this button to select a folder for storing infected mail"
 msgstr ""
 "Klik op deze knop om een map te selecteren voor het opslaan van "
 "geïnfecteerde e-mail"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:312
+#: src/plugins/clamd/clamav_plugin_gtk.c:306
 msgid "Automatic configuration"
 msgstr "Automatische instellingen"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:317
+#: src/plugins/clamd/clamav_plugin_gtk.c:311
 msgid "Should configuration be done automatic or manual"
 msgstr "Moet configuratie automatisch of handmatig gedaan worden"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:325
+#: src/plugins/clamd/clamav_plugin_gtk.c:318
 msgid "Where is clamd.conf"
 msgstr "Waar is clamd.conf"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:333
+#: src/plugins/clamd/clamav_plugin_gtk.c:326
 msgid ""
 "Full path to clamd.conf. If this field is not empty then the plugin has been "
 "able to locate the file automatically"
@@ -9851,37 +9976,36 @@ msgstr ""
 "Volledige pad naar clamd.conf. Als dit veld niet leeg is dan kon de plugin "
 "het bestand automatisch vinden"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:337
+#: src/plugins/clamd/clamav_plugin_gtk.c:329
 msgid "Br_owse"
 msgstr "Be_kijk"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:341
+#: src/plugins/clamd/clamav_plugin_gtk.c:333
 msgid "Click this button to select full path to clamd.conf"
 msgstr "Klik op deze knop om het volledige pad te selecteren naar clamd.conf"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:349
+#: src/plugins/clamd/clamav_plugin_gtk.c:340
 msgid "Check permission for folders and adjust if necessary"
-msgstr "Controleer permissies voor mappen en wijzig indien noodzakelijk"
+msgstr "Controleer rechten voor mappen en wijzig indien noodzakelijk"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:362
+#: src/plugins/clamd/clamav_plugin_gtk.c:353
 msgid "Click this button to check and adjust folder permissions"
 msgstr ""
-"Klik op deze knop om te controleren op bestandspermissies en deze aan te "
-"passen"
+"Klik op deze knop om te controleren op maprechten en deze aan te passen"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:370
+#: src/plugins/clamd/clamav_plugin_gtk.c:360
 msgid "Remote Host"
 msgstr "Server"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:378
+#: src/plugins/clamd/clamav_plugin_gtk.c:368
 msgid "Hostname or IP for remote host running clamav daemon"
 msgstr "Hostnaam of IP voor de server die de clamav daemon draait"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:398
+#: src/plugins/clamd/clamav_plugin_gtk.c:387
 msgid "Port number where clamav daemon is listening"
 msgstr "Poortnummer waarop de clamav daemon luistert"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:525
+#: src/plugins/clamd/clamav_plugin_gtk.c:513
 msgid ""
 "New config\n"
 "No socket information.\n"
@@ -9891,7 +10015,7 @@ msgstr ""
 "Geen socket-informatie.\n"
 "Antivirus uitgezet."
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:529
+#: src/plugins/clamd/clamav_plugin_gtk.c:517
 msgid ""
 "New config\n"
 "Clamd does not respond to ping.\n"
@@ -9901,7 +10025,7 @@ msgstr ""
 "Clamd reageert niet op ping.\n"
 "Draait clamd wel?"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:121
+#: src/plugins/clamd/libclamd/clamd-plugin.c:122
 #, c-format
 msgid ""
 "%s: Unable to open\n"
@@ -9910,7 +10034,7 @@ msgstr ""
 "%s: Niet in staat te openen\n"
 "clamd wordt uitgezet"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:216
+#: src/plugins/clamd/libclamd/clamd-plugin.c:217
 #, c-format
 msgid ""
 "%s: Not able to find required information\n"
@@ -9919,30 +10043,30 @@ msgstr ""
 "%s: Niet in staat de benodigde informatie te vinden\n"
 "clamd wordt uitgezet"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:250
+#: src/plugins/clamd/libclamd/clamd-plugin.c:251
 msgid "Could not create socket"
 msgstr "Kon socket niet aanmaken"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:437
+#: src/plugins/clamd/libclamd/clamd-plugin.c:442
 msgid ": File does not exist"
 msgstr ": Bestand bestaat niet"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:450
+#: src/plugins/clamd/libclamd/clamd-plugin.c:455
 msgid ": Unable to open"
 msgstr ": Niet in staat te openen"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:470
-#: src/plugins/clamd/libclamd/clamd-plugin.c:475
-#: src/plugins/clamd/libclamd/clamd-plugin.c:489
+#: src/plugins/clamd/libclamd/clamd-plugin.c:474
+#: src/plugins/clamd/libclamd/clamd-plugin.c:479
+#: src/plugins/clamd/libclamd/clamd-plugin.c:493
 msgid "Socket write error"
 msgstr "Socket schrijffout"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:482
+#: src/plugins/clamd/libclamd/clamd-plugin.c:486
 #, c-format
 msgid "%s: Error reading"
 msgstr "%s: Fout bij lezen"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:496
+#: src/plugins/clamd/libclamd/clamd-plugin.c:500
 msgid "Socket read error"
 msgstr "Socket leesfout"
 
@@ -9965,65 +10089,66 @@ msgstr ""
 "Mail te schrijven. Het installeert een hook voor nieuwe log-uitvoer en "
 "schrijft die naar stdout.\n"
 "\n"
-"De plugin is als plugin niet echt echt nuttig"
+"De plugin is als plugin niet echt echt nuttig."
 
-#: src/plugins/fancy/fancy_prefs.c:146
+#: src/plugins/fancy/fancy_prefs.c:147
 msgid "Display images"
 msgstr "Afbeeldingen weergeven"
 
-#: src/plugins/fancy/fancy_prefs.c:147
+#: src/plugins/fancy/fancy_prefs.c:148
 msgid "Display embedded images"
 msgstr "Weergeven ingesloten afbeeldingen"
 
-#: src/plugins/fancy/fancy_prefs.c:151
+#: src/plugins/fancy/fancy_prefs.c:152
 msgid "Execute javascript"
 msgstr "Zet Javascript aan"
 
-#: src/plugins/fancy/fancy_prefs.c:152
+#: src/plugins/fancy/fancy_prefs.c:153
 msgid "Execute embedded javascript"
 msgstr "Ingesloten Javascript uitvoeren"
 
-#: src/plugins/fancy/fancy_prefs.c:156
+#: src/plugins/fancy/fancy_prefs.c:157
 msgid "Execute Java applets"
 msgstr "Java-applets uitvoeren"
 
-#: src/plugins/fancy/fancy_prefs.c:157
+#: src/plugins/fancy/fancy_prefs.c:158
 msgid "Execute embedded Java applets"
 msgstr "Ingesloten Java-applets uitvoeren"
 
-#: src/plugins/fancy/fancy_prefs.c:161
+#: src/plugins/fancy/fancy_prefs.c:162
 msgid "Render objects using plugins"
 msgstr "Toon objecten met behulp van plugins"
 
-#: src/plugins/fancy/fancy_prefs.c:162
+#: src/plugins/fancy/fancy_prefs.c:163
 msgid "Render embedded objects using plugins"
 msgstr "Toon ingesloten objecten met behulp van plugins"
 
-#: src/plugins/fancy/fancy_prefs.c:169
-msgid "Open in viewer (remote content is enabled)"
-msgstr "Open in browser (inhoud van de server wordt geladen)"
+#: src/plugins/fancy/fancy_prefs.c:170
+msgid "Open in Viewer (remote content is enabled)"
+msgstr "Open in browser (inhoud laden van de server is ingeschakeld)"
 
-#: src/plugins/fancy/fancy_prefs.c:172
+#: src/plugins/fancy/fancy_prefs.c:173
 msgid "Do nothing (remote content is disabled)"
 msgstr "Doe niets (inhoud van de server wordt niet geladen)"
 
-#: src/plugins/fancy/fancy_prefs.c:209
+#: src/plugins/fancy/fancy_prefs.c:210 src/prefs_account.c:3924
+#: src/prefs_proxy.c:241
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/plugins/fancy/fancy_prefs.c:211
+#: src/plugins/fancy/fancy_prefs.c:212
 msgid "Use GNOME's proxy settings"
-msgstr "Gebruik GNOME's proxy instellingen"
+msgstr "GNOME's proxy instellingen gebruiken"
 
-#: src/plugins/fancy/fancy_prefs.c:219
+#: src/plugins/fancy/fancy_prefs.c:220
 msgid "Use proxy"
-msgstr "Gebruik proxy"
+msgstr "Proxy gebruiken"
 
-#: src/plugins/fancy/fancy_prefs.c:237
+#: src/plugins/fancy/fancy_prefs.c:238
 msgid "Remote resources"
 msgstr "Bronnen van de server"
 
-#: src/plugins/fancy/fancy_prefs.c:238
+#: src/plugins/fancy/fancy_prefs.c:239
 msgid ""
 "Loading remote resources can lead to some privacy issues.\n"
 "When remote content loading is disabled, nothing will be requested\n"
@@ -10037,121 +10162,117 @@ msgstr ""
 "scripts, plugin-objecten of Java-applets kan nog steeds\n"
 "worden aangezet voor inhoud die is bijgevoegd in de e-mail."
 
-#: src/plugins/fancy/fancy_prefs.c:244
+#: src/plugins/fancy/fancy_prefs.c:245
 msgid "Enable loading of remote content"
 msgstr "Inhoud van de server laden"
 
-#: src/plugins/fancy/fancy_prefs.c:276
+#: src/plugins/fancy/fancy_prefs.c:277
 msgid "When clicking on a link, by default"
 msgstr "Bij klikken op een link, standaard"
 
-#: src/plugins/fancy/fancy_prefs.c:284
-msgid "Open in external browser"
+#: src/plugins/fancy/fancy_prefs.c:285
+msgid "Open in External Browser"
 msgstr "Open met externe browser"
 
-#: src/plugins/fancy/fancy_prefs.c:298
+#: src/plugins/fancy/fancy_prefs.c:299
 msgid "The CSS in this file will be applied to all HTML parts"
 msgstr "De CSS in dit bestand wordt toegepast op alle HTML-delen"
 
-#: src/plugins/fancy/fancy_prefs.c:308
+#: src/plugins/fancy/fancy_prefs.c:309
 #: src/plugins/notification/notification_prefs.c:1346
-#: src/plugins/pgpcore/prefs_gpg.c:209 src/plugins/rssyl/rssyl_prefs.c:186
-#: src/prefs_account.c:1478 src/prefs_account.c:1567 src/prefs_account.c:2055
+#: src/plugins/pgpcore/prefs_gpg.c:208 src/plugins/rssyl/rssyl_prefs.c:186
+#: src/prefs_account.c:1550 src/prefs_account.c:1639 src/prefs_account.c:2190
 #: src/prefs_customheader.c:236
 msgid "Bro_wse"
 msgstr "Bekijk"
 
-#: src/plugins/fancy/fancy_prefs.c:350
+#: src/plugins/fancy/fancy_prefs.c:351
 msgid "Select stylesheet"
 msgstr "Stijlblad selecteren"
 
-#: src/plugins/fancy/fancy_viewer.c:418
+#: src/plugins/fancy/fancy_viewer.c:409
 msgid "Remote content loading is disabled."
 msgstr "Inhoud van de server laden is uitgezet."
 
-#: src/plugins/fancy/fancy_viewer.c:497
+#: src/plugins/fancy/fancy_viewer.c:488
 msgid "Load images"
 msgstr "Laad afbeeldingen"
 
-#: src/plugins/fancy/fancy_viewer.c:499
+#: src/plugins/fancy/fancy_viewer.c:490
 msgid "Enable remote content"
 msgstr "Deblokkeer externe inhoud"
 
-#: src/plugins/fancy/fancy_viewer.c:501
+#: src/plugins/fancy/fancy_viewer.c:492
 msgid "Enable Javascript"
 msgstr "Zet Javascript Aan"
 
-#: src/plugins/fancy/fancy_viewer.c:503
+#: src/plugins/fancy/fancy_viewer.c:494
 msgid "Enable Plugins"
 msgstr "Zet Plugins Aan"
 
-#: src/plugins/fancy/fancy_viewer.c:505
+#: src/plugins/fancy/fancy_viewer.c:496
 msgid "Enable Java"
 msgstr "Java activeren"
 
-#: src/plugins/fancy/fancy_viewer.c:507
+#: src/plugins/fancy/fancy_viewer.c:498
 msgid "Open links with external browser"
 msgstr "Open links met externe browser"
 
-#: src/plugins/fancy/fancy_viewer.c:689
+#: src/plugins/fancy/fancy_viewer.c:673
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Een fout gebeurde: %d\n"
 
-#: src/plugins/fancy/fancy_viewer.c:745
+#: src/plugins/fancy/fancy_viewer.c:733
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr "%s is een foutgevormde of niet-ondersteunde feed"
 
-#: src/plugins/fancy/fancy_viewer.c:756
+#: src/plugins/fancy/fancy_viewer.c:744
 msgid "Search the Web"
 msgstr "Zoeken op het Web"
 
-#: src/plugins/fancy/fancy_viewer.c:768
+#: src/plugins/fancy/fancy_viewer.c:755
 msgid "Open in Viewer"
 msgstr "Open in Browser"
 
-#: src/plugins/fancy/fancy_viewer.c:770
-msgid "Open in Viewer (enable remote content)"
-msgstr "Open in Browser (laad inhoud van de server)"
-
-#: src/plugins/fancy/fancy_viewer.c:779
+#: src/plugins/fancy/fancy_viewer.c:764
 msgid "Open in Browser"
 msgstr "Open in Browser"
 
-#: src/plugins/fancy/fancy_viewer.c:789
+#: src/plugins/fancy/fancy_viewer.c:774
 msgid "Open Image"
 msgstr "Open Afbeelding"
 
-#: src/plugins/fancy/fancy_viewer.c:798
+#: src/plugins/fancy/fancy_viewer.c:783
 msgid "Copy Link"
 msgstr "Kopieer Koppeling"
 
-#: src/plugins/fancy/fancy_viewer.c:802
+#: src/plugins/fancy/fancy_viewer.c:787
 msgid "Download Link"
 msgstr "Haal Koppeling Op"
 
-#: src/plugins/fancy/fancy_viewer.c:813
+#: src/plugins/fancy/fancy_viewer.c:798
 msgid "Save Image As"
 msgstr "Sla Afbeelding Op Als"
 
-#: src/plugins/fancy/fancy_viewer.c:823
+#: src/plugins/fancy/fancy_viewer.c:808
 msgid "Copy Image"
 msgstr "Kopieer Afbeelding"
 
-#: src/plugins/fancy/fancy_viewer.c:841
+#: src/plugins/fancy/fancy_viewer.c:848
 msgid "Import feed"
 msgstr "Importeer feed"
 
-#: src/plugins/fancy/fancy_viewer.c:1120
+#: src/plugins/fancy/fancy_viewer.c:1130
 msgid "Fancy"
 msgstr "Fancy"
 
-#: src/plugins/fancy/fancy_viewer.c:1148
+#: src/plugins/fancy/fancy_viewer.c:1158
 msgid "Fancy HTML Viewer"
 msgstr "Fancy HTML Weergever"
 
-#: src/plugins/fancy/fancy_viewer.c:1153
+#: src/plugins/fancy/fancy_viewer.c:1163
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -10244,7 +10365,7 @@ msgid ""
 "RFC822 format"
 msgstr ""
 "Voegt de X-FETCH-TIME-header toe met de datum en tijd van het ophalen van "
-"het bericht in RFC822-opmaak"
+"het bericht in RFC822-format"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:130
 msgid "GData plugin: Authorization required"
@@ -10287,7 +10408,7 @@ msgstr "Invoeren code:"
 #: src/plugins/gdata/cm_gdata_contacts.c:329
 #, c-format
 msgid "GData plugin: Error querying for contacts: %s\n"
-msgstr "GData-plugin: Fout bij het ophalen van contacten: %s\n"
+msgstr "GData-plugin: Fout bij ophalen van contacten: %s\n"
 
 #. TRANSLATORS: First part of "Added X of Y contacts to cache"
 #: src/plugins/gdata/cm_gdata_contacts.c:345
@@ -10331,15 +10452,15 @@ msgstr "GData-plugin: Authorisatiefout: %s\n"
 msgid "GData plugin: Authorization successful\n"
 msgstr "GData-plugin: Authorisatie gelukt\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:464
+#: src/plugins/gdata/cm_gdata_contacts.c:474
 msgid "GData plugin: Starting interactive authorization\n"
 msgstr "GData-plugin: Starten interactieve authorisatie\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:474
+#: src/plugins/gdata/cm_gdata_contacts.c:481
 msgid "GData plugin: Got authorization code, requesting authorization\n"
 msgstr "GData-plugin: Authorisatiecode ontvangen, authorisatie aanvragen\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:481
+#: src/plugins/gdata/cm_gdata_contacts.c:488
 msgid ""
 "GData plugin: No authorization code received, authorization request "
 "cancelled\n"
@@ -10347,16 +10468,24 @@ msgstr ""
 "GData-plugin: Geen authorisatiecode ontvangen, authorisatie-aanvraag is "
 "geannuleerd\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:497
+#: src/plugins/gdata/cm_gdata_contacts.c:494
+msgid ""
+"GData plugin: Interactive authorization still running, no additional session "
+"started\n"
+msgstr ""
+"GData-plugin: Interactieve authorisatie loopt nog, geen extra sessie "
+"gestart\n"
+
+#: src/plugins/gdata/cm_gdata_contacts.c:511
 #, c-format
 msgid "GData plugin: Authorization refresh error: %s\n"
 msgstr "GData-plugin: Authorisatie-vernieuwingsfout: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:506
+#: src/plugins/gdata/cm_gdata_contacts.c:535
 msgid "GData plugin: Authorization refresh successful\n"
 msgstr "GData-plugin: Authorisatie-vernieuwing gelukt\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:566
+#: src/plugins/gdata/cm_gdata_contacts.c:595
 #, c-format
 msgid ""
 "GData plugin: Elapsed time since last refresh: %d minutes, refreshing now\n"
@@ -10364,17 +10493,17 @@ msgstr ""
 "GData plugin: Tijd sinds de laatste update: %d minuten, nu aan het "
 "vernieuwen\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:574
+#: src/plugins/gdata/cm_gdata_contacts.c:603
 msgid "GData plugin: Trying to refresh authorization\n"
 msgstr "GData-plugin: Starten van vernieuwing authorisatie\n"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:78
-#: src/plugins/managesieve/sieve_prefs.c:203 src/prefs_account.c:1786
+#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:1921
 msgid "Authentication"
 msgstr "Authenticatie"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:84
-#: src/plugins/spam_report/spam_report_prefs.c:172 src/wizard.c:1560
+#: src/plugins/spam_report/spam_report_prefs.c:172 src/wizard.c:1562
 msgid "Username:"
 msgstr "Gebruikersnaam:"
 
@@ -10423,30 +10552,30 @@ msgstr ""
 msgid "GData integration"
 msgstr "GData integratie"
 
-#: src/plugins/libravatar/libravatar.c:338
-#: src/plugins/libravatar/libravatar.c:403
-#: src/plugins/libravatar/libravatar.c:463
+#: src/plugins/libravatar/libravatar.c:332
+#: src/plugins/libravatar/libravatar.c:397
+#: src/plugins/libravatar/libravatar.c:457
 #: src/plugins/libravatar/libravatar_prefs.c:546
 msgid "Libravatar"
 msgstr "Libravatar"
 
-#: src/plugins/libravatar/libravatar.c:345
+#: src/plugins/libravatar/libravatar.c:339
 msgid "Failed to register avatar header update hook"
 msgstr "Registreren van 'avatar header update'-hook is mislukt"
 
-#: src/plugins/libravatar/libravatar.c:354
+#: src/plugins/libravatar/libravatar.c:348
 msgid "Failed to register avatar image render hook"
 msgstr "Registreren van 'avatar image render'-hook is mislukt"
 
-#: src/plugins/libravatar/libravatar.c:360
+#: src/plugins/libravatar/libravatar.c:354
 msgid "Failed to create avatar image cache directory"
 msgstr "Avatar afbeeldingscache aanmaken mislukt"
 
-#: src/plugins/libravatar/libravatar.c:370
+#: src/plugins/libravatar/libravatar.c:364
 msgid "Failed to load missing items cache"
 msgstr "Missende items cache laden mislukt"
 
-#: src/plugins/libravatar/libravatar.c:413
+#: src/plugins/libravatar/libravatar.c:407
 msgid ""
 "Display libravatar profiles' images for mail messages. More\n"
 "info about libravatar at http://www.libravatar.org/. If you have\n"
@@ -10526,7 +10655,7 @@ msgid ""
 "• %u files failed to be read.\n"
 "• %u files couldn't be removed."
 msgstr ""
-"Fouten bij het wissen van de pictogramcache:\n"
+"Fouten bij wissen van de pictogramcache:\n"
 "• %u missende pictogrammen verwijderd.\n"
 "• %u bestanden verwijderd.\n"
 "• %u bestanden konden niet gelezen worden.\n"
@@ -10534,7 +10663,7 @@ msgstr ""
 
 #: src/plugins/libravatar/libravatar_prefs.c:198
 msgid "Error clearing icon cache."
-msgstr "Fout bij het wissen van de Pictogramcache."
+msgstr "Fout bij wissen van de pictogramcache."
 
 #: src/plugins/libravatar/libravatar_prefs.c:213
 msgid "_Use cached icons"
@@ -10544,7 +10673,7 @@ msgstr "_Gebruik gecachte pictogrammen"
 msgid ""
 "Keep icons on disk for reusing instead of making another network request"
 msgstr ""
-"Bewaar pictogrammen op harde schijf voor hergebruik ipv. een nieuwe "
+"Bewaar pictogrammen op harde schijf voor hergebruik i.p.v. een nieuwe "
 "netwerkaanvraag te maken"
 
 #: src/plugins/libravatar/libravatar_prefs.c:229
@@ -10552,8 +10681,8 @@ msgid "Cache refresh interval"
 msgstr "Cache verversingsinterval"
 
 #: src/plugins/libravatar/libravatar_prefs.c:229
-#: src/plugins/vcalendar/vcal_prefs.c:323 src/prefs_account.c:1523
-#: src/prefs_matcher.c:336 src/prefs_receive.c:177
+#: src/plugins/vcalendar/vcal_prefs.c:323 src/prefs_account.c:1595
+#: src/prefs_account.c:1752 src/prefs_matcher.c:340 src/prefs_receive.c:180
 msgid "hours"
 msgstr "uur"
 
@@ -10674,7 +10803,7 @@ msgstr "mailmbox map"
 
 #: src/plugins/mailmbox/plugin.c:63
 msgid "This is a plugin to handle mailboxes in mbox format."
-msgstr "Dit is een plugin die inboxen in mbox-formaat afhandelt."
+msgstr "Dit is een plugin die inboxen in mbox-format afhandelt."
 
 #: src/plugins/mailmbox/plugin.c:84
 msgid "MBOX"
@@ -10686,7 +10815,7 @@ msgid ""
 "If the existing mailbox is specified, it will be\n"
 "scanned automatically."
 msgstr ""
-"Geef de locatie van het postvak.\n"
+"Geef de locatie van het postvak op.\n"
 "Als een bestaand postvak wordt ingevuld,\n"
 "dan wordt hij automatisch gescand."
 
@@ -10699,70 +10828,70 @@ msgstr ""
 "Alle map(pen) en bericht(en) onder '%s' zullen worden verwijderd.\n"
 "Wil je werkelijk verwijderen?"
 
-#: src/plugins/managesieve/managesieve.c:435
+#: src/plugins/managesieve/managesieve.c:436
 msgid "No Sieve auth method available\n"
 msgstr "Sieve-auth-methode niet beschikbaar\n"
 
-#: src/plugins/managesieve/managesieve.c:439
+#: src/plugins/managesieve/managesieve.c:440
 msgid "Selected Sieve auth method not available\n"
 msgstr "Geselecteerde Sieve-auth-methode niet beschikbaar\n"
 
-#: src/plugins/managesieve/managesieve.c:672
+#: src/plugins/managesieve/managesieve.c:673
 msgid "Disconnected"
 msgstr "Verbinding verbroken"
 
-#: src/plugins/managesieve/managesieve.c:676
+#: src/plugins/managesieve/managesieve.c:677
 #, c-format
 msgid "Disconnected: %s"
 msgstr "Verbinding verbroken: %s"
 
-#: src/plugins/managesieve/managesieve.c:725
-#: src/plugins/managesieve/managesieve.c:870
+#: src/plugins/managesieve/managesieve.c:726
+#: src/plugins/managesieve/managesieve.c:871
 #, c-format
 msgid "unhandled message on Sieve session: %s\n"
 msgstr "onbehandeld bericht in Sieve-sessie: %s\n"
 
-#: src/plugins/managesieve/managesieve.c:732
+#: src/plugins/managesieve/managesieve.c:733
 msgid "STARTTLS failed"
 msgstr "STARTTLS mislukt"
 
-#: src/plugins/managesieve/managesieve.c:797
-#: src/plugins/managesieve/managesieve.c:813
-#: src/plugins/managesieve/managesieve.c:840
-#: src/plugins/managesieve/managesieve.c:922
-#: src/plugins/managesieve/managesieve.c:940
+#: src/plugins/managesieve/managesieve.c:798
+#: src/plugins/managesieve/managesieve.c:814
+#: src/plugins/managesieve/managesieve.c:841
+#: src/plugins/managesieve/managesieve.c:923
+#: src/plugins/managesieve/managesieve.c:941
 msgid "error occurred on SIEVE session\n"
 msgstr "er is een fout opgetreden tijdens de SIEVE-sessie\n"
 
-#: src/plugins/managesieve/managesieve.c:866
+#: src/plugins/managesieve/managesieve.c:867
 #, c-format
 msgid "error occurred on Sieve session. data: %s\n"
 msgstr "er is een fout opgetreden tijdens de Sieve-sessie. data: %s\n"
 
-#: src/plugins/managesieve/managesieve.c:875
+#: src/plugins/managesieve/managesieve.c:876
 #, c-format
 msgid "unhandled message on Sieve session: %d\n"
 msgstr "onbehandeld bericht in Sieve-sessie: %d\n"
 
-#: src/plugins/managesieve/managesieve.c:1132
+#: src/plugins/managesieve/managesieve.c:1153
 msgid "Sieve: retrying auth\n"
 msgstr "Sieve: auth opnieuw proberen\n"
 
-#: src/plugins/managesieve/managesieve.c:1134
+#: src/plugins/managesieve/managesieve.c:1155
 msgid "Auth method not available"
 msgstr "Auth-methode niet beschikbaar"
 
-#: src/plugins/managesieve/managesieve.c:1151
+#: src/plugins/managesieve/managesieve.c:1172
 #, c-format
 msgid "sending error on Sieve session: %s\n"
 msgstr "verzendfout in Sieve-sessie: %s\n"
 
-#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5676
+#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5830
 msgid "_Filter"
 msgstr "_Filter"
 
 #: src/plugins/managesieve/sieve_editor.c:86
-#: src/plugins/managesieve/sieve_editor.c:630
+#: src/plugins/managesieve/sieve_editor.c:632
 msgid "Chec_k Syntax"
 msgstr "Co_ntroleer Syntax"
 
@@ -10771,8 +10900,8 @@ msgid "Re_vert"
 msgstr "Teru_gdraaien"
 
 #: src/plugins/managesieve/sieve_editor.c:296
-#: src/plugins/managesieve/sieve_editor.c:722
-#: src/plugins/managesieve/sieve_manager.c:182
+#: src/plugins/managesieve/sieve_editor.c:724
+#: src/plugins/managesieve/sieve_manager.c:183
 msgid "Unable to get script contents"
 msgstr "Kon scriptinhoud niet verkrijgen"
 
@@ -10804,67 +10933,67 @@ msgstr "Opslaan..."
 msgid "Checking syntax..."
 msgstr "Syntax wordt geverifieerd..."
 
-#: src/plugins/managesieve/sieve_editor.c:432
+#: src/plugins/managesieve/sieve_editor.c:433
 msgid "This script has been modified. Save the latest changes?"
 msgstr "Dit script is gewijzigd. Veranderingen opslaan?"
 
-#: src/plugins/managesieve/sieve_editor.c:693
+#: src/plugins/managesieve/sieve_editor.c:695
 #, c-format
 msgid "%s - Sieve Filter%s"
 msgstr "%s - Sieve-filter%s"
 
-#: src/plugins/managesieve/sieve_editor.c:742
-#: src/plugins/pdf_viewer/poppler_viewer.c:1282
+#: src/plugins/managesieve/sieve_editor.c:744
+#: src/plugins/pdf_viewer/poppler_viewer.c:1315
 msgid "Loading..."
 msgstr "Laden..."
 
-#: src/plugins/managesieve/sieve_manager.c:159
-#: src/plugins/managesieve/sieve_manager.c:241
+#: src/plugins/managesieve/sieve_manager.c:160
+#: src/plugins/managesieve/sieve_manager.c:246
 msgid "Add Sieve script"
 msgstr "Toevoegen Sieve-script"
 
-#: src/plugins/managesieve/sieve_manager.c:160
+#: src/plugins/managesieve/sieve_manager.c:161
 msgid "Enter name for a new Sieve filter script."
 msgstr "Voer naam in van nieuw Sieve filterscript."
 
-#: src/plugins/managesieve/sieve_manager.c:242
+#: src/plugins/managesieve/sieve_manager.c:247
 msgid "Enter new name for the script."
 msgstr "Voer een nieuwe naam in voor het script."
 
-#: src/plugins/managesieve/sieve_manager.c:323
+#: src/plugins/managesieve/sieve_manager.c:328
 #, c-format
 msgid "Do you really want to delete the filter '%s'?"
 msgstr "Wil je werkelijk het filter '%s' verwijderen?"
 
-#: src/plugins/managesieve/sieve_manager.c:324
+#: src/plugins/managesieve/sieve_manager.c:329
 msgid "Delete filter"
 msgstr "Verwijder filter"
 
-#: src/plugins/managesieve/sieve_manager.c:478
+#: src/plugins/managesieve/sieve_manager.c:483
 msgid "Active"
 msgstr "Actief"
 
-#: src/plugins/managesieve/sieve_manager.c:489
+#: src/plugins/managesieve/sieve_manager.c:494
 msgid "An account can only have one active script at a time."
 msgstr "Een account kan maar één actief script tegelijkertijd hebben."
 
-#: src/plugins/managesieve/sieve_manager.c:576
+#: src/plugins/managesieve/sieve_manager.c:581
 msgid "Unable to connect"
 msgstr "Niet in staat te verbinden"
 
-#: src/plugins/managesieve/sieve_manager.c:623
+#: src/plugins/managesieve/sieve_manager.c:628
 msgid "Listing scripts..."
 msgstr "Lijst van  scripts weergeven..."
 
-#: src/plugins/managesieve/sieve_manager.c:626
+#: src/plugins/managesieve/sieve_manager.c:631
 msgid "Connecting..."
 msgstr "Verbinden..."
 
-#: src/plugins/managesieve/sieve_manager.c:658
+#: src/plugins/managesieve/sieve_manager.c:663
 msgid "Manage Sieve Filters"
 msgstr "Beheer Sieve-filters"
 
-#: src/plugins/managesieve/sieve_manager.c:800
+#: src/plugins/managesieve/sieve_manager.c:806
 msgid "To use Sieve, enable it in an account's preferences."
 msgstr "Om Sieve te gebruiken, activeer het in de voorkeuren van een account."
 
@@ -10885,109 +11014,110 @@ msgstr "Beheer sieve-filters op een server mbv. het ManageSieve-protocol."
 msgid "Enable Sieve"
 msgstr "Sieve activeren"
 
-#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1102
+#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1193
 msgid "Server information"
 msgstr "Serverinformatie"
 
-#: src/plugins/managesieve/sieve_prefs.c:165
+#: src/plugins/managesieve/sieve_prefs.c:163
 msgid "Server name"
 msgstr "Servernaam"
 
-#: src/plugins/managesieve/sieve_prefs.c:174
+#: src/plugins/managesieve/sieve_prefs.c:172
 msgid "Connect to this host instead of the host used for receiving mail"
 msgstr ""
-"Verbind met deze host ipv. de host gebruikt voor het ontvangen van e-mail"
+"Verbind met deze host i.p.v. de host gebruikt voor het ontvangen van e-mail"
 
-#: src/plugins/managesieve/sieve_prefs.c:178
+#: src/plugins/managesieve/sieve_prefs.c:176
 msgid "Server port"
 msgstr "Serverpoort"
 
-#: src/plugins/managesieve/sieve_prefs.c:185
+#: src/plugins/managesieve/sieve_prefs.c:183
 msgid "Connect to this port instead of the default"
-msgstr "Verbind met deze poort ipv. de standaardpoort"
+msgstr "Verbind met deze poort i.p.v. de standaardpoort"
 
-#: src/plugins/managesieve/sieve_prefs.c:189
+#: src/plugins/managesieve/sieve_prefs.c:187
 msgid "Encryption"
 msgstr "Versleuteling"
 
-#: src/plugins/managesieve/sieve_prefs.c:194
+#: src/plugins/managesieve/sieve_prefs.c:190
 msgid "No encryption"
 msgstr "Geen versleuteling"
 
-#: src/plugins/managesieve/sieve_prefs.c:196
+#: src/plugins/managesieve/sieve_prefs.c:192
 msgid "Use STARTTLS when available"
 msgstr "Gebruik STARTTLS wanneer beschikbaar"
 
-#: src/plugins/managesieve/sieve_prefs.c:198
+#: src/plugins/managesieve/sieve_prefs.c:194
 msgid "Require STARTTLS"
 msgstr "STARTTLS vereist"
 
-#: src/plugins/managesieve/sieve_prefs.c:206
-#: src/plugins/rssyl/rssyl_feed_props.c:262
+#: src/plugins/managesieve/sieve_prefs.c:202
+#: src/plugins/rssyl/rssyl_feed_props.c:268
 msgid "No authentication"
 msgstr "Geen authenticatie"
 
-#: src/plugins/managesieve/sieve_prefs.c:208
+#: src/plugins/managesieve/sieve_prefs.c:204
 msgid "Use same authentication as for receiving mail"
 msgstr "Gebruik dezelfde authenticatie als voor het ontvangen van e-mail"
 
-#: src/plugins/managesieve/sieve_prefs.c:210
+#: src/plugins/managesieve/sieve_prefs.c:206
 msgid "Specify authentication"
 msgstr "Geef authenticatie op"
 
-#: src/plugins/managesieve/sieve_prefs.c:240
+#: src/plugins/managesieve/sieve_prefs.c:236
 #: src/plugins/vcalendar/vcal_prefs.c:391
-#: src/plugins/vcalendar/vcal_prefs.c:510 src/prefs_account.c:1297
-#: src/prefs_account.c:1832
+#: src/plugins/vcalendar/vcal_prefs.c:510 src/prefs_account.c:1388
+#: src/prefs_account.c:1967
 msgid "User ID"
 msgstr "Gebruikersnaam"
 
-#: src/plugins/managesieve/sieve_prefs.c:250
-#: src/plugins/rssyl/rssyl_feed_props.c:393
+#: src/plugins/managesieve/sieve_prefs.c:246
+#: src/plugins/rssyl/rssyl_feed_props.c:383
 #: src/plugins/vcalendar/vcal_prefs.c:399
-#: src/plugins/vcalendar/vcal_prefs.c:518 src/prefs_account.c:1303
-#: src/prefs_account.c:1855 src/prefs_account.c:2583 src/prefs_account.c:2611
-#: src/wizard.c:1214 src/wizard.c:1634
+#: src/plugins/vcalendar/vcal_prefs.c:518 src/prefs_account.c:1394
+#: src/prefs_account.c:1990 src/prefs_account.c:2718 src/prefs_account.c:2746
+#: src/prefs_account.c:2943 src/prefs_proxy.c:134 src/wizard.c:1216
+#: src/wizard.c:1636
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: src/plugins/managesieve/sieve_prefs.c:266 src/prefs_account.c:1606
-#: src/prefs_account.c:1804
+#: src/plugins/managesieve/sieve_prefs.c:262 src/prefs_account.c:1678
+#: src/prefs_account.c:1939
 msgid "Authentication method"
 msgstr "Authenticatie-methode"
 
-#: src/plugins/managesieve/sieve_prefs.c:275 src/prefs_account.c:1616
-#: src/prefs_account.c:1813 src/prefs_send.c:261 src/prefs_send.c:332
-#: src/prefs_themes.c:1112
+#: src/plugins/managesieve/sieve_prefs.c:271 src/prefs_account.c:1688
+#: src/prefs_account.c:1948 src/prefs_send.c:265 src/prefs_send.c:336
+#: src/prefs_themes.c:1114
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: src/plugins/managesieve/sieve_prefs.c:394
+#: src/plugins/managesieve/sieve_prefs.c:390
 msgid "Sieve server must not contain a space."
 msgstr "Sieve-server mag geen spatie bevatten."
 
-#: src/plugins/managesieve/sieve_prefs.c:400
+#: src/plugins/managesieve/sieve_prefs.c:396
 msgid "Sieve server is not entered."
 msgstr "Je hebt geen Sieve-server opgegeven."
 
-#: src/plugins/managesieve/sieve_prefs.c:428
+#: src/plugins/managesieve/sieve_prefs.c:424
 msgid "Sieve"
 msgstr "Sieve"
 
-#: src/plugins/newmail/newmail.c:106 src/plugins/newmail/newmail.c:149
+#: src/plugins/newmail/newmail.c:107 src/plugins/newmail/newmail.c:150
 msgid "NewMail"
 msgstr "Nieuwe Mail"
 
-#: src/plugins/newmail/newmail.c:111
+#: src/plugins/newmail/newmail.c:112
 msgid "Failed to register newmail hook"
 msgstr "Registreren van 'newmail'-hook is mislukt"
 
-#: src/plugins/newmail/newmail.c:128
+#: src/plugins/newmail/newmail.c:129
 #, c-format
 msgid "Could not open log file %s: %s\n"
 msgstr "Kon logbestand %s niet openen: %s\n"
 
-#: src/plugins/newmail/newmail.c:141
+#: src/plugins/newmail/newmail.c:142
 #, c-format
 msgid ""
 "This plugin writes a header summary to a log file for each mail received "
@@ -11004,11 +11134,11 @@ msgstr ""
 "\n"
 "Huidige log is %s"
 
-#: src/plugins/newmail/newmail.c:175
+#: src/plugins/newmail/newmail.c:176
 msgid "Log file"
 msgstr "Logbestand"
 
-#: src/plugins/notification/notification_banner.c:356
+#: src/plugins/notification/notification_banner.c:357
 msgid "Folder:"
 msgstr "Map:"
 
@@ -11203,8 +11333,8 @@ msgstr "Banner"
 msgid "Popup"
 msgstr "Popup"
 
-#: src/plugins/notification/notification_prefs.c:470 src/prefs_actions.c:263
-#: src/prefs_receive.c:152
+#: src/plugins/notification/notification_prefs.c:470 src/prefs_actions.c:265
+#: src/prefs_receive.c:155
 msgid "Command"
 msgstr "Opdracht"
 
@@ -11258,20 +11388,20 @@ msgstr "Stel windowmanager hint in wanneer er ongelezen berichten zijn"
 
 #: src/plugins/notification/notification_prefs.c:687
 msgid "Use sound theme"
-msgstr "Gebruik geluids-thema"
+msgstr "Geluids-thema gebruiken"
 
 #: src/plugins/notification/notification_prefs.c:761
 msgid "Show banner"
 msgstr "Laat banner zien"
 
 #: src/plugins/notification/notification_prefs.c:766
-#: src/plugins/pgpcore/select-keys.c:240 src/plugins/pgpcore/sgpgme.c:147
-#: src/prefs_receive.c:228
+#: src/plugins/pgpcore/select-keys.c:234 src/plugins/pgpcore/sgpgme.c:148
+#: src/prefs_receive.c:231
 msgid "Never"
 msgstr "Nooit"
 
-#: src/plugins/notification/notification_prefs.c:768 src/prefs_receive.c:226
-#: src/prefs_summaries.c:493 src/prefs_summaries.c:503
+#: src/plugins/notification/notification_prefs.c:768 src/prefs_receive.c:229
+#: src/prefs_summaries.c:523 src/prefs_summaries.c:576
 msgid "Always"
 msgstr "Altijd"
 
@@ -11332,7 +11462,7 @@ msgstr "Bannerkleuren"
 #: src/plugins/notification/notification_prefs.c:901
 #: src/plugins/notification/notification_prefs.c:1122
 msgid "Use custom colors"
-msgstr "Gebruik aangepaste kleuren"
+msgstr "Gebruik eigen kleuren"
 
 #: src/plugins/notification/notification_prefs.c:916
 #: src/plugins/notification/notification_prefs.c:1135
@@ -11342,19 +11472,19 @@ msgstr "Voorgrond"
 #: src/plugins/notification/notification_prefs.c:922
 #: src/plugins/notification/notification_prefs.c:1141
 msgid "Foreground color"
-msgstr "Voorgrond kleur"
+msgstr "Voorgrondkleur"
 
 #: src/plugins/notification/notification_prefs.c:927
 #: src/plugins/notification/notification_prefs.c:1146
-#: src/prefs_msg_colors.c:276 src/prefs_msg_colors.c:296
-#: src/prefs_msg_colors.c:316
+#: src/prefs_msg_colors.c:260 src/prefs_msg_colors.c:273
+#: src/prefs_msg_colors.c:286
 msgid "Background"
 msgstr "Achtergrond"
 
 #: src/plugins/notification/notification_prefs.c:933
 #: src/plugins/notification/notification_prefs.c:1152
 msgid "Background color"
-msgstr "Achtergrond kleur"
+msgstr "Achtergrondkleur"
 
 #: src/plugins/notification/notification_prefs.c:1045
 #: src/plugins/notification/notification_prefs.c:1646
@@ -11366,14 +11496,6 @@ msgstr "Zet popup aan"
 msgid "Popup timeout"
 msgstr "Popup verlooptijd"
 
-#: src/plugins/notification/notification_prefs.c:1072
-#: src/plugins/notification/notification_prefs.c:1367
-#: src/plugins/notification/notification_prefs.c:1673
-#: src/plugins/spamassassin/spamassassin_gtk.c:391 src/prefs_other.c:574
-#: src/prefs_receive.c:200 src/prefs_summaries.c:542
-msgid "seconds"
-msgstr "seconden"
-
 #: src/plugins/notification/notification_prefs.c:1101
 msgid "Make popup sticky"
 msgstr "Maak popup klevend"
@@ -11407,7 +11529,7 @@ msgstr "Selecteer opdracht"
 msgid "Enable command"
 msgstr "Zet programma aan"
 
-#: src/plugins/notification/notification_prefs.c:1339
+#: src/plugins/notification/notification_prefs.c:1339 src/prefs_receive.c:268
 msgid "Command to execute"
 msgstr "Programma om uit te voeren"
 
@@ -11558,129 +11680,129 @@ msgid_plural "%d new articles in RSS feeds arrived"
 msgstr[0] "%d nieuw artikel in RSS-feeds aangekomen"
 msgstr[1] "%d nieuwe artikelen in RSS-feeds aangekomen"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:701
+#: src/plugins/pdf_viewer/poppler_viewer.c:704
 msgid "Title:"
 msgstr "Titel:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:703
+#: src/plugins/pdf_viewer/poppler_viewer.c:706
 msgid "Author:"
-msgstr "Auteur: "
+msgstr "Auteur:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:705
+#: src/plugins/pdf_viewer/poppler_viewer.c:708
 msgid "Creator:"
-msgstr "Maker"
+msgstr "Maker:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:706
+#: src/plugins/pdf_viewer/poppler_viewer.c:709
 msgid "Producer:"
 msgstr "Producent:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:709
+#: src/plugins/pdf_viewer/poppler_viewer.c:712
 msgid "Created:"
 msgstr "Aangemaakt:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:713
+#: src/plugins/pdf_viewer/poppler_viewer.c:716
 msgid "Modified:"
 msgstr "Gewijzigd:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:716
+#: src/plugins/pdf_viewer/poppler_viewer.c:719
 msgid "Format:"
-msgstr "Formaat:"
+msgstr "Format:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:718
 #: src/plugins/pdf_viewer/poppler_viewer.c:721
+#: src/plugins/pdf_viewer/poppler_viewer.c:724
 msgid "Optimized:"
 msgstr "Geoptimaliseerd:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1185
+#: src/plugins/pdf_viewer/poppler_viewer.c:1217
 msgid "PDF properties"
 msgstr "PDF-eigenschappen"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1333
+#: src/plugins/pdf_viewer/poppler_viewer.c:1366
 msgid "Enter password"
 msgstr "Invoeren wachtwoord"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1334
+#: src/plugins/pdf_viewer/poppler_viewer.c:1367
 msgid ""
 "This document is locked and requires a password before it can be opened."
 msgstr ""
 "Dit document is beveiligd en vereist een wachtwoord om geopend te worden."
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1349
+#: src/plugins/pdf_viewer/poppler_viewer.c:1382
 #, c-format
 msgid "%s Document"
 msgstr "%s Document"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1355
+#: src/plugins/pdf_viewer/poppler_viewer.c:1388
 #, c-format
 msgid "of %d"
 msgstr "van %d"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1371
+#: src/plugins/pdf_viewer/poppler_viewer.c:1404
 msgid "PDF rendering failed for an unknown reason."
 msgstr "PDF-weergave is om een onbekende reden mislukt."
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1735
-#: src/plugins/pdf_viewer/poppler_viewer.c:1950
+#: src/plugins/pdf_viewer/poppler_viewer.c:1776
+#: src/plugins/pdf_viewer/poppler_viewer.c:1993
 msgid "Document Index"
 msgstr "Inhoudsopgave"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1915
+#: src/plugins/pdf_viewer/poppler_viewer.c:1958
 msgid "First Page"
 msgstr "Eerste Pagina"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1918
+#: src/plugins/pdf_viewer/poppler_viewer.c:1961
 msgid "Previous Page"
 msgstr "Vorige Pagina"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1921
+#: src/plugins/pdf_viewer/poppler_viewer.c:1964
 msgid "Next Page"
 msgstr "Volgende Pagina"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1924
+#: src/plugins/pdf_viewer/poppler_viewer.c:1967
 msgid "Last Page"
 msgstr "Laatste Pagina"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1927
+#: src/plugins/pdf_viewer/poppler_viewer.c:1970
 msgid "Zoom In"
 msgstr "Zoom in"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1929
+#: src/plugins/pdf_viewer/poppler_viewer.c:1972
 msgid "Zoom Out"
 msgstr "Zoom uit"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1932
+#: src/plugins/pdf_viewer/poppler_viewer.c:1975
 msgid "Fit Page"
 msgstr "Passend"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1935
+#: src/plugins/pdf_viewer/poppler_viewer.c:1978
 msgid "Fit Page Width"
 msgstr "Paginabreed passend"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1938
+#: src/plugins/pdf_viewer/poppler_viewer.c:1981
 msgid "Rotate Left"
 msgstr "Roteer naar links"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1941
+#: src/plugins/pdf_viewer/poppler_viewer.c:1984
 msgid "Rotate Right"
 msgstr "Roteer naar rechts"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1944
+#: src/plugins/pdf_viewer/poppler_viewer.c:1987
 msgid "Print Document"
 msgstr "Document afdrukken"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1947
+#: src/plugins/pdf_viewer/poppler_viewer.c:1990
 msgid "Document Info"
 msgstr "Document Info"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1952
+#: src/plugins/pdf_viewer/poppler_viewer.c:1995
 msgid "Page Number"
 msgstr "Pagina Nummer"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1954
+#: src/plugins/pdf_viewer/poppler_viewer.c:1997
 msgid "Zoom Factor"
 msgstr "Zoom Factor"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2064
+#: src/plugins/pdf_viewer/poppler_viewer.c:2108
 #, c-format
 msgid ""
 "This plugin enables the viewing of PDF and PostScript attachments using the "
@@ -11688,18 +11810,18 @@ msgid ""
 "\n"
 "Any feedback is welcome: iwkse at claws-mail.org"
 msgstr ""
-"Deze plugin maakt het mogelijk om PDF- en PostScript-bijvoegsels te bekijken "
+"Deze plugin maakt het mogelijk om PDF- en PostScript-bijlages te bekijken "
 "met behulp van de Poppler %s bibliotheek en het gs-gereedschap.\n"
 "\n"
 "Feedback is welkom: iwkse at claws-mail.org"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2070
-#: src/plugins/pdf_viewer/poppler_viewer.c:2078
-#: src/plugins/pdf_viewer/poppler_viewer.c:2098
+#: src/plugins/pdf_viewer/poppler_viewer.c:2114
+#: src/plugins/pdf_viewer/poppler_viewer.c:2122
+#: src/plugins/pdf_viewer/poppler_viewer.c:2142
 msgid "PDF Viewer"
 msgstr "PDF Lezer"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2074
+#: src/plugins/pdf_viewer/poppler_viewer.c:2118
 #, c-format
 msgid ""
 "Warning: could not find ghostscript binary (gs) required for %s plugin to "
@@ -11709,8 +11831,8 @@ msgid ""
 "%s"
 msgstr ""
 "Waarschuwing: kon het ghostscript-programma (gs) niet vinden. Deze is nodig "
-"om via de %s plugin PostScript bijvoegsels te bekijken. Nu kunnen alleen PDF-"
-"bijvoegsels worden getoond. Om PostScript te ondersteunen kun je het gs-"
+"om via de %s plugin PostScript-bijlages te bekijken. Nu kunnen alleen PDF-"
+"bijlages worden getoond. Om PostScript te ondersteunen kun je het gs-"
 "programma installeren.\n"
 "\n"
 "%s"
@@ -11727,29 +11849,29 @@ msgstr "Registreren van 'PGP address autocompletion'-hook is mislukt"
 msgid "Passphrase"
 msgstr "Wachtwoord"
 
-#: src/plugins/pgpcore/passphrase.c:248
+#: src/plugins/pgpcore/passphrase.c:249
 msgid "[no user id]"
-msgstr "[geen gebruikersnaam]"
+msgstr "[geen gebruikers-ID]"
 
 # c-format
-#: src/plugins/pgpcore/passphrase.c:260
+#: src/plugins/pgpcore/passphrase.c:261
 msgid "Please enter the passphrase for the new key:"
 msgstr "Geef het wachtwoord voor de nieuwe sleutel:"
 
-#: src/plugins/pgpcore/passphrase.c:263
+#: src/plugins/pgpcore/passphrase.c:264
 msgid "Passphrases did not match.\n"
 msgstr "Wachtwoord was niet hetzelfde.\n"
 
 # c-format
-#: src/plugins/pgpcore/passphrase.c:267
+#: src/plugins/pgpcore/passphrase.c:268
 msgid "Please re-enter the passphrase for the new key:"
 msgstr "Geef nogmaals het wachtwoord voor de nieuwe sleutel:"
 
-#: src/plugins/pgpcore/passphrase.c:272
+#: src/plugins/pgpcore/passphrase.c:273
 msgid "Please enter the passphrase for:"
 msgstr "Geef het wachtwoord voor:"
 
-#: src/plugins/pgpcore/passphrase.c:275
+#: src/plugins/pgpcore/passphrase.c:276
 msgid "Bad passphrase.\n"
 msgstr "Fout wachtwoord. Probeer opnieuw...\n"
 
@@ -11884,329 +12006,329 @@ msgstr "Wachtwoord opslaan in geheugen"
 msgid "Expire after"
 msgstr "Verwijder na"
 
-#: src/plugins/pgpcore/prefs_gpg.c:179
+#: src/plugins/pgpcore/prefs_gpg.c:178
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr ""
 "Instellen op 0 zal het wachtwoord voor de hele\n"
 "sessie opslaan"
 
-#: src/plugins/pgpcore/prefs_gpg.c:183 src/plugins/rssyl/rssyl_feed_props.c:474
-#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1921
-#: src/prefs_receive.c:187
+#: src/plugins/pgpcore/prefs_gpg.c:182 src/plugins/rssyl/rssyl_feed_props.c:464
+#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1759
+#: src/prefs_account.c:2056 src/prefs_receive.c:190
 msgid "minutes"
 msgstr "minuten"
 
-#: src/plugins/pgpcore/prefs_gpg.c:193
+#: src/plugins/pgpcore/prefs_gpg.c:192
 msgid "Grab input while entering a passphrase"
 msgstr "Houd het toetsenbord vast tijdens het intikken van het wachtwoord"
 
-#: src/plugins/pgpcore/prefs_gpg.c:200
+#: src/plugins/pgpcore/prefs_gpg.c:199
 msgid "Display warning on start-up if GnuPG doesn't work"
 msgstr "Waarschuwing bij het opstarten als GnuPG niet werkt"
 
-#: src/plugins/pgpcore/prefs_gpg.c:203
+#: src/plugins/pgpcore/prefs_gpg.c:202
 msgid "Path to GnuPG executable"
 msgstr "Pad naar het GnuPG-programma"
 
-#: src/plugins/pgpcore/prefs_gpg.c:208
+#: src/plugins/pgpcore/prefs_gpg.c:207
 msgid ""
 "If left blank the location of the GnuPG executable will be automatically "
 "determined."
 msgstr ""
 "Bij leeglaten wordt de locatie van het GnuPG-programma automatisch bepaald."
 
-#: src/plugins/pgpcore/prefs_gpg.c:249
+#: src/plugins/pgpcore/prefs_gpg.c:248
 msgid "Select GnuPG executable"
 msgstr "Selecteer GnuPG-programma"
 
-#: src/plugins/pgpcore/prefs_gpg.c:361
+#: src/plugins/pgpcore/prefs_gpg.c:358
 msgid "Sign key"
-msgstr "Signeersleutel"
+msgstr "Ondertekenleutel"
 
-#: src/plugins/pgpcore/prefs_gpg.c:369
+#: src/plugins/pgpcore/prefs_gpg.c:366
 msgid "Use default GnuPG key"
 msgstr "Gebruik standaard GnuPG-sleutel"
 
-#: src/plugins/pgpcore/prefs_gpg.c:380
+#: src/plugins/pgpcore/prefs_gpg.c:377
 msgid "Select key by your email address"
 msgstr "Selecteer sleutel volgens e-mailadres"
 
-#: src/plugins/pgpcore/prefs_gpg.c:391
+#: src/plugins/pgpcore/prefs_gpg.c:388
 msgid "Specify key manually"
 msgstr "Specificeer sleutel zelf"
 
-#: src/plugins/pgpcore/prefs_gpg.c:401
+#: src/plugins/pgpcore/prefs_gpg.c:398
 msgid "User or key ID:"
 msgstr "Gebruikers- of sleutel-ID:"
 
-#: src/plugins/pgpcore/prefs_gpg.c:445
+#: src/plugins/pgpcore/prefs_gpg.c:442
 msgid "No secret key found."
 msgstr "Geen geheime sleutel gevonden."
 
-#: src/plugins/pgpcore/prefs_gpg.c:448
+#: src/plugins/pgpcore/prefs_gpg.c:445
 msgid "Generate a new key pair"
 msgstr "Genereer een nieuw sleutelpaar"
 
-#: src/plugins/pgpcore/prefs_gpg.c:687
+#: src/plugins/pgpcore/prefs_gpg.c:688
 msgid "GPG"
 msgstr "GPG"
 
-#: src/plugins/pgpcore/prefs_gpg.c:707 src/plugins/smime/plugin.c:38
-#: src/plugins/smime/plugin.c:54 src/plugins/smime/smime.c:913
+#: src/plugins/pgpcore/prefs_gpg.c:708 src/plugins/smime/plugin.c:38
+#: src/plugins/smime/plugin.c:54 src/plugins/smime/smime.c:920
 msgid "S/MIME"
 msgstr "S/MIME"
 
-#: src/plugins/pgpcore/select-keys.c:94
+#: src/plugins/pgpcore/select-keys.c:98
 #, c-format
 msgid "No exact match for '%s'; please select the key."
 msgstr "Geen exacte overeenkomst gevonden voor '%s', selecteer de sleutel."
 
-#: src/plugins/pgpcore/select-keys.c:97
+#: src/plugins/pgpcore/select-keys.c:101
 #, c-format
 msgid "Collecting info for '%s' ... %c"
 msgstr "Info wordt verzameld voor '%s' ... %c"
 
-#: src/plugins/pgpcore/select-keys.c:237 src/plugins/pgpcore/sgpgme.c:145
+#: src/plugins/pgpcore/select-keys.c:231 src/plugins/pgpcore/sgpgme.c:146
 msgid "Undefined"
 msgstr "Niet gedefiniëerd"
 
-#: src/plugins/pgpcore/select-keys.c:243 src/plugins/pgpcore/sgpgme.c:149
-#: src/plugins/pgpcore/sgpgme.c:165
+#: src/plugins/pgpcore/select-keys.c:237 src/plugins/pgpcore/sgpgme.c:150
+#: src/plugins/pgpcore/sgpgme.c:166
 msgid "Marginal"
 msgstr "Marginaal"
 
-#: src/plugins/pgpcore/select-keys.c:249 src/plugins/pgpcore/sgpgme.c:153
-#: src/plugins/pgpcore/sgpgme.c:169
+#: src/plugins/pgpcore/select-keys.c:243 src/plugins/pgpcore/sgpgme.c:154
+#: src/plugins/pgpcore/sgpgme.c:170
 msgid "Ultimate"
 msgstr "Ultiem"
 
-#: src/plugins/pgpcore/select-keys.c:381
+#: src/plugins/pgpcore/select-keys.c:408
 msgid "Select Keys"
 msgstr "Selecteer sleutels"
 
-#: src/plugins/pgpcore/select-keys.c:408
+#: src/plugins/pgpcore/select-keys.c:458
 msgid "Key ID"
 msgstr "Sleutel-ID"
 
-#: src/plugins/pgpcore/select-keys.c:411
+#: src/plugins/pgpcore/select-keys.c:476
 msgid "Trust"
 msgstr "Vertrouw"
 
-#: src/plugins/pgpcore/select-keys.c:436
+#: src/plugins/pgpcore/select-keys.c:495
 msgid "_Other"
 msgstr "D_iversen"
 
-#: src/plugins/pgpcore/select-keys.c:437
+#: src/plugins/pgpcore/select-keys.c:496
 msgid "Do_n't encrypt"
 msgstr "_Niet versleutelen"
 
-#: src/plugins/pgpcore/select-keys.c:596
+#: src/plugins/pgpcore/select-keys.c:677
 msgid "Add key"
 msgstr "Sleutel toevoegen"
 
-#: src/plugins/pgpcore/select-keys.c:597
+#: src/plugins/pgpcore/select-keys.c:678
 msgid "Enter another user or key ID:"
-msgstr "Kies een ander gebruikers- of sleutel-ID"
+msgstr "Kies een ander gebruikers- of sleutel-ID:"
 
-#: src/plugins/pgpcore/select-keys.c:619
+#: src/plugins/pgpcore/select-keys.c:700
 #, c-format
 msgid "Encrypt to %s <%s>"
 msgstr "Versleutelen naar %s <%s>"
 
-#: src/plugins/pgpcore/select-keys.c:620
+#: src/plugins/pgpcore/select-keys.c:701
 #, c-format
 msgid ""
 "This encryption key is not fully trusted.\n"
 "If you choose to encrypt the message with this key, you don't\n"
 "know for sure that it will go to the person you mean it to.\n"
 "\n"
-"Key details: ID %s, primary identity %s <%s>\n"
+"Key details: ID %s, primary identity %s <%s>\n"
 "\n"
 "Do you trust this key enough to use it anyway?"
 msgstr ""
 "De sleutel wordt niet volledig vertrouwd.\n"
-"Als je kiest om dit bericht te versleutelen met deze sleutel, weet je niet "
+"Als je kiest om het bericht te versleutelen met deze sleutel, weet je niet "
 "zeker\n"
 "of dit bericht daadwerkelijk naar de persoon gaat die je bedoelt.\n"
 "\n"
-"Sleutel-details: ID %s, primaire identiteit %s <%s>\n"
+"Sleutel-details: ID %s, primaire identiteit %s <%s>\n"
 "\n"
 "Vertrouw je deze sleutel genoeg om hem toch te gebruiken?"
 
-#: src/plugins/pgpcore/sgpgme.c:83 src/privacy.c:249 src/privacy.c:253
+#: src/plugins/pgpcore/sgpgme.c:84 src/privacy.c:249 src/privacy.c:253
 #: src/privacy.c:270 src/privacy.c:274
 msgid "No signature found"
-msgstr "Geen handtekening gevonden"
+msgstr "Geen ondertekening gevonden"
 
-#: src/plugins/pgpcore/sgpgme.c:163
+#: src/plugins/pgpcore/sgpgme.c:164
 msgid "Untrusted"
 msgstr "Niet vertrouwd"
 
-#: src/plugins/pgpcore/sgpgme.c:237 src/plugins/pgpcore/sgpgme.c:256
+#: src/plugins/pgpcore/sgpgme.c:238 src/plugins/pgpcore/sgpgme.c:257
 #, c-format
 msgid "The signature can't be checked - %s"
 msgstr "De ondertekening kan niet worden gecontroleerd - %s"
 
-#: src/plugins/pgpcore/sgpgme.c:241 src/plugins/pgpcore/sgpgme.c:245
+#: src/plugins/pgpcore/sgpgme.c:242 src/plugins/pgpcore/sgpgme.c:246
 msgid "The signature has not been checked."
 msgstr "Deze ondertekening is nog niet gecontroleerd."
 
-#: src/plugins/pgpcore/sgpgme.c:251
+#: src/plugins/pgpcore/sgpgme.c:252
 msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr "PGP Core: Geen sleutel, er draait geen gpg-agent."
 
-#: src/plugins/pgpcore/sgpgme.c:269
+#: src/plugins/pgpcore/sgpgme.c:270
 #, c-format
 msgid "Good signature from \"%s\" [ultimate]"
 msgstr "Goedgekeurde ondertekening van \"%s\" [ultimate]"
 
-#: src/plugins/pgpcore/sgpgme.c:272
+#: src/plugins/pgpcore/sgpgme.c:273
 #, c-format
 msgid "Good signature from \"%s\" [full]"
 msgstr "Goedgekeurde ondertekening van \"%s\" [volledig]"
 
-#: src/plugins/pgpcore/sgpgme.c:275
+#: src/plugins/pgpcore/sgpgme.c:276
 #, c-format
 msgid "Good signature from \"%s\" [marginal]"
 msgstr "Goedgekeurde ondertekening van \"%s\" [beperkt]"
 
-#: src/plugins/pgpcore/sgpgme.c:282
+#: src/plugins/pgpcore/sgpgme.c:283
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Goedgekeurde ondertekening van \"%s\""
 
-#: src/plugins/pgpcore/sgpgme.c:284 src/plugins/pgpcore/sgpgme.c:302
+#: src/plugins/pgpcore/sgpgme.c:285 src/plugins/pgpcore/sgpgme.c:303
 #, c-format
 msgid "Key 0x%s not available to verify this signature"
 msgstr "Sleutel 0x%s niet beschikbaar om deze ondertekening te verifiëren"
 
-#: src/plugins/pgpcore/sgpgme.c:290
+#: src/plugins/pgpcore/sgpgme.c:291
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Verlopen ondertekening van \"%s\""
 
-#: src/plugins/pgpcore/sgpgme.c:293
+#: src/plugins/pgpcore/sgpgme.c:294
 #, c-format
 msgid "Good signature from \"%s\", but the key has expired"
 msgstr "Goedgekeurde ondertekening van \"%s\", maar de sleutel is verlopen"
 
-#: src/plugins/pgpcore/sgpgme.c:296
+#: src/plugins/pgpcore/sgpgme.c:297
 #, c-format
 msgid "Good signature from \"%s\", but the key has been revoked"
 msgstr "Goedgekeurde ondertekening van \"%s\", maar de sleutel is ingetrokken"
 
-#: src/plugins/pgpcore/sgpgme.c:299
+#: src/plugins/pgpcore/sgpgme.c:300
 #, c-format
 msgid "Bad signature from \"%s\""
 msgstr "Foutieve ondertekening van \"%s\""
 
-#: src/plugins/pgpcore/sgpgme.c:306
+#: src/plugins/pgpcore/sgpgme.c:307
 msgid "The signature has not been checked"
 msgstr "Deze ondertekening is nog niet gecontroleerd"
 
-#: src/plugins/pgpcore/sgpgme.c:325
+#: src/plugins/pgpcore/sgpgme.c:330
 msgid "Error checking signature: no status\n"
 msgstr "Fout bij het controleren van de ondertekening: no status\n"
 
-#: src/plugins/pgpcore/sgpgme.c:343
+#: src/plugins/pgpcore/sgpgme.c:348
 #, c-format
 msgid "Error checking signature: %s\n"
 msgstr "Fout bij het controleren van de ondertekening: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:361
+#: src/plugins/pgpcore/sgpgme.c:366
 #, c-format
 msgid "Signature made on %s using %s key ID %s\n"
 msgstr "Ondertekening gemaakt op %s met %s sleutel-ID %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:367
+#: src/plugins/pgpcore/sgpgme.c:372
 #, c-format
 msgid "Good signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Goedgekeurde ondertekening van \"%s\" (Vertrouwen: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:372
+#: src/plugins/pgpcore/sgpgme.c:377
 #, c-format
 msgid "Expired key uid \"%s\"\n"
 msgstr "Verlopen sleutel-uid \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:377
+#: src/plugins/pgpcore/sgpgme.c:382
 #, c-format
 msgid "Expired signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Verlopen ondertekening van uid \"%s\" (Vertrouwen: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:382
+#: src/plugins/pgpcore/sgpgme.c:387
 #, c-format
 msgid "Revoked key uid \"%s\"\n"
 msgstr "Ingetrokken sleutel-uid \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:387
+#: src/plugins/pgpcore/sgpgme.c:392
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "FOUTIEVE ondertekening van \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:400
+#: src/plugins/pgpcore/sgpgme.c:405
 #, c-format
 msgid "uid \"%s\" (Validity: %s)\n"
 msgstr "uid \"%s\" (Vertrouwen: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:402
+#: src/plugins/pgpcore/sgpgme.c:407
 msgid "Revoked"
 msgstr "Ingetrokken"
 
-#: src/plugins/pgpcore/sgpgme.c:407
+#: src/plugins/pgpcore/sgpgme.c:412
 #, c-format
 msgid "Owner Trust: %s\n"
 msgstr "Betrouwbaarheid eigenaar: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:408
+#: src/plugins/pgpcore/sgpgme.c:413
 msgid "No key!"
 msgstr "Geen sleutel."
 
-#: src/plugins/pgpcore/sgpgme.c:410
+#: src/plugins/pgpcore/sgpgme.c:415
 msgid "Primary key fingerprint:"
 msgstr "Vingerafdruk van primaire sleutel:"
 
-#: src/plugins/pgpcore/sgpgme.c:428
+#: src/plugins/pgpcore/sgpgme.c:433
 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr ""
 "Waarschuwing: Adres van ondertekenaar \"%s\" klopt niet met DNS ingang\n"
 
-#: src/plugins/pgpcore/sgpgme.c:434
+#: src/plugins/pgpcore/sgpgme.c:439
 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr "Adres van geverifieerde ondertekenaar is \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:468
+#: src/plugins/pgpcore/sgpgme.c:473
 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr "Kon geen gegevens van bericht verkrijgen, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:484
+#: src/plugins/pgpcore/sgpgme.c:489
 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr "Kon gegevens initialiseren, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:661
+#: src/plugins/pgpcore/sgpgme.c:666
 msgid "Secret key specification is ambiguous"
 msgstr "Geheime sleutel-specificatie is onduidelijk"
 
-#: src/plugins/pgpcore/sgpgme.c:671
+#: src/plugins/pgpcore/sgpgme.c:676
 #, c-format
 msgid "Secret key not found (%s)"
 msgstr "Geheime sleutel niet gevonden (%s)"
 
-#: src/plugins/pgpcore/sgpgme.c:684
+#: src/plugins/pgpcore/sgpgme.c:689
 #, c-format
 msgid "Error setting secret key: %s"
 msgstr "Fout bij instellen geheime sleutel: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:777
+#: src/plugins/pgpcore/sgpgme.c:782
 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 msgstr ""
 "Gpgme-protocol '%s' is onbruikbaar: Engine '%s' is niet goed geïnstalleerd."
 
-#: src/plugins/pgpcore/sgpgme.c:783
+#: src/plugins/pgpcore/sgpgme.c:788
 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
@@ -12215,12 +12337,12 @@ msgstr ""
 "Gpgme-protocol '%s' is onbruikbaar: Engine '%s' versie %s is geïnstalleerd, "
 "maar versie %s is nodig.\n"
 
-#: src/plugins/pgpcore/sgpgme.c:791
+#: src/plugins/pgpcore/sgpgme.c:796
 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr "Gpgme-protocol '%s' is onbruikbaar (onbekend probleem)"
 
-#: src/plugins/pgpcore/sgpgme.c:807
+#: src/plugins/pgpcore/sgpgme.c:812
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
@@ -12228,7 +12350,7 @@ msgstr ""
 "GnuPG is niet goed geïnstalleerd of moet worden bijgewerkt.\n"
 "OpenPGP-ondersteuning wordt uitgeschakeld."
 
-#: src/plugins/pgpcore/sgpgme.c:884
+#: src/plugins/pgpcore/sgpgme.c:889
 msgid ""
 "You have to save the account's information with \"OK\" before being able to "
 "generate a key pair.\n"
@@ -12236,11 +12358,11 @@ msgstr ""
 "Je dient de informatie van het account op te slaan door op \"OK\" te klikken "
 "alvorens je een sleutelpaar kunt aanmaken.\n"
 
-#: src/plugins/pgpcore/sgpgme.c:889
+#: src/plugins/pgpcore/sgpgme.c:894
 msgid "No PGP key found"
 msgstr "Geen PGP-sleutel gevonden"
 
-#: src/plugins/pgpcore/sgpgme.c:890
+#: src/plugins/pgpcore/sgpgme.c:895
 msgid ""
 "Claws Mail did not find a secret PGP key, which means that you won't be able "
 "to sign emails or receive encrypted emails.\n"
@@ -12250,12 +12372,12 @@ msgstr ""
 "berichten kunt ondertekenen of versleutelde berichten kunt ontvangen.\n"
 "Wil je nu een sleutelpaar aanmaken?"
 
-#: src/plugins/pgpcore/sgpgme.c:979 src/plugins/pgpcore/sgpgme.c:1001
+#: src/plugins/pgpcore/sgpgme.c:984 src/plugins/pgpcore/sgpgme.c:1006
 #, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr "Kon nieuw sleutelpaar niet aanmaken: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:989
+#: src/plugins/pgpcore/sgpgme.c:994
 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
@@ -12263,11 +12385,11 @@ msgstr ""
 "Je nieuwe sleutelpaar wordt nu aangemaakt... Beweeg je muis heen en weer om "
 "te helpen bij het maken van entropie..."
 
-#: src/plugins/pgpcore/sgpgme.c:1007
+#: src/plugins/pgpcore/sgpgme.c:1012
 msgid "Couldn't generate a new key pair: unknown error"
 msgstr "Kon nieuw sleutelpaar niet aanmaken: onbekende fout"
 
-#: src/plugins/pgpcore/sgpgme.c:1011
+#: src/plugins/pgpcore/sgpgme.c:1016
 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
@@ -12280,62 +12402,62 @@ msgstr ""
 "\n"
 "Wil je de sleutel exporteren naar een sleutel-server?"
 
-#: src/plugins/pgpcore/sgpgme.c:1015
+#: src/plugins/pgpcore/sgpgme.c:1020
 msgid "Key generated"
 msgstr "Seutel aangemaakt"
 
-#: src/plugins/pgpcore/sgpgme.c:1091
+#: src/plugins/pgpcore/sgpgme.c:1096
 msgid "Key exported."
 msgstr "Sleutel geëxporteerd."
 
-#: src/plugins/pgpcore/sgpgme.c:1093
+#: src/plugins/pgpcore/sgpgme.c:1098
 msgid "Couldn't export key."
 msgstr "Kon sleutel niet exporteren."
 
-#: src/plugins/pgpinline/pgpinline.c:155
+#: src/plugins/pgpinline/pgpinline.c:156
 msgid "Incorrect part"
-msgstr "incorrect gedeelte"
+msgstr "Incorrect gedeelte"
 
-#: src/plugins/pgpinline/pgpinline.c:159
+#: src/plugins/pgpinline/pgpinline.c:160
 msgid "Not a text part"
 msgstr "Geen tekst gedeelte"
 
-#: src/plugins/pgpinline/pgpinline.c:170 src/plugins/pgpinline/pgpinline.c:322
+#: src/plugins/pgpinline/pgpinline.c:171 src/plugins/pgpinline/pgpinline.c:323
 msgid "Couldn't get text data."
 msgstr "Kon tekstgegevens niet vinden."
 
-#: src/plugins/pgpinline/pgpinline.c:188
+#: src/plugins/pgpinline/pgpinline.c:189
 msgid "Couldn't convert text data to any sane charset."
 msgstr "Kon tekstgegevens naar geen enkel zinnige karakterset converteren."
 
-#: src/plugins/pgpinline/pgpinline.c:196 src/plugins/pgpinline/pgpinline.c:518
-#: src/plugins/pgpinline/pgpinline.c:657 src/plugins/pgpinline/pgpinline.c:713
-#: src/plugins/pgpmime/pgpmime.c:183 src/plugins/pgpmime/pgpmime.c:329
-#: src/plugins/pgpmime/pgpmime.c:511 src/plugins/pgpmime/pgpmime.c:654
-#: src/plugins/smime/smime.c:413
+#: src/plugins/pgpinline/pgpinline.c:197 src/plugins/pgpinline/pgpinline.c:519
+#: src/plugins/pgpinline/pgpinline.c:658 src/plugins/pgpinline/pgpinline.c:714
+#: src/plugins/pgpmime/pgpmime.c:184 src/plugins/pgpmime/pgpmime.c:330
+#: src/plugins/pgpmime/pgpmime.c:512 src/plugins/pgpmime/pgpmime.c:656
+#: src/plugins/smime/smime.c:418
 #, c-format
 msgid "Couldn't initialize GPG context, %s"
 msgstr "Kon de GPG-context niet initialiseren, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:315
+#: src/plugins/pgpinline/pgpinline.c:316
 msgid "Couldn't parse mime part."
 msgstr "Kon mime-gedeelte van bericht niet lezen."
 
-#: src/plugins/pgpinline/pgpinline.c:345 src/plugins/pgpmime/pgpmime.c:352
+#: src/plugins/pgpinline/pgpinline.c:346 src/plugins/pgpmime/pgpmime.c:353
 #, c-format
 msgid "Couldn't open decrypted file %s"
 msgstr "Kon gedecodeerd bestand %s niet openen"
 
-#: src/plugins/pgpinline/pgpinline.c:362 src/plugins/pgpinline/pgpinline.c:371
-#: src/plugins/pgpinline/pgpinline.c:380 src/plugins/pgpinline/pgpinline.c:388
-#: src/plugins/pgpinline/pgpinline.c:398 src/plugins/pgpinline/pgpinline.c:407
-#: src/plugins/pgpmime/pgpmime.c:363 src/plugins/pgpmime/pgpmime.c:377
+#: src/plugins/pgpinline/pgpinline.c:363 src/plugins/pgpinline/pgpinline.c:372
+#: src/plugins/pgpinline/pgpinline.c:381 src/plugins/pgpinline/pgpinline.c:389
+#: src/plugins/pgpinline/pgpinline.c:399 src/plugins/pgpinline/pgpinline.c:408
+#: src/plugins/pgpmime/pgpmime.c:364 src/plugins/pgpmime/pgpmime.c:378
 #, c-format
 msgid "Couldn't write to decrypted file %s"
 msgstr "Kon gedecodeerd bestand %s niet wegschrijven"
 
-#: src/plugins/pgpinline/pgpinline.c:376 src/plugins/pgpinline/pgpinline.c:377
-#: src/plugins/pgpinline/pgpinline.c:378
+#: src/plugins/pgpinline/pgpinline.c:377 src/plugins/pgpinline/pgpinline.c:378
+#: src/plugins/pgpinline/pgpinline.c:379
 msgid ""
 "\n"
 "--- Start of PGP/Inline encrypted data ---\n"
@@ -12343,71 +12465,71 @@ msgstr ""
 "\n"
 "--- Begin van PGP/Ingesloten versleutelde data ---\n"
 
-#: src/plugins/pgpinline/pgpinline.c:394 src/plugins/pgpinline/pgpinline.c:395
-#: src/plugins/pgpinline/pgpinline.c:396
+#: src/plugins/pgpinline/pgpinline.c:395 src/plugins/pgpinline/pgpinline.c:396
+#: src/plugins/pgpinline/pgpinline.c:397
 msgid "--- End of PGP/Inline encrypted data ---\n"
 msgstr "--- Einde van PGP/Ingesloten versleutelde data ---\n"
 
-#: src/plugins/pgpinline/pgpinline.c:415 src/plugins/pgpmime/pgpmime.c:389
+#: src/plugins/pgpinline/pgpinline.c:416 src/plugins/pgpmime/pgpmime.c:390
 #, c-format
 msgid "Couldn't close decrypted file %s"
 msgstr "Kon gedecodeerd bestand %s niet sluiten"
 
-#: src/plugins/pgpinline/pgpinline.c:427
+#: src/plugins/pgpinline/pgpinline.c:428
 msgid "Couldn't scan decrypted file."
 msgstr "Kon gedecodeerd bestand niet scannen."
 
-#: src/plugins/pgpinline/pgpinline.c:435
+#: src/plugins/pgpinline/pgpinline.c:436
 msgid "Couldn't scan decrypted file parts."
 msgstr "Kon gedecodeerde bestandsonderdelen niet scannen."
 
-#: src/plugins/pgpinline/pgpinline.c:492 src/plugins/pgpinline/pgpinline.c:684
+#: src/plugins/pgpinline/pgpinline.c:493 src/plugins/pgpinline/pgpinline.c:685
 msgid "Malformed message"
 msgstr "Vervormd bericht"
 
-#: src/plugins/pgpinline/pgpinline.c:503 src/plugins/pgpinline/pgpinline.c:695
-#: src/plugins/pgpmime/pgpmime.c:694
+#: src/plugins/pgpinline/pgpinline.c:504 src/plugins/pgpinline/pgpinline.c:696
+#: src/plugins/pgpmime/pgpmime.c:696
 #, c-format
 msgid "Couldn't create temporary file, %s"
-msgstr "Kon tijdelijk bestand niet aanmaken, %s."
+msgstr "Kon tijdelijk bestand niet aanmaken, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:542 src/plugins/pgpmime/pgpmime.c:538
+#: src/plugins/pgpinline/pgpinline.c:543 src/plugins/pgpmime/pgpmime.c:539
 #, c-format
 msgid "Data signing failed, %s"
 msgstr "Gegevens ondertekenen mislukt, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:560 src/plugins/pgpmime/pgpmime.c:565
+#: src/plugins/pgpinline/pgpinline.c:561 src/plugins/pgpmime/pgpmime.c:566
 #, c-format
 msgid "Data signing failed due to invalid signer: %s"
 msgstr "Gegevens ondertekenen mislukt wegens ongeldige ondertekenaar: %s"
 
-#: src/plugins/pgpinline/pgpinline.c:569 src/plugins/pgpmime/pgpmime.c:574
+#: src/plugins/pgpinline/pgpinline.c:570 src/plugins/pgpmime/pgpmime.c:575
 msgid "Data signing failed, no results."
 msgstr "Gegevens ondertekenen mislukt, geen resultaten."
 
-#: src/plugins/pgpinline/pgpinline.c:579 src/plugins/pgpmime/pgpmime.c:585
+#: src/plugins/pgpinline/pgpinline.c:580 src/plugins/pgpmime/pgpmime.c:586
 msgid "Data signing failed, no contents."
 msgstr "Gegevens ondertekenen mislukt, geen inhoud."
 
-#: src/plugins/pgpinline/pgpinline.c:623
+#: src/plugins/pgpinline/pgpinline.c:624
 msgid ""
 "Please note that attachments are not encrypted by the PGP/Inline system, nor "
 "are email headers, like Subject."
 msgstr ""
-"Let op dat bijvoegsels niet worden versleuteld door het PGP/Ingesloten "
-"systeem, noch e-mail-headers, zoals Onderwerp."
+"Let op dat bijlages niet worden versleuteld door het PGP/Ingesloten systeem, "
+"noch e-mail-headers, zoals Onderwerp."
 
-#: src/plugins/pgpinline/pgpinline.c:667 src/plugins/pgpmime/pgpmime.c:664
+#: src/plugins/pgpinline/pgpinline.c:668 src/plugins/pgpmime/pgpmime.c:666
 #, c-format
 msgid "Couldn't add GPG key %s, %s"
 msgstr "Kon GPG-sleutel niet toevoegen %s, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:726 src/plugins/pgpmime/pgpmime.c:722
+#: src/plugins/pgpinline/pgpinline.c:727 src/plugins/pgpmime/pgpmime.c:724
 #, c-format
 msgid "Encryption failed, %s"
 msgstr "Versleutelen mislukt, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:795
+#: src/plugins/pgpinline/pgpinline.c:796
 msgid "PGP/Inline"
 msgstr "PGP/Ingesloten"
 
@@ -12441,28 +12563,28 @@ msgstr ""
 "\n"
 "GPGME auteursrecht 2001 door Werner Koch <dd9jn at gnu.org>"
 
-#: src/plugins/pgpmime/pgpmime.c:203
+#: src/plugins/pgpmime/pgpmime.c:204
 msgid "Signature boundary not found."
-msgstr "Grens van ondertekening niet gevonden"
+msgstr "Grens van ondertekening niet gevonden."
 
-#: src/plugins/pgpmime/pgpmime.c:401 src/plugins/smime/smime.c:494
+#: src/plugins/pgpmime/pgpmime.c:402 src/plugins/smime/smime.c:499
 msgid "Couldn't parse decrypted file."
 msgstr "Kon gedecodeerd bestand niet lezen."
 
-#: src/plugins/pgpmime/pgpmime.c:407 src/plugins/smime/smime.c:501
+#: src/plugins/pgpmime/pgpmime.c:408 src/plugins/smime/smime.c:506
 msgid "Couldn't parse decrypted file parts."
 msgstr "Kon gedecodeerde bestandsonderdelen niet lezen."
 
-#: src/plugins/pgpmime/pgpmime.c:456 src/plugins/pgpmime/pgpmime.c:495
+#: src/plugins/pgpmime/pgpmime.c:457 src/plugins/pgpmime/pgpmime.c:496
 #, c-format
 msgid "Couldn't create temporary file: %s"
 msgstr "Kon tijdelijk bestand niet aanmaken: %s"
 
-#: src/plugins/pgpmime/pgpmime.c:598
+#: src/plugins/pgpmime/pgpmime.c:599
 msgid "OpenPGP digital signature"
-msgstr "OpenPGP digitale handtekening"
+msgstr "OpenPGP digitale ondertekening"
 
-#: src/plugins/pgpmime/pgpmime.c:620
+#: src/plugins/pgpmime/pgpmime.c:622
 msgid ""
 "Please note that email headers, like Subject, are not encrypted by the PGP/"
 "Mime system."
@@ -12470,7 +12592,7 @@ msgstr ""
 "Let op dat e-mail-headers, zoals Onderwerp, niet versleuteld worden door het "
 "PGP/Mime-systeem."
 
-#: src/plugins/pgpmime/pgpmime.c:794
+#: src/plugins/pgpmime/pgpmime.c:798
 msgid "PGP/Mime"
 msgstr "PGP/Mime"
 
@@ -12503,36 +12625,36 @@ msgstr ""
 "\n"
 "GPGME auteursrecht 2001 by Werner Koch <dd9jn at gnu.org>"
 
-#: src/plugins/python/python_plugin.c:358
-#: src/plugins/python/python_plugin.c:502
+#: src/plugins/python/python_plugin.c:379
+#: src/plugins/python/python_plugin.c:523
 msgid "Python scripts"
 msgstr "Python scripts"
 
-#: src/plugins/python/python_plugin.c:497
+#: src/plugins/python/python_plugin.c:518
 msgid "Show Python console..."
 msgstr "Geef Python-console weer..."
 
-#: src/plugins/python/python_plugin.c:503
-#: src/plugins/rssyl/rssyl_feed_props.c:481
+#: src/plugins/python/python_plugin.c:524
+#: src/plugins/rssyl/rssyl_feed_props.c:471
 msgid "Refresh"
 msgstr "Verversen"
 
-#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2572
-#: src/prefs_account.c:2600 src/prefs_account.c:2883 src/wizard.c:1204
-#: src/wizard.c:1624
+#: src/plugins/python/python_plugin.c:526 src/prefs_account.c:2707
+#: src/prefs_account.c:2735 src/prefs_account.c:3172 src/wizard.c:1206
+#: src/wizard.c:1626
 msgid "Browse"
 msgstr "Bekijk"
 
-#: src/plugins/python/python_plugin.c:651
-#: src/plugins/python/python_plugin.c:735
+#: src/plugins/python/python_plugin.c:672
+#: src/plugins/python/python_plugin.c:762
 msgid "Python"
 msgstr "Python"
 
-#: src/plugins/python/python_plugin.c:657
+#: src/plugins/python/python_plugin.c:681
 msgid "Failed to register \"compose create hook\" in the Python plugin"
 msgstr "Registreren van 'compose create'-hook in de Python-plugin is mislukt"
 
-#: src/plugins/python/python_plugin.c:740
+#: src/plugins/python/python_plugin.c:767
 msgid ""
 "This plugin provides Python integration features.\n"
 "Python code can be entered interactively into an embedded Python console, "
@@ -12623,7 +12745,7 @@ msgstr ""
 "\n"
 "Feedback naar <berndth at gmx.de> is welkom."
 
-#: src/plugins/python/python_plugin.c:791
+#: src/plugins/python/python_plugin.c:818
 msgid "Python integration"
 msgstr "Python integratie"
 
@@ -12636,23 +12758,23 @@ msgstr ""
 "Kon inhoud van oude feeds.xml-bestand niet lezen:\n"
 "%s"
 
-#: src/plugins/rssyl/opml_export.c:110
+#: src/plugins/rssyl/opml_export.c:111
 #, c-format
 msgid "RSSyl: Error while writing '%s' to feed export list.\n"
 msgstr "RSSyl: Fout bij toevoegen van '%s' aan feed-exportlijst.\n"
 
-#: src/plugins/rssyl/opml_export.c:131
+#: src/plugins/rssyl/opml_export.c:132
 #, c-format
 msgid "RSSyl: Couldn't delete old OPML file '%s': %s\n"
 msgstr "RSSyl: Kon oud OPML-bestand '%s' niet verwijderen: %s\n"
 
-#: src/plugins/rssyl/opml_export.c:141
+#: src/plugins/rssyl/opml_export.c:142
 #, c-format
 msgid "RSSyl: Couldn't open file '%s' for feed list exporting: %s\n"
 msgstr ""
 "RSSyl: Kon het bestand '%s' niet openen voor exporteren van feedlijst: %s\n"
 
-#: src/plugins/rssyl/opml_export.c:182
+#: src/plugins/rssyl/opml_export.c:183
 msgid "RSSyl: Error during writing feed export file.\n"
 msgstr "RSSyl: Fout tijdens schrijven van feed-exportbestand.\n"
 
@@ -12678,7 +12800,7 @@ msgid ""
 "the web. You can read them, and delete or keep old entries."
 msgstr ""
 "Deze plugin maakt het mogelijk om een mailbox-boom aan te maken waar je "
-"nieuwsfeeds aan kunt toevoegen in RSS 1.0, RSS 2.0 of Atom-formaat.\n"
+"nieuwsfeeds aan kunt toevoegen in RSS 1.0, RSS 2.0 of Atom-format.\n"
 "\n"
 "Elke nieuwsfeed zal een map aanmaken met ingangen gehaald van het web. Je "
 "kunt ze lezen, verwijderen of bewaren."
@@ -12687,44 +12809,45 @@ msgstr ""
 msgid "RSS feed"
 msgstr "RSS-feed"
 
-#: src/plugins/rssyl/rssyl_add_item.c:296
+#: src/plugins/rssyl/rssyl_add_item.c:304
 msgctxt "Empty RSS feed title placeholder"
 msgid "(empty)"
 msgstr "(leegmaken)"
 
-#: src/plugins/rssyl/rssyl.c:156 src/plugins/rssyl/rssyl.c:167
+#: src/plugins/rssyl/rssyl.c:157 src/plugins/rssyl/rssyl.c:169
 msgid "Refresh all feeds"
 msgstr "Ververs alle feeds"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:65
+#: src/plugins/rssyl/rssyl_cb_menu.c:66
 msgid "Subscribe feed"
 msgstr "Abonneer op feed"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:66
+#: src/plugins/rssyl/rssyl_cb_menu.c:67
 msgid "Input the URL of the news feed you wish to subscribe:"
 msgstr "Voer de URL in van de nieuwsfeed waarop je wilt abonneren:"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:98
+#: src/plugins/rssyl/rssyl_cb_menu.c:99
 #, c-format
 msgid "'%c' can't be used in folder name."
 msgstr "'%c' mag niet in de naam van een map voorkomen."
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:251
+#: src/plugins/rssyl/rssyl_cb_menu.c:248 src/plugins/rssyl/rssyl_cb_menu.c:295
+#: src/plugins/rssyl/rssyl_feed_props.c:201
 msgid "Claws Mail needs network access in order to update the feed."
 msgid_plural "Claws Mail needs network access in order to update feeds."
 msgstr[0] "Claws-Mail heeft netwerktoegang nodig om de feed te verversen."
 msgstr[1] "Claws-Mail heeft netwerktoegang nodig om de feeds te verversen."
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:314
+#: src/plugins/rssyl/rssyl_cb_menu.c:321
 #, c-format
 msgid "Really remove the feed tree `%s' ?\n"
 msgstr "Werkelijk de feedboom '%s' verwijderen?\n"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:315
+#: src/plugins/rssyl/rssyl_cb_menu.c:322
 msgid "Remove feed tree"
 msgstr "Verwijder feedboom"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:349
+#: src/plugins/rssyl/rssyl_cb_menu.c:356
 msgid "Select an OPML file"
 msgstr "Selecteer een OPML bestand"
 
@@ -12768,53 +12891,53 @@ msgstr "RSSyl: Kon feed niet verwerken van '%s'\n"
 msgid "RSSyl: Application is exiting, couldn't finish updating feed at '%s'\n"
 msgstr "RSSyl: Applicatie wordt beeindigd, kon feed niet verversen op '%s'\n"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:268
+#: src/plugins/rssyl/rssyl_feed_props.c:270
 msgid "HTTP Basic authentication"
 msgstr "HTTP Basale authenticatie"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:289
+#: src/plugins/rssyl/rssyl_feed_props.c:292
 msgid "Use default refresh interval"
-msgstr "Gebruik standaard verversings interval"
+msgstr "Gebruik standaard verversings-interval"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:301
+#: src/plugins/rssyl/rssyl_feed_props.c:304
 msgid "Keep old items"
 msgstr "Bewaar oude items"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:307
+#: src/plugins/rssyl/rssyl_feed_props.c:310
 msgid "_Trim"
 msgstr "_Trim"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:309
+#: src/plugins/rssyl/rssyl_feed_props.c:312
 msgid "Update feed, deleting items which are no longer in the source feed"
 msgstr ""
 "Verversen feed, verwijderen van items die niet langer in de feedbron "
 "aanwezig zijn"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:312
+#: src/plugins/rssyl/rssyl_feed_props.c:315
 msgid "Fetch comments if possible"
 msgstr "Haal reacties op indien mogelijk"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:337
+#: src/plugins/rssyl/rssyl_feed_props.c:335
 msgid "Always mark it as new"
 msgstr "Altijd markeren als nieuw"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:343
+#: src/plugins/rssyl/rssyl_feed_props.c:337
 msgid "Only mark it as new if its text has changed"
 msgstr "Alleen als nieuw markeren als de tekst is gewijzigd"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:349
+#: src/plugins/rssyl/rssyl_feed_props.c:339
 msgid "Never mark it as new"
 msgstr "Nooit markeren als nieuw"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:354
+#: src/plugins/rssyl/rssyl_feed_props.c:344
 msgid "Add item title to the top of message"
 msgstr "Voeg item-titel toe aan bovenkant van bericht"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:361
+#: src/plugins/rssyl/rssyl_feed_props.c:351
 msgid "Ignore title rename"
 msgstr "Titel hernoemen negeren"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:366
+#: src/plugins/rssyl/rssyl_feed_props.c:356
 msgid ""
 "Enable this to keep current folder name, even if feed author changes title "
 "of the feed."
@@ -12822,54 +12945,54 @@ msgstr ""
 "Activeren om de huidige mapnaam te behouden, zelfs wanneer de feed-auteur de "
 "titel van de feed wijzigt."
 
-#: src/plugins/rssyl/rssyl_feed_props.c:370
+#: src/plugins/rssyl/rssyl_feed_props.c:360
 #: src/plugins/vcalendar/vcal_prefs.c:593
 msgid "Verify SSL/TLS certificate validity"
 msgstr "Verifieer geldigheid van SSL/TLS-certificaat"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:390
+#: src/plugins/rssyl/rssyl_feed_props.c:380
 msgid "User name"
 msgstr "Gebruikersnaam"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:403
+#: src/plugins/rssyl/rssyl_feed_props.c:393
 msgid "Source URL"
 msgstr "Bron-URL"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:416
+#: src/plugins/rssyl/rssyl_feed_props.c:406
 msgid "Fetch comments on posts aged less than"
 msgstr "Haal reacties op van berichten jonger dan"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:424
-#: src/plugins/vcalendar/day-view.c:614 src/plugins/vcalendar/month-view.c:711
-#: src/prefs_account.c:1513 src/prefs_folder_item.c:568 src/prefs_matcher.c:337
+#: src/plugins/rssyl/rssyl_feed_props.c:414
+#: src/plugins/vcalendar/day-view.c:615 src/plugins/vcalendar/month-view.c:711
+#: src/prefs_account.c:1585 src/prefs_folder_item.c:571 src/prefs_matcher.c:341
 msgid "days"
 msgstr "dagen"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:425
+#: src/plugins/rssyl/rssyl_feed_props.c:415
 msgid "Set to -1 to fetch all comments"
 msgstr "Stel in op -1 om alle reacties op te halen"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:449
+#: src/plugins/rssyl/rssyl_feed_props.c:439
 msgid "If an item changes"
 msgstr "Alleen als de tekst is veranderd"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:454
+#: src/plugins/rssyl/rssyl_feed_props.c:444
 msgid "Items"
 msgstr "Items"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:467
+#: src/plugins/rssyl/rssyl_feed_props.c:457
 msgid "Refresh interval"
 msgstr "Verversingsinterval"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:475
+#: src/plugins/rssyl/rssyl_feed_props.c:465
 msgid "Set to 0 to disable automatic refreshing for this feed"
 msgstr "Stel in op 0 om automatische verversing uit te zetten voor deze feed"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:527
+#: src/plugins/rssyl/rssyl_feed_props.c:517
 msgid "_OK"
 msgstr "_OK"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:535
+#: src/plugins/rssyl/rssyl_feed_props.c:525
 msgid "Set feed properties"
 msgstr "Stel feed-eigenschappen in"
 
@@ -12920,8 +13043,8 @@ msgid ""
 "there?"
 msgstr ""
 "Aanmaken van mappenboom is mislukt.\n"
-"Misschien dat sommige bestanden al bestaan, of je hebt geen permissie om "
-"daar te schrijven?"
+"Misschien dat sommige bestanden al bestaan, of je hebt geen rechten om daar "
+"te schrijven?"
 
 #: src/plugins/rssyl/rssyl.h:20
 msgid "My Feeds"
@@ -12989,27 +13112,26 @@ msgstr "_Bewerk feed-eigenschappen na het abonneren"
 msgid "Updating comments for '%s'..."
 msgstr "Bijwerken reacties voor '%s'..."
 
-#: src/plugins/rssyl/rssyl_update_feed.c:105
-#: src/plugins/vcalendar/vcal_folder.c:1620
+#: src/plugins/rssyl/rssyl_update_feed.c:107
+#: src/plugins/vcalendar/vcal_folder.c:1624
 msgid "401 (Authorisation required)"
 msgstr "401 (Authorisatie vereist)"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:108
-#: src/plugins/vcalendar/vcal_folder.c:1623
-msgid "403 (Unauthorised)"
-msgstr "403 (Niet geautoriseerd)"
+#: src/plugins/rssyl/rssyl_update_feed.c:110
+msgid "403 (Forbidden)"
+msgstr "403 (Verboden)"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:111
-#: src/plugins/vcalendar/vcal_folder.c:1626
+#: src/plugins/rssyl/rssyl_update_feed.c:113
+#: src/plugins/vcalendar/vcal_folder.c:1630
 msgid "404 (Not found)"
 msgstr "404 (Niet gevonden)"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:114
+#: src/plugins/rssyl/rssyl_update_feed.c:116
 #, c-format
 msgid "Error %d"
 msgstr "Fout %d"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:127
+#: src/plugins/rssyl/rssyl_update_feed.c:129
 #, c-format
 msgctxt "First parameter is URL, second is error text"
 msgid ""
@@ -13023,7 +13145,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:140
+#: src/plugins/rssyl/rssyl_update_feed.c:142
 #, c-format
 msgid ""
 "No valid feed found at\n"
@@ -13032,21 +13154,21 @@ msgstr ""
 "Geen geldige feed gevonden op\n"
 "<b>%s</b>"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:152
+#: src/plugins/rssyl/rssyl_update_feed.c:154
 msgid "Untitled feed"
 msgstr "Naamloze feed"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:154
+#: src/plugins/rssyl/rssyl_update_feed.c:156
 #, c-format
 msgid "RSSyl: Possibly invalid feed without title at %s.\n"
 msgstr "RSSyl: Mogelijk ongeldige feed gevonden op %s.\n"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:231
+#: src/plugins/rssyl/rssyl_update_feed.c:233
 #, c-format
 msgid "Updating feed '%s'..."
 msgstr "Verversen van feed '%s'..."
 
-#: src/plugins/rssyl/rssyl_update_feed.c:258
+#: src/plugins/rssyl/rssyl_update_feed.c:270
 #, c-format
 msgid ""
 "Couldn't process feed at\n"
@@ -13059,16 +13181,16 @@ msgstr ""
 "\n"
 "Neem contact op met de ontwikkelaars, dit zou niet mogen gebeuren."
 
-#: src/plugins/rssyl/rssyl_update_feed.c:342
+#: src/plugins/rssyl/rssyl_update_feed.c:356
 msgid "Claws Mail needs network access in order to update your feeds."
 msgstr "Claws Mail heeft netwerk toegang nodig om de feeds te verversen."
 
-#: src/plugins/rssyl/rssyl_update_format.c:127
+#: src/plugins/rssyl/rssyl_update_format.c:128
 msgid ""
 "Internal problem while upgrading storage format. This should not happen. "
 "Please report this, with debug output attached.\n"
 msgstr ""
-"Intern probleem tijdens bijwerken van opslagformaat. Dit zou niet mogen "
+"Intern probleem tijdens bijwerken van opslagformat. Dit zou niet mogen "
 "gebeuren. Maak een bugreport aan, met de debug-uitvoer bijgevoegd.\n"
 
 #: src/plugins/smime/plugin.c:59
@@ -13108,24 +13230,24 @@ msgstr ""
 "\n"
 "GPGME auteursrecht 2001 by Werner Koch <dd9jn at gnu.org>"
 
-#: src/plugins/smime/smime.c:421
+#: src/plugins/smime/smime.c:426
 #, c-format
 msgid "Couldn't set GPG protocol, %s"
 msgstr "Kon het GPG-protocol niet instellen, %s"
 
-#: src/plugins/smime/smime.c:449
+#: src/plugins/smime/smime.c:454
 msgid "Couldn't open temporary file"
 msgstr "Kon tijdelijk bestand niet openen"
 
-#: src/plugins/smime/smime.c:460 src/plugins/smime/smime.c:475
+#: src/plugins/smime/smime.c:465 src/plugins/smime/smime.c:480
 msgid "Couldn't write to temporary file"
 msgstr "Kon niet schrijven naar tijdelijk bestand"
 
-#: src/plugins/smime/smime.c:486
+#: src/plugins/smime/smime.c:491
 msgid "Couldn't close temporary file"
 msgstr "Kon tijdelijk bestand niet sluiten"
 
-#: src/plugins/smime/smime.c:708
+#: src/plugins/smime/smime.c:714
 msgid ""
 "Please note that email headers, like Subject, are not encrypted by the S/"
 "MIME system."
@@ -13133,21 +13255,21 @@ msgstr ""
 "Let op dat e-mail-headers, zoals Onderwerp, niet versleuteld worden door het "
 "S/MIME-systeem."
 
-#: src/plugins/spam_report/spam_report.c:301
+#: src/plugins/spam_report/spam_report.c:307
 msgid "Reporting spam..."
 msgstr "Rapporteer spam..."
 
-#: src/plugins/spam_report/spam_report.c:336
+#: src/plugins/spam_report/spam_report.c:342
 msgid "Report spam online..."
 msgstr "Rapporteer spam online..."
 
-#: src/plugins/spam_report/spam_report.c:347
-#: src/plugins/spam_report/spam_report.c:385
+#: src/plugins/spam_report/spam_report.c:353
+#: src/plugins/spam_report/spam_report.c:391
 #: src/plugins/spam_report/spam_report_prefs.c:83
 msgid "SpamReport"
 msgstr "SpamRapport"
 
-#: src/plugins/spam_report/spam_report.c:390
+#: src/plugins/spam_report/spam_report.c:396
 msgid ""
 "This plugin reports spam to various places.\n"
 "Currently the following sites or methods are supported:\n"
@@ -13163,7 +13285,7 @@ msgstr ""
 " * spamcop.net\n"
 " * lists.debian.org nomination system"
 
-#: src/plugins/spam_report/spam_report.c:415
+#: src/plugins/spam_report/spam_report.c:421
 msgid "Spam reporting"
 msgstr "Spam rapportering"
 
@@ -13175,32 +13297,32 @@ msgstr "Aangezet"
 msgid "Forward to:"
 msgstr "Doorsturen aan:"
 
-#: src/plugins/spam_report/spam_report_prefs.c:185 src/wizard.c:1572
+#: src/plugins/spam_report/spam_report_prefs.c:185 src/wizard.c:1574
 msgid "Password:"
 msgstr "Wachtwoord:"
 
-#: src/plugins/spamassassin/spamassassin.c:77
-#: src/plugins/spamassassin/spamassassin_gtk.c:649
+#: src/plugins/spamassassin/spamassassin.c:78
+#: src/plugins/spamassassin/spamassassin_gtk.c:671
 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 
-#: src/plugins/spamassassin/spamassassin.c:169
+#: src/plugins/spamassassin/spamassassin.c:182
 msgid "SpamAssassin plugin couldn't connect to spamd.\n"
 msgstr "De SpamAssassin-plugin kon geen verbinding maken met spamd.\n"
 
-#: src/plugins/spamassassin/spamassassin.c:185
+#: src/plugins/spamassassin/spamassassin.c:198
 msgid "SpamAssassin plugin filtering failed.\n"
 msgstr "Filteren door SpamAssassin-plugin mislukt.\n"
 
-#: src/plugins/spamassassin/spamassassin.c:211
+#: src/plugins/spamassassin/spamassassin.c:224
 msgid "SpamAssassin plugin is disabled by its preferences.\n"
 msgstr "De SpamAssassin-plugin staat uit in de voorkeuren.\n"
 
-#: src/plugins/spamassassin/spamassassin.c:216
+#: src/plugins/spamassassin/spamassassin.c:229
 msgid "SpamAssassin: filtering message..."
 msgstr "SpamAssassin: bericht wordt gefilterd..."
 
-#: src/plugins/spamassassin/spamassassin.c:345
+#: src/plugins/spamassassin/spamassassin.c:358
 msgid ""
 "The SpamAssassin plugin couldn't filter a message. The probable cause of the "
 "error is an unreachable spamd daemon. Please make sure spamd is running and "
@@ -13210,7 +13332,7 @@ msgstr ""
 "waarschijnlijke oorzaak is een onbereikbare spamd-daemon. Zorg er voor dat "
 "een spamd draait en toegankelijk is."
 
-#: src/plugins/spamassassin/spamassassin.c:402
+#: src/plugins/spamassassin/spamassassin.c:416
 msgid ""
 "Claws Mail needs network access in order to feed the mail to the remote "
 "learner."
@@ -13218,15 +13340,15 @@ msgstr ""
 "Claws Mail heeft netwerktoegang nodig om dit bericht aan de Spam-trainer te "
 "voeden."
 
-#: src/plugins/spamassassin/spamassassin.c:547
+#: src/plugins/spamassassin/spamassassin.c:561
 msgid "Failed to get username"
 msgstr "Verkrijgen gebruikersnaam mislukt"
 
-#: src/plugins/spamassassin/spamassassin.c:559
+#: src/plugins/spamassassin/spamassassin.c:578
 msgid "SpamAssassin plugin is loaded but disabled by its preferences.\n"
 msgstr "De SpamAssassin-plugin is geladen, maar staat uit in de voorkeuren.\n"
 
-#: src/plugins/spamassassin/spamassassin.c:593
+#: src/plugins/spamassassin/spamassassin.c:612
 msgid ""
 "This plugin can check all messages that are received from an IMAP, LOCAL or "
 "POP account for spam using a SpamAssassin server. You will need a "
@@ -13251,59 +13373,68 @@ msgstr ""
 "Opties kunnen worden gevonden in /Instellingen/Voorkeuren/Plugins/"
 "SpamAssassin"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:90
+#: src/plugins/spamassassin/spamassassin_gtk.c:91
 msgid "Localhost"
 msgstr "Locale computer"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:91
+#: src/plugins/spamassassin/spamassassin_gtk.c:92
 msgid "TCP"
 msgstr "TCP"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:92
+#: src/plugins/spamassassin/spamassassin_gtk.c:94
 msgid "Unix Socket"
 msgstr "Unix-socket"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:119
+#: src/plugins/spamassassin/spamassassin_gtk.c:122
 msgid "Select folder to save spam to"
 msgstr "Selecteer map om spam in op te slaan"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:269
+#: src/plugins/spamassassin/spamassassin_gtk.c:274
 msgid "Enable SpamAssassin plugin"
 msgstr "Zet SpamAssassin-plugin aan"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:273
+#: src/plugins/spamassassin/spamassassin_gtk.c:278
 msgid "Transport"
 msgstr "Transport"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:281
+#: src/plugins/spamassassin/spamassassin_gtk.c:286
 msgid "Type of transport"
 msgstr "Type van transport"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:302
+#: src/plugins/spamassassin/spamassassin_gtk.c:307
 msgid "User"
 msgstr "Gebruikersnaam"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:315
+#: src/plugins/spamassassin/spamassassin_gtk.c:320
 msgid "User to use with spamd server"
 msgstr "Gebruikersnaam om te gebruiken met de spamd-server"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:317
+#: src/plugins/spamassassin/spamassassin_gtk.c:322
 msgid "spamd"
 msgstr "spamd"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:335
+#: src/plugins/spamassassin/spamassassin_gtk.c:340
 msgid "Hostname or IP address of spamd server"
 msgstr "Hostnaam of IP-adres van spamd-server"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:346
+#: src/plugins/spamassassin/spamassassin_gtk.c:351
 msgid "Port of spamd server"
 msgstr "Poort van spamd-server"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:352
+#: src/plugins/spamassassin/spamassassin_gtk.c:357
 msgid "Path of Unix socket"
 msgstr "Pad van Unix-socket"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:387
+#: src/plugins/spamassassin/spamassassin_gtk.c:364
+msgid "Use compression"
+msgstr "Compressie gebruiken"
+
+#: src/plugins/spamassassin/spamassassin_gtk.c:368
+msgid "Enable compression if spamd uses it, otherwise disable it."
+msgstr ""
+"Comprimering inschakelen wanneer spamd het gebruikt, anders uitschakelen."
+
+#: src/plugins/spamassassin/spamassassin_gtk.c:403
 msgid ""
 "Maximum time allowed for checking. If the check takes longer it will be "
 "aborted."
@@ -13311,7 +13442,7 @@ msgstr ""
 "De toegestane tijd voor controle. Als de controle langer duurt zal de "
 "controle worden gestopt."
 
-#: src/plugins/tnef_parse/tnef_parse.c:73
+#: src/plugins/tnef_parse/tnef_parse.c:74
 #, c-format
 msgid ""
 "\n"
@@ -13324,37 +13455,37 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: src/plugins/tnef_parse/tnef_parse.c:130
-#: src/plugins/tnef_parse/tnef_parse.c:137
+#: src/plugins/tnef_parse/tnef_parse.c:131
+#: src/plugins/tnef_parse/tnef_parse.c:138
 msgid "Failed to write the part data."
 msgstr "Het schrijven van de deel data is mislukt."
 
-#: src/plugins/tnef_parse/tnef_parse.c:182
+#: src/plugins/tnef_parse/tnef_parse.c:183
 msgid "Failed to parse VCalendar data."
 msgstr "Het verwerken van de VCalendar-data is mislukt."
 
-#: src/plugins/tnef_parse/tnef_parse.c:221
+#: src/plugins/tnef_parse/tnef_parse.c:222
 msgid "Failed to parse VTask data."
-msgstr "Het verwerken van de VTask data is mislukt"
+msgstr "Het verwerken van de VTask data is mislukt."
 
-#: src/plugins/tnef_parse/tnef_parse.c:273
+#: src/plugins/tnef_parse/tnef_parse.c:274
 msgid "Failed to parse VCard data."
 msgstr "Het verwerken van de VCard data is mislukt."
 
-#: src/plugins/tnef_parse/tnef_parse.c:413
-#: src/plugins/tnef_parse/tnef_parse.c:437
+#: src/plugins/tnef_parse/tnef_parse.c:414
+#: src/plugins/tnef_parse/tnef_parse.c:438
 msgid "TNEF Parser"
 msgstr "TNEF Verwerker"
 
-#: src/plugins/tnef_parse/tnef_parse.c:442
+#: src/plugins/tnef_parse/tnef_parse.c:443
 msgid ""
 "This Claws Mail plugin allows you to read application/ms-tnef attachments.\n"
 "\n"
 "The plugin uses the Ytnef library, which is copyright 2002-2007 by Randall "
 "Hand <yerase at yerot.com>"
 msgstr ""
-"Deze Claws Mail plugin maakt het mogelijk om application/ms-tnef bijvoegsels "
-"te lezen.\n"
+"Deze Claws Mail plugin maakt het mogelijk om application/ms-tnef bijlages te "
+"lezen.\n"
 "\n"
 "De plugin gebruikt de Ytnef bibliotheek, welke valt onder auteursrecht "
 "2002-2007 door Randall Hand <yerase at yerot.com>"
@@ -13375,11 +13506,11 @@ msgstr "Aanmaken nieuwe afspraak..."
 msgid "_Go to today"
 msgstr "_Ga naar vandaag"
 
-#: src/plugins/vcalendar/day-view.c:593 src/plugins/vcalendar/month-view.c:690
+#: src/plugins/vcalendar/day-view.c:594 src/plugins/vcalendar/month-view.c:690
 msgid "Start"
 msgstr "Start"
 
-#: src/plugins/vcalendar/day-view.c:606 src/plugins/vcalendar/month-view.c:703
+#: src/plugins/vcalendar/day-view.c:607 src/plugins/vcalendar/month-view.c:703
 msgid "Show"
 msgstr "Laat zien"
 
@@ -13459,15 +13590,15 @@ msgstr "November"
 msgid "December"
 msgstr "December"
 
-#: src/plugins/vcalendar/month-view.c:796
+#: src/plugins/vcalendar/month-view.c:798
 msgid "Week number"
 msgstr "Weeknummer"
 
-#: src/plugins/vcalendar/month-view.c:886
+#: src/plugins/vcalendar/month-view.c:889
 msgid "Previous month"
 msgstr "Vorige maand"
 
-#: src/plugins/vcalendar/month-view.c:906
+#: src/plugins/vcalendar/month-view.c:909
 msgid "Next month"
 msgstr "Volgende maand"
 
@@ -13516,65 +13647,65 @@ msgid ""
 msgstr ""
 "Je bent bezig om %d afspraken aan te maken, één voor één. Wil je doorgaan?"
 
-#: src/plugins/vcalendar/vcalendar.c:139
+#: src/plugins/vcalendar/vcalendar.c:140
 msgid "Creating meeting..."
 msgstr "Maak afspraak aan..."
 
-#: src/plugins/vcalendar/vcalendar.c:158
+#: src/plugins/vcalendar/vcalendar.c:159
 msgid "no subject"
 msgstr "geen onderwerp"
 
-#: src/plugins/vcalendar/vcalendar.c:384
+#: src/plugins/vcalendar/vcalendar.c:385
 msgid "Accept"
 msgstr "Accepteer"
 
-#: src/plugins/vcalendar/vcalendar.c:385
+#: src/plugins/vcalendar/vcalendar.c:386
 msgid "Tentatively accept"
 msgstr "Voorlopig accepteren"
 
-#: src/plugins/vcalendar/vcalendar.c:386
+#: src/plugins/vcalendar/vcalendar.c:387
 msgid "Decline"
 msgstr "Afwijzen"
 
-#: src/plugins/vcalendar/vcalendar.c:473
+#: src/plugins/vcalendar/vcalendar.c:474
 msgid "You have a Todo item."
 msgstr "Je hebt een Todo item."
 
-#: src/plugins/vcalendar/vcalendar.c:474 src/plugins/vcalendar/vcalendar.c:481
-#: src/plugins/vcalendar/vcalendar.c:486 src/plugins/vcalendar/vcalendar.c:494
-#: src/plugins/vcalendar/vcalendar.c:503 src/plugins/vcalendar/vcalendar.c:744
+#: src/plugins/vcalendar/vcalendar.c:475 src/plugins/vcalendar/vcalendar.c:482
+#: src/plugins/vcalendar/vcalendar.c:487 src/plugins/vcalendar/vcalendar.c:495
+#: src/plugins/vcalendar/vcalendar.c:504 src/plugins/vcalendar/vcalendar.c:716
 msgid "Details follow:"
 msgstr "Details volgen:"
 
-#: src/plugins/vcalendar/vcalendar.c:480
+#: src/plugins/vcalendar/vcalendar.c:481
 msgid "You have created a meeting."
 msgstr "Je hebt een afspraak aangemaakt."
 
-#: src/plugins/vcalendar/vcalendar.c:485
+#: src/plugins/vcalendar/vcalendar.c:486
 msgid "You have been invited to a meeting."
 msgstr "Je bent uitgenodigd voor een afspraak."
 
-#: src/plugins/vcalendar/vcalendar.c:493
+#: src/plugins/vcalendar/vcalendar.c:494
 msgid "A meeting to which you had been invited has been cancelled."
 msgstr "Een afspraak waar je voor uitgenodigd was is afgezegd."
 
-#: src/plugins/vcalendar/vcalendar.c:502
+#: src/plugins/vcalendar/vcalendar.c:503
 msgid "You have been forwarded an appointment."
 msgstr "Je hebt een afspraak doorgestuurd gekregen."
 
-#: src/plugins/vcalendar/vcalendar.c:556
+#: src/plugins/vcalendar/vcalendar.c:557
 msgid "(this event recurs)"
 msgstr "(deze gebeurtenis gebeurt opnieuw)"
 
-#: src/plugins/vcalendar/vcalendar.c:563
+#: src/plugins/vcalendar/vcalendar.c:564
 msgid "(this event is part of a recurring event)"
 msgstr "(deze gebeurtenis is onderdeel van een terugkerende gebeurtenis)"
 
-#: src/plugins/vcalendar/vcalendar.c:743
+#: src/plugins/vcalendar/vcalendar.c:715
 msgid "You have received an answer to an unknown meeting proposal."
 msgstr "Je hebt antwoord ontvangen op een onbekend afspraak voorstel."
 
-#: src/plugins/vcalendar/vcalendar.c:747
+#: src/plugins/vcalendar/vcalendar.c:719
 #, c-format
 msgid ""
 "You have received an answer to a meeting proposal.\n"
@@ -13583,35 +13714,35 @@ msgstr ""
 "Je hebt antwoord ontvangen op een afspraak voorstel.\n"
 "%s heeft %s de uitnodiging met de volgende details:"
 
-#: src/plugins/vcalendar/vcalendar.c:826
+#: src/plugins/vcalendar/vcalendar.c:798
 msgid "Error - could not get the calendar MIME part."
 msgstr "Fout - kon niet het agenda-MIME-deel verkrijgen."
 
-#: src/plugins/vcalendar/vcalendar.c:833
+#: src/plugins/vcalendar/vcalendar.c:805
 msgid "Error - no calendar part found."
 msgstr "Fout - geen agenda deel gevonden."
 
-#: src/plugins/vcalendar/vcalendar.c:847
+#: src/plugins/vcalendar/vcalendar.c:819
 msgid "Error - Unknown calendar component type."
 msgstr "Fout - Onbekend agenda component-type."
 
-#: src/plugins/vcalendar/vcalendar.c:976
+#: src/plugins/vcalendar/vcalendar.c:951
 msgid "Send a notification to the attendees"
 msgstr "Stuur een notificatie naar de genodigden"
 
-#: src/plugins/vcalendar/vcalendar.c:985
+#: src/plugins/vcalendar/vcalendar.c:960
 msgid "Cancel meeting"
 msgstr "Zeg afspraak af"
 
-#: src/plugins/vcalendar/vcalendar.c:986
+#: src/plugins/vcalendar/vcalendar.c:961
 msgid "Are you sure you want to cancel this meeting?"
 msgstr "Weet je zeker dat je deze afspraak wilt afzeggen?"
 
-#: src/plugins/vcalendar/vcalendar.c:1081
+#: src/plugins/vcalendar/vcalendar.c:1056
 msgid "No account found"
 msgstr "Geen account gevonden"
 
-#: src/plugins/vcalendar/vcalendar.c:1082
+#: src/plugins/vcalendar/vcalendar.c:1057
 msgid ""
 "You have no account matching any attendee.\n"
 "Do you want to reply anyway?"
@@ -13619,128 +13750,128 @@ msgstr ""
 "Je hebt geen account dat overeenkomt met een genodigde.\n"
 "Wil je toch antwoorden?"
 
-#: src/plugins/vcalendar/vcalendar.c:1084
+#: src/plugins/vcalendar/vcalendar.c:1059
 msgid "Reply anyway"
 msgstr "Toch antwoorden"
 
-#: src/plugins/vcalendar/vcalendar.c:1213
+#: src/plugins/vcalendar/vcalendar.c:1188
 msgid "Answer"
 msgstr "Antwoord"
 
-#: src/plugins/vcalendar/vcalendar.c:1214
+#: src/plugins/vcalendar/vcalendar.c:1189
 msgid "Edit meeting..."
 msgstr "Pas afspraak aan..."
 
-#: src/plugins/vcalendar/vcalendar.c:1215
+#: src/plugins/vcalendar/vcalendar.c:1190
 msgid "Cancel meeting..."
 msgstr "Zeg afspraak af..."
 
-#: src/plugins/vcalendar/vcalendar.c:1216
+#: src/plugins/vcalendar/vcalendar.c:1191
 msgid "Launch website"
 msgstr "Ga naar website"
 
-#: src/plugins/vcalendar/vcalendar.c:1220
+#: src/plugins/vcalendar/vcalendar.c:1195
 msgid "You are already busy at this time."
 msgstr "Je bent al bezet op dit moment."
 
-#: src/plugins/vcalendar/vcalendar.c:1259
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1727
+#: src/plugins/vcalendar/vcalendar.c:1234
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1613
 msgid "Event:"
 msgstr "Gebeurtenis:"
 
-#: src/plugins/vcalendar/vcalendar.c:1260
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1705
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1716
+#: src/plugins/vcalendar/vcalendar.c:1235
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1591
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1602
 msgid "Organizer:"
 msgstr "Agenda:"
 
-#: src/plugins/vcalendar/vcalendar.c:1261
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1708
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1718
+#: src/plugins/vcalendar/vcalendar.c:1236
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1594
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1604
 msgid "Location:"
 msgstr "Locatie:"
 
-#: src/plugins/vcalendar/vcalendar.c:1262
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1706
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1717
+#: src/plugins/vcalendar/vcalendar.c:1237
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1592
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1603
 msgid "Summary:"
 msgstr "Samenvatting:"
 
-#: src/plugins/vcalendar/vcalendar.c:1263
+#: src/plugins/vcalendar/vcalendar.c:1238
 msgid "Starting:"
 msgstr "Start:"
 
-#: src/plugins/vcalendar/vcalendar.c:1264
+#: src/plugins/vcalendar/vcalendar.c:1239
 msgid "Ending:"
 msgstr "Einde:"
 
-#: src/plugins/vcalendar/vcalendar.c:1266
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1710
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1720
+#: src/plugins/vcalendar/vcalendar.c:1241
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1596
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1606
 msgid "Attendees:"
 msgstr "Genodigden:"
 
-#: src/plugins/vcalendar/vcalendar.c:1268
+#: src/plugins/vcalendar/vcalendar.c:1243
 msgid "Action:"
 msgstr "Actie:"
 
-#: src/plugins/vcalendar/vcal_folder.c:166
+#: src/plugins/vcalendar/vcal_folder.c:168
 msgid "_New meeting..."
 msgstr "_Nieuwe afspraak..."
 
-#: src/plugins/vcalendar/vcal_folder.c:167
+#: src/plugins/vcalendar/vcal_folder.c:169
 msgid "_Export calendar..."
 msgstr "_Exporteer agenda..."
 
-#: src/plugins/vcalendar/vcal_folder.c:168
+#: src/plugins/vcalendar/vcal_folder.c:170
 msgid "_Subscribe to Webcal..."
 msgstr "_Schrijf je in voor Webcal..."
 
-#: src/plugins/vcalendar/vcal_folder.c:170
+#: src/plugins/vcalendar/vcal_folder.c:172
 msgid "_Rename..."
 msgstr "_Hernoem..."
 
-#: src/plugins/vcalendar/vcal_folder.c:171
+#: src/plugins/vcalendar/vcal_folder.c:173
 msgid "U_pdate subscriptions"
 msgstr "_Ververs abonnementen"
 
-#: src/plugins/vcalendar/vcal_folder.c:172
+#: src/plugins/vcalendar/vcal_folder.c:174
 msgid "_List view"
 msgstr "_Lijst beeld"
 
-#: src/plugins/vcalendar/vcal_folder.c:173
+#: src/plugins/vcalendar/vcal_folder.c:175
 msgid "_Week view"
 msgstr "_Week beeld"
 
-#: src/plugins/vcalendar/vcal_folder.c:174
+#: src/plugins/vcalendar/vcal_folder.c:176
 msgid "_Month view"
 msgstr "_Maand beeld"
 
-#: src/plugins/vcalendar/vcal_folder.c:1101
+#: src/plugins/vcalendar/vcal_folder.c:1103
 msgid "Meetings"
 msgstr "Afspraken"
 
-#: src/plugins/vcalendar/vcal_folder.c:1500
+#: src/plugins/vcalendar/vcal_folder.c:1502
 msgid "in the past"
 msgstr "in het verleden"
 
-#: src/plugins/vcalendar/vcal_folder.c:1503
+#: src/plugins/vcalendar/vcal_folder.c:1505
 msgid "today"
 msgstr "vandaag"
 
-#: src/plugins/vcalendar/vcal_folder.c:1506
+#: src/plugins/vcalendar/vcal_folder.c:1508
 msgid "tomorrow"
 msgstr "morgen"
 
-#: src/plugins/vcalendar/vcal_folder.c:1509
+#: src/plugins/vcalendar/vcal_folder.c:1511
 msgid "this week"
 msgstr "deze week"
 
-#: src/plugins/vcalendar/vcal_folder.c:1512
+#: src/plugins/vcalendar/vcal_folder.c:1514
 msgid "later"
 msgstr "later"
 
-#: src/plugins/vcalendar/vcal_folder.c:1516
+#: src/plugins/vcalendar/vcal_folder.c:1518
 #, c-format
 msgid ""
 "\n"
@@ -13749,17 +13880,21 @@ msgstr ""
 "\n"
 "Dit zijn de dingen gepland %s:\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1611
+#: src/plugins/vcalendar/vcal_folder.c:1615
 #, c-format
 msgid "Timeout (%d seconds) connecting to %s\n"
 msgstr "Tijdslimiet (%d secondes) voor verbinden met %s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1629
+#: src/plugins/vcalendar/vcal_folder.c:1627
+msgid "403 (Unauthorised)"
+msgstr "403 (Niet geautoriseerd)"
+
+#: src/plugins/vcalendar/vcal_folder.c:1633
 #, c-format
 msgid "Error %ld"
 msgstr "Fout %ld"
 
-#: src/plugins/vcalendar/vcal_folder.c:1811
+#: src/plugins/vcalendar/vcal_folder.c:1815
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -13772,7 +13907,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1837
+#: src/plugins/vcalendar/vcal_folder.c:1846
 #, c-format
 msgid ""
 "This URL does not look like a Webcal URL:\n"
@@ -13783,130 +13918,130 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1868
-#: src/plugins/vcalendar/vcal_folder.c:1871
+#: src/plugins/vcalendar/vcal_folder.c:1877
+#: src/plugins/vcalendar/vcal_folder.c:1880
 #, c-format
 msgid "Could not create directory %s"
 msgstr "Kon de doelmap %s niet aanmaken"
 
-#: src/plugins/vcalendar/vcal_folder.c:1911
+#: src/plugins/vcalendar/vcal_folder.c:1920
 msgid "Claws Mail needs network access in order to update the Webcal feed."
 msgstr "Claws Mail heeft netwerk toegang nodig om de Webcal-feed te verversen."
 
-#: src/plugins/vcalendar/vcal_folder.c:1922
+#: src/plugins/vcalendar/vcal_folder.c:1931
 #, c-format
 msgid "Fetching calendar for %s..."
 msgstr "Kalender voor %s wordt bijgewerkt..."
 
-#: src/plugins/vcalendar/vcal_folder.c:1923
+#: src/plugins/vcalendar/vcal_folder.c:1932
 msgid "new subscription"
-msgstr "Nieuw abonnement"
+msgstr "nieuw abonnement"
 
-#: src/plugins/vcalendar/vcal_folder.c:1934
+#: src/plugins/vcalendar/vcal_folder.c:1943
 msgid "Claws Mail needs network access in order to update the subscription."
 msgstr "Claws Mail heeft netwerk toegang nodig om de abonnering te vernieuwen."
 
-#: src/plugins/vcalendar/vcal_folder.c:1946
+#: src/plugins/vcalendar/vcal_folder.c:1955
 msgid "Subscribe to Webcal"
 msgstr "Abonneren op Webcal"
 
-#: src/plugins/vcalendar/vcal_folder.c:1946
-msgid "Enter the WebCal URL:"
-msgstr "Voer de WebCal-URL in:"
+#: src/plugins/vcalendar/vcal_folder.c:1955
+msgid "Enter the Webcal URL:"
+msgstr "Voer de Webcal-URL in:"
 
-#: src/plugins/vcalendar/vcal_folder.c:1958
+#: src/plugins/vcalendar/vcal_folder.c:1967
 msgid "Could not parse the URL."
 msgstr "Kon de URL niet verwerken."
 
-#: src/plugins/vcalendar/vcal_folder.c:1986
+#: src/plugins/vcalendar/vcal_folder.c:1995
 msgid "Do you really want to unsubscribe?"
 msgstr "Wil je echt uitschrijven?"
 
-#: src/plugins/vcalendar/vcal_folder.c:1987
+#: src/plugins/vcalendar/vcal_folder.c:1996
 msgid "Delete subscription"
 msgstr "Verwijder abonnement"
 
-#: src/plugins/vcalendar/vcal_manager.c:110
+#: src/plugins/vcalendar/vcal_manager.c:111
 msgid "accepted"
 msgstr "geaccepteerd"
 
-#: src/plugins/vcalendar/vcal_manager.c:111
+#: src/plugins/vcalendar/vcal_manager.c:112
 msgid "tentatively accepted"
 msgstr "voorlopig geaccepteerd"
 
-#: src/plugins/vcalendar/vcal_manager.c:112
+#: src/plugins/vcalendar/vcal_manager.c:113
 msgid "declined"
 msgstr "afgewezen"
 
-#: src/plugins/vcalendar/vcal_manager.c:113
+#: src/plugins/vcalendar/vcal_manager.c:114
 msgid "did not answer"
 msgstr "niet beantwoord"
 
-#: src/plugins/vcalendar/vcal_manager.c:144
+#: src/plugins/vcalendar/vcal_manager.c:145
 msgid "individual"
 msgstr "individueel"
 
-#: src/plugins/vcalendar/vcal_manager.c:145
+#: src/plugins/vcalendar/vcal_manager.c:146
 msgid "group"
 msgstr "groep"
 
-#: src/plugins/vcalendar/vcal_manager.c:146
+#: src/plugins/vcalendar/vcal_manager.c:147
 msgid "resource"
 msgstr "bron"
 
-#: src/plugins/vcalendar/vcal_manager.c:147
+#: src/plugins/vcalendar/vcal_manager.c:148
 msgid "room"
 msgstr "kamer"
 
-#: src/plugins/vcalendar/vcal_manager.c:558
+#: src/plugins/vcalendar/vcal_manager.c:560
 msgid "Past"
 msgstr "Vorige"
 
-#: src/plugins/vcalendar/vcal_manager.c:561
+#: src/plugins/vcalendar/vcal_manager.c:563
 msgid "Today"
 msgstr "Vandaag"
 
-#: src/plugins/vcalendar/vcal_manager.c:564
+#: src/plugins/vcalendar/vcal_manager.c:566
 msgid "Tomorrow"
 msgstr "Morgen"
 
-#: src/plugins/vcalendar/vcal_manager.c:567
+#: src/plugins/vcalendar/vcal_manager.c:569
 msgid "This week"
 msgstr "Deze week"
 
-#: src/plugins/vcalendar/vcal_manager.c:570
+#: src/plugins/vcalendar/vcal_manager.c:572
 msgid "Later"
 msgstr "Later"
 
-#: src/plugins/vcalendar/vcal_manager.c:1246
+#: src/plugins/vcalendar/vcal_manager.c:1248
 msgid "Accepted: "
 msgstr "Geaccepteerd: "
 
-#: src/plugins/vcalendar/vcal_manager.c:1248
+#: src/plugins/vcalendar/vcal_manager.c:1250
 msgid "Declined: "
 msgstr "Afgewezen: "
 
-#: src/plugins/vcalendar/vcal_manager.c:1250
+#: src/plugins/vcalendar/vcal_manager.c:1252
 msgid "Tentatively Accepted: "
 msgstr "Voorlopig Geaccepteerd: "
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:307
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:308
 msgid "Individual"
 msgstr "Individueel"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:309
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:310
 msgid "Resource"
 msgstr "Bron"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:310
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:311
 msgid "Room"
 msgstr "Kamer"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:323
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:324
 msgid "Add..."
 msgstr "Toevoegen..."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:779
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:728
 msgid ""
 "The following people are busy at the time of your planned meeting:\n"
 "- "
@@ -13914,62 +14049,62 @@ msgstr ""
 "De volgende personen zijn bezet op het moment van de geplande afspraak:\n"
 "- "
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:780
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:869
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:955
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:729
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:818
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:904
 msgid "You"
 msgstr "U"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:781
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:730
 msgid "You are busy at the time of your planned meeting"
 msgstr "Je bent bezet op het moment van de geplande afspraak"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:783
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:732
 #, c-format
 msgid "%s is busy at the time of your planned meeting"
 msgstr "%s is bezet op het moment van de geplande afspraak"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:785
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:734
 #, c-format
 msgid "%d hour sooner"
 msgstr "%d uur eerder"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:787
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:736
 #, c-format
 msgid "%d hours sooner"
 msgstr "%d uur eerder"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:789
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:738
 #, c-format
 msgid "%d hours and %d minutes sooner"
 msgstr "%d uur en %d minuten eerder"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:791
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:740
 #, c-format
 msgid "%d minutes sooner"
 msgstr "%d minuten eerder"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:796
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:745
 #, c-format
 msgid "%d hour later"
 msgstr "%d uur later"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:798
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:747
 #, c-format
 msgid "%d hours later"
 msgstr "%d uur later"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:800
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:749
 #, c-format
 msgid "%d hours and %d minutes later"
 msgstr "%d uur en %d minuten later"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:802
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:751
 #, c-format
 msgid "%d minutes later"
 msgstr "%d minuten later"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:808
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:757
 #, c-format
 msgid ""
 "\n"
@@ -13980,7 +14115,7 @@ msgstr ""
 "\n"
 "Iedereen zou beschikbaar zijn op %s of %s."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:810
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:759
 #, c-format
 msgid ""
 "\n"
@@ -13991,7 +14126,7 @@ msgstr ""
 "\n"
 "Iedereen zou beschikbaar zijn op %s."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:812
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:761
 msgid ""
 "\n"
 "\n"
@@ -14003,73 +14138,73 @@ msgstr ""
 "Het is niet mogelijk deze afspraak te hebben met iedereen in de vorige of de "
 "volgende 6 uur."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:817
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:766
 #, c-format
 msgid "would be available %s or %s"
 msgstr "is beschikbaar %s of %s"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:819
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:768
 #, c-format
 msgid "would be available %s"
 msgstr "is beschikbaar %s"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:821
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:882
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:952
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:770
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:831
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:901
 msgid "not available"
 msgstr "niet beschikbaar"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:824
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:773
 #, c-format
 msgid ", but would be available %s or %s."
 msgstr ", maar zou beschikbaar zijn %s of %s."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:826
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:775
 #, c-format
 msgid ", but would be available %s."
 msgstr ", maar zou beschikbaar zijn %s."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:828
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:777
 msgid ", and isn't available in the previous or next 6 hours."
 msgstr ", en is niet beschikbaar in de vorige of volgende 6 uur."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:885
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:834
 msgid "available"
 msgstr "beschikbaar"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:887
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1136
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:836
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1087
 msgid "Free/busy retrieval failed"
 msgstr "Vrij/bezet ophalen mislukt"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:969
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:918
 msgid "Not everyone is available"
 msgstr "Niet iedereen is beschikbaar"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:970
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:919
 msgid "Send anyway"
 msgstr "Verstuur toch"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:981
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:930
 msgid "Not everyone is available. See tooltips for more info..."
 msgstr "Niet iedereen is beschikbaar. Zie tooltips voor meer info..."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1118
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1069
 #, c-format
 msgid "Fetching planning for %s..."
 msgstr "Planning voor %s wordt bijgewerkt..."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1145
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1096
 msgid "Available"
 msgstr "Beschikbaar"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1158
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1165
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1173
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1109
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1116
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1124
 msgid "Everyone is available."
 msgstr "Iedereen is beschikbaar."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1174
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1125
 msgid ""
 "Everyone seems available, but some free/busy information failed to be "
 "retrieved."
@@ -14077,7 +14212,7 @@ msgstr ""
 "Iedereen lijkt beschikbaar, maar sommige vrij/bezet informatie kon niet "
 "opgehaald worden."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1340
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1295
 msgid ""
 "Could not send the meeting invitation.\n"
 "Check the recipients."
@@ -14085,61 +14220,61 @@ msgstr ""
 "Kon de uitnodiging niet versturen.\n"
 "Controleer de ontvangers."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1461
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1376
 msgid "Save & Send"
 msgstr "Opslaan en verzenden"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1462
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1377
 msgid "Check availability"
 msgstr "Controleer beschikbaarheid"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1585
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1471
 msgid "Starts at:"
 msgstr "Begint om:"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1591
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1615
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1477
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1501 src/prefs_matcher.c:771
 msgid "on:"
 msgstr "aan:"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1609
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1495
 msgid "Ends at:"
 msgstr "Eindigt om:"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1650
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1536
 msgid "New meeting"
 msgstr "Nieuwe afspraak"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1652
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1538
 #, c-format
 msgid "%s - Edit meeting"
 msgstr "%s - Pas afspraak aan"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1707
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1731
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1593
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1617
 msgid "Time:"
 msgstr "Tijd:"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1864
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1739
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d uur"
 msgstr[1] "%d uur"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1867
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1742
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuut"
 msgstr[1] "%d minuten"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1878
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1753
 #, c-format
 msgid "Upcoming event: %s"
 msgstr "Eerstvolgende afspraak: %s"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1879
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1754
 #, c-format
 msgid ""
 "You have a meeting or event soon.\n"
@@ -14156,39 +14291,39 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1896
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1771
 #, c-format
 msgid "Remind me in %d minute"
 msgid_plural "Remind me in %d minutes"
 msgstr[0] "Herinner me over %d minuut"
 msgstr[1] "Herinner me over %d minuten"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2022
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1897
 msgid "Empty calendar"
 msgstr "Lege agenda"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2023
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1898
 msgid "There is nothing to export."
 msgstr "Er is niets te exporteren."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2063
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1938
 msgid "Could not export the calendar."
-msgstr "Kon de agenda niet exporteren"
+msgstr "Kon de agenda niet exporteren."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2080
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1955
 msgid "Export calendar to ICS"
 msgstr "Exporteer agenda nar ICS"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2103
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1978
 #, c-format
 msgid "Couldn't export calendar to '%s'\n"
 msgstr "Kon agenda niet exporteren naar '%s'\n"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2219
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2094
 msgid "Could not export the freebusy info."
 msgstr "Kon de vrij/bezet info niet exporteren."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2251
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2126
 #, c-format
 msgid "Couldn't export free/busy to '%s'\n"
 msgstr "Kon vrij/bezet niet exporteren naar '%s'\n"
@@ -14283,107 +14418,107 @@ msgstr ""
 msgid "SSL/TLS options"
 msgstr "SSL/TLS-opties"
 
-#: src/pop.c:152
+#: src/pop.c:153
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Er is geen APOP-timestamp gevonden in de begroeting\n"
 
-#: src/pop.c:159
+#: src/pop.c:160
 msgid "Timestamp syntax error in greeting\n"
 msgstr "APOP-timestamp in de begroeting is ongeldig\n"
 
-#: src/pop.c:166
+#: src/pop.c:167
 msgid "Timestamp syntax error in greeting (not ASCII)\n"
 msgstr "Timestamp syntax in de begroeting (geen ASCII) is ongeldig\n"
 
-#: src/pop.c:190 src/pop.c:217
+#: src/pop.c:191 src/pop.c:218
 msgid "POP protocol error\n"
 msgstr "POP-protocolfout\n"
 
-#: src/pop.c:263
+#: src/pop.c:264
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "ongeldig UIDL antwoord: %s\n"
 
-#: src/pop.c:841
+#: src/pop.c:843
 #, c-format
 msgid "POP: Deleting expired message %d [%s]\n"
 msgstr "POP: Verwijderen verlopen bericht %d [%s]\n"
 
-#: src/pop.c:857
+#: src/pop.c:859
 #, c-format
 msgid "POP: Skipping message %d [%s] (%d bytes)\n"
 msgstr "POP: Bericht %d [%s] wordt overgeslagen (%d bytes)\n"
 
-#: src/pop.c:889
+#: src/pop.c:891
 msgid "mailbox is locked\n"
 msgstr "postvak zit op slot\n"
 
-#: src/pop.c:892
+#: src/pop.c:894
 msgid "Session timeout\n"
 msgstr "Sessie verlopen\n"
 
-#: src/pop.c:911
+#: src/pop.c:913
 msgid "command not supported\n"
 msgstr "opdracht wordt niet ondersteund\n"
 
-#: src/pop.c:916
+#: src/pop.c:918
 msgid "error occurred on POP session\n"
 msgstr "er is een fout opgetreden in de POP-sessie\n"
 
-#: src/pop.c:1111
+#: src/pop.c:1113
 msgid "TOP command unsupported\n"
 msgstr "TOP-opdracht wordt niet ondersteund\n"
 
-#: src/prefs_account.c:335 src/prefs_account.c:1487 src/prefs_account.c:2500
+#: src/prefs_account.c:364 src/prefs_account.c:1559 src/prefs_account.c:2635
 msgid "POP"
 msgstr "POP"
 
-#: src/prefs_account.c:336 src/prefs_account.c:1600 src/prefs_account.c:2515
-#: src/wizard.c:1499
+#: src/prefs_account.c:365 src/prefs_account.c:1672 src/prefs_account.c:2650
+#: src/wizard.c:1501
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/prefs_account.c:337
+#: src/prefs_account.c:366
 msgid "News (NNTP)"
 msgstr "Nieuws (NNTP)"
 
-#: src/prefs_account.c:338 src/wizard.c:1500
+#: src/prefs_account.c:367 src/wizard.c:1502
 msgid "Local mbox file"
 msgstr "Lokaal mbox-bestand"
 
-#: src/prefs_account.c:339
+#: src/prefs_account.c:368
 msgid "None (SMTP only)"
 msgstr "Niets (alleen SMTP)"
 
-#: src/prefs_account.c:1040
+#: src/prefs_account.c:1131
 msgid "Name of account"
 msgstr "Naam van dit account"
 
-#: src/prefs_account.c:1049
+#: src/prefs_account.c:1140
 msgid "Set as default"
-msgstr "Instellen als standaardaccount "
+msgstr "Instellen als standaardaccount"
 
-#: src/prefs_account.c:1057
+#: src/prefs_account.c:1148
 msgid "Personal information"
 msgstr "Persoonlijke informatie"
 
-#: src/prefs_account.c:1066
+#: src/prefs_account.c:1157
 msgid "Full name"
 msgstr "Volledige naam"
 
-#: src/prefs_account.c:1072
+#: src/prefs_account.c:1163
 msgid "Mail address"
 msgstr "E-mailadres"
 
-#: src/prefs_account.c:1135 src/wizard.c:1523
+#: src/prefs_account.c:1226 src/wizard.c:1525
 msgid "Auto-configure"
 msgstr "Automatische instellingen"
 
-#: src/prefs_account.c:1137 src/wizard.c:1524
+#: src/prefs_account.c:1228 src/wizard.c:1526
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: src/prefs_account.c:1154
+#: src/prefs_account.c:1245
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP and News support."
@@ -14391,77 +14526,77 @@ msgstr ""
 "Waarschuwing: deze versie van Claws Mail is\n"
 "gecompileerd zonder ondersteuning voor IMAP en Nieuws."
 
-#: src/prefs_account.c:1185
+#: src/prefs_account.c:1276
 msgid "This server requires authentication"
 msgstr "Deze server vereist authenticatie"
 
-#: src/prefs_account.c:1192
+#: src/prefs_account.c:1283
 msgid "Authenticate on connect"
 msgstr "Authenticatie bij verbinding maken"
 
-#: src/prefs_account.c:1254
+#: src/prefs_account.c:1345
 msgid "News server"
 msgstr "Nieuwsserver"
 
-#: src/prefs_account.c:1260
+#: src/prefs_account.c:1351
 msgid "Server for receiving"
 msgstr "Server om van te ontvangen"
 
-#: src/prefs_account.c:1266
+#: src/prefs_account.c:1357
 msgid "Local mailbox"
 msgstr "Lokaal postvak"
 
-#: src/prefs_account.c:1273
+#: src/prefs_account.c:1364
 msgid "SMTP server (send)"
 msgstr "SMTP-server (zenden)"
 
-#: src/prefs_account.c:1281
+#: src/prefs_account.c:1372
 msgid "Use mail command rather than SMTP server"
-msgstr "Gebruik mail opdracht ipv. SMTP"
+msgstr "Gebruik mail opdracht i.p.v. SMTP"
 
-#: src/prefs_account.c:1290
+#: src/prefs_account.c:1381
 msgid "command to send mails"
 msgstr "opdracht voor versturen berichten"
 
-#: src/prefs_account.c:1365
+#: src/prefs_account.c:1454
 #, c-format
 msgid "Account%d"
 msgstr "Account%d"
 
-#: src/prefs_account.c:1461
+#: src/prefs_account.c:1533
 msgid "Local"
 msgstr "Lokaal"
 
-#: src/prefs_account.c:1467 src/prefs_account.c:1556
+#: src/prefs_account.c:1539 src/prefs_account.c:1628
 msgid "Default Inbox"
 msgstr "Standaard Inbox"
 
-#: src/prefs_account.c:1474 src/prefs_account.c:1481 src/prefs_account.c:1563
-#: src/prefs_account.c:1570
+#: src/prefs_account.c:1546 src/prefs_account.c:1553 src/prefs_account.c:1635
+#: src/prefs_account.c:1642
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Ongefilterde berichten gaan in deze map"
 
-#: src/prefs_account.c:1489
+#: src/prefs_account.c:1561
 msgid "Use secure authentication (APOP)"
 msgstr "Gebruik beveiligde authenticatie (APOP)"
 
-#: src/prefs_account.c:1492
+#: src/prefs_account.c:1564
 msgid "Remove messages on server when received"
 msgstr "Verwijder reeds ontvangen berichten van de server"
 
-#: src/prefs_account.c:1503
+#: src/prefs_account.c:1575
 msgid "Remove after"
 msgstr "Verwijder na"
 
-#: src/prefs_account.c:1510 src/prefs_account.c:1520
+#: src/prefs_account.c:1582 src/prefs_account.c:1592
 msgid "0 days and 0 hours : remove immediately"
 msgstr "0 dagen en 0 uur: verwijder meteen"
 
-#: src/prefs_account.c:1533
+#: src/prefs_account.c:1605
 msgid "Receive size limit"
 msgstr "Limiet op grootte"
 
-#: src/prefs_account.c:1536
+#: src/prefs_account.c:1608
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
@@ -14470,82 +14605,95 @@ msgstr ""
 "opgehaald. Als je zo'n bericht selecteert, kun je kiezen om het helemaal op "
 "te halen of te verwijderen."
 
-#: src/prefs_account.c:1576 src/prefs_account.c:2530
+#: src/prefs_account.c:1648 src/prefs_account.c:2665
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account.c:1583
+#: src/prefs_account.c:1655
 msgid "Maximum number of articles to download"
 msgstr "Maximum aantal artikelen dat zal worden opgehaald"
 
-#: src/prefs_account.c:1593
+#: src/prefs_account.c:1665
 msgid "unlimited if 0 is specified"
 msgstr "ongelimiteerd als 0 is opgegeven"
 
-#: src/prefs_account.c:1618
+#: src/prefs_account.c:1690
 msgid "Plain text"
 msgstr "Platte tekst"
 
-#: src/prefs_account.c:1631
+#: src/prefs_account.c:1703
 msgid "IMAP server directory"
 msgstr "IMAP-servermap"
 
-#: src/prefs_account.c:1635
+#: src/prefs_account.c:1707
 msgid "(usually empty)"
 msgstr "(gewoonlijk leeg)"
 
-#: src/prefs_account.c:1649
+#: src/prefs_account.c:1721
 msgid "Show subscribed folders only"
 msgstr "Geef alleen geabonneerde mappen weer"
 
-#: src/prefs_account.c:1656
+#: src/prefs_account.c:1728
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr "Bandbreedte-efficiente methode (vermijdt ophalen van tags)"
 
-#: src/prefs_account.c:1658
+#: src/prefs_account.c:1730
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr ""
 "Deze methode gebruikt minder bandbreedte, maar kan langzamer zijn met "
 "bepaalde servers."
 
-#: src/prefs_account.c:1665
+#: src/prefs_account.c:1737 src/prefs_receive.c:164
+msgid "Automatic checking"
+msgstr "Automatisch controleren"
+
+#: src/prefs_account.c:1740
+msgid "Use global settings"
+msgstr "Globale instellingen gebruiken"
+
+# TPTD: check
+#: src/prefs_account.c:1746 src/prefs_receive.c:171
+msgid "Check for new mail every"
+msgstr "Controleer op nieuwe berichten elke"
+
+#: src/prefs_account.c:1785
 msgid "Filter messages on receiving"
 msgstr "Filter de berichten bij het ophalen"
 
-#: src/prefs_account.c:1672
+#: src/prefs_account.c:1801
 msgid "Allow filtering using plugins on receiving"
 msgstr "Filter de berichten bij het ophalen met behulp van plugins"
 
-#: src/prefs_account.c:1676
+#: src/prefs_account.c:1805
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "'Ophalen' haalt de e-mail voor dit account op"
 
-#: src/prefs_account.c:1759 src/prefs_customheader.c:208
-#: src/prefs_matcher.c:623 src/prefs_matcher.c:1970 src/prefs_matcher.c:1992
+#: src/prefs_account.c:1894 src/prefs_customheader.c:210
+#: src/prefs_matcher.c:634 src/prefs_matcher.c:2014 src/prefs_matcher.c:2042
 msgid "Header"
 msgstr "Header"
 
-#: src/prefs_account.c:1761
+#: src/prefs_account.c:1896
 msgid "Generate Message-ID"
 msgstr "Bericht-ID aanmaken"
 
-#: src/prefs_account.c:1764
+#: src/prefs_account.c:1899
 msgid "Send account mail address in Message-ID"
 msgstr "Stuur account-e-mailadres in Bericht-ID"
 
-#: src/prefs_account.c:1767
+#: src/prefs_account.c:1902
 msgid "Add user agent header"
 msgstr "Voeg een header van de gebruikers-agent toe"
 
-#: src/prefs_account.c:1774
+#: src/prefs_account.c:1909
 msgid "Add user-defined header"
 msgstr "Voeg een door de gebruiker gespecificeerde header toe"
 
-#: src/prefs_account.c:1789
+#: src/prefs_account.c:1924
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP-authenticatie (SMTP AUTH)"
 
-#: src/prefs_account.c:1887
+#: src/prefs_account.c:2022
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -14553,168 +14701,204 @@ msgstr ""
 "Als je deze velden leeg laat, worden dezelfde\n"
 "gebruikersnaam en wachtwoord gebruikt als bij ontvangen."
 
-#: src/prefs_account.c:1898
+#: src/prefs_account.c:2033
 msgid "Authenticate with POP before sending"
 msgstr "Authenticatie met POP voor het verzenden"
 
-#: src/prefs_account.c:1913
-msgid "POP authentication timeout: "
-msgstr "Tijdslimiet voor POP-authenticatie: "
+#: src/prefs_account.c:2048
+msgid "POP authentication timeout"
+msgstr "Tijdslimiet voor POP-authenticatie"
 
-#: src/prefs_account.c:2001 src/prefs_account.c:2047
+#: src/prefs_account.c:2136 src/prefs_account.c:2182
 msgid "Signature"
-msgstr "Handtekening"
+msgstr "Ondertekening"
 
-#: src/prefs_account.c:2004
+#: src/prefs_account.c:2139
 msgid "Automatically insert signature"
 msgstr "Voeg automatisch ondertekening in"
 
-#: src/prefs_account.c:2009
+#: src/prefs_account.c:2144
 msgid "Signature separator"
-msgstr "Scheidingsteken van handtekening"
+msgstr "Scheidingsteken van ondertekening"
 
-#: src/prefs_account.c:2034
+#: src/prefs_account.c:2169
 msgid "Command output"
 msgstr "Opdracht-uitvoer"
 
-#: src/prefs_account.c:2067
+#: src/prefs_account.c:2202
 msgid "Automatically set the following addresses"
 msgstr "Automatisch volgende adressen instellen"
 
-#: src/prefs_account.c:2119
+#: src/prefs_account.c:2254
 msgid "Spell check dictionaries"
 msgstr "Woordenlijsten voor spellingcontrole"
 
-#: src/prefs_account.c:2129 src/prefs_folder_item.c:1104
+#: src/prefs_account.c:2264 src/prefs_folder_item.c:1114
 #: src/prefs_spelling.c:162
 msgid "Default dictionary"
 msgstr "Standaard woordenlijst"
 
-#: src/prefs_account.c:2142 src/prefs_folder_item.c:1138
+#: src/prefs_account.c:2277 src/prefs_folder_item.c:1148
 #: src/prefs_spelling.c:174
 msgid "Default alternate dictionary"
 msgstr "Standaard alternatieve woordenlijst"
 
-#: src/prefs_account.c:2228 src/prefs_account.c:3423
-#: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1449
-#: src/prefs_folder_item.c:1842 src/prefs_quote.c:119 src/prefs_quote.c:237
+#: src/prefs_account.c:2363 src/prefs_account.c:3776
+#: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1539
+#: src/prefs_folder_item.c:1924 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:332 src/prefs_wrapping.c:152
 msgid "Compose"
 msgstr "Opstellen"
 
-#: src/prefs_account.c:2243 src/prefs_folder_item.c:1477 src/prefs_quote.c:134
+#: src/prefs_account.c:2378 src/prefs_folder_item.c:1567 src/prefs_quote.c:134
 #: src/toolbar.c:490
 msgid "Reply"
 msgstr "Antwoord"
 
-#: src/prefs_account.c:2258 src/prefs_filtering_action.c:191
-#: src/prefs_folder_item.c:1505 src/prefs_quote.c:149 src/toolbar.c:495
+#: src/prefs_account.c:2393 src/prefs_filtering_action.c:185
+#: src/prefs_folder_item.c:1595 src/prefs_quote.c:149 src/toolbar.c:495
 msgid "Forward"
 msgstr "Doorsturen"
 
-#: src/prefs_account.c:2305
+#: src/prefs_account.c:2440
 msgid "Default privacy system"
 msgstr "Standaard privacy-systeem"
 
-#: src/prefs_account.c:2334
+#: src/prefs_account.c:2469 src/prefs_folder_item.c:1188
 msgid "Always sign messages"
 msgstr "Berichten altijd ondertekenen"
 
-#: src/prefs_account.c:2336
+#: src/prefs_account.c:2471 src/prefs_folder_item.c:1220
 msgid "Always encrypt messages"
 msgstr "Berichten altijd versleutelen"
 
-#: src/prefs_account.c:2338
+#: src/prefs_account.c:2473
 msgid "Always sign messages when replying to a signed message"
 msgstr ""
-"Berichten altijd versleutelen bij het reageren op een ondertekend bericht"
+"Berichten altijd ondertekenen bij het reageren op een ondertekend bericht"
 
-#: src/prefs_account.c:2341
+#: src/prefs_account.c:2476
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr ""
 "Berichten altijd versleutelen bij het reageren op een versleuteld bericht"
 
-#: src/prefs_account.c:2344
+#: src/prefs_account.c:2479
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr ""
 "Versleutel verzonden berichten behalve met de sleutel van de ontvanger ook "
 "met je eigen sleutel"
 
-#: src/prefs_account.c:2346
+#: src/prefs_account.c:2481
 msgid "Save sent encrypted messages as clear text"
 msgstr "Sla verzonden versleutelde berichten onversleuteld op"
 
-#: src/prefs_account.c:2504 src/prefs_account.c:2519 src/prefs_account.c:2533
+#: src/prefs_account.c:2639 src/prefs_account.c:2654 src/prefs_account.c:2668
 msgid "Don't use SSL/TLS"
 msgstr "Gebruik geen SSL/TLS"
 
-#: src/prefs_account.c:2507 src/prefs_account.c:2522 src/prefs_account.c:2542
-#: src/prefs_account.c:2553
+#: src/prefs_account.c:2642 src/prefs_account.c:2657 src/prefs_account.c:2677
+#: src/prefs_account.c:2688
 msgid "Use SSL/TLS"
 msgstr "Gebruik SSL/TLS"
 
-#: src/prefs_account.c:2510 src/prefs_account.c:2525 src/prefs_account.c:2556
+#: src/prefs_account.c:2645 src/prefs_account.c:2660 src/prefs_account.c:2691
 msgid "Use STARTTLS command to start encrypted session"
 msgstr "Gebruik STARTTLS voor starten beveiligde sessie"
 
-#: src/prefs_account.c:2546
+#: src/prefs_account.c:2681
 msgid "Send (SMTP)"
 msgstr "Verzenden (SMTP)"
 
-#: src/prefs_account.c:2550
+#: src/prefs_account.c:2685
 msgid "Don't use SSL/TLS (but, if necessary, use STARTTLS)"
 msgstr "Gebruik geen SSL/TLS (maar, als het noodzakelijk is, gebruik STARTTLS)"
 
-#: src/prefs_account.c:2561
+#: src/prefs_account.c:2696
 msgid "Client certificates"
 msgstr "Client-certificaten"
 
-#: src/prefs_account.c:2569
+#: src/prefs_account.c:2704
 msgid "Certificate for receiving"
 msgstr "Certificaat om te ontvangen"
 
-#: src/prefs_account.c:2574 src/prefs_account.c:2576 src/prefs_account.c:2602
-#: src/prefs_account.c:2604
+#: src/prefs_account.c:2709 src/prefs_account.c:2711 src/prefs_account.c:2737
+#: src/prefs_account.c:2739
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr "Client-certificaat-bestand als een PKCS12- of PEM-bestand"
 
-#: src/prefs_account.c:2597
+#: src/prefs_account.c:2732
 msgid "Certificate for sending"
 msgstr "Certificaat om te verzenden"
 
-#: src/prefs_account.c:2637
+#: src/prefs_account.c:2772
 msgid "Automatically accept valid SSL/TLS certificates"
 msgstr "Geldige SSL/TLS-certificaten automatisch accepteren"
 
-#: src/prefs_account.c:2640
+#: src/prefs_account.c:2775
 msgid "Use non-blocking SSL/TLS"
 msgstr "Gebruik niet-blokkerende SSL/TLS"
 
-#: src/prefs_account.c:2652
+#: src/prefs_account.c:2787
 msgid "Turn this off if you have SSL/TLS connection problems"
 msgstr "Zet dit uit als je problemen hebt met SSL/TLS-verbindingen"
 
-#: src/prefs_account.c:2787
+#: src/prefs_account.c:2879 src/prefs_proxy.c:73
+msgid "Use proxy server"
+msgstr "Proxy-server gebruiken"
+
+#: src/prefs_account.c:2888
+msgctxt ""
+"In account preferences, referring to whether or not use proxy settings from "
+"common preferences"
+msgid "Use default settings"
+msgstr "Gebruik de standaard instellingen"
+
+#: src/prefs_account.c:2890
+msgid "Use global proxy server settings"
+msgstr "Globale proxy-instellingen gebruiken"
+
+#: src/prefs_account.c:2927 src/prefs_proxy.c:115 src/wizard.c:1120
+msgid "Use authentication"
+msgstr "Gebruik authenticatie"
+
+#: src/prefs_account.c:2932 src/prefs_proxy.c:123
+msgid "Username"
+msgstr "Gebruikersnaam"
+
+#: src/prefs_account.c:2966
+msgid "Use proxy server for sending"
+msgstr "Proxy-server gebruiken voor verzenden"
+
+#: src/prefs_account.c:2968
+msgid ""
+"If disabled, messages will be sent using direct connection to configured "
+"outgoing server, bypassing any configured proxy server."
+msgstr ""
+"Wanneer uitgeschakeld, worden berichten verzonden via directe verbinding "
+"naar de ingestelde uitgaande server, en wordt de ingestelde proxy-server "
+"niet gebruikt."
+
+#: src/prefs_account.c:3079
 msgid "SMTP port"
 msgstr "SMTP-poort"
 
-#: src/prefs_account.c:2794
+#: src/prefs_account.c:3086
 msgid "POP port"
 msgstr "POP-poort"
 
-#: src/prefs_account.c:2801
+#: src/prefs_account.c:3093
 msgid "IMAP port"
 msgstr "IMAP-poort"
 
-#: src/prefs_account.c:2808
+#: src/prefs_account.c:3100
 msgid "NNTP port"
 msgstr "NNTP-poort"
 
-#: src/prefs_account.c:2814
+#: src/prefs_account.c:3106
 msgid "Domain name"
 msgstr "Domeinnaam"
 
-#: src/prefs_account.c:2817
+#: src/prefs_account.c:3109
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
@@ -14722,218 +14906,238 @@ msgstr ""
 "De domeinnaam wordt gebruikt in de aangemaakte Bericht-ID, en wanneer er "
 "wordt verbonden met SMTP-servers."
 
-#: src/prefs_account.c:2831
+#: src/prefs_account.c:3123
 msgid "Use command to communicate with server"
 msgstr "Gebruik opdracht om te communiceren met server"
 
-#: src/prefs_account.c:2840
+#: src/prefs_account.c:3132
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Markeer dubbel geplaatste berichten als gelezen en kleur:"
 
-#: src/prefs_account.c:2896
+#: src/prefs_account.c:3185
 msgid "Put sent messages in"
 msgstr "Plaats verzonden berichten in"
 
-#: src/prefs_account.c:2898
+#: src/prefs_account.c:3187
 msgid "Put queued messages in"
 msgstr "Plaats berichten in wachtrij in"
 
-#: src/prefs_account.c:2900
+#: src/prefs_account.c:3189
 msgid "Put draft messages in"
 msgstr "Plaats kladberichten in"
 
-#: src/prefs_account.c:2902
+#: src/prefs_account.c:3191
 msgid "Put deleted messages in"
 msgstr "Plaats verwijderde berichten in"
 
-#: src/prefs_account.c:2961
+#: src/prefs_account.c:3248
 msgid "Account name is not entered."
 msgstr "Je hebt geen accountnaam opgegeven."
 
-#: src/prefs_account.c:2965
+#: src/prefs_account.c:3252
 msgid "Mail address is not entered."
 msgstr "Je hebt geen e-mailadres opgegeven."
 
-#: src/prefs_account.c:2973
+#: src/prefs_account.c:3260
 msgid "SMTP server is not entered."
 msgstr "Je hebt geen SMTP-server opgegeven."
 
-#: src/prefs_account.c:2978
+#: src/prefs_account.c:3265
 msgid "User ID is not entered."
 msgstr "Je hebt geen gebruikers-ID opgegeven."
 
-#: src/prefs_account.c:2983
+#: src/prefs_account.c:3270
 msgid "POP server is not entered."
 msgstr "Je hebt geen POP-server opgegeven."
 
-#: src/prefs_account.c:3003
+#: src/prefs_account.c:3290
 msgid "The default Inbox folder doesn't exist."
 msgstr "De standaard Inbox-map bestaat niet."
 
-#: src/prefs_account.c:3009
+#: src/prefs_account.c:3296
 msgid "IMAP server is not entered."
 msgstr "Je hebt geen IMAP-server opgegeven."
 
-#: src/prefs_account.c:3014
+#: src/prefs_account.c:3301
 msgid "NNTP server is not entered."
 msgstr "Je hebt geen NNTP-server opgegeven."
 
-#: src/prefs_account.c:3020
+#: src/prefs_account.c:3307
 msgid "local mailbox filename is not entered."
-msgstr "Je hebt geen bestandsnaam voor het lokale postvak opgegeven."
+msgstr "je hebt geen bestandsnaam voor het lokale postvak opgegeven."
 
-#: src/prefs_account.c:3026
+#: src/prefs_account.c:3313
 msgid "mail command is not entered."
-msgstr "Je hebt geen mail-opdrachtregel opgegeven."
+msgstr "je hebt geen mail-opdrachtregel opgegeven."
 
-#: src/prefs_account.c:3036
+#: src/prefs_account.c:3323
 msgid "User ID cannot contain a newline character."
 msgstr "Gebruikers-ID kan geen karakter voor nieuwe regel bevatten."
 
-#: src/prefs_account.c:3041
+#: src/prefs_account.c:3328
 msgid "Password cannot contain a newline character."
 msgstr "Wachtwoord kan geen karakter voor nieuwe regel bevatten."
 
-#: src/prefs_account.c:3069
+#: src/prefs_account.c:3356
 msgid "SMTP user ID cannot contain a newline character."
 msgstr "SMTP gebruikers-ID kan geen karakter voor nieuwe regel bevatten."
 
-#: src/prefs_account.c:3074
+#: src/prefs_account.c:3361
 msgid "SMTP password cannot contain a newline character."
 msgstr "SMTP-wachtwoord kan geen karakter voor nieuwe regel bevatten."
 
-#: src/prefs_account.c:3387
+#: src/prefs_account.c:3437
+msgid "domain is not specified."
+msgstr "geen domein opgegeven."
+
+#: src/prefs_account.c:3442
+msgid "sent folder is not selected."
+msgstr "verzonden-map is niet geselecteerd."
+
+#: src/prefs_account.c:3447
+msgid "queue folder is not selected."
+msgstr "wachtrij-map is niet geselecteerd."
+
+#: src/prefs_account.c:3452
+msgid "draft folder is not selected."
+msgstr "concept-map is niet geselecteerd."
+
+#: src/prefs_account.c:3457
+msgid "trash folder is not selected."
+msgstr "prullenbak-map is niet geselecteerd."
+
+#: src/prefs_account.c:3740
 msgid "Receive"
 msgstr "Ontvangen"
 
-#: src/prefs_account.c:3441 src/prefs_folder_item.c:1858 src/prefs_quote.c:238
+#: src/prefs_account.c:3794 src/prefs_folder_item.c:1940 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Sjablonen"
 
-#: src/prefs_account.c:3459
+#: src/prefs_account.c:3812
 msgid "Privacy"
 msgstr "Privacy"
 
-#: src/prefs_account.c:3571
+#: src/prefs_account.c:3942
 msgid "Advanced"
 msgstr "Geavanceerd"
 
-#: src/prefs_account.c:3906
+#: src/prefs_account.c:4291
 msgid "Preferences for new account"
 msgstr "Voorkeuren voor nieuw account"
 
-#: src/prefs_account.c:3908
+#: src/prefs_account.c:4293
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - accountvoorkeuren"
 
-#: src/prefs_account.c:4029 src/wizard.c:1388
+#: src/prefs_account.c:4412 src/wizard.c:1390
 msgid "Failed (wrong address)"
 msgstr "Mislukt (verkeerd adres)"
 
-#: src/prefs_account.c:4114
+#: src/prefs_account.c:4497
 msgid "Select signature file"
-msgstr "Selecteer bestand met handtekening"
+msgstr "Selecteer bestand met ondertekening"
 
-#: src/prefs_account.c:4132 src/prefs_account.c:4149 src/wizard.c:1065
+#: src/prefs_account.c:4515 src/prefs_account.c:4532 src/wizard.c:1067
 msgid "Select certificate file"
 msgstr "Selecteer certificaat-bestand"
 
-#: src/prefs_account.c:4245
+#: src/prefs_account.c:4628
 msgid "Protocol:"
 msgstr "Protocol:"
 
-#: src/prefs_account.c:4385
+#: src/prefs_account.c:4799
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (plugin niet geladen)"
 
-#: src/prefs_actions.c:223
+#: src/prefs_actions.c:225
 msgid "Actions configuration"
 msgstr "Acties instellen"
 
-#: src/prefs_actions.c:250
+#: src/prefs_actions.c:252
 msgid "Menu name"
 msgstr "Menunaam"
 
-#: src/prefs_actions.c:283
+#: src/prefs_actions.c:285
 msgid "Shell command"
 msgstr "Voer opdracht uit"
 
-#: src/prefs_actions.c:293
+#: src/prefs_actions.c:295
 msgid "Filter action"
 msgstr "Filter actie"
 
-#: src/prefs_actions.c:299
+#: src/prefs_actions.c:301
 msgid "Edit filter action"
 msgstr "Bewerk filter actie"
 
-#: src/prefs_actions.c:327
+#: src/prefs_actions.c:329
 msgid "Append the new action above to the list"
 msgstr "Plaats de nieuwe actie bovenaan de lijst"
 
-#: src/prefs_actions.c:335
+#: src/prefs_actions.c:337
 msgid "Replace the selected action in list with the action above"
 msgstr "Vervang de geselecteerde actie in de lijst met bovenstaande actie"
 
-#: src/prefs_actions.c:337 src/prefs_filtering_action.c:616
-#: src/prefs_filtering.c:486 src/prefs_matcher.c:780 src/prefs_template.c:320
-#: src/prefs_toolbar.c:1069
+#: src/prefs_actions.c:339 src/prefs_filtering_action.c:589
+#: src/prefs_filtering.c:487 src/prefs_matcher.c:804 src/prefs_template.c:320
+#: src/prefs_toolbar.c:1024
 msgid "D_elete"
 msgstr "V_erwijderen"
 
-#: src/prefs_actions.c:345
+#: src/prefs_actions.c:347
 msgid "Delete the selected action from the list"
 msgstr "Verwijder de geselecteerde actie van de lijst"
 
-#: src/prefs_actions.c:355 src/prefs_filtering.c:503 src/prefs_template.c:338
+#: src/prefs_actions.c:357 src/prefs_filtering.c:504 src/prefs_template.c:338
 msgid "Clear all the input fields in the dialog"
 msgstr "Wis alle invoervelden in de dialoog"
 
-#: src/prefs_actions.c:363
+#: src/prefs_actions.c:365
 msgid "Show information on configuring actions"
 msgstr "Geef informatie weer over configureren van acties"
 
-#: src/prefs_actions.c:394
+#: src/prefs_actions.c:396
 msgid "Move the selected action up"
 msgstr "Verplaats de geselecteerde actie naar boven"
 
-#: src/prefs_actions.c:402
+#: src/prefs_actions.c:404
 msgid "Move selected action down"
 msgstr "Verplaats de geselecteerde actie naar onderen"
 
-#: src/prefs_actions.c:535 src/prefs_filtering_action.c:707
-#: src/prefs_filtering.c:838 src/prefs_filtering.c:840
-#: src/prefs_filtering.c:841 src/prefs_filtering.c:951 src/prefs_matcher.c:897
+#: src/prefs_actions.c:537 src/prefs_filtering_action.c:678
+#: src/prefs_filtering.c:839 src/prefs_filtering.c:841
+#: src/prefs_filtering.c:842 src/prefs_filtering.c:952 src/prefs_matcher.c:922
 #: src/prefs_template.c:472
 msgid "(New)"
 msgstr "(Nieuw)"
 
-#: src/prefs_actions.c:600
+#: src/prefs_actions.c:602
 msgid "Menu name is not set."
 msgstr "Menunaam is niet ingevoerd."
 
-#: src/prefs_actions.c:605
+#: src/prefs_actions.c:607
 msgid "A leading '/' is not allowed in the menu name."
 msgstr "Een menunaam mag niet met een '/' beginnen."
 
-#: src/prefs_actions.c:610
+#: src/prefs_actions.c:612
 msgid "Colon ':' is not allowed in the menu name."
 msgstr "Dubbele punt ':' is niet toegestaan in de menunaam."
 
-#: src/prefs_actions.c:629
+#: src/prefs_actions.c:631
 msgid "Menu name is too long."
 msgstr "Menunaam is te lang."
 
-#: src/prefs_actions.c:638
+#: src/prefs_actions.c:640
 msgid "Command-line not set."
 msgstr "Opdrachtregel is niet ingevoerd."
 
-#: src/prefs_actions.c:643
+#: src/prefs_actions.c:645
 msgid "Menu name and command are too long."
 msgstr "Menunaam en opdrachtregel zijn te lang."
 
-#: src/prefs_actions.c:649
+#: src/prefs_actions.c:651
 #, c-format
 msgid ""
 "The command\n"
@@ -14944,148 +15148,148 @@ msgstr ""
 "%s\n"
 "bevat een syntaxfout."
 
-#: src/prefs_actions.c:707
+#: src/prefs_actions.c:709
 msgid "Delete action"
 msgstr "Verwijder actie"
 
-#: src/prefs_actions.c:708
+#: src/prefs_actions.c:710
 msgid "Do you really want to delete this action?"
 msgstr "Wil je werkelijk deze actie verwijderen?"
 
-#: src/prefs_actions.c:728
+#: src/prefs_actions.c:730
 msgid "Delete all actions"
 msgstr "Verwijder alle acties"
 
-#: src/prefs_actions.c:729
+#: src/prefs_actions.c:731
 msgid "Do you really want to delete all the actions?"
 msgstr "Wil je werkelijk alle acties verwijderen?"
 
-#: src/prefs_actions.c:892 src/prefs_actions.c:923 src/prefs_filtering.c:1501
-#: src/prefs_filtering.c:1523 src/prefs_matcher.c:2117 src/prefs_template.c:572
+#: src/prefs_actions.c:894 src/prefs_actions.c:925 src/prefs_filtering.c:1504
+#: src/prefs_filtering.c:1526 src/prefs_matcher.c:2165 src/prefs_template.c:572
 #: src/prefs_template.c:597
 msgid "Entry not saved"
 msgstr "Ingang niet opgeslagen"
 
-#: src/prefs_actions.c:893 src/prefs_actions.c:924 src/prefs_filtering.c:1502
-#: src/prefs_filtering.c:1524 src/prefs_template.c:573 src/prefs_template.c:598
+#: src/prefs_actions.c:895 src/prefs_actions.c:926 src/prefs_filtering.c:1505
+#: src/prefs_filtering.c:1527 src/prefs_template.c:573 src/prefs_template.c:598
 msgid "The entry was not saved. Close anyway?"
 msgstr "Deze ingang is nie opgeslagen. Toch afsluiten?"
 
-#: src/prefs_actions.c:894 src/prefs_actions.c:899 src/prefs_actions.c:925
-#: src/prefs_filtering.c:1481 src/prefs_filtering.c:1503
-#: src/prefs_filtering.c:1525 src/prefs_matcher.c:2120 src/prefs_template.c:574
+#: src/prefs_actions.c:896 src/prefs_actions.c:901 src/prefs_actions.c:927
+#: src/prefs_filtering.c:1484 src/prefs_filtering.c:1506
+#: src/prefs_filtering.c:1528 src/prefs_matcher.c:2168 src/prefs_template.c:574
 #: src/prefs_template.c:599 src/prefs_template.c:604
 msgid "_Continue editing"
 msgstr "Ga _door met bewerken"
 
-#: src/prefs_actions.c:897
+#: src/prefs_actions.c:899
 msgid "Actions list not saved"
 msgstr "Actielijst is niet bewaard"
 
-#: src/prefs_actions.c:898
+#: src/prefs_actions.c:900
 msgid "The actions list has been modified. Close anyway?"
 msgstr "De actielijst is gewijzigd. Toch afsluiten?"
 
-#: src/prefs_actions.c:968
+#: src/prefs_actions.c:970
 msgid "<span weight=\"bold\" underline=\"single\">Menu name:</span>"
 msgstr "<span weight=\"bold\" underline=\"single\">Menunaam:</span>"
 
-#: src/prefs_actions.c:969
+#: src/prefs_actions.c:971
 msgid "Use / in menu name to make submenus."
 msgstr "Gebruik '/' in een menunaam om submenus te maken."
 
-#: src/prefs_actions.c:971
+#: src/prefs_actions.c:973
 msgid "<span weight=\"bold\" underline=\"single\">Command-line:</span>"
 msgstr "<span weight=\"bold\" underline=\"single\">Opdrachtregel:</span>"
 
-#: src/prefs_actions.c:972
+#: src/prefs_actions.c:974
 msgid "<span weight=\"bold\">Begin with:</span>"
 msgstr "<span weight=\"bold\">Begin met:</span>"
 
-#: src/prefs_actions.c:973
+#: src/prefs_actions.c:975
 msgid "to send message body or selection to command's standard input"
 msgstr ""
-"om de berichttekst of selectie naar de standaard input van de opdracht te "
-"sturen."
+"om de berichttekst of selectie naar de standaard invoer van de opdracht te "
+"sturen"
 
-#: src/prefs_actions.c:974
+#: src/prefs_actions.c:976
 msgid "to send user provided text to command's standard input"
 msgstr ""
-"om door de gebruiker opgegeven tekst naar de standaard input van de opdracht "
-"te sturen."
+"om door de gebruiker opgegeven tekst naar de standaard invoer van de "
+"opdracht te sturen"
 
-#: src/prefs_actions.c:975
+#: src/prefs_actions.c:977
 msgid "to send user provided hidden text to command's standard input"
 msgstr ""
 "om door de gebruiker opgegeven, maar verborgen, tekst naar de standaard "
-"input van de opdracht te sturen."
+"invoer van de opdracht te sturen"
 
-#: src/prefs_actions.c:976
+#: src/prefs_actions.c:978
 msgid "<span weight=\"bold\">End with:</span>"
 msgstr "<span weight=\"bold\">Eindig met:</span>"
 
-#: src/prefs_actions.c:977
+#: src/prefs_actions.c:979
 msgid "to replace message body or selection with command's standard output"
 msgstr ""
-"om de berichttekst of selectie te vervangen met de standaard output van de "
-"opdracht."
+"om de berichttekst of selectie te vervangen met de standaard uitvoer van de "
+"opdracht"
 
-#: src/prefs_actions.c:978
+#: src/prefs_actions.c:980
 msgid "to insert command's standard output without replacing old text"
 msgstr ""
-"de standaard output van de opdracht in te voegen, zonder de oude tekst te "
-"vervangen."
+"de standaard uitvoer van de opdracht in te voegen, zonder de oude tekst te "
+"vervangen"
 
-#: src/prefs_actions.c:979
+#: src/prefs_actions.c:981
 msgid "to run command asynchronously"
 msgstr "om de opdracht asynchroon uit te voeren"
 
-#: src/prefs_actions.c:980
+#: src/prefs_actions.c:982
 msgid "<span weight=\"bold\">Use:</span>"
 msgstr "<span weight=\"bold\">Gebruik:</span>"
 
-#: src/prefs_actions.c:981
+#: src/prefs_actions.c:983
 msgid "for the file of the selected message in RFC822/2822 format "
 msgstr ""
-"voor het bestand met daarin het geselecteerde bericht in RFC822/2822 format"
+"voor het bestand met daarin het geselecteerde bericht in RFC822/2822-format "
 
-#: src/prefs_actions.c:982
+#: src/prefs_actions.c:984
 msgid ""
 "for the list of the files of the selected messages in RFC822/2822 format"
 msgstr ""
-"voor de lijst van bestanden van de geselecteerde berichten in RFC822/2822 "
+"voor de lijst van bestanden van de geselecteerde berichten in RFC822/2822-"
 "format"
 
-#: src/prefs_actions.c:983
+#: src/prefs_actions.c:985
 msgid "for the file of the selected decoded message MIME part"
 msgstr "voor het bestand van het geselecteerde berichtonderdeel"
 
-#: src/prefs_actions.c:984
+#: src/prefs_actions.c:986
 msgid "for a user provided argument"
 msgstr "voor een door de gebruiker opgegeven argument"
 
-#: src/prefs_actions.c:985
+#: src/prefs_actions.c:987
 msgid "for a user provided hidden argument (e.g. password)"
 msgstr ""
 "voor een door de gebruiker opgegeven verborgen argument (bijv. wachtwoord)"
 
-#: src/prefs_actions.c:986
+#: src/prefs_actions.c:988
 msgid "for the text selection"
 msgstr "voor de tekst selectie"
 
-#: src/prefs_actions.c:987
+#: src/prefs_actions.c:989
 msgid "apply filtering actions between {} to selected messages"
 msgstr "voer de filteracties tussen de {} uit op de geselecteerde berichten"
 
-#: src/prefs_actions.c:988
+#: src/prefs_actions.c:990
 msgid "for a literal %"
 msgstr "letterlijke %"
 
-#: src/prefs_actions.c:998 src/prefs_themes.c:1088
+#: src/prefs_actions.c:1000 src/prefs_themes.c:1090
 msgid "Actions"
 msgstr "Acties"
 
-#: src/prefs_actions.c:999
+#: src/prefs_actions.c:1001
 msgid ""
 "The Actions feature is a way for the user to launch external commands to "
 "process a complete message file or just one of its parts."
@@ -15093,29 +15297,29 @@ msgstr ""
 "Met 'Acties' kunt externe programma's uitvoeren om berichten of gedeelten "
 "daarvan te verwerken."
 
-#: src/prefs_actions.c:1086 src/prefs_filtering.c:1699
-#: src/prefs_template.c:1113
+#: src/prefs_actions.c:1088 src/prefs_filtering.c:1702
+#: src/prefs_template.c:1114
 msgid "D_uplicate"
 msgstr "D_ubbele"
 
-#: src/prefs_actions.c:1206
+#: src/prefs_actions.c:1208
 msgid "Current actions"
 msgstr "Huidige acties"
 
-#: src/prefs_actions.c:1305 src/prefs_filtering.c:1078
-#: src/prefs_filtering.c:1136
+#: src/prefs_actions.c:1307 src/prefs_filtering.c:1079
+#: src/prefs_filtering.c:1137
 msgid "Action string is not valid."
 msgstr "Actie-regel is niet geldig."
 
-#: src/prefs_common.c:236 src/prefs_quote.c:69
+#: src/prefs_common.c:239 src/prefs_quote.c:69
 msgid "Hello,\\n"
 msgstr "Hallo,\\n"
 
-#: src/prefs_common.c:314
+#: src/prefs_common.c:317
 msgid "On %d\\n%f wrote:\\n\\n%q\\n%X"
 msgstr "Op %d\\n%f schreef:\\n\\n%q\\n%X"
 
-#: src/prefs_common.c:320 src/prefs_quote.c:85
+#: src/prefs_common.c:323 src/prefs_quote.c:85
 msgid ""
 "\\n\\nBegin forwarded message:\\n\\n?d{Date: %d\\n}?f{From: %f\\n}?t{To: %t"
 "\\n}?c{Cc: %c\\n}?n{Newsgroups: %n\\n}?s{Subject: %s\\n}\\n\\n%M"
@@ -15123,7 +15327,7 @@ msgstr ""
 "\\n\\nBegin doorgestuurd bericht:\\n\\n?d{Datum: %d\\n}?f{Van: %f\\n}?t{Aan: "
 "%t\\n}?c{Cc: %c\\n}?n{Nieuwsgroepen: %n\\n}?s{Onderwerp: %s\\n}\\n\\n%M"
 
-#: src/prefs_common.c:448
+#: src/prefs_common.c:451
 msgid "%x(%a) %H:%M"
 msgstr "%x(%a) %H:%M"
 
@@ -15191,9 +15395,9 @@ msgstr "Antwoord-knop beantwoordt mailing-lijst"
 msgid "Forwarding"
 msgstr "Doorsturen"
 
-#: src/prefs_compose_writing.c:225 src/prefs_filtering_action.c:192
+#: src/prefs_compose_writing.c:225 src/prefs_filtering_action.c:186
 msgid "Forward as attachment"
-msgstr "Doorsturen als bijvoegsel"
+msgstr "Doorsturen als bijlage"
 
 #: src/prefs_compose_writing.c:227
 #, c-format
@@ -15220,98 +15424,98 @@ msgstr "Bijvoegen"
 msgid "Writing"
 msgstr "Schrijven"
 
-#: src/prefs_customheader.c:183
+#: src/prefs_customheader.c:185
 msgid "Custom header configuration"
 msgstr "Aangepaste header instellen"
 
-#: src/prefs_customheader.c:506 src/prefs_display_header.c:601
-#: src/prefs_matcher.c:1597 src/prefs_matcher.c:1612
+#: src/prefs_customheader.c:504 src/prefs_display_header.c:589
+#: src/prefs_matcher.c:1637 src/prefs_matcher.c:1652
 msgid "Header name is not set."
 msgstr "Header-naam niet ingevoerd."
 
-#: src/prefs_customheader.c:516
+#: src/prefs_customheader.c:514
 msgid "This Header name is not allowed as a custom header."
 msgstr "Deze header-naam is niet toegestaan voor een aangepaste header."
 
-#: src/prefs_customheader.c:563
+#: src/prefs_customheader.c:561
 msgid "Choose a PNG file"
 msgstr "Kies een PNG-bestand"
 
-#: src/prefs_customheader.c:565
+#: src/prefs_customheader.c:563
 msgid "Choose an XBM file"
 msgstr "Kies een XBM-bestand"
 
-#: src/prefs_customheader.c:567
+#: src/prefs_customheader.c:565
 msgid "Choose a text file"
 msgstr "Kies een tekst-bestand"
 
-#: src/prefs_customheader.c:580
+#: src/prefs_customheader.c:578
 msgid "This file isn't an image."
 msgstr "Dit bestand is geen afbeelding."
 
-#: src/prefs_customheader.c:585
+#: src/prefs_customheader.c:583
 msgid "The chosen image isn't the correct size (48x48)."
 msgstr "De gekozen afbeelding heeft niet de goede afmetingen (48x48)"
 
-#: src/prefs_customheader.c:591
+#: src/prefs_customheader.c:589
 msgid "The image is too big; it must be maximum 725 bytes."
 msgstr "De afbeelding is te groot, het mag maximaal 725 bytes zijn."
 
-#: src/prefs_customheader.c:596
+#: src/prefs_customheader.c:594
 msgid "The image isn't in the correct format (PNG)."
 msgstr "De afbeelding heeft niet het goede format (PNG)."
 
-#: src/prefs_customheader.c:605
+#: src/prefs_customheader.c:603
 msgid "The image isn't in the correct format (XBM)."
 msgstr "De afbeelding heeft niet het goede format (XBM)."
 
-#: src/prefs_customheader.c:614
+#: src/prefs_customheader.c:612
 msgid "Couldn't call `compface`. Make sure it's in your $PATH."
 msgstr ""
 "Kon 'compface' niet aanroepen. Zorg ervoor dat het in je $PATH voorkomt."
 
-#: src/prefs_customheader.c:620
+#: src/prefs_customheader.c:618
 #, c-format
 msgid "Compface error: %s"
 msgstr "'Compface' fout: %s"
 
-#: src/prefs_customheader.c:673
+#: src/prefs_customheader.c:671
 msgid "This file contains newlines."
 msgstr "Dit bestand bevat regeleinden."
 
-#: src/prefs_customheader.c:703
+#: src/prefs_customheader.c:701
 msgid "Delete header"
 msgstr "Verwijder header"
 
-#: src/prefs_customheader.c:704
+#: src/prefs_customheader.c:702
 msgid "Do you really want to delete this header?"
 msgstr "Wil je deze header werkelijk verwijderen?"
 
-#: src/prefs_customheader.c:877
+#: src/prefs_customheader.c:875
 msgid "Current custom headers"
 msgstr "Huidige aangepaste headers"
 
-#: src/prefs_display_header.c:252
+#: src/prefs_display_header.c:254
 msgid "Displayed header configuration"
 msgstr "Weergegeven header instellen"
 
-#: src/prefs_display_header.c:276
+#: src/prefs_display_header.c:278
 msgid "Header name"
 msgstr "Header-naam"
 
-#: src/prefs_display_header.c:319
-msgid "Displayed Headers"
-msgstr "Weergegeven headers"
-
-#: src/prefs_display_header.c:381
+#: src/prefs_display_header.c:313
 msgid "Hidden headers"
 msgstr "Verborgen headers"
 
-#: src/prefs_display_header.c:407
+#: src/prefs_display_header.c:354
+msgid "Displayed Headers"
+msgstr "Weergegeven headers"
+
+#: src/prefs_display_header.c:399
 msgid "Show all unspecified headers"
 msgstr "Alle headers weergeven"
 
-#: src/prefs_display_header.c:611
+#: src/prefs_display_header.c:599
 msgid "This header is already in the list."
 msgstr "Deze header staat al in de lijst."
 
@@ -15345,12 +15549,12 @@ msgid ""
 "This option enables MIME parts to be displayed in the message view via a "
 "script when using the 'Display as text' contextual menu item"
 msgstr ""
-"Deze optie maakt het mogelijk om als MIME-onderdelen van een bericht m.b.v "
+"Deze optie maakt het mogelijk om als MIME-onderdelen van een bericht m.b.v. "
 "de 'Als tekst weergeven'-optie worden weergegeven, dit te laten doen door "
-"middel van een script."
+"middel van een script"
 
 #: src/prefs_ext_prog.c:282 src/prefs_image_viewer.c:138
-#: src/prefs_message.c:354
+#: src/prefs_message.c:351
 msgid "Message View"
 msgstr "Berichtweergave"
 
@@ -15358,177 +15562,173 @@ msgstr "Berichtweergave"
 msgid "External Programs"
 msgstr "Externe programma's"
 
-#: src/prefs_filtering_action.c:175
+#: src/prefs_filtering_action.c:171
 msgid "Move"
 msgstr "Verplaats"
 
-#: src/prefs_filtering_action.c:176
-msgid "Copy"
-msgstr "Kopieer"
-
-#: src/prefs_filtering_action.c:178
+#: src/prefs_filtering_action.c:174
 msgid "Hide"
 msgstr "Verberg"
 
+#: src/prefs_filtering_action.c:175 src/prefs_filtering_action.c:176
+#: src/prefs_filtering_action.c:177 src/prefs_filtering_action.c:178
 #: src/prefs_filtering_action.c:179 src/prefs_filtering_action.c:180
 #: src/prefs_filtering_action.c:181 src/prefs_filtering_action.c:182
-#: src/prefs_filtering_action.c:183 src/prefs_filtering_action.c:184
-#: src/prefs_filtering_action.c:185 src/prefs_filtering_action.c:186
 msgid "Message flags"
 msgstr "Bericht vlaggen"
 
-#: src/prefs_filtering_action.c:179 src/prefs_summaries.c:449
-#: src/prefs_summary_column.c:77 src/summaryview.c:2813 src/toolbar.c:505
+#: src/prefs_filtering_action.c:175 src/prefs_summaries.c:641
+#: src/prefs_summary_column.c:77 src/summaryview.c:2888 src/toolbar.c:505
 msgid "Mark"
 msgstr "Markeren"
 
-#: src/prefs_filtering_action.c:183
+#: src/prefs_filtering_action.c:179
 msgid "Mark as read"
 msgstr "Markeer gelezen"
 
-#: src/prefs_filtering_action.c:184
+#: src/prefs_filtering_action.c:180
 msgid "Mark as unread"
 msgstr "Markeer ongelezen"
 
-#: src/prefs_filtering_action.c:185
+#: src/prefs_filtering_action.c:181
 msgid "Mark as spam"
 msgstr "Markeer als spam"
 
-#: src/prefs_filtering_action.c:186
+#: src/prefs_filtering_action.c:182
 msgid "Mark as ham"
 msgstr "Markeer als ham"
 
-#: src/prefs_filtering_action.c:187 src/prefs_filtering_action.c:1442
-#: src/toolbar.c:238 src/toolbar.c:499 src/toolbar.c:2465
+#: src/prefs_filtering_action.c:183 src/prefs_filtering_action.c:1395
+#: src/toolbar.c:238 src/toolbar.c:499 src/toolbar.c:2468
 msgid "Execute"
-msgstr "Doen"
+msgstr "Uitvoeren"
 
-#: src/prefs_filtering_action.c:189 src/prefs_summaries.c:447
+#: src/prefs_filtering_action.c:184 src/prefs_summaries.c:639
 msgid "Color label"
 msgstr "Kleurlabel"
 
-#: src/prefs_filtering_action.c:191 src/prefs_filtering_action.c:192
-#: src/prefs_filtering_action.c:193
+#: src/prefs_filtering_action.c:185 src/prefs_filtering_action.c:186
+#: src/prefs_filtering_action.c:187
 msgid "Resend"
 msgstr "Verzend opnieuw"
 
-#: src/prefs_filtering_action.c:193
+#: src/prefs_filtering_action.c:187
 msgid "Redirect"
 msgstr "Herverwijzen"
 
-#: src/prefs_filtering_action.c:194 src/prefs_filtering_action.c:195
-#: src/prefs_filtering_action.c:1446 src/prefs_matcher.c:629
-#: src/prefs_summaries.c:452 src/prefs_summary_column.c:86
-#: src/summaryview.c:449
+#: src/prefs_filtering_action.c:188 src/prefs_filtering_action.c:189
+#: src/prefs_filtering_action.c:1399 src/prefs_matcher.c:640
+#: src/prefs_summaries.c:644 src/prefs_summary_column.c:86
+#: src/summaryview.c:474
 msgid "Score"
 msgstr "Score"
 
-#: src/prefs_filtering_action.c:194
+#: src/prefs_filtering_action.c:188
 msgid "Change score"
 msgstr "Wijzig score"
 
-#: src/prefs_filtering_action.c:195
+#: src/prefs_filtering_action.c:189
 msgid "Set score"
 msgstr "Stel Score in"
 
-#: src/prefs_filtering_action.c:196 src/prefs_filtering_action.c:197
-#: src/prefs_filtering_action.c:198 src/prefs_matcher.c:633
-#: src/prefs_summary_column.c:88 src/summaryview.c:451
+#: src/prefs_filtering_action.c:190 src/prefs_filtering_action.c:191
+#: src/prefs_filtering_action.c:192 src/prefs_matcher.c:644
+#: src/prefs_summary_column.c:88 src/summaryview.c:476
 msgid "Tags"
 msgstr "Tags"
 
-#: src/prefs_filtering_action.c:196
+#: src/prefs_filtering_action.c:190
 msgid "Apply tag"
 msgstr "Pas tag toe"
 
-#: src/prefs_filtering_action.c:197
+#: src/prefs_filtering_action.c:191
 msgid "Unset tag"
 msgstr "Pas tag niet toe"
 
-#: src/prefs_filtering_action.c:198
+#: src/prefs_filtering_action.c:192
 msgid "Clear tags"
 msgstr "Wis tags"
 
-#: src/prefs_filtering_action.c:199 src/prefs_filtering_action.c:200
+#: src/prefs_filtering_action.c:193 src/prefs_filtering_action.c:194
 msgid "Threads"
 msgstr "Draden"
 
-#: src/prefs_filtering_action.c:202
+#: src/prefs_filtering_action.c:196
 msgid "Stop filter"
 msgstr "Stop filter"
 
-#: src/prefs_filtering_action.c:410
+#: src/prefs_filtering_action.c:401
 msgid "Action configuration"
 msgstr "Acties instellen"
 
-#: src/prefs_filtering_action.c:427 src/prefs_filtering.c:1890
-#: src/prefs_matcher.c:586
+#: src/prefs_filtering_action.c:418 src/prefs_filtering.c:1895
+#: src/prefs_matcher.c:597
 msgid "Rule"
 msgstr "Regel"
 
-#: src/prefs_filtering_action.c:440 src/prefs_filtering.c:433
+#: src/prefs_filtering_action.c:431 src/prefs_filtering.c:434
 msgid "Action"
 msgstr "Actie"
 
-#: src/prefs_filtering_action.c:938
+#: src/prefs_filtering_action.c:907
 msgid "Command-line not set"
-msgstr "Opdrachtregel is niet ingevoerd."
+msgstr "Opdrachtregel is niet ingevoerd"
 
-#: src/prefs_filtering_action.c:939
+#: src/prefs_filtering_action.c:908
 msgid "Destination is not set."
 msgstr "Er is geen map gekozen om naar te verplaatsen."
 
-#: src/prefs_filtering_action.c:950
+#: src/prefs_filtering_action.c:919
 msgid "Recipient is not set."
 msgstr "Ontvanger is niet gespecificeerd."
 
-#: src/prefs_filtering_action.c:968
+#: src/prefs_filtering_action.c:935
 msgid "Score is not set"
-msgstr "Score niet ingesteld."
+msgstr "Score niet ingesteld"
 
-#: src/prefs_filtering_action.c:976
+#: src/prefs_filtering_action.c:943
 msgid "Header is not set."
 msgstr "Header-naam niet ingevoerd."
 
-#: src/prefs_filtering_action.c:983
+#: src/prefs_filtering_action.c:950
 msgid "Target addressbook/folder is not set."
 msgstr "Doel adresboek/map is niet opgegeven."
 
-#: src/prefs_filtering_action.c:997
+#: src/prefs_filtering_action.c:960
 msgid "Tag name is empty."
 msgstr "Vlagnaam niet ingevoerd."
 
-#: src/prefs_filtering_action.c:1219
+#: src/prefs_filtering_action.c:1182
 msgid "No action was defined."
 msgstr "Geen acties gedefinieerd."
 
-#: src/prefs_filtering_action.c:1257 src/prefs_matcher.c:2163
+#: src/prefs_filtering_action.c:1220 src/prefs_matcher.c:2212
 #: src/quote_fmt.c:79
 msgid "literal %"
-msgstr "Letterlijke %"
+msgstr "letterlijke %"
 
-#: src/prefs_filtering_action.c:1266 src/prefs_matcher.c:2172
+#: src/prefs_filtering_action.c:1229 src/prefs_matcher.c:2221
 msgid "filename (should not be modified)"
 msgstr "bestandsnaam (dient niet veranderd te worden)"
 
-#: src/prefs_filtering_action.c:1267 src/prefs_matcher.c:2173
+#: src/prefs_filtering_action.c:1230 src/prefs_matcher.c:2222
 #: src/quote_fmt.c:87
 msgid "new line"
 msgstr "nieuwe regel"
 
-#: src/prefs_filtering_action.c:1268 src/prefs_matcher.c:2174
+#: src/prefs_filtering_action.c:1231 src/prefs_matcher.c:2223
 msgid "escape character for quotes"
 msgstr "escape-teken voor aanhalingstekens"
 
-#: src/prefs_filtering_action.c:1269 src/prefs_matcher.c:2175
+#: src/prefs_filtering_action.c:1232 src/prefs_matcher.c:2224
 msgid "quote character"
 msgstr "aanhalingsteken"
 
-#: src/prefs_filtering_action.c:1278
+#: src/prefs_filtering_action.c:1241
 msgid "Filtering Action: 'Execute'"
 msgstr "Filteractie: 'Uitvoeren'"
 
-#: src/prefs_filtering_action.c:1279
+#: src/prefs_filtering_action.c:1242
 msgid ""
 "'Execute' allows you to send a message or message element to an external "
 "program or script.\n"
@@ -15539,146 +15739,146 @@ msgstr ""
 "\n"
 "De volgende speciale tekens kunnen worden gebruikt:"
 
-#: src/prefs_filtering_action.c:1426
+#: src/prefs_filtering_action.c:1381
 msgid "Recipient"
 msgstr "Ontvanger"
 
-#: src/prefs_filtering_action.c:1430
+#: src/prefs_filtering_action.c:1385
 msgid "Book/Folder"
 msgstr "Boek/Map"
 
-#: src/prefs_filtering_action.c:1434
+#: src/prefs_filtering_action.c:1389
 msgid "Destination"
 msgstr "Doel"
 
-#: src/prefs_filtering_action.c:1438
+#: src/prefs_filtering_action.c:1392
 msgid "Color"
 msgstr "Kleur"
 
-#: src/prefs_filtering_action.c:1524
+#: src/prefs_filtering_action.c:1477
 msgid "Current action list"
 msgstr "Huidige actielijst"
 
-#: src/prefs_filtering.c:197 src/prefs_filtering.c:359
+#: src/prefs_filtering.c:197 src/prefs_filtering.c:360
 msgid "Filtering/Processing configuration"
 msgstr "Filteren/Verwerken instellen"
 
 # TPTD: Check this
-#: src/prefs_filtering.c:266 src/prefs_filtering.c:869
-#: src/prefs_filtering.c:985
+#: src/prefs_filtering.c:266 src/prefs_filtering.c:870
+#: src/prefs_filtering.c:986
 msgctxt "Filtering Account Menu"
 msgid "All"
 msgstr "Alle"
 
-#: src/prefs_filtering.c:411
+#: src/prefs_filtering.c:412
 msgid "Condition"
 msgstr "Voorwaarde"
 
-#: src/prefs_filtering.c:424
+#: src/prefs_filtering.c:425
 msgid " Def_ine... "
 msgstr " D_efinieer... "
 
-#: src/prefs_filtering.c:446
+#: src/prefs_filtering.c:447
 msgid " De_fine... "
 msgstr " De_finieer... "
 
-#: src/prefs_filtering.c:475
+#: src/prefs_filtering.c:476
 msgid "Append the new rule above to the list"
 msgstr "Voeg de nieuwe bovenstaande regel toe aan de lijst"
 
-#: src/prefs_filtering.c:484
+#: src/prefs_filtering.c:485
 msgid "Replace the selected rule in list with the rule above"
 msgstr "Vervang de geselecteerde regel in de lijst met bovenstaande regel"
 
-#: src/prefs_filtering.c:493
+#: src/prefs_filtering.c:494
 msgid "Delete the selected rule from the list"
 msgstr "Verwijder de geselecteerde regel van de lijst"
 
-#: src/prefs_filtering.c:534
+#: src/prefs_filtering.c:535
 msgid "Move the selected rule to the top"
 msgstr "Verplaats de geselecteerde regel naar bovenaan"
 
-#: src/prefs_filtering.c:537
+#: src/prefs_filtering.c:538
 msgid "Page u_p"
 msgstr "Pagina naar _boven"
 
-#: src/prefs_filtering.c:545
+#: src/prefs_filtering.c:546
 msgid "Move the selected rule one page up"
 msgstr "Verplaats de geselecteerde regel één pagina naar boven"
 
-#: src/prefs_filtering.c:554
+#: src/prefs_filtering.c:555
 msgid "Move the selected rule up"
 msgstr "Verplaats de geselecteerde regel naar boven"
 
-#: src/prefs_filtering.c:562
+#: src/prefs_filtering.c:563
 msgid "Move the selected rule down"
 msgstr "Verplaats e geselecteerde regel naar onderen"
 
-#: src/prefs_filtering.c:565
+#: src/prefs_filtering.c:566
 msgid "Page dow_n"
 msgstr "Pagina naar b_eneden"
 
-#: src/prefs_filtering.c:573
+#: src/prefs_filtering.c:574
 msgid "Move the selected rule one page down"
 msgstr "Verplaats de geselecteerde regel één pagina naar beneden"
 
-#: src/prefs_filtering.c:582
+#: src/prefs_filtering.c:583
 msgid "Move the selected rule to the bottom"
 msgstr "Verplaats de geselecteerde regel naar benedenaan"
 
-#: src/prefs_filtering.c:1042 src/prefs_filtering.c:1128
+#: src/prefs_filtering.c:1043 src/prefs_filtering.c:1129
 msgid "Condition string is not valid."
 msgstr "Voorwaarde-regel is niet geldig."
 
-#: src/prefs_filtering.c:1115
+#: src/prefs_filtering.c:1116
 msgid "Condition string is empty."
 msgstr "Voorwaarde-regel is leeg."
 
-#: src/prefs_filtering.c:1121
+#: src/prefs_filtering.c:1122
 msgid "Action string is empty."
 msgstr "Actie-regel is leeg."
 
-#: src/prefs_filtering.c:1209
+#: src/prefs_filtering.c:1211
 msgid "Delete rule"
 msgstr "Verwijder deze regel"
 
-#: src/prefs_filtering.c:1210
+#: src/prefs_filtering.c:1212
 msgid "Do you really want to delete this rule?"
 msgstr "Wil je deze regel werkelijk verwijderen?"
 
-#: src/prefs_filtering.c:1228
+#: src/prefs_filtering.c:1230
 msgid "Delete all rules"
 msgstr "Verwijder alle regels"
 
-#: src/prefs_filtering.c:1229
+#: src/prefs_filtering.c:1231
 msgid "Do you really want to delete all the rules?"
 msgstr "Wil je alle regels werkelijk verwijderen?"
 
-#: src/prefs_filtering.c:1479
+#: src/prefs_filtering.c:1482
 msgid "Filtering rules not saved"
 msgstr "Filterregels niet bewaard"
 
-#: src/prefs_filtering.c:1480
+#: src/prefs_filtering.c:1483
 msgid "The list of filtering rules have been modified. Close anyway?"
 msgstr "De lijst met filterregels is gewijzigd. Toch afsluiten?"
 
-#: src/prefs_filtering.c:1702
+#: src/prefs_filtering.c:1705
 msgid "Move one page up"
 msgstr "Ga een pagina naar boven"
 
-#: src/prefs_filtering.c:1703
+#: src/prefs_filtering.c:1706
 msgid "Move one page down"
 msgstr "Ga een pagina naar beneden"
 
-#: src/prefs_filtering.c:1858
+#: src/prefs_filtering.c:1863
 msgid "Enable"
 msgstr "Activeren"
 
-#: src/prefs_folder_column.c:211
+#: src/prefs_folder_column.c:212
 msgid "Folder list columns configuration"
 msgstr "Kolommen mappenlijst instellen"
 
-#: src/prefs_folder_column.c:228
+#: src/prefs_folder_column.c:229
 msgid ""
 "Select columns to be displayed in the folder list. You can modify\n"
 "the order by using the Up / Down buttons or by dragging the items."
@@ -15686,21 +15886,21 @@ msgstr ""
 "Selecteer weer te geven items in mappenlijst. Verander de\n"
 "volgorde met de Omhoog / Omlaag knoppen, of door de items te verslepen."
 
-#: src/prefs_folder_column.c:258 src/prefs_summary_column.c:272
+#: src/prefs_folder_column.c:259 src/prefs_summary_column.c:273
 msgid "Hidden columns"
 msgstr "Verborgen kolommen"
 
-#: src/prefs_folder_column.c:299 src/prefs_summaries.c:416
-#: src/prefs_summaries.c:591 src/prefs_summary_column.c:313
+#: src/prefs_folder_column.c:300 src/prefs_summaries.c:386
+#: src/prefs_summaries.c:451 src/prefs_summary_column.c:314
 msgid "Displayed columns"
 msgstr "Weergegeven kolommen"
 
-#: src/prefs_folder_column.c:332 src/prefs_msg_colors.c:484
-#: src/prefs_summary_column.c:346 src/prefs_toolbar.c:1077
+#: src/prefs_folder_column.c:333 src/prefs_msg_colors.c:464
+#: src/prefs_summary_column.c:347 src/prefs_toolbar.c:1032
 msgid " Use default "
 msgstr " Gebruik de standaard "
 
-#: src/prefs_folder_item.c:210
+#: src/prefs_folder_item.c:214
 msgid ""
 "These preferences will not be saved as this folder is a top-level folder.\n"
 "However, you can set them for the whole mailbox tree by using \"Apply to "
@@ -15711,7 +15911,7 @@ msgstr ""
 "Je kunt deze voorkeuren echter wel instellen voor de hele mappenboom door "
 "gebruik te maken van \"Pas toe op submappen\"."
 
-#: src/prefs_folder_item.c:289 src/prefs_folder_item.c:886
+#: src/prefs_folder_item.c:293 src/prefs_folder_item.c:896
 msgid ""
 "Apply to\n"
 "subfolders"
@@ -15719,56 +15919,56 @@ msgstr ""
 "Pas toe op\n"
 "submappen"
 
-#: src/prefs_folder_item.c:314
+#: src/prefs_folder_item.c:318
 msgid "Normal"
 msgstr "Normaal"
 
-#: src/prefs_folder_item.c:316
+#: src/prefs_folder_item.c:320
 msgid "Outbox"
 msgstr "Uitbox"
 
-#: src/prefs_folder_item.c:332
+#: src/prefs_folder_item.c:336
 msgid "Folder type"
 msgstr "Map-type"
 
-#: src/prefs_folder_item.c:344
+#: src/prefs_folder_item.c:348
 msgid "Simplify Subject RegExp"
 msgstr "Verkorte onderwerpweergave RegExp"
 
-#: src/prefs_folder_item.c:370
-msgid "Test string:"
-msgstr "Test string:"
+#: src/prefs_folder_item.c:374
+msgid "Test string"
+msgstr "Test string"
 
-#: src/prefs_folder_item.c:387
-msgid "Result:"
-msgstr "Resultaat:"
+#: src/prefs_folder_item.c:391
+msgid "Result"
+msgstr "Resultaat"
 
 # TPTD: ugly
-#: src/prefs_folder_item.c:402
+#: src/prefs_folder_item.c:406
 msgid "Folder chmod"
 msgstr "Map-chmod"
 
-#: src/prefs_folder_item.c:428
+#: src/prefs_folder_item.c:432
 msgid "Folder color"
 msgstr "Mapkleur"
 
-#: src/prefs_folder_item.c:441 src/prefs_folder_item.c:1678
+#: src/prefs_folder_item.c:444 src/prefs_folder_item.c:1768
 msgid "Pick color for folder"
 msgstr "Selecteer kleur voor map"
 
-#: src/prefs_folder_item.c:459
+#: src/prefs_folder_item.c:462
 msgid "Run Processing rules at start-up"
 msgstr "Draai Verwerkingsregels bij opstarten"
 
-#: src/prefs_folder_item.c:474
+#: src/prefs_folder_item.c:477
 msgid "Run Processing rules when opening"
 msgstr "Draai Verwerkingsregels bij openen"
 
-#: src/prefs_folder_item.c:488
+#: src/prefs_folder_item.c:491
 msgid "Scan for new mail"
 msgstr "Controleer op nieuwe berichten"
 
-#: src/prefs_folder_item.c:490
+#: src/prefs_folder_item.c:493
 msgid ""
 "Turn this option on if mail is delivered directly to this folder by server "
 "side filtering on IMAP or by an external application"
@@ -15776,11 +15976,11 @@ msgstr ""
 "Zet deze optie aan als e-mail direct afgeleverd wordt in deze map door "
 "filteren op de IMAP-server of door een externe applicatie"
 
-#: src/prefs_folder_item.c:510
+#: src/prefs_folder_item.c:513
 msgid "Select the HTML part of multipart messages"
 msgstr "Selecteer het HTML-gedeelte van meerdelige berichten"
 
-#: src/prefs_folder_item.c:527
+#: src/prefs_folder_item.c:530
 msgid ""
 "\"Default\" will follow global preference (found in /Preferences/Message "
 "View/Text Options)"
@@ -15788,64 +15988,68 @@ msgstr ""
 "\"Standaard\" volgt de globale voorkeuren (gevonden in /Voorkeuren/"
 "Berichtweergave/Tekstopties)"
 
-#: src/prefs_folder_item.c:537
+#: src/prefs_folder_item.c:540
 msgid "Synchronise for offline use"
 msgstr "Synchroniseer voor offline gebruik"
 
-#: src/prefs_folder_item.c:558
+#: src/prefs_folder_item.c:561
 msgid "Fetch message bodies from the last"
 msgstr "Haal berichttekst op van de laatste"
 
-#: src/prefs_folder_item.c:565
+#: src/prefs_folder_item.c:568
 msgid "0: all bodies"
 msgstr "0: alle berichtteksten"
 
-#: src/prefs_folder_item.c:573
+#: src/prefs_folder_item.c:576
 msgid "Remove older messages bodies"
 msgstr "Verwijder oude berichtteksten"
 
-#: src/prefs_folder_item.c:590
+#: src/prefs_folder_item.c:593
 msgid "Discard folder cache"
-msgstr "Gooi cache van de map weg"
+msgstr "Cache van de map weggooien"
 
-#: src/prefs_folder_item.c:895
+#: src/prefs_folder_item.c:905
 msgid "Request Return Receipt"
 msgstr "Vraag om ontvangstbevestiging"
 
-#: src/prefs_folder_item.c:910
+#: src/prefs_folder_item.c:920
 msgid "Save copy of outgoing messages to this folder instead of Sent"
 msgstr "Bewaar kopie van uitgaande post in deze map inplaats van Verzonden"
 
-#: src/prefs_folder_item.c:924 src/prefs_folder_item.c:976
-#: src/prefs_folder_item.c:1002 src/prefs_folder_item.c:1028
+#: src/prefs_folder_item.c:934 src/prefs_folder_item.c:986
+#: src/prefs_folder_item.c:1012 src/prefs_folder_item.c:1038
 #, c-format
 msgctxt "folder properties: %s stands for a header name"
 msgid "Default %s"
 msgstr "Standaard %s"
 
-#: src/prefs_folder_item.c:950
+#: src/prefs_folder_item.c:960
 #, c-format
 msgctxt "folder properties: %s stands for a header name"
 msgid "Default %s for replies"
 msgstr "Standaard %s voor antwoorden"
 
-#: src/prefs_folder_item.c:1053
+#: src/prefs_folder_item.c:1063
 msgid "Default account"
 msgstr "Standaard account"
 
-#: src/prefs_folder_item.c:1691
+#: src/prefs_folder_item.c:1205 src/prefs_folder_item.c:1237
+msgid "\"Default\" will follow the applicable account preference"
+msgstr "\"Standaard\" volgt de voorkeuren van het betreffende account"
+
+#: src/prefs_folder_item.c:1781
 msgid "Discard cache"
-msgstr "Gooi cache weg"
+msgstr "Cache weggooien"
 
-#: src/prefs_folder_item.c:1692
+#: src/prefs_folder_item.c:1782
 msgid "Do you really want to discard the local cached data for this folder?"
 msgstr "Wil je werkelijk de lokale cache voor deze map verwijderen?"
 
-#: src/prefs_folder_item.c:1825
+#: src/prefs_folder_item.c:1907
 msgid "General"
 msgstr "Algemeen"
 
-#: src/prefs_folder_item.c:1904
+#: src/prefs_folder_item.c:1986
 #, c-format
 msgid "Properties for folder %s"
 msgstr "Eigenschappen voor map %s"
@@ -15854,7 +16058,7 @@ msgstr "Eigenschappen voor map %s"
 msgid "Folder and Message Lists"
 msgstr "Mappen- en berichtenlijst"
 
-#: src/prefs_fonts.c:99 src/prefs_matcher.c:2038
+#: src/prefs_fonts.c:99 src/prefs_matcher.c:2086
 msgid "Message"
 msgstr "Bericht"
 
@@ -15878,8 +16082,8 @@ msgstr "Gebruik ander lettertype bij het afdrukken"
 msgid "Message Printing"
 msgstr "Bericht afdrukken"
 
-#: src/prefs_fonts.c:268 src/prefs_msg_colors.c:830 src/prefs_summaries.c:766
-#: src/prefs_themes.c:421
+#: src/prefs_fonts.c:268 src/prefs_msg_colors.c:776 src/prefs_summaries.c:869
+#: src/prefs_themes.c:422
 msgid "Display"
 msgstr "Beeld"
 
@@ -15887,7 +16091,7 @@ msgstr "Beeld"
 msgid "Fonts"
 msgstr "Lettertypen"
 
-#: src/prefs_gtk.c:910 src/toolbar.c:256 src/toolbar.c:517
+#: src/prefs_gtk.c:895 src/toolbar.c:256 src/toolbar.c:517
 msgid "Preferences"
 msgstr "Voorkeuren"
 
@@ -16032,7 +16236,7 @@ msgstr "Foutmeldingen"
 msgid "Status messages for filtering/processing log"
 msgstr "Statusmeldingen voor filteren/verwerken log"
 
-#: src/prefs_logging.c:410 src/prefs_msg_colors.c:144 src/prefs_other.c:776
+#: src/prefs_logging.c:410 src/prefs_msg_colors.c:153 src/prefs_other.c:815
 msgid "Other"
 msgstr "Diversen"
 
@@ -16040,247 +16244,267 @@ msgstr "Diversen"
 msgid "Logging"
 msgstr "Loggen"
 
-#: src/prefs_matcher.c:331
+#: src/prefs_matcher.c:335
 msgid "more than"
 msgstr "meer dan"
 
-#: src/prefs_matcher.c:332
+#: src/prefs_matcher.c:336
 msgid "less than"
 msgstr "minder dan"
 
-#: src/prefs_matcher.c:338
+#: src/prefs_matcher.c:342
 msgid "weeks"
 msgstr "weken"
 
-#: src/prefs_matcher.c:342
+#: src/prefs_matcher.c:346
+msgid "after"
+msgstr "na"
+
+#: src/prefs_matcher.c:347
+msgid "before"
+msgstr "voor"
+
+#: src/prefs_matcher.c:351
 msgid "higher than"
 msgstr "hoger dan"
 
-#: src/prefs_matcher.c:343
+#: src/prefs_matcher.c:352
 msgid "lower than"
 msgstr "lager dan"
 
-#: src/prefs_matcher.c:344 src/prefs_matcher.c:350
+#: src/prefs_matcher.c:353 src/prefs_matcher.c:359
 msgid "exactly"
 msgstr "exacte grootte"
 
-#: src/prefs_matcher.c:348
+#: src/prefs_matcher.c:357
 msgid "greater than"
 msgstr "groter dan"
 
-#: src/prefs_matcher.c:349
+#: src/prefs_matcher.c:358
 msgid "smaller than"
 msgstr "kleiner dan"
 
-#: src/prefs_matcher.c:354
+#: src/prefs_matcher.c:363
 msgid "bytes"
 msgstr "bytes"
 
-#: src/prefs_matcher.c:355
+#: src/prefs_matcher.c:364
 msgid "kilobytes"
 msgstr "kilobytes"
 
-#: src/prefs_matcher.c:356
+#: src/prefs_matcher.c:365
 msgid "megabytes"
 msgstr "megabytes"
 
-#: src/prefs_matcher.c:360
+#: src/prefs_matcher.c:369
 msgid "contains"
 msgstr "bevat"
 
-#: src/prefs_matcher.c:361
+#: src/prefs_matcher.c:370
 msgid "doesn't contain"
 msgstr "bevat niet"
 
-#: src/prefs_matcher.c:385
+#: src/prefs_matcher.c:394
 msgid "headers part"
 msgstr "header-deel"
 
-#: src/prefs_matcher.c:386
+#: src/prefs_matcher.c:395
 msgid "headers values"
 msgstr "header-waardes"
 
-#: src/prefs_matcher.c:387
+#: src/prefs_matcher.c:396
 msgid "body part"
 msgstr "berichtinhoud"
 
-#: src/prefs_matcher.c:388
+#: src/prefs_matcher.c:397
 msgid "whole message"
 msgstr "hele bericht"
 
-#: src/prefs_matcher.c:394 src/summaryview.c:6351
+#: src/prefs_matcher.c:403 src/summaryview.c:6559
 msgid "Marked"
 msgstr "Gemarkeerd"
 
-#: src/prefs_matcher.c:395 src/summaryview.c:6349
+#: src/prefs_matcher.c:404 src/summaryview.c:6557
 msgid "Deleted"
 msgstr "Verwijderd"
 
-#: src/prefs_matcher.c:396
+#: src/prefs_matcher.c:405
 msgid "Replied"
 msgstr "Beantwoord"
 
-#: src/prefs_matcher.c:397 src/summaryview.c:6343
+#: src/prefs_matcher.c:406 src/summaryview.c:6551
 msgid "Forwarded"
 msgstr "Doorgestuurd"
 
-#: src/prefs_matcher.c:399 src/summaryview.c:6333 src/toolbar.c:515
-#: src/toolbar.c:988 src/toolbar.c:2339
+#: src/prefs_matcher.c:408 src/summaryview.c:6541 src/toolbar.c:515
+#: src/toolbar.c:988 src/toolbar.c:2342
 msgid "Spam"
 msgstr "Spam"
 
-#: src/prefs_matcher.c:400
+#: src/prefs_matcher.c:409
 msgid "Has attachment"
-msgstr "Heeft bijvoegsel"
+msgstr "Heeft bijlage"
 
-#: src/prefs_matcher.c:401 src/summaryview.c:6369
+#: src/prefs_matcher.c:410 src/summaryview.c:6577
 msgid "Signed"
 msgstr "Ondertekend"
 
-#: src/prefs_matcher.c:405
+#: src/prefs_matcher.c:414
 msgid "set"
 msgstr "gezet"
 
-#: src/prefs_matcher.c:406
+#: src/prefs_matcher.c:415
 msgid "not set"
 msgstr "niet gezet"
 
-#: src/prefs_matcher.c:410
+#: src/prefs_matcher.c:419
 msgid "yes"
 msgstr "ja"
 
-#: src/prefs_matcher.c:411
+#: src/prefs_matcher.c:420
 msgid "no"
 msgstr "nee"
 
-#: src/prefs_matcher.c:415
+#: src/prefs_matcher.c:424
 msgid "Any tags"
 msgstr "Elke tag"
 
-#: src/prefs_matcher.c:416
+#: src/prefs_matcher.c:425
 msgid "Specific tag"
 msgstr "Specifieke tag"
 
-#: src/prefs_matcher.c:420
+#: src/prefs_matcher.c:429
 msgid "ignored"
 msgstr "genegeerd"
 
-#: src/prefs_matcher.c:421
+#: src/prefs_matcher.c:430
 msgid "not ignored"
 msgstr "niet genegeerd"
 
-#: src/prefs_matcher.c:422
+#: src/prefs_matcher.c:431
 msgid "watched"
 msgstr "gevolgd"
 
-#: src/prefs_matcher.c:423
+#: src/prefs_matcher.c:432
 msgid "not watched"
 msgstr "niet gevolgd"
 
-#: src/prefs_matcher.c:427
+#: src/prefs_matcher.c:436
 msgid "found"
 msgstr "gevonden"
 
-#: src/prefs_matcher.c:428
+#: src/prefs_matcher.c:437
 msgid "not found"
 msgstr "niet gevonden"
 
-#: src/prefs_matcher.c:432
+#: src/prefs_matcher.c:441
 msgid "0 (Passed)"
 msgstr "0 (Gelukt)"
 
-#: src/prefs_matcher.c:433
+#: src/prefs_matcher.c:442
 msgid "non-0 (Failed)"
 msgstr "non-0 (Mislukt)"
 
-#: src/prefs_matcher.c:569
+#: src/prefs_matcher.c:580
 msgid "Condition configuration"
 msgstr "Voorwaarden instellen"
 
-#: src/prefs_matcher.c:613
-msgid "Match criteria:"
-msgstr "Overeenkomst met criteria:"
+#: src/prefs_matcher.c:624
+msgid "Match criteria"
+msgstr "Overeenkomst met criteria"
 
-#: src/prefs_matcher.c:622
+#: src/prefs_matcher.c:633
 msgid "All messages"
 msgstr "Alle berichten"
 
-#: src/prefs_matcher.c:624
+#: src/prefs_matcher.c:635
 msgid "Age"
 msgstr "Leeftijd"
 
-#: src/prefs_matcher.c:625
+#: src/prefs_matcher.c:636
 msgid "Phrase"
 msgstr "Zin"
 
-#: src/prefs_matcher.c:626
+#: src/prefs_matcher.c:637
 msgid "Flags"
 msgstr "Vlaggen"
 
-#: src/prefs_matcher.c:627 src/prefs_msg_colors.c:399
+#: src/prefs_matcher.c:638 src/prefs_msg_colors.c:380
 msgid "Color labels"
 msgstr "Kleurlabels"
 
-#: src/prefs_matcher.c:628
+#: src/prefs_matcher.c:639
 msgid "Thread"
 msgstr "Draad"
 
-#: src/prefs_matcher.c:631
+#: src/prefs_matcher.c:642
 msgid "Partially downloaded"
 msgstr "Gedeeltelijk opgehaald"
 
-#: src/prefs_matcher.c:634
+#: src/prefs_matcher.c:645
 msgid "External program test"
 msgstr "Externe programma-test"
 
-#: src/prefs_matcher.c:710 src/prefs_matcher.c:1618 src/prefs_matcher.c:1633
-#: src/prefs_matcher.c:2519
+#: src/prefs_matcher.c:674
+msgid ""
+"Use selector on the right to pick the header name. Type the name of the "
+"header if not available in the list."
+msgstr ""
+"Gebruik kiezer rechts om de header-naam te kiezen. Type de naam van de "
+"header wanneer het niet beschikbaar is in de lijst."
+
+#: src/prefs_matcher.c:719 src/prefs_matcher.c:1658 src/prefs_matcher.c:1673
+#: src/prefs_matcher.c:2583
 msgctxt "Filtering Matcher Menu"
 msgid "All"
 msgstr "Alle"
 
-#: src/prefs_matcher.c:744
+#: src/prefs_matcher.c:753
 msgid "Use regexp"
 msgstr "Gebruik regex"
 
-#: src/prefs_matcher.c:820
+#: src/prefs_matcher.c:844
 msgid "Message must match"
 msgstr "Bericht moet overeenkomen met"
 
-#: src/prefs_matcher.c:824
+#: src/prefs_matcher.c:848
 msgid "at least one"
 msgstr "minstens één"
 
-#: src/prefs_matcher.c:825
+#: src/prefs_matcher.c:849
 msgid "all"
 msgstr "elke"
 
-#: src/prefs_matcher.c:828
+#: src/prefs_matcher.c:852
 msgid "of above rules"
 msgstr "van bovenstaande regels"
 
-#: src/prefs_matcher.c:1536 src/prefs_matcher.c:1602
+#: src/prefs_matcher.c:1564 src/prefs_matcher.c:1642
 msgid "Search pattern is not set."
 msgstr "Zoekcriteria niet ingevoerd."
 
-#: src/prefs_matcher.c:1545
+#: src/prefs_matcher.c:1578
+msgid "Invalid hour."
+msgstr "Ongeldig uur."
+
+#: src/prefs_matcher.c:1587
 msgid "Test command is not set."
 msgstr "Test-opdrachtregel is niet ingevoerd."
 
-#: src/prefs_matcher.c:1619
+#: src/prefs_matcher.c:1659
 msgid "all addresses in all headers"
 msgstr "alle adressen in alle headers"
 
-#: src/prefs_matcher.c:1622
+#: src/prefs_matcher.c:1662
 msgid "any address in any header"
 msgstr "elk adres in elke header"
 
-#: src/prefs_matcher.c:1624
+#: src/prefs_matcher.c:1664
 #, c-format
 msgid "the address(es) in header '%s'"
 msgstr "de adres(sen) in header '%s'"
 
-#: src/prefs_matcher.c:1625
+#: src/prefs_matcher.c:1665
 #, c-format
 msgid ""
 "Book/folder path is not set.\n"
@@ -16293,83 +16517,87 @@ msgstr ""
 "Als je %s wilt vergelijken met alle ingangen in het adresboek, dan dien je "
 "'%s' te selecteren van de boek/map-keuzelijst."
 
-#: src/prefs_matcher.c:1844
+#: src/prefs_matcher.c:1884
 msgid "Headers part"
 msgstr "Header-deel"
 
-#: src/prefs_matcher.c:1848
+#: src/prefs_matcher.c:1888
 msgid "Headers values"
 msgstr "Header-waardes"
 
-#: src/prefs_matcher.c:1852
+#: src/prefs_matcher.c:1892
 msgid "Body part"
 msgstr "Berichtinhoud"
 
-#: src/prefs_matcher.c:1856
+#: src/prefs_matcher.c:1896
 msgid "Whole message"
 msgstr "Hele bericht"
 
-#: src/prefs_matcher.c:1969 src/prefs_matcher.c:2011
+#: src/prefs_matcher.c:2013 src/prefs_matcher.c:2059
 msgid "in"
 msgstr "in"
 
-#: src/prefs_matcher.c:1971
+#: src/prefs_matcher.c:2015
 msgid "content is"
 msgstr "inhoud is"
 
-#: src/prefs_matcher.c:1980
+#: src/prefs_matcher.c:2019
+msgid "Date is"
+msgstr "Datum is"
+
+#: src/prefs_matcher.c:2030
 msgid "Age is"
 msgstr "Leeftijd is"
 
-#: src/prefs_matcher.c:1985
+#: src/prefs_matcher.c:2035
 msgid "Flag"
 msgstr "Vlag"
 
-#: src/prefs_matcher.c:1986 src/prefs_matcher.c:2001
+#: src/prefs_matcher.c:2036 src/prefs_matcher.c:2050
 msgid "is"
 msgstr "is"
 
-#: src/prefs_matcher.c:1991
+#: src/prefs_matcher.c:2041
 msgid "Name:"
 msgstr "Naam:"
 
-#: src/prefs_matcher.c:2000
+#: src/prefs_matcher.c:2049
 msgid "Label"
 msgstr "Label"
 
-#: src/prefs_matcher.c:2006
+#: src/prefs_matcher.c:2054
 msgid "Value:"
 msgstr "Waarde:"
 
-#: src/prefs_matcher.c:2021
+#: src/prefs_matcher.c:2069
 msgid "Score is"
 msgstr "Score is"
 
-#: src/prefs_matcher.c:2022
+#: src/prefs_matcher.c:2070
 msgid "points"
 msgstr "punten"
 
-#: src/prefs_matcher.c:2032
+#: src/prefs_matcher.c:2080
 msgid "Size is"
 msgstr "Grootte is"
 
-#: src/prefs_matcher.c:2037
+#: src/prefs_matcher.c:2085
 msgid "Scope:"
 msgstr "Breedte:"
 
-#: src/prefs_matcher.c:2039
+#: src/prefs_matcher.c:2087
 msgid "tags"
 msgstr "tags"
 
-#: src/prefs_matcher.c:2044
+#: src/prefs_matcher.c:2092
 msgid "type is"
 msgstr "type is"
 
-#: src/prefs_matcher.c:2048
+#: src/prefs_matcher.c:2096
 msgid "Program returns"
 msgstr "Programma komt terug"
 
-#: src/prefs_matcher.c:2118
+#: src/prefs_matcher.c:2166
 msgid ""
 "The entry was not saved.\n"
 "Close anyway?"
@@ -16377,11 +16605,11 @@ msgstr ""
 "Deze ingang is niet opgeslagen.\n"
 "Toch sluiten?"
 
-#: src/prefs_matcher.c:2184
+#: src/prefs_matcher.c:2233
 msgid "Match Type: 'Test'"
 msgstr "Zoek Type: 'Test'"
 
-#: src/prefs_matcher.c:2185
+#: src/prefs_matcher.c:2234
 msgid ""
 "'Test' allows you to test a message or message element using an external "
 "program or script. The program will return either 0 or 1.\n"
@@ -16394,91 +16622,91 @@ msgstr ""
 "\n"
 "De volgende speciale tekens kunnen gebruikt worden:"
 
-#: src/prefs_matcher.c:2284
+#: src/prefs_matcher.c:2333
 msgid "Current condition rules"
 msgstr "Huidige voorwaarden"
 
-#: src/prefs_message.c:120
+#: src/prefs_message.c:119
 msgid "Headers"
 msgstr "Headers"
 
-#: src/prefs_message.c:123
+#: src/prefs_message.c:122
 msgid "Display header pane above message view"
 msgstr "Geef headerpaneel weer boven berichtweergave"
 
-#: src/prefs_message.c:127
+#: src/prefs_message.c:126
 msgid "Display (X-)Face in message view"
 msgstr "Geef (X-)Face weer in berichtweergave"
 
-#: src/prefs_message.c:130
+#: src/prefs_message.c:129
 msgid "Display Face in message view"
 msgstr "Geef Face weer in berichtweergave"
 
-#: src/prefs_message.c:144
+#: src/prefs_message.c:143
 msgid "Display headers in message view"
 msgstr "Geef headers weer in berichtweergave"
 
-#: src/prefs_message.c:156
+#: src/prefs_message.c:155
 msgid "HTML messages"
 msgstr "HTML-berichten"
 
-#: src/prefs_message.c:159
+#: src/prefs_message.c:158
 msgid "Render HTML messages as text"
 msgstr "Geef HTML-berichten weer als tekst"
 
-#: src/prefs_message.c:162
+#: src/prefs_message.c:161
 msgid "Render HTML-only messages with plugin if possible"
 msgstr "Geef indien mogelijk HTML-berichten weer met de plugin"
 
-#: src/prefs_message.c:165
+#: src/prefs_message.c:164
 msgid "Select the HTML part of multipart/alternative messages"
 msgstr "Selecteer het HTML-gedeelte van meerdelige/alternatieve berichten"
 
-#: src/prefs_message.c:175
+#: src/prefs_message.c:174
 msgid "Line space"
 msgstr "Regelafstand"
 
-#: src/prefs_message.c:189 src/prefs_message.c:223
+#: src/prefs_message.c:187 src/prefs_message.c:220
 msgid "pixels"
 msgstr "pixels"
 
-#: src/prefs_message.c:195
+#: src/prefs_message.c:193
 msgid "Scroll"
 msgstr "Schuiven"
 
-#: src/prefs_message.c:197
+#: src/prefs_message.c:195
 msgid "Half page"
 msgstr "Halve pagina"
 
-#: src/prefs_message.c:203
+#: src/prefs_message.c:201
 msgid "Smooth scroll"
 msgstr "Vloeiend schuiven"
 
-#: src/prefs_message.c:209
+#: src/prefs_message.c:207
 msgid "Step"
 msgstr "Stap"
 
-#: src/prefs_message.c:230
+#: src/prefs_message.c:227
 msgid "Show attachment descriptions (rather than names)"
-msgstr "Toon beschrijving van bijvoegsels (i.p.v de namen)"
+msgstr "Toon beschrijving van bijlages (i.p.v de namen)"
 
-#: src/prefs_message.c:233
+#: src/prefs_message.c:230
 msgid "Quotation"
 msgstr "Citaat"
 
-#: src/prefs_message.c:242
+#: src/prefs_message.c:239
 msgid "Collapse quoted text on double click"
-msgstr "Vouw citaat in bij dubbelklik"
+msgstr "Citaat invouwen bij dubbelklik"
 
-#: src/prefs_message.c:249
-msgid "Treat these characters as quotation marks: "
-msgstr "Behandel deze tekens als citaatmarkering: "
+#: src/prefs_message.c:246
+msgid "Treat these characters as quotation marks"
+msgstr "Behandel deze tekens als citaatmarkering"
 
-#: src/prefs_message.c:355
+#: src/prefs_message.c:352
 msgid "Text Options"
 msgstr "Tekstopties"
 
-#: src/prefs_migration.c:50
+#: src/prefs_migration.c:51
 #, c-format
 msgid ""
 "Your Claws Mail configuration is from a newer version than the version which "
@@ -16499,38 +16727,38 @@ msgstr ""
 "\n"
 "Wil je nu afsluiten?"
 
-#: src/prefs_migration.c:59
+#: src/prefs_migration.c:60
 msgid "Configuration warning"
 msgstr "Waarschuwing over de configuratie"
 
-#: src/prefs_msg_colors.c:146
+#: src/prefs_msg_colors.c:155
 msgid "Message view"
 msgstr "Berichtweergave"
 
-#: src/prefs_msg_colors.c:153
+#: src/prefs_msg_colors.c:162
 msgid "Enable coloration of message text"
 msgstr "Kleurmarkering in berichten activeren"
 
-#: src/prefs_msg_colors.c:161
+#: src/prefs_msg_colors.c:170
 msgid "Quote"
 msgstr "Citaat"
 
-#: src/prefs_msg_colors.c:173
+#: src/prefs_msg_colors.c:182
 msgid "Cycle quote colors"
 msgstr "Gebruikte kleuren opnieuw gebruiken"
 
-#: src/prefs_msg_colors.c:177
+#: src/prefs_msg_colors.c:186
 msgid "If there are more than 3 quote levels, the colors will be reused"
 msgstr ""
 "Als er meer dan drie citatie-niveaus zijn zullen de kleuren worden "
 "hergebruikt"
 
-#: src/prefs_msg_colors.c:183
+#: src/prefs_msg_colors.c:192
 msgid "1st Level"
 msgstr "1e niveau"
 
-#: src/prefs_msg_colors.c:189 src/prefs_msg_colors.c:214
-#: src/prefs_msg_colors.c:239
+#: src/prefs_msg_colors.c:198 src/prefs_msg_colors.c:216
+#: src/prefs_msg_colors.c:234
 msgid "Text"
 msgstr "Tekst"
 
@@ -16539,85 +16767,122 @@ msgctxt "Tooltip"
 msgid "Pick color for 1st level text"
 msgstr "Selecteer kleur voor tekst van 1e niveau"
 
-#: src/prefs_msg_colors.c:208
+#: src/prefs_msg_colors.c:210
 msgid "2nd Level"
 msgstr "2e niveau"
 
-#: src/prefs_msg_colors.c:227
+#: src/prefs_msg_colors.c:220
 msgctxt "Tooltip"
 msgid "Pick color for 2nd level text"
 msgstr "Selecteer kleur voor tekst van 2e niveau"
 
-#: src/prefs_msg_colors.c:233
+#: src/prefs_msg_colors.c:228
 msgid "3rd Level"
 msgstr "3e niveau"
 
-#: src/prefs_msg_colors.c:252
+#: src/prefs_msg_colors.c:238
 msgctxt "Tooltip"
 msgid "Pick color for 3rd level text"
-msgstr "Selecteer kleur voor tekst van 3e niveau "
+msgstr "Selecteer kleur voor tekst van 3e niveau"
 
-#: src/prefs_msg_colors.c:259
+#: src/prefs_msg_colors.c:247
 msgid "Enable coloration of text background"
 msgstr "Gebruik van achtergrondkleur activeren"
 
-#: src/prefs_msg_colors.c:274
+#: src/prefs_msg_colors.c:256
 msgctxt "Tooltip"
 msgid "Pick color for 1st level text background"
 msgstr "Selecteer kleur voor achtergrond van 1e niveau"
 
-#: src/prefs_msg_colors.c:294
+#: src/prefs_msg_colors.c:269
 msgctxt "Tooltip"
 msgid "Pick color for 2nd level text background"
 msgstr "Selecteer kleur voor achtergrond van 2e niveau"
 
-#: src/prefs_msg_colors.c:314
+#: src/prefs_msg_colors.c:282
 msgctxt "Tooltip"
 msgid "Pick color for 3rd level text background"
 msgstr "Selecteer kleur voor achtergrond van 3e niveau"
 
-#: src/prefs_msg_colors.c:333
+#: src/prefs_msg_colors.c:294
 msgctxt "Tooltip"
 msgid "Pick color for links"
 msgstr "Selecteer kleur voor koppelingen"
 
-#: src/prefs_msg_colors.c:335
+#: src/prefs_msg_colors.c:298
 msgid "URI link"
 msgstr "URI link"
 
-#: src/prefs_msg_colors.c:351
+#: src/prefs_msg_colors.c:306
 msgctxt "Tooltip"
 msgid "Pick color for signatures"
-msgstr "Selecteer kleur voor handtekeningen"
+msgstr "Selecteer kleur voor ondertekeningen"
+
+#. TRANSLATORS: A patch is a text file listing the differences between 2 or more different
+#. versions of the same text file
+#: src/prefs_msg_colors.c:316
+msgid "Patch messages and attachments"
+msgstr "Patchberichten en bijvoegsels"
+
+#: src/prefs_msg_colors.c:324
+msgctxt "Tooltip"
+msgid "Pick color for inserted lines"
+msgstr "Selecteer kleur voor ingevoegde regels"
 
-#: src/prefs_msg_colors.c:358 src/prefs_summaries.c:365
+#: src/prefs_msg_colors.c:326
+msgid "Inserted lines"
+msgstr "Ingevoegde regels"
+
+#: src/prefs_msg_colors.c:333
+msgctxt "Tooltip"
+msgid "Pick color for removed lines"
+msgstr "Selecteer kleur voor verwijderde regels"
+
+#: src/prefs_msg_colors.c:336
+msgid "Removed lines"
+msgstr "Verwijderde regels"
+
+#. TRANSLATORS: A hunk is a section of the patch indicating how the files differ
+#: src/prefs_msg_colors.c:344
+msgctxt "Tooltip."
+msgid "Pick color for hunk lines"
+msgstr "Selecteer kleur voor \"hunk\"-regels"
+
+#. TRANSLATORS: A hunk is a section of the patch indicating how the files differ
+#: src/prefs_msg_colors.c:348
+msgid "Hunk lines"
+msgstr "\"Hunk\"-regels"
+
+#: src/prefs_msg_colors.c:350 src/prefs_summaries.c:380
 msgid "Folder list"
 msgstr "Mappenlijst"
 
-#: src/prefs_msg_colors.c:370
+#: src/prefs_msg_colors.c:357
+msgctxt "Tooltip"
 msgid ""
 "Pick color for Target folder. Target folder is used when the option 'Execute "
 "immediately when moving or deleting messages' is turned off"
 msgstr ""
-"Selecteer de kleur voor de doel-map. Een doel-map wordt gebruikt als de "
-"optie 'Meteen uitvoeren wanneer een bericht verplaatst of verwijderd wordt' "
-"uit staat"
+"Selecteer de kleur voor de doelmap. Een doelmap wordt gebruikt als de optie "
+"'Meteen uitvoeren wanneer een bericht verplaatst of verwijderd wordt' "
+"uitgeschakeld is"
 
-#: src/prefs_msg_colors.c:374
+#: src/prefs_msg_colors.c:362
 msgid "Target folder"
 msgstr "Doelmap"
 
-#: src/prefs_msg_colors.c:388
+#: src/prefs_msg_colors.c:369
+msgctxt "Tooltip"
 msgid "Pick color for folders containing new messages"
-msgstr "Slecteer kleur voor mappen met nieuwe berichten"
+msgstr "Selecteer kleur voor mappen met nieuwe berichten"
 
-#: src/prefs_msg_colors.c:390
+#: src/prefs_msg_colors.c:373
 msgid "Folder containing new messages"
 msgstr "Map met nieuwe berichten"
 
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated
-#: src/prefs_msg_colors.c:417 src/prefs_msg_colors.c:449
+#: src/prefs_msg_colors.c:398 src/prefs_msg_colors.c:430
 #, c-format
 msgctxt "Tooltip"
 msgid "Pick color for 'color %d'"
@@ -16625,82 +16890,97 @@ msgstr "Selecteer kleur voor 'color %d'"
 
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated
-#: src/prefs_msg_colors.c:421 src/prefs_msg_colors.c:453
+#: src/prefs_msg_colors.c:402 src/prefs_msg_colors.c:434
 #, c-format
 msgid "Set label for 'color %d'"
 msgstr "Selecteer label voor 'color %d'"
 
-#. TRANSLATORS: 'color %d' refers to the filtering/processing
-#. rule name and should not be translated
-#: src/prefs_msg_colors.c:582
-#, c-format
-msgctxt "Dialog title"
-msgid "Pick color for 'color %d'"
-msgstr "Selecteer kleur voor 'color %d'"
-
-#: src/prefs_msg_colors.c:590
+#: src/prefs_msg_colors.c:529
 msgctxt "Dialog title"
 msgid "Pick color for 1st level text"
 msgstr "Selecteer kleur voor tekst van 1e niveau"
 
-#: src/prefs_msg_colors.c:593
+#: src/prefs_msg_colors.c:531
 msgctxt "Dialog title"
 msgid "Pick color for 2nd level text"
 msgstr "Selecteer kleur voor tekst van 2e niveau"
 
-#: src/prefs_msg_colors.c:596
+#: src/prefs_msg_colors.c:533
 msgctxt "Dialog title"
 msgid "Pick color for 3rd level text"
-msgstr "Selecteer kleur voor tekst van 3e niveau "
+msgstr "Selecteer kleur voor tekst van 3e niveau"
 
-#: src/prefs_msg_colors.c:599
+#: src/prefs_msg_colors.c:535
 msgctxt "Dialog title"
 msgid "Pick color for 1st level text background"
 msgstr "Selecteer kleur voor achtergrond van 1e niveau"
 
-#: src/prefs_msg_colors.c:602
+#: src/prefs_msg_colors.c:537
 msgctxt "Dialog title"
 msgid "Pick color for 2nd level text background"
 msgstr "Selecteer kleur voor achtergrond van 2e niveau"
 
-#: src/prefs_msg_colors.c:605
+#: src/prefs_msg_colors.c:539
 msgctxt "Dialog title"
 msgid "Pick color for 3rd level text background"
 msgstr "Selecteer kleur voor achtergrond van 3e niveau"
 
-#: src/prefs_msg_colors.c:608
+#: src/prefs_msg_colors.c:541
 msgctxt "Dialog title"
 msgid "Pick color for links"
 msgstr "Selecteer kleur voor koppelingen"
 
-#: src/prefs_msg_colors.c:611
+#: src/prefs_msg_colors.c:543
 msgctxt "Dialog title"
 msgid "Pick color for target folder"
 msgstr "Selecteer kleur voor doelmap"
 
-#: src/prefs_msg_colors.c:614
+#: src/prefs_msg_colors.c:545
 msgctxt "Dialog title"
 msgid "Pick color for signatures"
-msgstr "Selecteer kleur voor handtekeningen"
+msgstr "Selecteer kleur voor ondertekeningen"
 
-#: src/prefs_msg_colors.c:617
+#: src/prefs_msg_colors.c:547
 msgctxt "Dialog title"
 msgid "Pick color for folder"
 msgstr "Selecteer kleur voor map"
 
-#: src/prefs_msg_colors.c:831
+#: src/prefs_msg_colors.c:549
+msgctxt "Dialog title"
+msgid "Pick color for inserted lines"
+msgstr "Selecteer kleur voor ingevoegde regels"
+
+#: src/prefs_msg_colors.c:551
+msgctxt "Dialog title"
+msgid "Pick color for removed lines"
+msgstr "Selecteer kleur voor verwijderde regels"
+
+#: src/prefs_msg_colors.c:553
+msgctxt "Dialog title"
+msgid "Pick color for hunk lines"
+msgstr "Selecteer kleur voor \"hunk\"-regels"
+
+#. TRANSLATORS: 'color %d' refers to the filtering/processing
+#. rule name and should not be translated
+#: src/prefs_msg_colors.c:576
+#, c-format
+msgctxt "Dialog title"
+msgid "Pick color for 'color %d'"
+msgstr "Selecteer kleur voor 'color %d'"
+
+#: src/prefs_msg_colors.c:777
 msgid "Colors"
 msgstr "Kleuren"
 
-#: src/prefs_other.c:107
+#: src/prefs_other.c:109
 msgid "Choose preset keyboard shortcuts"
 msgstr "Kies thema sneltoetsen"
 
-#: src/prefs_other.c:121
+#: src/prefs_other.c:124
 msgid "Select preset:"
 msgstr "Selecteer thema:"
 
-#: src/prefs_other.c:136
+#: src/prefs_other.c:139
 msgid ""
 "You can also modify each menu shortcut by pressing\n"
 "any key(s) when focusing the mouse pointer on the item."
@@ -16709,35 +16989,39 @@ msgstr ""
 "met de muis op dat item te gaan staan, en dan de gewenste toets in te "
 "drukken."
 
-#: src/prefs_other.c:496
+#: src/prefs_other.c:497
 msgid "Add address to destination when double-clicked"
 msgstr "Voeg adres toe aan 'Geadresseerden' na dubbelklikken"
 
-#: src/prefs_other.c:499
+#: src/prefs_other.c:500
 msgid "On exit"
 msgstr "Afsluiten"
 
-#: src/prefs_other.c:502
+#: src/prefs_other.c:503
 msgid "Confirm on exit"
 msgstr "Bevestigen bij het afsluiten"
 
-#: src/prefs_other.c:509
+#: src/prefs_other.c:510
 msgid "Empty trash on exit"
 msgstr "Prullenbak legen bij het afsluiten"
 
-#: src/prefs_other.c:512
+#: src/prefs_other.c:513
 msgid "Warn if there are queued messages"
 msgstr "Waarschuwen wanneer er berichten in de wachtrij staan"
 
-#: src/prefs_other.c:514
+#: src/prefs_other.c:515
 msgid "Keyboard shortcuts"
 msgstr "Sneltoetsen"
 
-#: src/prefs_other.c:517
+#: src/prefs_other.c:518
+msgid "Enable keyboard shortcuts"
+msgstr "Schakel gebruik van sneltoetsen in"
+
+#: src/prefs_other.c:521
 msgid "Enable customisable keyboard shortcuts"
 msgstr "Maak aangepaste sneltoetsen mogelijk"
 
-#: src/prefs_other.c:520
+#: src/prefs_other.c:524
 msgid ""
 "If checked, you can change the keyboard shortcuts of most of the menu items "
 "by focusing on the menu item and pressing a key combination.\n"
@@ -16747,15 +17031,15 @@ msgstr ""
 "muis op dat item te gaan staan, en dan de gewenste toets in te drukken\n"
 "Vink deze optie uit als je alle sneltoetsen wilt vastzetten."
 
-#: src/prefs_other.c:527
+#: src/prefs_other.c:531
 msgid " Choose preset keyboard shortcuts... "
-msgstr "Kies sneltoetsen..."
+msgstr "Kies vooringestelde sneltoetsen... "
 
-#: src/prefs_other.c:537
+#: src/prefs_other.c:541
 msgid "Metadata handling"
 msgstr "Metadata verwerking"
 
-#: src/prefs_other.c:538
+#: src/prefs_other.c:542
 msgid ""
 "Safer mode asks the OS to write metadata to disk directly;\n"
 "it avoids data loss after crashes but can take some time."
@@ -16764,31 +17048,43 @@ msgstr ""
 "schrijven,\n"
 "het vermijdt informatieverlies na vastlopen maar kan wat langer duren."
 
-#: src/prefs_other.c:542
+#: src/prefs_other.c:546
 msgid "Safer"
 msgstr "Veiliger"
 
-#: src/prefs_other.c:544
+#: src/prefs_other.c:548
 msgid "Faster"
 msgstr "Sneller"
 
-#: src/prefs_other.c:562
+#: src/prefs_other.c:566
 msgid "Socket I/O timeout"
 msgstr "Socket-I/O tijdslimiet"
 
-#: src/prefs_other.c:583
+#: src/prefs_other.c:587
+msgid "Translate header names"
+msgstr "Vertaal headernamen"
+
+#: src/prefs_other.c:589
+msgid ""
+"The display of standard headers (such as 'From:', 'Subject:') will be "
+"translated into your language."
+msgstr ""
+"De standaardheaders (zoals 'From:', 'Subject:') zullen in je eigen taal "
+"worden weergegeven."
+
+#: src/prefs_other.c:592
 msgid "Ask before emptying trash"
 msgstr "Bevestigen bij het legen"
 
-#: src/prefs_other.c:585
+#: src/prefs_other.c:594
 msgid "Ask about account specific filtering rules when filtering manually"
 msgstr "Bij handmatig filteren, vraag naar accountspecifieke filterregels"
 
-#: src/prefs_other.c:590
+#: src/prefs_other.c:599
 msgid "Use secure file deletion if possible"
 msgstr "Gebruik veilige bestandsverwijdering wanneer mogelijk"
 
-#: src/prefs_other.c:594
+#: src/prefs_other.c:603
 msgid ""
 "Use secure file deletion if possible\n"
 "(the 'shred' program is not available)"
@@ -16796,7 +17092,7 @@ msgstr ""
 "Gebruik veilige bestandsverwijdering wanneer mogelijk\n"
 "(het programma 'shred' is niet beschikbaar)"
 
-#: src/prefs_other.c:599
+#: src/prefs_other.c:608
 msgid ""
 "Use the 'shred' program to overwrite files with random data before deleting "
 "them. This slows down deletion. Be sure to read shred's man page for caveats."
@@ -16805,19 +17101,19 @@ msgstr ""
 "overschrijven voor het verwijderen. Dit vertraagt het verwijderen. Het "
 "advies is om de handleiding (man shred) na te lezen voor de zekerheid."
 
-#: src/prefs_other.c:603
+#: src/prefs_other.c:612
 msgid "Synchronise offline folders as soon as possible"
 msgstr "Synchroniseer offline mappen zo snel mogelijk"
 
-#: src/prefs_other.c:606
+#: src/prefs_other.c:615
 msgid "Master passphrase"
 msgstr "Hoofdwachtwoord"
 
-#: src/prefs_other.c:609
+#: src/prefs_other.c:618
 msgid "Use a master passphrase"
 msgstr "Gebruik een hoofdwachtwoord"
 
-#: src/prefs_other.c:612
+#: src/prefs_other.c:621
 msgid ""
 "If checked, your saved account passwords will be protected by a master "
 "passphrase. If no master passphrase is set, you will be prompted to set one."
@@ -16826,261 +17122,248 @@ msgstr ""
 "hoofdwachtwoord. Als er geen hoofdwachtwoord is ingesteld, dan wordt je "
 "gevraagd om deze in te stellen."
 
-#: src/prefs_other.c:617
+#: src/prefs_other.c:626
 msgid "Change master passphrase"
 msgstr "Wijzigen hoofdwachtwoord"
 
-#: src/prefs_other.c:777
+#: src/prefs_other.c:816
 msgid "Miscellaneous"
 msgstr "Overige"
 
+#: src/prefs_proxy.c:240 src/prefs_receive.c:415 src/prefs_send.c:419
+msgid "Mail Handling"
+msgstr "E-mailverwerking"
+
 #: src/prefs_quote.c:77
 msgid "On %d\\n%f wrote:\\n\\n%q"
 msgstr "Op %d\\nschreef %f:\\n\\n%q"
 
-#: src/prefs_receive.c:142
+#: src/prefs_receive.c:145
 msgid "External incorporation program"
 msgstr "Extern invoegprogramma"
 
-#: src/prefs_receive.c:145
+#: src/prefs_receive.c:148
 msgid "Use external program for receiving mail"
 msgstr "Gebruik extern programma voor ontvangen van e-mail"
 
-#: src/prefs_receive.c:161
-msgid "Automatic checking"
-msgstr "Automatisch controleren"
-
-# TPTD: check
-#: src/prefs_receive.c:168
-msgid "Check for new mail every"
-msgstr "Controleer op nieuwe berichten elke"
-
-#: src/prefs_receive.c:212
+#: src/prefs_receive.c:215
 msgid "Check for new mail on start-up"
 msgstr "Controleer op nieuwe berichten tijdens het opstarten"
 
-#: src/prefs_receive.c:215
+#: src/prefs_receive.c:218
 msgid "Dialogs"
 msgstr "Dialogen"
 
-#: src/prefs_receive.c:217
+#: src/prefs_receive.c:220
 msgid "Show receive dialog"
 msgstr "Ontvangstvenster weergeven"
 
-#: src/prefs_receive.c:227
+#: src/prefs_receive.c:230
 msgid "Only on manual receiving"
 msgstr "Alleen bij het handmatig ophalen"
 
-#: src/prefs_receive.c:238
+#: src/prefs_receive.c:241
 msgid "Close receive dialog when finished"
 msgstr "Na het ophalen onvangstvenster sluiten"
 
-#: src/prefs_receive.c:241
+#: src/prefs_receive.c:244
 msgid "Don't popup error dialog on receive error"
 msgstr "Geen popup-waarschuwingsvenster bij ontvangstfouten"
 
-#: src/prefs_receive.c:244
+#: src/prefs_receive.c:247
 msgid "After receiving new mail"
 msgstr "Na ontvangen van nieuwe e-mail"
 
-#: src/prefs_receive.c:246
+#: src/prefs_receive.c:249
 msgid "Go to Inbox"
 msgstr "Ga naar Inbox"
 
-#: src/prefs_receive.c:248
+#: src/prefs_receive.c:251
 msgid "Update all local folders"
 msgstr "Alle lokale mappen bijwerken"
 
-#: src/prefs_receive.c:250
+#: src/prefs_receive.c:253
 msgid "Run command"
 msgstr "Voer opdracht uit"
 
-#: src/prefs_receive.c:255
+#: src/prefs_receive.c:258
 msgid "after automatic check"
 msgstr "na automatisch ophalen"
 
-#: src/prefs_receive.c:257
+#: src/prefs_receive.c:260
 msgid "after manual check"
 msgstr "na handmatig ophalen"
 
-#: src/prefs_receive.c:265
+#: src/prefs_receive.c:280
 #, c-format
-msgid ""
-"Command to execute:\n"
-"(use %d as number of new mails)"
-msgstr ""
-"Opdracht om uit te voeren:\n"
-"(gebruik %d voor het aantal nieuwe berichten)"
+msgid "Use %d as number of new mails"
+msgstr "Use %d as number of new mails"
 
-#: src/prefs_receive.c:408 src/prefs_send.c:415
-msgid "Mail Handling"
-msgstr "E-mailverwerking"
-
-#: src/prefs_receive.c:409
+#: src/prefs_receive.c:416
 msgid "Receiving"
 msgstr "Ontvangen"
 
-#: src/prefs_send.c:172
+#: src/prefs_send.c:176
 msgid "Save sent messages"
 msgstr "Bewaar verzonden berichten"
 
-#: src/prefs_send.c:175
+#: src/prefs_send.c:179
 msgid "Never send Return Receipts"
 msgstr "Stuur nooit een ontvangstbevestiging"
 
-#: src/prefs_send.c:193
+#: src/prefs_send.c:197
 msgid "Confirm before sending queued messages"
 msgstr "Bevestig voor verzenden van berichten uit de wachtrij"
 
-#: src/prefs_send.c:196
+#: src/prefs_send.c:200
 msgid "Show send dialog"
 msgstr "Verstuurvenster weergeven"
 
-#: src/prefs_send.c:199
+#: src/prefs_send.c:203
 msgid "Warn when Subject is empty"
 msgstr "Waarschuwen wanneer het Onderwerp leeg is"
 
-#: src/prefs_send.c:205
-msgid "Warn when sending to more recipients than:"
-msgstr "Waarschuwen wanneer verzonden wordt aan meer ontvangers dan:"
+#: src/prefs_send.c:209
+msgid "Warn when sending to more recipients than"
+msgstr "Waarschuwen wanneer verzonden wordt aan meer ontvangers dan"
 
-#: src/prefs_send.c:221
+#: src/prefs_send.c:225
 msgid "Outgoing encoding"
 msgstr "Codering voor uitgaande berichten"
 
-#: src/prefs_send.c:246
+#: src/prefs_send.c:250
 msgid ""
 "If 'Automatic' is selected, the optimal encoding for the current locale will "
 "be used"
 msgstr ""
-"Als 'Automatisch' is ingesteld wordt de optimale codering\n"
-"gebruikt voor de huidige locale."
+"Als 'Automatisch' is ingesteld wordt de optimale codering gebruikt voor de "
+"huidige locale"
 
-#: src/prefs_send.c:263
+#: src/prefs_send.c:267
 msgid "7bit ASCII (US-ASCII)"
 msgstr "7bit ASCII (US-ASCII)"
 
-#: src/prefs_send.c:264
+#: src/prefs_send.c:268
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_send.c:266
+#: src/prefs_send.c:270
 msgid "Western European (ISO-8859-1)"
 msgstr "West-Europees (ISO-8859-1)"
 
-#: src/prefs_send.c:267
+#: src/prefs_send.c:271
 msgid "Western European (ISO-8859-15)"
 msgstr "West-Europees (ISO-8859-15)"
 
-#: src/prefs_send.c:269
+#: src/prefs_send.c:273
 msgid "Central European (ISO-8859-2)"
 msgstr "Centraal-Europees (ISO-8859-2)"
 
-#: src/prefs_send.c:271
+#: src/prefs_send.c:275
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltisch (ISO-8859-13)"
 
-#: src/prefs_send.c:272
+#: src/prefs_send.c:276
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltisch (ISO-8859-4)"
 
-#: src/prefs_send.c:274
+#: src/prefs_send.c:278
 msgid "Greek (ISO-8859-7)"
 msgstr "Grieks (ISO-8859-7)"
 
-#: src/prefs_send.c:276
+#: src/prefs_send.c:280
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Hebreeuws (ISO-8859-7)"
 
-#: src/prefs_send.c:277
+#: src/prefs_send.c:281
 msgid "Hebrew (Windows-1255)"
 msgstr "Hebreeuws (Windows-1251)"
 
-#: src/prefs_send.c:279
+#: src/prefs_send.c:283
 msgid "Arabic (ISO-8859-6)"
 msgstr "Arabisch (ISO-8859-6)"
 
-#: src/prefs_send.c:280
+#: src/prefs_send.c:284
 msgid "Arabic (Windows-1256)"
 msgstr "Arabisch (Windows-1256)"
 
-#: src/prefs_send.c:282
+#: src/prefs_send.c:286
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turks (ISO-8859-9)"
 
-#: src/prefs_send.c:284
+#: src/prefs_send.c:288
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cyrillisch (ISO-8859-5)"
 
-#: src/prefs_send.c:285
+#: src/prefs_send.c:289
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cyrillisch (KOI8-R)"
 
-#: src/prefs_send.c:286
+#: src/prefs_send.c:290
 msgid "Cyrillic (X-MAC-CYRILLIC)"
 msgstr "Cyrillisch (X-MAC-CYRILLIC)"
 
-#: src/prefs_send.c:287
+#: src/prefs_send.c:291
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cyrillisch (KOI8-U)"
 
-#: src/prefs_send.c:288
+#: src/prefs_send.c:292
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cyrillisch (Windows-1251)"
 
-#: src/prefs_send.c:290
+#: src/prefs_send.c:294
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japans (ISO-2022-JP)"
 
-#: src/prefs_send.c:292
+#: src/prefs_send.c:296
 msgid "Japanese (EUC-JP)"
 msgstr "Japans (EUC-JP)"
 
-#: src/prefs_send.c:293
+#: src/prefs_send.c:297
 msgid "Japanese (Shift_JIS)"
 msgstr "Japans (Shift_JIS)"
 
-#: src/prefs_send.c:296
+#: src/prefs_send.c:300
 msgid "Simplified Chinese (GB18030)"
 msgstr "Vereenvoudigd Chinees (GB18030)"
 
-#: src/prefs_send.c:297
+#: src/prefs_send.c:301
 msgid "Simplified Chinese (GB2312)"
 msgstr "Vereenvoudigd Chinees (GB2312)"
 
-#: src/prefs_send.c:298
+#: src/prefs_send.c:302
 msgid "Simplified Chinese (GBK)"
 msgstr "Vereenvoudigd Chinees (GBK)"
 
-#: src/prefs_send.c:299
+#: src/prefs_send.c:303
 msgid "Traditional Chinese (Big5)"
 msgstr "Traditioneel Chinees (Big5)"
 
-#: src/prefs_send.c:301
+#: src/prefs_send.c:305
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Traditioneel Chinees (EUC-TW)"
 
-#: src/prefs_send.c:302
+#: src/prefs_send.c:306
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chinees (ISO-2022-CN)"
 
-#: src/prefs_send.c:305
+#: src/prefs_send.c:309
 msgid "Korean (EUC-KR)"
 msgstr "Koreaans (EUC-KR)"
 
-#: src/prefs_send.c:307
+#: src/prefs_send.c:311
 msgid "Thai (TIS-620)"
 msgstr "Thai (TIS-620)"
 
-#: src/prefs_send.c:308
+#: src/prefs_send.c:312
 msgid "Thai (Windows-874)"
 msgstr "Thai (Windows-874)"
 
-#: src/prefs_send.c:312
+#: src/prefs_send.c:316
 msgid "Transfer encoding"
 msgstr "Overdracht-codering"
 
-#: src/prefs_send.c:323
+#: src/prefs_send.c:327
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters"
@@ -17088,8 +17371,8 @@ msgstr ""
 "Specificeer de Inhoud-Overdracht-Codering (Content-Transfer-Encoding) die "
 "gebruikt moet worden als de tekst van het bericht niet-ASCII tekens bevat"
 
-#: src/prefs_send.c:416 src/send_message.c:501 src/send_message.c:505
-#: src/send_message.c:510
+#: src/prefs_send.c:420 src/send_message.c:520 src/send_message.c:524
+#: src/send_message.c:529
 msgid "Sending"
 msgstr "Verzenden"
 
@@ -17136,254 +17419,278 @@ msgstr "Kleur voor foutief gespeld woord"
 #: src/prefs_spelling.c:216
 msgid "Pick color for misspelled word. Use black to underline"
 msgstr ""
-"Selecteer kleur voor foutief gespeld woord. Gebruik zwart voor onderstrepen."
+"Selecteer kleur voor foutief gespeld woord. Gebruik zwart voor onderstrepen"
 
 #: src/prefs_spelling.c:333
 msgid "Spell Checking"
 msgstr "Spellingcontrole"
 
-#: src/prefs_summaries.c:160
+#: src/prefs_summaries.c:167
 msgid "the abbreviated weekday name"
 msgstr "afkorting naam van de dag"
 
-#: src/prefs_summaries.c:161
+#: src/prefs_summaries.c:168
 msgid "the full weekday name"
 msgstr "volledige naam van dag"
 
-#: src/prefs_summaries.c:162
+#: src/prefs_summaries.c:169
 msgid "the abbreviated month name"
 msgstr "afkorting naam van de dag"
 
-#: src/prefs_summaries.c:163
+#: src/prefs_summaries.c:170
 msgid "the full month name"
 msgstr "volledige naam van maand"
 
-#: src/prefs_summaries.c:164
+#: src/prefs_summaries.c:171
 msgid "the preferred date and time for the current locale"
 msgstr "voorkeursdatum en -tijd voor huidige locale"
 
-#: src/prefs_summaries.c:165
+#: src/prefs_summaries.c:172
 msgid "the century number (year/100)"
 msgstr "eeuw (jaar/100)"
 
-#: src/prefs_summaries.c:166
+#: src/prefs_summaries.c:173
 msgid "the day of the month as a decimal number"
 msgstr "dag van de maand"
 
-#: src/prefs_summaries.c:167
+#: src/prefs_summaries.c:174
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "uur (24-uurs klok)"
 
-#: src/prefs_summaries.c:168
+#: src/prefs_summaries.c:175
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "uur (12-uurs klok)"
 
-#: src/prefs_summaries.c:169
+#: src/prefs_summaries.c:176
 msgid "the day of the year as a decimal number"
 msgstr "dagnummer van het jaar (1-366)"
 
-#: src/prefs_summaries.c:170
+#: src/prefs_summaries.c:177
 msgid "the month as a decimal number"
 msgstr "maandnummer (1-12)"
 
-#: src/prefs_summaries.c:171
+#: src/prefs_summaries.c:178
 msgid "the minute as a decimal number"
 msgstr "minuut"
 
-#: src/prefs_summaries.c:172
+#: src/prefs_summaries.c:179
 msgid "either AM or PM"
-msgstr "AM / PM"
+msgstr "of AM of PM"
 
-#: src/prefs_summaries.c:173
+#: src/prefs_summaries.c:180
 msgid "the second as a decimal number"
 msgstr "seconde"
 
-#: src/prefs_summaries.c:174
+#: src/prefs_summaries.c:181
 msgid "the day of the week as a decimal number"
 msgstr "dagnummer van de week (0-6, 0=zondag)"
 
-#: src/prefs_summaries.c:175
+#: src/prefs_summaries.c:182
 msgid "the preferred date for the current locale"
 msgstr "voorkeursdatum voor huidige locale"
 
-#: src/prefs_summaries.c:176
+#: src/prefs_summaries.c:183
 msgid "the last two digits of a year"
 msgstr "laatste twee decimalen van een jaar"
 
-#: src/prefs_summaries.c:177
+#: src/prefs_summaries.c:184
 msgid "the year as a decimal number"
 msgstr "laatste decimaal van een jaar"
 
-#: src/prefs_summaries.c:178
+#: src/prefs_summaries.c:185
 msgid "the time zone or name or abbreviation"
 msgstr "tijdzone of naam of afkorting"
 
-#: src/prefs_summaries.c:199 src/prefs_summaries.c:247
-#: src/prefs_summaries.c:565
+#: src/prefs_summaries.c:206 src/prefs_summaries.c:255
+#: src/prefs_summaries.c:486
 msgid "Date format"
-msgstr "Datumformaat"
+msgstr "Datumformat"
 
-#: src/prefs_summaries.c:223
+#: src/prefs_summaries.c:231
 msgid "Specifier"
 msgstr "Teken"
 
-#: src/prefs_summaries.c:265
+#: src/prefs_summaries.c:273
 msgid "Example"
 msgstr "Voorbeeld"
 
-#: src/prefs_summaries.c:371
+#: src/prefs_summaries.c:400
 msgid "Display message count next to folder name"
 msgstr "Geef aantal berichten weer naast mapnaam"
 
-#: src/prefs_summaries.c:381
+#: src/prefs_summaries.c:410
 msgid "Unread messages"
 msgstr "Ongelezen berichten"
 
-#: src/prefs_summaries.c:382
+#: src/prefs_summaries.c:411
 msgid "Unread and Total messages"
 msgstr "Ongelezen en Totaal aantal berichten"
 
-#: src/prefs_summaries.c:392
+#: src/prefs_summaries.c:417
 msgid "Open last opened folder at start-up"
 msgstr "Open de laatst geopende map bij het opstarten"
 
-#: src/prefs_summaries.c:395
+#: src/prefs_summaries.c:424
 msgid "Abbreviate newsgroup names longer than"
 msgstr "Inkorten van nieuwsgroep namen langer dan"
 
-#: src/prefs_summaries.c:408
+#: src/prefs_summaries.c:437
 msgid "letters"
 msgstr "tekens"
 
-#: src/prefs_summaries.c:426
+#: src/prefs_summaries.c:445
 msgid "Message list"
 msgstr "Berichtenlijst"
 
-#: src/prefs_summaries.c:432
-msgid "Sort new folders by"
-msgstr "Sorteer nieuwe mappen op"
+#: src/prefs_summaries.c:462
+msgid "Lock column headers"
+msgstr "Kolomkoppen vastzetten"
 
-#: src/prefs_summaries.c:440 src/prefs_summary_column.c:85
-msgid "Number"
-msgstr "Nummer"
+#: src/prefs_summaries.c:468
+msgid "Displayed in From column"
+msgstr "Weergegeven in Van-kolom"
 
-#: src/prefs_summaries.c:443
-msgid "Thread date"
-msgstr "Datum van draad"
+#: src/prefs_summaries.c:479
+msgid "Name and Address"
+msgstr "Naam en adres"
 
-#: src/prefs_summaries.c:454
-msgid "Don't sort"
-msgstr "Niet sorteren"
-
-#: src/prefs_summaries.c:471
-msgid "Set default selection when entering a folder"
-msgstr "Gebruik standaard selectie bij het binnen gaan van een map"
-
-#: src/prefs_summaries.c:484
-msgid "Show \"no unread (or new) message\" dialog"
-msgstr "Toon 'Geen ongelezen (nieuwe) berichten'-dialoogvenster"
-
-#: src/prefs_summaries.c:494
-msgid "Assume 'Yes'"
-msgstr "Veronderstel 'Ja'"
+#: src/prefs_summaries.c:505
+msgid "Date format help"
+msgstr "Help bij datumformat"
 
-#: src/prefs_summaries.c:495
-msgid "Assume 'No'"
-msgstr "Veronderstel 'Nee'"
+#: src/prefs_summaries.c:511
+msgid "Set message selection when entering a folder"
+msgstr "Stel standaard selectie in bij het binnen gaan van een map"
 
-#: src/prefs_summaries.c:500
+#: src/prefs_summaries.c:520
 msgid "Open message when selected"
 msgstr "Bij selecteren het bericht openen"
 
-#: src/prefs_summaries.c:505
+#: src/prefs_summaries.c:525
 msgid "When opening a folder"
 msgstr "Bij het binnen gaan van een map"
 
-#: src/prefs_summaries.c:507
+#: src/prefs_summaries.c:527
 msgid "When displaying search results"
 msgstr "Wanneer de zoekresultaten weergegeven worden"
 
-#: src/prefs_summaries.c:509
+#: src/prefs_summaries.c:529
 msgid "When selecting next or previous message using shortcuts"
 msgstr ""
 "Bij het selecteren van het vorige of volgende bericht m.b.v. sneltoetsen"
 
-#: src/prefs_summaries.c:511
+#: src/prefs_summaries.c:531
 msgid "When deleting or moving messages"
 msgstr "Wanneer berichten worden verwijderd of verplaatst"
 
-#: src/prefs_summaries.c:513
+#: src/prefs_summaries.c:533
 msgid "When using directional keys"
 msgstr "Wanneer de pijltjestoetsen gebruikt worden"
 
-#: src/prefs_summaries.c:517
+#: src/prefs_summaries.c:535
+msgid "Mark message as read"
+msgstr "Markeer berichten als gelezen"
+
+#: src/prefs_summaries.c:538
+msgid "when selected, after"
+msgstr "bij selecteren, na"
+
+#: src/prefs_summaries.c:557
+msgid "only when opened in a new window, or replied to"
+msgstr "alleen als ze geopend worden in een nieuw venster, of beantwoord zijn"
+
+#: src/prefs_summaries.c:567
+msgid "Show \"no unread (or new) message\" dialog"
+msgstr "Toon 'Geen ongelezen (nieuwe) berichten'-dialoogvenster"
+
+#: src/prefs_summaries.c:577
+msgid "Assume 'Yes'"
+msgstr "Veronderstel 'Ja'"
+
+#: src/prefs_summaries.c:578
+msgid "Assume 'No'"
+msgstr "Veronderstel 'Nee'"
+
+#: src/prefs_summaries.c:584
+msgid "Display sender using address book"
+msgstr "Toon afzender mbv. adresboek"
+
+#: src/prefs_summaries.c:588
 msgid "Thread using subject in addition to standard headers"
 msgstr ""
 "Maak discussie-draden aan, aan de hand van het onderwerp bovenop het gebruik "
 "van de standaard headers"
 
-#: src/prefs_summaries.c:521
+#: src/prefs_summaries.c:592
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Meteen uitvoeren wanneer een bericht verplaatst of verwijderd wordt"
 
-#: src/prefs_summaries.c:523
+#: src/prefs_summaries.c:594
 msgid ""
-"Defers moving, copying and deleting of messages until you choose 'Tools/"
-"Execute'"
+"When unchecked moving, copying and deleting of messages is deferred until "
+"you use 'Tools/Execute'"
 msgstr ""
-"Stelt verplaatsen, kopiëren en verwijderen van berichten uit totdat je "
-"'Gereedschap/Opdracht Uitvoeren' kiest"
+"Indien uitgeschakeld, stelt verplaatsen, kopiëren en verwijderen van "
+"berichten uit totdat je 'Gereedschap/Uitvoeren' kiest"
 
-#: src/prefs_summaries.c:526
-msgid "Mark message as read"
-msgstr "Markeer berichten als gelezen"
-
-#: src/prefs_summaries.c:529
-msgid "when selected, after"
-msgstr "Bij selecteren, na"
+#: src/prefs_summaries.c:599
+msgid "Confirm when marking all messages as read or unread"
+msgstr ""
+"Bevestigen om alle berichten in een map als gelezen of ongelezen te markeren"
 
-#: src/prefs_summaries.c:548
-msgid "only when opened in a new window, or replied to"
-msgstr "Alleen als ze geopend worden in een nieuw venster, of beantwoord zijn"
+#: src/prefs_summaries.c:602
+msgid "Confirm when changing color labels"
+msgstr "Bevestigen voor veranderen kleurlabels"
 
-#: src/prefs_summaries.c:555
-msgid "Display sender using address book"
-msgstr "Toon afzender mbv. adresboek"
-
-#: src/prefs_summaries.c:559
+#: src/prefs_summaries.c:606
 msgid "Show tooltips"
 msgstr "Geef tooltips weer"
 
-#: src/prefs_summaries.c:585
-msgid "Date format help"
-msgstr "Help bij datumformaat"
+#: src/prefs_summaries.c:616 src/quote_fmt.c:539
+msgid "Defaults"
+msgstr "Standaard instellingen"
 
-#: src/prefs_summaries.c:603
-msgid "Confirm before marking all messages in a folder as read"
-msgstr ""
-"Vraag om bevestiging om alle berichten in een map als gelezen te markeren"
+#: src/prefs_summaries.c:618
+msgid "New folders"
+msgstr "Nieuwe mappen"
 
-#: src/prefs_summaries.c:606
-msgid "Translate header names"
-msgstr "Vertaal headernamen"
+#: src/prefs_summaries.c:624
+msgid "Sort by"
+msgstr "Sorteren op"
 
-#: src/prefs_summaries.c:608
-msgid ""
-"The display of standard headers (such as 'From:', 'Subject:') will be "
-"translated into your language."
-msgstr ""
-"De standaardheaders (zoals 'From:', 'Subject:') zullen in je eigen taal "
-"worden weergegeven."
+#: src/prefs_summaries.c:632 src/prefs_summary_column.c:85
+msgid "Number"
+msgstr "Nummer"
+
+#: src/prefs_summaries.c:635
+msgid "Thread date"
+msgstr "Datum van draad"
+
+#: src/prefs_summaries.c:646
+msgid "Don't sort"
+msgstr "Niet sorteren"
+
+#: src/prefs_summaries.c:661
+msgid "Thread view"
+msgstr "Boomvorm"
+
+#: src/prefs_summaries.c:664
+msgid "Collapse all threads"
+msgstr "Berichtenboom inklappen"
 
-#: src/prefs_summaries.c:767
+#: src/prefs_summaries.c:670
+msgid "Hide read messages"
+msgstr "Gelezen berichten verbergen"
+
+#: src/prefs_summaries.c:870
 msgid "Summaries"
 msgstr "Samenvattingen"
 
-#: src/prefs_summary_column.c:225
+#: src/prefs_summary_column.c:226
 msgid "Message list columns configuration"
 msgstr "Kolommen berichtenweergave instellen"
 
-#: src/prefs_summary_column.c:242
+#: src/prefs_summary_column.c:243
 msgid ""
 "Select columns to be displayed in the message list. You can modify\n"
 "the order by using the Up / Down buttons or by dragging the items."
@@ -17392,40 +17699,52 @@ msgstr ""
 "volgorde met de Omhoog / Omlaag knoppen, of door kolommen te verslepen."
 
 #: src/prefs_summary_open.c:109
-msgid "first marked email"
-msgstr "eerste gemarkeerde e-mail"
+msgid "oldest marked email"
+msgstr "oudste gemarkeerde e-mail"
 
 #: src/prefs_summary_open.c:110
-msgid "first new email"
-msgstr "eerste nieuwe e-mail"
+msgid "oldest new email"
+msgstr "oudste nieuwe e-mail"
 
 #: src/prefs_summary_open.c:111
-msgid "first unread email"
-msgstr "eerste ongelezen e-mail"
+msgid "oldest unread email"
+msgstr "oudste ongelezen e-mail"
 
 #: src/prefs_summary_open.c:112
 msgid "last opened email"
 msgstr "laatst geopende e-mail"
 
 #: src/prefs_summary_open.c:113
-msgid "last email in the list"
-msgstr "laatste e-mail in de lijst"
+msgid "newest email in the list"
+msgstr "nieuwste e-mail in de lijst"
 
 #: src/prefs_summary_open.c:115
-msgid "first email in the list"
-msgstr "eerste e-mail in de lijst"
+msgid "oldest email in the list"
+msgstr "oudste e-mail in de lijst"
+
+#: src/prefs_summary_open.c:116
+msgid "newest marked email"
+msgstr "nieuwste gemarkeerde e-mail"
+
+#: src/prefs_summary_open.c:117
+msgid "newest new email"
+msgstr "nieuwste nieuwe e-mail"
 
-#: src/prefs_summary_open.c:184
-msgid " Selection when entering a folder"
+#: src/prefs_summary_open.c:118
+msgid "newest unread email"
+msgstr "nieuwste ongelezen e-mail"
+
+#: src/prefs_summary_open.c:189
+msgid "Message selection when entering a folder"
 msgstr "Selectie bij het binnen gaan van een map"
 
-#: src/prefs_summary_open.c:230
-msgid "Possible selections"
-msgstr "Mogelijke selecties"
+#: src/prefs_summary_open.c:234
+msgid "Available selections"
+msgstr "Beschikbare selecties"
 
-#: src/prefs_summary_open.c:266
-msgid "Selection on folder opening"
-msgstr "Selectie bij het openen van een map"
+#: src/prefs_summary_open.c:269
+msgid "Current selections"
+msgstr "Huidige selecties"
 
 #: src/prefs_template.c:80
 msgid "This name is used as the Menu item"
@@ -17524,47 +17843,43 @@ msgstr "Wil je dit sjabloon werkelijk verwijderen?"
 
 #: src/prefs_template.c:917
 msgid "Delete all templates"
-msgstr "Verwijder alle sjablonen?"
+msgstr "Verwijder alle sjablonen"
 
 #: src/prefs_template.c:918
 msgid "Do you really want to delete all the templates?"
 msgstr "Wil je alle sjablonen werkelijk verwijderen?"
 
-#: src/prefs_template.c:1233
+#: src/prefs_template.c:1234
 msgid "Current templates"
 msgstr "Huidige sjablonen"
 
-#: src/prefs_template.c:1261
+#: src/prefs_template.c:1262
 msgid "Template"
 msgstr "Sjabloon"
 
-#: src/prefs_themes.c:400 src/prefs_themes.c:841
+#: src/prefs_themes.c:401 src/prefs_themes.c:841
 msgid "Default internal theme"
 msgstr "Standaard intern thema"
 
-#: src/prefs_themes.c:422
+#: src/prefs_themes.c:423
 msgid "Themes"
 msgstr "Thema's"
 
-#: src/prefs_themes.c:501
-msgid "Only root can remove system themes"
-msgstr "Alleen root kan systeemthema's verwijderen"
-
-#: src/prefs_themes.c:504
+#: src/prefs_themes.c:500
 #, c-format
 msgid "Remove system theme '%s'"
 msgstr "Verwijder systeemthema '%s'"
 
-#: src/prefs_themes.c:507
+#: src/prefs_themes.c:502
 #, c-format
 msgid "Remove theme '%s'"
 msgstr "Verwijder thema '%s'"
 
-#: src/prefs_themes.c:513
+#: src/prefs_themes.c:507
 msgid "Are you sure you want to remove this theme?"
 msgstr "Wil je dit thema werkelijk verwijderen?"
 
-#: src/prefs_themes.c:523
+#: src/prefs_themes.c:517
 #, c-format
 msgid ""
 "File %s failed\n"
@@ -17573,40 +17888,40 @@ msgstr ""
 "Bestand %s mislukt\n"
 "tijdens verwijderen thema."
 
-#: src/prefs_themes.c:527
+#: src/prefs_themes.c:521
 msgid "Removing theme directory failed."
 msgstr "Verwijderen van thema-map mislukt."
 
-#: src/prefs_themes.c:530
+#: src/prefs_themes.c:524
 msgid "Theme removed successfully"
 msgstr "Thema verwijderd"
 
-#: src/prefs_themes.c:550
+#: src/prefs_themes.c:544
 msgid "Select theme folder"
 msgstr "Selecteer thema-map"
 
-#: src/prefs_themes.c:565
+#: src/prefs_themes.c:559
 #, c-format
 msgid "Install theme '%s'"
 msgstr "Installeer thema '%s'"
 
-#: src/prefs_themes.c:568
+#: src/prefs_themes.c:562
 msgid ""
-"This folder doesn't seem to be a theme folder.\n"
+"This folder doesn't seem to be a themefolder.\n"
 "Install anyway?"
 msgstr ""
 "Deze map lijkt niet een thema-map te zijn.\n"
 "Toch installeren?"
 
-#: src/prefs_themes.c:575
+#: src/prefs_themes.c:572
 msgid "Do you want to install theme for all users?"
 msgstr "Wil je dit thema voor alle gebruikers installeren?"
 
-#: src/prefs_themes.c:595
+#: src/prefs_themes.c:592
 msgid "Theme exists"
 msgstr "Thema bestaat"
 
-#: src/prefs_themes.c:596
+#: src/prefs_themes.c:593
 msgid ""
 "A theme with the same name is\n"
 "already installed in this location.\n"
@@ -17618,12 +17933,12 @@ msgstr ""
 "\n"
 "Wil je het vervangen?"
 
-#: src/prefs_themes.c:602
+#: src/prefs_themes.c:600
 #, c-format
 msgid "Couldn't delete the old theme in %s."
 msgstr "Kon het oude thema in '%s' niet verwijderen."
 
-#: src/prefs_themes.c:610
+#: src/prefs_themes.c:609
 #, c-format
 msgid "Couldn't create destination directory %s."
 msgstr "Kon de doelmap %s niet aanmaken."
@@ -17684,31 +17999,31 @@ msgstr "Haal er meer..."
 msgid "Information"
 msgstr "Informatie"
 
-#: src/prefs_themes.c:997
-msgid "Author: "
-msgstr "Auteur: "
+#: src/prefs_themes.c:998
+msgid "Author"
+msgstr "Auteur"
 
-#: src/prefs_themes.c:1005
-msgid "URL:"
-msgstr "URL:"
+#: src/prefs_themes.c:1006
+msgid "URL"
+msgstr "URL"
 
-#: src/prefs_themes.c:1047
+#: src/prefs_themes.c:1048
 msgid "Preview"
 msgstr "Voorbeeld"
 
-#: src/prefs_themes.c:1103
+#: src/prefs_themes.c:1105
 msgid "SVG rendering"
 msgstr "SVG rendering"
 
-#: src/prefs_themes.c:1110
+#: src/prefs_themes.c:1112
 msgid "Enable alpha channel"
 msgstr "Inschakelen alpha-channel"
 
-#: src/prefs_themes.c:1111
+#: src/prefs_themes.c:1113
 msgid "Force scaling"
 msgstr "Forceer schalen"
 
-#: src/prefs_themes.c:1117
+#: src/prefs_themes.c:1119
 msgid "Pixels per inch (PPI)"
 msgstr "Pixels per inch (PPI)"
 
@@ -17728,67 +18043,67 @@ msgstr "Item heeft geen pictogram ingesteld."
 msgid "Item has no text defined."
 msgstr "Item heeft geen tekst ingesteld."
 
-#: src/prefs_toolbar.c:929
+#: src/prefs_toolbar.c:896
 msgid "Toolbar item"
 msgstr "Werkbalk item"
 
-#: src/prefs_toolbar.c:945
+#: src/prefs_toolbar.c:912
 msgid "Item type"
 msgstr "Item-type"
 
-#: src/prefs_toolbar.c:955
+#: src/prefs_toolbar.c:922
 msgid "Internal Function"
 msgstr "Interne Functie"
 
-#: src/prefs_toolbar.c:956
+#: src/prefs_toolbar.c:923
 msgid "User Action"
 msgstr "Gebruikers Actie"
 
-#: src/prefs_toolbar.c:958 src/toolbar.c:279
+#: src/prefs_toolbar.c:925 src/toolbar.c:279
 msgid "Separator"
 msgstr "Scheidingsteken"
 
-#: src/prefs_toolbar.c:965
+#: src/prefs_toolbar.c:932
 msgid "Event executed on click"
 msgstr "Gebeurtenis uitgevoerd na klikken"
 
-#: src/prefs_toolbar.c:1004
+#: src/prefs_toolbar.c:959
 msgid "Toolbar text"
 msgstr "Tekst van werkbalk"
 
-#: src/prefs_toolbar.c:1019 src/prefs_toolbar.c:1395
+#: src/prefs_toolbar.c:974 src/prefs_toolbar.c:1351
 msgid "Icon"
 msgstr "Pictogram"
 
-#: src/prefs_toolbar.c:1055
+#: src/prefs_toolbar.c:1010
 msgid "A_dd"
 msgstr "_Toevoegen"
 
-#: src/prefs_toolbar.c:1275 src/prefs_toolbar.c:1289 src/prefs_toolbar.c:1303
+#: src/prefs_toolbar.c:1230 src/prefs_toolbar.c:1244 src/prefs_toolbar.c:1258
 msgid "Toolbars"
 msgstr "Werkbalken"
 
-#: src/prefs_toolbar.c:1276
+#: src/prefs_toolbar.c:1231
 msgid "Main Window"
 msgstr "Hoofdvenster"
 
-#: src/prefs_toolbar.c:1290
+#: src/prefs_toolbar.c:1245
 msgid "Message Window"
 msgstr "Berichtvenster"
 
-#: src/prefs_toolbar.c:1304
+#: src/prefs_toolbar.c:1259
 msgid "Compose Window"
 msgstr "Venster sluiten"
 
-#: src/prefs_toolbar.c:1418
+#: src/prefs_toolbar.c:1374
 msgid "Icon text"
 msgstr "Pictogramtekst"
 
-#: src/prefs_toolbar.c:1427
+#: src/prefs_toolbar.c:1383
 msgid "Mapped event"
 msgstr "Gebeurtenis"
 
-#: src/prefs_toolbar.c:1724
+#: src/prefs_toolbar.c:1690
 msgid "Toolbar item icon"
 msgstr "Werkbalk item pictogram"
 
@@ -17816,35 +18131,35 @@ msgstr "Tekst afbreken op"
 msgid "Wrapping"
 msgstr "Regels afbreken"
 
-#: src/printing.c:436
+#: src/printing.c:431
 msgid "Print preview"
 msgstr "Afdrukvoorbeeld"
 
-#: src/printing.c:479
+#: src/printing.c:474
 msgid "First page"
-msgstr "eerste pagina"
+msgstr "Eerste pagina"
 
-#: src/printing.c:490
+#: src/printing.c:484
 msgid "Last page"
 msgstr "Laatste pagina"
 
-#: src/printing.c:496
+#: src/printing.c:490
 msgid "Zoom 100%"
 msgstr "Zoom 100%"
 
-#: src/printing.c:498
+#: src/printing.c:492
 msgid "Zoom fit"
 msgstr "Zoom passend"
 
-#: src/printing.c:500
+#: src/printing.c:494
 msgid "Zoom in"
 msgstr "Zoom in"
 
-#: src/printing.c:502
+#: src/printing.c:496
 msgid "Zoom out"
 msgstr "Zoom uit"
 
-#: src/printing.c:701
+#: src/printing.c:676
 #, c-format
 msgid "Page %d"
 msgstr "Pagina %d"
@@ -17857,28 +18172,32 @@ msgstr "Geen informatie beschikbaar"
 msgid "No recipient keys defined."
 msgstr "Geen sleutel van ontvanger gedefinieerd."
 
-#: src/procmime.c:433 src/procmime.c:435 src/procmime.c:436
+#: src/procmime.c:402 src/procmime.c:404 src/procmime.c:405
 msgid "[Error decoding BASE64]\n"
 msgstr "[Fout bij decoderen BASE64]\n"
 
-#: src/procmsg.c:937 src/procmsg.c:940
+#: src/procmime.c:2755
+msgid "Could not decode part"
+msgstr "Kon gedeelte van bericht niet decoderen"
+
+#: src/procmsg.c:936 src/procmsg.c:939
 msgid "Already trying to send."
 msgstr "Reeds bezig met proberen te sturen."
 
-#: src/procmsg.c:1558 src/procmsg.c:1619
+#: src/procmsg.c:1563 src/procmsg.c:1624
 #, c-format
 msgid "Couldn't open file %s."
 msgstr "Kon bestand '%s' niet openen."
 
-#: src/procmsg.c:1629
+#: src/procmsg.c:1634
 msgid "Queued message header is broken."
 msgstr "Header van bericht in de wachtrij is kapot."
 
-#: src/procmsg.c:1649
+#: src/procmsg.c:1654
 msgid "An error happened during SMTP session."
 msgstr "Er is een fout opgetreden tijdens de SMTP-sessie."
 
-#: src/procmsg.c:1663
+#: src/procmsg.c:1668
 msgid ""
 "No specific account has been found to send, and an error happened during "
 "SMTP session."
@@ -17886,7 +18205,7 @@ msgstr ""
 "Er is geen specifiek account gevonden om mee te versturen en er is een fout "
 "opgetreden tijdens de SMTP-sessie."
 
-#: src/procmsg.c:1671
+#: src/procmsg.c:1676
 msgid ""
 "Couldn't determine sending information. Maybe the email hasn't been "
 "generated by Claws Mail."
@@ -17894,21 +18213,21 @@ msgstr ""
 "Kon verzend-informatie niet vinden. Misschien is deze e-mail niet gemaakt "
 "met Claws Mail."
 
-#: src/procmsg.c:1694
+#: src/procmsg.c:1699
 msgid "Couldn't create temporary file for news sending."
 msgstr "Kon tijdelijk bestand voor het verzenden van nieuws niet aanmaken."
 
-#: src/procmsg.c:1707
+#: src/procmsg.c:1712
 msgid "Error when writing temporary file for news sending."
 msgstr ""
 "Fout bij het schrijven naar tijdelijk bestand voor het verzenden van nieuws."
 
-#: src/procmsg.c:1721
+#: src/procmsg.c:1726
 #, c-format
 msgid "Error occurred while posting the message to %s."
 msgstr "Er is een fout opgetreden bij het versturen van het bericht naar %s."
 
-#: src/procmsg.c:2273
+#: src/procmsg.c:2286
 msgid "Filtering messages...\n"
 msgstr "Berichten sorteren...\n"
 
@@ -17918,7 +18237,7 @@ msgstr "<span weight=\"bold\">speciale tekens:</span>"
 
 #: src/quote_fmt.c:48
 msgid "customized date format (see 'man strftime')"
-msgstr "stel datumweergave in (zie 'man strftime')"
+msgstr "stel datumformat in (zie 'man strftime')"
 
 #: src/quote_fmt.c:51
 msgid "email address of sender"
@@ -17950,11 +18269,11 @@ msgstr "inhoud van bericht als citaat"
 
 #: src/quote_fmt.c:64
 msgid "message body without signature"
-msgstr "inhoud van bericht zonder handtekening"
+msgstr "inhoud van bericht zonder ondertekening"
 
 #: src/quote_fmt.c:65
 msgid "quoted message body without signature"
-msgstr "inhoud van bericht als citaat, zonder handtekening"
+msgstr "inhoud van bericht als citaat, zonder ondertekening"
 
 #: src/quote_fmt.c:66
 msgid "message tags"
@@ -17986,11 +18305,11 @@ msgstr "account-eigenschap: organisatie"
 
 #: src/quote_fmt.c:73
 msgid "account property: signature"
-msgstr "account-eigenschap: je handtekening"
+msgstr "account-eigenschap: je ondertekening"
 
 #: src/quote_fmt.c:74
 msgid "account property: signature path"
-msgstr "account-eigenschap: pad naar je handtekening"
+msgstr "account-eigenschap: pad naar je ondertekening"
 
 #: src/quote_fmt.c:75
 msgid "account property: default dictionary"
@@ -18161,7 +18480,7 @@ msgstr "De volgende speciale tekens en opdrachten kunnen worden gebruikt:"
 msgid "Use template when composing new messages"
 msgstr "Gebruik sjabloon bij het opstellen van nieuwe berichten"
 
-#: src/quote_fmt.c:198
+#: src/quote_fmt.c:197
 msgid ""
 "Override From header. This doesn't change the account used to compose the "
 "new message."
@@ -18169,31 +18488,27 @@ msgstr ""
 "Overschrijf de Van-header. Dit verandert niets aan het account dat gebruikt "
 "wordt om het nieuwe bericht te schrijven."
 
-#: src/quote_fmt.c:300
+#: src/quote_fmt.c:297
 msgid "Use template when replying to messages"
 msgstr "Gebruik sjabloon bij het beantwoorden van berichten"
 
-#: src/quote_fmt.c:324
+#: src/quote_fmt.c:320
 msgid "Override From header. This doesn't change the account used to reply."
 msgstr "Overschrijf Van-header. Dit verandert het gebruikte account niet."
 
-#: src/quote_fmt.c:335 src/quote_fmt.c:465
+#: src/quote_fmt.c:331 src/quote_fmt.c:459
 msgid "Quotation mark"
-msgstr "Citeerformaat"
+msgstr "Citeeropmaak"
 
-#: src/quote_fmt.c:430
+#: src/quote_fmt.c:425
 msgid "Use template when forwarding messages"
 msgstr "Gebruik sjabloon bij het doorsturen van berichten"
 
-#: src/quote_fmt.c:454
+#: src/quote_fmt.c:448
 msgid "Override From header. This doesn't change the account used to forward."
 msgstr "Overschrijf Van-header. Dit verandert het gebruikte account niet."
 
-#: src/quote_fmt.c:546
-msgid "Defaults"
-msgstr "Standaard instellingen"
-
-#: src/quote_fmt.c:564
+#: src/quote_fmt.c:557
 msgid ""
 "The \"From\" field of the \"New message\" template contains an invalid email "
 "address."
@@ -18201,111 +18516,111 @@ msgstr ""
 "Het \"Van\" veld van het \"Nieuw bericht\" sjabloon bevat een ongeldig e-"
 "mailadres."
 
-#: src/quote_fmt.c:567
+#: src/quote_fmt.c:560
 msgid "The \"Subject\" field of the \"New message\" template is invalid."
 msgstr "Het \"Onderwerp\" veld van het \"Nieuw bericht\" sjabloon is ongeldig."
 
-#: src/quote_fmt.c:584
+#: src/quote_fmt.c:577
 msgid "The \"Quotation mark\" field of the \"Reply\" template is invalid."
 msgstr ""
 "Het \"Citeer markering\" veld van het \"Beantwoorden\" sjabloon is ongeldig."
 
-#: src/quote_fmt.c:604
+#: src/quote_fmt.c:597
 msgid "The \"Quotation mark\" field of the \"Forward\" template is invalid."
 msgstr ""
 "Het \"Citeer markering\" veld van het \"Doorsturen\" sjabloon is ongeldig."
 
-#: src/quote_fmt_parse.y:541
+#: src/quote_fmt_parse.y:544
 #, c-format
 msgid "Enter text to replace '%s'"
 msgstr "Geef tekst om '%s' mee te vervangen"
 
-#: src/quote_fmt_parse.y:542
+#: src/quote_fmt_parse.y:545
 msgid "Enter variable"
 msgstr "Geef variabele"
 
-#: src/send_message.c:152
+#: src/send_message.c:154
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Bericht wordt verzonden met behulp van opdracht: %s\n"
 
-#: src/send_message.c:166
+#: src/send_message.c:168
 #, c-format
 msgid "Couldn't execute command: %s"
 msgstr "Kon de externe opdracht '%s' niet uitvoeren"
 
-#: src/send_message.c:202
+#: src/send_message.c:204
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Fout bij uitvoeren van opdracht: %s"
 
-#: src/send_message.c:350
+#: src/send_message.c:353
 msgid "Connecting"
 msgstr "Verbinding wordt gemaakt"
 
-#: src/send_message.c:355
+#: src/send_message.c:358
 msgid "Doing POP before SMTP..."
 msgstr "Bezig met POP voor SMTP..."
 
-#: src/send_message.c:358
+#: src/send_message.c:361
 msgid "POP before SMTP"
 msgstr "POP voor SMTP"
 
-#: src/send_message.c:363
+#: src/send_message.c:366
 #, c-format
 msgid "Account '%s': Connecting to SMTP server: %s:%d..."
 msgstr "Account '%s': Verbinden met SMTP-server: %s:%d..."
 
-#: src/send_message.c:420
+#: src/send_message.c:439
 msgid "Mail sent successfully."
 msgstr "Bestand verzonden."
 
-#: src/send_message.c:486
+#: src/send_message.c:505
 msgid "Sending HELO..."
 msgstr "HELO wordt verstuurd..."
 
-#: src/send_message.c:487 src/send_message.c:492 src/send_message.c:497
+#: src/send_message.c:506 src/send_message.c:511 src/send_message.c:516
 msgid "Authenticating"
 msgstr "Bezig met authenticatie"
 
-#: src/send_message.c:488 src/send_message.c:493
+#: src/send_message.c:507 src/send_message.c:512
 msgid "Sending message..."
 msgstr "Bericht wordt verzonden..."
 
-#: src/send_message.c:491
+#: src/send_message.c:510
 msgid "Sending EHLO..."
 msgstr "EHLO wordt verstuurd..."
 
-#: src/send_message.c:500
+#: src/send_message.c:519
 msgid "Sending MAIL FROM..."
 msgstr "MAIL FROM wordt verstuurd..."
 
-#: src/send_message.c:504
+#: src/send_message.c:523
 msgid "Sending RCPT TO..."
 msgstr "RCPT TO wordt verstuurd..."
 
-#: src/send_message.c:509
+#: src/send_message.c:528
 msgid "Sending DATA..."
 msgstr "DATA wordt verstuurd..."
 
-#: src/send_message.c:513
+#: src/send_message.c:532
 msgid "Quitting..."
 msgstr "Bezig met sluiten..."
 
-#: src/send_message.c:542
+#: src/send_message.c:561
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Bericht wordt verzonden (%d / %d bytes)"
 
-#: src/send_message.c:595
+#: src/send_message.c:614
 msgid "Sending message"
 msgstr "Bericht wordt verzonden"
 
-#: src/send_message.c:664 src/send_message.c:684
+#: src/send_message.c:683 src/send_message.c:703
 msgid "Error occurred while sending the message."
 msgstr "Er is een fout opgetreden bij het verzenden."
 
-#: src/send_message.c:667
+#: src/send_message.c:686
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -18326,348 +18641,369 @@ msgid ""
 "If you're not sure, just select OK."
 msgstr ""
 "Je zult eerst de locatie van het postvak moeten geven.\n"
-"Je kunt een bestaand postvak in MH-formaat gebruiken.\n"
+"Je kunt een bestaand postvak in MH-format gebruiken.\n"
 "Als je twijfelt kun je het beste gewoon op OK klikken."
 
-#: src/sourcewindow.c:64
+#: src/sourcewindow.c:65
 msgid "Source of the message"
 msgstr "Bron van het bericht"
 
-#: src/sourcewindow.c:159
+#: src/sourcewindow.c:161
 #, c-format
 msgid "%s - Source"
 msgstr "%s - Bron"
 
-#: src/ssl_manager.c:156
+#: src/ssl_manager.c:131
+msgid "Expiry"
+msgstr "Verloopt"
+
+#: src/ssl_manager.c:195
 msgid "Saved SSL/TLS certificates"
 msgstr "Opgeslagen SSL/TLS-certificaten"
 
-#: src/ssl_manager.c:410
+#: src/ssl_manager.c:445
 msgid "Delete certificate"
 msgstr "Certificaat verwijderen"
 
-#: src/ssl_manager.c:411
+#: src/ssl_manager.c:446
 msgid "Do you really want to delete this certificate?"
 msgstr "Wil je dit certificaat werkelijk verwijderen?"
 
-#: src/summary_search.c:305
+#: src/summary_search.c:290
 msgid "Search messages"
 msgstr "Zoek berichten"
 
-#: src/summary_search.c:327
+#: src/summary_search.c:313
 msgid "Match any of the following"
 msgstr "Zoek één van de zoektermen"
 
-#: src/summary_search.c:329
+#: src/summary_search.c:315
 msgid "Match all of the following"
 msgstr "Zoek alle zoektermen"
 
-#: src/summary_search.c:495
+#: src/summary_search.c:436
 msgid "Body:"
 msgstr "Berichttekst:"
 
-#: src/summary_search.c:502
+#: src/summary_search.c:443
 msgid "Condition:"
 msgstr "Voorwaarde:"
 
-#: src/summary_search.c:536
+#: src/summary_search.c:477
 msgid "Find _all"
 msgstr "Vind _alles"
 
-#: src/summary_search.c:751 src/summaryview.c:1090 src/summaryview.c:1352
+#: src/summary_search.c:692 src/summaryview.c:1148 src/summaryview.c:1411
 #, c-format
 msgid "Searching in %s... \n"
 msgstr "Bezig met zoeken in %s...\n"
 
-#: src/summary_search.c:846
+#: src/summary_search.c:787
 msgid "Beginning of list reached; continue from end?"
 msgstr "Begin van de lijst bereikt, verdergaan vanaf het einde?"
 
-#: src/summary_search.c:848
+#: src/summary_search.c:789
 msgid "End of list reached; continue from beginning?"
 msgstr "Einde van de lijst bereikt, verdergaan vanaf het begin?"
 
-#: src/summaryview.c:432
+#: src/summaryview.c:430
+msgid "Re-edit"
+msgstr "Opnieuw wijzigen"
+
+#: src/summaryview.c:443
 msgid "Create _filter rule"
 msgstr "_Filterregel aanmaken"
 
-#: src/summaryview.c:560
+#: src/summaryview.c:456
+msgid "_Set displayed columns"
+msgstr "Weergegeven _kolommen instellen"
+
+#: src/summaryview.c:461
+msgid "_Lock column headers"
+msgstr "Kolomkoppen _vastzetten"
+
+#: src/summaryview.c:598
 msgid "Toggle quick search bar"
 msgstr "Verberg/Toon snelzoeken"
 
-#: src/summaryview.c:597
+#: src/summaryview.c:635
 msgid "Toggle multiple selection"
 msgstr "Tik meervoudige selectie aan"
 
-#: src/summaryview.c:1280
+#: src/summaryview.c:1339
 msgid "Process mark"
 msgstr "Verwerkmarkering"
 
-#: src/summaryview.c:1281
+#: src/summaryview.c:1340
 msgid "Some marks are left. Process them?"
 msgstr "Sommige markeringen zijn nog aanwezig. Verwerken?"
 
-#: src/summaryview.c:1331
+#: src/summaryview.c:1390
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Map wordt ingelezen (%s)..."
 
-#: src/summaryview.c:1883 src/summaryview.c:1931
+#: src/summaryview.c:1950 src/summaryview.c:1998
 msgid "No more unread messages"
 msgstr "Geen ongelezen berichten"
 
-#: src/summaryview.c:1884
+#: src/summaryview.c:1951
 msgid "No unread message found. Search from the end?"
 msgstr "Geen ongelezen berichten gevonden. Zoeken vanaf einde?"
 
-#: src/summaryview.c:1896 src/summaryview.c:1944 src/summaryview.c:1981
-#: src/summaryview.c:2029 src/summaryview.c:2096
+#: src/summaryview.c:1963 src/summaryview.c:2011 src/summaryview.c:2048
+#: src/summaryview.c:2096 src/summaryview.c:2163
 msgid ""
 "Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
 msgstr ""
 "Interne fout: onverwachte waarde voor prefs_common.next_unread_msg_dialog\n"
 
-#: src/summaryview.c:1908
+#: src/summaryview.c:1975
 msgid "No unread messages."
 msgstr "Geen ongelezen berichten."
 
-#: src/summaryview.c:1932
+#: src/summaryview.c:1999
 msgid "No unread message found. Go to next folder?"
 msgstr "Geen ongelezen berichten gevonden. Doorgaan naar de volgende map?"
 
-#: src/summaryview.c:1968 src/summaryview.c:2016
+#: src/summaryview.c:2035 src/summaryview.c:2083
 msgid "No more new messages"
 msgstr "Geen nieuwe berichten"
 
-#: src/summaryview.c:1969
+#: src/summaryview.c:2036
 msgid "No new message found. Search from the end?"
 msgstr "Geen nieuwe berichten gevonden. Zoeken vanaf einde?"
 
-#: src/summaryview.c:1993
+#: src/summaryview.c:2060
 msgid "No new messages."
 msgstr "Geen nieuwe berichten."
 
-#: src/summaryview.c:2017
+#: src/summaryview.c:2084
 msgid "No new message found. Go to next folder?"
 msgstr "Geen nieuwe berichten gevonden. Doorgaan naar de volgende map?"
 
-#: src/summaryview.c:2050 src/summaryview.c:2083
+#: src/summaryview.c:2117 src/summaryview.c:2150
 msgid "No more marked messages"
 msgstr "Laatste gemarkeerde bericht"
 
-#: src/summaryview.c:2051
+#: src/summaryview.c:2118
 msgid "No marked message found. Search from the end?"
 msgstr "Geen gemarkeerde berichten gevonden. Zoeken vanaf einde?"
 
-#: src/summaryview.c:2060
+#: src/summaryview.c:2127
 msgid "No marked messages."
 msgstr "Geen gemarkeerde berichten."
 
-#: src/summaryview.c:2084
+#: src/summaryview.c:2151
 msgid "No marked message found. Go to next folder?"
 msgstr "Geen ongemarkeerde berichten gevonden. Doorgaan naar de volgende map?"
 
-#: src/summaryview.c:2117 src/summaryview.c:2146
+#: src/summaryview.c:2184 src/summaryview.c:2213
 msgid "No more labeled messages"
 msgstr "Geen berichten met labels"
 
-#: src/summaryview.c:2118
+#: src/summaryview.c:2185
 msgid "No labeled message found. Search from the end?"
 msgstr "Geen berichten met gekleurde labels gevonden. Zoeken vanaf eind?"
 
-#: src/summaryview.c:2127 src/summaryview.c:2160
+#: src/summaryview.c:2194 src/summaryview.c:2227
 msgid "No labeled messages."
 msgstr "Geen berichten met labels."
 
-#: src/summaryview.c:2147
+#: src/summaryview.c:2214
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Geen berichten met gekleurde labels gevonden. Zoeken vanaf begin?"
 
-#: src/summaryview.c:2464
+#: src/summaryview.c:2537
 msgid "Attracting messages by subject..."
 msgstr "Berichten worden aangetrokken op onderwerp..."
 
-#: src/summaryview.c:2649
+#: src/summaryview.c:2722
 #, c-format
 msgid "%d deleted"
 msgstr "%d verwijderd"
 
-#: src/summaryview.c:2653
+#: src/summaryview.c:2726
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d verplaatst"
 
-#: src/summaryview.c:2654 src/summaryview.c:2661
+#: src/summaryview.c:2727 src/summaryview.c:2734
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2659
+#: src/summaryview.c:2732
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d gekopieerd"
 
-#: src/summaryview.c:2673
+#: src/summaryview.c:2746
 msgid " item selected"
 msgid_plural " items selected"
 msgstr[0] " item geselecteerd"
 msgstr[1] " items geselecteerd"
 
-#: src/summaryview.c:2691 src/summaryview.c:2734
+#: src/summaryview.c:2764 src/summaryview.c:2809
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "nieuw: %d, ongelezen:%d, totaal: %d (%s)"
 
-#: src/summaryview.c:2709
+#: src/summaryview.c:2784
 msgid "Message summary"
 msgstr "Berichtsamenvatting"
 
-#: src/summaryview.c:2710
+#: src/summaryview.c:2785
 msgid "New:"
 msgstr "Nieuw:"
 
-#: src/summaryview.c:2711
+#: src/summaryview.c:2786
 msgid "Unread:"
 msgstr "Ongelezen:"
 
-#: src/summaryview.c:2712
+#: src/summaryview.c:2787
 msgid "Total:"
 msgstr "Totaal:"
 
-#: src/summaryview.c:2714
+#: src/summaryview.c:2789
 msgid "Marked:"
 msgstr "Gemarkeerd:"
 
-#: src/summaryview.c:2715
+#: src/summaryview.c:2790
 msgid "Replied:"
 msgstr "Beantwoord:"
 
-#: src/summaryview.c:2716
+#: src/summaryview.c:2791
 msgid "Forwarded:"
 msgstr "Doorgestuurd:"
 
-#: src/summaryview.c:2717
+#: src/summaryview.c:2792
 msgid "Locked:"
 msgstr "Op slot:"
 
-#: src/summaryview.c:2718
+#: src/summaryview.c:2793
 msgid "Ignored:"
 msgstr "Genegeerd:"
 
-#: src/summaryview.c:2719
+#: src/summaryview.c:2794
 msgid "Watched:"
 msgstr "Gevolgd:"
 
-#: src/summaryview.c:2729
+#: src/summaryview.c:2804
 #, c-format
 msgid "%d/%d selected (%s/%s), %d unread"
 msgstr "%d/%d geselecteerd (%s/%s, %d ongelezen"
 
-#: src/summaryview.c:3022
+#: src/summaryview.c:3097
 msgid "Sorting summary..."
 msgstr "Lijst wordt gesorteerd..."
 
-#: src/summaryview.c:3190
+#: src/summaryview.c:3265
 msgid "Setting summary from message data..."
 msgstr "Lijst wordt ingesteld van berichtinformatie..."
 
-#: src/summaryview.c:3395
+#: src/summaryview.c:3471
 msgid "(No Date)"
 msgstr "(Geen datum)"
 
-#: src/summaryview.c:3447
+#: src/summaryview.c:3528
 msgid "(No Recipient)"
 msgstr "(Geen ontvanger)"
 
-#: src/summaryview.c:3482
+#: src/summaryview.c:3576
 #, c-format
 msgid "From: %s, on %s"
 msgstr "Van: %s, op %s"
 
-#: src/summaryview.c:3491
+#: src/summaryview.c:3585
 #, c-format
 msgid "To: %s, on %s"
 msgstr "Aan: %s, op %s"
 
-#: src/summaryview.c:4356
-msgid "You're not the author of the article.\n"
-msgstr "Je bent niet de auteur van het artikel.\n"
+#: src/summaryview.c:4481
+msgid "You're not the author of the article."
+msgstr "Je bent niet de auteur van het artikel."
 
-#: src/summaryview.c:4446
+#: src/summaryview.c:4571
 #, c-format
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the %d selected messages?"
 msgstr[0] "Wil je werkelijk het geselecteerde bericht verwijderen?"
 msgstr[1] "Wil je werkelijk de %d geselecteerde berichten verwijderen?"
 
-#: src/summaryview.c:4449
+#: src/summaryview.c:4574
 msgid "Delete message"
 msgid_plural "Delete messages"
 msgstr[0] "Verwijder bericht"
 msgstr[1] "Verwijder bericht"
 
-#: src/summaryview.c:4613
+#: src/summaryview.c:4738
 msgid "Destination is same as current folder."
 msgstr "Doel is gelijk aan de huidige map."
 
-#: src/summaryview.c:4668
+#: src/summaryview.c:4793
 msgid "Select folder to move selected message to"
 msgid_plural "Select folder to move selected messages to"
 msgstr[0] "Selecteer map om geselecteerd bericht heen te verplaatsen"
 msgstr[1] "Selecteer map om geselecteerde berichten heen te verplaatsen"
 
-#: src/summaryview.c:4719
+#: src/summaryview.c:4844
 msgid "Destination to copy is same as current folder."
 msgstr "Doel is gelijk aan de huidige map."
 
-#: src/summaryview.c:4753
+#: src/summaryview.c:4878
 msgid "Select folder to copy selected message to"
 msgid_plural "Select folder to copy selected messages to"
 msgstr[0] "Selecteer map om geselecteerd bericht heen te kopiëren"
 msgstr[1] "Selecteer map om geselecteerde berichten heen te kopiëren"
 
-#: src/summaryview.c:4889
+#: src/summaryview.c:5036
 msgid "Append or Overwrite"
 msgstr "Toevoegen of Overschrijven"
 
-#: src/summaryview.c:4890
+#: src/summaryview.c:5037
 msgid "Append or overwrite existing file?"
 msgstr "Aan bestaand bestand toevoegen of overschrijven?"
 
-#: src/summaryview.c:4891
+#: src/summaryview.c:5038
 msgid "_Append"
 msgstr "_Toevoegen"
 
-#: src/summaryview.c:4891
+#: src/summaryview.c:5038
 msgid "_Overwrite"
 msgstr "_Overschrijven"
 
-#: src/summaryview.c:4932
+#: src/summaryview.c:5049 src/summaryview.c:5052 src/summaryview.c:5067
+#, c-format
+msgid "Couldn't save the file '%s'."
+msgstr "Kan bestand '%s' niet opslaan."
+
+#: src/summaryview.c:5086
 #, c-format
 msgid ""
 "You are about to print %d messages, one by one. Do you want to continue?"
 msgstr "Je staat op het punt om %d berichten af te drukken. Wil je doorgaan?"
 
-#: src/summaryview.c:5390
+#: src/summaryview.c:5544
 msgid "Building threads..."
 msgstr "Discussie-draden worden opgebouwd..."
 
-#: src/summaryview.c:5638
+#: src/summaryview.c:5792
 msgid "Skip these rules"
 msgstr "Sla deze regels over"
 
-#: src/summaryview.c:5641
+#: src/summaryview.c:5795
 msgid "Apply these rules regardless of the account they belong to"
-msgstr "Pas deze regels toe, ongeacht welk account ze bij horen."
+msgstr "Pas deze regels toe, ongeacht welk account ze bij horen"
 
-#: src/summaryview.c:5644
+#: src/summaryview.c:5798
 msgid "Apply these rules if they apply to the current account"
-msgstr "Pas deze regels toe als ze betrekking hebben op het huidige account."
+msgstr "Pas deze regels toe als ze betrekking hebben op het huidige account"
 
-#: src/summaryview.c:5673
+#: src/summaryview.c:5827
 msgid "Filtering"
 msgstr "Filteren"
 
-#: src/summaryview.c:5674
+#: src/summaryview.c:5828
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
@@ -18675,55 +19011,73 @@ msgstr ""
 "Er zijn filterregels die bij een account horen.\n"
 "Kies wat te doen met deze regels:"
 
-#: src/summaryview.c:5704
+#: src/summaryview.c:5860
 msgid "Filtering..."
 msgstr "Bezig met filteren..."
 
-#: src/summaryview.c:5783
+#: src/summaryview.c:5943
 msgid "Processing configuration"
 msgstr "Verwerken instellen"
 
-#: src/summaryview.c:6329
+#: src/summaryview.c:6091
+msgid "Do you really want to reset the color label of all selected messages?"
+msgstr ""
+"Wil je werkelijk het kleurlabel van alle geselecteerde berichten terugzetten?"
+
+#: src/summaryview.c:6093
+msgid "Do you really want to apply this color label to all selected messages?"
+msgstr ""
+"Wil je werkelijk dit kleurlabel toepassen op alle geselecteerde berichten?"
+
+#: src/summaryview.c:6094
+msgid "Reset color label"
+msgstr "Kleurlabel herstellen"
+
+#: src/summaryview.c:6094
+msgid "Set color label"
+msgstr "Kleurlabel instellen"
+
+#: src/summaryview.c:6537
 msgid "Ignored thread"
 msgstr "Genegeerde draad"
 
-#: src/summaryview.c:6331
+#: src/summaryview.c:6539
 msgid "Watched thread"
 msgstr "Gevolgde draad"
 
-#: src/summaryview.c:6339
+#: src/summaryview.c:6547
 msgid "Replied but also forwarded - click to see reply"
 msgstr "Beantwoord maar ook doorgestuurd - klik om het antwoord te zien"
 
-#: src/summaryview.c:6341
+#: src/summaryview.c:6549
 msgid "Replied - click to see reply"
 msgstr "Beantwoord - klik om het antwoord te zien"
 
-#: src/summaryview.c:6353
+#: src/summaryview.c:6561
 msgid "To be moved"
 msgstr "Nog te verplaatsen"
 
-#: src/summaryview.c:6355
+#: src/summaryview.c:6563
 msgid "To be copied"
 msgstr "Nog te kopiëren"
 
-#: src/summaryview.c:6367
+#: src/summaryview.c:6575
 msgid "Signed, has attachment(s)"
-msgstr "Getekend, heeft bijvoegsel(s)"
+msgstr "Ondertekend, heeft bijlage(s)"
 
-#: src/summaryview.c:6371
+#: src/summaryview.c:6579
 msgid "Encrypted, has attachment(s)"
-msgstr "Versleuteld, heeft bijvoegsel(s)"
+msgstr "Versleuteld, heeft bijlage(s)"
 
-#: src/summaryview.c:6373
+#: src/summaryview.c:6581
 msgid "Encrypted"
 msgstr "Versleuteld"
 
-#: src/summaryview.c:6375
+#: src/summaryview.c:6583
 msgid "Has attachment(s)"
-msgstr "Heeft bijvoegsel(s)"
+msgstr "Heeft bijlage(s)"
 
-#: src/summaryview.c:8046
+#: src/summaryview.c:8295
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -18732,53 +19086,45 @@ msgstr ""
 "Reguliere expressie (regexp) fout:\n"
 "%s"
 
-#: src/summaryview.c:8149
+#: src/summaryview.c:8398
 msgid "Go back to the folder list (You have unread messages)"
 msgstr "Ga terug in de mappenlijst (Je heeft ongelezen berichten)"
 
-#: src/summaryview.c:8154
+#: src/summaryview.c:8403
 msgid "Go back to the folder list"
 msgstr "Ga terug naar de mappenlijst"
 
-#: src/textview.c:245
+#: src/textview.c:242
 msgid "_Open in web browser"
 msgstr "_Openen met webbrowser"
 
-#: src/textview.c:246
+#: src/textview.c:243
 msgid "Copy this _link"
 msgstr "Kopieer deze _koppeling"
 
-#: src/textview.c:253
+#: src/textview.c:250
 msgid "_Reply to this address"
 msgstr "_Antwoord aan dit adres"
 
-#: src/textview.c:254
+#: src/textview.c:251
 msgid "Add to _Address book"
 msgstr "Toevoegen aan _adresboek"
 
-#: src/textview.c:255
+#: src/textview.c:252
 msgid "Copy this add_ress"
 msgstr "Kopieer _dit adres"
 
-#: src/textview.c:261
-msgid "_Open image"
-msgstr "_Open afbeelding"
-
-#: src/textview.c:262
-msgid "_Save image..."
-msgstr "_Afbeelding opslaan..."
-
-#: src/textview.c:724
+#: src/textview.c:702
 #, c-format
 msgid "[%s  %s (%d bytes)]"
 msgstr "[%s  %s (%d bytes)]"
 
-#: src/textview.c:727
+#: src/textview.c:705
 #, c-format
 msgid "[%s (%d bytes)]"
 msgstr "[%s (%d bytes)]"
 
-#: src/textview.c:917
+#: src/textview.c:875
 msgid ""
 "\n"
 "  This message can't be displayed.\n"
@@ -18792,81 +19138,80 @@ msgstr ""
 "\n"
 "  Gebruik "
 
-#: src/textview.c:922
+#: src/textview.c:880
 msgid "'Network Log'"
 msgstr "'Netwerklog'"
 
-#: src/textview.c:923
+#: src/textview.c:881
 msgid " in the Tools menu for more information."
 msgstr " in het 'Gereedschap'-menu voor meer informatie."
 
-#: src/textview.c:986
+#: src/textview.c:947
 msgid "  The following can be performed on this part\n"
 msgstr "  Het volgende kan op dit gedeelte worden toegepast\n"
 
-#: src/textview.c:988
+#: src/textview.c:949
 msgid "  by right-clicking the icon or list item:"
 msgstr "  met de rechtermuisknop op het pictogram of lijst-item te klikken:"
 
-#: src/textview.c:992
+#: src/textview.c:953
 msgid "     - To save, select "
 msgstr "     - Om op te slaan selecteer "
 
-#: src/textview.c:993
+#: src/textview.c:954
 msgid "'Save as...'"
 msgstr "'Opslaan als...'"
 
-#: src/textview.c:995 src/textview.c:1007 src/textview.c:1019
-#: src/textview.c:1029
+#: src/textview.c:956 src/textview.c:968 src/textview.c:980 src/textview.c:990
 msgid " (Shortcut key: '"
 msgstr " (Sneltoets: '"
 
-#: src/textview.c:1003
+#: src/textview.c:964
 msgid "     - To display as text, select "
 msgstr "     - Om als tekst weer te geven selecteer "
 
-#: src/textview.c:1004
+#: src/textview.c:965
 msgid "'Display as text'"
 msgstr "'Als tekst weergeven'"
 
-#: src/textview.c:1015
+#: src/textview.c:976
 msgid "     - To open with an external program, select "
 msgstr "     - Om te openen met een extern programma, selecteer "
 
-#: src/textview.c:1016
+#: src/textview.c:977
 msgid "'Open'"
 msgstr "'Openen'"
 
-#: src/textview.c:1024
+#: src/textview.c:985
 msgid "       (alternately double-click, or click the middle "
 msgstr "       (of dubbelklik, of klik met de middelste "
 
-#: src/textview.c:1025
+#: src/textview.c:986
 msgid "mouse button)\n"
 msgstr "muisknop)\n"
 
-#: src/textview.c:1027
+#: src/textview.c:988
 msgid "     - Or use "
 msgstr "     - Of gebruik "
 
-#: src/textview.c:1028
+#: src/textview.c:989
 msgid "'Open with...'"
 msgstr "'Open met...'"
 
-#: src/textview.c:1147
+#: src/textview.c:1111
 #, c-format
 msgid ""
 "The command to view attachment as text failed:\n"
 "    %s\n"
 "Exit code %d\n"
 msgstr ""
-"De opdracht om het bijvoegsel mee te bekijken mislukte:\n"
+"De opdracht om het bijlage mee te bekijken mislukte:\n"
 "    %s\n"
 "Uitvoer-code %d\n"
 
-#: src/textview.c:2206
+#: src/textview.c:2195
 msgid "Tags: "
-msgstr "Tags:"
+msgstr "Tags: "
 
 #: src/textview.c:2914
 msgid "The real URL is different from the displayed URL."
@@ -18892,19 +19237,19 @@ msgstr "Phishing-waarschuwing"
 msgid "_Open URL"
 msgstr "_Open URL"
 
-#: src/toolbar.c:224 src/toolbar.c:2291
+#: src/toolbar.c:224 src/toolbar.c:2294
 msgid "Receive Mail from all Accounts"
 msgstr "E-mail voor alle Accounts ophalen"
 
-#: src/toolbar.c:225 src/toolbar.c:2296
+#: src/toolbar.c:225 src/toolbar.c:2299
 msgid "Receive Mail from current Account"
 msgstr "E-mail voor huidige Account ophalen"
 
-#: src/toolbar.c:226 src/toolbar.c:2300
+#: src/toolbar.c:226 src/toolbar.c:2303
 msgid "Send Queued Messages"
 msgstr "Berichten uit de wachtrij verzenden"
 
-#: src/toolbar.c:227 src/toolbar.c:959 src/toolbar.c:2318 src/toolbar.c:2329
+#: src/toolbar.c:227 src/toolbar.c:959 src/toolbar.c:2321 src/toolbar.c:2332
 msgid "Compose Email"
 msgstr "E-mail opstellen"
 
@@ -18912,35 +19257,35 @@ msgstr "E-mail opstellen"
 msgid "Compose News"
 msgstr "Nieuws opstellen"
 
-#: src/toolbar.c:229 src/toolbar.c:2373 src/toolbar.c:2383
+#: src/toolbar.c:229 src/toolbar.c:2376 src/toolbar.c:2386
 msgid "Reply to Message"
 msgstr "Beantwoord bericht"
 
-#: src/toolbar.c:230 src/toolbar.c:2390 src/toolbar.c:2400
+#: src/toolbar.c:230 src/toolbar.c:2393 src/toolbar.c:2403
 msgid "Reply to Sender"
 msgstr "Beantwoord afzender"
 
-#: src/toolbar.c:231 src/toolbar.c:2407 src/toolbar.c:2417
+#: src/toolbar.c:231 src/toolbar.c:2410 src/toolbar.c:2420
 msgid "Reply to All"
 msgstr "Beantwoord allen"
 
-#: src/toolbar.c:232 src/toolbar.c:2424 src/toolbar.c:2434
+#: src/toolbar.c:232 src/toolbar.c:2427 src/toolbar.c:2437
 msgid "Reply to Mailing-list"
 msgstr "Beantwoord mailing-lijst"
 
-#: src/toolbar.c:233 src/toolbar.c:2312
+#: src/toolbar.c:233 src/toolbar.c:2315
 msgid "Open email"
 msgstr "Open e-mail"
 
-#: src/toolbar.c:234 src/toolbar.c:2441 src/toolbar.c:2452
+#: src/toolbar.c:234 src/toolbar.c:2444 src/toolbar.c:2455
 msgid "Forward Message"
 msgstr "Stuur bericht door"
 
-#: src/toolbar.c:235 src/toolbar.c:2457
+#: src/toolbar.c:235 src/toolbar.c:2460
 msgid "Trash Message"
 msgstr "Bericht naar prullenbak"
 
-#: src/toolbar.c:236 src/toolbar.c:2461
+#: src/toolbar.c:236 src/toolbar.c:2464
 msgid "Delete Message"
 msgstr "Verwijder bericht"
 
@@ -18948,11 +19293,11 @@ msgstr "Verwijder bericht"
 msgid "Delete duplicate messages"
 msgstr "Verwijder dubbele berichten"
 
-#: src/toolbar.c:239 src/toolbar.c:2469
+#: src/toolbar.c:239 src/toolbar.c:2472
 msgid "Go to Previous Unread Message"
 msgstr "Ga naar vorige ongelezen bericht"
 
-#: src/toolbar.c:240 src/toolbar.c:2473
+#: src/toolbar.c:240 src/toolbar.c:2476
 msgid "Go to Next Unread Message"
 msgstr "Ga naar volgende ongelezen bericht"
 
@@ -19000,55 +19345,55 @@ msgstr "Leer spam of ham"
 msgid "Open folder/Go to folder list"
 msgstr "Open map/Ga naar mappenlijst"
 
-#: src/toolbar.c:258 src/toolbar.c:2479
+#: src/toolbar.c:258 src/toolbar.c:2482
 msgid "Send Message"
 msgstr "Verzend bericht"
 
-#: src/toolbar.c:259 src/toolbar.c:2483
+#: src/toolbar.c:259 src/toolbar.c:2486
 msgid "Put into queue folder and send later"
 msgstr "In de wachtrij plaatsen en later verzenden"
 
-#: src/toolbar.c:260 src/toolbar.c:2487
+#: src/toolbar.c:260 src/toolbar.c:2490
 msgid "Save to draft folder"
 msgstr "Opslaan als klad"
 
-#: src/toolbar.c:261 src/toolbar.c:2491
+#: src/toolbar.c:261 src/toolbar.c:2494
 msgid "Insert file"
 msgstr "Bestand invoegen"
 
-#: src/toolbar.c:262 src/toolbar.c:2495
+#: src/toolbar.c:262 src/toolbar.c:2498
 msgid "Attach file"
 msgstr "Bestand bijvoegen"
 
-#: src/toolbar.c:263 src/toolbar.c:2499
+#: src/toolbar.c:263 src/toolbar.c:2502
 msgid "Insert signature"
-msgstr "Handtekening invoegen"
+msgstr "Ondertekening invoegen"
 
-#: src/toolbar.c:264 src/toolbar.c:2503
+#: src/toolbar.c:264 src/toolbar.c:2506
 msgid "Replace signature"
-msgstr "Vervang ondertekening"
+msgstr "Ondertekening vervangen"
 
-#: src/toolbar.c:265 src/toolbar.c:2507
+#: src/toolbar.c:265 src/toolbar.c:2510
 msgid "Edit with external editor"
 msgstr "Aanpassen met externe editor"
 
-#: src/toolbar.c:266 src/toolbar.c:2511
+#: src/toolbar.c:266 src/toolbar.c:2514
 msgid "Wrap long lines of current paragraph"
 msgstr "Lange regels van huige paragraaf afbreken"
 
-#: src/toolbar.c:267 src/toolbar.c:2515
+#: src/toolbar.c:267 src/toolbar.c:2518
 msgid "Wrap all long lines"
 msgstr "Regelterugloop voor alle regels"
 
-#: src/toolbar.c:270 src/toolbar.c:531 src/toolbar.c:2524
+#: src/toolbar.c:270 src/toolbar.c:531 src/toolbar.c:2527
 msgid "Check spelling"
 msgstr "Controleer spelling"
 
-#: src/toolbar.c:272 src/toolbar.c:533 src/toolbar.c:2529
+#: src/toolbar.c:272 src/toolbar.c:533 src/toolbar.c:2532
 msgid "Sign"
 msgstr "Ondertekenen"
 
-#: src/toolbar.c:273 src/toolbar.c:534 src/toolbar.c:2537
+#: src/toolbar.c:273 src/toolbar.c:534 src/toolbar.c:2540
 msgid "Encrypt"
 msgstr "Versleutelen"
 
@@ -19056,15 +19401,15 @@ msgstr "Versleutelen"
 msgid "Claws Mail Actions Feature"
 msgstr "Claws Mail Acties Kenmerken"
 
-#: src/toolbar.c:275 src/toolbar.c:2556
+#: src/toolbar.c:275 src/toolbar.c:2559
 msgid "Cancel receiving"
 msgstr "Ophalen annuleren"
 
-#: src/toolbar.c:277 src/toolbar.c:2564
+#: src/toolbar.c:277 src/toolbar.c:2567
 msgid "Cancel receiving/sending"
 msgstr "Ophalen/verzenden annuleren"
 
-#: src/toolbar.c:278 src/toolbar.c:2304
+#: src/toolbar.c:278 src/toolbar.c:2307
 msgid "Close window"
 msgstr "Venster sluiten"
 
@@ -19103,7 +19448,7 @@ msgstr "Allen"
 msgid "List"
 msgstr "Lijst"
 
-#: src/toolbar.c:498 src/toolbar.c:2357 src/toolbar.c:2366
+#: src/toolbar.c:498 src/toolbar.c:2360 src/toolbar.c:2369
 msgid "Delete duplicates"
 msgstr "Verwijder dubbele berichten"
 
@@ -19137,7 +19482,7 @@ msgstr "Klad"
 
 #: src/toolbar.c:524
 msgid "Insert sig."
-msgstr "Handtekening invoegen"
+msgstr "Ondertekening invoegen."
 
 #: src/toolbar.c:525
 msgid "Replace sig."
@@ -19149,7 +19494,7 @@ msgstr "Bewerken"
 
 #: src/toolbar.c:527
 msgid "Wrap para."
-msgstr "Breek para. af"
+msgstr "Breek para. af."
 
 #: src/toolbar.c:528
 msgid "Wrap all"
@@ -19195,101 +19540,101 @@ msgstr "Bericht zal versleuteld worden"
 msgid "Message will not be encrypted"
 msgstr "Bericht zal niet versleuteld worden"
 
-#: src/toolbar.c:2286
+#: src/toolbar.c:2289
 msgid "Go to folder list"
 msgstr "Ga naar mappenlijst"
 
-#: src/toolbar.c:2292
+#: src/toolbar.c:2295
 msgid "Receive Mail from selected Account"
 msgstr "E-mail voor geselecteerde Account ophalen"
 
-#: src/toolbar.c:2308
+#: src/toolbar.c:2311
 msgid "Open preferences"
 msgstr "Open voorkeuren"
 
-#: src/toolbar.c:2319
+#: src/toolbar.c:2322
 msgid "Compose with selected Account"
 msgstr "E-mail opstellen met geselecteerde Account"
 
-#: src/toolbar.c:2340
+#: src/toolbar.c:2343
 msgid "Learn as..."
-msgstr "leren als..."
+msgstr "Leren als..."
 
-#: src/toolbar.c:2350
+#: src/toolbar.c:2353
 msgid "Learn as _Spam"
 msgstr "Leer als _Spam"
 
-#: src/toolbar.c:2351
+#: src/toolbar.c:2354
 msgid "Learn as _Ham"
 msgstr "Leer als _Ham"
 
-#: src/toolbar.c:2358
+#: src/toolbar.c:2361
 msgid "Delete duplicates options"
 msgstr "Opties voor verwijderen dubbele berichten"
 
-#: src/toolbar.c:2362
+#: src/toolbar.c:2365
 msgid "Delete duplicates in selected folder"
 msgstr "Verwijder dubbele berichten in geselecteerde map"
 
-#: src/toolbar.c:2363
+#: src/toolbar.c:2366
 msgid "Delete duplicates in all folders"
 msgstr "Verwijder dubbele berichten in alle mappen"
 
-#: src/toolbar.c:2374
+#: src/toolbar.c:2377
 msgid "Reply to Message options"
 msgstr "Opties voor bericht beantwoorden"
 
-#: src/toolbar.c:2378 src/toolbar.c:2395 src/toolbar.c:2412 src/toolbar.c:2429
+#: src/toolbar.c:2381 src/toolbar.c:2398 src/toolbar.c:2415 src/toolbar.c:2432
 msgid "_Reply with quote"
 msgstr "Antwoord met _citaat"
 
-#: src/toolbar.c:2379 src/toolbar.c:2396 src/toolbar.c:2413 src/toolbar.c:2430
+#: src/toolbar.c:2382 src/toolbar.c:2399 src/toolbar.c:2416 src/toolbar.c:2433
 msgid "Reply without _quote"
 msgstr "Antwoord _zonder citaat"
 
-#: src/toolbar.c:2391
+#: src/toolbar.c:2394
 msgid "Reply to Sender options"
 msgstr "Opties voor afzender antwoorden"
 
-#: src/toolbar.c:2408
+#: src/toolbar.c:2411
 msgid "Reply to All options"
 msgstr "Opties voor allen beantwoorden"
 
-#: src/toolbar.c:2425
+#: src/toolbar.c:2428
 msgid "Reply to Mailing-list options"
 msgstr "Opties voor mailing-lijst beantwoorden"
 
-#: src/toolbar.c:2442
+#: src/toolbar.c:2445
 msgid "Forward Message options"
 msgstr "Opties voor bericht doorsturen"
 
-#: src/uri_opener.c:88
+#: src/uri_opener.c:87
 msgid "There are no URLs in this email."
 msgstr "Er zijn geen adressen in deze e-mail."
 
-#: src/uri_opener.c:116
+#: src/uri_opener.c:115
 msgid "Available URLs:"
 msgstr "Beschikbare adressen:"
 
-#: src/uri_opener.c:181
+#: src/uri_opener.c:189
 msgctxt "Dialog title"
 msgid "Open URLs"
 msgstr "Open adressen"
 
-#: src/uri_opener.c:206
+#: src/uri_opener.c:217
 msgid "Please select the URL to open."
 msgstr "Selecteer een adres om te openen."
 
-#: src/uri_opener.c:214
+#: src/uri_opener.c:225
 msgid "Select All"
 msgstr "Alles selecteren"
 
-#: src/wizard.c:521
+#: src/wizard.c:523
 msgctxt "Welcome Mail Subject"
 msgid "Welcome to Claws Mail"
 msgstr "Welkom bij Claws Mail"
 
-#: src/wizard.c:544
+#: src/wizard.c:546
 #, c-format
 msgid ""
 "\n"
@@ -19379,47 +19724,47 @@ msgstr ""
 "dat doen te <%s>.\n"
 "\n"
 
-#: src/wizard.c:619
+#: src/wizard.c:621
 msgid "Please enter the mailbox name."
 msgstr "Geef naam van postvak."
 
-#: src/wizard.c:647
+#: src/wizard.c:649
 msgid "Please enter your name and email address."
 msgstr "Geef naam en e-mailadres."
 
-#: src/wizard.c:658
+#: src/wizard.c:660
 msgid "Please enter your receiving server and username."
 msgstr "Geef onvangende server en gebruikersnaam."
 
-#: src/wizard.c:668
+#: src/wizard.c:670
 msgid "Please enter your username."
 msgstr "Geef je gebruikersnaam."
 
-#: src/wizard.c:678
+#: src/wizard.c:680
 msgid "Please enter your SMTP server."
 msgstr "Geef je SMTP-server."
 
-#: src/wizard.c:689
+#: src/wizard.c:691
 msgid "Please enter your SMTP username."
 msgstr "Geef je SMTP-gebruikersnaam."
 
-#: src/wizard.c:974
+#: src/wizard.c:976
 msgid "Your name:"
 msgstr "Je naam:"
 
-#: src/wizard.c:985
+#: src/wizard.c:987
 msgid "Your email address:"
 msgstr "Je e-mailadres:"
 
-#: src/wizard.c:996
+#: src/wizard.c:998
 msgid "Your organization:"
 msgstr "Je organisatie:"
 
-#: src/wizard.c:1030
+#: src/wizard.c:1032
 msgid "Mailbox name:"
 msgstr "Postvak-naam:"
 
-#: src/wizard.c:1038
+#: src/wizard.c:1040
 msgid ""
 "You can also specify an absolute path, for example: \"/home/john/Documents/"
 "Mail\""
@@ -19427,7 +19772,7 @@ msgstr ""
 "Je kunt ook een absoluut pad opgeven, bijvoorbeeld: \"/home/kees/Documenten/"
 "Mail\""
 
-#: src/wizard.c:1109
+#: src/wizard.c:1111
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:25\""
@@ -19435,55 +19780,51 @@ msgstr ""
 "Je kunt het poortnummer specificeren door het aan het eind toe te voegen: "
 "\"mail.voorbeeld.com:25\""
 
-#: src/wizard.c:1112
+#: src/wizard.c:1114
 msgid "SMTP server address:"
 msgstr "SMTP-serveradres:"
 
-#: src/wizard.c:1118
-msgid "Use authentication"
-msgstr "Gebruik authenticatie"
-
-#: src/wizard.c:1127
+#: src/wizard.c:1129
 msgid "(empty to use the same as receive)"
 msgstr "(laat leeg om dezelfde als bij ontvangen te gebruiken)"
 
-#: src/wizard.c:1141
+#: src/wizard.c:1143
 msgid "SMTP username:"
-msgstr "SMTP-gebruikersnaam"
+msgstr "SMTP-gebruikersnaam:"
 
-#: src/wizard.c:1152
+#: src/wizard.c:1154
 msgid "SMTP password:"
 msgstr "SMTP-wachtwoord:"
 
-#: src/wizard.c:1165
+#: src/wizard.c:1167
 msgid "Use SSL/TLS to connect to SMTP server"
 msgstr "Gebruik SSL/TLS voor verbinding met de SMTP-server"
 
-#: src/wizard.c:1176 src/wizard.c:1596
+#: src/wizard.c:1178 src/wizard.c:1598
 msgid "Use STARTTLS command to start encryption"
 msgstr "Gebruik STARTTLS voor starten beveiligde sessie"
 
-#: src/wizard.c:1188 src/wizard.c:1608
+#: src/wizard.c:1190 src/wizard.c:1610
 msgid "Client SSL/TLS certificate (optional)"
 msgstr "Client SSL/TLS-certificaat (optioneel)"
 
-#: src/wizard.c:1256 src/wizard.c:1288 src/wizard.c:1543
+#: src/wizard.c:1258 src/wizard.c:1290 src/wizard.c:1545
 msgid "Server address:"
 msgstr "Serveradres:"
 
-#: src/wizard.c:1320
+#: src/wizard.c:1322
 msgid "Local mailbox:"
 msgstr "Lokaal postvak:"
 
-#: src/wizard.c:1489
+#: src/wizard.c:1491
 msgid "Server type:"
 msgstr "Servertype:"
 
-#: src/wizard.c:1498
+#: src/wizard.c:1500
 msgid "POP3"
 msgstr "POP3"
 
-#: src/wizard.c:1554
+#: src/wizard.c:1556
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:110\""
@@ -19491,19 +19832,19 @@ msgstr ""
 "Je kunt het poortnummer specificeren door het aan het eind toe te voegen: "
 "\"mail.voorbeeld.com:110\""
 
-#: src/wizard.c:1585
+#: src/wizard.c:1587
 msgid "Use SSL/TLS to connect to receiving server"
 msgstr "Gebruik SSL/TLS voor verbinding met de ontvangende server"
 
-#: src/wizard.c:1650
+#: src/wizard.c:1652
 msgid "IMAP server directory:"
-msgstr "IMAP-serverdirectory:"
+msgstr "IMAP-servermap:"
 
-#: src/wizard.c:1661
+#: src/wizard.c:1663
 msgid "Show only subscribed folders"
 msgstr "Alleen ge-abonneerde mappen weergeven"
 
-#: src/wizard.c:1669
+#: src/wizard.c:1671
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP support."
@@ -19511,15 +19852,15 @@ msgstr ""
 "Waarschuwing: deze versie van Claws Mail\n"
 "is gecompileerd zonder ondersteuning voor IMAP."
 
-#: src/wizard.c:1787
+#: src/wizard.c:1789
 msgid "Claws Mail Setup Wizard"
 msgstr "Claws Mail Setup-assistent"
 
-#: src/wizard.c:1821
+#: src/wizard.c:1822
 msgid "Welcome to Claws Mail"
 msgstr "Welkom by Claws Mail"
 
-#: src/wizard.c:1828
+#: src/wizard.c:1829
 msgid ""
 "Welcome to the Claws Mail setup wizard.\n"
 "\n"
@@ -19533,46 +19874,34 @@ msgstr ""
 "gebruikte e-mailopties zodat je binnen vijf minuten Claws Mail kunt "
 "gebruiken."
 
-#: src/wizard.c:1841
+#: src/wizard.c:1842
 msgid "About You"
 msgstr "Over u"
 
-#: src/wizard.c:1849 src/wizard.c:1864 src/wizard.c:1879 src/wizard.c:1895
+#: src/wizard.c:1850 src/wizard.c:1865 src/wizard.c:1880 src/wizard.c:1896
 msgid "Bold fields must be completed"
 msgstr "Velden in vet zijn verplicht"
 
-#: src/wizard.c:1856
+#: src/wizard.c:1857
 msgid "Receiving mail"
 msgstr "E-mail ontvangen"
 
-#: src/wizard.c:1871
+#: src/wizard.c:1872
 msgid "Sending mail"
 msgstr "E-mail verzenden"
 
-#: src/wizard.c:1887
+#: src/wizard.c:1888
 msgid "Saving mail on disk"
 msgstr "E-mail opslaan op schijf"
 
-#: src/wizard.c:1903
+#: src/wizard.c:1904
 msgid "Configuration finished"
 msgstr "Klaar met instellen"
 
-#: src/wizard.c:1910
+#: src/wizard.c:1911
 msgid ""
 "Claws Mail is now ready.\n"
 "Click Save to start."
 msgstr ""
 "Claws Mail is nu klaar.\n"
 "Klik op 'Opslaan' om te starten."
-
-#~ msgid ""
-#~ "Copyright (C) 1999-2017\n"
-#~ "The Claws Mail Team\n"
-#~ " and Hiroyuki Yamamoto"
-#~ msgstr ""
-#~ "Auteursrecht (C) 1999-2017\n"
-#~ "Het Claws Mail Team\n"
-#~ "en Hiroyuki Yamamoto"
-
-#~ msgid "Change to..."
-#~ msgstr "Wijzig in..."

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail


More information about the Commits mailing list