Automated l10n update (.po files)

author: Timothy Pearson <kb9vqf@pearsoncomputing.net> 2014-09-29 03:08:03 -0500
committer: Timothy Pearson <kb9vqf@pearsoncomputing.net> 2014-09-29 03:08:03 -0500
commit: 242434109c14a494dee7738b9c343f5947d20506 (patch)
tree: ea25930767128361a7669f1a25a479a66ccdfbeb /tde-i18n-nl/messages/tdepim/kmail.po
parent: 8819501c6a160b7ae106b1a968bc953b0f0bc465 (diff)
download: tde-i18n-242434109c14a494dee7738b9c343f5947d20506.tar.gz
tde-i18n-242434109c14a494dee7738b9c343f5947d20506.zip
1 files changed, 3402 insertions, 2228 deletions
diff --git a/tde-i18n-nl/messages/tdepim/kmail.po b/tde-i18n-nl/messages/tdepim/kmail.po
index f747c088101..9eb34750c23 100644
--- a/tde-i18n-nl/messages/tdepim/kmail.po
+++ b/tde-i18n-nl/messages/tdepim/kmail.po
@@ -13,10 +13,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
-"POT-Creation-Date: 2008-08-19 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2008-03-01 20:20+0100\n"
 "Last-Translator: Bram Schoenmakers <bramschoenmakers@kde.nl>\n"
 "Language-Team: Nederlands <kde-i18n-nl@kde.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -109,7 +110,7 @@ msgstr "tijdaanduiding voor statusbericht 'Transmissie voltooid'"
 msgid "multiple encryption keys per address"
 msgstr "meerdere cryptografische sleutels per adres"
 
-#: aboutdata.cpp:212 kmreaderwin.cpp:1336 kmstartup.cpp:148
+#: aboutdata.cpp:212 kmreaderwin.cpp:1300 kmstartup.cpp:149
 #: mailinglistpropertiesdialog.cpp:97
 msgid "KMail"
 msgstr "KMail"
@@ -153,7 +154,8 @@ msgid "Locking Method"
 msgstr "Vergrendelingsmethode"
 
 #: accountdialog.cpp:368
-msgid "Procmail loc&kfile:"
+#, fuzzy
+msgid "Procmail loc&tdefile:"
 msgstr "Procmail-vergrendel&bestand:"
 
 #: accountdialog.cpp:380
@@ -211,7 +213,7 @@ msgid "Check inter&val:"
 msgstr "Controle-inter&val:"
 
 #: accountdialog.cpp:438 accountdialog.cpp:537 accountdialog.cpp:741
-#: accountdialog.cpp:1059 configuredialog.cpp:2655
+#: accountdialog.cpp:1059 configuredialog.cpp:2733
 msgid " min"
 msgstr " min"
 
@@ -244,8 +246,8 @@ msgstr "&Meenemen in handmatige berichtencontrole"
 msgid "Account Type: POP Account"
 msgstr "Accounttype: POP-account"
 
-#: accountdialog.cpp:582 accountdialog.cpp:851 configuredialog.cpp:2526
-#: identitydialog.cpp:109 kmfilterdlg.cpp:160 kmtransport.cpp:376
+#: accountdialog.cpp:582 accountdialog.cpp:851 configuredialog.cpp:2550
+#: identitydialog.cpp:112 kmfilterdlg.cpp:164 kmtransport.cpp:376
 msgid "&General"
 msgstr "Al&gemeen"
 
@@ -349,7 +351,7 @@ msgstr "&Extra's"
 msgid "Check &What the Server Supports"
 msgstr "Ondersteuning &van de server controleren"
 
-#: accountdialog.cpp:782 accountdialog.cpp:1097 kmheaders.cpp:137
+#: accountdialog.cpp:782 accountdialog.cpp:1097 kmheaders.cpp:140
 #: kmtransport.cpp:502
 msgid "Encryption"
 msgstr "Versleuteling"
@@ -475,7 +477,8 @@ msgid "Sho&w hidden folders"
 msgstr "Verborgen mappen &tonen"
 
 #: accountdialog.cpp:987
-msgid "Show only s&ubscribed folders"
+#, fuzzy
+msgid "Show only serverside s&ubscribed folders"
 msgstr "Alleen gea&bonneerde mappen tonen"
 
 #: accountdialog.cpp:992
@@ -532,9 +535,9 @@ msgstr "&Filter"
 msgid "<none>"
 msgstr "<niets>"
 
-#: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:244
-#: kmfoldercachedimap.cpp:2085 kmfolderimap.cpp:204 kmfolderimap.cpp:907
-#: kmkernel.cpp:1374 subscriptiondialog.cpp:172
+#: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
+#: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
+#: kmkernel.cpp:1424 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "postvak in"
 
@@ -634,7 +637,7 @@ msgstr ""
 "Omdat sommige servers hun mogelijkheden niet goed aankondigen kan het zijn dat "
 "u deze optie alsnog aan kunt zetten."
 
-#: accountdialog.cpp:1734 vacationdialog.cpp:163
+#: accountdialog.cpp:1734 vacationdialog.cpp:76 vacationdialog.cpp:165
 msgid ""
 "_n:  day\n"
 " days"
@@ -678,12 +681,12 @@ msgstr "Leeg"
 msgid "Edit Namespace '%1'"
 msgstr "Namespace '%1' bewerken"
 
-#: accountmanager.cpp:101
+#: accountmanager.cpp:103
 #, c-format
 msgid "Account %1"
 msgstr "Account %1"
 
-#: accountmanager.cpp:181
+#: accountmanager.cpp:183
 msgid ""
 "Account %1 has no mailbox defined:\n"
 "mail checking aborted;\n"
@@ -693,24 +696,24 @@ msgstr ""
 "Het controleren op nieuwe berichten is geannuleerd.\n"
 "Controleer uw accountinstellingen."
 
-#: accountmanager.cpp:196
+#: accountmanager.cpp:226
 msgid "Checking account %1 for new mail"
 msgstr "Account %1 wordt gecontroleerd op nieuwe berichten"
 
-#: accountmanager.cpp:214 accountmanager.cpp:217 accountwizard.cpp:441
+#: accountmanager.cpp:244 accountmanager.cpp:247 accountwizard.cpp:441
 #: accountwizard.cpp:477
 msgid "Local Account"
 msgstr "Lokaal account"
 
-#: accountmanager.cpp:220
+#: accountmanager.cpp:250
 msgid "POP Account"
 msgstr "POP-account"
 
-#: accountmanager.cpp:223 accountmanager.cpp:225
+#: accountmanager.cpp:253 accountmanager.cpp:255
 msgid "IMAP Account"
 msgstr "IMAP-account"
 
-#: accountmanager.cpp:308
+#: accountmanager.cpp:343
 msgid ""
 "You need to add an account in the network section of the settings in order to "
 "receive mail."
@@ -821,13 +824,13 @@ msgstr "Lokale bezorging aanhouden"
 msgid "Server Information"
 msgstr "Serverinformatie"
 
-#. i18n: file customtemplates_base.ui line 248
-#: accountwizard.cpp:329 rc.cpp:212
+#. i18n: file customtemplates_base.ui line 302
+#: accountwizard.cpp:329 rc.cpp:221
 #, no-c-format
 msgid "None"
 msgstr "Geen"
 
-#: accountwizard.cpp:384 configuredialog.cpp:792
+#: accountwizard.cpp:384 configuredialog.cpp:794
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -835,13 +838,13 @@ msgstr "Sendmail"
 msgid "Check for supported security capabilities of %1..."
 msgstr "Controleer de beveiligingsmogelijkheden van %1..."
 
-#: actionscheduler.cpp:598 kmfiltermgr.cpp:152 kmfiltermgr.cpp:255
-#: kmfiltermgr.cpp:293
+#: actionscheduler.cpp:598 kmfiltermgr.cpp:150 kmfiltermgr.cpp:253
+#: kmfiltermgr.cpp:291
 msgid "<b>Evaluating filter rules:</b> "
 msgstr "<b>Filterregels evalueren</b> "
 
-#: actionscheduler.cpp:605 kmfiltermgr.cpp:159 kmfiltermgr.cpp:262
-#: kmfiltermgr.cpp:299
+#: actionscheduler.cpp:605 kmfiltermgr.cpp:157 kmfiltermgr.cpp:260
+#: kmfiltermgr.cpp:297
 msgid "<b>Filter rules have matched.</b>"
 msgstr "<b>Filterregels kwamen overeen.</b>"
 
@@ -850,68 +853,68 @@ msgstr "<b>Filterregels kwamen overeen.</b>"
 msgid "<b>Applying filter action:</b> %1"
 msgstr "<b>Filter wordt toegepast:</b> %1"
 
-#: antispamwizard.cpp:101
+#: antispamwizard.cpp:100
 msgid "Anti-Spam Wizard"
 msgstr "Antispam-assistent"
 
-#: antispamwizard.cpp:102
+#: antispamwizard.cpp:101
 msgid "Anti-Virus Wizard"
 msgstr "Antivirus-assistent"
 
-#: antispamwizard.cpp:106
+#: antispamwizard.cpp:105
 msgid "Welcome to the KMail Anti-Spam Wizard"
 msgstr "Welkom bij de KMail Antispam-assistent"
 
-#: antispamwizard.cpp:107
+#: antispamwizard.cpp:106
 msgid "Welcome to the KMail Anti-Virus Wizard"
 msgstr "Welkom bij de KMail Antivirus-assistent"
 
-#: antispamwizard.cpp:113
+#: antispamwizard.cpp:112
 msgid "Options to fine-tune the handling of spam messages"
 msgstr "Opties om de afhandeling van ongewenste reclameberichten te verfijnen"
 
-#: antispamwizard.cpp:119
+#: antispamwizard.cpp:118
 msgid "Options to fine-tune the handling of virus messages"
 msgstr "Opties om de afhandeling van virusberichten te verfijnen"
 
-#: antispamwizard.cpp:131
+#: antispamwizard.cpp:130
 msgid "Summary of changes to be made by this wizard"
 msgstr ""
 "Overzicht van de wijzigingen die aangebracht zullen worden door deze assistent"
 
-#: antispamwizard.cpp:200
+#: antispamwizard.cpp:199
 msgid "Virus handling"
 msgstr "Omgang met virussen"
 
-#: antispamwizard.cpp:284 antispamwizard.cpp:286 antispamwizard.cpp:572
+#: antispamwizard.cpp:283 antispamwizard.cpp:285 antispamwizard.cpp:577
 msgid "Spam handling"
 msgstr "Omgang met ongewenste reclame"
 
-#: antispamwizard.cpp:325 antispamwizard.cpp:327 antispamwizard.cpp:585
+#: antispamwizard.cpp:324 antispamwizard.cpp:326 antispamwizard.cpp:590
 msgid "Semi spam (unsure) handling"
 msgstr "Omgang met onzekere ongewenste reclame"
 
-#: antispamwizard.cpp:387 antispamwizard.cpp:389 antispamwizard.cpp:593
+#: antispamwizard.cpp:386 antispamwizard.cpp:388 antispamwizard.cpp:598
 msgid "Classify as spam"
 msgstr "Beschouwen als spam"
 
-#: antispamwizard.cpp:419 antispamwizard.cpp:421 antispamwizard.cpp:595
+#: antispamwizard.cpp:418 antispamwizard.cpp:420 antispamwizard.cpp:600
 msgid "Classify as NOT spam"
 msgstr "Beschouwen als gewenste post"
 
-#: antispamwizard.cpp:493
+#: antispamwizard.cpp:498
 msgid "Scanning for %1..."
 msgstr "Zoeken naar %1..."
 
-#: antispamwizard.cpp:524
+#: antispamwizard.cpp:529
 msgid "Scanning for anti-spam tools finished."
 msgstr "Het zoeken naar antispam-hulpprogramma's is voltooid."
 
-#: antispamwizard.cpp:525
+#: antispamwizard.cpp:530
 msgid "Scanning for anti-virus tools finished."
 msgstr "Het zoeken naar antivirusprogramma's is voltooid."
 
-#: antispamwizard.cpp:528
+#: antispamwizard.cpp:533
 msgid ""
 "<p>No spam detection tools have been found. Install your spam detection "
 "software and re-run this wizard.</p>"
@@ -919,39 +922,39 @@ msgstr ""
 "<p>Er zijn geen spamdetectie-hulpmiddelen gevonden. Installeer zo'n hulpmiddel "
 "en start deze assistent opnieuw.</p>"
 
-#: antispamwizard.cpp:531
+#: antispamwizard.cpp:536
 msgid "Scanning complete. No anti-virus tools found."
 msgstr "Zoeken voltooid. Geen antivirus-hulpprogramma's gevonden."
 
-#: antispamwizard.cpp:555
+#: antispamwizard.cpp:560
 msgid "<p>Messages classified as spam are marked as read."
 msgstr "<p>Mogelijke spamberichten worden als gelezen gemarkeerd."
 
-#: antispamwizard.cpp:557
+#: antispamwizard.cpp:562
 msgid "<p>Messages classified as spam are not marked as read."
 msgstr "<p>Mogelijke spamberichten worden niet als gelezen gemarkeerd."
 
-#: antispamwizard.cpp:560
+#: antispamwizard.cpp:565
 msgid "<br>Spam messages are moved into the folder named <i>"
 msgstr "<br>Spamberichten worden in de volgende map geplaatst: <i>"
 
-#: antispamwizard.cpp:563
+#: antispamwizard.cpp:568
 msgid "<br>Spam messages are not moved into a certain folder.</p>"
 msgstr "<br>Spamberichten worden niet in een bepaalde map verplaatst.</p>"
 
-#: antispamwizard.cpp:587
+#: antispamwizard.cpp:592
 msgid "<p>The folder for messages classified as unsure (probably spam) is <i>"
 msgstr "<p>De map voor mogelijke spam is <i>"
 
-#: antispamwizard.cpp:600
+#: antispamwizard.cpp:605
 msgid "<p>The wizard will create the following filters:<ul>"
 msgstr "<p>De assistent zal de volgende filters aanmaken:<ul>"
 
-#: antispamwizard.cpp:603
+#: antispamwizard.cpp:608
 msgid "<p>The wizard will replace the following filters:<ul>"
 msgstr "<p>De assistent zal de volgende filters vervangen:<ul>"
 
-#: antispamwizard.cpp:860
+#: antispamwizard.cpp:864
 msgid ""
 "The wizard will search for any tools to do spam detection\n"
 "and setup KMail to work with them."
@@ -959,7 +962,7 @@ msgstr ""
 "De assistent zal naar hulpprogramma's voor spamherkenning zoeken.\n"
 "Vervolgens zal KMail ingesteld worden om met deze filters te gaan werken."
 
-#: antispamwizard.cpp:864
+#: antispamwizard.cpp:868
 msgid ""
 "<p>Here you can get some assistance in setting up KMail's filter rules to use "
 "some commonly-known anti-virus tools.</p>"
@@ -984,7 +987,7 @@ msgstr ""
 "filterregels van de assistent te verwijderen om het oude gedrag weer terug te "
 "krijgen."
 
-#: antispamwizard.cpp:915
+#: antispamwizard.cpp:919
 msgid ""
 "<p>Please select the tools to be used for the detection and go to the next "
 "page.</p>"
@@ -992,19 +995,19 @@ msgstr ""
 "<p>Selecteer de hulpprogramma's die u wilt gebruiken voor het herkennen van "
 "ongewenste e-mail en ga naar de volgende pagina.</p>"
 
-#: antispamwizard.cpp:941
+#: antispamwizard.cpp:945
 msgid "&Mark detected spam messages as read"
 msgstr "Gedetecteerde berichten &markeren als gelezen"
 
-#: antispamwizard.cpp:943
+#: antispamwizard.cpp:947
 msgid "Mark messages which have been classified as spam as read."
 msgstr "Spamberichten markeren als gelezen."
 
-#: antispamwizard.cpp:946
+#: antispamwizard.cpp:950
 msgid "Move &known spam to:"
 msgstr "Echte spam verplaatsen &naar:"
 
-#: antispamwizard.cpp:948
+#: antispamwizard.cpp:952
 msgid ""
 "The default folder for spam messages is the trash folder, but you may change "
 "that in the folder view below."
@@ -1012,11 +1015,11 @@ msgstr ""
 "De standaardmap voor spamberichten is de prullenbak, maar u kunt dat wijzigen "
 "in de onderstaande mappenlijst."
 
-#: antispamwizard.cpp:962
+#: antispamwizard.cpp:966
 msgid "Move &probable spam to:"
 msgstr "Mogelijke s&pam verplaatsen naar:"
 
-#: antispamwizard.cpp:964
+#: antispamwizard.cpp:968
 msgid ""
 "The default folder is the inbox folder, but you may change that in the folder "
 "view below."
@@ -1028,11 +1031,11 @@ msgstr ""
 "<p>Niet alle hulpmiddelen kunnen spam als onzeker bestempelen. Wanneer u geen "
 "geschikt hulpmiddel hebt kunt u ook geen map selecteren."
 
-#: antispamwizard.cpp:1064
+#: antispamwizard.cpp:1068
 msgid "Check messages using the anti-virus tools"
 msgstr "Berichten classificeren met behulp van antivirusprogramma's"
 
-#: antispamwizard.cpp:1066
+#: antispamwizard.cpp:1070
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
@@ -1044,11 +1047,11 @@ msgstr ""
 "het antivirusprogramma gemarkeerd zodat u vervolgens met andere filters de "
 "virusberichten bijvoorbeeld naar een bepaalde map kunt verplaatsen."
 
-#: antispamwizard.cpp:1072
+#: antispamwizard.cpp:1076
 msgid "Move detected viral messages to the selected folder"
 msgstr "Gevonden geïnfecteerde berichten naar de geselecteerde map verplaatsen"
 
-#: antispamwizard.cpp:1074
+#: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
 "messages into a predefined folder is created. The default folder is the trash "
@@ -1058,11 +1061,11 @@ msgstr ""
 "bepaalde map te plaatsen. De standaardmap is de prullenbak, maar dat kunt u in "
 "de mapweergave veranderen."
 
-#: antispamwizard.cpp:1080
+#: antispamwizard.cpp:1084
 msgid "Additionally, mark detected viral messages as read"
 msgstr "Gevonden geïnfecteerde berichten als gelezen markeren"
 
-#: antispamwizard.cpp:1083
+#: antispamwizard.cpp:1087
 msgid ""
 "Mark messages which have been classified as virus-infected as read, as well as "
 "moving them to the selected folder."
@@ -1070,7 +1073,163 @@ msgstr ""
 "Markeert gevonden geïnfecteerde berichten als gelezen en plaatst deze in de "
 "geselecteerde map."
 
-#: cachedimapjob.cpp:220 cachedimapjob.cpp:271 cachedimapjob.cpp:825
+#: archivefolderdialog.cpp:48
+msgid ""
+"_: Start of the filename for a mail archive file\n"
+"Archive"
+msgstr ""
+
+#: archivefolderdialog.cpp:53
+#, fuzzy
+msgid "Archive Folder"
+msgstr "Bladwijzermappen"
+
+#: archivefolderdialog.cpp:70 importarchivedialog.cpp:54
+#, fuzzy
+msgid "&Folder:"
+msgstr "&Mappen"
+
+#: archivefolderdialog.cpp:80
+#, fuzzy
+msgid "F&ormat:"
+msgstr "N&ormaal:"
+
+#: archivefolderdialog.cpp:86
+msgid "Compressed Zip Archive (.zip)"
+msgstr ""
+
+#: archivefolderdialog.cpp:87
+msgid "Uncompressed Archive (.tar)"
+msgstr ""
+
+#: archivefolderdialog.cpp:88
+msgid "BZ2-Compressed Tar Archive (.tar.bz2)"
+msgstr ""
+
+#: archivefolderdialog.cpp:89
+msgid "GZ-Compressed Tar Archive (.tar.gz)"
+msgstr ""
+
+#: archivefolderdialog.cpp:96 importarchivedialog.cpp:61
+#, fuzzy
+msgid "&Archive File:"
+msgstr "Bestand bijvoegen"
+
+#: archivefolderdialog.cpp:111
+#, fuzzy
+msgid "&Delete folders after completion"
+msgstr "De mappen op de server worden verwijderd"
+
+#: archivefolderdialog.cpp:161
+#, fuzzy
+msgid "Please select the folder that should be archived."
+msgstr "Selecteer de publieke sleutel die moet worden bijgesloten."
+
+#: archivefolderdialog.cpp:162
+#, fuzzy
+msgid "No folder selected"
+msgstr "Geen map geselecteerd"
+
+#: backupjob.cpp:123 importjob.cpp:89
+msgid "The operation was canceled by the user."
+msgstr ""
+
+#: backupjob.cpp:151
+#, fuzzy
+msgid "Failed to archive the folder '%1'."
+msgstr "De map kon niet worden aangemaakt"
+
+#: backupjob.cpp:153
+#, fuzzy
+msgid "Archiving failed."
+msgstr "Overdracht is mislukt."
+
+#: backupjob.cpp:163
+msgid "Unable to finalize the archive file."
+msgstr ""
+
+#: backupjob.cpp:168
+msgid "Archiving finished"
+msgstr ""
+
+#: backupjob.cpp:173
+msgid ""
+"Archiving folder '%1' successfully completed. The archive was written to the "
+"file '%2'."
+msgstr ""
+
+#: backupjob.cpp:177
+#, fuzzy
+msgid ""
+"_n: 1 message of size %1 was archived.\n"
+"%n messages with the total size of %1 were archived."
+msgstr ""
+"%n bericht doorzocht\n"
+"%n berichten doorzocht"
+
+#: backupjob.cpp:179
+#, c-format
+msgid "The archive file has a size of %1."
+msgstr ""
+
+#: backupjob.cpp:181
+msgid "Archiving finished."
+msgstr ""
+
+#: backupjob.cpp:216 backupjob.cpp:226
+#, fuzzy
+msgid "Unable to retrieve a message for folder '%1'."
+msgstr "Kan het bericht niet toevoegen aan deze map: "
+
+#: backupjob.cpp:251
+#, fuzzy
+msgid "Internal error while trying to retrieve a message from folder '%1'."
+msgstr "Fout bij het hernoemen van de map %1 "
+
+#: backupjob.cpp:321
+#, fuzzy
+msgid "Failed to write a message into the archive folder '%1'."
+msgstr "Gevonden geïnfecteerde berichten naar de geselecteerde map verplaatsen"
+
+#: backupjob.cpp:360
+#, fuzzy
+msgid "Downloading a message in folder '%1' failed."
+msgstr "Het verwijderen van oude berichten uit de map %1 is mislukt."
+
+#: backupjob.cpp:362
+#, fuzzy
+msgid "Downloading a message in the current folder failed."
+msgstr "Alle discussies in de huidige map invouwen"
+
+#: backupjob.cpp:391
+#, fuzzy, c-format
+msgid "Archiving folder %1"
+msgstr "mappen ophalen"
+
+#: backupjob.cpp:393 importjob.cpp:210
+#, fuzzy
+msgid "Unable to open folder '%1'."
+msgstr "Onbekende map '%1'"
+
+#: backupjob.cpp:413
+msgid "Unable to create folder structure for folder '%1' within archive file."
+msgstr ""
+
+#: backupjob.cpp:425
+msgid "Unable to backup messages in folder '%1', the index file is corrupted."
+msgstr ""
+
+#: backupjob.cpp:483
+#, fuzzy
+msgid "Unable to open archive for writing."
+msgstr "Verificatie kon niet worden uitgevoerd: sleutel ontbreekt."
+
+#: backupjob.cpp:489
+#, fuzzy
+msgid "Archiving"
+msgstr "Ontvan&gen"
+
+#: cachedimapjob.cpp:220 cachedimapjob.cpp:271 cachedimapjob.cpp:886
 msgid "Error while deleting messages on the server: "
 msgstr "Fout bij het verwijderen van berichten van de server: "
 
@@ -1078,15 +1237,15 @@ msgstr "Fout bij het verwijderen van berichten van de server: "
 msgid "Error while retrieving message on the server: "
 msgstr "Fout bij het ophalen van bericht van de server: "
 
-#: cachedimapjob.cpp:538
+#: cachedimapjob.cpp:541
 msgid "Error while uploading folder"
 msgstr "Fout tijdens het verzenden van de map"
 
-#: cachedimapjob.cpp:539
+#: cachedimapjob.cpp:542
 msgid "Could not make the folder <b>%1</b> on the server."
 msgstr "De map %1 kon niet op de server worden aangemaakt."
 
-#: cachedimapjob.cpp:540
+#: cachedimapjob.cpp:543
 msgid ""
 "This could be because you do not have permission to do this, or because the "
 "folder is already present on the server; the error message from the server "
@@ -1095,28 +1254,78 @@ msgstr ""
 "Dit komt doordat u geen toegangsrechten hebt om deze handeling uit te voeren, "
 "of omdat de map reeds op de server staat. Hier is de foutmelding van de server:"
 
-#: cachedimapjob.cpp:626
+#: cachedimapjob.cpp:629
 msgid "Error while deleting folder %1 on the server: "
 msgstr "De map %1 kon niet op de server worden verwijderd: "
 
-#: cachedimapjob.cpp:679
+#: cachedimapjob.cpp:682
 msgid "Error while reading folder %1 on the server: "
 msgstr "Fout bij het lezen van map %1 van de server: "
 
-#: cachedimapjob.cpp:794
+#: cachedimapjob.cpp:811
+msgid ""
+"Error while trying to subscribe to the renamed folder %1.\n"
+"Renaming itself was successful, but the renamed folder might disappear from the "
+"folder list after the next sync since it is unsubscribed on the server.\n"
+"You can try to manually subscribe to the folder yourself.\n"
+"\n"
+"%2"
+msgstr ""
+
+#: cachedimapjob.cpp:857
 #, c-format
 msgid "Error while trying to rename folder %1"
 msgstr "Fout bij het hernoemen van de map %1 "
 
-#: callback.cpp:170
+#: callback.cpp:71
+msgid ""
+"<qt>The receiver of this invitation doesn't match any of your identities."
+"<br>Please select the transport which should be used to send your reply.</qt>"
+msgstr ""
+
+#: callback.cpp:74
+msgid ""
+"<qt>The identity matching the receiver of this invitation doesn't have an "
+"associated transport configured."
+"<br>Please select the transport which should be used to send your reply.</qt>"
+msgstr ""
+
+#: callback.cpp:78
+#, fuzzy
+msgid "Select Transport"
+msgstr "Transport instellen op"
+
+#: callback.cpp:97
+#, fuzzy, c-format
+msgid "Declined: %1"
+msgstr " Regel: %1 "
+
+#: callback.cpp:99
+#, c-format
+msgid "Tentative: %1"
+msgstr ""
+
+#: callback.cpp:101
+#, fuzzy, c-format
+msgid "Accepted: %1"
+msgstr "Bijlage: %1"
+
+#: callback.cpp:103
+#, fuzzy, c-format
+msgid "Delegated: %1"
+msgstr "Verwijderd"
+
+#: callback.cpp:216
+#, fuzzy
 msgid ""
 "<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any:"
+"<br>please choose which of the following addresses is yours, if any, or select "
+"one of your identities to use in the reply:"
 msgstr ""
 "<qt>Geen van uw identiteiten komt overeen met de ontvanger van dit bericht. "
 "<br>Kies welke van deze adressen van u is (indien aanwezig):"
 
-#: callback.cpp:176
+#: callback.cpp:222
 msgid ""
 "<qt>Several of your identities match the receiver of this message,"
 "<br>please choose which of the following addresses is yours:"
@@ -1125,7 +1334,7 @@ msgstr ""
 "bericht."
 "<br>Kies welke van deze adressen van u is:"
 
-#: callback.cpp:183
+#: callback.cpp:233
 msgid "Select Address"
 msgstr "Adres selecteren"
 
@@ -1152,7 +1361,7 @@ msgstr ""
 "Er deed zich een fout voor tijdens het comprimeren van %1. Het comprimeren is "
 "afgebroken."
 
-#: configuredialog.cpp:155
+#: configuredialog.cpp:156
 msgid ""
 "<qt>"
 "<p>This setting has been fixed by your administrator.</p>"
@@ -1163,147 +1372,147 @@ msgstr ""
 "<p>Als u het daar niet mee eens bent, neem dan contact met hem of haar op.</p>"
 "</qt>"
 
-#: configuredialog.cpp:217
+#: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "Profiel &laden..."
 
-#: configuredialog.cpp:305 simplestringlisteditor.cpp:85
+#: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "Toevoege&n..."
 
-#: configuredialog.cpp:306 configuredialog.cpp:625 configuredialog.cpp:1096
-#: configuredialog.cpp:3165 simplestringlisteditor.cpp:108
+#: configuredialog.cpp:309 configuredialog.cpp:628 configuredialog.cpp:1102
+#: configuredialog.cpp:3278 simplestringlisteditor.cpp:108
 msgid "&Modify..."
 msgstr "&Wijzigen..."
 
-#: configuredialog.cpp:307
+#: configuredialog.cpp:310
 msgid "&Rename"
 msgstr "He&rnoemen"
 
-#: configuredialog.cpp:308 configuredialog.cpp:3115 configuredialog.cpp:3164
+#: configuredialog.cpp:311 configuredialog.cpp:3228 configuredialog.cpp:3277
 msgid "Remo&ve"
 msgstr "&Verwijderen"
 
-#: configuredialog.cpp:309
+#: configuredialog.cpp:312
 msgid "Set as &Default"
 msgstr "Instellen als stan&daard"
 
-#: configuredialog.cpp:450
+#: configuredialog.cpp:453
 msgid "<qt>Do you really want to remove the identity named <b>%1</b>?</qt>"
 msgstr ""
 "<qt>Wilt u werkelijk de identiteit genaamd <b>\"%1\"</b> verwijderen?</qt>"
 
-#: configuredialog.cpp:452
+#: configuredialog.cpp:455
 msgid "Remove Identity"
 msgstr "Identiteit verwijderen"
 
-#: configuredialog.cpp:493 configuredialog.cpp:3114
+#: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "Toevoegen..."
 
-#: configuredialog.cpp:495 configuredialog.cpp:3116
+#: configuredialog.cpp:498 configuredialog.cpp:3229
 msgid "Modify..."
 msgstr "Wijzigen..."
 
-#: configuredialog.cpp:499
+#: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "Instellen als standaard"
 
-#: configuredialog.cpp:562
+#: configuredialog.cpp:565
 msgid "&Receiving"
 msgstr "Ontvan&gen"
 
-#: configuredialog.cpp:570
+#: configuredialog.cpp:573
 msgid "&Sending"
 msgstr "Ver&zenden"
 
-#: configuredialog.cpp:595
+#: configuredialog.cpp:598
 msgid "Outgoing accounts (add at least one):"
 msgstr "Uitgaande accounts (voeg tenminste één account toe):"
 
-#. i18n: file customtemplates_base.ui line 99
-#: configuredialog.cpp:604 configuredialog.cpp:1074 configuredialog.cpp:3290
-#: distributionlistdialog.cpp:115 favoritefolderview.cpp:378
-#: kmcomposewin.cpp:366 rc.cpp:191 recipientspicker.cpp:389
+#. i18n: file customtemplates_base.ui line 89
+#: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
+#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
+#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "Naam"
 
-#. i18n: file customtemplates_base.ui line 88
-#: configuredialog.cpp:605 configuredialog.cpp:1075 kmcomposewin.cpp:369
-#: kmfilterdlg.cpp:214 kmmimeparttree.cpp:65 rc.cpp:188
+#. i18n: file customtemplates_base.ui line 78
+#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
+#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
 #, no-c-format
 msgid "Type"
 msgstr "Type"
 
-#: configuredialog.cpp:618 configuredialog.cpp:1089 configuredialog.cpp:2836
-#: configuredialog.cpp:3087 configuredialog.cpp:3164 configuredialog.cpp:3498
+#: configuredialog.cpp:621 configuredialog.cpp:1095 configuredialog.cpp:2949
+#: configuredialog.cpp:3200 configuredialog.cpp:3277 configuredialog.cpp:3611
 msgid "A&dd..."
 msgstr "&Toevoegen..."
 
-#: configuredialog.cpp:633 configuredialog.cpp:1104
+#: configuredialog.cpp:636 configuredialog.cpp:1110
 msgid "R&emove"
 msgstr "Verwijd&eren"
 
-#: configuredialog.cpp:640
+#: configuredialog.cpp:643
 msgid "Set Default"
 msgstr "Instellen als standaard"
 
-#: configuredialog.cpp:650
+#: configuredialog.cpp:653
 msgid "Common Options"
 msgstr "Algemene opties"
 
-#. i18n: file kmail.kcfg line 382
-#: configuredialog.cpp:658 rc.cpp:788
+#. i18n: file kmail.kcfg line 412
+#: configuredialog.cpp:661 rc.cpp:813
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "Ver&zending bevestigen"
 
-#: configuredialog.cpp:666
+#: configuredialog.cpp:669
 msgid "Never Automatically"
 msgstr "Nooit automatisch"
 
-#: configuredialog.cpp:667
+#: configuredialog.cpp:670
 msgid "On Manual Mail Checks"
 msgstr "Bij handmatige berichtencontroles"
 
-#: configuredialog.cpp:668
+#: configuredialog.cpp:671
 msgid "On All Mail Checks"
 msgstr "Bij alle berichtencontroles"
 
-#: configuredialog.cpp:676
+#: configuredialog.cpp:679
 msgid "Send Now"
 msgstr "Nu verzenden"
 
-#: configuredialog.cpp:677
+#: configuredialog.cpp:680
 msgid "Send Later"
 msgstr "Later verzenden"
 
-#: configuredialog.cpp:687
+#: configuredialog.cpp:690
 msgid "Allow 8-bit"
 msgstr "8-bit toestaan"
 
-#: configuredialog.cpp:688
+#: configuredialog.cpp:691
 msgid "MIME Compliant (Quoted Printable)"
 msgstr "MIME-ondersteunend (Quoted Printable)"
 
-#: configuredialog.cpp:701
+#: configuredialog.cpp:704
 msgid "Send &messages in outbox folder:"
 msgstr "Berichte&n in postvak uit verzenden:"
 
-#: configuredialog.cpp:709
+#: configuredialog.cpp:712
 msgid "Defa&ult send method:"
 msgstr "Standaar&d verzendwijze:"
 
-#: configuredialog.cpp:711
+#: configuredialog.cpp:714
 msgid "Message &property:"
 msgstr "Berichteigenscha&p:"
 
-#: configuredialog.cpp:713
+#: configuredialog.cpp:716
 msgid "Defaul&t domain:"
 msgstr "S&tandaarddomein:"
 
-#: configuredialog.cpp:717
+#: configuredialog.cpp:720
 msgid ""
 "<qt>"
 "<p>The default domain is used to complete email addresses that only consist of "
@@ -1313,25 +1522,25 @@ msgstr ""
 "<p>Het standaarddomein wordt gebruikt om e-mailadressen die alleen bestaan uit "
 "een gebruikersnaam aan te vullen.</p></qt>"
 
-#: configuredialog.cpp:741
+#: configuredialog.cpp:744
 msgid ""
 "_: %1: name; %2: number appended to it to make it unique among a list of names\n"
 "%1 %2"
 msgstr "%1 %2"
 
-#: configuredialog.cpp:766 configuredialog.cpp:943 configuredialog.cpp:991
+#: configuredialog.cpp:769 configuredialog.cpp:950 configuredialog.cpp:997
 msgid "smtp (Default)"
 msgstr "smtp (standaard)"
 
-#: configuredialog.cpp:768 configuredialog.cpp:945 configuredialog.cpp:993
+#: configuredialog.cpp:771 configuredialog.cpp:952 configuredialog.cpp:999
 msgid "sendmail (Default)"
 msgstr "sendmail (standaard)"
 
-#: configuredialog.cpp:799 kmtransport.cpp:248
+#: configuredialog.cpp:801 kmtransport.cpp:248
 msgid "Add Transport"
 msgstr "Transport toevoegen"
 
-#: configuredialog.cpp:830
+#: configuredialog.cpp:832
 msgid ""
 "_: %1: type of transport. Result used in Configure->Accounts->"
 "Sending listview, \"type\" column, first row, to indicate that this is the "
@@ -1339,11 +1548,11 @@ msgid ""
 "%1 (Default)"
 msgstr "%1 (standaard)"
 
-#: configuredialog.cpp:854
+#: configuredialog.cpp:856
 msgid "Modify Transport"
 msgstr "Transport wijzigen"
 
-#: configuredialog.cpp:890
+#: configuredialog.cpp:892
 #, c-format
 msgid ""
 "_n: This identity has been changed to use the modified transport:\n"
@@ -1354,7 +1563,7 @@ msgstr ""
 "Deze %n identiteiten zijn veranderd zodat ze gebruik maken van het aangepaste "
 "transport:"
 
-#: configuredialog.cpp:921
+#: configuredialog.cpp:927
 #, c-format
 msgid ""
 "_n: This identity has been changed to use the default transport:\n"
@@ -1365,367 +1574,359 @@ msgstr ""
 "Deze %n identiteiten zijn veranderd zodat ze gebruik maken van het standaard "
 "transport:"
 
-#: configuredialog.cpp:1066
+#: configuredialog.cpp:1072
 msgid "Incoming accounts (add at least one):"
 msgstr "Inkomende accounts (voeg tenminste één account toe):"
 
-#: configuredialog.cpp:1076 kmfolderseldlg.cpp:95 kmfoldertree.cpp:376
-#: searchwindow.cpp:230
+#: configuredialog.cpp:1082 kmfoldertree.cpp:397 searchwindow.cpp:229
+#: simplefoldertree.h:141
 msgid "Folder"
 msgstr "Map"
 
-#: configuredialog.cpp:1112
+#: configuredialog.cpp:1118
 msgid "Chec&k mail on startup"
 msgstr "Berichten op&halen bij opstarten"
 
-#: configuredialog.cpp:1118
+#: configuredialog.cpp:1124
 msgid "New Mail Notification"
 msgstr "Notificatie bij nieuwe e-mail"
 
-#: configuredialog.cpp:1123
+#: configuredialog.cpp:1129
 msgid "&Beep"
 msgstr "&Geluidsignaal"
 
-#: configuredialog.cpp:1131
+#: configuredialog.cpp:1137
 msgid "Deta&iled new mail notification"
 msgstr "Gedetailleerde notificatie bij nieuwe e-mail"
 
-#: configuredialog.cpp:1135
+#: configuredialog.cpp:1141
 msgid "Show for each folder the number of newly arrived messages"
 msgstr "Toon voor iedere map het aantal nieuw binnengekomen berichten"
 
-#: configuredialog.cpp:1143
+#: configuredialog.cpp:1149
 msgid "Other Actio&ns"
 msgstr "Overi&ge acties"
 
-#: configuredialog.cpp:1221
+#: configuredialog.cpp:1227
 msgid "Unknown account type selected"
 msgstr "Onbekend accounttype geselecteerd"
 
-#: configuredialog.cpp:1230
+#: configuredialog.cpp:1236
 msgid "Unable to create account"
 msgstr "Het account kon niet worden aangemaakt."
 
-#: configuredialog.cpp:1236 kmacctseldlg.cpp:36
+#: configuredialog.cpp:1242 kmacctseldlg.cpp:36
 msgid "Add Account"
 msgstr "Account toevoegen"
 
-#: configuredialog.cpp:1288
+#: configuredialog.cpp:1294
 msgid "Unable to locate account"
 msgstr "Het account kon niet worden gevonden."
 
-#: configuredialog.cpp:1315
+#: configuredialog.cpp:1321
 msgid "Modify Account"
 msgstr "Account bewerken"
 
-#: configuredialog.cpp:1360 configuredialog.cpp:1440
+#: configuredialog.cpp:1366 configuredialog.cpp:1446
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt>Het account <b>%1</b> is niet gevonden.</qt>"
 
-#: configuredialog.cpp:1491
+#: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "Kle&uren"
 
-#: configuredialog.cpp:1497
+#: configuredialog.cpp:1503
 msgid "La&yout"
 msgstr "Op&maak"
 
-#: configuredialog.cpp:1503
+#: configuredialog.cpp:1509
 msgid "M&essage List"
 msgstr "B&erichtenlijst"
 
-#: configuredialog.cpp:1509
+#: configuredialog.cpp:1515
 msgid "Message W&indow"
 msgstr "Ber&ichtenvenster"
 
-#: configuredialog.cpp:1515
+#: configuredialog.cpp:1521
 msgid "System &Tray"
 msgstr "Sys&teemvak"
 
-#: configuredialog.cpp:1531
+#: configuredialog.cpp:1537
 msgid "Message Body"
 msgstr "Berichtveld"
 
-#: configuredialog.cpp:1532
+#: configuredialog.cpp:1538
 msgid "Message List"
 msgstr "Berichtenlijst"
 
-#: configuredialog.cpp:1533
+#: configuredialog.cpp:1539
 msgid "Message List - New Messages"
 msgstr "Berichtenlijst - Nieuwe berichten"
 
-#: configuredialog.cpp:1534
+#: configuredialog.cpp:1540
 msgid "Message List - Unread Messages"
 msgstr "Berichtenlijst - Ongelezen berichten"
 
-#: configuredialog.cpp:1535
+#: configuredialog.cpp:1541
 msgid "Message List - Important Messages"
 msgstr "Berichtenlijst - Belangrijke berichten"
 
-#: configuredialog.cpp:1536
+#: configuredialog.cpp:1542
 msgid "Message List - Todo Messages"
 msgstr "Berichtenlijst - Berichten met taak"
 
-#: configuredialog.cpp:1537
+#: configuredialog.cpp:1543
 msgid "Message List - Date Field"
 msgstr "Berichtenlijst - Datumveld"
 
-#: configuredialog.cpp:1538 configuredialog.cpp:1859
+#: configuredialog.cpp:1544 configuredialog.cpp:1868
 msgid "Folder List"
 msgstr "Mappenlijst"
 
-#: configuredialog.cpp:1539 configuredialog.cpp:1702
+#: configuredialog.cpp:1545 configuredialog.cpp:1708
 msgid "Quoted Text - First Level"
 msgstr "Aangehaalde tekst - eerste niveau"
 
-#: configuredialog.cpp:1540 configuredialog.cpp:1703
+#: configuredialog.cpp:1546 configuredialog.cpp:1709
 msgid "Quoted Text - Second Level"
 msgstr "Aangehaalde tekst - tweede niveau"
 
-#: configuredialog.cpp:1541 configuredialog.cpp:1704
+#: configuredialog.cpp:1547 configuredialog.cpp:1710
 msgid "Quoted Text - Third Level"
 msgstr "Aangehaalde tekst - derde niveau"
 
-#: configuredialog.cpp:1542
+#: configuredialog.cpp:1548
 msgid "Fixed Width Font"
 msgstr "Vaste letterbreedte"
 
-#: configuredialog.cpp:1543 kmcomposewin.cpp:356
+#: configuredialog.cpp:1549 kmcomposewin.cpp:386
 msgid "Composer"
 msgstr "Opsteller"
 
-#: configuredialog.cpp:1544
+#: configuredialog.cpp:1550
 msgid "Printing Output"
 msgstr "Afdrukuitvoer"
 
-#: configuredialog.cpp:1559
+#: configuredialog.cpp:1565
 msgid "&Use custom fonts"
 msgstr "Aangepaste lettertypen geb&ruiken"
 
-#: configuredialog.cpp:1575
+#: configuredialog.cpp:1581
 msgid "Apply &to:"
 msgstr "&Toepassen op:"
 
-#: configuredialog.cpp:1699
+#: configuredialog.cpp:1705
 msgid "Composer Background"
 msgstr "Achtergrond van opsteller"
 
-#: configuredialog.cpp:1700
+#: configuredialog.cpp:1706
 msgid "Alternative Background Color"
 msgstr "Alternatieve achtergrondkleur"
 
-#: configuredialog.cpp:1701
+#: configuredialog.cpp:1707
 msgid "Normal Text"
 msgstr "Normale tekst"
 
-#: configuredialog.cpp:1705
+#: configuredialog.cpp:1711
 msgid "Link"
 msgstr "Koppeling"
 
-#: configuredialog.cpp:1706
+#: configuredialog.cpp:1712
 msgid "Followed Link"
 msgstr "Bezochte koppeling"
 
-#: configuredialog.cpp:1707
+#: configuredialog.cpp:1713
 msgid "Misspelled Words"
 msgstr "Foutgespelde woorden"
 
 #. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1708 rc.cpp:444
+#: configuredialog.cpp:1714 rc.cpp:450
 #, no-c-format
 msgid "New Message"
 msgstr "Nieuw bericht"
 
-#: configuredialog.cpp:1709
+#: configuredialog.cpp:1715
 msgid "Unread Message"
 msgstr "Ongelezen bericht"
 
-#: configuredialog.cpp:1710
+#: configuredialog.cpp:1716
 msgid "Important Message"
 msgstr "Belangrijk bericht"
 
-#: configuredialog.cpp:1711
+#: configuredialog.cpp:1717
 msgid "Todo Message"
 msgstr "Berichten met taak"
 
-#: configuredialog.cpp:1712
+#: configuredialog.cpp:1718
 msgid "OpenPGP Message - Encrypted"
 msgstr "OpenPGP-bericht - Versleuteld"
 
-#: configuredialog.cpp:1713
+#: configuredialog.cpp:1719
 msgid "OpenPGP Message - Valid Signature with Trusted Key"
 msgstr "OpenPGP-bericht - Geldige ondertekening met betrouwbare sleutel"
 
-#: configuredialog.cpp:1714
+#: configuredialog.cpp:1720
 msgid "OpenPGP Message - Valid Signature with Untrusted Key"
 msgstr "OpenPGP-bericht - Geldige ondertekening met onbetrouwbare sleutel"
 
-#: configuredialog.cpp:1715
+#: configuredialog.cpp:1721
 msgid "OpenPGP Message - Unchecked Signature"
 msgstr "OpenPGP-bericht - Niet-gecontroleerde ondertekening"
 
-#: configuredialog.cpp:1716
+#: configuredialog.cpp:1722
 msgid "OpenPGP Message - Bad Signature"
 msgstr "OpenPGP-bericht - Ongeldige ondertekening"
 
-#: configuredialog.cpp:1717
+#: configuredialog.cpp:1723
 msgid "Border Around Warning Prepending HTML Messages"
 msgstr "Rand rond waarschuwing voor HTML-berichten"
 
-#: configuredialog.cpp:1718
+#: configuredialog.cpp:1724
 msgid "Folder Name and Size When Close to Quota"
 msgstr "Mapnaam en -grootte indien quota nadert"
 
-#: configuredialog.cpp:1719
+#: configuredialog.cpp:1725
 msgid "HTML Status Bar Background - No HTML Message"
 msgstr "Achtergrond van HTML-statusbalk - Geen HTML-bericht"
 
-#: configuredialog.cpp:1720
+#: configuredialog.cpp:1726
 msgid "HTML Status Bar Foreground - No HTML Message"
 msgstr "Voorgrond van HTML-statusbalk - Geen HTML-bericht"
 
-#: configuredialog.cpp:1721
+#: configuredialog.cpp:1727
 msgid "HTML Status Bar Background - HTML Message"
 msgstr "Achtergrond van HTML-statusbalk - HTML-bericht"
 
-#: configuredialog.cpp:1722
+#: configuredialog.cpp:1728
 msgid "HTML Status Bar Foreground - HTML Message"
 msgstr "Voorgrond van HTML-statusbalk - HTML-bericht"
 
-#: configuredialog.cpp:1734
+#: configuredialog.cpp:1740
 msgid "&Use custom colors"
 msgstr "Aangepaste kleuren g&ebruiken"
 
-#: configuredialog.cpp:1749
+#: configuredialog.cpp:1755
 msgid "Recycle colors on deep &quoting"
 msgstr "Kleu&ren hergebruiken bij aanhalingen"
 
-#: configuredialog.cpp:1757
+#: configuredialog.cpp:1763
 msgid "Close to quota threshold"
 msgstr "Drempel voor nadering quota"
 
-#: configuredialog.cpp:1763
+#: configuredialog.cpp:1770
 #, c-format
 msgid "%"
 msgstr "%"
 
-#: configuredialog.cpp:1855
+#: configuredialog.cpp:1864
 msgid "Lon&g folder list"
 msgstr "Lan&ge mappenlijst"
 
-#: configuredialog.cpp:1856
+#: configuredialog.cpp:1865
 msgid "Shor&t folder list"
 msgstr "Kor&te mappenlijst"
 
-#: configuredialog.cpp:1865
+#: configuredialog.cpp:1874
 msgid "Abo&ve the message pane"
 msgstr "Bo&ven het berichtvak"
 
-#: configuredialog.cpp:1866
+#: configuredialog.cpp:1875
 msgid "&Below the message pane"
 msgstr "Onder het &berichtvak"
 
-#: configuredialog.cpp:1869
+#: configuredialog.cpp:1878
 msgid "Message Structure Viewer Placement"
 msgstr "Plaatsing van berichtenstructuurweergave"
 
-#: configuredialog.cpp:1874
+#: configuredialog.cpp:1883
 msgid "Show &never"
 msgstr "&Nooit tonen"
 
-#: configuredialog.cpp:1875
+#: configuredialog.cpp:1884
 msgid "Show only for non-plaintext &messages"
 msgstr "Alleen to&nen voor berichten die niet in platte tekst zijn opgesteld"
 
-#: configuredialog.cpp:1876
+#: configuredialog.cpp:1885
 msgid "Show alway&s"
 msgstr "Altij&d tonen"
 
-#: configuredialog.cpp:1879
+#: configuredialog.cpp:1888
 msgid "Message Structure Viewer"
 msgstr "Berichtenstructuurweergave"
 
-#: configuredialog.cpp:1885
+#: configuredialog.cpp:1894
 msgid "&Do not show a message preview pane"
 msgstr "Geen berichtvoorbeel&dvak tonen"
 
-#: configuredialog.cpp:1886
+#: configuredialog.cpp:1895
 msgid "Show the message preview pane belo&w the message list"
 msgstr "Bericht&voorbeeldvak tonen onder de berichtenlijst"
 
-#: configuredialog.cpp:1887
+#: configuredialog.cpp:1896
 msgid "Show the message preview pane ne&xt to the message list"
 msgstr "Beric&htvoorbeeldvak naast de berichtenlijst tonen"
 
-#: configuredialog.cpp:1890
+#: configuredialog.cpp:1899
 msgid "Message Preview Pane"
 msgstr "Berichtvoorbeeldvak"
 
-#: configuredialog.cpp:1908
+#: configuredialog.cpp:1917
 msgid "Show favorite folder view"
 msgstr "Bladwijzerweergave tonen"
 
-#: configuredialog.cpp:1912
-msgid "Show folder quick search field"
-msgstr "Snelzoeken voor mappen tonen"
-
-#: configuredialog.cpp:1983
+#: configuredialog.cpp:1986
 msgid "Sta&ndard format (%1)"
 msgstr "Sta&ndaardopmaak (%1)"
 
-#: configuredialog.cpp:1984
+#: configuredialog.cpp:1987
 msgid "Locali&zed format (%1)"
 msgstr "Gelokali&seerde opmaak (%1)"
 
-#: configuredialog.cpp:1985
+#: configuredialog.cpp:1988
 msgid "Fancy for&mat (%1)"
 msgstr "Ele&gante opmaak (%1)"
 
-#: configuredialog.cpp:1986
+#: configuredialog.cpp:1989
 msgid "C&ustom format (Shift+F1 for help):"
 msgstr "Aange&paste opmaak (Shift+F1 voor help):"
 
-#: configuredialog.cpp:2003
+#: configuredialog.cpp:2006
 msgid "General Options"
 msgstr "Algemene opties"
 
-#: configuredialog.cpp:2006
-msgid "Show Quick Search"
-msgstr "Snelzoeken tonen"
-
-#: configuredialog.cpp:2008
+#: configuredialog.cpp:2009
 msgid "Display messa&ge sizes"
 msgstr "Ber&ichtgrootte tonen"
 
-#: configuredialog.cpp:2010
+#: configuredialog.cpp:2011
 msgid "Show crypto &icons"
 msgstr "Crypto-p&ictogrammen tonen"
 
-#: configuredialog.cpp:2012
+#: configuredialog.cpp:2013
 msgid "Show attachment icon"
 msgstr "Bijlagepictogram tonen"
 
-#: configuredialog.cpp:2015
+#: configuredialog.cpp:2016
 msgid "&Threaded message list"
 msgstr "Discussies groeperen in berich&tenlijst"
 
-#: configuredialog.cpp:2033
+#: configuredialog.cpp:2032
 msgid "Threaded Message List Options"
 msgstr "Opties voor groeperen van discussies in berichtenlijst"
 
-#: configuredialog.cpp:2037
+#: configuredialog.cpp:2036
 msgid "Always &keep threads open"
 msgstr "Discussies alti&jd open houden"
 
-#: configuredialog.cpp:2040
+#: configuredialog.cpp:2039
 msgid "Threads default to o&pen"
 msgstr "Discussies zijn standaard o&pen"
 
-#: configuredialog.cpp:2043
+#: configuredialog.cpp:2042
 msgid "Threads default to closed"
 msgstr "Discussies zijn stan&daard gesloten"
 
-#: configuredialog.cpp:2046
+#: configuredialog.cpp:2045
 msgid ""
 "Open threads that contain ne&w, unread or important messages and open watched "
 "threads."
@@ -1733,11 +1934,11 @@ msgstr ""
 "Discussies openen als ze nieuwe, o&ngelezen of belangrijke berichten bevatten "
 "of als ze geobserveerd worden."
 
-#: configuredialog.cpp:2056
+#: configuredialog.cpp:2055
 msgid "Date Display"
 msgstr "Datumweergave"
 
-#: configuredialog.cpp:2073
+#: configuredialog.cpp:2072
 msgid ""
 "<qt>"
 "<p><strong>These expressions may be used for the date:</strong></p>"
@@ -1800,116 +2001,165 @@ msgstr ""
 "<li>Z - tijdszone in numerieke vorm (-0500)</li></ul>"
 "<p><strong>Alle andere invoertekens zullen worden genegeerd.</strong></p></qt>"
 
-#: configuredialog.cpp:2187
+#: configuredialog.cpp:2185
 msgid ""
 "Changing the global threading setting will override all folder specific values."
 msgstr ""
 "Het wijzigen van globale instellingen voor discussies zal alle map-specifieke "
 "waarden overschrijven."
 
-#: configuredialog.cpp:2224
+#: configuredialog.cpp:2221
+msgid "Close message window after replying or forwarding"
+msgstr ""
+
+#: configuredialog.cpp:2225
 msgid "Show HTML stat&us bar"
 msgstr "HTML-stat&usbalk tonen"
 
-#: configuredialog.cpp:2228
+#: configuredialog.cpp:2229
 msgid "Show s&pam status in fancy headers"
 msgstr "S&pamstatus in elegante koppen tonen"
 
-#. i18n: file kmail.kcfg line 541
-#: configuredialog.cpp:2232 rc.cpp:856
+#. i18n: file kmail.kcfg line 583
+#: configuredialog.cpp:2233 rc.cpp:890
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr "Smileys vervangen door emoticons"
 
-#: configuredialog.cpp:2236
+#: configuredialog.cpp:2237
 msgid "Use smaller font for quoted text"
 msgstr "Kleiner lettertype voor aangehaalde tekst gebruiken"
 
-#. i18n: file kmail.kcfg line 546
-#: configuredialog.cpp:2240 rc.cpp:862
+#. i18n: file kmail.kcfg line 588
+#: configuredialog.cpp:2241 rc.cpp:896
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr "Markeringen tonen om aanhalingen in- of uit te klappen"
 
-#: configuredialog.cpp:2315
+#: configuredialog.cpp:2245
+msgid "Show current sender time"
+msgstr ""
+
+#: configuredialog.cpp:2262
+msgid ""
+"Close the standalone message window after replying or forwarding the message"
+msgstr ""
+
+#: configuredialog.cpp:2328
 msgid "Fallback ch&aracter encoding:"
 msgstr "Secund&aire tekensetcodering:"
 
-#: configuredialog.cpp:2325 configuredialog.cpp:2382 kmreaderwin.cpp:650
+#: configuredialog.cpp:2338 configuredialog.cpp:2400 kmreaderwin.cpp:584
 msgid "Auto"
 msgstr "Automatisch"
 
-#: configuredialog.cpp:2336
+#: configuredialog.cpp:2349
 msgid "&Override character encoding:"
 msgstr "Primaire tekensetc&odering:"
 
-#. i18n: file kmail.kcfg line 103
-#: configuredialog.cpp:2462 rc.cpp:643
+#. i18n: file kmail.kcfg line 105
+#: configuredialog.cpp:2486 rc.cpp:649
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr "Systeemvakpictogram inschakelen"
 
-#: configuredialog.cpp:2468
+#: configuredialog.cpp:2492
 msgid "System Tray Mode"
 msgstr "Systeemvakmodus"
 
-#: configuredialog.cpp:2476
+#: configuredialog.cpp:2500
 msgid "Always show KMail in system tray"
 msgstr "KMail altijd in systeemvak weergeven"
 
-#: configuredialog.cpp:2479
+#: configuredialog.cpp:2503
 msgid "Only show KMail in system tray if there are unread messages"
 msgstr "KMail alleen in systeemvak weergeven als er ongelezen berichten zijn"
 
-#: configuredialog.cpp:2539 identitydialog.cpp:384
+#: configuredialog.cpp:2563 identitydialog.cpp:408
 msgid "&Templates"
 msgstr "S&jablonen"
 
-#: configuredialog.cpp:2545
+#: configuredialog.cpp:2569
 msgid "&Custom Templates"
 msgstr "Aangepaste s&jablonen"
 
-#: configuredialog.cpp:2551
+#: configuredialog.cpp:2575
 msgid "&Subject"
 msgstr "Onder&werp"
 
-#: configuredialog.cpp:2558
+#: configuredialog.cpp:2582
 msgid "Cha&rset"
 msgstr "Teken&set"
 
-#: configuredialog.cpp:2564
+#: configuredialog.cpp:2588
 msgid "H&eaders"
 msgstr "B&erichtkoppen"
 
-#: configuredialog.cpp:2570
+#: configuredialog.cpp:2594
 msgid ""
 "_: Config->Composer->Attachments\n"
 "A&ttachments"
 msgstr "Bij&lagen"
 
-#: configuredialog.cpp:2654
+#: configuredialog.cpp:2633
+msgid ""
+"When replying, add quote signs in front of all lines of the quoted text,\n"
+"even when the line was created by adding an additional linebreak while\n"
+"word-wrapping the text."
+msgstr ""
+
+#: configuredialog.cpp:2643
+msgid ""
+"When replying, only quote the selected text instead of the complete message "
+"when there is text selected in the message window."
+msgstr ""
+
+#: configuredialog.cpp:2704
+msgid "Warn if too many recipients are specified"
+msgstr ""
+
+#: configuredialog.cpp:2716
+msgid "Warn if more than this many recipients are specified"
+msgstr ""
+
+#: configuredialog.cpp:2732
 msgid "No autosave"
 msgstr "Niet automatisch opslaan"
 
-#: configuredialog.cpp:2661
+#: configuredialog.cpp:2741
+#, fuzzy
+msgid "Default Forwarding Type:"
+msgstr "S&tandaarddomein:"
+
+#: configuredialog.cpp:2744
+#, fuzzy
+msgid "Inline"
+msgstr "&Ingebed..."
+
+#: configuredialog.cpp:2745
+#, fuzzy
+msgid "As Attachment"
+msgstr "Heeft bijlage"
+
+#: configuredialog.cpp:2753
 msgid "Configure Completion Order"
 msgstr "Aanvulvolgorde instellen"
 
-#: configuredialog.cpp:2669 kmlineeditspell.cpp:136
+#: configuredialog.cpp:2761 kmlineeditspell.cpp:159
 msgid "Edit Recent Addresses..."
 msgstr "Recente adressen bewerken..."
 
-#: configuredialog.cpp:2676 kmedit.cpp:540
+#: configuredialog.cpp:2768 kmedit.cpp:633
 msgid "External Editor"
 msgstr "Externe editor"
 
-#: configuredialog.cpp:2707
+#: configuredialog.cpp:2799
 #, c-format
 msgid "<b>%f</b> will be replaced with the filename to edit."
 msgstr ""
 "<b>%f</b> zal worden vervangen door de naam van het te bewerken bestand."
 
-#: configuredialog.cpp:2817
+#: configuredialog.cpp:2930
 msgid ""
 "<qt>The following placeholders are supported in the reply phrases:"
 "<br><b>%D</b>: date, <b>%S</b>: subject,"
@@ -1929,54 +2179,54 @@ msgstr ""
 "(BCC), "
 "<br><b>%%</b>: procentteken, <b>%_</b>: spatie, <b>%L</b>: regeleinde</qt>"
 
-#: configuredialog.cpp:2830
+#: configuredialog.cpp:2943
 msgid "Lang&uage:"
 msgstr "Taa&l:"
 
-#: configuredialog.cpp:2839 configuredialog.cpp:3087 configuredialog.cpp:3303
-#: configuredialog.cpp:3498
+#: configuredialog.cpp:2952 configuredialog.cpp:3200 configuredialog.cpp:3416
+#: configuredialog.cpp:3611
 msgid "Re&move"
 msgstr "Verwij&deren"
 
-#: configuredialog.cpp:2853
+#: configuredialog.cpp:2966
 msgid "Reply to se&nder:"
 msgstr "Afzender bea&ntwoorden:"
 
-#: configuredialog.cpp:2861
+#: configuredialog.cpp:2974
 msgid "Repl&y to all:"
 msgstr "Allen &beantwoorden:"
 
-#: configuredialog.cpp:2869
+#: configuredialog.cpp:2982
 msgid "&Forward:"
 msgstr "&Doorsturen:"
 
 #. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2877 rc.cpp:459
+#: configuredialog.cpp:2990 rc.cpp:465
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr "&Aanhalingsindicatie:"
 
-#: configuredialog.cpp:2922 kmmessage.cpp:3960
+#: configuredialog.cpp:3035 kmmessage.cpp:4048
 msgid "On %D, you wrote:"
 msgstr "Op %D, schreef u:"
 
-#: configuredialog.cpp:2923 kmmessage.cpp:3962
+#: configuredialog.cpp:3036 kmmessage.cpp:4050
 msgid "On %D, %F wrote:"
 msgstr "Op %D, schreef %F:"
 
-#: configuredialog.cpp:2924 kmmessage.cpp:3964
+#: configuredialog.cpp:3037 kmmessage.cpp:4052
 msgid "Forwarded Message"
 msgstr "Doorgestuurd bericht"
 
-#: configuredialog.cpp:2925
+#: configuredialog.cpp:3038
 msgid ">%_"
 msgstr ">%_"
 
-#: configuredialog.cpp:3074
+#: configuredialog.cpp:3187
 msgid "Repl&y Subject Prefixes"
 msgstr "Onderwerpvoorvoegsel voor bean&twoorde berichten"
 
-#: configuredialog.cpp:3078 configuredialog.cpp:3107
+#: configuredialog.cpp:3191 configuredialog.cpp:3220
 msgid ""
 "Recognize any sequence of the following prefixes\n"
 "(entries are case-insensitive regular expressions):"
@@ -1984,23 +2234,23 @@ msgstr ""
 "De volgende voorvoegsels herkennen\n"
 "(de ingangen zijn hoofdlettergevoelige reguliere expressies):"
 
-#: configuredialog.cpp:3088 configuredialog.cpp:3499
+#: configuredialog.cpp:3201 configuredialog.cpp:3612
 msgid "Mod&ify..."
 msgstr "Wijz&igen..."
 
-#: configuredialog.cpp:3089
+#: configuredialog.cpp:3202
 msgid "Enter new reply prefix:"
 msgstr "Nieuw antwoordvoorvoegsel invoeren:"
 
-#: configuredialog.cpp:3103
+#: configuredialog.cpp:3216
 msgid "For&ward Subject Prefixes"
 msgstr "Onder&werpvoorvoegsel voor doorgestuurde berichten"
 
-#: configuredialog.cpp:3117
+#: configuredialog.cpp:3230
 msgid "Enter new forward prefix:"
 msgstr "Nieuw doorsturen-voorvoegsel invoeren:"
 
-#: configuredialog.cpp:3156
+#: configuredialog.cpp:3269
 msgid ""
 "This list is checked for every outgoing message from the top to the bottom for "
 "a charset that contains all required characters."
@@ -2008,58 +2258,58 @@ msgstr ""
 "Deze lijst wordt voor elk uitgaand bericht van boven naar beneden gecontroleerd "
 "op een tekenset die alle benodigde tekens bevat."
 
-#: configuredialog.cpp:3165
+#: configuredialog.cpp:3278
 msgid "Enter charset:"
 msgstr "Tekenset invoeren:"
 
-#: configuredialog.cpp:3171
+#: configuredialog.cpp:3284
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr ""
 "Originele te&kenset behouden bij beantwoorden en doorsturen (indien mogelijk)"
 
-#: configuredialog.cpp:3205
+#: configuredialog.cpp:3318
 msgid "This charset is not supported."
 msgstr "Deze tekenset wordt niet ondersteund."
 
-#: configuredialog.cpp:3256
+#: configuredialog.cpp:3369
 msgid "&Use custom message-id suffix"
 msgstr "Aangepast achtervoegsel voor Message-ID gebr&uiken"
 
-#: configuredialog.cpp:3269
+#: configuredialog.cpp:3382
 msgid "Custom message-&id suffix:"
 msgstr "Aangepast Message-&ID-achtervoegsel:"
 
-#: configuredialog.cpp:3283
+#: configuredialog.cpp:3396
 msgid "Define custom mime header fields:"
 msgstr "Definieer hier uw eigen MIME-velden:"
 
-#: configuredialog.cpp:3291
+#: configuredialog.cpp:3404
 msgid "Value"
 msgstr "Waarde"
 
-#: configuredialog.cpp:3299
+#: configuredialog.cpp:3412
 msgid "Ne&w"
 msgstr "Nieu&w"
 
 #. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3312 kmfolderdia.cpp:268 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:76 rc.cpp:224
-#: rc.cpp:399
+#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
+#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
+#: rc.cpp:405
 #, no-c-format
 msgid "&Name:"
 msgstr "Naa&m:"
 
-#: configuredialog.cpp:3321
+#: configuredialog.cpp:3434
 msgid "&Value:"
 msgstr "&Waarde:"
 
-#. i18n: file kmail.kcfg line 359
-#: configuredialog.cpp:3468 rc.cpp:782
+#. i18n: file kmail.kcfg line 389
+#: configuredialog.cpp:3581 rc.cpp:807
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Bijlagenaamgeving compatibel met Outlook(tm)"
 
-#: configuredialog.cpp:3471
+#: configuredialog.cpp:3584
 msgid ""
 "Turn this option on to make Outlook(tm) understand attachment names containing "
 "non-English characters"
@@ -2067,31 +2317,31 @@ msgstr ""
 "Zet deze optie aan om ervoor te zorgen dat Outlook(tm) de bijlagenamen begrijpt "
 "die niet-West-Europese tekens bevatten"
 
-#: configuredialog.cpp:3482
+#: configuredialog.cpp:3595
 msgid "E&nable detection of missing attachments"
 msgstr "Detectie van ontbrekende bijlagen activere&n"
 
-#: configuredialog.cpp:3489
+#: configuredialog.cpp:3602
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr ""
 "Herken een van de volgende trefwoorden als een intentie om een bestand bij te "
 "voegen:"
 
-#: configuredialog.cpp:3500
+#: configuredialog.cpp:3613
 msgid "Enter new key word:"
 msgstr "Nieuw trefwoord invoeren:"
 
-#: configuredialog.cpp:3521 configuredialog.cpp:3522 kmcomposewin.cpp:2232
-#: kmcomposewin.cpp:2233
+#: configuredialog.cpp:3634 configuredialog.cpp:3635 kmcomposewin.cpp:2297
+#: kmcomposewin.cpp:2298
 msgid "attachment"
 msgstr "bijlage"
 
-#: configuredialog.cpp:3523 configuredialog.cpp:3524 kmcomposewin.cpp:2234
-#: kmcomposewin.cpp:2235
+#: configuredialog.cpp:3636 configuredialog.cpp:3637 kmcomposewin.cpp:2299
+#: kmcomposewin.cpp:2300
 msgid "attached"
 msgstr "bijgevoegd"
 
-#: configuredialog.cpp:3542
+#: configuredialog.cpp:3655
 msgid ""
 "You have chosen to encode attachment names containing non-English characters in "
 "a way that is understood by Outlook(tm) and other mail clients that do not "
@@ -2109,27 +2359,27 @@ msgstr ""
 "houden dezeberichten niet goed kunnen verwerken. U dient deze optie dus niet "
 "aan te zetten tenzij u het echt nodig hebt."
 
-#: configuredialog.cpp:3569
+#: configuredialog.cpp:3682
 msgid "&Reading"
 msgstr "&Lezen"
 
-#: configuredialog.cpp:3575
+#: configuredialog.cpp:3688
 msgid "Composing"
 msgstr "Opstellen"
 
-#: configuredialog.cpp:3581
+#: configuredialog.cpp:3694
 msgid "Warnings"
 msgstr "Waarschuwingen"
 
-#: configuredialog.cpp:3587
+#: configuredialog.cpp:3700
 msgid "S/MIME &Validation"
 msgstr "S/MIME-&validatie"
 
-#: configuredialog.cpp:3593
+#: configuredialog.cpp:3706
 msgid "Crypto Backe&nds"
 msgstr "Crypto-backe&nds"
 
-#: configuredialog.cpp:3624
+#: configuredialog.cpp:3737
 msgid ""
 "<qt>"
 "<p>Messages sometimes come in both formats. This option controls whether you "
@@ -2162,7 +2412,7 @@ msgstr ""
 "<p><b>Opmerking:</b> u kunt deze optie per map instellen via het menu <i>Map</i> "
 "van KMail's hoofdvenster.</p></qt>"
 
-#: configuredialog.cpp:3641
+#: configuredialog.cpp:3754
 msgid ""
 "<qt>"
 "<p>Some mail advertisements are in HTML and contain references to, for example, "
@@ -2191,7 +2441,7 @@ msgstr ""
 "e-mailberichten, dan kunt u deze optie activeren. Houd dan wel rekening met dit "
 "mogelijke probleem.</p></qt>"
 
-#: configuredialog.cpp:3654
+#: configuredialog.cpp:3767
 msgid ""
 "<qt>"
 "<h3>Message Disposition Notification Policy</h3>"
@@ -2243,19 +2493,19 @@ msgstr ""
 "mogelijke inbreuk op uw privacy afgeraden voor normaal e-mailgebruik. </li></ul>"
 "</qt>"
 
-#: configuredialog.cpp:3687
+#: configuredialog.cpp:3800
 msgid "HTML Messages"
 msgstr "HTML-berichten"
 
-#: configuredialog.cpp:3690
+#: configuredialog.cpp:3803
 msgid "Prefer H&TML to plain text"
 msgstr "H&TML in plaats van platte tekst prefereren"
 
-#: configuredialog.cpp:3694
+#: configuredialog.cpp:3807
 msgid "Allow messages to load e&xternal references from the Internet"
 msgstr "E-mailberichten toestaan e&xterne referenties van internet te laden"
 
-#: configuredialog.cpp:3699
+#: configuredialog.cpp:3812
 msgid ""
 "<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
 "will be compromised by present and anticipated security exploits. <a "
@@ -2267,61 +2517,61 @@ msgstr ""
 "href=\"whatsthis:%1\">Meer over HTML-berichten...</a> <a href=\"whatsthis:%2\">"
 "Meer over externe referenties...</a>"
 
-#: configuredialog.cpp:3711
+#: configuredialog.cpp:3824
 msgid "Encrypted Messages"
 msgstr "Versleutelde berichten"
 
-#: configuredialog.cpp:3713
+#: configuredialog.cpp:3826
 msgid "Attempt decryption of encrypted messages when viewing"
 msgstr ""
 "Berichten automatisch decoderen bij bekijken van versleutelde berichten"
 
-#: configuredialog.cpp:3718
+#: configuredialog.cpp:3831
 msgid "Message Disposition Notifications"
 msgstr "Ontvangst- en gelezennotificaties"
 
-#: configuredialog.cpp:3730
+#: configuredialog.cpp:3843
 msgid "Send policy:"
 msgstr "Verzendbeleid:"
 
-#: configuredialog.cpp:3732 kmmessage.cpp:1361 kmmessage.cpp:1368
+#: configuredialog.cpp:3845 kmmessage.cpp:1381 kmmessage.cpp:1388
 msgid "&Ignore"
 msgstr "&Negeren"
 
-#: configuredialog.cpp:3735
+#: configuredialog.cpp:3848
 msgid "As&k"
 msgstr "Vra&gen"
 
-#: configuredialog.cpp:3738
+#: configuredialog.cpp:3851
 msgid "&Deny"
 msgstr "&Weigeren"
 
-#: configuredialog.cpp:3741
+#: configuredialog.cpp:3854
 msgid "Al&ways send"
 msgstr "Altijd ver&zenden"
 
-#: configuredialog.cpp:3759
+#: configuredialog.cpp:3872
 msgid "Quote original message:"
 msgstr "Aanhalen uit origineel bericht:"
 
-#: configuredialog.cpp:3761
+#: configuredialog.cpp:3874
 msgid "Nothin&g"
 msgstr "Niet&s"
 
-#: configuredialog.cpp:3764
+#: configuredialog.cpp:3877
 msgid "&Full message"
 msgstr "&Volledig bericht"
 
-#: configuredialog.cpp:3767
+#: configuredialog.cpp:3880
 msgid "Onl&y headers"
 msgstr "Alleen de &koppen"
 
-#: configuredialog.cpp:3773
+#: configuredialog.cpp:3886
 msgid "Do not send MDNs in response to encrypted messages"
 msgstr ""
 "Geen ontvangst- en gelezenbevestigingen sturen naar versleutelde berichten"
 
-#: configuredialog.cpp:3777
+#: configuredialog.cpp:3890
 msgid ""
 "<b>WARNING:</b> Unconditionally returning confirmations undermines your "
 "privacy. <a href=\"whatsthis:%1\">More...</a>"
@@ -2330,136 +2580,150 @@ msgstr ""
 "<p><b>WAARSCHUWING:</b> onvoorwaardelijk bevestigingen retourneren ondermijnt "
 "uw privacy. <a href=\"whatsthis:%1\">Meer...</a>"
 
-#: configuredialog.cpp:3786
+#: configuredialog.cpp:3899
 msgid "Certificate && Key Bundle Attachments"
 msgstr "Certificaat- en sleutelbosbijlagen"
 
-#: configuredialog.cpp:3789
+#: configuredialog.cpp:3902
 msgid "Automatically import keys and certificates"
 msgstr "Sleutels en certificaten automatisch importeren"
 
-#: configuredialog.cpp:3850
+#: configuredialog.cpp:3963
 msgid ""
 "Changing the global HTML setting will override all folder specific values."
 msgstr ""
 "Het wijzigen van de globale HTML-instellingen zal alle map-specifieke "
 "instellingen overschrijven."
 
-#: configuredialog.cpp:4138
+#: configuredialog.cpp:4251
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr "Deze optie vereist dirmngr 0.9.0 of nieuwer"
 
 #. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4247 rc.cpp:347
+#: configuredialog.cpp:4360 rc.cpp:353
 #, no-c-format
 msgid "no proxy"
 msgstr "geen proxy"
 
-#: configuredialog.cpp:4248
+#: configuredialog.cpp:4361
 msgid "(Current system setting: %1)"
 msgstr "(Huidige systeeminstelling: %1)"
 
-#: configuredialog.cpp:4425
+#: configuredialog.cpp:4538
 msgid "&Folders"
 msgstr "&Mappen"
 
-#: configuredialog.cpp:4428
+#: configuredialog.cpp:4541
 msgid "&Groupware"
 msgstr "&Groupware"
 
-#: configuredialog.cpp:4449
+#: configuredialog.cpp:4562
 msgid ""
 "_: Corresponds to Folder->Move All Messages to Trash\n"
 "Ask for co&nfirmation before moving all messages to trash"
 msgstr ""
 "Om bevestiging vrage&n voordat alle berichten in de prullenbak worden geplaatst"
 
-#: configuredialog.cpp:4456
+#: configuredialog.cpp:4569
 msgid "E&xclude important messages from expiry"
 msgstr "Berichten gemarkeerd als belan&grijk niet laten verlopen"
 
-#: configuredialog.cpp:4467
+#: configuredialog.cpp:4580
 msgid ""
 "_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
 "in all folders\".\n"
 "When trying to find unread messages:"
 msgstr "Bij het zoeken naar ongelezen berichten:"
 
-#: configuredialog.cpp:4470
+#: configuredialog.cpp:4583
 msgid ""
 "_: continuation of \"When trying to find unread messages:\"\n"
 "Do not Loop"
 msgstr "Niet doorlopen"
 
-#: configuredialog.cpp:4472
+#: configuredialog.cpp:4585
 msgid ""
 "_: continuation of \"When trying to find unread messages:\"\n"
 "Loop in Current Folder"
 msgstr "Huidige map doorlopen"
 
-#: configuredialog.cpp:4474
+#: configuredialog.cpp:4587
 msgid ""
 "_: continuation of \"When trying to find unread messages:\"\n"
 "Loop in All Folders"
 msgstr "Alle mappen doorlopen"
 
-#: configuredialog.cpp:4487
+#: configuredialog.cpp:4600
 msgid ""
 "_: to be continued with \"jump to first new message\", \"jump to first unread "
 "or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr "Bij het binnengaan van een map:"
 
-#: configuredialog.cpp:4490
+#: configuredialog.cpp:4603
 msgid ""
 "_: continuation of \"When entering a folder:\"\n"
 "Jump to First New Message"
 msgstr "Naar eerste nieuwe bericht gaan"
 
-#: configuredialog.cpp:4492
+#: configuredialog.cpp:4605
 msgid ""
 "_: continuation of \"When entering a folder:\"\n"
 "Jump to First Unread or New Message"
 msgstr "Naar eerste ongelezen of nieuwe bericht gaan"
 
-#: configuredialog.cpp:4494
+#: configuredialog.cpp:4607
 msgid ""
 "_: continuation of \"When entering a folder:\"\n"
 "Jump to Last Selected Message"
 msgstr "Naar laatst geselecteerde bericht gaan"
 
-#: configuredialog.cpp:4501
+#: configuredialog.cpp:4609
+#, fuzzy
+msgid ""
+"_: continuation of \"When entering a folder:\"\n"
+"Jump to Newest Message"
+msgstr "Naar eerste nieuwe bericht gaan"
+
+#: configuredialog.cpp:4611
+#, fuzzy
+msgid ""
+"_: continuation of \"When entering a folder:\"\n"
+"Jump to Oldest Message"
+msgstr "Naar eerste nieuwe bericht gaan"
+
+#: configuredialog.cpp:4618
 msgid "Mar&k selected message as read after"
 msgstr "Geselecteerd bericht mar&keren als gelezen na"
 
-#: configuredialog.cpp:4505
+#: configuredialog.cpp:4622
 msgid " sec"
 msgstr " sec"
 
-#: configuredialog.cpp:4518
+#: configuredialog.cpp:4635
 msgid "Ask for action after &dragging messages to another folder"
 msgstr ""
 "Vragen om een actie na het verslepen van berichten naar een an&dere map"
 
-#: configuredialog.cpp:4529
+#: configuredialog.cpp:4646
 msgid ""
 "_: to be continued with \"flat files\" and \"directories\", resp.\n"
 "By default, &message folders on disk are:"
 msgstr "Standaard zijn e-&mailmappen op de schijf:"
 
-#: configuredialog.cpp:4532
+#: configuredialog.cpp:4649
 msgid ""
 "_: continuation of \"By default, &message folders on disk are\"\n"
 "Flat Files (\"mbox\" format)"
 msgstr "platte tekstbestanden (van het type \"mbox\")"
 
-#: configuredialog.cpp:4534
+#: configuredialog.cpp:4651
 msgid ""
 "_: continuation of \"By default, &message folders on disk are\"\n"
 "Directories (\"maildir\" format)"
 msgstr "mappen (van het type \"maildir\")"
 
-#: configuredialog.cpp:4537
+#: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
 "<qt>"
@@ -2484,35 +2748,35 @@ msgstr ""
 "meer schijfruimte in beslag, maar het is robuuster, zeker bij het verplaatsen "
 "van berichten tussen mappen.</p></qt>"
 
-#: configuredialog.cpp:4562
+#: configuredialog.cpp:4679
 msgid "Open this folder on startup:"
 msgstr "Deze map openen bij het opstarten:"
 
-#: configuredialog.cpp:4570
+#: configuredialog.cpp:4687
 msgid "Empty local &trash folder on program exit"
 msgstr "Lokale prullenbak legen bij afslui&ten"
 
-#: configuredialog.cpp:4578
+#: configuredialog.cpp:4695
 msgid "Enable full text &indexing"
 msgstr "Volledige tekst-&indexering gebruiken"
 
-#: configuredialog.cpp:4588
+#: configuredialog.cpp:4705
 msgid "Quota units: "
 msgstr "Quota-eenheden: "
 
-#: configuredialog.cpp:4590 quotajobs.h:86
+#: configuredialog.cpp:4707 quotajobs.h:86
 msgid "KB"
 msgstr "KB"
 
-#: configuredialog.cpp:4591 quotajobs.h:91
+#: configuredialog.cpp:4708 quotajobs.h:91
 msgid "MB"
 msgstr "MB"
 
-#: configuredialog.cpp:4592 quotajobs.h:96
+#: configuredialog.cpp:4709 quotajobs.h:96
 msgid "GB"
 msgstr "GB"
 
-#: configuredialog.cpp:4601
+#: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
 "<qt>"
@@ -2542,7 +2806,7 @@ msgstr ""
 "bericht,afhankelijk van de gekozen instelling, herstarten bij het laatste "
 "bericht in de map of verder zoeken in de vorige map.</p></qt>"
 
-#: configuredialog.cpp:4618
+#: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
 "<qt>"
@@ -2563,70 +2827,71 @@ msgstr ""
 "<p>Nadat u dit hebt aangezet wordt de index aangemaakt, maar u kunt in de "
 "tussentijd nog gewoon gebruik maken van KMail.</p></qt>"
 
-#: configuredialog.cpp:4694
+#: configuredialog.cpp:4811
 msgid "&IMAP Resource Folder Options"
 msgstr "Opties voor &IMAP-gegevensbronmap"
 
-#: configuredialog.cpp:4698
+#: configuredialog.cpp:4815
 msgid "&Enable IMAP resource functionality"
 msgstr "Functionaliteit voor IMAP-gegevensbronnen activ&eren"
 
-#: configuredialog.cpp:4699
+#: configuredialog.cpp:4816
 msgid "This enables the IMAP storage for the Kontact applications"
 msgstr "Dit zet de IMAP-opslag aan voor Kontact-toepassingen"
 
-#: configuredialog.cpp:4712
+#: configuredialog.cpp:4829
 msgid "&Format used for the groupware folders:"
 msgstr "Gebruikte &formaat voor groupwaremappen:"
 
-#: configuredialog.cpp:4714
+#: configuredialog.cpp:4831
 msgid ""
 "Choose the format to use to store the contents of the groupware folders."
 msgstr ""
 "Kies het formaat waarin de inhoud van de groupwaremappen opgeslagen moeten "
 "worden."
 
-#: configuredialog.cpp:4723
-msgid "Standard (Ical / Vcard)"
-msgstr "Standaard (iCal / VCard)"
+#: configuredialog.cpp:4840
+msgid "Deprecated Kolab1 (iCal/vCard)"
+msgstr ""
 
-#: configuredialog.cpp:4723
-msgid "Kolab (XML)"
+#: configuredialog.cpp:4840
+#, fuzzy
+msgid "Kolab2 (XML)"
 msgstr "Kolab (XML)"
 
-#: configuredialog.cpp:4731
+#: configuredialog.cpp:4848
 msgid "&Language of the groupware folders:"
 msgstr "Taa&l van groupware-mappen:"
 
-#: configuredialog.cpp:4734
+#: configuredialog.cpp:4851
 msgid "Set the language of the folder names"
 msgstr "Stel de taal in van de mapnamen"
 
-#: configuredialog.cpp:4743
+#: configuredialog.cpp:4860
 msgid "English"
 msgstr "Engels"
 
-#: configuredialog.cpp:4743
+#: configuredialog.cpp:4860
 msgid "German"
 msgstr "Duits"
 
-#: configuredialog.cpp:4743
+#: configuredialog.cpp:4860
 msgid "French"
 msgstr "Frans"
 
-#: configuredialog.cpp:4743
+#: configuredialog.cpp:4860
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: configuredialog.cpp:4752
+#: configuredialog.cpp:4869
 msgid "Set the parent of the resource folders"
 msgstr "Hoofdmap van gegevensbronmappen instellen"
 
-#: configuredialog.cpp:4781
+#: configuredialog.cpp:4898
 msgid "&Hide groupware folders"
 msgstr "Groupware-mappen &verbergen"
 
-#: configuredialog.cpp:4785
+#: configuredialog.cpp:4902
 msgid ""
 "When this is checked, you will not see the IMAP resource folders in the folder "
 "tree."
@@ -2634,11 +2899,11 @@ msgstr ""
 "Wanneer deze optie is geselecteerd ziet u geen IMAP gegevensbronmappen meer in "
 "de mappenstructuur."
 
-#: configuredialog.cpp:4792
+#: configuredialog.cpp:4909
 msgid "&Only show groupware folders for this account"
 msgstr "Alleen groupware-mappen voor dit account t&onen"
 
-#: configuredialog.cpp:4796
+#: configuredialog.cpp:4913
 msgid ""
 "When this is checked, you will not see normal  mail folders in the folder tree "
 "for the account configured for groupware."
@@ -2646,11 +2911,11 @@ msgstr ""
 "Wanneer deze optie is geselecteerd ziet u geen normale berichtmappen meer in de "
 "mappenstructuur van het account dat is ingesteld voor groupware."
 
-#: configuredialog.cpp:4804
+#: configuredialog.cpp:4921
 msgid "Synchronize groupware changes immediately"
 msgstr "Groupware-wijzigingen meteen synchroniseren"
 
-#: configuredialog.cpp:4806
+#: configuredialog.cpp:4923
 msgid ""
 "Synchronize groupware changes in disconnected IMAP folders immediately when "
 "being online."
@@ -2658,19 +2923,19 @@ msgstr ""
 "Groupware-wijzigingen meteen synchroniseren in offline IMAP-mappen zodra u "
 "online bent."
 
-#: configuredialog.cpp:4818
+#: configuredialog.cpp:4935
 msgid "Groupware Compatibility && Legacy Options"
 msgstr "Groupware-ondersteuning en bijbehorende instellingen"
 
-#: configuredialog.cpp:4823
+#: configuredialog.cpp:4940
 msgid "&Enable groupware functionality"
 msgstr "Groupware-functionaliteit activ&eren"
 
-#: configuredialog.cpp:4831
+#: configuredialog.cpp:4948
 msgid "Mangle From:/To: headers in replies to invitations"
 msgstr "De kopschriften Van:/Aan: aanpassen bij antwoorden op uitnodigingen"
 
-#: configuredialog.cpp:4832
+#: configuredialog.cpp:4949
 msgid ""
 "Turn this option on in order to make Outlook(tm) understand your answers to "
 "invitation replies"
@@ -2678,11 +2943,11 @@ msgstr ""
 "Zet deze optie aan om ervoor te zorgen dat Outlook(tm) uw antwoorden op "
 "uitnodigingen begrijpt."
 
-#: configuredialog.cpp:4837
+#: configuredialog.cpp:4954
 msgid "Send invitations in the mail body"
 msgstr "Uitnodigingen in berichtinhoud verzenden"
 
-#: configuredialog.cpp:4838
+#: configuredialog.cpp:4955
 msgid ""
 "Turn this option on in order to make Outlook(tm) understand your answers to "
 "invitations"
@@ -2690,31 +2955,41 @@ msgstr ""
 "Zet deze optie aan om ervoor te zorgen dat Outlook(tm) uw antwoorden op "
 "uitnodigingen begrijpt."
 
-#: configuredialog.cpp:4846
+#: configuredialog.cpp:4963
 msgid "Exchange compatible invitation naming"
 msgstr "Naamgeving uitnodigingen compatibel met Exchange"
 
-#. i18n: file kmail.kcfg line 183
-#: configuredialog.cpp:4847 rc.cpp:685
-#, no-c-format
+#: configuredialog.cpp:4964
+#, fuzzy
 msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
+"Outlook(tm), when used in combination with a Microsoft Exchange server,\n"
+"has a problem understanding standards-compliant groupware e-mail.\n"
+"Turn this option on to send groupware invitations and replies in an Exchange "
+"compatible way."
 msgstr ""
 "Microsoft Outlook heeft, in combinatie met Microsoft Exchange, problemen met "
 "groupware-e-mail die zich aan de standaard houdt.\n"
 "Schakel deze optie in om groupware-uitnodigingen te versturen die correct "
 "kunnen worden verwerkt door Microsoft Exchange."
 
-#. i18n: file kmail.kcfg line 188
-#: configuredialog.cpp:4853 rc.cpp:688
+#. i18n: file kmail.kcfg line 190
+#: configuredialog.cpp:4970 rc.cpp:694
+#, fuzzy, no-c-format
+msgid "Outlook compatible invitation reply comments"
+msgstr "Bijlagenaamgeving compatibel met Outlook(tm)"
+
+#: configuredialog.cpp:4971
+msgid ""
+"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+msgstr ""
+
+#. i18n: file kmail.kcfg line 196
+#: configuredialog.cpp:4977 rc.cpp:700
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr "Automatisch uitnodigingen verzenden"
 
-#: configuredialog.cpp:4854
+#: configuredialog.cpp:4978
 msgid ""
 "When this is on, the user will not see the mail composer window. Invitation "
 "mails are sent automatically"
@@ -2722,7 +2997,7 @@ msgstr ""
 "Wanneer dit aan staat zal er geen berichtopsteller in beeld komen;\n"
 "e-mailberichten met uitnodigingen worden automatisch verzonden."
 
-#: configuredialog.cpp:4867
+#: configuredialog.cpp:4991
 msgid ""
 "<qt>Invitations are normally sent as attachments to a mail. This switch changes "
 "the invitation mails to be sent in the text of the mail instead; this is "
@@ -2743,15 +3018,15 @@ msgstr ""
 "<br>Dit zal nog wel werken voor degenen die e-mailprogramma's gebruiken die dit "
 "wel ondersteunen.</qt>"
 
-#: configuredialog.cpp:4922
+#: configuredialog.cpp:5048
 msgid "<Choose a Folder>"
 msgstr "<Selecteer een map>"
 
-#: configuredialog.cpp:5026
+#: configuredialog.cpp:5154
 msgid "&Resource folders are subfolders of:"
 msgstr "De gegevensbronmappen zijn submappen van:"
 
-#: configuredialog.cpp:5029
+#: configuredialog.cpp:5157
 msgid "&Resource folders are in account:"
 msgstr "De gegevensbronmappen zijn van account:"
 
@@ -2820,31 +3095,31 @@ msgid ""
 "Not available"
 msgstr "Niet beschikbaar"
 
-#: customtemplates.cpp:87
+#: customtemplates.cpp:100
 msgid ""
 "_: Message->\n"
 "Universal"
 msgstr "Algemeen"
 
-#: customtemplates.cpp:88 customtemplates.cpp:131
+#: customtemplates.cpp:101 customtemplates.cpp:180
 msgid ""
 "_: Message->\n"
 "Reply"
 msgstr "Beantwoorden"
 
-#: customtemplates.cpp:89 customtemplates.cpp:133
+#: customtemplates.cpp:102 customtemplates.cpp:182
 msgid ""
 "_: Message->\n"
 "Reply to All"
 msgstr "Allen beantwoorden"
 
-#: customtemplates.cpp:90 customtemplates.cpp:135
+#: customtemplates.cpp:103 customtemplates.cpp:184
 msgid ""
 "_: Message->\n"
 "Forward"
 msgstr "Doorsturen"
 
-#: customtemplates.cpp:93
+#: customtemplates.cpp:106
 msgid ""
 "<qt>"
 "<p>Here you can add, edit, and delete custom message templates to use when you "
@@ -2871,21 +3146,44 @@ msgstr ""
 ". De laatste soort kan voor allerlei dingen gebruikt worden. U kunt geen "
 "sneltoets toewijzen aan algemene sjablonen.</p></qt>"
 
-#: customtemplates.cpp:107 templatesconfiguration.cpp:105
+#: customtemplates.cpp:120 templatesconfiguration.cpp:105
 msgid "<a href=\"whatsthis:%1\">How does this work?</a>"
 msgstr "<a href=\"whatsthis:%1\">Hoe werkt dit?</a>"
 
-#: customtemplates.cpp:137
+#: customtemplates.cpp:122
+#, fuzzy
+msgid "Additional recipients of the message when forwarding"
+msgstr ""
+"Berichten automatisch decoderen bij bekijken van versleutelde berichten"
+
+#: customtemplates.cpp:123
+msgid "Additional recipients who get a copy of the message when forwarding"
+msgstr ""
+
+#: customtemplates.cpp:124
+msgid ""
+"When using this template for forwarding, the default recipients are those you "
+"enter here. This is a comma-separated list of mail addresses."
+msgstr ""
+
+#: customtemplates.cpp:125
+msgid ""
+"When using this template for forwarding, the recipients you enter here will by "
+"default get a copy of this message. This is a comma-separated list of mail "
+"addresses."
+msgstr ""
+
+#: customtemplates.cpp:186
 msgid ""
 "_: Message->\n"
 "Unknown"
 msgstr "Onbekend"
 
-#: customtemplates.cpp:347 customtemplates.cpp:364
+#: customtemplates.cpp:420 customtemplates.cpp:437
 msgid "Key Conflict"
 msgstr "Sneltoetsconflict"
 
-#: customtemplates.cpp:348
+#: customtemplates.cpp:421
 msgid ""
 "The selected shortcut is already used for another custom template, would you "
 "still like to continue with the assignment?"
@@ -2893,7 +3191,7 @@ msgstr ""
 "De geselecteerde sneltoets wordt reeds gebruikt voor een ander sjabloon. Wilt u "
 "deze sneltoets toch toewijzen?"
 
-#: customtemplates.cpp:365
+#: customtemplates.cpp:438
 msgid ""
 "The selected shortcut is already used, would you still like to continue with "
 "the assignment?"
@@ -2901,23 +3199,23 @@ msgstr ""
 "De geselecteerde sneltoets wordt reeds gebruikt. Wilt u deze sneltoets toch "
 "toewijzen?"
 
-#: distributionlistdialog.cpp:96
+#: distributionlistdialog.cpp:97
 msgid "Save Distribution List"
 msgstr "Distributielijst opslaan"
 
-#: distributionlistdialog.cpp:97
+#: distributionlistdialog.cpp:98
 msgid "Save List"
 msgstr "Lijst opslaan"
 
-#: distributionlistdialog.cpp:106
+#: distributionlistdialog.cpp:107
 msgid "Name:"
 msgstr "Naam:"
 
-#: distributionlistdialog.cpp:116 recipientspicker.cpp:390
+#: distributionlistdialog.cpp:117 recipientspicker.cpp:390
 msgid "Email"
 msgstr "E-mail"
 
-#: distributionlistdialog.cpp:170
+#: distributionlistdialog.cpp:169
 msgid ""
 "There are no recipients in your list. First select some recipients, then try "
 "again."
@@ -2925,15 +3223,15 @@ msgstr ""
 "Er staan geen geadresseerden in de lijst. Selecteer enkele geadresseerden en "
 "probeer het opnieuw."
 
-#: distributionlistdialog.cpp:185
+#: distributionlistdialog.cpp:184
 msgid "New Distribution List"
 msgstr "Nieuwe distributielijst"
 
-#: distributionlistdialog.cpp:186
+#: distributionlistdialog.cpp:185
 msgid "Please enter name:"
 msgstr "Voer een naam in:"
 
-#: distributionlistdialog.cpp:197
+#: distributionlistdialog.cpp:198
 msgid ""
 "<qt>Distribution list with the given name <b>%1</b> already exists. Please "
 "select a different name.</qt>"
@@ -2941,107 +3239,108 @@ msgstr ""
 "<qt>Distributielijst met de opgegeven naam <b>%1</b> "
 "bestaat al. Geef een andere naam op.</qt>"
 
-#: editorwatcher.cpp:86
+#: editorwatcher.cpp:76
 msgid "Edit with:"
 msgstr "Bewerken met:"
 
-#: editorwatcher.cpp:169
+#: editorwatcher.cpp:161
+#, fuzzy
 msgid ""
-"KMail is unable to detect when the choosen editor is closed. To avoid data "
-"loss, editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
+"editing the attachment will be aborted."
 msgstr ""
 "KMail kan niet detecteren wanneer de gekozen editor is afgesloten. Om "
 "gegevensverlies te voorkomen zal het bewerken van bijlagen worden afgebroken."
 
-#: editorwatcher.cpp:170
+#: editorwatcher.cpp:163
 msgid "Unable to edit attachment"
 msgstr "Kon de bijlage niet bewerken"
 
-#: encodingdetector.cpp:1250 encodingdetector.cpp:1352
+#: encodingdetector.cpp:1170 encodingdetector.cpp:1272
 msgid ""
 "_: @item Text character set\n"
 "Unicode"
 msgstr "Unicode"
 
-#: encodingdetector.cpp:1252 encodingdetector.cpp:1322
+#: encodingdetector.cpp:1172 encodingdetector.cpp:1242
 msgid ""
 "_: @item Text character set\n"
 "Cyrillic"
 msgstr "Cyrilisch"
 
-#: encodingdetector.cpp:1254 encodingdetector.cpp:1337
+#: encodingdetector.cpp:1174 encodingdetector.cpp:1257
 msgid ""
 "_: @item Text character set\n"
 "Western European"
 msgstr "West-Europees"
 
-#: encodingdetector.cpp:1256 encodingdetector.cpp:1319
+#: encodingdetector.cpp:1176 encodingdetector.cpp:1239
 msgid ""
 "_: @item Text character set\n"
 "Central European"
 msgstr "Centraal-Europees"
 
-#: encodingdetector.cpp:1258 encodingdetector.cpp:1325
+#: encodingdetector.cpp:1178 encodingdetector.cpp:1245
 msgid ""
 "_: @item Text character set\n"
 "Greek"
 msgstr "Grieks"
 
-#: encodingdetector.cpp:1260 encodingdetector.cpp:1328
+#: encodingdetector.cpp:1180 encodingdetector.cpp:1248
 msgid ""
 "_: @item Text character set\n"
 "Hebrew"
 msgstr "Hebreeuws"
 
-#: encodingdetector.cpp:1262 encodingdetector.cpp:1334
+#: encodingdetector.cpp:1182 encodingdetector.cpp:1254
 msgid ""
 "_: @item Text character set\n"
 "Turkish"
 msgstr "Turks"
 
-#: encodingdetector.cpp:1264 encodingdetector.cpp:1331
+#: encodingdetector.cpp:1184 encodingdetector.cpp:1251
 msgid ""
 "_: @item Text character set\n"
 "Japanese"
 msgstr "Japans"
 
-#: encodingdetector.cpp:1266 encodingdetector.cpp:1316
+#: encodingdetector.cpp:1186 encodingdetector.cpp:1236
 msgid ""
 "_: @item Text character set\n"
 "Baltic"
 msgstr "Baltisch"
 
-#: encodingdetector.cpp:1268 encodingdetector.cpp:1313
+#: encodingdetector.cpp:1188 encodingdetector.cpp:1233
 msgid ""
 "_: @item Text character set\n"
 "Arabic"
 msgstr "Arabisch"
 
-#: encodingdetector.cpp:1340
+#: encodingdetector.cpp:1260
 msgid ""
 "_: @item Text character set\n"
 "Chinese Traditional"
 msgstr "Traditioneel Chinees"
 
-#: encodingdetector.cpp:1343
+#: encodingdetector.cpp:1263
 msgid ""
 "_: @item Text character set\n"
 "Chinese Simplified"
 msgstr "Vereenvoudigd Chinees"
 
-#: encodingdetector.cpp:1346
+#: encodingdetector.cpp:1266
 msgid ""
 "_: @item Text character set\n"
 "Korean"
 msgstr "Koreaans"
 
-#: encodingdetector.cpp:1349
+#: encodingdetector.cpp:1269
 msgid ""
 "_: @item Text character set\n"
 "Thai"
 msgstr "Thais"
 
-#: expirejob.cpp:164
+#: expirejob.cpp:177
 msgid ""
 "_n: Removing 1 old message from folder %1...\n"
 "Removing %n old messages from folder %1..."
@@ -3049,13 +3348,13 @@ msgstr ""
 "1 oud bericht wordt uit de map %1 verwijderd...\n"
 "%n oude berichten worden uit de map %1 verwijderd..."
 
-#: expirejob.cpp:171
+#: expirejob.cpp:184
 msgid "Cannot expire messages from folder %1: destination folder %2 not found"
 msgstr ""
 "Kan geen berichten laten verlopen van de map %1: de bestemmingsmap %2 werd niet "
 "gevonden"
 
-#: expirejob.cpp:186
+#: expirejob.cpp:199
 msgid ""
 "_n: Moving 1 old message from folder %1 to folder %2...\n"
 "Moving %n old messages from folder %1 to folder %2..."
@@ -3063,7 +3362,7 @@ msgstr ""
 "1 oud bericht wordt verplaatst van de map %1 naar %2...\n"
 "%n oude berichten worden verplaatst van de map %1 naar %2..."
 
-#: expirejob.cpp:214
+#: expirejob.cpp:227
 msgid ""
 "_n: Removed 1 old message from folder %1.\n"
 "Removed %n old messages from folder %1."
@@ -3071,7 +3370,7 @@ msgstr ""
 "1 oud bericht is uit de map %1 verwijderd.\n"
 "%n oude berichten zijn uit de map %1 verwijderd."
 
-#: expirejob.cpp:220
+#: expirejob.cpp:233
 msgid ""
 "_n: Moved 1 old message from folder %1 to folder %2.\n"
 "Moved %n old messages from folder %1 to folder %2."
@@ -3079,19 +3378,19 @@ msgstr ""
 "1 oud bericht is verplaatst van de map %1 naar %2.\n"
 "%n oude berichten zijn verplaatst van de map %1 naar %2."
 
-#: expirejob.cpp:227
+#: expirejob.cpp:240
 msgid "Removing old messages from folder %1 failed."
 msgstr "Het verwijderen van oude berichten uit de map %1 is mislukt."
 
-#: expirejob.cpp:231
+#: expirejob.cpp:244
 msgid "Moving old messages from folder %1 to folder %2 failed."
 msgstr "Het verplaatsen van oude berichten van de map %1 naar %2 is mislukt."
 
-#: expirejob.cpp:237
+#: expirejob.cpp:250
 msgid "Removing old messages from folder %1 was canceled."
 msgstr "Verwijdering van oude berichten uit de map %1 is geannuleerd."
 
-#: expirejob.cpp:241
+#: expirejob.cpp:254
 msgid "Moving old messages from folder %1 to folder %2 was canceled."
 msgstr "Verplaatsing van oude berichten van de map %1 naar %2 is geannuleerd."
 
@@ -3130,79 +3429,97 @@ msgstr ""
 "Opmerking: De verloophandeling wordt direct toegepast nadat u de instellingen "
 "hebt opgeslagen."
 
-#: expirypropertiesdialog.cpp:163
+#: expirypropertiesdialog.cpp:167
 msgid "Please select a folder to expire messages into."
 msgstr ""
 "Selecteer een map waarnaar de verlopen berichten verplaatst zullen worden."
 
-#: expirypropertiesdialog.cpp:164
+#: expirypropertiesdialog.cpp:168
 msgid "No Folder Selected"
 msgstr "Geen map geselecteerd"
 
+#: expirypropertiesdialog.cpp:176
+#, fuzzy
+msgid ""
+"Please select a different folder than the current folder to expire message "
+"into."
+msgstr ""
+"Selecteer een map waarnaar de verlopen berichten verplaatst zullen worden."
+
+#: expirypropertiesdialog.cpp:178
+#, fuzzy
+msgid "Wrong Folder Selected"
+msgstr "Geen map geselecteerd"
+
 #: favoritefolderview.cpp:90
 msgid "Favorite Folders"
 msgstr "Bladwijzermappen"
 
-#: favoritefolderview.cpp:326
-msgid "Remove From Favorites"
-msgstr "Uit bladwijzers verwijderen"
-
-#: favoritefolderview.cpp:328 favoritefolderview.cpp:378
-msgid "Rename Favorite"
-msgstr "Bladwijzer hernoemen"
-
-#: favoritefolderview.cpp:337 kmfoldertree.cpp:1153 kmmainwidget.cpp:2767
+#: favoritefolderview.cpp:337 kmfoldertree.cpp:1190 kmmainwidget.cpp:2790
 msgid "&Assign Shortcut..."
 msgstr "Snelt&oets toewijzen..."
 
-#: favoritefolderview.cpp:338 kmfoldertree.cpp:1158
+#: favoritefolderview.cpp:338 kmfoldertree.cpp:1195
 msgid "Expire..."
 msgstr "Verlopen..."
 
-#: favoritefolderview.cpp:341
+#: favoritefolderview.cpp:342
+msgid "Remove From Favorites"
+msgstr "Uit bladwijzers verwijderen"
+
+#: favoritefolderview.cpp:344 favoritefolderview.cpp:389
+msgid "Rename Favorite"
+msgstr "Bladwijzer hernoemen"
+
+#: favoritefolderview.cpp:347
 msgid "Add Favorite Folder..."
 msgstr "Bladwijzermap toevoegen..."
 
-#: favoritefolderview.cpp:395
+#: favoritefolderview.cpp:406
 msgid "Local Inbox"
 msgstr "Lokaal postvak"
 
-#: favoritefolderview.cpp:397
+#: favoritefolderview.cpp:408
 #, c-format
 msgid "Inbox of %1"
 msgstr "Postvak in van %1"
 
-#: favoritefolderview.cpp:401
+#: favoritefolderview.cpp:412
 msgid "%1 on %2"
 msgstr "%1 op %2"
 
-#: favoritefolderview.cpp:403
+#: favoritefolderview.cpp:414
 msgid "%1 (local)"
 msgstr "%1 (lokaal)"
 
-#: favoritefolderview.cpp:443
+#: favoritefolderview.cpp:454
 msgid "Add Favorite Folder"
 msgstr "Bladwijzermap toevoegen"
 
-#: filterimporterexporter.cpp:51
+#: filterimporterexporter.cpp:50
 msgid "Select Filters"
 msgstr "Filters selecteren"
 
-#: filterimporterexporter.cpp:58
+#: filterimporterexporter.cpp:61
 msgid "Filters"
 msgstr "Filters"
 
-#: filterimporterexporter.cpp:182
+#: filterimporterexporter.cpp:67
+#, fuzzy
+msgid "Unselect All"
+msgstr "Alle tekst selecteren"
+
+#: filterimporterexporter.cpp:213
 msgid "Import Filters"
 msgstr "Filters importeren"
 
-#: filterimporterexporter.cpp:189
+#: filterimporterexporter.cpp:220
 msgid ""
 "The selected file is not readable. Your file access permissions might be "
 "insufficient."
 msgstr "Het gekozen bestand is onleesbaar. Controleer de bestandspermissies."
 
-#: filterimporterexporter.cpp:204
+#: filterimporterexporter.cpp:235
 msgid "Export Filters"
 msgstr "Filters exporteren"
 
@@ -3282,8 +3599,8 @@ msgstr ""
 "Kon bestand %1 niet schrijven:\n"
 "\"%2\" is de gedetailleerde foutmelding."
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2706 kmcommands.cpp:2730
-#: kmmainwidget.cpp:1795 kmmainwidget.cpp:1812 urlhandlermanager.cpp:489
+#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "KMail - foutmelding"
 
@@ -3332,64 +3649,81 @@ msgstr ""
 "gebruiker. Uw logingegevens van uw account zullen vermelden welke u dient in te "
 "vullen."
 
-#: folderdiaacltab.cpp:106 folderdiaacltab.cpp:341
+#: folderdiaacltab.cpp:103 recipientseditor.cpp:776
+msgid "Se&lect..."
+msgstr "Se&lecteren..."
+
+#: folderdiaacltab.cpp:106 folderdiaacltab.cpp:340
 msgid "Permissions"
 msgstr "Toegangsrechten"
 
-#: folderdiaacltab.cpp:247
+#: folderdiaacltab.cpp:118
+msgid "<b>Note: </b>Renaming requires write permissions on the parent folder."
+msgstr ""
+
+#: folderdiaacltab.cpp:245
 msgid "Custom Permissions"
 msgstr "Aangepaste toegangsrechten"
 
-#: folderdiaacltab.cpp:249
+#: folderdiaacltab.cpp:247
 msgid "Custom Permissions (%1)"
 msgstr "Aangepaste toegangsrechten (%1)"
 
-#: folderdiaacltab.cpp:340
+#: folderdiaacltab.cpp:339
 msgid "User Id"
 msgstr "Gebruikers-id"
 
-#: folderdiaacltab.cpp:352
+#: folderdiaacltab.cpp:351
 msgid "Add Entry..."
 msgstr "Ingang toevoegen..."
 
-#: folderdiaacltab.cpp:353
+#: folderdiaacltab.cpp:352
 msgid "Modify Entry..."
 msgstr "Ingang bewerken..."
 
-#: folderdiaacltab.cpp:354
+#: folderdiaacltab.cpp:353
 msgid "Remove Entry"
 msgstr "Ingang verwijderen"
 
-#: folderdiaacltab.cpp:426
+#: folderdiaacltab.cpp:428
 msgid "Error retrieving user permissions."
 msgstr "Fout bij het ophalen van de gebruikersrechten."
 
-#: folderdiaacltab.cpp:431
-msgid "Information not retrieved from server yet, please use \"Check Mail\"."
+#: folderdiaacltab.cpp:430
+#, fuzzy
+msgid ""
+"You might not have enough permissions to see the permissions of this folder."
+msgstr "U hebt geen lees- of schrijfrechten voor uw prullenbak."
+
+#: folderdiaacltab.cpp:435
+#, fuzzy
+msgid ""
+"Information not retrieved from server, you need to use \"Check Mail\" and have "
+"administrative privileges on the folder."
 msgstr ""
 "Nog geen informatie van de server ontvangen, gebruik a.u.b. \"Berichten "
 "ophalen\"."
 
-#: folderdiaacltab.cpp:446 folderdiaquotatab.cpp:114
+#: folderdiaacltab.cpp:450 folderdiaquotatab.cpp:114
 msgid "Error: no IMAP account defined for this folder"
 msgstr "Fout: Geen IMAP-account aangemaakt voor deze map"
 
-#: folderdiaacltab.cpp:452 folderdiaquotatab.cpp:120
+#: folderdiaacltab.cpp:456 folderdiaquotatab.cpp:120
 msgid "Connecting to server %1, please wait..."
 msgstr "Bezig met verbinden met server %1, even geduld a.u.b..."
 
-#: folderdiaacltab.cpp:470 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:843
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
+#: kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr "Fout bij het verbinden met server %1"
 
-#: folderdiaacltab.cpp:490 folderdiaacltab.cpp:517
+#: folderdiaacltab.cpp:494 folderdiaacltab.cpp:522
 msgid "This IMAP server does not have support for access control lists (ACL)"
 msgstr ""
 "Deze IMAP-server biedt geen ondersteuning voor toegangscontrolelijsten (ACL's)"
 
-#: folderdiaacltab.cpp:519
+#: folderdiaacltab.cpp:524
 #, c-format
 msgid ""
 "Error retrieving access control list (ACL) from server\n"
@@ -3398,15 +3732,15 @@ msgstr ""
 "Fout bij het ophalen van de toegangscontrole (ACL) van de server\n"
 "%1"
 
-#: folderdiaacltab.cpp:564
+#: folderdiaacltab.cpp:569
 msgid "Modify Permissions"
 msgstr "Toegangsrechten bewerken"
 
-#: folderdiaacltab.cpp:598
+#: folderdiaacltab.cpp:603
 msgid "Add Permissions"
 msgstr "Toegangsrechten toevoegen"
 
-#: folderdiaacltab.cpp:631
+#: folderdiaacltab.cpp:636
 msgid ""
 "Do you really want to remove your own permissions for this folder? You will not "
 "be able to access it afterwards."
@@ -3443,8 +3777,8 @@ msgstr "Gebruik:"
 msgid "Select Folder"
 msgstr "Map selecteren"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1831 kmfoldermgr.cpp:45
-#: kmfoldertree.cpp:552
+#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "Lokale mappen"
 
@@ -3475,7 +3809,7 @@ msgstr ""
 "huidige map, klikt u op de onderstaande knop, en drukt u op de toetsen die u "
 "voor die map wilt gebruiken.</qt>"
 
-#: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:526 snippetdlg.cpp:93
+#: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:530 snippetdlg.cpp:100
 msgid "The selected shortcut is already used, please select a different one."
 msgstr "De ingevoerde sneltoets bestaat al, voer een andere sneltoets in."
 
@@ -3491,13 +3825,23 @@ msgstr "Hierheen &kopiëren"
 msgid "C&ancel"
 msgstr "&Annuleren"
 
-#: headeritem.cpp:157 headeritem.cpp:164
+#: folderutil.cpp:93
+msgid ""
+"<qt>The folder you deleted was associated with the account <b>%1</b> "
+"which delivered mail into it. The folder the account delivers new mail into was "
+"reset to the main Inbox folder.</qt>"
+msgstr ""
+"<qt>De map die u hebt verwijderd hoorde bij het account <b>%1</b>"
+", die daar berichten in plaatst. Berichten die op dat account binnenkomen "
+"zullen in het algemene postvak in terecht komen.</qt>"
+
+#: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: headeritem.cpp:171 headerstyle.cpp:140 headerstyle.cpp:238
-#: headerstyle.cpp:442 headerstyle.cpp:625 headerstyle.cpp:778
-#: kmmainwidget.cpp:1057
+#: headeritem.cpp:193 headerstyle.cpp:141 headerstyle.cpp:240
+#: headerstyle.cpp:445 headerstyle.cpp:743 headerstyle.cpp:898
+#: kmmainwidget.cpp:1029
 msgid "No Subject"
 msgstr "Geen onderwerp"
 
@@ -3517,46 +3861,46 @@ msgstr ""
 msgid "Stat&us:"
 msgstr "Stat&us:"
 
-#: headerlistquicksearch.cpp:72
+#: headerlistquicksearch.cpp:73
 msgid "Any Status"
 msgstr "Iedere status"
 
-#: headerlistquicksearch.cpp:91
+#: headerlistquicksearch.cpp:93
 msgid "Open Full Search"
 msgstr "Volledige zoekopdracht openen"
 
-#: headerstyle.cpp:169 headerstyle.cpp:296 headerstyle.cpp:647
-#: headerstyle.cpp:860
+#: headerstyle.cpp:170 headerstyle.cpp:298 headerstyle.cpp:765
+#: headerstyle.cpp:974
 msgid "[vCard]"
 msgstr "[Visitekaartje]"
 
-#: headerstyle.cpp:174 headerstyle.cpp:314 headerstyle.cpp:672
-#: headerstyle.cpp:797
+#: headerstyle.cpp:175 headerstyle.cpp:316 headerstyle.cpp:790
+#: headerstyle.cpp:998
 msgid "CC: "
 msgstr "CC: "
 
-#: headerstyle.cpp:177 headerstyle.cpp:318 headerstyle.cpp:679
-#: headerstyle.cpp:800
+#: headerstyle.cpp:178 headerstyle.cpp:320 headerstyle.cpp:797
+#: headerstyle.cpp:1008
 msgid "BCC: "
 msgstr "BCC: "
 
-#: headerstyle.cpp:272 headerstyle.cpp:685
+#: headerstyle.cpp:274 headerstyle.cpp:803
 msgid "Date: "
 msgstr "Datum: "
 
-#: headerstyle.cpp:292 headerstyle.cpp:639 headerstyle.cpp:865
+#: headerstyle.cpp:294 headerstyle.cpp:757 headerstyle.cpp:979
 msgid "From: "
 msgstr "Van: "
 
-#: headerstyle.cpp:310 headerstyle.cpp:665 headerstyle.cpp:873
+#: headerstyle.cpp:312 headerstyle.cpp:783 headerstyle.cpp:988
 msgid "To: "
 msgstr "Aan: "
 
-#: headerstyle.cpp:322
+#: headerstyle.cpp:324
 msgid "Reply to: "
 msgstr "Beantwoorden aan: "
 
-#: headerstyle.cpp:408
+#: headerstyle.cpp:410
 msgid ""
 "%1% probability of being spam.\n"
 "\n"
@@ -3568,23 +3912,45 @@ msgstr ""
 "Volledig rapport:\n"
 "%2"
 
-#: headerstyle.cpp:609
+#: headerstyle.cpp:612
 msgid "Launch IM"
 msgstr "Instant messenger starten"
 
-#: headerstyle.cpp:642
+#: headerstyle.cpp:660
+msgid "Night"
+msgstr ""
+
+#: headerstyle.cpp:669
+#, fuzzy
+msgid "Morning"
+msgstr "Waarschuwingen"
+
+#: headerstyle.cpp:678
+msgid "Afternoon"
+msgstr ""
+
+#: headerstyle.cpp:687
+msgid "Evening"
+msgstr ""
+
+#: headerstyle.cpp:724
+#, fuzzy
+msgid "Sender's Current Time:"
+msgstr "Identiteit van af&zender:"
+
+#: headerstyle.cpp:760
 msgid "(resent from %1)"
 msgstr "(opnieuw verzonden door %1)"
 
-#: headerstyle.cpp:694
+#: headerstyle.cpp:812
 msgid "User-Agent: "
 msgstr "Gebruikersagent: "
 
-#: headerstyle.cpp:703
+#: headerstyle.cpp:821
 msgid "X-Mailer: "
 msgstr "X-Mailer: "
 
-#: headerstyle.cpp:723
+#: headerstyle.cpp:843
 msgid "Spam Status:"
 msgstr "Spamstatus:"
 
@@ -3656,15 +4022,15 @@ msgstr ""
 "<br>h"
 "<br>t</qt>"
 
-#: identitydialog.cpp:90
+#: identitydialog.cpp:93
 msgid "Edit Identity"
 msgstr "Identiteit bewerken"
 
-#: identitydialog.cpp:118
+#: identitydialog.cpp:121
 msgid "&Your name:"
 msgstr "N&aam:"
 
-#: identitydialog.cpp:120
+#: identitydialog.cpp:123
 msgid ""
 "<qt>"
 "<h3>Your name</h3>"
@@ -3680,11 +4046,11 @@ msgstr ""
 "<p>Als u dit veld leeglaat, dan zal uw echte naam niet verschijnen, maar alleen "
 "het e-mailadres.</p></qt>"
 
-#: identitydialog.cpp:132
+#: identitydialog.cpp:135
 msgid "Organi&zation:"
 msgstr "Organi&satie:"
 
-#: identitydialog.cpp:134
+#: identitydialog.cpp:137
 msgid ""
 "<qt>"
 "<h3>Organization</h3>"
@@ -3698,15 +4064,19 @@ msgstr ""
 "kop van de berichten die u verzendt.</p> "
 "<p>Normaliter laat u dit veld leeg.</p></qt>"
 
-#: identitydialog.cpp:147
+#: identitydialog.cpp:149
 msgid "&Email address:"
 msgstr "&E-mailadres:"
 
-#: identitydialog.cpp:149
+#: identitydialog.cpp:151
+#, fuzzy
 msgid ""
 "<qt>"
 "<h3>Email address</h3>"
-"<p>This field should have your full email address.</p>"
+"<p>This field should have your full email address</p>"
+"<p>This address is the primary one, used for all outgoing mail. If you have "
+"more than one address, either create a new identity, or add additional alias "
+"addresses in the field below.</p>"
 "<p>If you leave this blank, or get it wrong, people will have trouble replying "
 "to you.</p></qt>"
 msgstr ""
@@ -3716,25 +4086,49 @@ msgstr ""
 "<p>Als u dit veld leeg laat, of er een onjuist e-mailadres inzet, dan kunnen de "
 "personen aan wie u een e-mail stuurt deze niet beantwoorden.</p></qt>"
 
-#: identitydialog.cpp:161
+#: identitydialog.cpp:165
+#, fuzzy
+msgid "Email a&liases:"
+msgstr "&E-mailadres:"
+
+#: identitydialog.cpp:167
+msgid ""
+"<qt>"
+"<h3>Email aliases</h3>"
+"<p>This field contains alias addresses that should also be considered as "
+"belonging to this identity (as opposed to representing a different "
+"identity).</p>"
+"<p>Example:</p>"
+"<table>"
+"<tr>"
+"<th>Primary address:</th>"
+"<td>first.last@example.org</td></tr>"
+"<tr>"
+"<th>Aliases:</th>"
+"<td>first@example.org"
+"<br>last@example.org</td></tr></table>"
+"<p>Type one alias address per line.</p></qt>"
+msgstr ""
+
+#: identitydialog.cpp:185
 msgid "Cryptograph&y"
 msgstr "Cryptografi&e"
 
-#: identitydialog.cpp:168 identitydialog.cpp:192 identitydialog.cpp:217
-#: identitydialog.cpp:243
+#: identitydialog.cpp:192 identitydialog.cpp:216 identitydialog.cpp:241
+#: identitydialog.cpp:267
 msgid "Chang&e..."
 msgstr "Wijzig&en..."
 
-#: identitydialog.cpp:169
+#: identitydialog.cpp:193
 msgid "Your OpenPGP Signature Key"
 msgstr "Uw OpenPGP-ondertekeningssleutel"
 
-#: identitydialog.cpp:170
+#: identitydialog.cpp:194
 msgid ""
 "Select the OpenPGP key which should be used to digitally sign your messages."
 msgstr "Kies een OpenPGP-sleutel waarmee u uw berichten wilt ondertekenen."
 
-#: identitydialog.cpp:174
+#: identitydialog.cpp:198
 msgid ""
 "<qt>"
 "<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
@@ -3752,15 +4146,15 @@ msgstr ""
 "ondervinden.</p>"
 "<p>U vindt meer informatie over sleutels op <a>http://www.gnupg.org</a></p></qt>"
 
-#: identitydialog.cpp:181
+#: identitydialog.cpp:205
 msgid "OpenPGP signing key:"
 msgstr "OpenPGP-ondertekeningssleutel:"
 
-#: identitydialog.cpp:193
+#: identitydialog.cpp:217
 msgid "Your OpenPGP Encryption Key"
 msgstr "Uw OpenPGP-sleutel voor versleuteling"
 
-#: identitydialog.cpp:194
+#: identitydialog.cpp:218
 msgid ""
 "Select the OpenPGP key which should be used when encrypting to yourself and for "
 "the \"Attach My Public Key\" feature in the composer."
@@ -3768,7 +4162,7 @@ msgstr ""
 "Selecteer de OpenPGP-sleutel waarmee u voor uzelf versleutelt en voor de optie "
 "\"Mijn publieke sleutel bijvoegen\" tijdens het opstellen van een bericht."
 
-#: identitydialog.cpp:199
+#: identitydialog.cpp:223
 msgid ""
 "<qt>"
 "<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
@@ -3789,15 +4183,15 @@ msgstr ""
 "hinder van ondervinden.</p>"
 "<p>U vindt meer informatie over sleutels op <a>http://www.gnupg.org</a></p></qt>"
 
-#: identitydialog.cpp:206
+#: identitydialog.cpp:230
 msgid "OpenPGP encryption key:"
 msgstr "OpenPGP-versleutelingssleutel:"
 
-#: identitydialog.cpp:218
+#: identitydialog.cpp:242
 msgid "Your S/MIME Signature Certificate"
 msgstr "Uw S/MIME-handtekeningcertificaat"
 
-#: identitydialog.cpp:219
+#: identitydialog.cpp:243
 msgid ""
 "Select the S/MIME certificate which should be used to digitally sign your "
 "messages."
@@ -3805,7 +4199,7 @@ msgstr ""
 "Selecteer het S/MIME-certificaat waarmee u uw berichten digitaal wilt "
 "ondertekenen."
 
-#: identitydialog.cpp:223
+#: identitydialog.cpp:247
 msgid ""
 "<qt>"
 "<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
@@ -3820,15 +4214,15 @@ msgstr ""
 "ondertekenen. Normale e-mailfuncties zullen hier geen hinder van "
 "ondervinden.</p></qt>"
 
-#: identitydialog.cpp:228
+#: identitydialog.cpp:252
 msgid "S/MIME signing certificate:"
 msgstr "S/MIME-ondertekeningscertificaat:"
 
-#: identitydialog.cpp:244
+#: identitydialog.cpp:268
 msgid "Your S/MIME Encryption Certificate"
 msgstr "Uw S/MIME-versleutelingscertificaat"
 
-#: identitydialog.cpp:245
+#: identitydialog.cpp:269
 msgid ""
 "Select the S/MIME certificate which should be used when encrypting to yourself "
 "and for the \"Attach My Certificate\" feature in the composer."
@@ -3837,7 +4231,7 @@ msgstr ""
 "versleutelen en voor de optie \"Mijn certificaat bijvoegen\" tijdens het "
 "opstellen van een bericht."
 
-#: identitydialog.cpp:250
+#: identitydialog.cpp:274
 msgid ""
 "<qt>"
 "<p>The S/MIME certificate you choose here will be used to encrypt messages to "
@@ -3854,23 +4248,23 @@ msgstr ""
 "de uitgaande berichten naar uzelf te versleutelen met S/MIME. Dit heeft geen "
 "invloed op de overige e-mailfuncties.</p></qt>"
 
-#: identitydialog.cpp:256
+#: identitydialog.cpp:280
 msgid "S/MIME encryption certificate:"
 msgstr "S/MIME-versleutelingscertificaat:"
 
-#: identitydialog.cpp:277
+#: identitydialog.cpp:301
 msgid "Preferred crypto message format:"
 msgstr "Voorkeursformaat berichtversleuteling:"
 
-#: identitydialog.cpp:290
+#: identitydialog.cpp:314
 msgid "&Advanced"
 msgstr "Ge&avanceerd"
 
-#: identitydialog.cpp:300
+#: identitydialog.cpp:324
 msgid "&Reply-To address:"
 msgstr "Antwoo&rdadres:"
 
-#: identitydialog.cpp:302
+#: identitydialog.cpp:326
 msgid ""
 "<qt>"
 "<h3>Reply-To addresses</h3>"
@@ -3891,11 +4285,11 @@ msgstr ""
 "groeps-e-mailadres wordt gestuurd.</p> "
 "<p>Als u twijfelt, laat dan dit veld leeg.</p></qt>"
 
-#: identitydialog.cpp:319
+#: identitydialog.cpp:343
 msgid "&BCC addresses:"
 msgstr "&BCC-adres:"
 
-#: identitydialog.cpp:321
+#: identitydialog.cpp:345
 msgid ""
 "<qt>"
 "<h3>BCC (Blind Carbon Copy) addresses</h3>"
@@ -3918,47 +4312,52 @@ msgstr ""
 "gescheiden door een komma.</p>"
 "<p>Als u twijfelt, laat dit veld dan leeg.</p></qt>"
 
-#: identitydialog.cpp:337
+#: identitydialog.cpp:361
 msgid "D&ictionary:"
 msgstr "W&oordenboek:"
 
-#: identitydialog.cpp:346
+#: identitydialog.cpp:370
 msgid "Sent-mail &folder:"
 msgstr "Map voor verzonden berich&ten:"
 
-#: identitydialog.cpp:355
+#: identitydialog.cpp:379
 msgid "&Drafts folder:"
 msgstr "&Map voor concepten:"
 
-#: identitydialog.cpp:364
+#: identitydialog.cpp:388
 msgid "&Templates folder:"
 msgstr "Sja&bloonmap:"
 
-#: identitydialog.cpp:369
+#: identitydialog.cpp:393
 msgid "Special &transport:"
 msgstr "Spe&ciaal transport:"
 
-#: identitydialog.cpp:386 kmfolderdia.cpp:717
+#: identitydialog.cpp:410 kmfolderdia.cpp:808
 msgid "&Use custom message templates"
 msgstr "Aangepaste berichtsjablonen gebr&uiken"
 
-#: identitydialog.cpp:392 kmfolderdia.cpp:725
+#: identitydialog.cpp:416 kmfolderdia.cpp:816
 msgid "&Copy global templates"
 msgstr "Globale sjablonen &kopiëren"
 
-#: identitydialog.cpp:407
+#: identitydialog.cpp:431
 msgid "&Signature"
 msgstr "Onderte&kening"
 
-#: identitydialog.cpp:411
+#: identitydialog.cpp:435
 msgid "&Picture"
 msgstr "Af&beelding"
 
-#: identitydialog.cpp:486 identitydialog.cpp:498 kmcomposewin.cpp:4004
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
 msgid "Invalid Email Address"
 msgstr "Ongeldig e-mailadres"
 
-#: identitydialog.cpp:518
+#: identitydialog.cpp:530
+#, fuzzy
+msgid "Invalid Email Alias \"%1\""
+msgstr "Ongeldig e-mailadres"
+
+#: identitydialog.cpp:551
 msgid ""
 "One of the configured OpenPGP signing keys does not contain any user ID with "
 "the configured email address for this identity (%1).\n"
@@ -3970,7 +4369,7 @@ msgstr ""
 "Dit kan leiden tot waarschuwingen wanneer u probeert om handtekeningen te "
 "verifiëren met deze instellingen."
 
-#: identitydialog.cpp:527
+#: identitydialog.cpp:560
 msgid ""
 "One of the configured OpenPGP encryption keys does not contain any user ID with "
 "the configured email address for this identity (%1)."
@@ -3978,7 +4377,7 @@ msgstr ""
 "Eén van de ingestelde OpenPGP-sleutels voor versleuteling bevat geen "
 "gebruikers-id met een e-mailadres voor deze identiteit (%1)."
 
-#: identitydialog.cpp:534
+#: identitydialog.cpp:567
 msgid ""
 "One of the configured S/MIME signing certificates does not contain the "
 "configured email address for this identity (%1).\n"
@@ -3990,7 +4389,7 @@ msgstr ""
 "Dit kan leiden tot waarschuwingen wanneer u probeert om handtekeningen te "
 "verifiëren met deze instellingen."
 
-#: identitydialog.cpp:543
+#: identitydialog.cpp:576
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
 "configured email address for this identity (%1)."
@@ -3998,19 +4397,19 @@ msgstr ""
 "Eén van de ingestelde S/MIME-versleutelingscertificaten bevat geen "
 "gebruikers-id met een e-mailadres voor deze identiteit (%1)."
 
-#: identitydialog.cpp:551
+#: identitydialog.cpp:584
 msgid "Email Address Not Found in Key/Certificates"
 msgstr "E-mailadres werd niet gevonden in de sleutels/certificaten"
 
-#: identitydialog.cpp:562
+#: identitydialog.cpp:595
 msgid "The signature file is not valid"
 msgstr "Het handtekeningsbestand is ongeldig"
 
-#: identitydialog.cpp:582
+#: identitydialog.cpp:615
 msgid "Edit Identity \"%1\""
 msgstr "Identiteit \"%1\" bewerken"
 
-#: identitydialog.cpp:606
+#: identitydialog.cpp:640
 msgid ""
 "The custom sent-mail folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default sent-mail folder will be used."
@@ -4019,7 +4418,7 @@ msgstr ""
 "(meer). In plaats daarvan zal de standaardmap voor verzonden berichten worden "
 "gebruikt."
 
-#: identitydialog.cpp:617
+#: identitydialog.cpp:651
 msgid ""
 "The custom drafts folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default drafts folder will be used."
@@ -4027,7 +4426,7 @@ msgstr ""
 "De aangepaste conceptenmap voor identiteit \"%1\" bestaat niet (meer). In "
 "plaats daarvan zal de standaard conceptenmap worden gebruikt."
 
-#: identitydialog.cpp:628
+#: identitydialog.cpp:662
 msgid ""
 "The custom templates folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default templates folder will be used."
@@ -4050,33 +4449,33 @@ msgstr "Identiteit"
 msgid "Email Address"
 msgstr "E-mailadres"
 
-#: imapaccountbase.cpp:291 popaccount.cpp:154
+#: imapaccountbase.cpp:293 popaccount.cpp:154
 msgid "You need to supply a username and a password to access this mailbox."
 msgstr ""
 "U moet een gebruikersnaam en wachtwoord opgeven voor toegang tot deze postbus."
 
-#: imapaccountbase.cpp:296
+#: imapaccountbase.cpp:298
 msgid "Authorization Dialog"
 msgstr "Autorisatiedialoog"
 
-#: imapaccountbase.cpp:297 popaccount.cpp:155
+#: imapaccountbase.cpp:299 popaccount.cpp:155
 msgid "Account:"
 msgstr "Account:"
 
-#: imapaccountbase.cpp:318
+#: imapaccountbase.cpp:320
 #, c-format
 msgid "Could not start process for %1."
 msgstr "Er kon geen proces worden gestart voor %1."
 
-#: imapaccountbase.cpp:399
+#: imapaccountbase.cpp:403
 msgid "Error while trying to subscribe to %1:"
 msgstr "Fout bij inschrijven bij %1:"
 
-#: imapaccountbase.cpp:637
+#: imapaccountbase.cpp:645
 msgid "Retrieving Namespaces"
 msgstr "Namespaces worden opgehaald"
 
-#: imapaccountbase.cpp:728
+#: imapaccountbase.cpp:736
 msgid ""
 "KMail has detected a prefix entry in the configuration of the account \"%1\" "
 "which is obsolete with the support of IMAP namespaces."
@@ -4084,7 +4483,7 @@ msgstr ""
 "KMail heeft een voorvoegsel gevonden in de instellingen van account \"%1\". Dit "
 "is overbodig met de ondersteuning voor IMAP-namespaces."
 
-#: imapaccountbase.cpp:742 imapaccountbase.cpp:756
+#: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
 "The configuration was automatically migrated but you should check your account "
 "configuration."
@@ -4092,7 +4491,7 @@ msgstr ""
 "De instellingen zijn automatisch overgezet maar u dient uw accountinstellingen "
 "alsnog te controleren."
 
-#: imapaccountbase.cpp:760
+#: imapaccountbase.cpp:768
 msgid ""
 "It was not possible to migrate your configuration automatically so please check "
 "your account configuration."
@@ -4100,15 +4499,15 @@ msgstr ""
 "Het was niet mogelijk om uw instellingen automatisch over te zetten dus "
 "controleer uw accountinstellingen."
 
-#: imapaccountbase.cpp:874 imapaccountbase.cpp:875
+#: imapaccountbase.cpp:882 imapaccountbase.cpp:883
 msgid "<unknown>"
 msgstr "<onbekend>"
 
-#: imapaccountbase.cpp:876
+#: imapaccountbase.cpp:884
 msgid "Error while uploading message"
 msgstr "Fout tijdens het verzenden van het bericht"
 
-#: imapaccountbase.cpp:878
+#: imapaccountbase.cpp:886
 msgid ""
 "Could not upload the message dated %1 from <i>%2</i> with subject <i>%3</i> "
 "to the server."
@@ -4116,23 +4515,23 @@ msgstr ""
 "Kon het bericht van <i>%2</i> met de datum %1 en het onderwerp <i>%3</i> "
 "niet verzenden naar de server."
 
-#: imapaccountbase.cpp:880
+#: imapaccountbase.cpp:888
 msgid "The destination folder was: <b>%1</b>."
 msgstr "De bestemmingsmap was: <b>%1</b>."
 
-#: imapaccountbase.cpp:882
+#: imapaccountbase.cpp:890
 msgid "The server reported:"
 msgstr "De server rapporteerde:"
 
-#: imapaccountbase.cpp:892
+#: imapaccountbase.cpp:900
 msgid "No detailed quota information available."
 msgstr "Geen gedetailleerde quota-informatie beschikbaar."
 
-#: imapaccountbase.cpp:903
+#: imapaccountbase.cpp:911
 msgid "The folder is too close to its quota limit. (%1)"
 msgstr "De map ligt tegen het quotum aan. (%1)"
 
-#: imapaccountbase.cpp:905
+#: imapaccountbase.cpp:913
 msgid ""
 "\n"
 "Since you do not have write privileges on this folder, please ask the owner of "
@@ -4142,7 +4541,7 @@ msgstr ""
 "Omdat u geen schrijfrechten heeft voor deze map, kunt u de eigenaar van de map "
 "vragen om wat ruimte vrij te maken."
 
-#: imapaccountbase.cpp:951
+#: imapaccountbase.cpp:959
 msgid ""
 "The connection to the server %1 was unexpectedly closed or timed out. It will "
 "be re-established automatically if possible."
@@ -4150,25 +4549,25 @@ msgstr ""
 "De verbinding met de server %1 was onverwacht verbroken. Dit zal automatisch "
 "opnieuw opgezet worden indien mogelijk."
 
-#: imapaccountbase.cpp:957
+#: imapaccountbase.cpp:965
 msgid "The connection to account %1 was broken."
 msgstr "De verbinding met account %1 werd onderbroken."
 
-#: imapaccountbase.cpp:960
+#: imapaccountbase.cpp:968
 msgid "The connection to account %1 timed out."
 msgstr "De verbinding met account %1 is verlopen."
 
-#: imapaccountbase.cpp:1245
+#: imapaccountbase.cpp:1253
 msgid "Error while uploading status of messages to server: "
 msgstr ""
 "Er deed zich een fout voor tijdens het verzenden van de berichtstatussen naar "
 "de server: "
 
-#: imapaccountbase.cpp:1290 listjob.cpp:118
+#: imapaccountbase.cpp:1298 listjob.cpp:118
 msgid "retrieving folders"
 msgstr "mappen ophalen"
 
-#: imapjob.cpp:153 kmfolderimap.cpp:496
+#: imapjob.cpp:153 kmfolderimap.cpp:490
 msgid "Uploading message data"
 msgstr "Berichtgegevens worden verzonden"
 
@@ -4192,25 +4591,115 @@ msgstr "Bericht met onderwerp: "
 msgid "Error while retrieving messages from the server."
 msgstr "Fout bij het ophalen van berichten van de server."
 
-#: imapjob.cpp:483
+#: imapjob.cpp:485
 msgid "Error while retrieving information on the structure of a message."
 msgstr ""
 "Er deed zich een fout voor tijdens het ophalen van de berichtstructuur van het "
 "bericht."
 
-#: imapjob.cpp:541
+#: imapjob.cpp:543
 msgid "Uploading message data failed."
 msgstr "Het verzenden van berichtgegevens is mislukt."
 
-#: imapjob.cpp:546
+#: imapjob.cpp:548
 msgid "Uploading message data completed."
 msgstr "Het verzenden van berichtgegevens is voltooid."
 
-#: imapjob.cpp:650
+#: imapjob.cpp:652
 msgid "Error while copying messages."
 msgstr "Fout tijdens het kopiëren van de berichten."
 
-#: keyresolver.cpp:234
+#: importarchivedialog.cpp:36
+#, fuzzy
+msgid "Import Archive"
+msgstr "Lijstarchieven"
+
+#: importarchivedialog.cpp:87
+msgid "Please select an archive file that should be imported."
+msgstr ""
+
+#: importarchivedialog.cpp:88
+#, fuzzy
+msgid "No archive file selected"
+msgstr "Geen map geselecteerd"
+
+#: importarchivedialog.cpp:93
+#, fuzzy
+msgid "Please select the folder where the archive should be imported to."
+msgstr ""
+"Selecteer een map waarnaar de verlopen berichten verplaatst zullen worden."
+
+#: importarchivedialog.cpp:94
+#, fuzzy
+msgid "No target folder selected"
+msgstr "Geen map geselecteerd"
+
+#: importjob.cpp:80
+msgid "Importing the archive file '%1' into the folder '%2' succeeded."
+msgstr ""
+
+#: importjob.cpp:82
+#, fuzzy, c-format
+msgid ""
+"_n: 1 message was imported.\n"
+"%n messages were imported."
+msgstr ""
+"1 nieuwe geheime sleutel werd geïmporteerd.\n"
+"%n nieuwe geheime sleutels werden geïmporteerd."
+
+#: importjob.cpp:83
+#, fuzzy
+msgid "Import finished."
+msgstr "Filters importeren"
+
+#: importjob.cpp:98
+#, fuzzy
+msgid "Failed to import the archive into folder '%1'."
+msgstr "De map kon niet worden aangemaakt"
+
+#: importjob.cpp:105
+#, fuzzy
+msgid "Importing archive failed."
+msgstr "Het bufferbestand wordt bijgewerkt"
+
+#: importjob.cpp:114 importjob.cpp:287
+#, fuzzy
+msgid "Unable to create subfolder for folder '%1'."
+msgstr "De map kon niet worden aangemaakt"
+
+#: importjob.cpp:214
+#, fuzzy, c-format
+msgid "Importing folder %1"
+msgstr "Map wordt verwijderd"
+
+#: importjob.cpp:234
+#, fuzzy
+msgid "Failed to add a message to the folder '%1'."
+msgstr "Kan het bericht niet toevoegen aan deze map: "
+
+#: importjob.cpp:254
+#, fuzzy
+msgid "Failed to upload a message to the IMAP server."
+msgstr "Ontvangen berichten op de ser&ver laten staan"
+
+#: importjob.cpp:337
+msgid "Unexpected subdirectory named '%1'."
+msgstr ""
+
+#: importjob.cpp:371
+msgid "The file '%1' does not appear to be a valid archive."
+msgstr ""
+
+#: importjob.cpp:376
+msgid "Unable to open archive file '%1'"
+msgstr ""
+
+#: importjob.cpp:382
+#, fuzzy
+msgid "Importing Archive"
+msgstr "Lijstarchieven"
+
+#: keyresolver.cpp:306
 msgid ""
 "One or more of your configured OpenPGP encryption keys or S/MIME certificates "
 "is not fully trusted for encryption."
@@ -4218,7 +4707,16 @@ msgstr ""
 "Eén of meer ingestelde OpenPGP-versleutelingssleutels of S/MIME-certificaten "
 "zijn niet volledig vertrouwd voor versleuteling."
 
-#: keyresolver.cpp:240
+#: keyresolver.cpp:309
+#, fuzzy
+msgid ""
+"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
+"\"%1\" is not fully trusted for encryption."
+msgstr ""
+"Eén of meer ingestelde OpenPGP-versleutelingssleutels of S/MIME-certificaten "
+"zijn niet volledig vertrouwd voor versleuteling."
+
+#: keyresolver.cpp:315
 msgid ""
 "\n"
 "The following keys are only marginally trusted: \n"
@@ -4226,7 +4724,7 @@ msgstr ""
 "\n"
 "De volgende sleutels worden deels vertrouwd: \n"
 
-#: keyresolver.cpp:244
+#: keyresolver.cpp:319
 msgid ""
 "\n"
 "The following keys or certificates have unknown trust level: \n"
@@ -4234,11 +4732,244 @@ msgstr ""
 "\n"
 "De volgende sleutels of certificaten hebben een onbekende vertrouwenswaarde: \n"
 
-#: keyresolver.cpp:248
+#: keyresolver.cpp:323
+#, fuzzy
+msgid ""
+"\n"
+"The following keys or certificates are <b>revoked</b>: \n"
+msgstr ""
+"\n"
+"De volgende sleutels of certificaten hebben een onbekende vertrouwenswaarde: \n"
+
+#: keyresolver.cpp:327
 msgid "Not Fully Trusted Encryption Keys"
 msgstr "Onbruikbare sleutels voor versleuteling"
 
-#: keyresolver.cpp:553
+#: keyresolver.cpp:642
+#, fuzzy
+msgid ""
+"_n: "
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
+"<p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
+"<p>expired %n days ago.</p>"
+msgstr ""
+"<p>Uw OpenPGP-sleutel </p><p align=center><b>%1</b> (sleutel-id 0x%2)</p>"
+"<p> voor ondertekening verloopt binnen één dag.</p>\n"
+"<p>Uw OpenPGP-sleutel </p><p align=center><b>%1</b> (sleutel-id 0x%2)</p>"
+"<p> voor ondertekening verloopt binnen %n dagen.</p>"
+
+#: keyresolver.cpp:647
+#, fuzzy
+msgid ""
+"_n: "
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
+"<p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
+"<p>expired %n days ago.</p>"
+msgstr ""
+"<p>Uw OpenPGP-sleutel </p><p align=center><b>%1</b> (sleutel-id 0x%2)</p>"
+"<p> voor versleuteling verloopt binnen één dag.</p>\n"
+"<p>Uw OpenPGP-sleutel </p><p align=center><b>%1</b> (sleutel-id 0x%2)</p>"
+"<p> voor versleuteling verloopt binnen %n dagen.</p>"
+
+#: keyresolver.cpp:652
+#, fuzzy
+msgid ""
+"_n: "
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
+"<p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
+"<p>expired %n days ago.</p>"
+msgstr ""
+"<p>Uw OpenPGP-sleutel </p><p align=center><b>%1</b> (sleutel-id 0x%2)</p>"
+"<p> verloopt binnen één dag.</p>\n"
+"<p>Uw OpenPGP-sleutel </p><p align=center><b>%1</b> (sleutel-id 0x%2)</p>"
+"<p> verloopt binnen %n dagen.</p>"
+
+#: keyresolver.cpp:662
+#, fuzzy
+msgid ""
+"_n: "
+"<p>The root certificate</p><p align=center><b>%3</b></p>"
+"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p>"
+"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired %n days ago.</p>"
+msgstr ""
+"<p>Het hoofdcertificaat</p><p align=center><b>%3</b></p> "
+"<p>voor uw S/MIME-ondertekeningscertificaat</p><p align=center><b>%1</b> "
+"(serienummer %2)</p>"
+"<p>verloopt binnen één dag.</p>\n"
+"<p>Het hoofdcertificaat</p><p align=center><b>%3</b></p> "
+"<p>voor uw S/MIME-ondertekeningscertificaat</p><p align=center><b>%1</b> "
+"(serienummer %2)</p>"
+"<p>verloopt binnen %n dagen.</p>"
+
+#: keyresolver.cpp:669
+#, fuzzy
+msgid ""
+"_n: "
+"<p>The root certificate</p><p align=center><b>%3</b></p>"
+"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p>"
+"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired %n days ago.</p>"
+msgstr ""
+"<p>Het hoofdcertificaat</p><p align=center><b>%3</b></p> "
+"<p>voor uw S/MIME-versleutelingscertificaat</p><p align=center><b>%1</b> "
+"(serienummer %2)</p>"
+"<p>verloopt binnen één dag.</p>\n"
+"<p>Het hoofdcertificaat</p><p align=center><b>%3</b></p> "
+"<p>voor uw S/MIME-versleutelingscertificaat</p><p align=center><b>%1</b> "
+"(serienummer %2)</p>"
+"<p>verloopt binnen %n dagen.</p>"
+
+#: keyresolver.cpp:676
+#, fuzzy
+msgid ""
+"_n: "
+"<p>The root certificate</p><p align=center><b>%3</b></p>"
+"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
+"<p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p>"
+"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
+"<p>expired %n days ago.</p>"
+msgstr ""
+"<p>Het hoofdcertificaat</p><p align=center><b>%3</b></p> "
+"<p>voor uw S/MIME-certificaat</p><p align=center><b>%1</b> (serienummer %2)</p>"
+"<p>verloopt binnen één dag.</p>\n"
+"<p>Het hoofdcertificaat</p><p align=center><b>%3</b></p> "
+"<p>voor uw S/MIME-certificaat</p><p align=center><b>%1</b> (serienummer %2)</p>"
+"<p>verloopt binnen %n dagen.</p>"
+
+#: keyresolver.cpp:684
+#, fuzzy
+msgid ""
+"_n: "
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
+"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
+"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired %n days ago.</p>"
+msgstr ""
+"<p>Het tijdelijke CA-certificaat</p><p align=center><b>%3</b></p> "
+"<p>voor uw S/MIME-certificaat voor ondertekening</p><p align=center><b>%1</b> "
+"(serienummer %2)</p>"
+"<p>verloopt binnen één dag.</p>\n"
+"<p>Het tijdelijke CA-certificaat</p><p align=center><b>%3</b></p> "
+"<p>voor uw S/MIME-certificaat voor ondertekening</p><p align=center><b>%1</b> "
+"(serienummer %2)</p>"
+"<p>verloopt binnen %n dagen.</p>"
+
+#: keyresolver.cpp:691
+#, fuzzy
+msgid ""
+"_n: "
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
+"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
+"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired %n days ago.</p>"
+msgstr ""
+"<p>Het tijdelijke CA-certificaat</p><p align=center><b>%3</b></p> "
+"<p>voor uw S/MIME-versleutelingscertificaat</p><p align=center><b>%1</b> "
+"(serienummer %2)</p>"
+"<p>verloopt binnen één dag.</p>\n"
+"<p>Het tijdelijke CA-certificaat</p><p align=center><b>%3</b></p> "
+"<p>voor uw S/MIME-versleutelingscertificaat</p><p align=center><b>%1</b> "
+"(serienummer %2)</p>"
+"<p>verloopt binnen %n dagen.</p>"
+
+#: keyresolver.cpp:698
+#, fuzzy
+msgid ""
+"_n: "
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
+"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
+"<p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
+"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
+"<p>expired %n days ago.</p>"
+msgstr ""
+"<p>Het tijdelijke CA-certificaat</p><p align=center><b>%3</b></p> "
+"<p>voor uw S/MIME-certificaat</p><p align=center><b>%1</b> (serienummer %2)</p>"
+"<p>verloopt binnen één dag.</p>\n"
+"<p>Het tijdelijke CA-certificaat</p><p align=center><b>%3</b></p> "
+"<p>voor uw S/MIME-certificaat</p><p align=center><b>%1</b> (serienummer %2)</p>"
+"<p>verloopt binnen %n dagen.</p>"
+
+#: keyresolver.cpp:707
+#, fuzzy
+msgid ""
+"_n: "
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired %n days ago.</p>"
+msgstr ""
+"<p>Uw S/MIME-certificaat </p><p align=center><b>%1</b> (serienummer %2)</p>"
+"<p> voor ondertekening verloopt binnen één dag.</p>\n"
+"<p>Uw S/MIME-certificaat </p><p align=center><b>%1</b> (serienummer %2)</p>"
+"<p> voor ondertekening verloopt binnen %n dagen.</p>"
+
+#: keyresolver.cpp:712
+#, fuzzy
+msgid ""
+"_n: "
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired %n days ago.</p>"
+msgstr ""
+"<p>Uw S/MIME-certificaat </p><p align=center><b>%1</b> (serienummer %2)</p>"
+"<p> voor versleuteling verloopt binnen één dag.</p>\n"
+"<p>Uw S/MIME-certificaat </p><p align=center><b>%1</b> (serienummer %2)</p>"
+"<p> voor versleuteling verloopt binnen %n dagen.</p>"
+
+#: keyresolver.cpp:717
+#, fuzzy
+msgid ""
+"_n: "
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired %n days ago.</p>"
+msgstr ""
+"<p>Uw S/MIME-certificaat </p><p align=center><b>%1</b> (serienummer %2)</p>"
+"<p> verloopt binnen één dag.</p>\n"
+"<p>Uw S/MIME-certificaat </p><p align=center><b>%1</b> (serienummer %2)</p>"
+"<p> verloopt binnen %n dagen.</p>"
+
+#: keyresolver.cpp:724
+#, fuzzy
+msgid "OpenPGP Key Expired"
+msgstr "OpenPGP-sleutel verloopt binnenkort"
+
+#: keyresolver.cpp:725
+#, fuzzy
+msgid "S/MIME Certificate Expired"
+msgstr "S/MIME-certificaat zal binnenkort verlopen"
+
+#: keyresolver.cpp:750
 msgid ""
 "_n: "
 "<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
@@ -4251,7 +4982,7 @@ msgstr ""
 "<p>Uw OpenPGP-sleutel </p><p align=center><b>%1</b> (sleutel-id 0x%2)</p>"
 "<p> voor ondertekening verloopt binnen %n dagen.</p>"
 
-#: keyresolver.cpp:558
+#: keyresolver.cpp:755
 msgid ""
 "_n: "
 "<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
@@ -4264,7 +4995,7 @@ msgstr ""
 "<p>Uw OpenPGP-sleutel </p><p align=center><b>%1</b> (sleutel-id 0x%2)</p>"
 "<p> voor versleuteling verloopt binnen %n dagen.</p>"
 
-#: keyresolver.cpp:563
+#: keyresolver.cpp:760
 msgid ""
 "_n: "
 "<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
@@ -4277,7 +5008,7 @@ msgstr ""
 "<p>Uw OpenPGP-sleutel </p><p align=center><b>%1</b> (sleutel-id 0x%2)</p>"
 "<p> verloopt binnen %n dagen.</p>"
 
-#: keyresolver.cpp:573
+#: keyresolver.cpp:770
 msgid ""
 "_n: "
 "<p>The root certificate</p><p align=center><b>%3</b></p>"
@@ -4298,7 +5029,7 @@ msgstr ""
 "(serienummer %2)</p>"
 "<p>verloopt binnen %n dagen.</p>"
 
-#: keyresolver.cpp:580
+#: keyresolver.cpp:777
 msgid ""
 "_n: "
 "<p>The root certificate</p><p align=center><b>%3</b></p>"
@@ -4319,7 +5050,7 @@ msgstr ""
 "(serienummer %2)</p>"
 "<p>verloopt binnen %n dagen.</p>"
 
-#: keyresolver.cpp:587
+#: keyresolver.cpp:784
 msgid ""
 "_n: "
 "<p>The root certificate</p><p align=center><b>%3</b></p>"
@@ -4336,7 +5067,7 @@ msgstr ""
 "<p>voor uw S/MIME-certificaat</p><p align=center><b>%1</b> (serienummer %2)</p>"
 "<p>verloopt binnen %n dagen.</p>"
 
-#: keyresolver.cpp:595
+#: keyresolver.cpp:792
 msgid ""
 "_n: "
 "<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
@@ -4357,7 +5088,7 @@ msgstr ""
 "(serienummer %2)</p>"
 "<p>verloopt binnen %n dagen.</p>"
 
-#: keyresolver.cpp:602
+#: keyresolver.cpp:799
 msgid ""
 "_n: "
 "<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
@@ -4378,7 +5109,7 @@ msgstr ""
 "(serienummer %2)</p>"
 "<p>verloopt binnen %n dagen.</p>"
 
-#: keyresolver.cpp:609
+#: keyresolver.cpp:806
 msgid ""
 "_n: "
 "<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
@@ -4395,7 +5126,7 @@ msgstr ""
 "<p>voor uw S/MIME-certificaat</p><p align=center><b>%1</b> (serienummer %2)</p>"
 "<p>verloopt binnen %n dagen.</p>"
 
-#: keyresolver.cpp:618
+#: keyresolver.cpp:815
 msgid ""
 "_n: "
 "<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
@@ -4410,7 +5141,7 @@ msgstr ""
 "<p>Uw S/MIME-certificaat </p><p align=center><b>%1</b> (serienummer %2)</p>"
 "<p> voor ondertekening verloopt binnen %n dagen.</p>"
 
-#: keyresolver.cpp:623
+#: keyresolver.cpp:820
 msgid ""
 "_n: "
 "<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
@@ -4425,7 +5156,7 @@ msgstr ""
 "<p>Uw S/MIME-certificaat </p><p align=center><b>%1</b> (serienummer %2)</p>"
 "<p> voor versleuteling verloopt binnen %n dagen.</p>"
 
-#: keyresolver.cpp:628
+#: keyresolver.cpp:825
 msgid ""
 "_n: "
 "<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
@@ -4440,15 +5171,15 @@ msgstr ""
 "<p>Uw S/MIME-certificaat </p><p align=center><b>%1</b> (serienummer %2)</p>"
 "<p> verloopt binnen %n dagen.</p>"
 
-#: keyresolver.cpp:634
+#: keyresolver.cpp:832
 msgid "OpenPGP Key Expires Soon"
 msgstr "OpenPGP-sleutel verloopt binnenkort"
 
-#: keyresolver.cpp:635
+#: keyresolver.cpp:833
 msgid "S/MIME Certificate Expires Soon"
 msgstr "S/MIME-certificaat zal binnenkort verlopen"
 
-#: keyresolver.cpp:668
+#: keyresolver.cpp:867
 msgid ""
 "One or more of your configured OpenPGP encryption keys or S/MIME certificates "
 "is not usable for encryption. Please reconfigure your encryption keys and "
@@ -4463,11 +5194,11 @@ msgstr ""
 "Wanneer u kiest om door te gaan en u de sleutels later nog nodig hebt, zult u "
 "gevraagd worden om een sleutel te kiezen."
 
-#: keyresolver.cpp:676 keyresolver.cpp:989 keyresolver.cpp:1016
+#: keyresolver.cpp:875 keyresolver.cpp:1204 keyresolver.cpp:1231
 msgid "Unusable Encryption Keys"
 msgstr "Onbruikbare sleutels voor versleuteling"
 
-#: keyresolver.cpp:712
+#: keyresolver.cpp:911
 msgid ""
 "One or more of your configured OpenPGP signing keys or S/MIME signing "
 "certificates is not usable for signing. Please reconfigure your signing keys "
@@ -4481,11 +5212,11 @@ msgstr ""
 "Wanneer u kiest om door te gaan en u de sleutels later nog nodig hebt, zult u "
 "gevraagd worden om een sleutel te kiezen."
 
-#: keyresolver.cpp:720 keyresolver.cpp:1043 keyresolver.cpp:1059
+#: keyresolver.cpp:919 keyresolver.cpp:1258 keyresolver.cpp:1274
 msgid "Unusable Signing Keys"
 msgstr "Onbruikbare ondertekeningsleutels"
 
-#: keyresolver.cpp:980
+#: keyresolver.cpp:1195
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
@@ -4501,7 +5232,7 @@ msgstr ""
 "U kunt doorgaan zonder dat u voor uzelf versleutelt, maar houd er rekening mee "
 "dat u dan uw eigen berichten niet meer kunt lezen."
 
-#: keyresolver.cpp:1007
+#: keyresolver.cpp:1222
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
@@ -4517,7 +5248,7 @@ msgstr ""
 "U kunt doorgaan zonder dat u voor uzelf versleutelt, maar houd er rekening mee "
 "dat u dan uw eigen berichten niet meer kunt lezen."
 
-#: keyresolver.cpp:1037
+#: keyresolver.cpp:1252
 msgid ""
 "Examination of recipient's signing preferences yielded that the message should "
 "be signed using OpenPGP, at least for some recipients;\n"
@@ -4529,11 +5260,11 @@ msgstr ""
 "U hebt echter geen geldige en vertrouwde OpenPGP-sleutel voor versleuteling "
 "voor deze identiteit."
 
-#: keyresolver.cpp:1044
+#: keyresolver.cpp:1259
 msgid "Do Not OpenPGP-Sign"
 msgstr "Niet OpenPGP-ondertekenen"
 
-#: keyresolver.cpp:1053
+#: keyresolver.cpp:1268
 msgid ""
 "Examination of recipient's signing preferences yielded that the message should "
 "be signed using S/MIME, at least for some recipients;\n"
@@ -4545,11 +5276,11 @@ msgstr ""
 "U hebt echter geen geldige S/MIME-certificaat voor versleuteling voor deze "
 "identiteit."
 
-#: keyresolver.cpp:1060
+#: keyresolver.cpp:1275
 msgid "Do Not S/MIME-Sign"
 msgstr "Niet S/MIME-ondertekenen"
 
-#: keyresolver.cpp:1116
+#: keyresolver.cpp:1331
 msgid ""
 "Examination of recipient's signing preferences showed no common type of "
 "signature matching your available signing keys.\n"
@@ -4559,11 +5290,11 @@ msgstr ""
 "gemeenschappelijk type ondertekening was voor uw beschikbare sleutels. Bericht "
 "verzenden zonder ondertekening?"
 
-#: keyresolver.cpp:1120
+#: keyresolver.cpp:1335
 msgid "No signing possible"
 msgstr "Geen ondertekening mogelijk"
 
-#: keyresolver.cpp:1275
+#: keyresolver.cpp:1490
 msgid ""
 "You did not select an encryption key for yourself (encrypt to self). You will "
 "not be able to decrypt your own message if you encrypt it."
@@ -4572,16 +5303,16 @@ msgstr ""
 "mezelf). Het is niet mogelijk om uw eigen berichten te ontcijferen wanneer u "
 "het versleutelt."
 
-#: keyresolver.cpp:1279 keyresolver.cpp:1303 keyresolver.cpp:1317
+#: keyresolver.cpp:1494 keyresolver.cpp:1518 keyresolver.cpp:1532
 msgid "Missing Key Warning"
 msgstr "Waarschuwing voor ontbrekende ondertekeningsleutel"
 
-#: keyresolver.cpp:1280 keyresolver.cpp:1318 messagecomposer.cpp:885
-#: messagecomposer.cpp:910 messagecomposer.cpp:957
+#: keyresolver.cpp:1495 keyresolver.cpp:1533 messagecomposer.cpp:883
+#: messagecomposer.cpp:908 messagecomposer.cpp:955
 msgid "&Encrypt"
 msgstr "V&ersleutelen"
 
-#: keyresolver.cpp:1296
+#: keyresolver.cpp:1511
 msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
@@ -4589,7 +5320,7 @@ msgstr ""
 "U hebt geen sleutel voor versleuteling gekozen voor de ontvanger van dit "
 "bericht. Het bericht zal daardoor niet versleuteld worden."
 
-#: keyresolver.cpp:1299
+#: keyresolver.cpp:1514
 msgid ""
 "You did not select an encryption key for any of the recipients of this message; "
 "therefore, the message will not be encrypted."
@@ -4597,11 +5328,11 @@ msgstr ""
 "U hebt geen sleutel voor versleuteling gekozen voor één van de ontvangers van "
 "dit bericht. Het bericht zal daardoor niet versleuteld worden."
 
-#: keyresolver.cpp:1304 messagecomposer.cpp:933
+#: keyresolver.cpp:1519 messagecomposer.cpp:931
 msgid "Send &Unencrypted"
 msgstr "Onversle&uteld verzenden"
 
-#: keyresolver.cpp:1309
+#: keyresolver.cpp:1524
 msgid ""
 "You did not select an encryption key for one of the recipients: this person "
 "will not be able to decrypt the message if you encrypt it."
@@ -4609,7 +5340,7 @@ msgstr ""
 "U hebt geen sleutel voor versleuteling gekozen voor één van de ontvangers van "
 "dit bericht. Deze persoon kan het bericht niet lezen wanneer u het versleutelt."
 
-#: keyresolver.cpp:1312
+#: keyresolver.cpp:1527
 msgid ""
 "You did not select encryption keys for some of the recipients: these persons "
 "will not be able to decrypt the message if you encrypt it."
@@ -4618,55 +5349,60 @@ msgstr ""
 "dit bericht. Deze personen kunnen het bericht niet lezen wanneer u het "
 "versleutelt."
 
-#: keyresolver.cpp:1367
+#: keyresolver.cpp:1585
 msgid "Encryption Key Selection"
 msgstr "Sleutelselectie voor versleuteling"
 
-#: keyresolver.cpp:1408
+#: keyresolver.cpp:1628
+#, fuzzy
 msgid ""
-"_: if in your language something like 'key(s)' isn't possible please use the "
-"plural in the translation\n"
-"There is a problem with the encryption key(s) for \"%1\".\n"
+"_: if in your language something like 'certificate(s)' isn't possible please "
+"use the plural in the translation\n"
+"There is a problem with the encryption certificate(s) for \"%1\".\n"
 "\n"
-"Please re-select the key(s) which should be used for this recipient."
+"Please re-select the certificate(s) which should be used for this recipient."
 msgstr ""
 "Er is een probleem met de sleutel(s) voor \"%1\".\n"
 "\n"
 "Selecteer de sleutel(s) nogmaals die voor deze ontvanger gebruikt moet worden."
 
-#: keyresolver.cpp:1452
+#: keyresolver.cpp:1678
+#, fuzzy
 msgid ""
-"_: if in your language something like 'key(s)' isn't possible please use the "
-"plural in the translation\n"
-"No valid and trusted encryption key was found for \"%1\".\n"
-"\n"
-"Select the key(s) which should be used for this recipient."
+"_: if in your language something like 'certificate(s)' isn't possible please "
+"use the plural in the translation\n"
+"<qt>No valid and trusted encryption certificate was found for \"%1\"."
+"<br/>"
+"<br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for external "
+"certificates by clicking the button: search for external certificates.</qt>"
 msgstr ""
 "Er is geen geldige en vertrouwde sleutel gevonden voor \"%1\".\n"
 "\n"
 "Selecteer de sleutel(s) die gebruikt moet(en) worden voor deze ontvanger."
 
-#: keyresolver.cpp:1459
+#: keyresolver.cpp:1687
+#, fuzzy
 msgid ""
-"_: if in your language something like 'key(s)' isn't possible please use the "
-"plural in the translation\n"
-"More than one key matches \"%1\".\n"
+"_: if in your language something like 'certificate(s)' isn't possible please "
+"use the plural in the translation\n"
+"More than one certificate matches \"%1\".\n"
 "\n"
-"Select the key(s) which should be used for this recipient."
+"Select the certificate(s) which should be used for this recipient."
 msgstr ""
 "Meer dan één sleutel komt overeen met \"%1\".\n"
 "\n"
 "Selecteer de sleutel(s) die gebruikt moet(en) worden voor deze ontvanger."
 
-#: keyresolver.cpp:1567
+#: keyresolver.cpp:1800
 msgid "Name Selection"
 msgstr "Naamselectie"
 
-#: keyresolver.cpp:1567
+#: keyresolver.cpp:1800
 msgid "Which name shall the contact '%1' have in your addressbook?"
 msgstr "Welke naam dient contactpersoon '%1' in uw adresboek te krijgen?"
 
-#: kmaccount.cpp:49 kmaccount.cpp:381 kmsender.cpp:538
+#: kmaccount.cpp:49 kmaccount.cpp:381 kmsender.cpp:539
 #, c-format
 msgid "Executing precommand %1"
 msgstr "Precommando %1 wordt uitgevoerd"
@@ -4698,11 +5434,11 @@ msgstr ""
 msgid "Checking account: %1"
 msgstr "Account %1 wordt gecontroleerd"
 
-#: kmacctimap.cpp:398 kmfolderimap.cpp:858
+#: kmacctimap.cpp:398 kmfolderimap.cpp:852
 msgid " completed"
 msgstr " voltooid"
 
-#: kmacctimap.cpp:607 kmheaders.cpp:1275
+#: kmacctimap.cpp:607 kmheaders.cpp:1313
 msgid "Unable to process messages: "
 msgstr "De berichten konden niet worden verwerkt: "
 
@@ -4733,11 +5469,11 @@ msgstr "Overdracht is mislukt: %1 kon niet worden vergrendeld."
 msgid "Moving message %3 of %2 from %1."
 msgstr "Bericht %3 van %2 wordt verplaatst van %1."
 
-#: kmacctlocal.cpp:244
+#: kmacctlocal.cpp:245
 msgid "<qt>Cannot remove mail from mailbox <b>%1</b>:<br>%2</qt>"
 msgstr "<qt>Kan geen berichten verwijderen uit postbus <b>%1</b>: <br>%2</qt>"
 
-#: kmacctlocal.cpp:254
+#: kmacctlocal.cpp:255
 msgid ""
 "_n: Fetched 1 message from mailbox %1.\n"
 "Fetched %n messages from mailbox %1."
@@ -4781,44 +5517,44 @@ msgstr "IMAP zonder verbin&ding"
 msgid "&Maildir mailbox"
 msgstr "&Maildir-postbus"
 
-#: kmailicalifaceimpl.cpp:90 kmfolderdia.cpp:448 newfolderdialog.cpp:125
+#: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "Mail"
 
-#: kmailicalifaceimpl.cpp:91 kmfolderdia.cpp:449 newfolderdialog.cpp:126
+#: kmailicalifaceimpl.cpp:94 kmfolderdia.cpp:507 newfolderdialog.cpp:131
 msgid "Calendar"
 msgstr "Agenda"
 
-#: kmailicalifaceimpl.cpp:92 kmfolderdia.cpp:450 newfolderdialog.cpp:127
+#: kmailicalifaceimpl.cpp:95 kmfolderdia.cpp:508 newfolderdialog.cpp:132
 msgid "Contacts"
 msgstr "Contactpersonen"
 
-#: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:451 newfolderdialog.cpp:128
+#: kmailicalifaceimpl.cpp:96 kmfolderdia.cpp:509 newfolderdialog.cpp:133
 msgid "Notes"
 msgstr "Notities"
 
-#: kmailicalifaceimpl.cpp:94 kmfolderdia.cpp:452 newfolderdialog.cpp:129
+#: kmailicalifaceimpl.cpp:97 kmfolderdia.cpp:510 newfolderdialog.cpp:134
 msgid "Tasks"
 msgstr "Taken"
 
-#: kmailicalifaceimpl.cpp:95 kmfolderdia.cpp:453 newfolderdialog.cpp:130
+#: kmailicalifaceimpl.cpp:98 kmfolderdia.cpp:511 newfolderdialog.cpp:135
 msgid "Journal"
 msgstr "Journaal"
 
-#: kmailicalifaceimpl.cpp:667
+#: kmailicalifaceimpl.cpp:684
 msgid "%1's %2"
 msgstr "%1 z'n %2"
 
-#: kmailicalifaceimpl.cpp:681
+#: kmailicalifaceimpl.cpp:700
 msgid "My %1 (%2)"
 msgstr "Mijn %1 (%2)"
 
-#: kmailicalifaceimpl.cpp:685
+#: kmailicalifaceimpl.cpp:704 kmailicalifaceimpl.cpp:708
 #, c-format
 msgid "My %1"
 msgstr "Mijn %1"
 
-#: kmailicalifaceimpl.cpp:1726
+#: kmailicalifaceimpl.cpp:1777
 msgid ""
 "KMail will now create the required groupware folders as subfolders of %1; if "
 "you do not want this, cancel and the IMAP resource will be disabled"
@@ -4827,15 +5563,15 @@ msgstr ""
 "dit niet wilt dient u dit te annuleren en de IMAP-gegevensbron zal "
 "uitgeschakeld worden"
 
-#: kmailicalifaceimpl.cpp:1736
+#: kmailicalifaceimpl.cpp:1787
 msgid "%1: no folder found. It will be created."
 msgstr "%1: geen map gevonden, deze zal aangemaakt worden."
 
-#: kmailicalifaceimpl.cpp:1738
+#: kmailicalifaceimpl.cpp:1789
 msgid "%1: found folder %2. It will be set as the main groupware folder."
 msgstr "%1: map %2 gevonden, deze zal ingesteld worden als hoofdmap groupware."
 
-#: kmailicalifaceimpl.cpp:1744
+#: kmailicalifaceimpl.cpp:1795
 msgid ""
 "<qt>KMail found the following groupware folders in %1 and needs to perform the "
 "following operations: %2"
@@ -4846,23 +5582,32 @@ msgstr ""
 "<br>Wanneer u dit niet wilt dient u dit te annuleren en zal de "
 "IMAP-gegevensbron uitgeschakeld worden"
 
-#: kmailicalifaceimpl.cpp:1751
+#: kmailicalifaceimpl.cpp:1802
 msgid "Standard Groupware Folders"
 msgstr "Standaard groupware-mappen"
 
-#: kmailicalifaceimpl.cpp:1953
+#: kmailicalifaceimpl.cpp:1992
+#, fuzzy
+msgid "Default folder"
+msgstr "Map verwijderen"
+
+#: kmailicalifaceimpl.cpp:1993
+msgid "There are multiple %1 default folders, please choose one:"
+msgstr ""
+
+#: kmailicalifaceimpl.cpp:2019
 msgid "You do not have read/write permission to your %1 folder."
 msgstr "U hebt geen lees- of schrijfrechten voor uw map %1."
 
-#: kmailicalifaceimpl.cpp:2007
+#: kmailicalifaceimpl.cpp:2073
 msgid "You do not have read/write permission to your folder."
 msgstr "U hebt geen lees- of schrijfrechten voor uw map."
 
-#: kmcommands.cpp:300
+#: kmcommands.cpp:304
 msgid "Please wait"
 msgstr "Even wachten a.u.b."
 
-#: kmcommands.cpp:302 kmcommands.cpp:403
+#: kmcommands.cpp:306 kmcommands.cpp:407
 #, c-format
 msgid ""
 "_n: Please wait while the message is transferred\n"
@@ -4871,37 +5616,43 @@ msgstr ""
 "Wacht even terwijl het bericht wordt overgezonden\n"
 "Wacht even terwijl de %n berichten worden overgezonden"
 
-#: kmcommands.cpp:594
+#: kmcommands.cpp:598
 msgid "Address copied to clipboard."
 msgstr "Adres is gekopieerd naar het klembord."
 
-#: kmcommands.cpp:601
+#: kmcommands.cpp:605
 msgid "URL copied to clipboard."
 msgstr "URL-adres is gekopieerd naar het klembord."
 
-#: kmcommands.cpp:638
+#: kmcommands.cpp:642
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr "<qt>Bestand <b>%1</b> bestaat reeds.<br>Wilt u het vervangen?</qt>"
 
-#: kmcommands.cpp:639 kmcommands.cpp:939 kmkernel.cpp:1940
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2050
 msgid "Save to File"
 msgstr "Opslaan naar bestand"
 
-#: kmcommands.cpp:639 kmcommands.cpp:939 kmkernel.cpp:1940
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2050
 msgid "&Replace"
 msgstr "&Vervangen"
 
-#: kmcommands.cpp:739
+#: kmcommands.cpp:743
 msgid "Message as Plain Text"
 msgstr "Bericht als platte tekst"
 
-#: kmcommands.cpp:882
+#: kmcommands.cpp:775
+msgid ""
+"*.mbox|email messages (*.mbox)\n"
+"*|all files (*)"
+msgstr ""
+
+#: kmcommands.cpp:908
 msgid "The message was removed while saving it. It has not been saved."
 msgstr ""
 "Het bericht werd verwijderd terwijl het werd opgeslagen. Het opslaan is daarom "
 "niet gelukt."
 
-#: kmcommands.cpp:938 kmkernel.cpp:1939
+#: kmcommands.cpp:965 kmkernel.cpp:2049
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -4909,20 +5660,20 @@ msgstr ""
 "Bestand %1 bestaat reeds.\n"
 "Wilt u het vervangen?"
 
-#: kmcommands.cpp:982
+#: kmcommands.cpp:1009
 msgid "Open Message"
 msgstr "Bericht openen"
 
-#: kmcommands.cpp:1020 kmcommands.cpp:1048
+#: kmcommands.cpp:1047 kmcommands.cpp:1075
 msgid "The file does not contain a message."
 msgstr "Het bestand bevat geen bericht."
 
-#: kmcommands.cpp:1066
+#: kmcommands.cpp:1093
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr ""
 "Dit bestand bevat meerdere berichten. Het eerste bericht wordt weergegeven."
 
-#: kmcommands.cpp:1363
+#: kmcommands.cpp:1404
 msgid ""
 "\n"
 "This is a MIME digest forward. The content of the message is contained in the "
@@ -4937,85 +5688,85 @@ msgstr ""
 "\n"
 "--\n"
 
-#: kmcommands.cpp:1697 kmheaders.cpp:1407
+#: kmcommands.cpp:1750 kmheaders.cpp:1445
 msgid "Filtering messages"
 msgstr "Berichten filteren"
 
-#: kmcommands.cpp:1705 kmheaders.cpp:1415
+#: kmcommands.cpp:1758 kmheaders.cpp:1453
 msgid "Filtering message %1 of %2"
 msgstr "Bericht %1 van %2 wordt gefilterd"
 
-#: kmcommands.cpp:1715
+#: kmcommands.cpp:1768
 msgid "Not enough free disk space?"
 msgstr "Onvoldoende vrije schijfruimte?"
 
-#: kmcommands.cpp:1881 kmfoldertree.cpp:1891
+#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr "Verplaatsen naar deze map"
 
-#: kmcommands.cpp:1883 kmfoldertree.cpp:1893
+#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr "Kopiëren naar deze map"
 
-#: kmcommands.cpp:1959
+#: kmcommands.cpp:2012
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr ""
 "De IMAP-cache in map %1 blijkt corrupt te zijn. Het kopiëren van de berichten "
 "is afgebroken."
 
-#: kmcommands.cpp:2133
+#: kmcommands.cpp:2186
 msgid "Moving messages"
 msgstr "Berichten worden verplaatst"
 
-#: kmcommands.cpp:2133
+#: kmcommands.cpp:2186
 msgid "Deleting messages"
 msgstr "Berichten worden verwijderd"
 
-#: kmcommands.cpp:2406
+#: kmcommands.cpp:2471
 msgid "Opening URL..."
 msgstr "URL-adres wordt geopend..."
 
-#: kmcommands.cpp:2413
+#: kmcommands.cpp:2478
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt>Wilt u werkelijk <b>%1</b> uitvoeren?</qt>"
 
-#: kmcommands.cpp:2414
+#: kmcommands.cpp:2479
 msgid "Execute"
 msgstr "Uitvoeren"
 
-#: kmcommands.cpp:2495
+#: kmcommands.cpp:2561
 msgid "Found no attachments to save."
 msgstr "Er zijn geen bijlagen gevonden om op te slaan."
 
-#: kmcommands.cpp:2508
+#: kmcommands.cpp:2574
 msgid "Save Attachments To"
 msgstr "Bijlage opslaan als"
 
-#: kmcommands.cpp:2528
+#: kmcommands.cpp:2594
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr "bijlage.1"
 
-#: kmcommands.cpp:2556
+#: kmcommands.cpp:2622
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr "bijlage.%1"
 
-#: kmcommands.cpp:2595
+#: kmcommands.cpp:2661
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr "Een bestand met de naam %1 bestaat reeds. Wilt u het overschrijven?"
 
-#: kmcommands.cpp:2597
+#: kmcommands.cpp:2663
 msgid "File Already Exists"
 msgstr "Bestand bestaat reeds"
 
-#: kmcommands.cpp:2597 util.h:211
+#: kmcommands.cpp:2663 util.h:211
 msgid "&Overwrite"
 msgstr "&Overschrijven"
 
-#: kmcommands.cpp:2619
+#: kmcommands.cpp:2685
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
@@ -5023,19 +5774,19 @@ msgstr ""
 "Het deel %1 van het bericht is versleuteld. Wilt u de versleuteling bij het "
 "opslaan behouden?"
 
-#: kmcommands.cpp:2621 kmcommands.cpp:2630
+#: kmcommands.cpp:2687 kmcommands.cpp:2696
 msgid "KMail Question"
 msgstr "KMail - vraag"
 
-#: kmcommands.cpp:2621
+#: kmcommands.cpp:2687
 msgid "Keep Encryption"
 msgstr "Versleuteling behouden"
 
-#: kmcommands.cpp:2621 kmcommands.cpp:2630
+#: kmcommands.cpp:2687 kmcommands.cpp:2696
 msgid "Do Not Keep"
 msgstr "Niet behouden"
 
-#: kmcommands.cpp:2628
+#: kmcommands.cpp:2694
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
@@ -5043,11 +5794,11 @@ msgstr ""
 "Het deel %1 van het bericht is ondertekend. Wilt u de ondertekening behouden "
 "bij het opslaan?"
 
-#: kmcommands.cpp:2630
+#: kmcommands.cpp:2696
 msgid "Keep Signature"
 msgstr "Handtekening behouden"
 
-#: kmcommands.cpp:2703
+#: kmcommands.cpp:2769
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
@@ -5056,12 +5807,12 @@ msgstr ""
 "Kon het bestand %1 niet opslaan:\n"
 "%2"
 
-#: kmcommands.cpp:2728
+#: kmcommands.cpp:2794
 #, c-format
 msgid "Could not write the file %1."
 msgstr "Kon het bestand %1 niet opslaan."
 
-#: kmcommands.cpp:2952
+#: kmcommands.cpp:3018
 msgid ""
 "There is no Address Book entry for this email address. Add them to the Address "
 "Book and then add instant messaging addresses using your preferred messaging "
@@ -5071,7 +5822,7 @@ msgstr ""
 "adresboek en voeg vervolgens de instant messaging-adressen toe aan uw "
 "IM-programma van uw voorkeur."
 
-#: kmcommands.cpp:2955
+#: kmcommands.cpp:3021
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
@@ -5081,7 +5832,7 @@ msgstr ""
 "%1\n"
 " Het is onmogelijk om te bepalen met wie u wilt chatten."
 
-#: kmcommands.cpp:3179 kmcomposewin.cpp:5128 objecttreeparser.cpp:1632
+#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
 msgid ""
 "Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
 "this bug."
@@ -5089,15 +5840,15 @@ msgstr ""
 "Het Chiasmus-backend biedt geen functie \"x-obtain-keys\". Rapporteer deze bug "
 "a.u.b."
 
-#: kmcommands.cpp:3181 kmcommands.cpp:3186 kmcommands.cpp:3195
-#: kmcommands.cpp:3204 kmcommands.cpp:3222 kmcommands.cpp:3233
-#: kmcommands.cpp:3273 kmcomposewin.cpp:5130 kmcomposewin.cpp:5135
-#: kmcomposewin.cpp:5144 messagecomposer.cpp:558 messagecomposer.cpp:566
-#: messagecomposer.cpp:580 objecttreeparser.cpp:1638
+#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
+#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
+#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
+#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr "Chiasmus-backendfout"
 
-#: kmcommands.cpp:3192 kmcomposewin.cpp:5141 objecttreeparser.cpp:1644
+#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
 msgid ""
 "Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
 "did not return a string list. Please report this bug."
@@ -5106,7 +5857,7 @@ msgstr ""
 "\"x-obtain-keys\" resulteerde niet in een lijst met strings. Rapporteer deze "
 "bug a.u.b."
 
-#: kmcommands.cpp:3201 kmcomposewin.cpp:5150 objecttreeparser.cpp:1652
+#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
 msgid ""
 "No keys have been found. Please check that a valid key path has been set in the "
 "Chiasmus configuration."
@@ -5114,11 +5865,11 @@ msgstr ""
 "Er zijn geen sleutels gevonden. Controleer of u een geldig sleutelpad hebt "
 "opgegeven in de instellingen van Chiasmus."
 
-#: kmcommands.cpp:3208 objecttreeparser.cpp:1659
+#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
 msgid "Chiasmus Decryption Key Selection"
 msgstr "Sleutelselectie ontcijfering Chiasmus"
 
-#: kmcommands.cpp:3220 objecttreeparser.cpp:1671
+#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
 msgid ""
 "Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
 "bug."
@@ -5126,7 +5877,7 @@ msgstr ""
 "Het Chiasmus-backend biedt geen functie \"x-decrypt\". Rapporteer deze bug "
 "a.u.b."
 
-#: kmcommands.cpp:3231 objecttreeparser.cpp:1679
+#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
@@ -5134,11 +5885,11 @@ msgstr ""
 "De functie \"x-decrypt\" accepteerde niet de verwachte parameters. Rapporteer "
 "a.u.b. deze bug."
 
-#: kmcommands.cpp:3239 kmcommands.cpp:3265 objecttreeparser.cpp:1685
+#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr "Ontcijferingsfout in Chiasmus"
 
-#: kmcommands.cpp:3270 objecttreeparser.cpp:1691
+#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
 msgid ""
 "Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
 "not return a byte array. Please report this bug."
@@ -5146,15 +5897,7 @@ msgstr ""
 "Onverwachte waarde van het Chiasmus-backend. De functie \"x-decrypt\" "
 "resulteerde niet in een byte array. Rapporteer deze bug a.u.b."
 
-#: kmcommands.cpp:3425
-msgid "This attachment has been deleted."
-msgstr "Deze bijlage is verwijderd."
-
-#: kmcommands.cpp:3427
-msgid "The attachment '%1' has been deleted."
-msgstr "De bijlage '%1' is verwijderd."
-
-#: kmcommands.cpp:3541
+#: kmcommands.cpp:3581
 msgid ""
 "From: %1\n"
 "To: %2\n"
@@ -5164,46 +5907,122 @@ msgstr ""
 "Aan: %2\n"
 "Onderwerp: %3"
 
-#: kmcommands.cpp:3551
+#: kmcommands.cpp:3591
 #, c-format
 msgid "Mail: %1"
 msgstr "Bericht: %1"
 
-#: kmcomposewin.cpp:233
+#: kmcomposewin.cpp:207
+#, fuzzy
+msgid "Select an identity for this message"
+msgstr "HTML voor dit bericht activeren."
+
+#: kmcomposewin.cpp:211
+msgid "Select the dictionary to use when spell-checking this message"
+msgstr ""
+
+#: kmcomposewin.cpp:216
+msgid "Select the sent-mail folder where a copy of this message will be saved"
+msgstr ""
+
+#: kmcomposewin.cpp:220
+msgid "Select the outgoing account to use for sending this message"
+msgstr ""
+
+#: kmcomposewin.cpp:224
+msgid "Set the \"From:\" email address for this message"
+msgstr ""
+
+#: kmcomposewin.cpp:228
+msgid "Set the \"Reply-To:\" email address for this message"
+msgstr ""
+
+#: kmcomposewin.cpp:248
 msgid "Select email address(es)"
 msgstr "E-mailadres(sen) selecteren"
 
-#: kmcomposewin.cpp:286
+#: kmcomposewin.cpp:295
+#, fuzzy
+msgid "Set a subject for this message"
+msgstr "Onderwerp van bericht instellen"
+
+#: kmcomposewin.cpp:297
+msgid "&Identity:"
+msgstr "&Identiteit:"
+
+#: kmcomposewin.cpp:298
+msgid "&Dictionary:"
+msgstr "Woor&denboek:"
+
+#: kmcomposewin.cpp:299
+msgid "&Sent-Mail folder:"
+msgstr "Map voor ver&zonden berichten:"
+
+#: kmcomposewin.cpp:300
+msgid "&Mail transport:"
+msgstr "Beric&htentransport:"
+
+#: kmcomposewin.cpp:301
+msgid ""
+"_: sender address field\n"
+"&From:"
+msgstr "&Van:"
+
+#: kmcomposewin.cpp:302
+msgid "&Reply to:"
+msgstr "Beant&woorden aan:"
+
+#: kmcomposewin.cpp:303
+msgid "S&ubject:"
+msgstr "&Onderwerp:"
+
+#: kmcomposewin.cpp:305
 msgid "Sticky"
 msgstr "Behouden"
 
-#: kmcomposewin.cpp:367 kmfoldertree.cpp:1681 kmheaders.cpp:138
-#: kmheaders.cpp:183 kmmainwidget.cpp:424 kmmainwidget.cpp:431
-#: kmmainwidget.cpp:438 kmmimeparttree.cpp:67 kmpopfiltercnfrmdlg.cpp:43
+#: kmcomposewin.cpp:308
+msgid "Use the selected value as your identity for future messages"
+msgstr ""
+
+#: kmcomposewin.cpp:311
+msgid "Use the selected value as your sent-mail folder for future messages"
+msgstr ""
+
+#: kmcomposewin.cpp:314
+msgid "Use the selected value as your outgoing account for future messages"
+msgstr ""
+
+#: kmcomposewin.cpp:317
+msgid "Use the selected value as your dictionary for future messages"
+msgstr ""
+
+#: kmcomposewin.cpp:398 kmfoldertree.cpp:1719 kmheaders.cpp:141
+#: kmheaders.cpp:187 kmmainwidget.cpp:416 kmmainwidget.cpp:423
+#: kmmainwidget.cpp:430 kmmimeparttree.cpp:67 kmpopfiltercnfrmdlg.cpp:43
 msgid "Size"
 msgstr "Grootte"
 
-#: kmcomposewin.cpp:368 kmmimeparttree.cpp:66
+#: kmcomposewin.cpp:399 kmmimeparttree.cpp:66
 msgid "Encoding"
 msgstr "Codering"
 
-#: kmcomposewin.cpp:375 kmcomposewin.cpp:3247
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
 msgid "Compress"
 msgstr "Comprimeren"
 
-#: kmcomposewin.cpp:377
+#: kmcomposewin.cpp:408
 msgid "Encrypt"
 msgstr "Versleutelen"
 
-#: kmcomposewin.cpp:379
+#: kmcomposewin.cpp:410
 msgid "Sign"
 msgstr "Ondertekenen"
 
-#: kmcomposewin.cpp:590 kmcomposewin.cpp:3616
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
 msgid "Name of the attachment:"
 msgstr "Naam van bijlage:"
 
-#: kmcomposewin.cpp:828
+#: kmcomposewin.cpp:868
 msgid ""
 "Autosaving the message as %1 failed.\n"
 "Reason: %2"
@@ -5211,62 +6030,26 @@ msgstr ""
 "Het automatisch opslaan van het bericht als %1 is mislukt.\n"
 "Reden: %2"
 
-#: kmcomposewin.cpp:832
+#: kmcomposewin.cpp:872
 msgid "Autosaving Failed"
 msgstr "Het automatisch opslaan is mislukt"
 
-#: kmcomposewin.cpp:970
-msgid "&Identity:"
-msgstr "&Identiteit:"
-
-#: kmcomposewin.cpp:974
-msgid "&Dictionary:"
-msgstr "Woor&denboek:"
-
-#: kmcomposewin.cpp:978
-msgid "&Sent-Mail folder:"
-msgstr "Map voor ver&zonden berichten:"
-
-#: kmcomposewin.cpp:982
-msgid "&Mail transport:"
-msgstr "Beric&htentransport:"
-
-#: kmcomposewin.cpp:986
-msgid ""
-"_: sender address field\n"
-"&From:"
-msgstr "&Van:"
-
-#: kmcomposewin.cpp:992
-msgid "&Reply to:"
-msgstr "Beant&woorden aan:"
-
-#: kmcomposewin.cpp:1000
-msgid ""
-"_: recipient address field\n"
-"&To:"
-msgstr "&Naar:"
-
-#: kmcomposewin.cpp:1002
+#: kmcomposewin.cpp:1042
 msgid "Primary Recipients"
 msgstr "Hoofdgeadresseerden"
 
-#: kmcomposewin.cpp:1003
+#: kmcomposewin.cpp:1043
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email.</qt>"
 msgstr ""
 "<qt>De e-mailadressen die in dit veld worden ingevuld ontvangen een kopie van "
 "het e-mailbericht.</qt>"
 
-#: kmcomposewin.cpp:1010
-msgid "&Copy to (CC):"
-msgstr "&CC:"
-
-#: kmcomposewin.cpp:1012
+#: kmcomposewin.cpp:1052
 msgid "Additional Recipients"
 msgstr "Extra geadresseerden"
 
-#: kmcomposewin.cpp:1013
+#: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
 "Technically it is the same thing as putting all the addresses in the <b>To:</b> "
@@ -5278,15 +6061,11 @@ msgstr ""
 "in het veld <b>Aan:</b>. Het verschil zit hem erin dat iemand in de Carbon Copy "
 "(CC) alleen maar meeluistert en niet de echte ontvanger is van het bericht.</qt>"
 
-#: kmcomposewin.cpp:1025
-msgid "&Blind copy to (BCC):"
-msgstr "&BCC:"
-
-#: kmcomposewin.cpp:1027
+#: kmcomposewin.cpp:1067
 msgid "Hidden Recipients"
 msgstr "Verborgen geadresseerden"
 
-#: kmcomposewin.cpp:1028
+#: kmcomposewin.cpp:1068
 msgid ""
 "<qt>Essentially the same thing as the <b>Copy To:</b> "
 "field but differs in that all other recipients do not see who receives a blind "
@@ -5295,310 +6074,325 @@ msgstr ""
 "<qt>In principe hetzelfde als het veld <b>Kopiëren naar</b> "
 "(CC), alleenzien de andere ontvangers niet wie een kopie ontvangen heeft.</qt>"
 
-#: kmcomposewin.cpp:1060
-msgid "S&ubject:"
-msgstr "&Onderwerp:"
-
-#: kmcomposewin.cpp:1198 kmcomposewin.cpp:1220
+#: kmcomposewin.cpp:1236 kmcomposewin.cpp:1258
 msgid "&Send Mail"
 msgstr "E-mail ver&zenden"
 
-#: kmcomposewin.cpp:1202 kmcomposewin.cpp:1224
+#: kmcomposewin.cpp:1240 kmcomposewin.cpp:1262
 msgid "&Send Mail Via"
 msgstr "E-mail verzenden &via"
 
-#: kmcomposewin.cpp:1205 kmcomposewin.cpp:1214 kmcomposewin.cpp:4329
-#: redirectdialog.cpp:83
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "&Later verzenden"
 
-#: kmcomposewin.cpp:1207 kmcomposewin.cpp:1217
+#: kmcomposewin.cpp:1245 kmcomposewin.cpp:1255
 msgid "Send &Later Via"
 msgstr "&Later verzenden via"
 
-#: kmcomposewin.cpp:1255
+#: kmcomposewin.cpp:1293
 msgid "Save as &Draft"
 msgstr "Op&slaan als concept"
 
-#: kmcomposewin.cpp:1258
+#: kmcomposewin.cpp:1296
 msgid "Save as &Template"
 msgstr "Opslaan als s&jabloon"
 
-#: kmcomposewin.cpp:1261
+#: kmcomposewin.cpp:1299
 msgid "&Insert File..."
 msgstr "Bestand &invoegen..."
 
-#: kmcomposewin.cpp:1264
+#: kmcomposewin.cpp:1302
 msgid "&Insert File Recent"
 msgstr "Recent bestand &invoegen"
 
-#: kmcomposewin.cpp:1271
+#: kmcomposewin.cpp:1309
 msgid "&Address Book"
 msgstr "&Adresboek"
 
-#: kmcomposewin.cpp:1274
+#: kmcomposewin.cpp:1312
 msgid "&New Composer"
 msgstr "&Nieuw bericht"
 
-#: kmcomposewin.cpp:1278
+#: kmcomposewin.cpp:1316
 msgid "New Main &Window"
 msgstr "Nieu&w hoofdvenster"
 
-#: kmcomposewin.cpp:1283
+#: kmcomposewin.cpp:1321
 msgid "Select &Recipients..."
 msgstr "Gead&resseerde selecteren..."
 
-#: kmcomposewin.cpp:1285
+#: kmcomposewin.cpp:1323
 msgid "Save &Distribution List..."
 msgstr "&Distributielijst opslaan..."
 
-#: kmcomposewin.cpp:1307
+#: kmcomposewin.cpp:1345
 msgid "Pa&ste as Quotation"
 msgstr "Plakken al&s aanhaling"
 
-#: kmcomposewin.cpp:1310
+#: kmcomposewin.cpp:1348
 msgid "Paste as Attac&hment"
 msgstr "Als bijla&ge plakken"
 
-#: kmcomposewin.cpp:1313
+#: kmcomposewin.cpp:1351
 msgid "Add &Quote Characters"
 msgstr "Aan&halingstekens toevoegen"
 
-#: kmcomposewin.cpp:1316
+#: kmcomposewin.cpp:1356
 msgid "Re&move Quote Characters"
 msgstr "Aanhalingstekens verwijdere&n"
 
-#: kmcomposewin.cpp:1320
+#: kmcomposewin.cpp:1362
 msgid "Cl&ean Spaces"
 msgstr "Spaties &comprimeren"
 
-#. i18n: file kmail.kcfg line 341
-#: kmcomposewin.cpp:1323 kmreaderwin.cpp:683 rc.cpp:779
+#. i18n: file kmail.kcfg line 358
+#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "Vast lettertype gebr&uiken"
 
-#: kmcomposewin.cpp:1328
+#: kmcomposewin.cpp:1370
 msgid "&Urgent"
 msgstr "&Urgent"
 
-#: kmcomposewin.cpp:1331
+#: kmcomposewin.cpp:1373
 msgid "&Request Disposition Notification"
 msgstr "Ontvan&gst- en gelezenbevestiging verzoeken"
 
-#: kmcomposewin.cpp:1336
+#: kmcomposewin.cpp:1378
 msgid "Se&t Encoding"
 msgstr "Codering ins&tellen"
 
-#: kmcomposewin.cpp:1339
+#: kmcomposewin.cpp:1381
 msgid "&Wordwrap"
 msgstr "Regela&fbreking"
 
-#: kmcomposewin.cpp:1344
+#: kmcomposewin.cpp:1386
 msgid "&Snippets"
 msgstr "&Fragmenten"
 
-#: kmcomposewin.cpp:1350
+#: kmcomposewin.cpp:1392
 msgid "&Automatic Spellchecking"
 msgstr "&Automatische spellingcontrole"
 
-#: kmcomposewin.cpp:1360
+#: kmcomposewin.cpp:1402
 msgid "Auto-Detect"
 msgstr "Autodetecteren"
 
-#: kmcomposewin.cpp:1365
+#: kmcomposewin.cpp:1407
 msgid "Formatting (HTML)"
 msgstr "Opmaak (HTML)"
 
-#: kmcomposewin.cpp:1369
+#: kmcomposewin.cpp:1411
 msgid "&All Fields"
 msgstr "Alle vel&den"
 
-#: kmcomposewin.cpp:1372
+#: kmcomposewin.cpp:1414
 msgid "&Identity"
 msgstr "&Identiteit"
 
-#: kmcomposewin.cpp:1375
+#: kmcomposewin.cpp:1417
 msgid "&Dictionary"
 msgstr "Woor&denboek"
 
-#: kmcomposewin.cpp:1378
+#: kmcomposewin.cpp:1420
 msgid "&Sent-Mail Folder"
 msgstr "Map met ver&zonden berichten"
 
-#: kmcomposewin.cpp:1381
+#: kmcomposewin.cpp:1423
 msgid "&Mail Transport"
 msgstr "Beric&htentransport"
 
-#: kmcomposewin.cpp:1384
+#: kmcomposewin.cpp:1426
 msgid "&From"
 msgstr "&Van"
 
-#: kmcomposewin.cpp:1387
+#: kmcomposewin.cpp:1429
 msgid "&Reply To"
 msgstr "Beant&woorden aan"
 
-#: kmcomposewin.cpp:1391
+#: kmcomposewin.cpp:1433
 msgid "&To"
 msgstr "&Aan"
 
-#: kmcomposewin.cpp:1394
+#: kmcomposewin.cpp:1436
 msgid "&CC"
 msgstr "&CC"
 
-#: kmcomposewin.cpp:1397
+#: kmcomposewin.cpp:1439
 msgid "&BCC"
 msgstr "&BCC"
 
-#: kmcomposewin.cpp:1401
+#: kmcomposewin.cpp:1443
 msgid "S&ubject"
 msgstr "&Onderwerp"
 
-#: kmcomposewin.cpp:1406
+#: kmcomposewin.cpp:1448
 msgid "Append S&ignature"
 msgstr "Handtekening &invoegen"
 
-#: kmcomposewin.cpp:1409
+#: kmcomposewin.cpp:1451
 msgid "Prepend S&ignature"
 msgstr "Handtekening voorin &invoegen"
 
-#: kmcomposewin.cpp:1413
+#: kmcomposewin.cpp:1455
 msgid "Insert Signature At C&ursor Position"
 msgstr "Handtekening op c&ursorpositie invoegen"
 
-#: kmcomposewin.cpp:1417
+#: kmcomposewin.cpp:1459
 msgid "Attach &Public Key..."
 msgstr "&Publieke sleutel bijvoegen..."
 
-#: kmcomposewin.cpp:1420
+#: kmcomposewin.cpp:1462
 msgid "Attach &My Public Key"
 msgstr "&Mijn publieke sleutel bijvoegen"
 
-#: kmcomposewin.cpp:1423 kmcomposewin.cpp:2272
+#: kmcomposewin.cpp:1465 kmcomposewin.cpp:2337
 msgid "&Attach File..."
 msgstr "Bestand &bijvoegen..."
 
-#: kmcomposewin.cpp:1426
+#: kmcomposewin.cpp:1468
 msgid "&Remove Attachment"
 msgstr "Bijlage ve&rwijderen"
 
-#: kmcomposewin.cpp:1429
+#: kmcomposewin.cpp:1471
 msgid "&Save Attachment As..."
 msgstr "Bijlage op&slaan als..."
 
-#: kmcomposewin.cpp:1432
+#: kmcomposewin.cpp:1474
 msgid "Attachment Pr&operties"
 msgstr "Bijlage-eigenscha&ppen"
 
-#: kmcomposewin.cpp:1442
+#: kmcomposewin.cpp:1484
 msgid "&Spellchecker..."
 msgstr "Spelling&controle..."
 
-#: kmcomposewin.cpp:1446 kmcomposewin.cpp:1449
+#: kmcomposewin.cpp:1488 kmcomposewin.cpp:1491
 msgid "Encrypt Message with Chiasmus..."
 msgstr "Bericht met Chiasmus versleutelen..."
 
-#: kmcomposewin.cpp:1457
+#: kmcomposewin.cpp:1499
 msgid "&Encrypt Message"
 msgstr "Bericht v&ersleutelen"
 
-#: kmcomposewin.cpp:1460
+#: kmcomposewin.cpp:1502
 msgid "&Sign Message"
 msgstr "Bericht onderte&kenen"
 
-#: kmcomposewin.cpp:1507
+#: kmcomposewin.cpp:1549
 msgid "&Cryptographic Message Format"
 msgstr "&Cryptografisch berichtformaat"
 
-#: kmcomposewin.cpp:1515 kmcomposewin.cpp:4970
+#: kmcomposewin.cpp:1554
+msgid "Select a cryptographic format for this message"
+msgstr ""
+
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
 msgid "Standard"
 msgstr "Standaard"
 
-#: kmcomposewin.cpp:1516 kmcomposewin.cpp:4972
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
 msgid "Bulleted List (Disc)"
 msgstr "Opgesomde lijst (bolletje)"
 
-#: kmcomposewin.cpp:1517 kmcomposewin.cpp:4974
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
 msgid "Bulleted List (Circle)"
 msgstr "Opgesomde lijst (rondje)"
 
-#: kmcomposewin.cpp:1518 kmcomposewin.cpp:4976
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
 msgid "Bulleted List (Square)"
 msgstr "Opgesomde lijst (vierkantje)"
 
-#: kmcomposewin.cpp:1519 kmcomposewin.cpp:4978
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
 msgid "Ordered List (Decimal)"
 msgstr "Geordende lijst (decimaal)"
 
-#: kmcomposewin.cpp:1520 kmcomposewin.cpp:4980
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
 msgid "Ordered List (Alpha lower)"
 msgstr "Geordende lijst (kleine letters)"
 
-#: kmcomposewin.cpp:1521 kmcomposewin.cpp:4982
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
 msgid "Ordered List (Alpha upper)"
 msgstr "Geordende lijst (hoofdletters)"
 
-#: kmcomposewin.cpp:1523
+#: kmcomposewin.cpp:1566
 msgid "Select Style"
 msgstr "Stijl selecteren"
 
-#: kmcomposewin.cpp:1537
+#: kmcomposewin.cpp:1569
+#, fuzzy
+msgid "Select a list style"
+msgstr "Stijl selecteren"
+
+#: kmcomposewin.cpp:1574
+#, fuzzy
+msgid "Select a font"
+msgstr "Alle tekst selecteren"
+
+#: kmcomposewin.cpp:1579
+#, fuzzy
+msgid "Select a font size"
+msgstr "Geluidsbestand selecteren"
+
+#: kmcomposewin.cpp:1583
 msgid "Align Left"
 msgstr "Links uitlijnen"
 
-#: kmcomposewin.cpp:1541
+#: kmcomposewin.cpp:1587
 msgid "Align Right"
 msgstr "Rechts uitlijnen"
 
-#: kmcomposewin.cpp:1544
+#: kmcomposewin.cpp:1590
 msgid "Align Center"
 msgstr "Centreren"
 
-#: kmcomposewin.cpp:1547
+#: kmcomposewin.cpp:1593
 msgid "&Bold"
 msgstr "&Vet"
 
-#: kmcomposewin.cpp:1550
+#: kmcomposewin.cpp:1596
 msgid "&Italic"
 msgstr "&Cursief"
 
-#: kmcomposewin.cpp:1553
+#: kmcomposewin.cpp:1599
 msgid "&Underline"
 msgstr "&Onderstrepen"
 
-#: kmcomposewin.cpp:1556
+#: kmcomposewin.cpp:1602
 msgid "Reset Font Settings"
 msgstr "Lettertype-instellingen herstellen"
 
-#: kmcomposewin.cpp:1559
+#: kmcomposewin.cpp:1605
 msgid "Text Color..."
 msgstr "Tekstkleur..."
 
-#: kmcomposewin.cpp:1573
+#: kmcomposewin.cpp:1619
 msgid "Configure KMail..."
 msgstr "KMail instellen..."
 
-#: kmcomposewin.cpp:1582
+#: kmcomposewin.cpp:1628
 msgid " Spellcheck: %1 "
 msgstr "Spellingcontrole: %1 "
 
-#: kmcomposewin.cpp:1583 kmcomposewin.cpp:1597
+#: kmcomposewin.cpp:1629 kmcomposewin.cpp:1643
 msgid " Column: %1 "
 msgstr " Kolom: %1 "
 
-#: kmcomposewin.cpp:1584 kmcomposewin.cpp:1595
+#: kmcomposewin.cpp:1630 kmcomposewin.cpp:1641
 msgid " Line: %1 "
 msgstr " Regel: %1 "
 
-#: kmcomposewin.cpp:2188
+#: kmcomposewin.cpp:2252
 msgid "Re&save as Template"
 msgstr "Opnieuw opslaan als &sjabloon"
 
-#: kmcomposewin.cpp:2189
+#: kmcomposewin.cpp:2253
 msgid "&Save as Draft"
 msgstr "Op&slaan als concept"
 
-#: kmcomposewin.cpp:2191
+#: kmcomposewin.cpp:2255
 msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
 "time."
@@ -5606,7 +6400,7 @@ msgstr ""
 "Bericht opnieuw opslaan in de sjabloonmap. Het kan dan op een ander tijdstip "
 "gebruikt worden."
 
-#: kmcomposewin.cpp:2193
+#: kmcomposewin.cpp:2257
 msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
 "later time."
@@ -5614,15 +6408,15 @@ msgstr ""
 "Bewaar dit bericht in de map Concepten. Deze kunnen nog bewerkt worden en op "
 "een later tijdstip verzonden worden."
 
-#: kmcomposewin.cpp:2197
+#: kmcomposewin.cpp:2261
 msgid "Do you want to save the message for later or discard it?"
 msgstr "Wilt u het bericht verwerpen of opslaan voor later?"
 
-#: kmcomposewin.cpp:2198
+#: kmcomposewin.cpp:2262
 msgid "Close Composer"
 msgstr "Opsteller sluiten"
 
-#: kmcomposewin.cpp:2268
+#: kmcomposewin.cpp:2333
 msgid ""
 "The message you have composed seems to refer to an attached file but you have "
 "not attached anything.\n"
@@ -5632,15 +6426,15 @@ msgstr ""
 "bijgesloten in dit bericht.\n"
 "Wilt u een bijlage toevoegen?"
 
-#: kmcomposewin.cpp:2271
+#: kmcomposewin.cpp:2336
 msgid "File Attachment Reminder"
 msgstr "Herinnering voor bijlage toevoegen"
 
-#: kmcomposewin.cpp:2273
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
 msgid "&Send as Is"
 msgstr "Zo &verzenden"
 
-#: kmcomposewin.cpp:2350
+#: kmcomposewin.cpp:2415
 msgid ""
 "<qt>"
 "<p>KMail could not recognize the location of the attachment (%1);</p>"
@@ -5650,7 +6444,7 @@ msgstr ""
 "<p>KMail heeft de locatie van de bijlage (%1) niet herkend.</p>"
 "<p>Geef het volledige pad op als u een bijlage wilt toevoegen.</p></qt>"
 
-#: kmcomposewin.cpp:2359
+#: kmcomposewin.cpp:2424
 msgid ""
 "<qt>"
 "<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
@@ -5659,21 +6453,21 @@ msgstr ""
 "<p>Uw systeembeheerder staat het niet toe dat er bestanden groter dan %1 MB "
 "worden bijgevoegd.</p>"
 
-#: kmcomposewin.cpp:2697
+#: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "Bestand bijvoegen"
 
 #. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2698 rc.cpp:57
+#: kmcomposewin.cpp:2778 rc.cpp:57
 #, no-c-format
 msgid "&Attach"
 msgstr "Bij&lage"
 
-#: kmcomposewin.cpp:2878
+#: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "Bestand invoegen"
 
-#: kmcomposewin.cpp:3048
+#: kmcomposewin.cpp:3129
 msgid ""
 "<qt>"
 "<p>An error occurred while trying to export the key from the backend:</p>"
@@ -5684,56 +6478,56 @@ msgstr ""
 "backend:</p>"
 "<p><b>%1</b></p></qt>"
 
-#: kmcomposewin.cpp:3052
+#: kmcomposewin.cpp:3133
 msgid "Key Export Failed"
 msgstr "Sleutelexport mislukt"
 
-#: kmcomposewin.cpp:3079
+#: kmcomposewin.cpp:3160
 msgid "Exporting key..."
 msgstr "Sleutel wordt geëxporteerd..."
 
-#: kmcomposewin.cpp:3090
+#: kmcomposewin.cpp:3171
 #, c-format
 msgid "OpenPGP key 0x%1"
 msgstr "OpenPGP-sleutel 0x%1"
 
-#: kmcomposewin.cpp:3105
+#: kmcomposewin.cpp:3186
 msgid "Attach Public OpenPGP Key"
 msgstr "Publieke OpenPGP-sleutel bijvoegen"
 
-#: kmcomposewin.cpp:3106
+#: kmcomposewin.cpp:3187
 msgid "Select the public key which should be attached."
 msgstr "Selecteer de publieke sleutel die moet worden bijgesloten."
 
-#: kmcomposewin.cpp:3128 kmmimeparttree.cpp:137 kmreaderwin.cpp:1967
+#: kmcomposewin.cpp:3209 kmmimeparttree.cpp:135 kmreaderwin.cpp:2032
 msgid ""
 "_: to open\n"
 "Open"
 msgstr "Openen"
 
-#: kmcomposewin.cpp:3130 kmmimeparttree.cpp:138 kmreaderwin.cpp:1968
+#: kmcomposewin.cpp:3211 kmmimeparttree.cpp:136 kmreaderwin.cpp:2033
 msgid "Open With..."
 msgstr "Openen met..."
 
-#: kmcomposewin.cpp:3132
+#: kmcomposewin.cpp:3213
 msgid ""
 "_: to view\n"
 "View"
 msgstr "Tonen"
 
-#: kmcomposewin.cpp:3135
+#: kmcomposewin.cpp:3216
 msgid "Edit With..."
 msgstr "Bewerken met..."
 
-#: kmcomposewin.cpp:3143
+#: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "Bijlage toevoegen..."
 
-#: kmcomposewin.cpp:3232 kmcomposewin.cpp:3240
+#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
 msgid "KMail could not compress the file."
 msgstr "KMail kon het bestand niet comprimeren."
 
-#: kmcomposewin.cpp:3246
+#: kmcomposewin.cpp:3326
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
@@ -5741,43 +6535,43 @@ msgstr ""
 "Het gecomprimeerde bestand is groter dan het oorspronkelijke bestand. Wilt u "
 "het oorspronkelijke bestand behouden?"
 
-#: kmcomposewin.cpp:3247
+#: kmcomposewin.cpp:3327
 msgid "Keep"
 msgstr "Behouden"
 
-#: kmcomposewin.cpp:3313 kmcomposewin.cpp:3321
+#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
 msgid "KMail could not uncompress the file."
 msgstr "KMail kon het bestand niet uitpakken."
 
-#: kmcomposewin.cpp:3519
+#: kmcomposewin.cpp:3601
 msgid "Save Attachment As"
 msgstr "Bijlage opslaan als"
 
-#: kmcomposewin.cpp:3769 kmedit.cpp:178
+#: kmcomposewin.cpp:3856 kmedit.cpp:178
 msgid "Add as Text"
 msgstr "Als tekst toevoegen"
 
-#: kmcomposewin.cpp:3770 kmedit.cpp:179
+#: kmcomposewin.cpp:3857 kmedit.cpp:179
 msgid "Add as Attachment"
 msgstr "Als bijlage toevoegen"
 
-#: kmcomposewin.cpp:3771
+#: kmcomposewin.cpp:3858
 msgid ""
 "Please select whether you want to insert the content as text into the editor, "
 "or append the referenced file as an attachment."
 msgstr ""
 "Kies of u de inhoud als tekst wilt invoegen of als bijlage wilt toevoegen."
 
-#: kmcomposewin.cpp:3773
+#: kmcomposewin.cpp:3860
 msgid "Paste as text or attachment?"
 msgstr "Plakken als tekst of bijvoegen?"
 
-#: kmcomposewin.cpp:3848 kmfilterdlg.cpp:705 kmfolderdia.cpp:274
-#: kmfolderdia.cpp:632 kmfoldertree.cpp:1603 managesievescriptsdialog.cpp:280
+#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "naamloos"
 
-#: kmcomposewin.cpp:3873
+#: kmcomposewin.cpp:3961
 msgid ""
 "<qt>"
 "<p>You have requested that messages be encrypted to yourself, but the currently "
@@ -5792,11 +6586,11 @@ msgstr ""
 "<p>Selecteer a.u.b. de te gebruiken sleutel(s) in de "
 "identiteitsinstellingen.</p></qt>"
 
-#: kmcomposewin.cpp:3880
+#: kmcomposewin.cpp:3968
 msgid "Undefined Encryption Key"
 msgstr "Niet-gedefinieerd versleutelingtype"
 
-#: kmcomposewin.cpp:3924
+#: kmcomposewin.cpp:4015
 msgid ""
 "<qt>"
 "<p>In order to be able to sign this message you first have to define the "
@@ -5809,11 +6603,11 @@ msgstr ""
 "<p>Selecteer a.u.b. de te gebruiken sleutel(s) in de "
 "identiteitsinstellingen.</p></qt>"
 
-#: kmcomposewin.cpp:3931
+#: kmcomposewin.cpp:4022
 msgid "Undefined Signing Key"
 msgstr "Niet-gedefinieerde ondertekeningsleutel"
 
-#: kmcomposewin.cpp:4016
+#: kmcomposewin.cpp:4129
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
@@ -5821,11 +6615,11 @@ msgstr ""
 "KMail is momenteel in de offline-modus. Uw berichten zullen in het postvak uit "
 "bewaard blijven totdat u weer online gaat."
 
-#: kmcomposewin.cpp:4018 kmkernel.cpp:1243
+#: kmcomposewin.cpp:4131 kmkernel.cpp:1285
 msgid "Online/Offline"
 msgstr "Online/Offline"
 
-#: kmcomposewin.cpp:4033
+#: kmcomposewin.cpp:4146
 msgid ""
 "You must enter your email address in the From: field. You should also set your "
 "email address for all identities, so that you do not have to enter it for each "
@@ -5835,61 +6629,61 @@ msgstr ""
 "e-mailadres voor al uw identiteiten in te stellen, zodat u het niet voor ieder "
 "bericht hoeft in te voeren."
 
-#: kmcomposewin.cpp:4044
+#: kmcomposewin.cpp:4157
 msgid ""
 "You must specify at least one receiver,either in the To: field or as CC or as "
 "BCC."
 msgstr "U moet tenminste één ontvanger opgeven in het veld Aan, CC of BCC."
 
-#: kmcomposewin.cpp:4052
+#: kmcomposewin.cpp:4165
 msgid "To field is missing.Send message anyway?"
 msgstr "Het To-veld is leeg. Het bericht toch verzenden?"
 
-#: kmcomposewin.cpp:4054
+#: kmcomposewin.cpp:4167
 msgid "No To: specified"
 msgstr "Geen To: opgegeven"
 
-#: kmcomposewin.cpp:4079
+#: kmcomposewin.cpp:4192
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "U hebt geen onderwerp ingevoerd. Het bericht toch verzenden?"
 
-#: kmcomposewin.cpp:4081
+#: kmcomposewin.cpp:4194
 msgid "No Subject Specified"
 msgstr "Geen onderwerp ingevoerd"
 
-#: kmcomposewin.cpp:4082
+#: kmcomposewin.cpp:4195
 msgid "S&end as Is"
 msgstr "Zo &verzenden"
 
-#: kmcomposewin.cpp:4083
+#: kmcomposewin.cpp:4196
 msgid "&Specify the Subject"
 msgstr "&Onderwerp opgeven"
 
-#: kmcomposewin.cpp:4121
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not sign/encrypt"
 msgstr "&Opmaak behouden, niet ondertekenen noch versleutelen"
 
-#: kmcomposewin.cpp:4122
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not encrypt"
 msgstr "Opmaak &behouden, niet versleutelen"
 
-#: kmcomposewin.cpp:4123
+#: kmcomposewin.cpp:4236
 msgid "&Keep markup, do not sign"
 msgstr "&Opmaak behouden, niet ondertekenen"
 
-#: kmcomposewin.cpp:4125
+#: kmcomposewin.cpp:4238
 msgid "Sign/Encrypt (delete markup)"
 msgstr "Ondertekenen/versleutelen (opmaak verwijderen)"
 
-#: kmcomposewin.cpp:4126
+#: kmcomposewin.cpp:4239
 msgid "Encrypt (delete markup)"
 msgstr "Versleutelen (Opmaak verwijderen)"
 
-#: kmcomposewin.cpp:4127
+#: kmcomposewin.cpp:4240
 msgid "Sign (delete markup)"
 msgstr "&Ondertekenen (opmaak verwijderen)"
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4242
 msgid ""
 "<qt>"
 "<p>Inline signing/encrypting of HTML messages is not possible;</p>"
@@ -5899,11 +6693,11 @@ msgstr ""
 "versleutelen;</p> "
 "<p>Wilt u de opmaak wissen?</p></qt>"
 
-#: kmcomposewin.cpp:4131
+#: kmcomposewin.cpp:4244
 msgid "Sign/Encrypt Message?"
 msgstr "Bericht ondertekenen/versleutelen?"
 
-#: kmcomposewin.cpp:4180
+#: kmcomposewin.cpp:4293
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
 "(anymore); therefore, the default drafts or templates folder will be used."
@@ -5912,43 +6706,63 @@ msgstr ""
 "(meer). In plaats daarvan zal de standaard concepten- of sjabloonmap worden "
 "gebruikt."
 
-#: kmcomposewin.cpp:4326
+#: kmcomposewin.cpp:4393 kmsender.cpp:114
+msgid "Please create an account for sending and try again."
+msgstr "Maak een account aan voor het verzenden en probeer het opnieuw."
+
+#: kmcomposewin.cpp:4456
 msgid "About to send email..."
 msgstr "Staat op het punt een bericht te verzenden..."
 
-#: kmcomposewin.cpp:4327
+#: kmcomposewin.cpp:4457
 msgid "Send Confirmation"
 msgstr "Bevestiging verzenden"
 
-#: kmcomposewin.cpp:4328 redirectdialog.cpp:82
+#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "Nu ver&zenden"
 
-#: kmcomposewin.cpp:4549
+#: kmcomposewin.cpp:4479
+msgid ""
+"You are trying to send the mail to more than %1 recipients. Send message "
+"anyway?"
+msgstr ""
+
+#: kmcomposewin.cpp:4480
+#, fuzzy
+msgid "Too many receipients"
+msgstr "Geen geadresseerden"
+
+#: kmcomposewin.cpp:4482
+#, fuzzy
+msgid "&Edit Recipients"
+msgstr "Extra geadresseerden"
+
+#: kmcomposewin.cpp:4728
 msgid "Spellcheck: on"
 msgstr "Spellingcontrole: aan"
 
-#: kmcomposewin.cpp:4551
+#: kmcomposewin.cpp:4730
 msgid "Spellcheck: off"
 msgstr "Spellingcontrole: uit"
 
-#: kmcomposewin.cpp:4608
+#: kmcomposewin.cpp:4787
 msgid " Spell check canceled."
 msgstr " Spellingcontrole geannuleerd."
 
-#: kmcomposewin.cpp:4611
+#: kmcomposewin.cpp:4790
 msgid " Spell check stopped."
 msgstr " Spellingcontrole gestopt."
 
-#: kmcomposewin.cpp:4614
+#: kmcomposewin.cpp:4793
 msgid " Spell check complete."
 msgstr " Spellingcontrole uitgevoerd."
 
-#: kmcomposewin.cpp:4798 kmcomposewin.cpp:4806
+#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
 msgid "Spellchecker"
 msgstr "Spellingcontrole"
 
-#: kmcomposewin.cpp:5115
+#: kmcomposewin.cpp:5304
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
 "You can do this in the Crypto Backends tab of the configure dialog's Security "
@@ -5959,7 +6773,7 @@ msgstr ""
 "U kunt dit doen in het tabblad Crypto-backends in het onderdeel Beveiliging van "
 "het configuratievenster van KMail."
 
-#: kmcomposewin.cpp:5119
+#: kmcomposewin.cpp:5308
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
@@ -5967,49 +6781,60 @@ msgstr ""
 "Het lijkt erop dat libkleopatra is gecompileerd zonder Chiasmus-ondersteuning. "
 "Wellicht wilt u libkleopatra opnieuw compileren met de vlag --enable-chiasmus."
 
-#: kmcomposewin.cpp:5122
+#: kmcomposewin.cpp:5311
 msgid "No Chiasmus Backend Configured"
 msgstr "Geen Chiasmus-backend ingesteld"
 
-#: kmcomposewin.cpp:5153
+#: kmcomposewin.cpp:5342
 msgid "No Chiasmus Keys Found"
 msgstr "Geen Chiasmus-sleutels gevonden"
 
-#: kmcomposewin.cpp:5157
+#: kmcomposewin.cpp:5346
 msgid "Chiasmus Encryption Key Selection"
 msgstr "Sleutelselectie Chiasmus-versleuteling"
 
-#: kmcomposewin.cpp:5189
+#: kmcomposewin.cpp:5378
 msgid "Message will be signed"
 msgstr "Het bericht zal worden ondertekend"
 
-#: kmcomposewin.cpp:5189
+#: kmcomposewin.cpp:5378
 msgid "Message will not be signed"
 msgstr "Het bericht zal niet worden ondertekend"
 
-#: kmcomposewin.cpp:5190
+#: kmcomposewin.cpp:5379
 msgid "Message will be encrypted"
 msgstr "Het bericht zal versleuteld worden"
 
-#: kmcomposewin.cpp:5190
+#: kmcomposewin.cpp:5379
 msgid "Message will not be encrypted"
 msgstr "Het bericht zal niet versleuteld worden"
 
-#: kmedit.cpp:391
+#: kmedit.cpp:458
 msgid "Unable to start external editor."
 msgstr "De externe editor kon niet worden opgestart."
 
-#: kmedit.cpp:442
-msgid "Suggestions"
+#: kmedit.cpp:522
+#, fuzzy
+msgid "No Suggestions"
 msgstr "Suggesties"
 
-#: kmedit.cpp:494
+#: kmedit.cpp:529
+#, fuzzy
+msgid "Add to Dictionary"
+msgstr "Woor&denboek"
+
+#: kmedit.cpp:530
+#, fuzzy
+msgid "Ignore All"
+msgstr "Negeren"
+
+#: kmedit.cpp:587
 msgid "Automatic spellchecking is not possible on text with markup."
 msgstr ""
 "Het is bij opgemaakte teksten niet mogelijk om een automatische "
 "spellingcontrole uit te voeren."
 
-#: kmedit.cpp:538
+#: kmedit.cpp:631
 msgid ""
 "The external editor is still running.\n"
 "Abort the external editor or leave it open?"
@@ -6017,19 +6842,19 @@ msgstr ""
 "De externe editor draait nog steeds.\n"
 "Wilt u de externe editor afsluiten of openhouden?"
 
-#: kmedit.cpp:541
+#: kmedit.cpp:634
 msgid "Abort Editor"
 msgstr "Editor afsluiten"
 
-#: kmedit.cpp:541
+#: kmedit.cpp:634
 msgid "Leave Editor Open"
 msgstr "Editor open laten"
 
-#: kmedit.cpp:565
+#: kmedit.cpp:661
 msgid "Spellcheck - KMail"
 msgstr "Spellingcontrole - KMail"
 
-#: kmedit.cpp:734
+#: kmedit.cpp:884
 msgid ""
 "ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
 "properly configured and in your PATH."
@@ -6037,15 +6862,20 @@ msgstr ""
 "ISpell/ASpell kon niet worden opgestart. Zorg ervoor dat ISpell of ASpell goed "
 "is geconfigureerd en in uw zoekpad (PATH) staat."
 
-#: kmedit.cpp:743
+#: kmedit.cpp:893
 msgid "ISpell/Aspell seems to have crashed."
 msgstr "ISpell/ASpell is onverwacht beëindigd."
 
-#: kmedit.cpp:752
+#: kmedit.cpp:902
 msgid "No misspellings encountered."
 msgstr "Geen foutgespelde woorden gevonden."
 
-#: kmfawidgets.cpp:102
+#: kmfawidgets.cpp:39
+#, fuzzy
+msgid "Open Address Book"
+msgstr "Openen in adresboek"
+
+#: kmfawidgets.cpp:107
 msgid "Select Sound File"
 msgstr "Geluidsbestand selecteren"
 
@@ -6072,191 +6902,223 @@ msgstr ""
 "<br> in filterregel <b>%2</b>."
 "<br>Deze wordt genegeerd.</qt>"
 
-#: kmfilteraction.cpp:598
+#: kmfilteraction.cpp:601
 msgid "Confirm Delivery"
 msgstr "Aflevering bevestigen"
 
-#: kmfilteraction.cpp:634
+#: kmfilteraction.cpp:637
 msgid "Set Transport To"
 msgstr "Transport instellen op"
 
-#: kmfilteraction.cpp:665
+#: kmfilteraction.cpp:668
 msgid "Set Reply-To To"
 msgstr "Antwoordadres instellen op"
 
-#: kmfilteraction.cpp:701
+#: kmfilteraction.cpp:704
 msgid "Set Identity To"
 msgstr "Identiteit instellen op"
 
-#: kmfilteraction.cpp:784
+#: kmfilteraction.cpp:787
 msgid "Mark As"
 msgstr "Markeren als"
 
-#: kmfilteraction.cpp:789
+#: kmfilteraction.cpp:792
 msgid ""
 "_: msg status\n"
 "Important"
 msgstr "Belangrijk"
 
-#: kmfilteraction.cpp:790
+#: kmfilteraction.cpp:793
 msgid ""
 "_: msg status\n"
 "Read"
 msgstr "Gelezen"
 
-#: kmfilteraction.cpp:791
+#: kmfilteraction.cpp:794
 msgid ""
 "_: msg status\n"
 "Unread"
 msgstr "Ongelezen"
 
-#: kmfilteraction.cpp:792
+#: kmfilteraction.cpp:795
 msgid ""
 "_: msg status\n"
 "Replied"
 msgstr "Beantwoord"
 
-#: kmfilteraction.cpp:793
+#: kmfilteraction.cpp:796
 msgid ""
 "_: msg status\n"
 "Forwarded"
 msgstr "Doorgestuurd"
 
-#: kmfilteraction.cpp:794
+#: kmfilteraction.cpp:797
 msgid ""
 "_: msg status\n"
 "Old"
 msgstr "Oud"
 
-#: kmfilteraction.cpp:795
+#: kmfilteraction.cpp:798
 msgid ""
 "_: msg status\n"
 "New"
 msgstr "Nieuw"
 
-#: kmfilteraction.cpp:796
+#: kmfilteraction.cpp:799
 msgid ""
 "_: msg status\n"
 "Watched"
 msgstr "Geobserveerd"
 
-#: kmfilteraction.cpp:797
+#: kmfilteraction.cpp:800
 msgid ""
 "_: msg status\n"
 "Ignored"
 msgstr "Genegeerd"
 
-#: kmfilteraction.cpp:798
+#: kmfilteraction.cpp:801
 msgid ""
 "_: msg status\n"
 "Spam"
 msgstr "Ongewenst"
 
-#: kmfilteraction.cpp:799
+#: kmfilteraction.cpp:802
 msgid ""
 "_: msg status\n"
 "Ham"
 msgstr "Gewenst"
 
-#: kmfilteraction.cpp:883
+#: kmfilteraction.cpp:886
 msgid "Send Fake MDN"
 msgstr "Valse MDN verzenden"
 
-#: kmfilteraction.cpp:888
+#: kmfilteraction.cpp:891
 msgid ""
 "_: MDN type\n"
 "Ignore"
 msgstr "Negeren"
 
-#: kmfilteraction.cpp:889
+#: kmfilteraction.cpp:892
 msgid ""
 "_: MDN type\n"
 "Displayed"
 msgstr "Weergegeven"
 
-#: kmfilteraction.cpp:890
+#: kmfilteraction.cpp:893
 msgid ""
 "_: MDN type\n"
 "Deleted"
 msgstr "Verwijderd"
 
-#: kmfilteraction.cpp:891
+#: kmfilteraction.cpp:894
 msgid ""
 "_: MDN type\n"
 "Dispatched"
 msgstr "Doorgestuurd"
 
-#: kmfilteraction.cpp:892
+#: kmfilteraction.cpp:895
 msgid ""
 "_: MDN type\n"
 "Processed"
 msgstr "Verwerkt"
 
-#: kmfilteraction.cpp:893
+#: kmfilteraction.cpp:896
 msgid ""
 "_: MDN type\n"
 "Denied"
 msgstr "Geweigerd"
 
-#: kmfilteraction.cpp:894
+#: kmfilteraction.cpp:897
 msgid ""
 "_: MDN type\n"
 "Failed"
 msgstr "Mislukt"
 
-#: kmfilteraction.cpp:963
+#: kmfilteraction.cpp:966
 msgid "Remove Header"
 msgstr "Berichtkop verwijderen"
 
-#: kmfilteraction.cpp:1036
+#: kmfilteraction.cpp:1039
 msgid "Add Header"
 msgstr "Berichtkop toevoegen"
 
-#: kmfilteraction.cpp:1063
+#: kmfilteraction.cpp:1066
 msgid "With value:"
 msgstr "Met waarde:"
 
-#: kmfilteraction.cpp:1177
+#: kmfilteraction.cpp:1180
 msgid "Rewrite Header"
 msgstr "Berichtkop herschrijven"
 
-#: kmfilteraction.cpp:1213
+#: kmfilteraction.cpp:1216
 msgid "Replace:"
 msgstr "Vervangen:"
 
-#: kmfilteraction.cpp:1220
+#: kmfilteraction.cpp:1223
 msgid "With:"
 msgstr "Door:"
 
-#: kmfilteraction.cpp:1340
+#: kmfilteraction.cpp:1343
 msgid "Move Into Folder"
 msgstr "Verplaatsen naar deze map"
 
-#: kmfilteraction.cpp:1390
+#: kmfilteraction.cpp:1393
 msgid "Copy Into Folder"
 msgstr "Kopiëren naar deze map"
 
-#: kmfilteraction.cpp:1452
+#: kmfilteraction.cpp:1467
 msgid "Forward To"
 msgstr "Doorsturen naar"
 
-#: kmfilteraction.cpp:1565
+#: kmfilteraction.cpp:1508
+msgid "The addressee the message will be forwarded to"
+msgstr ""
+
+#: kmfilteraction.cpp:1509
+msgid "The filter will forward the message to the addressee entered here."
+msgstr ""
+
+#: kmfilteraction.cpp:1515
+#, fuzzy
+msgid "Default Template"
+msgstr "Aangepaste s&jablonen"
+
+#: kmfilteraction.cpp:1525
+#, fuzzy
+msgid "The template used when forwarding"
+msgstr "Berichtsjabloon voor doorsturen"
+
+#: kmfilteraction.cpp:1526
+msgid "Set the forwarding template that will be used with this filter."
+msgstr ""
+
+#: kmfilteraction.cpp:1620
+#, fuzzy
+msgid "Forward to %1 with default template "
+msgstr "Doorsturen met aangepast sjabloon"
+
+#: kmfilteraction.cpp:1622
+#, fuzzy
+msgid "Forward to %1 with template %2"
+msgstr "Doorsturen met aangepast sjabloon"
+
+#: kmfilteraction.cpp:1643
 msgid "Redirect To"
 msgstr "Omleiden naar"
 
-#: kmfilteraction.cpp:1605
+#: kmfilteraction.cpp:1683
 msgid "Execute Command"
 msgstr "Commando uitvoeren"
 
-#: kmfilteraction.cpp:1702
+#: kmfilteraction.cpp:1780
 msgid "Pipe Through"
 msgstr "Doorsluizen via"
 
-#: kmfilteraction.cpp:1809
+#: kmfilteraction.cpp:1887
 msgid "Play Sound"
 msgstr "Geluid afspelen"
 
-#: kmfilterdlg.cpp:51
+#: kmfilterdlg.cpp:55
 msgid ""
 "<qt>"
 "<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
@@ -6269,7 +7131,7 @@ msgstr ""
 "<p>Klik op een filter om deze te bewerken met de knoppen in de rechter helft "
 "van het dialoogvenster.</p></qt>"
 
-#: kmfilterdlg.cpp:57
+#: kmfilterdlg.cpp:61
 msgid ""
 "<qt>"
 "<p>Click this button to create a new filter.</p>"
@@ -6285,7 +7147,7 @@ msgstr ""
 "<p>Mocht u deze knop per ongeluk hebben ingedrukt, dan kunt u dit ongedaan "
 "maken door rechts op de knop <em>verwijderen</em> te drukken.</p></qt>"
 
-#: kmfilterdlg.cpp:64
+#: kmfilterdlg.cpp:68
 msgid ""
 "<qt>"
 "<p>Click this button to copy a filter.</p>"
@@ -6297,7 +7159,7 @@ msgstr ""
 "<p>Mocht u deze knop per ongeluk hebben ingedrukt, dan kunt u dit ongedaan "
 "maken door rechts op de knop <em>verwijderen</em> te drukken.</p></qt>"
 
-#: kmfilterdlg.cpp:68
+#: kmfilterdlg.cpp:72
 msgid ""
 "<qt>"
 "<p>Click this button to <em>delete</em> the currently-selected filter from the "
@@ -6313,7 +7175,7 @@ msgstr ""
 "dialoogvenster altijd verlaten zonder dat de wijzigingen van kracht worden. Dit "
 "doet u door op <em>Annuleren</em> te drukken.</p></qt>"
 
-#: kmfilterdlg.cpp:75
+#: kmfilterdlg.cpp:79
 msgid ""
 "<qt>"
 "<p>Click this button to move the currently-selected filter to the <em>top</em> "
@@ -6328,7 +7190,7 @@ msgstr ""
 "<p>Het aanpassen hiervan is handig omdat het programma de filters op volgorde "
 "afhandelt. Het eerste filter wordt als eerste afgehandeld.</p></qt>"
 
-#: kmfilterdlg.cpp:81
+#: kmfilterdlg.cpp:85
 msgid ""
 "<qt>"
 "<p>Click this button to move the currently-selected filter <em>up</em> "
@@ -6347,7 +7209,7 @@ msgstr ""
 "<p>Mocht u deze knop per ongeluk hebben ingedrukt, dan kunt u de zet ongedaan "
 "maken via de knop <em>omlaag</em>.</p></qt>"
 
-#: kmfilterdlg.cpp:89
+#: kmfilterdlg.cpp:93
 msgid ""
 "<qt>"
 "<p>Click this button to move the currently-selected filter <em>down</em> "
@@ -6366,7 +7228,7 @@ msgstr ""
 "<p>Mocht u deze knop per ongeluk hebben ingedrukt, dan kunt u de zet ongedaan "
 "maken via de knop <em>omhoog</em></p></qt>"
 
-#: kmfilterdlg.cpp:97
+#: kmfilterdlg.cpp:101
 msgid ""
 "<qt>"
 "<p>Click this button to move the currently-selected filter to the <em>"
@@ -6381,7 +7243,7 @@ msgstr ""
 "<p>Het aanpassen hiervan is handig omdat het programma de filters op volgorde "
 "afhandelt. Het eerste filter wordt als eerste afgehandeld.</p></qt>"
 
-#: kmfilterdlg.cpp:103
+#: kmfilterdlg.cpp:107
 msgid ""
 "<qt>"
 "<p>Click this button to rename the currently-selected filter.</p>"
@@ -6398,7 +7260,7 @@ msgstr ""
 "weer terug, druk dan op deze knop en selecteer <em>Beginwaarde</em> "
 "en vervolgens <em>Wissen</em> in het volgende dialoogvenster.</p></qt>"
 
-#: kmfilterdlg.cpp:110
+#: kmfilterdlg.cpp:114
 msgid ""
 "<qt>"
 "<p>Check this button to force the confirmation dialog to be displayed.</p>"
@@ -6416,115 +7278,120 @@ msgstr ""
 "server wachten, of als u de filterinstelling voor het markeren van de berichten "
 "wou veranderen.</p></qt>"
 
-#: kmfilterdlg.cpp:129
+#: kmfilterdlg.cpp:133
 msgid "POP3 Filter Rules"
 msgstr "POP3-filterregels"
 
-#: kmfilterdlg.cpp:129
+#: kmfilterdlg.cpp:133
 msgid "Filter Rules"
 msgstr "Filterregels"
 
-#: kmfilterdlg.cpp:151
+#: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "Beschikbare filters"
 
-#: kmfilterdlg.cpp:164
+#: kmfilterdlg.cpp:168
 msgid "A&dvanced"
 msgstr "Geavanceer&d"
 
-#: kmfilterdlg.cpp:171
+#: kmfilterdlg.cpp:175
 msgid "Filter Criteria"
 msgstr "Filtercriteria"
 
-#: kmfilterdlg.cpp:175
+#: kmfilterdlg.cpp:179
 msgid "Filter Action"
 msgstr "Filterhandelingen"
 
-#: kmfilterdlg.cpp:178
+#: kmfilterdlg.cpp:182
 msgid "Global Options"
 msgstr "Globale opties"
 
-#: kmfilterdlg.cpp:179
+#: kmfilterdlg.cpp:183
 msgid "Always &show matched 'Download Later' messages in confirmation dialog"
 msgstr ""
 "Overeenkomende beri&chten die gemarkeerd zijn als \"Later ophalen\" altijd "
 "tonen in het bevestigingsdialoog"
 
-#: kmfilterdlg.cpp:184
+#: kmfilterdlg.cpp:188
 msgid "Filter Actions"
 msgstr "Filterhandelingen"
 
-#: kmfilterdlg.cpp:189
+#: kmfilterdlg.cpp:193
 msgid "Advanced Options"
 msgstr "Uitgebreide opties"
 
-#: kmfilterdlg.cpp:197
+#: kmfilterdlg.cpp:201
 msgid "Apply this filter to incoming messages:"
 msgstr "Dit filter toepassen op inkomende berichten:"
 
-#: kmfilterdlg.cpp:201
+#: kmfilterdlg.cpp:205
 msgid "from all accounts"
 msgstr "van alle accounts"
 
-#: kmfilterdlg.cpp:204
+#: kmfilterdlg.cpp:208
 msgid "from all but online IMAP accounts"
 msgstr "van alle behalve de online IMAP-accounts"
 
-#: kmfilterdlg.cpp:207
+#: kmfilterdlg.cpp:211
 msgid "from checked accounts only"
 msgstr "enkel van geselecteerde accounts"
 
-#: kmfilterdlg.cpp:213
+#: kmfilterdlg.cpp:217
 msgid "Account Name"
 msgstr "Accountnaam"
 
-#: kmfilterdlg.cpp:220
+#: kmfilterdlg.cpp:224
 msgid "Apply this filter to &sent messages"
 msgstr "Dit filter toepassen op ver&zonden berichten"
 
-#: kmfilterdlg.cpp:223
+#: kmfilterdlg.cpp:227
 msgid "Apply this filter on manual &filtering"
 msgstr "Dit filter toepassen bij handmatig &filteren"
 
-#: kmfilterdlg.cpp:226
+#: kmfilterdlg.cpp:230
 msgid "If this filter &matches, stop processing here"
 msgstr "Als dit filter overeen ko&mt, verwerking hier stoppen"
 
-#: kmfilterdlg.cpp:230
+#: kmfilterdlg.cpp:234
 msgid "Add this filter to the Apply Filter menu"
 msgstr "Dit filter toevoegen aan het menu \"Filter toepassen\""
 
-#: kmfilterdlg.cpp:232
+#: kmfilterdlg.cpp:236
 msgid "Shortcut:"
 msgstr "Sneltoets:"
 
-#: kmfilterdlg.cpp:238
+#: kmfilterdlg.cpp:242
 msgid "Additionally add this filter to the toolbar"
 msgstr "Dit filter ook toevoegen aan werkbalk"
 
-#: kmfilterdlg.cpp:243
+#: kmfilterdlg.cpp:247
 msgid "Icon for this filter:"
 msgstr "Pictogram voor dit filter:"
 
-#: kmfilterdlg.cpp:608
+#: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "Omhoog"
 
-#: kmfilterdlg.cpp:609
+#: kmfilterdlg.cpp:613
 msgid "Down"
 msgstr "Omlaag"
 
-#: kmfilterdlg.cpp:628
+#: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "Hernoemen..."
 
 #. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:629 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
 #, no-c-format
 msgid "New"
 msgstr "Nieuw"
 
-#: kmfilterdlg.cpp:744
+#: kmfilterdlg.cpp:645
+#, fuzzy
+msgid "Select Source Folders"
+msgstr "Selecteer een sneltoets voor de map"
+
+#: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
 "will only be applied when manually filtering and when filtering incoming online "
@@ -6534,7 +7401,7 @@ msgstr ""
 "heeft. Deze filters worden alleen toegepast wanneer er handmatig gefilterd "
 "wordt of wanneer u binnenkomende berichten van uw online IMAP-account ophaalt."
 
-#: kmfilterdlg.cpp:774
+#: kmfilterdlg.cpp:786
 msgid ""
 "The following filters have not been saved because they were invalid (e.g. "
 "containing no actions or no search rules)."
@@ -6542,11 +7409,11 @@ msgstr ""
 "De volgende filters zijn niet opgeslagen omdat ze ongeldig zijn (bijv. omdat ze "
 "geen handelingen of zoekregels bevatten)."
 
-#: kmfilterdlg.cpp:935
+#: kmfilterdlg.cpp:947
 msgid "Rename Filter"
 msgstr "Filter hernoemen"
 
-#: kmfilterdlg.cpp:936
+#: kmfilterdlg.cpp:948
 msgid ""
 "Rename filter \"%1\" to:\n"
 "(leave the field empty for automatic naming)"
@@ -6554,19 +7421,24 @@ msgstr ""
 "Filter \"%1\" hernoemen naar:\n"
 "(laat het veld leeg voor een automatische benaming)"
 
-#: kmfilterdlg.cpp:1113
+#: kmfilterdlg.cpp:973
+#, fuzzy
+msgid "Select Folders to Filter"
+msgstr "Map met focus selecteren"
+
+#: kmfilterdlg.cpp:1136
 msgid "Please select an action."
 msgstr "Selecteer a.u.b. een handeling."
 
-#: kmfilterdlg.cpp:1280
+#: kmfilterdlg.cpp:1303
 msgid "&Download mail"
 msgstr "Berichten o&phalen"
 
-#: kmfilterdlg.cpp:1281
+#: kmfilterdlg.cpp:1304
 msgid "Download mail la&ter"
 msgstr "Berichten la&ter ophalen"
 
-#: kmfilterdlg.cpp:1282
+#: kmfilterdlg.cpp:1305
 msgid "D&elete mail from server"
 msgstr "Berichten van server v&erwijderen"
 
@@ -6574,10 +7446,30 @@ msgstr "Berichten van server v&erwijderen"
 msgid "<qt>Error while creating file <b>%1</b>:<br>%2</qt>"
 msgstr "<qt>Fout tijdens het aanmaken van bestand <b>%1</b>:<br>%2</qt>"
 
-#: kmfolder.cpp:272
+#: kmfolder.cpp:276
 msgid "Failed to create folder"
 msgstr "De map kon niet worden aangemaakt"
 
+#: kmfolder.cpp:907
+msgid ""
+"Folder names cannot contain the / (slash) character; please choose another "
+"folder name."
+msgstr "Mapnamen kunnen niet het teken / bevatten; kies een andere mapnaam."
+
+#: kmfolder.cpp:913
+msgid ""
+"Folder names cannot start with a . (dot) character; please choose another "
+"folder name."
+msgstr ""
+"Mapnamen kunnen geen . (punt) bevatten; kies daarom een andere mapnaam."
+
+#: kmfolder.cpp:932
+msgid ""
+"Your IMAP server does not allow the character '%1'; please choose another "
+"folder name."
+msgstr ""
+"Uw IMAP-server ondersteunt het teken '%1' niet; kies een andere mapnaam."
+
 #: kmfoldercachedimap.cpp:107
 msgid "Troubleshooting IMAP Cache"
 msgstr "Probleemoplossing voor de IMAP-cache"
@@ -6632,7 +7524,7 @@ msgstr "Alle mappen van dit account"
 msgid "Refresh &Cache"
 msgstr "&Buffer verversen"
 
-#: kmfoldercachedimap.cpp:203
+#: kmfoldercachedimap.cpp:216
 msgid ""
 "The UID cache file for folder %1 could not be read. There could be a problem "
 "with file system permission, or it is corrupted."
@@ -6640,7 +7532,7 @@ msgstr ""
 "Het UID-cachebestand van de map %1 kon niet gelezen worden. Er kan een probleem "
 "zijn met de toegangsrechten of het bestand is corrupt."
 
-#: kmfoldercachedimap.cpp:452
+#: kmfoldercachedimap.cpp:488
 msgid ""
 "The UID cache file for folder %1 could not be written. There could be a problem "
 "with file system permission."
@@ -6648,11 +7540,11 @@ msgstr ""
 "Het UID-cachebestand voor de map %1 kon niet geschreven worden. Er kan een "
 "probleem zijn met uw toegangsrechten."
 
-#: kmfoldercachedimap.cpp:562
+#: kmfoldercachedimap.cpp:612
 msgid "You must synchronize with the server before renaming IMAP folders."
 msgstr "Voer eerst een synchronisatie uit voordat u de IMAP-mappen hernoemt."
 
-#: kmfoldercachedimap.cpp:679
+#: kmfoldercachedimap.cpp:735
 msgid ""
 "No account setup for this folder.\n"
 "Please try running a sync before this."
@@ -6660,7 +7552,7 @@ msgstr ""
 "Geen accountinstelling voor deze map.\n"
 "Probeer eerst een synchronisatie uit te voeren."
 
-#: kmfoldercachedimap.cpp:683
+#: kmfoldercachedimap.cpp:739
 msgid ""
 "Are you sure you want to refresh the IMAP cache of the folder %1 and all its "
 "subfolders?\n"
@@ -6670,19 +7562,19 @@ msgstr ""
 "verversen?\n"
 "Alle lokale wijzigingen zullen verloren gaan."
 
-#: kmfoldercachedimap.cpp:687 kmmainwidget.cpp:1352
+#: kmfoldercachedimap.cpp:743 kmmainwidget.cpp:1316
 msgid "Refresh IMAP Cache"
 msgstr "IMAP-buffer verversen"
 
-#: kmfoldercachedimap.cpp:688 kmmainwidget.cpp:1352
+#: kmfoldercachedimap.cpp:744 kmmainwidget.cpp:1316
 msgid "&Refresh"
 msgstr "Ve&rversen"
 
-#: kmfoldercachedimap.cpp:711
+#: kmfoldercachedimap.cpp:767
 msgid "The index of this folder has been recreated."
 msgstr "De index van deze map is opnieuw aangemaakt."
 
-#: kmfoldercachedimap.cpp:721
+#: kmfoldercachedimap.cpp:777
 msgid ""
 "Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
 "to initial sync state and sync anyway?"
@@ -6692,104 +7584,105 @@ msgstr ""
 "Wilt u deze terugzetten naar de oorspronkelijke synchronisatiestatus en toch "
 "synchroniseren?"
 
-#: kmfoldercachedimap.cpp:721
+#: kmfoldercachedimap.cpp:777
 msgid "Reset && Sync"
 msgstr "Hestellen && synchroniseren"
 
-#: kmfoldercachedimap.cpp:741
+#: kmfoldercachedimap.cpp:798
 msgid "Synchronization skipped"
 msgstr "Synchronisatie overgeslagen"
 
-#: kmfoldercachedimap.cpp:831
+#: kmfoldercachedimap.cpp:890
 msgid "Synchronizing"
 msgstr "Synchronisatie loopt"
 
-#: kmfoldercachedimap.cpp:850
+#: kmfoldercachedimap.cpp:909
 #, c-format
 msgid "Connecting to %1"
 msgstr "Verbinden met %1"
 
-#: kmfoldercachedimap.cpp:872
+#: kmfoldercachedimap.cpp:934
 msgid "Checking permissions"
 msgstr "Toegangsrechten worden gecontroleerd"
 
-#: kmfoldercachedimap.cpp:886
+#: kmfoldercachedimap.cpp:956
 msgid "Renaming folder"
 msgstr "Map wordt hernoemd"
 
-#: kmfoldercachedimap.cpp:948
+#: kmfoldercachedimap.cpp:1021
 msgid "Retrieving folderlist"
 msgstr "Mappenlijst wordt opgehaald"
 
-#: kmfoldercachedimap.cpp:952
+#: kmfoldercachedimap.cpp:1026
 msgid "Error while retrieving the folderlist"
 msgstr "Fout bij het ophalen van mappenlijst"
 
-#: kmfoldercachedimap.cpp:959
+#: kmfoldercachedimap.cpp:1035
 msgid "Retrieving subfolders"
 msgstr "Submappen worden opgehaald"
 
-#: kmfoldercachedimap.cpp:966
+#: kmfoldercachedimap.cpp:1043
 msgid "Deleting folders from server"
 msgstr "De mappen op de server worden verwijderd"
 
-#: kmfoldercachedimap.cpp:981
+#: kmfoldercachedimap.cpp:1058
 msgid "Retrieving message list"
 msgstr "De berichtenlijst wordt opgehaald"
 
-#: kmfoldercachedimap.cpp:994
+#: kmfoldercachedimap.cpp:1071
 msgid "No messages to delete..."
 msgstr "Geen berichten om te verwijderen..."
 
-#: kmfoldercachedimap.cpp:1005
+#: kmfoldercachedimap.cpp:1082
 msgid "Expunging deleted messages"
 msgstr "Verwijderde berichten worden geschrapt"
 
-#: kmfoldercachedimap.cpp:1019
-msgid "Retrieving new messages"
-msgstr "Nieuwe berichten worden opgehaald"
+#: kmfoldercachedimap.cpp:1096
+#, fuzzy, c-format
+msgid ""
+"_n: Retrieving one new message\n"
+"Retrieving %n new messages"
+msgstr ""
+"1 nieuw bericht in %1.\n"
+"%n nieuwe berichten in %1."
 
-#: kmfoldercachedimap.cpp:1031
+#: kmfoldercachedimap.cpp:1108
 msgid "No new messages from server"
 msgstr "Geen nieuwe berichten van de server"
 
-#: kmfoldercachedimap.cpp:1064
+#: kmfoldercachedimap.cpp:1141
 msgid "Checking annotation support"
 msgstr "Ondersteuning voor speciale inhoud wordt gecontroleerd"
 
-#: kmfoldercachedimap.cpp:1111
+#: kmfoldercachedimap.cpp:1191
 msgid "Retrieving annotations"
 msgstr "Speciale inhoud wordt opgehaald"
 
-#: kmfoldercachedimap.cpp:1133
+#: kmfoldercachedimap.cpp:1213
 msgid "Setting annotations"
 msgstr "Speciale inhoud wordt ingesteld"
 
-#: kmfoldercachedimap.cpp:1174
+#: kmfoldercachedimap.cpp:1260
 msgid "Setting permissions"
 msgstr "Toegangsrechten instellen"
 
-#: kmfoldercachedimap.cpp:1193
+#: kmfoldercachedimap.cpp:1279
 msgid "Retrieving permissions"
 msgstr "Toegangsrechten worden opgehaald"
 
-#: kmfoldercachedimap.cpp:1203
+#: kmfoldercachedimap.cpp:1306
 msgid "Getting quota information"
 msgstr "Quotagegevens worden opgehaald"
 
-#: kmfoldercachedimap.cpp:1218
-msgid "Updating cache file"
-msgstr "Het bufferbestand wordt bijgewerkt"
-
-#: kmfoldercachedimap.cpp:1244
+#: kmfoldercachedimap.cpp:1321
 msgid "Synchronization done"
 msgstr "Synchronisatie is voltooid"
 
-#: kmfoldercachedimap.cpp:1326
+#: kmfoldercachedimap.cpp:1464
 msgid "Uploading messages to server"
 msgstr "Berichten worden naar de server verzonden"
 
-#: kmfoldercachedimap.cpp:1342
+#: kmfoldercachedimap.cpp:1480
 msgid ""
 "<p>Your access rights to folder <b>%1</b> have been restricted, it will no "
 "longer be possible to add messages to this folder.</p>"
@@ -6797,24 +7690,24 @@ msgstr ""
 "<p>Uw toegangsrechten tot de map <b>%1</b> zijn beperkt, u kunt niet langer "
 "berichten toevoegen aan deze map.</p>"
 
-#: kmfoldercachedimap.cpp:1344
+#: kmfoldercachedimap.cpp:1482
 msgid "Acces rights revoked"
 msgstr "Toegangsrechten teruggetrokken"
 
-#: kmfoldercachedimap.cpp:1347 kmfoldercachedimap.cpp:1402
-#: kmfoldercachedimap.cpp:1447
+#: kmfoldercachedimap.cpp:1485 kmfoldercachedimap.cpp:1545
+#: kmfoldercachedimap.cpp:1596
 msgid "No messages to upload to server"
 msgstr "Geen berichten om te verzenden naar de server"
 
-#: kmfoldercachedimap.cpp:1366 kmfoldercachedimap.cpp:1410
+#: kmfoldercachedimap.cpp:1504 kmfoldercachedimap.cpp:1553
 msgid "Uploading status of messages to server"
 msgstr "De berichtenstatus wordt naar de server verzonden"
 
-#: kmfoldercachedimap.cpp:1490
+#: kmfoldercachedimap.cpp:1647
 msgid "Creating subfolders on server"
 msgstr "De submappen worden op de server aangemaakt"
 
-#: kmfoldercachedimap.cpp:1546
+#: kmfoldercachedimap.cpp:1707
 msgid ""
 "<qt>"
 "<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
@@ -6826,24 +7719,24 @@ msgstr ""
 "lokaal verwijderen?"
 "<br> UIDs: %2</p></qt>"
 
-#: kmfoldercachedimap.cpp:1558
+#: kmfoldercachedimap.cpp:1719
 msgid "Deleting removed messages from server"
 msgstr "De verwijderde berichten van de server verwijderd"
 
-#: kmfoldercachedimap.cpp:1592
+#: kmfoldercachedimap.cpp:1758
 msgid "Checking folder validity"
 msgstr "Bezig met het controleren van de mapintegriteit"
 
-#: kmfoldercachedimap.cpp:1806
+#: kmfoldercachedimap.cpp:1972
 msgid "Folder listing failed in interesting ways."
 msgstr "Het opvragen van de map is mislukt."
 
-#: kmfoldercachedimap.cpp:1888
+#: kmfoldercachedimap.cpp:2058
 #, c-format
 msgid "Retrieving folders for namespace %1"
 msgstr "Mappen voor namespace %1 worden opgehaald"
 
-#: kmfoldercachedimap.cpp:2130
+#: kmfoldercachedimap.cpp:2300
 msgid ""
 "<qt>"
 "<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
@@ -6853,11 +7746,11 @@ msgstr ""
 "<p>Het lijkt of de map <b>%1</b> was verwijderd. Wilt u het verwijderen van de "
 "server?</p></qt>"
 
-#: kmfoldercachedimap.cpp:2411
+#: kmfoldercachedimap.cpp:2597
 msgid "Aborted"
 msgstr "Afgebroken"
 
-#: kmfoldercachedimap.cpp:2592
+#: kmfoldercachedimap.cpp:2812
 msgid ""
 "The IMAP server %1 does not have support for IMAP annotations. The XML storage "
 "cannot be used on this server; please re-configure KMail differently."
@@ -6866,7 +7759,7 @@ msgstr ""
 "XML-opslag kon niet gebruikt worden voor deze server, pas de instellingen van "
 "KMail daarom aan."
 
-#: kmfoldercachedimap.cpp:2620
+#: kmfoldercachedimap.cpp:2840
 msgid ""
 "The IMAP server %1 doesn't have support for imap annotations. The XML storage "
 "cannot be used on this server, please re-configure KMail differently"
@@ -6875,16 +7768,16 @@ msgstr ""
 "XML-opslag kon niet gebruikt worden voor deze server, pas de instellingen van "
 "KMail daarom aan"
 
-#: kmfoldercachedimap.cpp:2729
+#: kmfoldercachedimap.cpp:2951
 msgid "Error while setting annotation: "
 msgstr ""
 "Er deed zich een fout voor tijdens het instellen van de speciale inhoud: "
 
-#: kmfoldercachedimap.cpp:2857 kmfoldercachedimap.cpp:2860
+#: kmfoldercachedimap.cpp:3079 kmfoldercachedimap.cpp:3082
 msgid "lost+found"
 msgstr "verloren+gevonden"
 
-#: kmfoldercachedimap.cpp:2895
+#: kmfoldercachedimap.cpp:3117
 msgid ""
 "<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
 "the server yet, but the folder has been deleted on the server or you do not "
@@ -6898,11 +7791,11 @@ msgstr ""
 "<p>De betreffende berichten worden verplaatst naar <b>%2</b> "
 "om gegevensverlies te voorkomen.</p>"
 
-#: kmfoldercachedimap.cpp:2901
+#: kmfoldercachedimap.cpp:3123
 msgid "Insufficient access rights"
 msgstr "Onvoldoende toegangsrechten"
 
-#: kmfoldercachedimap.cpp:2907
+#: kmfoldercachedimap.cpp:3129
 msgid ""
 "<p>There are new messages in this folder (%1), which have not been uploaded to "
 "the server yet, but the folder has been deleted on the server or you do not "
@@ -6918,55 +7811,62 @@ msgstr ""
 "berichten uit deze map.</p> "
 "<p>Wilt u de berichten nu naar een andere map verplaatsen?</p>"
 
-#: kmfoldercachedimap.cpp:2914 kmkernel.cpp:1801
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1903
 msgid "Do Not Move"
 msgstr "Niet verplaatsen"
 
-#: kmfoldercachedimap.cpp:2916
+#: kmfoldercachedimap.cpp:3138
 msgid "Move Messages to Folder"
 msgstr "Berichten naar map verplaatsen"
 
-#: kmfolderdia.cpp:83
+#: kmfolderdia.cpp:84
 msgid "Permissions (ACL)"
 msgstr "Toegangsrechten (ACL)"
 
 #. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:121 rc.cpp:221 snippetwidget.cpp:119
+#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "Algemeen"
 
-#: kmfolderdia.cpp:124
+#: kmfolderdia.cpp:125
 msgid "Templates"
 msgstr "Sjablonen"
 
-#: kmfolderdia.cpp:133
+#: kmfolderdia.cpp:134
 msgid "Access Control"
 msgstr "Toegangcontrole"
 
-#: kmfolderdia.cpp:140
+#: kmfolderdia.cpp:141
 msgid "Quota"
 msgstr "Quota"
 
+#: kmfolderdia.cpp:327
+msgid ""
+"Not enough permissions to rename this folder.\n"
+"The parent folder doesn't have write support.\n"
+"A sync is needed after changing the permissions."
+msgstr ""
+
 #. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:299 rc.cpp:239
+#: kmfolderdia.cpp:356 rc.cpp:245
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "Aangepaste p&ictogrammen gebruiken"
 
-#: kmfolderdia.cpp:304
+#: kmfolderdia.cpp:361
 msgid "&Normal:"
 msgstr "&Normaal:"
 
-#: kmfolderdia.cpp:319
+#: kmfolderdia.cpp:376
 msgid "&Unread:"
 msgstr "&Ongelezen:"
 
-#: kmfolderdia.cpp:356
+#: kmfolderdia.cpp:413
 msgid "Act on new/unread mail in this folder"
 msgstr "Notificatie van nieuwe of ongelezen berichten in deze map"
 
-#: kmfolderdia.cpp:358
+#: kmfolderdia.cpp:415
 msgid ""
 "<qt>"
 "<p>If this option is enabled then you will be notified about new/unread mail in "
@@ -6986,15 +7886,15 @@ msgstr ""
 "volgende/vorige map gaat met ongelezen berichten. Dit is handig om mappen met "
 "ongewenste berichten te negeren.</p></qt>"
 
-#: kmfolderdia.cpp:374
+#: kmfolderdia.cpp:431
 msgid "Include this folder in mail checks"
 msgstr "Deze map meenemen in berichtencontrole"
 
-#: kmfolderdia.cpp:385
+#: kmfolderdia.cpp:442
 msgid "Keep replies in this folder"
 msgstr "Antwoorden in deze map behouden"
 
-#: kmfolderdia.cpp:387
+#: kmfolderdia.cpp:444
 msgid ""
 "Check this option if you want replies you write to mails in this folder to be "
 "put in this same folder after sending, instead of in the configured sent-mail "
@@ -7003,34 +7903,34 @@ msgstr ""
 "Activeer deze optie wanneer u uw antwoorden op berichten in deze map wilt "
 "bewaren in plaats van de map Verzonden."
 
-#: kmfolderdia.cpp:402
+#: kmfolderdia.cpp:459
 msgid "Show Sender/Receiver Column in List of Messages"
 msgstr "Afzender/ontvanger tonen in berichtenlijst"
 
-#: kmfolderdia.cpp:404
+#: kmfolderdia.cpp:461
 msgid "Sho&w column:"
 msgstr "Kolo&m tonen:"
 
 #. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:411 kmheaders.cpp:181 kmheaders.cpp:243 kmheaders.cpp:378
-#: kmheaders.cpp:549 kmheaders.cpp:765 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:287
+#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
+#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
 #, no-c-format
 msgid "Sender"
 msgstr "Afzender"
 
 #. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:412 kmheaders.cpp:139 kmheaders.cpp:184 kmheaders.cpp:240
-#: kmheaders.cpp:245 kmheaders.cpp:380 kmheaders.cpp:551 kmheaders.cpp:767
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:290
+#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
+#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
+#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
 #, no-c-format
 msgid "Receiver"
 msgstr "Ontvanger"
 
-#: kmfolderdia.cpp:423
+#: kmfolderdia.cpp:480
 msgid "&Sender identity:"
 msgstr "Identiteit van af&zender:"
 
-#: kmfolderdia.cpp:429
+#: kmfolderdia.cpp:486
 msgid ""
 "Select the sender identity to be used when writing new mail or replying to mail "
 "in this folder. This means that if you are in one of your work folders, you can "
@@ -7044,15 +7944,15 @@ msgstr ""
 "koppelen. U kunt de identiteiten instellen in het configuratievenster "
 "(Instellingen->KMail instellen)."
 
-#: kmfolderdia.cpp:442
+#: kmfolderdia.cpp:500
 msgid "&Folder contents:"
 msgstr "&Mapinhoud:"
 
-#: kmfolderdia.cpp:475
+#: kmfolderdia.cpp:533
 msgid "Generate free/&busy and activate alarms for:"
 msgstr "Vrij/&bezet-informatie aanmaken en herinneringen aanzetten voor:"
 
-#: kmfolderdia.cpp:482
+#: kmfolderdia.cpp:540
 msgid ""
 "This setting defines which users sharing this folder should get \"busy\" "
 "periods in their freebusy lists and should see the alarms for the events or "
@@ -7081,30 +7981,42 @@ msgstr ""
 "Een bedrijf die een agenda heeft voor het hele bedrijf dient dit op \"Niemand\" "
 "te zetten omdat niet bekend is wie naar een bepaald evenement zal gaan."
 
-#: kmfolderdia.cpp:497
+#: kmfolderdia.cpp:555
 msgid "Nobody"
 msgstr "Niemand"
 
-#: kmfolderdia.cpp:498
+#: kmfolderdia.cpp:556
 msgid "Admins of This Folder"
 msgstr "Beheerders van deze map"
 
-#: kmfolderdia.cpp:499
+#: kmfolderdia.cpp:557
 msgid "All Readers of This Folder"
 msgstr "Alle lezers van deze map"
 
-#: kmfolderdia.cpp:502
+#: kmfolderdia.cpp:560
 msgid ""
 "This setting allows you to disable alarms for folders shared by others. "
 msgstr ""
 "Met deze instelling kunt u herinneringen uitschakelen voor mappen die gedeeld "
 "worden met anderen. "
 
-#: kmfolderdia.cpp:506
-msgid "Block free/&busy and alarms locally"
+#: kmfolderdia.cpp:562
+#, fuzzy
+msgid "Block alarms locally"
 msgstr "Vrij/&bezet-informatie en herinneringen lokaal blokkeren"
 
-#: kmfolderdia.cpp:585
+#: kmfolderdia.cpp:576
+msgid "Share unread state with all users"
+msgstr ""
+
+#: kmfolderdia.cpp:579
+msgid ""
+"If enabled, the unread state of messages in this folder will be the same for "
+"all users having access to this folders. If disabled (the default), every user "
+"with access to this folder has her own unread state."
+msgstr ""
+
+#: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
 "general configuration option to hide groupware folders is set. That means that "
@@ -7118,70 +8030,70 @@ msgstr ""
 "verwijderen, dan dient u tijdelijk het verbergen van groupware-mappen uit te "
 "schakelen om de map zichtbaar te maken."
 
-#: kmfolderdir.cpp:184
+#: kmfolderdir.cpp:209
 msgid "<qt>Cannot enter folder <b>%1</b>.</qt>"
 msgstr "<qt>De map <b>%1</b> kan niet worden geopend.</qt>"
 
-#: kmfolderdir.cpp:192
+#: kmfolderdir.cpp:217
 msgid "<qt>Folder <b>%1</b> is unreadable.</qt>"
 msgstr "<qt>De map <b>%1'</b> is onleesbaar.</qt>"
 
-#: kmfolderimap.cpp:251
+#: kmfolderimap.cpp:247
 msgid "Removing folder"
 msgstr "Map wordt verwijderd"
 
-#: kmfolderimap.cpp:252 searchjob.cpp:270
+#: kmfolderimap.cpp:248 searchjob.cpp:270
 #, c-format
 msgid "URL: %1"
 msgstr "URL: %1"
 
-#: kmfolderimap.cpp:267
+#: kmfolderimap.cpp:263
 msgid "Error while removing a folder."
 msgstr "Fout tijdens het verwijderen van de map."
 
-#: kmfolderimap.cpp:497
+#: kmfolderimap.cpp:491
 #, c-format
 msgid "Destination folder: %1"
 msgstr "Bestemmingsmap: %1"
 
-#: kmfolderimap.cpp:1068
+#: kmfolderimap.cpp:1069
 msgid "checking"
 msgstr "controle"
 
-#: kmfolderimap.cpp:1118
+#: kmfolderimap.cpp:1119
 msgid "Error while querying the server status."
 msgstr "Fout bij het opvragen van de serverstatus."
 
-#: kmfolderimap.cpp:1233
+#: kmfolderimap.cpp:1234
 msgid "Retrieving message status"
 msgstr "Berichtstatus wordt opgehaald"
 
-#: kmfolderimap.cpp:1248 kmfolderimap.cpp:1343
+#: kmfolderimap.cpp:1249 kmfolderimap.cpp:1344
 msgid "Retrieving messages"
 msgstr "Berichten worden opgehaald"
 
-#: kmfolderimap.cpp:1273
+#: kmfolderimap.cpp:1274
 #, c-format
 msgid "Error while listing the contents of the folder %1."
 msgstr "Fout bij het ophalen de mapinhoud van %1."
 
-#: kmfolderimap.cpp:1694
+#: kmfolderimap.cpp:1695
 msgid "Error while retrieving messages."
 msgstr "Fout tijdens het ophalen van de berichten."
 
-#: kmfolderimap.cpp:1763
+#: kmfolderimap.cpp:1764
 msgid "Error while creating a folder."
 msgstr "Fout bij het aanmaken van een map."
 
-#: kmfolderimap.cpp:2130
+#: kmfolderimap.cpp:2131
 msgid "updating message counts"
 msgstr "berichtaantallen worden vernieuwd"
 
-#: kmfolderimap.cpp:2154
+#: kmfolderimap.cpp:2155
 msgid "Error while getting folder information."
 msgstr "Fout bij het ophalen van mapinformatie."
 
-#: kmfolderindex.cpp:334
+#: kmfolderindex.cpp:369
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
@@ -7191,18 +8103,19 @@ msgstr ""
 "De index kan opnieuw gegenereerd worden, maar bepaalde informatie zoals "
 "statusmarkeringen, kan verloren gaan. Wilt u uw indexbestand opnieuw genereren?"
 
-#: kmfolderindex.cpp:337
+#: kmfolderindex.cpp:372
 msgid "Downgrade"
 msgstr "Downgraden"
 
-#: kmfolderindex.cpp:337
+#: kmfolderindex.cpp:372
 msgid "Do Not Downgrade"
 msgstr "Niet downgraden"
 
-#: kmfolderindex.cpp:491
+#: kmfolderindex.cpp:529
+#, fuzzy
 msgid ""
 "The mail index for '%1' is corrupted and will be regenerated now, but some "
-"information, including status flags, will be lost."
+"information, like status flags, might get lost."
 msgstr ""
 "De berichtenindex voor '%1' is corrupt en zal opnieuw aangemaakt worden, maar "
 "bepaalde informatie, zoals statusmarkeringen, kan verloren gaan."
@@ -7223,26 +8136,26 @@ msgstr ""
 msgid "Folder `%1' changed; recreating index."
 msgstr "De map '%1' is gewijzigd. De index wordt nu bijgewerkt."
 
-#: kmfoldermaildir.cpp:252
+#: kmfoldermaildir.cpp:253
 msgid "Could not sync maildir folder."
 msgstr "De maildir-map kon niet worden gesynchroniseerd."
 
-#: kmfoldermaildir.cpp:417
+#: kmfoldermaildir.cpp:418
 msgid "Message could not be added to the folder, possibly disk space is low."
 msgstr ""
 "Het bericht kon niet aan de map toegevoegd worden, waarschijnlijk is er nog "
 "weinig beschikbare schijfruimte over."
 
-#: kmfoldermaildir.cpp:510
+#: kmfoldermaildir.cpp:514
 msgid "KMFolderMaildir::addMsg: abnormally terminating to prevent data loss."
 msgstr ""
 "KMFolderMaildir::addMsg: abnormale terminatie om gegevensverlies te voorkomen."
 
-#: kmfoldermaildir.cpp:884 kmfoldermbox.cpp:794
+#: kmfoldermaildir.cpp:888 kmfoldermbox.cpp:799
 msgid "Writing index file"
 msgstr "Indexbestand wordt geschreven"
 
-#: kmfoldermaildir.cpp:892 kmfoldermbox.cpp:803
+#: kmfoldermaildir.cpp:896 kmfoldermbox.cpp:808
 msgid ""
 "Your outbox contains messages which were most-likely not created by KMail;\n"
 "please remove them from there if you do not want KMail to send them."
@@ -7251,7 +8164,7 @@ msgstr ""
 "opgesteld.\n"
 "Verwijder deze a.u.b. als u niet wilt dat KMail ze verzendt."
 
-#: kmfoldermbox.cpp:111
+#: kmfoldermbox.cpp:112
 msgid ""
 "Cannot open file \"%1\":\n"
 "%2"
@@ -7259,7 +8172,7 @@ msgstr ""
 "Kon dit bestand niet openen \"%1\":\n"
 "%2"
 
-#: kmfoldermbox.cpp:128
+#: kmfoldermbox.cpp:129
 msgid ""
 "<qt>"
 "<p>The index of folder '%2' seems to be out of date. To prevent message "
@@ -7277,23 +8190,23 @@ msgstr ""
 "<p>Lees a.u.b. de <a href=\"%1\">FAQ in de handleiding van KMail</a> "
 "voor informatie over hoe u dit probleem in de toekomst kunt voorkomen.</p></qt>"
 
-#: kmfoldermbox.cpp:152 kmfoldermbox.cpp:158
+#: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
 msgid "Index Out of Date"
 msgstr "Index niet actueel"
 
-#: kmfoldermbox.cpp:165
+#: kmfoldermbox.cpp:166
 msgid "Folder `%1' changed. Recreating index."
 msgstr "De map '%1' is gewijzigd. De index wordt nu bijgewerkt."
 
-#: kmfoldermbox.cpp:298
+#: kmfoldermbox.cpp:300
 msgid "Could not sync index file <b>%1</b>: %2"
 msgstr "Indexbestand <b>%1</b> kan niet worden geïndexeerd: %2"
 
-#: kmfoldermbox.cpp:298
+#: kmfoldermbox.cpp:300
 msgid "Internal error. Please copy down the details and report a bug."
 msgstr "Interne fout. Kopieer a.u.b. de details en stuur een bugrapport."
 
-#: kmfoldermbox.cpp:597
+#: kmfoldermbox.cpp:602
 #, c-format
 msgid ""
 "_n: Creating index file: one message done\n"
@@ -7302,15 +8215,15 @@ msgstr ""
 "Indexbestand wordt aangemaakt: 1 bericht is verwerkt\n"
 "Indexbestand wordt aangemaakt: %n berichten zijn verwerkt"
 
-#: kmfoldermbox.cpp:1038
+#: kmfoldermbox.cpp:1043
 msgid "Could not add message to folder: "
 msgstr "Kan het bericht niet toevoegen aan deze map: "
 
-#: kmfoldermbox.cpp:1119
+#: kmfoldermbox.cpp:1127
 msgid "Could not add message to folder:"
 msgstr "Kan het bericht niet toevoegen aan deze map:"
 
-#: kmfoldermbox.cpp:1121
+#: kmfoldermbox.cpp:1129
 msgid "Could not add message to folder (No space left on device?)"
 msgstr ""
 "Het bericht kon niet worden toegevoegd aan de map. (Onvoldoende schijfruimte?)"
@@ -7319,11 +8232,11 @@ msgstr ""
 msgid "Are you sure you want to expire old messages?"
 msgstr "Wilt u werkelijk de verlopen berichten voor verwijdering markeren?"
 
-#: kmfoldermgr.cpp:69 kmmainwidget.cpp:1366
+#: kmfoldermgr.cpp:69 kmmainwidget.cpp:1330
 msgid "Expire Old Messages?"
 msgstr "Oude berichten laten verlopen?"
 
-#: kmfoldermgr.cpp:69 kmmainwidget.cpp:1366
+#: kmfoldermgr.cpp:69 kmmainwidget.cpp:1330
 msgid "Expire"
 msgstr "Oude berichten laten verlopen"
 
@@ -7335,7 +8248,7 @@ msgstr ""
 "'%1' blijkt geen map te zijn.\n"
 "Haal het bestand a.u.b. uit de weg."
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1325
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1368
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
@@ -7343,7 +8256,7 @@ msgstr ""
 "De toegangsrechten van map '%1' zijn onjuist.\n"
 "Zorg ervoor dat u de inhoud van deze map kunt openen en bewerken."
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1317
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1360
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -7364,7 +8277,7 @@ msgstr ""
 msgid "Could Not Create Folder"
 msgstr "De map kon niet worden aangemaakt"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1611
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1676
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -7372,96 +8285,97 @@ msgstr ""
 "Kan het bestand '%1' niet aanmaken in %2.\n"
 "KMail kan niet zonder dit bestand opstarten."
 
-#: kmfolderseldlg.cpp:96 kmfolderseldlg.cpp:380 kmfolderseldlg.cpp:414
-#: kmfolderseldlg.cpp:416
-msgid "Path"
-msgstr "Pad"
-
-#: kmfolderseldlg.cpp:283 kmfolderseldlg.cpp:445 kmfolderseldlg.cpp:465
-#: kmfoldertree.cpp:1056 kmfoldertree.cpp:1077
+#: kmfolderseldlg.cpp:25 kmfolderseldlg.cpp:47 kmfoldertree.cpp:1091
+#: kmfoldertree.cpp:1112 treebase.cpp:99
 msgid "&New Subfolder..."
 msgstr "&Nieuwe submap..."
 
-#: kmfolderseldlg.cpp:446 kmfolderseldlg.cpp:466
+#: kmfolderseldlg.cpp:26 kmfolderseldlg.cpp:48
 msgid "Create a new subfolder under the currently selected folder"
 msgstr "Een nieuwe submap aanmaken in de huidige geselecteerde map"
 
-#: kmfoldertree.cpp:386 kmheaders.cpp:128
+#: kmfolderseldlg.cpp:36 kmfolderseldlg.cpp:55
+msgid "You can start typing to filter the list of folders"
+msgstr ""
+
+#: kmfoldertree.cpp:407 kmheaders.cpp:130
 msgid "View Columns"
 msgstr "Kolommen tonen"
 
-#: kmfoldertree.cpp:388
+#: kmfoldertree.cpp:409
 msgid "Unread Column"
 msgstr "Ongelezen kolom"
 
-#: kmfoldertree.cpp:389
+#: kmfoldertree.cpp:410
 msgid "Total Column"
 msgstr "Totaalkolom"
 
-#: kmfoldertree.cpp:390
+#: kmfoldertree.cpp:411
 msgid "Size Column"
 msgstr "Kolom grootte"
 
-#: kmfoldertree.cpp:567 kmfoldertree.cpp:1059
+#: kmfoldertree.cpp:591 kmfoldertree.cpp:1094
 msgid "Searches"
 msgstr "Zoekopdrachten"
 
-#: kmfoldertree.cpp:884
+#: kmfoldertree.cpp:920
 msgid "<qt>Go to the next unread message in folder <b>%1</b>?</qt>"
 msgstr "<qt>Naar het volgende ongelezen bericht gaan in map <b>%1</b>?</qt>"
 
-#: kmfoldertree.cpp:886
+#: kmfoldertree.cpp:922
 msgid "Go to Next Unread Message"
 msgstr "Naar het volgende ongelezen bericht gaan"
 
-#: kmfoldertree.cpp:887
+#: kmfoldertree.cpp:923
 msgid "Go To"
 msgstr "Ga naar"
 
-#: kmfoldertree.cpp:887
+#: kmfoldertree.cpp:923
 msgid "Do Not Go To"
 msgstr "Ga niet naar"
 
-#: kmfoldertree.cpp:1057 kmmainwidget.cpp:2757
+#: kmfoldertree.cpp:1092 kmmainwidget.cpp:2780
 msgid "&New Folder..."
 msgstr "&Nieuwe map..."
 
-#: kmfoldertree.cpp:1068 kmmainwidget.cpp:2645
+#: kmfoldertree.cpp:1103 kmmainwidget.cpp:2668
 msgid "Check &Mail"
 msgstr "&Controleren op nieuwe berichten"
 
-#: kmfoldertree.cpp:1084
+#: kmfoldertree.cpp:1119
 msgid "&Copy Folder To"
 msgstr "Map &kopiëren naar"
 
-#: kmfoldertree.cpp:1090
+#: kmfoldertree.cpp:1125
 msgid "&Move Folder To"
 msgstr "&Map verplaatsen naar"
 
-#: kmfoldertree.cpp:1104
+#: kmfoldertree.cpp:1141
 msgid "Add to Favorite Folders"
 msgstr "Aan bladwijzermappen toevoegen"
 
-#: kmfoldertree.cpp:1123
-msgid "Subscription..."
+#: kmfoldertree.cpp:1160
+#, fuzzy
+msgid "Serverside Subscription..."
 msgstr "Inschrijving..."
 
-#: kmfoldertree.cpp:1126
+#: kmfoldertree.cpp:1163
 msgid "Local Subscription..."
 msgstr "Lokale inschrijving..."
 
-#: kmfoldertree.cpp:1133
+#: kmfoldertree.cpp:1170
 msgid "Refresh Folder List"
 msgstr "Mappenlijst vernieuwen"
 
-#: kmfoldertree.cpp:1140 kmmainwidget.cpp:3737
+#: kmfoldertree.cpp:1177 kmmainwidget.cpp:3771
 msgid "&Troubleshoot IMAP Cache..."
 msgstr "Problemen in IMAP-bu&ffer oplossen..."
 
-#: kmfoldertree.cpp:1242
+#: kmfoldertree.cpp:1280
+#, fuzzy
 msgid ""
-"<qt>Cannot create folder <b>%1</b> because of insufficient permissions on the "
-"server. If you think you should be able to create subfolders here, ask your "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
+"the server. If you think you should be able to create subfolders here, ask your "
 "administrator to grant you rights to do so.</qt> "
 msgstr ""
 "<qt>Kon de map <b>%1</b> niet aanmaken omdat er onvoldoende toegangsrechten "
@@ -7469,17 +8383,17 @@ msgstr ""
 "maken, neem dan contact op met uw systeembeheerder of pas de rechten zelf "
 "aan.</qt>"
 
-#: kmfoldertree.cpp:1657 kmmainwidget.cpp:420 kmmainwidget.cpp:427
-#: kmmainwidget.cpp:434 kmsearchpattern.h:220
+#: kmfoldertree.cpp:1695 kmmainwidget.cpp:412 kmmainwidget.cpp:419
+#: kmmainwidget.cpp:426 kmsearchpattern.h:220
 msgid "Unread"
 msgstr "Ongelezen"
 
-#: kmfoldertree.cpp:1670 kmmainwidget.cpp:422 kmmainwidget.cpp:429
-#: kmmainwidget.cpp:436
+#: kmfoldertree.cpp:1708 kmmainwidget.cpp:414 kmmainwidget.cpp:421
+#: kmmainwidget.cpp:428
 msgid "Total"
 msgstr "Totaal"
 
-#: kmfoldertree.cpp:1951
+#: kmfoldertree.cpp:1989
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> here because a folder with the same "
 "name already exists.</qt>"
@@ -7487,7 +8401,7 @@ msgstr ""
 "<qt>Kan de map <b>%1</b> niet hier verplaatsen of kopiëren omdat er al een map "
 "met dezelfde naam bestaat.</qt>"
 
-#: kmfoldertree.cpp:1961
+#: kmfoldertree.cpp:2000
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> because it is not completely copied "
 "itself.</qt>"
@@ -7495,65 +8409,70 @@ msgstr ""
 "<qt>Kan de map <b>%1</b> niet verplaatsen of kopiëren omdat het zichzelf niet "
 "volledig gekopieerd heeft.</qt>"
 
-#: kmfoldertree.cpp:1970
+#: kmfoldertree.cpp:2010
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> into a subfolder below itself.</qt>"
 msgstr ""
 "<qt>Kan de map <b>%1</b> niet verplaatsen of kopiëren in zijn eigen submap.</qt>"
 
-#: kmfoldertree.cpp:2012
+#: kmfoldertree.cpp:2055
 msgid "Moving the selected folders is not possible"
 msgstr "Het verplaatsen van de geselecteerde mappen is niet mogelijk"
 
-#: kmheaders.cpp:130
+#: kmheaders.cpp:132
 msgid "Status"
 msgstr "Status"
 
-#: kmheaders.cpp:131 kmsearchpattern.h:218
+#: kmheaders.cpp:133 kmsearchpattern.h:218
 msgid "Important"
 msgstr "Belangrijk"
 
-#: kmheaders.cpp:132
+#: kmheaders.cpp:134
 msgid "Action Item"
 msgstr "Actie-item"
 
-#: kmheaders.cpp:133
+#: kmheaders.cpp:135
 msgid "Attachment"
 msgstr "Bijlage"
 
-#: kmheaders.cpp:134
+#: kmheaders.cpp:136 kmsearchpattern.h:233
+#, fuzzy
+msgid "Invitation"
+msgstr "Documentatie"
+
+#: kmheaders.cpp:137
 msgid "Spam/Ham"
 msgstr "Spam/Gewenst"
 
-#: kmheaders.cpp:135
+#: kmheaders.cpp:138
 msgid "Watched/Ignored"
 msgstr "Geobserveerd Genegeerd"
 
-#: kmheaders.cpp:136
+#: kmheaders.cpp:139
 msgid "Signature"
 msgstr "Handtekening"
 
-#: kmheaders.cpp:180 kmheaders.cpp:775 kmheaders.cpp:2604
-#: kmpopfiltercnfrmdlg.cpp:39 searchwindow.cpp:224
-#: templatesinsertcommand.cpp:142 templatesinsertcommand.cpp:243
+#: kmheaders.cpp:184 kmheaders.cpp:804 kmheaders.cpp:2646
+#: kmpopfiltercnfrmdlg.cpp:39 kmsearchpatternedit.cpp:41 searchwindow.cpp:223
+#: templatesinsertcommand.cpp:145 templatesinsertcommand.cpp:246
 msgid "Subject"
 msgstr "Onderwerp"
 
-#: kmheaders.cpp:182 kmheaders.cpp:770 kmheaders.cpp:2599
-#: kmpopfiltercnfrmdlg.cpp:42 searchwindow.cpp:228
-#: templatesinsertcommand.cpp:66 templatesinsertcommand.cpp:167
+#: kmheaders.cpp:186 kmheaders.cpp:799 kmheaders.cpp:2641
+#: kmpopfiltercnfrmdlg.cpp:42 searchwindow.cpp:227
+#: templatesinsertcommand.cpp:66 templatesinsertcommand.cpp:170
 msgid "Date"
 msgstr "Datum"
 
-#: kmheaders.cpp:772 kmheaders.cpp:2601
+#: kmheaders.cpp:801 kmheaders.cpp:2643
 msgid "Order of Arrival"
 msgstr "In volgorde van ontvangst"
 
-#: kmheaders.cpp:777 kmheaders.cpp:2606
+#: kmheaders.cpp:806 kmheaders.cpp:2648
 msgid " (Status)"
 msgstr " (Status)"
 
-#: kmheaders.cpp:1360
+#: kmheaders.cpp:1398
 #, c-format
 msgid ""
 "_n: 1 unsent\n"
@@ -7562,11 +8481,11 @@ msgstr ""
 "1 niet verzonden\n"
 "%n niet verzonden"
 
-#: kmheaders.cpp:1360
+#: kmheaders.cpp:1398
 msgid "0 unsent"
 msgstr "0 onverzonden"
 
-#: kmheaders.cpp:1362
+#: kmheaders.cpp:1400
 #, c-format
 msgid ""
 "_n: 1 unread\n"
@@ -7575,11 +8494,11 @@ msgstr ""
 "1 ongelezen\n"
 "%n ongelezen"
 
-#: kmheaders.cpp:1362
+#: kmheaders.cpp:1400
 msgid "0 unread"
 msgstr "0 ongelezen"
 
-#: kmheaders.cpp:1364
+#: kmheaders.cpp:1402
 msgid ""
 "_n: 1 message, %1.\n"
 "%n messages, %1."
@@ -7587,17 +8506,17 @@ msgstr ""
 "1 bericht, %1.\n"
 "%n berichten, %1."
 
-#: kmheaders.cpp:1365
+#: kmheaders.cpp:1403
 msgid "0 messages"
 msgstr "0 berichten"
 
-#: kmheaders.cpp:1367
+#: kmheaders.cpp:1405
 msgid ""
 "_: %1 = n messages, m unread.\n"
 "%1 Folder is read-only."
 msgstr "%1 mappen zijn alleen-lezen."
 
-#: kmheaders.cpp:1560
+#: kmheaders.cpp:1598
 #, c-format
 msgid ""
 "_n: <qt>Do you really want to delete the selected message?"
@@ -7610,49 +8529,49 @@ msgstr ""
 "<qt>Wilt u werkelijk de %n geselecteerde berichten verwijderen?"
 "<br>Eenmaal verwijderd kunt u ze niet meer terughalen.</qt>"
 
-#: kmheaders.cpp:1562
+#: kmheaders.cpp:1600
 msgid "Delete Messages"
 msgstr "Berichten verwijderen"
 
-#: kmheaders.cpp:1562
+#: kmheaders.cpp:1600
 msgid "Delete Message"
 msgstr "Bericht verwijderen"
 
-#: kmheaders.cpp:1586
+#: kmheaders.cpp:1624
 msgid "Messages deleted successfully."
 msgstr "De berichten zijn met succes verwijderd."
 
-#: kmheaders.cpp:1586
+#: kmheaders.cpp:1624
 msgid "Messages moved successfully"
 msgstr "De berichten zijn met succes verplaatst"
 
-#: kmheaders.cpp:1609
+#: kmheaders.cpp:1647
 msgid "Deleting messages failed."
 msgstr "Het verwijderen van berichten is mislukt."
 
-#: kmheaders.cpp:1609
+#: kmheaders.cpp:1647
 msgid "Moving messages failed."
 msgstr "Het verplaatsen van berichten is mislukt."
 
-#: kmheaders.cpp:1612
+#: kmheaders.cpp:1650
 msgid "Deleting messages canceled."
 msgstr "Verwijderen van berichten is geannuleerd."
 
-#: kmheaders.cpp:1612
+#: kmheaders.cpp:1650
 msgid "Moving messages canceled."
 msgstr "Verplaatsing van berichten is geannuleerd."
 
-#: kmheaders.cpp:2431 kmmainwidget.cpp:2977 kmreadermainwin.cpp:470
-#: searchwindow.cpp:833
+#: kmheaders.cpp:2470 kmmainwidget.cpp:2989 kmreadermainwin.cpp:508
+#: searchwindow.cpp:856
 msgid "&Copy To"
 msgstr "Ko&piëren naar"
 
-#: kmheaders.cpp:2434 kmheaders.cpp:2440 kmmainwidget.cpp:2974
-#: searchwindow.cpp:834
+#: kmheaders.cpp:2473 kmheaders.cpp:2479 kmmainwidget.cpp:2986
+#: searchwindow.cpp:857
 msgid "&Move To"
 msgstr "Verplaat&sen naar"
 
-#: kmheaders.cpp:2774 kmheaders.cpp:2814
+#: kmheaders.cpp:2818 kmheaders.cpp:2858
 msgid ""
 "Failure modifying %1\n"
 "(No space left on device?)"
@@ -7660,86 +8579,98 @@ msgstr ""
 "Fout bij het wijzigen van %1\n"
 "(Onvoldoende schijfruimte?)"
 
-#: kmkernel.cpp:684
+#: kmkernel.cpp:712
 msgid "Certificate Signature Request"
 msgstr "Certificaat-ondertekening-aanvraag"
 
-#: kmkernel.cpp:687
+#: kmkernel.cpp:715
 msgid "Please create a certificate from attachment and return to sender."
 msgstr "Onderteken a.u.b. dit certificaat en stuur het retour."
 
-#: kmkernel.cpp:1210
+#: kmkernel.cpp:1246
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 "KMail is ingesteld op de offline-modus. Alle netwerktaken zijn uitgesteld"
 
-#: kmkernel.cpp:1220
+#: kmkernel.cpp:1256
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr "KMail is ingesteld op de online-modus. Alle netwerktaken worden hervat"
 
-#: kmkernel.cpp:1241
+#: kmkernel.cpp:1283
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "KMail bevindt zich in de offline-modus. Hoe wilt u verdergaan?"
 
-#: kmkernel.cpp:1244 kmmainwidget.cpp:1899
+#: kmkernel.cpp:1286 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr "Online werken"
 
-#: kmkernel.cpp:1245 kmmainwidget.cpp:1897
+#: kmkernel.cpp:1287 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr "Offline werken"
 
-#: kmkernel.cpp:1379
+#: kmkernel.cpp:1429
 msgid "You do not have read/write permission to your inbox folder."
 msgstr "U hebt geen lees- of schrijfrechten voor uw postvak in."
 
-#: kmkernel.cpp:1387
+#: kmkernel.cpp:1437
 msgid "outbox"
 msgstr "postvak uit"
 
-#: kmkernel.cpp:1389
+#: kmkernel.cpp:1439
 msgid "You do not have read/write permission to your outbox folder."
 msgstr "U hebt geen lees- of schrijfrechten voor uw postvak uit."
 
-#: kmkernel.cpp:1406
+#: kmkernel.cpp:1456
 msgid "sent-mail"
 msgstr "verzonden"
 
-#: kmkernel.cpp:1408
+#: kmkernel.cpp:1458
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr ""
 "U hebt geen lees- of schrijfrechten voor uw map met verzonden berichten."
 
-#: kmkernel.cpp:1415
+#: kmkernel.cpp:1465
 msgid "trash"
 msgstr "prullenbak"
 
-#: kmkernel.cpp:1417
+#: kmkernel.cpp:1467
 msgid "You do not have read/write permission to your trash folder."
 msgstr "U hebt geen lees- of schrijfrechten voor uw prullenbak."
 
-#: kmkernel.cpp:1424
+#: kmkernel.cpp:1474
 msgid "drafts"
 msgstr "concepten"
 
-#: kmkernel.cpp:1426
+#: kmkernel.cpp:1476
 msgid "You do not have read/write permission to your drafts folder."
 msgstr "U hebt geen lees- of schrijfrechten voor uw conceptenmap."
 
-#: kmkernel.cpp:1435
+#: kmkernel.cpp:1485
 msgid "templates"
 msgstr "sjablonen"
 
-#: kmkernel.cpp:1437
+#: kmkernel.cpp:1487
 msgid "You do not have read/write permission to your templates folder."
 msgstr "U hebt geen lees- of schrijfrechten voor uw sjabloonmap."
 
-#: kmkernel.cpp:1480 searchwindow.cpp:255 searchwindow.cpp:490
-#: searchwindow.cpp:633
+#: kmkernel.cpp:1531 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "Laatste zoekopdracht"
 
-#: kmkernel.cpp:1777
+#: kmkernel.cpp:1716
+msgid ""
+"There is a problem with the mail index of the following folders, the indices "
+"will now be regenerated.\n"
+"This can happen because the index files are out of date, missing or corrupted.\n"
+"Contact your administrator if this happens frequently.\n"
+"Some information, like status flags, might get lost."
+msgstr ""
+
+#: kmkernel.cpp:1721
+msgid "Problem with mail indices"
+msgstr ""
+
+#: kmkernel.cpp:1879
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
 "<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
@@ -7754,7 +8685,7 @@ msgstr ""
 "bestaande bestanden met dezelfde naam kan overschrijven in <i>%7</i>. "
 "<p><strong>Wilt u dat %3 de berichtbestanden nu verplaatst?</strong></qt>"
 
-#: kmkernel.cpp:1789
+#: kmkernel.cpp:1891
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
 "<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
@@ -7766,15 +8697,15 @@ msgstr ""
 "voor zijn berichten. %2 kan de inhoud van <i>%6</i> in deze map verplaatsen. "
 "<p><strong>Wilt u dat %3 de berichtbestanden nu verplaatst?</strong></qt>"
 
-#: kmkernel.cpp:1798
+#: kmkernel.cpp:1900
 msgid "Migrate Mail Files?"
 msgstr "Berichtbestanden overplaatsen?"
 
-#: kmkernel.cpp:2023
+#: kmkernel.cpp:2135
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr "KMail kwam een fatale fout tegen en zal nu worden afgesloten."
 
-#: kmkernel.cpp:2025
+#: kmkernel.cpp:2137
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -7785,75 +8716,75 @@ msgstr ""
 "De fout was:\n"
 "%1"
 
-#: kmkernel.cpp:2158 kmmainwidget.cpp:1176
+#: kmkernel.cpp:2270 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "Prullenbak legen"
 
-#: kmkernel.cpp:2159
+#: kmkernel.cpp:2271
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Wilt u werkelijk de prullenbak van alle accounts legen?"
 
-#: kmlineeditspell.cpp:105
+#: kmlineeditspell.cpp:134
 msgid "vCard Import Failed"
 msgstr "Import vCard mislukt"
 
-#: kmlineeditspell.cpp:116
+#: kmlineeditspell.cpp:135
 msgid "<qt>Unable to access <b>%1</b>.</qt>"
 msgstr "<qt>Kon <b>%1</b> niet benaderen.</qt>"
 
-#: kmlineeditspell.cpp:168 recipientspicker.cpp:578
+#: kmlineeditspell.cpp:194 recipientspicker.cpp:578
 msgid "Recent Addresses"
 msgstr "Recente adressen"
 
-#: kmmainwidget.cpp:611
+#: kmmainwidget.cpp:601
 msgid "S&earch:"
 msgstr "&Zoeken:"
 
-#: kmmainwidget.cpp:674 kmmainwidget.cpp:1709
+#: kmmainwidget.cpp:664 kmmainwidget.cpp:1686
 msgid "Move Message to Folder"
 msgstr "Bericht verplaatsen naar map"
 
-#: kmmainwidget.cpp:679 kmmainwidget.cpp:1818
+#: kmmainwidget.cpp:669 kmmainwidget.cpp:1795
 msgid "Copy Message to Folder"
 msgstr "Bericht kopiëren naar map"
 
-#: kmmainwidget.cpp:684 kmmainwidget.cpp:1697
+#: kmmainwidget.cpp:674 kmmainwidget.cpp:1674
 msgid "Jump to Folder"
 msgstr "Naar map gaan"
 
-#: kmmainwidget.cpp:743
+#: kmmainwidget.cpp:717
 msgid "Remove Duplicate Messages"
 msgstr "Dubbele berichten verwijderen"
 
-#: kmmainwidget.cpp:748
+#: kmmainwidget.cpp:722
 msgid "Abort Current Operation"
 msgstr "Huidige sessie afbreken"
 
-#: kmmainwidget.cpp:753
+#: kmmainwidget.cpp:727
 msgid "Focus on Next Folder"
 msgstr "Focus op volgende map richten"
 
-#: kmmainwidget.cpp:758
+#: kmmainwidget.cpp:732
 msgid "Focus on Previous Folder"
 msgstr "Focus op vorige map richten"
 
-#: kmmainwidget.cpp:763
+#: kmmainwidget.cpp:737
 msgid "Select Folder with Focus"
 msgstr "Map met focus selecteren"
 
-#: kmmainwidget.cpp:768
+#: kmmainwidget.cpp:742
 msgid "Focus on Next Message"
 msgstr "Focus op volgende bericht richten"
 
-#: kmmainwidget.cpp:773
+#: kmmainwidget.cpp:747
 msgid "Focus on Previous Message"
 msgstr "Focus op vorige bericht richten"
 
-#: kmmainwidget.cpp:778
+#: kmmainwidget.cpp:752
 msgid "Select Message with Focus"
 msgstr "Bericht met focus selecteren "
 
-#: kmmainwidget.cpp:977
+#: kmmainwidget.cpp:951
 msgid ""
 "_n: 1 new message in %1\n"
 "%n new messages in %1"
@@ -7861,49 +8792,49 @@ msgstr ""
 "1 nieuw bericht in %1.\n"
 "%n nieuwe berichten in %1."
 
-#: kmmainwidget.cpp:993
+#: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
 "<b>New mail arrived</b>"
 "<br>%1"
 msgstr "<b>Nieuw bericht binnengekomen</b><br>%1"
 
-#: kmmainwidget.cpp:997
+#: kmmainwidget.cpp:971
 msgid "New mail arrived"
 msgstr "Nieuwe berichten ontvangen"
 
-#: kmmainwidget.cpp:1128
+#: kmmainwidget.cpp:1100
 #, c-format
 msgid "Properties of Folder %1"
 msgstr "Eigenschappen voor map %1"
 
-#: kmmainwidget.cpp:1149
+#: kmmainwidget.cpp:1124
 msgid "This folder does not have any expiry options set"
 msgstr "Bij deze map zijn geen verloop-opties ingesteld."
 
-#: kmmainwidget.cpp:1157
+#: kmmainwidget.cpp:1132
 msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 msgstr ""
 "<qt>Wilt u werkelijk de ingestelde bewaartijd voor de inhoud van de map <b>"
 "%1</b> uitvoeren?</qt>"
 
-#: kmmainwidget.cpp:1158
+#: kmmainwidget.cpp:1133
 msgid "Expire Folder"
 msgstr "Verlopen berichten uit map verwijderen"
 
-#: kmmainwidget.cpp:1159
+#: kmmainwidget.cpp:1134
 msgid "&Expire"
 msgstr "V&erlopen berichten verwijderen"
 
-#: kmmainwidget.cpp:1176
+#: kmmainwidget.cpp:1151
 msgid "Move to Trash"
 msgstr "Naar prullenbak"
 
-#: kmmainwidget.cpp:1178
+#: kmmainwidget.cpp:1153
 msgid "Are you sure you want to empty the trash folder?"
 msgstr "Wilt u werkelijk de prullenbak legen?"
 
-#: kmmainwidget.cpp:1179
+#: kmmainwidget.cpp:1154
 msgid ""
 "<qt>Are you sure you want to move all messages from folder <b>%1</b> "
 "to the trash?</qt>"
@@ -7911,15 +8842,27 @@ msgstr ""
 "<qt>Wilt u werkelijk alle berichten uit de map <b>%1</b> "
 "naar de prullenbak verplaatsen?</qt>"
 
-#: kmmainwidget.cpp:1198
+#: kmmainwidget.cpp:1173
 msgid "Moved all messages to the trash"
 msgstr "Alle berichten liggen nu in de prullenbak"
 
-#: kmmainwidget.cpp:1220
+#: kmmainwidget.cpp:1200
+msgid ""
+"It is not possible to delete this folder right now because it is being "
+"syncronized. Please wait until the syncronization of this folder is complete "
+"and then try again."
+msgstr ""
+
+#: kmmainwidget.cpp:1203
+#, fuzzy
+msgid "Unable to delete folder"
+msgstr "De map kon niet worden aangemaakt"
+
+#: kmmainwidget.cpp:1209
 msgid "Delete Search"
 msgstr "Zoekopdracht verwijderen"
 
-#: kmmainwidget.cpp:1221
+#: kmmainwidget.cpp:1210
 msgid ""
 "<qt>Are you sure you want to delete the search <b>%1</b>?"
 "<br>Any messages it shows will still be available in their original folder.</qt>"
@@ -7928,15 +8871,15 @@ msgstr ""
 "<br>De berichten die er in worden weergegeven zullen echter niet worden "
 "verwijderd. Deze blijven in de originele map staan.</qt>"
 
-#: kmmainwidget.cpp:1225
+#: kmmainwidget.cpp:1214
 msgid "Delete Folder"
 msgstr "Map verwijderen"
 
-#: kmmainwidget.cpp:1228
+#: kmmainwidget.cpp:1217
 msgid "<qt>Are you sure you want to delete the empty folder <b>%1</b>?</qt>"
 msgstr "<qt>Wilt u werkelijk de lege map <b>%1</b> verwijderen?</qt>"
 
-#: kmmainwidget.cpp:1233
+#: kmmainwidget.cpp:1222
 msgid ""
 "<qt>Are you sure you want to delete the empty folder <b>%1</b> "
 "and all its subfolders? Those subfolders might not be empty and their contents "
@@ -7950,7 +8893,7 @@ msgstr ""
 "<p><b>Let op</b>: de verwijderde berichten komen niet in de prullenbak maar "
 "worden definitief verwijderd.</qt>"
 
-#: kmmainwidget.cpp:1242
+#: kmmainwidget.cpp:1231
 msgid ""
 "<qt>Are you sure you want to delete the folder <b>%1</b>"
 ", discarding its contents? "
@@ -7961,7 +8904,7 @@ msgstr ""
 "<p><b>Let op</b>: de verwijderde berichten komen niet in de prullenbak maar "
 "worden definitief verwijderd.</qt>"
 
-#: kmmainwidget.cpp:1249
+#: kmmainwidget.cpp:1238
 msgid ""
 "<qt>Are you sure you want to delete the folder <b>%1</b> "
 "and all its subfolders, discarding their contents? "
@@ -7973,17 +8916,7 @@ msgstr ""
 "<p><b>Let op</b>: de verwijderde berichten komen niet in de prullenbak maar "
 "worden definitief verwijderd.</qt>"
 
-#: kmmainwidget.cpp:1268
-msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
-"reset to the main Inbox folder.</qt>"
-msgstr ""
-"<qt>De map die u hebt verwijderd hoorde bij het account <b>%1</b>"
-", die daar berichten in plaatst. Berichten die op dat account binnenkomen "
-"zullen in het algemene postvak in terecht komen.</qt>"
-
-#: kmmainwidget.cpp:1349
+#: kmmainwidget.cpp:1313
 msgid ""
 "Are you sure you want to refresh the IMAP cache?\n"
 "This will remove all changes that you have done locally to your IMAP folders."
@@ -7991,13 +8924,13 @@ msgstr ""
 "Wilt u werkelijk de IMAP-buffer verversen?Alle wijzigingen die u in uw lokale "
 "IMAP-mappen hebt gemaakt zullen verloren gaan."
 
-#: kmmainwidget.cpp:1365
+#: kmmainwidget.cpp:1329
 msgid "Are you sure you want to expire all old messages?"
 msgstr ""
 "Wilt u werkelijk alle oude berichten, waarvan de bewaartijd is verstreken, "
 "verwijderen?"
 
-#: kmmainwidget.cpp:1389
+#: kmmainwidget.cpp:1353
 msgid ""
 "Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
 "the likelihood that your system will be compromised by other present and "
@@ -8008,15 +8941,15 @@ msgstr ""
 "typen van beveiligingsrisico's.\n"
 "Wilt u toch doorgaan?"
 
-#: kmmainwidget.cpp:1392 kmmainwidget.cpp:1416 kmsender.cpp:503
+#: kmmainwidget.cpp:1356 kmmainwidget.cpp:1380 kmsender.cpp:504
 msgid "Security Warning"
 msgstr "Beveiligingswaarschuwing"
 
-#: kmmainwidget.cpp:1393
+#: kmmainwidget.cpp:1357
 msgid "Use HTML"
 msgstr "Gebruik HTML"
 
-#: kmmainwidget.cpp:1413
+#: kmmainwidget.cpp:1377
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
 "\"spam\" and may increase the likelihood that your system will be compromised "
@@ -8026,19 +8959,19 @@ msgstr ""
 "voor \"spam\" (ongewenste e-mailreclame) en vergroot de kans dat uw systeem "
 "gevoelig wordt voor andere typen van beveiligingsrisico's."
 
-#: kmmainwidget.cpp:1417
+#: kmmainwidget.cpp:1381
 msgid "Load External References"
 msgstr "Externe referenties ophalen"
 
-#: kmmainwidget.cpp:1658
+#: kmmainwidget.cpp:1634
 msgid "Filter on Mailing-List..."
 msgstr "Filteren op discussiegroep..."
 
-#: kmmainwidget.cpp:1663
+#: kmmainwidget.cpp:1639
 msgid "Filter on Mailing-List %1..."
 msgstr "Filteren op discussiegroep %1..."
 
-#: kmmainwidget.cpp:1761
+#: kmmainwidget.cpp:1738
 msgid ""
 "KMail's Out of Office Reply functionality relies on server-side filtering. You "
 "have not yet configured an IMAP server for this.\n"
@@ -8048,495 +8981,503 @@ msgstr ""
 "U hebt hier nog geen IMAP-server voor ingesteld.\n"
 "U kunt dit regelen bij tabblad \"Filtering\" in de IMAP-accountconfiguratie."
 
-#: kmmainwidget.cpp:1766
+#: kmmainwidget.cpp:1743
 msgid "No Server-Side Filtering Configured"
 msgstr "Geen serverzijde filtering ingesteld"
 
-#: kmmainwidget.cpp:1793
-msgid "Could not start certificate manager; please check your installation."
+#: kmmainwidget.cpp:1770
+#, fuzzy
+msgid ""
+"Could not start certificate manager 'kleopatra'; please check your "
+"installation."
 msgstr ""
 "Het Certificaatbeheer kon niet worden opgestart. Controleer uw installatie."
 
-#: kmmainwidget.cpp:1810
+#: kmmainwidget.cpp:1787
 msgid ""
 "Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
 msgstr ""
 "De GnuPG logweergave kon niet worden opgestart. Controleer a.u.b. uw "
 "installatie."
 
-#: kmmainwidget.cpp:2485
+#: kmmainwidget.cpp:2508
 msgid "Forward With Custom Template"
 msgstr "Doorsturen met aangepast sjabloon"
 
-#: kmmainwidget.cpp:2494
+#: kmmainwidget.cpp:2517
 msgid "Reply With Custom Template"
 msgstr "Antwoorden met aangepast sjabloon"
 
-#: kmmainwidget.cpp:2502
+#: kmmainwidget.cpp:2525
 msgid "Reply to All With Custom Template"
 msgstr "Allen beantwoorden met aangepast sjabloon"
 
-#: kmmainwidget.cpp:2597 kmmainwidget.cpp:2602 kmmainwidget.cpp:2607
+#: kmmainwidget.cpp:2620 kmmainwidget.cpp:2625 kmmainwidget.cpp:2630
 msgid "(no custom templates)"
 msgstr "(geen aangepaste sjablonen)"
 
-#: kmmainwidget.cpp:2622 kmmimeparttree.cpp:141
+#: kmmainwidget.cpp:2645 kmmimeparttree.cpp:139
 msgid "Save &As..."
 msgstr "Opslaan a&ls..."
 
-#: kmmainwidget.cpp:2629
+#: kmmainwidget.cpp:2652
 msgid "&Compact All Folders"
 msgstr "Alle mappen co&mprimeren"
 
-#: kmmainwidget.cpp:2633
+#: kmmainwidget.cpp:2656
 msgid "&Expire All Folders"
 msgstr "Verlopen berichten v&erwijderen"
 
-#: kmmainwidget.cpp:2637
+#: kmmainwidget.cpp:2660
 msgid "&Refresh Local IMAP Cache"
 msgstr "Lokale IMAP-buffer ve&rversen"
 
-#: kmmainwidget.cpp:2641
+#: kmmainwidget.cpp:2664
 msgid "Empty All &Trash Folders"
 msgstr "A&lle prullenbakken legen"
 
-#: kmmainwidget.cpp:2649
+#: kmmainwidget.cpp:2672
 msgid "Check Mail in Favorite Folders"
 msgstr "Controleren op berichten in bladwijzermappen"
 
-#: kmmainwidget.cpp:2656
+#: kmmainwidget.cpp:2679
 msgid "Check Mail &In"
 msgstr "Ber&ichten ophalen"
 
-#: kmmainwidget.cpp:2666
+#: kmmainwidget.cpp:2689
 msgid "&Send Queued Messages"
 msgstr "Berichten &verzenden"
 
-#: kmmainwidget.cpp:2669
+#: kmmainwidget.cpp:2692
 msgid "Online Status (unknown)"
 msgstr "Online-status (onbekend)"
 
-#: kmmainwidget.cpp:2673
+#: kmmainwidget.cpp:2696
 msgid "Send Queued Messages Via"
 msgstr "Berichten in wachtrij verzenden via"
 
-#: kmmainwidget.cpp:2684
+#: kmmainwidget.cpp:2707
 msgid "&Address Book..."
 msgstr "&Adresboek..."
 
-#: kmmainwidget.cpp:2689
+#: kmmainwidget.cpp:2712
 msgid "Certificate Manager..."
 msgstr "Certificaatbeheer..."
 
-#: kmmainwidget.cpp:2694
+#: kmmainwidget.cpp:2717
 msgid "GnuPG Log Viewer..."
 msgstr "GnuPG-logweergave..."
 
-#: kmmainwidget.cpp:2699
+#: kmmainwidget.cpp:2722
 msgid "&Import Messages..."
 msgstr "Berichten &importeren..."
 
-#: kmmainwidget.cpp:2704
+#: kmmainwidget.cpp:2727
 msgid "&Debug Sieve..."
 msgstr "Sieve &debuggen..."
 
-#: kmmainwidget.cpp:2710
+#: kmmainwidget.cpp:2733
 msgid "Edit \"Out of Office\" Replies..."
 msgstr "Afwezigheidsantwoorden bewerken..."
 
-#: kmmainwidget.cpp:2716
+#: kmmainwidget.cpp:2739
 msgid "Filter &Log Viewer..."
 msgstr "Logweergave filter..."
 
-#: kmmainwidget.cpp:2719
+#: kmmainwidget.cpp:2742
 msgid "&Anti-Spam Wizard..."
 msgstr "&Antispam-assistent..."
 
-#: kmmainwidget.cpp:2721
+#: kmmainwidget.cpp:2744
 msgid "&Anti-Virus Wizard..."
 msgstr "A&ntivirus-assistent..."
 
-#: kmmainwidget.cpp:2725 kmreadermainwin.cpp:316
+#: kmmainwidget.cpp:2748 kmreadermainwin.cpp:367
 msgid "&Move to Trash"
 msgstr "&Naar prullenbak"
 
-#: kmmainwidget.cpp:2726 kmreadermainwin.cpp:317
+#: kmmainwidget.cpp:2749 kmreadermainwin.cpp:368
 msgid "Move message to trashcan"
 msgstr "Bericht naar de prullenbak verplaatsen"
 
-#: kmmainwidget.cpp:2738
+#: kmmainwidget.cpp:2761
 msgid "M&ove Thread to Trash"
 msgstr "Disc&ussie naar prullenbak verplaatsen"
 
-#: kmmainwidget.cpp:2739
+#: kmmainwidget.cpp:2762
 msgid "Move thread to trashcan"
 msgstr "Discussie naar de prullenbak verplaatsen"
 
-#: kmmainwidget.cpp:2743
+#: kmmainwidget.cpp:2766
 msgid "Delete T&hread"
 msgstr "Discussie verwij&deren"
 
-#: kmmainwidget.cpp:2747
+#: kmmainwidget.cpp:2770
 msgid "&Find Messages..."
 msgstr "Zoe&ken..."
 
-#: kmmainwidget.cpp:2750
+#: kmmainwidget.cpp:2773
 msgid "&Find in Message..."
 msgstr "Zoeken in &bericht..."
 
-#: kmmainwidget.cpp:2753
+#: kmmainwidget.cpp:2776
 msgid "Select &All Messages"
 msgstr "&Alle berichten selecteren"
 
-#: kmmainwidget.cpp:2760
+#: kmmainwidget.cpp:2783
 msgid "&Properties"
 msgstr "Eigenscha&ppen"
 
-#: kmmainwidget.cpp:2763
+#: kmmainwidget.cpp:2786
 msgid "&Mailing List Management..."
 msgstr "Discussielijstbe&heer..."
 
-#: kmmainwidget.cpp:2772
+#: kmmainwidget.cpp:2795
 msgid "Mark All Messages as &Read"
 msgstr "Alle berichten als gelezen ma&rkeren"
 
-#: kmmainwidget.cpp:2775
+#: kmmainwidget.cpp:2798
 msgid "&Expiration Settings"
 msgstr "V&erloopinstellingen"
 
-#: kmmainwidget.cpp:2778
+#: kmmainwidget.cpp:2801
 msgid "&Compact Folder"
 msgstr "Map &comprimeren"
 
-#: kmmainwidget.cpp:2781
+#: kmmainwidget.cpp:2804
 msgid "Check Mail &in This Folder"
 msgstr "Controleren op ber&ichten in deze map"
 
-#: kmmainwidget.cpp:2793
+#: kmmainwidget.cpp:2816
+#, fuzzy
+msgid "&Archive Folder..."
+msgstr "&Nieuwe map..."
+
+#: kmmainwidget.cpp:2820
 msgid "Prefer &HTML to Plain Text"
 msgstr "&HTML voor platte tekst prefereren"
 
-#: kmmainwidget.cpp:2796
+#: kmmainwidget.cpp:2823
 msgid "Load E&xternal References"
 msgstr "E&xterne referenties ophalen"
 
-#: kmmainwidget.cpp:2799
+#: kmmainwidget.cpp:2826
 msgid "&Thread Messages"
 msgstr "Discussies &groeperen"
 
-#: kmmainwidget.cpp:2802
+#: kmmainwidget.cpp:2829
 msgid "Thread Messages also by &Subject"
 msgstr "Beri&chten ook op onderwerp groeperen"
 
-#: kmmainwidget.cpp:2805
+#: kmmainwidget.cpp:2832
 msgid "Copy Folder"
 msgstr "Map kopiëren"
 
-#: kmmainwidget.cpp:2807
+#: kmmainwidget.cpp:2834
 msgid "Cut Folder"
 msgstr "Map knippen"
 
-#: kmmainwidget.cpp:2809
+#: kmmainwidget.cpp:2836
 msgid "Paste Folder"
 msgstr "Map plakken"
 
-#: kmmainwidget.cpp:2812
+#: kmmainwidget.cpp:2839
 msgid "Copy Messages"
 msgstr "Berichten kopiëren"
 
-#: kmmainwidget.cpp:2814
+#: kmmainwidget.cpp:2841
 msgid "Cut Messages"
 msgstr "Berichten knippen"
 
-#: kmmainwidget.cpp:2816
+#: kmmainwidget.cpp:2843
 msgid "Paste Messages"
 msgstr "Berichten plakken"
 
-#: kmmainwidget.cpp:2820
+#: kmmainwidget.cpp:2847
 msgid "&New Message..."
 msgstr "&Nieuw bericht..."
 
-#: kmmainwidget.cpp:2823 kmmainwidget.cpp:2915
+#: kmmainwidget.cpp:2850 kmmainwidget.cpp:2927
 msgid "New Message From &Template"
 msgstr "Nieuw berich&t van sjabloon"
 
-#: kmmainwidget.cpp:2831
+#: kmmainwidget.cpp:2858
 msgid "New Message t&o Mailing-List..."
 msgstr "Nieuw bericht aan discussiegr&oep..."
 
-#: kmmainwidget.cpp:2836 kmreadermainwin.cpp:327 searchwindow.cpp:320
+#: kmmainwidget.cpp:2863 kmreadermainwin.cpp:378 searchwindow.cpp:321
 msgid ""
 "_: Message->\n"
 "&Forward"
 msgstr "&Doorsturen"
 
-#: kmmainwidget.cpp:2840 kmreadermainwin.cpp:330 searchwindow.cpp:329
+#: kmmainwidget.cpp:2867 kmreadermainwin.cpp:381 searchwindow.cpp:330
 msgid "&Inline..."
 msgstr "&Ingebed..."
 
-#: kmmainwidget.cpp:2846 kmreadermainwin.cpp:336 searchwindow.cpp:325
+#: kmmainwidget.cpp:2873 kmreadermainwin.cpp:387 searchwindow.cpp:326
 msgid ""
 "_: Message->Forward->\n"
 "As &Attachment..."
 msgstr "&Als bijlage..."
 
-#: kmmainwidget.cpp:2852 kmreadermainwin.cpp:342 searchwindow.cpp:341
+#: kmmainwidget.cpp:2879 kmreadermainwin.cpp:393 searchwindow.cpp:342
 msgid ""
 "_: Message->Forward->\n"
 "As Di&gest..."
 msgstr "Als b&undel..."
 
-#: kmmainwidget.cpp:2858 kmreadermainwin.cpp:348 searchwindow.cpp:346
+#: kmmainwidget.cpp:2885 kmreadermainwin.cpp:399 searchwindow.cpp:347
 msgid ""
 "_: Message->Forward->\n"
 "&Redirect..."
 msgstr "Om&leiden..."
 
-#: kmmainwidget.cpp:2885
+#: kmmainwidget.cpp:2897
 msgid "Send A&gain..."
 msgstr "Opnieu&w verzenden..."
 
-#: kmmainwidget.cpp:2890
+#: kmmainwidget.cpp:2902
 msgid "&Create Filter"
 msgstr "&Filter aanmaken"
 
-#: kmmainwidget.cpp:2893
+#: kmmainwidget.cpp:2905
 msgid "Filter on &Subject..."
 msgstr "Filteren op &Onderwerp..."
 
-#: kmmainwidget.cpp:2898
+#: kmmainwidget.cpp:2910
 msgid "Filter on &From..."
 msgstr "Filteren op &Van..."
 
-#: kmmainwidget.cpp:2903
+#: kmmainwidget.cpp:2915
 msgid "Filter on &To..."
 msgstr "Filteren op &Aan..."
 
-#: kmmainwidget.cpp:2908
+#: kmmainwidget.cpp:2920
 msgid "Filter on Mailing-&List..."
 msgstr "Filteren op &Discussiegroep..."
 
-#: kmmainwidget.cpp:2921
+#: kmmainwidget.cpp:2933
 msgid "Mark &Thread"
 msgstr "Dis&cussie markeren"
 
-#: kmmainwidget.cpp:2924
+#: kmmainwidget.cpp:2936
 msgid "Mark Thread as &Read"
 msgstr "Discussie ma&rkeren als gelezen"
 
-#: kmmainwidget.cpp:2925
+#: kmmainwidget.cpp:2937
 msgid "Mark all messages in the selected thread as read"
 msgstr "Alle berichten in de geselecteerde discussie markeren als gelezen"
 
-#: kmmainwidget.cpp:2930
+#: kmmainwidget.cpp:2942
 msgid "Mark Thread as &New"
 msgstr "Discussie markeren als &nieuw"
 
-#: kmmainwidget.cpp:2931
+#: kmmainwidget.cpp:2943
 msgid "Mark all messages in the selected thread as new"
 msgstr "Alle berichten in de geselecteerde discussie markeren als nieuw"
 
-#: kmmainwidget.cpp:2936
+#: kmmainwidget.cpp:2948
 msgid "Mark Thread as &Unread"
 msgstr "Discussie markeren als &ongelezen"
 
-#: kmmainwidget.cpp:2937
+#: kmmainwidget.cpp:2949
 msgid "Mark all messages in the selected thread as unread"
 msgstr "Alle berichten in de geselecteerde discussie markeren als ongelezen"
 
-#: kmmainwidget.cpp:2945
+#: kmmainwidget.cpp:2957
 msgid "Mark Thread as &Important"
 msgstr "D&iscussie markeren als belangrijk"
 
-#: kmmainwidget.cpp:2948
+#: kmmainwidget.cpp:2960
 msgid "Remove &Important Thread Mark"
 msgstr "Markering voor belangr&ijke discussie verwijderen"
 
-#: kmmainwidget.cpp:2951
+#: kmmainwidget.cpp:2963
 msgid "Mark Thread as &Action Item"
 msgstr "Discussie markeren als &actie-item"
 
-#: kmmainwidget.cpp:2954
+#: kmmainwidget.cpp:2966
 msgid "Remove &Action Item Thread Mark"
 msgstr "Markering voor &actie-item van discussie verwijderen"
 
-#: kmmainwidget.cpp:2958
+#: kmmainwidget.cpp:2970
 msgid "&Watch Thread"
 msgstr "Discussie v&olgen"
 
-#: kmmainwidget.cpp:2962
+#: kmmainwidget.cpp:2974
 msgid "&Ignore Thread"
 msgstr "D&iscussie negeren"
 
-#: kmmainwidget.cpp:2970
+#: kmmainwidget.cpp:2982
 msgid "Save A&ttachments..."
 msgstr "Bijlagen op&slaan..."
 
-#: kmmainwidget.cpp:2980
+#: kmmainwidget.cpp:2992
 msgid "Appl&y All Filters"
 msgstr "Alle filters toe&passen"
 
-#. i18n: file kmail_part.rc line 141
-#: kmmainwidget.cpp:2985 rc.cpp:30 rc.cpp:96
+#. i18n: file kmail_part.rc line 142
+#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
 #, no-c-format
 msgid "A&pply Filter"
 msgstr "F&ilter toepassen"
 
-#: kmmainwidget.cpp:2992
+#: kmmainwidget.cpp:3004
 msgid ""
 "_: View->\n"
 "&Unread Count"
 msgstr "&Ongelezen aantal"
 
-#: kmmainwidget.cpp:2994
+#: kmmainwidget.cpp:3006
 msgid "Choose how to display the count of unread messages"
 msgstr "Bepaal hoe het aantal ongelezen berichten zal worden getoond."
 
-#: kmmainwidget.cpp:2996
+#: kmmainwidget.cpp:3008
 msgid ""
 "_: View->Unread Count\n"
 "View in &Separate Column"
 msgstr "Tonen in apa&rte kolom"
 
-#: kmmainwidget.cpp:3002
+#: kmmainwidget.cpp:3014
 msgid ""
 "_: View->Unread Count\n"
 "View After &Folder Name"
 msgstr "Tonen ac&hter de mapnaam"
 
-#: kmmainwidget.cpp:3009
+#: kmmainwidget.cpp:3021
 msgid ""
 "_: View->\n"
 "&Total Column"
 msgstr "&Totaalkolom"
 
-#: kmmainwidget.cpp:3012
+#: kmmainwidget.cpp:3024
 msgid ""
 "Toggle display of column showing the total number of messages in folders."
 msgstr ""
 "Schakelt de weergave van de kolom om die het aantal berichten in de mappen "
 "toont."
 
-#: kmmainwidget.cpp:3014
+#: kmmainwidget.cpp:3026
 msgid ""
 "_: View->\n"
 "&Size Column"
 msgstr "Kolom &grootte"
 
-#: kmmainwidget.cpp:3017
+#: kmmainwidget.cpp:3029
 msgid "Toggle display of column showing the total size of messages in folders."
 msgstr ""
 "Schakelt de weergave van de kolom om die de totale grootte van de berichten in "
 "de mappen toont."
 
-#: kmmainwidget.cpp:3020
+#: kmmainwidget.cpp:3032
 msgid ""
 "_: View->\n"
 "&Expand Thread"
 msgstr "Discussie uitvouw&en"
 
-#: kmmainwidget.cpp:3021
+#: kmmainwidget.cpp:3033
 msgid "Expand the current thread"
 msgstr "De huidige discussie uitvouwen"
 
-#: kmmainwidget.cpp:3026
+#: kmmainwidget.cpp:3038
 msgid ""
 "_: View->\n"
 "&Collapse Thread"
 msgstr "Dis&cussie invouwen"
 
-#: kmmainwidget.cpp:3027
+#: kmmainwidget.cpp:3039
 msgid "Collapse the current thread"
 msgstr "De huidige discussie invouwen"
 
-#: kmmainwidget.cpp:3032
+#: kmmainwidget.cpp:3044
 msgid ""
 "_: View->\n"
 "Ex&pand All Threads"
 msgstr "Alle &discussies uitvouwen"
 
-#: kmmainwidget.cpp:3033
+#: kmmainwidget.cpp:3045
 msgid "Expand all threads in the current folder"
 msgstr "Vouwt alle discussies uit in de huidige map"
 
-#: kmmainwidget.cpp:3038
+#: kmmainwidget.cpp:3050
 msgid ""
 "_: View->\n"
 "C&ollapse All Threads"
 msgstr "A&lle discussies invouwen"
 
-#: kmmainwidget.cpp:3039
+#: kmmainwidget.cpp:3051
 msgid "Collapse all threads in the current folder"
 msgstr "Alle discussies in de huidige map invouwen"
 
-#: kmmainwidget.cpp:3044 kmreadermainwin.cpp:322
+#: kmmainwidget.cpp:3056 kmreadermainwin.cpp:373
 msgid "&View Source"
 msgstr "Bron &tonen"
 
-#: kmmainwidget.cpp:3048
+#: kmmainwidget.cpp:3060
 msgid "&Display Message"
 msgstr "Ber&icht tonen"
 
-#: kmmainwidget.cpp:3054
+#: kmmainwidget.cpp:3066
 msgid "&Next Message"
 msgstr "Volge&nde bericht"
 
-#: kmmainwidget.cpp:3055
+#: kmmainwidget.cpp:3067
 msgid "Go to the next message"
 msgstr "Naar het volgende bericht gaan"
 
-#: kmmainwidget.cpp:3059
+#: kmmainwidget.cpp:3071
 msgid "Next &Unread Message"
 msgstr "Volgende &ongelezen bericht"
 
-#: kmmainwidget.cpp:3061
+#: kmmainwidget.cpp:3073
 msgid "Go to the next unread message"
 msgstr "Naar het volgende ongelezen bericht gaan"
 
 #. i18n("Go to the next important message") ),
-#: kmmainwidget.cpp:3072
+#: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "Vori&ge bericht"
 
-#: kmmainwidget.cpp:3073
+#: kmmainwidget.cpp:3085
 msgid "Go to the previous message"
 msgstr "Naar het vorige bericht gaan"
 
-#: kmmainwidget.cpp:3077
+#: kmmainwidget.cpp:3089
 msgid "Previous Unread &Message"
 msgstr "Vorige ongele&zen bericht"
 
-#: kmmainwidget.cpp:3079
+#: kmmainwidget.cpp:3091
 msgid "Go to the previous unread message"
 msgstr "Naar het vorige ongelezen bericht gaan"
 
-#: kmmainwidget.cpp:3091
+#: kmmainwidget.cpp:3103
 msgid "Next Unread &Folder"
 msgstr "&Volgende ongelezen map"
 
-#: kmmainwidget.cpp:3092
+#: kmmainwidget.cpp:3104
 msgid "Go to the next folder with unread messages"
 msgstr "Naar de volgende map met ongelezen berichten"
 
-#: kmmainwidget.cpp:3100
+#: kmmainwidget.cpp:3112
 msgid "Previous Unread F&older"
 msgstr "V&orige ongelezen map"
 
-#: kmmainwidget.cpp:3101
+#: kmmainwidget.cpp:3113
 msgid "Go to the previous folder with unread messages"
 msgstr "Naar de vorige map met ongelezen berichten gaan"
 
-#: kmmainwidget.cpp:3108
+#: kmmainwidget.cpp:3120
 msgid ""
 "_: Go->\n"
 "Next Unread &Text"
 msgstr "Volgende ongelezen &tekst"
 
-#: kmmainwidget.cpp:3109
+#: kmmainwidget.cpp:3121
 msgid "Go to the next unread text"
 msgstr "Naar de volgende ongelezen tekst gaan"
 
-#: kmmainwidget.cpp:3110
+#: kmmainwidget.cpp:3122
 msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
 "message."
@@ -8544,51 +9485,55 @@ msgstr ""
 "In het huidige bericht naar beneden schuiven. Aan het einde van het huidige "
 "bericht overgaan naar het volgende ongelezen bericht."
 
-#: kmmainwidget.cpp:3117
+#: kmmainwidget.cpp:3129
+msgid "Show Quick Search"
+msgstr "Snelzoeken tonen"
+
+#: kmmainwidget.cpp:3136
 msgid "Configure &Filters..."
 msgstr "Filters i&nstellen..."
 
-#: kmmainwidget.cpp:3119
+#: kmmainwidget.cpp:3138
 msgid "Configure &POP Filters..."
 msgstr "&POP-filters instellen..."
 
-#: kmmainwidget.cpp:3121
+#: kmmainwidget.cpp:3140
 msgid "Manage &Sieve Scripts..."
 msgstr "&Sieve-scripts beheren..."
 
-#: kmmainwidget.cpp:3124
+#: kmmainwidget.cpp:3143
 msgid "KMail &Introduction"
 msgstr "&Inleiding in KMail"
 
-#: kmmainwidget.cpp:3125
+#: kmmainwidget.cpp:3144
 msgid "Display KMail's Welcome Page"
 msgstr "Welkomstpagina van KMail tonen"
 
-#: kmmainwidget.cpp:3131
+#: kmmainwidget.cpp:3150
 msgid "Configure &Notifications..."
 msgstr "&Notificaties instellen..."
 
-#: kmmainwidget.cpp:3136
+#: kmmainwidget.cpp:3155
 msgid "&Configure KMail..."
 msgstr "KMail &instellen..."
 
-#: kmmainwidget.cpp:3431
+#: kmmainwidget.cpp:3454
 msgid "E&mpty Trash"
 msgstr "Prull&enbak legen"
 
-#: kmmainwidget.cpp:3431
+#: kmmainwidget.cpp:3455
 msgid "&Move All Messages to Trash"
 msgstr "Alle berichten naar de &prullenbak verplaatsen"
 
-#: kmmainwidget.cpp:3434
+#: kmmainwidget.cpp:3464
 msgid "&Delete Search"
 msgstr "Zoekopdracht verwij&deren"
 
-#: kmmainwidget.cpp:3434
+#: kmmainwidget.cpp:3465
 msgid "&Delete Folder"
 msgstr "Map verwij&deren"
 
-#: kmmainwidget.cpp:3615
+#: kmmainwidget.cpp:3649
 #, c-format
 msgid ""
 "_n: Removed %n duplicate message.\n"
@@ -8597,24 +9542,24 @@ msgstr ""
 "%n dubbel bericht verwijderd.\n"
 "%n dubbele berichten verwijderd."
 
-#: kmmainwidget.cpp:3617
+#: kmmainwidget.cpp:3651
 msgid "No duplicate messages found."
 msgstr "Geen dubbele berichten gevonden."
 
-#: kmmainwidget.cpp:3687
+#: kmmainwidget.cpp:3721
 #, c-format
 msgid "Filter %1"
 msgstr "Filter %1"
 
-#: kmmainwidget.cpp:3821
+#: kmmainwidget.cpp:3855
 msgid "Subscription"
 msgstr "Inschrijving"
 
-#: kmmainwidget.cpp:3838
+#: kmmainwidget.cpp:3872
 msgid "Local Subscription"
 msgstr "Lokale inschrijving"
 
-#: kmmainwidget.cpp:3971
+#: kmmainwidget.cpp:4007
 msgid "Out of office reply active"
 msgstr "Afwezigheidsantwoorden actief"
 
@@ -8626,7 +9571,7 @@ msgstr "Nieu&w hoofdvenster"
 msgid " Initializing..."
 msgstr " Initialiseren..."
 
-#: kmmessage.cpp:1316
+#: kmmessage.cpp:1336
 msgid ""
 "This message contains a request to return a notification about your reception "
 "of the message.\n"
@@ -8637,7 +9582,7 @@ msgstr ""
 "U kunt dit verzoek negeren, een bevestiging laten versturen, of een "
 "\"geweigerd\" als antwoord versturen."
 
-#: kmmessage.cpp:1321
+#: kmmessage.cpp:1341
 msgid ""
 "This message contains a request to send a notification about your reception of "
 "the message.\n"
@@ -8651,7 +9596,7 @@ msgstr ""
 "U kunt dit verzoek negeren of KMail een antwoord in de vorm \"mislukt\" laten "
 "sturen."
 
-#: kmmessage.cpp:1328
+#: kmmessage.cpp:1348
 msgid ""
 "This message contains a request to send a notification about your reception of "
 "the message,\n"
@@ -8664,7 +9609,7 @@ msgstr ""
 "U kunt het verzoek negeren, een bevestiging laten sturen of een antwoord in de "
 "vorm \"geweigerd\" laten sturen."
 
-#: kmmessage.cpp:1335
+#: kmmessage.cpp:1355
 msgid ""
 "This message contains a request to send a notification about your reception of "
 "the message,\n"
@@ -8677,7 +9622,7 @@ msgstr ""
 "U kunt dit verzoek negeren, een bevestiging laten versturen of een antwoord "
 "versturen in de vorm \"geweigerd\"."
 
-#: kmmessage.cpp:1341
+#: kmmessage.cpp:1361
 msgid ""
 "This message contains a request to send a notification about your reception of "
 "the message,\n"
@@ -8691,19 +9636,19 @@ msgstr ""
 "U kunt dit verzoek negeren, een bevestiging laten versturen, of een antwoord in "
 "de vorm van \"geweigerd\"."
 
-#: kmmessage.cpp:1359 kmmessage.cpp:1366
+#: kmmessage.cpp:1379 kmmessage.cpp:1386
 msgid "Message Disposition Notification Request"
 msgstr "Verzoek voor ontvangst- en gelezenbevestigingen"
 
-#: kmmessage.cpp:1361
+#: kmmessage.cpp:1381
 msgid "Send \"&denied\""
 msgstr "\"Geweiger&d\" sturen"
 
-#: kmmessage.cpp:1361 kmmessage.cpp:1368
+#: kmmessage.cpp:1381 kmmessage.cpp:1388
 msgid "&Send"
 msgstr "&Verzenden"
 
-#: kmmessage.cpp:1436
+#: kmmessage.cpp:1458
 msgid ""
 "Header \"Disposition-Notification-Options\" contained required, but unknown "
 "parameter"
@@ -8711,34 +9656,42 @@ msgstr ""
 "De kop voor \"ontvangst- en gelezenbevestigingen\" bevat een vereiste, maar "
 "onbekende parameter."
 
-#: kmmessage.cpp:1628
+#: kmmessage.cpp:1650
 msgid "Receipt: "
 msgstr "Ontvangst:"
 
-#: kmmessage.cpp:3128 urlhandlermanager.cpp:551
+#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "Bijlage: %1"
 
-#: kmmimeparttree.cpp:139 kmreaderwin.cpp:1969
+#: kmmessage.cpp:3199
+msgid "This attachment has been deleted."
+msgstr "Deze bijlage is verwijderd."
+
+#: kmmessage.cpp:3201
+msgid "The attachment '%1' has been deleted."
+msgstr "De bijlage '%1' is verwijderd."
+
+#: kmmimeparttree.cpp:137 kmreaderwin.cpp:2034
 msgid ""
 "_: to view something\n"
 "View"
 msgstr "Tonen"
 
-#: kmmimeparttree.cpp:147
+#: kmmimeparttree.cpp:145
 msgid "Save All Attachments..."
 msgstr "Alle bijlagen opslaan..."
 
-#: kmmimeparttree.cpp:154 kmreaderwin.cpp:1975 kmreaderwin.cpp:2626
+#: kmmimeparttree.cpp:152 kmreaderwin.cpp:2041 kmreaderwin.cpp:2805
 msgid "Delete Attachment"
 msgstr "Bijlage verwijderen"
 
-#: kmmimeparttree.cpp:157 kmreaderwin.cpp:1973 kmreaderwin.cpp:2638
+#: kmmimeparttree.cpp:155 kmreaderwin.cpp:2039 kmreaderwin.cpp:2861
 msgid "Edit Attachment"
 msgstr "Bijlage bewerken"
 
-#: kmmimeparttree.cpp:370
+#: kmmimeparttree.cpp:368
 msgid "Unspecified Binary Data"
 msgstr "Niet-gespecificeerde binaire gegevens"
 
@@ -8958,213 +9911,226 @@ msgstr "geen onderwerp"
 msgid "unknown"
 msgstr "onbekend"
 
-#: kmreadermainwin.cpp:477 searchwindow.cpp:352
+#: kmreadermainwin.cpp:515 searchwindow.cpp:353
 msgid "Save Attachments..."
 msgstr "Bijlagen opslaan..."
 
-#: kmreaderwin.cpp:562
+#: kmreaderwin.cpp:489
 msgid ""
 "_: View->\n"
 "&Headers"
 msgstr "Beric&htkoppen"
 
-#: kmreaderwin.cpp:563
+#: kmreaderwin.cpp:490
 msgid "Choose display style of message headers"
 msgstr "Kies de wijze waarop berichtkoppen worden getoond"
 
-#: kmreaderwin.cpp:568
+#: kmreaderwin.cpp:495
 msgid ""
 "_: View->headers->\n"
 "&Enterprise Headers"
 msgstr "&Enterprise-berichtkoppen"
 
-#: kmreaderwin.cpp:571
+#: kmreaderwin.cpp:498
 msgid "Show the list of headers in Enterprise style"
 msgstr "Toon de lijst met berichtkoppen in een Enterprise-opmaak"
 
-#: kmreaderwin.cpp:575
+#: kmreaderwin.cpp:502
 msgid ""
 "_: View->headers->\n"
 "&Fancy Headers"
 msgstr "E&legant"
 
-#: kmreaderwin.cpp:578
+#: kmreaderwin.cpp:505
 msgid "Show the list of headers in a fancy format"
 msgstr "Toon de lijst met berichtkoppen in een elegante opmaak"
 
-#: kmreaderwin.cpp:582
+#: kmreaderwin.cpp:509
 msgid ""
 "_: View->headers->\n"
 "&Brief Headers"
 msgstr "&Beknopt"
 
-#: kmreaderwin.cpp:585
+#: kmreaderwin.cpp:512
 msgid "Show brief list of message headers"
 msgstr "Toon een beknopte lijst van de berichtkoppen"
 
-#: kmreaderwin.cpp:589
+#: kmreaderwin.cpp:516
 msgid ""
 "_: View->headers->\n"
 "&Standard Headers"
 msgstr "&Standaard"
 
-#: kmreaderwin.cpp:592
+#: kmreaderwin.cpp:519
 msgid "Show standard list of message headers"
 msgstr "Toon de standaardlijst met berichtkoppen"
 
-#: kmreaderwin.cpp:596
+#: kmreaderwin.cpp:523
 msgid ""
 "_: View->headers->\n"
 "&Long Headers"
 msgstr "&Uitgebreid"
 
-#: kmreaderwin.cpp:599
+#: kmreaderwin.cpp:526
 msgid "Show long list of message headers"
 msgstr "Toon een uitgebreide lijst met berichtkoppen"
 
-#: kmreaderwin.cpp:603
+#: kmreaderwin.cpp:530
 msgid ""
 "_: View->headers->\n"
 "&All Headers"
 msgstr "&Alles"
 
-#: kmreaderwin.cpp:606
+#: kmreaderwin.cpp:533
 msgid "Show all message headers"
 msgstr "Toon alle berichtkoppen"
 
-#: kmreaderwin.cpp:612
+#: kmreaderwin.cpp:539
 msgid ""
 "_: View->\n"
 "&Attachments"
 msgstr "Bijl&agen"
 
-#: kmreaderwin.cpp:613
+#: kmreaderwin.cpp:540
 msgid "Choose display style of attachments"
 msgstr "Kies de wijze waarop bijlagen worden getoond"
 
-#: kmreaderwin.cpp:617
+#: kmreaderwin.cpp:544
 msgid ""
 "_: View->attachments->\n"
 "&As Icons"
 msgstr "&Als pictogrammen"
 
-#: kmreaderwin.cpp:620
+#: kmreaderwin.cpp:547
 msgid "Show all attachments as icons. Click to see them."
 msgstr "Toon alle bijlagen als pictogrammen. Klik er op om ze te bekijken."
 
-#: kmreaderwin.cpp:624
+#: kmreaderwin.cpp:551
 msgid ""
 "_: View->attachments->\n"
 "&Smart"
 msgstr "In&telligent"
 
-#: kmreaderwin.cpp:627
+#: kmreaderwin.cpp:554
 msgid "Show attachments as suggested by sender."
 msgstr "Toon de bijlagen zoals wordt aanbevolen door de afzender."
 
-#: kmreaderwin.cpp:631
+#: kmreaderwin.cpp:558
 msgid ""
 "_: View->attachments->\n"
 "&Inline"
 msgstr "&Ingebed"
 
-#: kmreaderwin.cpp:634
+#: kmreaderwin.cpp:561
 msgid "Show all attachments inline (if possible)"
 msgstr "Toon alle bijlagen ingebed (indien mogelijk)"
 
-#: kmreaderwin.cpp:638
+#: kmreaderwin.cpp:565
 msgid ""
 "_: View->attachments->\n"
 "&Hide"
 msgstr "&Verborgen"
 
-#: kmreaderwin.cpp:641
+#: kmreaderwin.cpp:568
 msgid "Do not show attachments in the message viewer"
 msgstr "Geen bijlagen in de berichtenweergave tonen"
 
-#: kmreaderwin.cpp:646
+#: kmreaderwin.cpp:572
+#, fuzzy
+msgid ""
+"_: View->attachments->\n"
+"In Header &Only"
+msgstr "&Verborgen"
+
+#: kmreaderwin.cpp:575
+#, fuzzy
+msgid "Show Attachments only in the header of the mail"
+msgstr "Toon alle bijlagen als pictogrammen. Klik er op om ze te bekijken."
+
+#: kmreaderwin.cpp:580
 msgid "&Set Encoding"
 msgstr "Codering in&stellen"
 
-#: kmreaderwin.cpp:654
+#: kmreaderwin.cpp:588
 msgid "New Message To..."
 msgstr "Nieuw bericht aan..."
 
-#: kmreaderwin.cpp:657
+#: kmreaderwin.cpp:591
 msgid "Reply To..."
 msgstr "Antwoord zenden aan..."
 
-#: kmreaderwin.cpp:660
+#: kmreaderwin.cpp:594
 msgid "Forward To..."
 msgstr "Doorsturen naar..."
 
-#: kmreaderwin.cpp:663
+#: kmreaderwin.cpp:597
 msgid "Add to Address Book"
 msgstr "Toevoegen aan adresboek"
 
-#: kmreaderwin.cpp:666
+#: kmreaderwin.cpp:600
 msgid "Open in Address Book"
 msgstr "Openen in adresboek"
 
-#: kmreaderwin.cpp:670
+#: kmreaderwin.cpp:604
 msgid "Select All Text"
 msgstr "Alle tekst selecteren"
 
-#: kmreaderwin.cpp:672
+#: kmreaderwin.cpp:606 kmreaderwin.cpp:1994
 msgid "Copy Link Address"
 msgstr "Koppelingslocatie kopiëren"
 
-#: kmreaderwin.cpp:674
+#: kmreaderwin.cpp:608
 msgid "Open URL"
 msgstr "URL-adres openen"
 
-#: kmreaderwin.cpp:676
+#: kmreaderwin.cpp:610
 msgid "Bookmark This Link"
 msgstr "Bladwijzer aanmaken voor deze koppeling"
 
-#: kmreaderwin.cpp:680
+#: kmreaderwin.cpp:614
 msgid "Save Link As..."
 msgstr "Koppeling opslaan als..."
 
-#: kmreaderwin.cpp:687
+#: kmreaderwin.cpp:621
 msgid "Chat &With..."
 msgstr "Chatten &met..."
 
-#: kmreaderwin.cpp:1294
+#: kmreaderwin.cpp:1258
 msgid "Full namespace support for IMAP"
 msgstr "Volledige namespace-ondersteuning voor IMAP"
 
-#: kmreaderwin.cpp:1295
+#: kmreaderwin.cpp:1259
 msgid "Offline mode"
 msgstr "Offline-modus"
 
-#: kmreaderwin.cpp:1296
+#: kmreaderwin.cpp:1260
 msgid "Sieve script management and editing"
 msgstr "Sieve-scripts beheren en bewerken"
 
-#: kmreaderwin.cpp:1297
+#: kmreaderwin.cpp:1261
 msgid "Account specific filtering"
 msgstr "Account-specifiek filteren"
 
-#: kmreaderwin.cpp:1298
+#: kmreaderwin.cpp:1262
 msgid "Filtering of incoming mail for online IMAP accounts"
 msgstr "Het filteren van inkomende berichten van online IMAP-accounts"
 
-#: kmreaderwin.cpp:1299
+#: kmreaderwin.cpp:1263
 msgid "Online IMAP folders can be used when filtering into folders"
 msgstr ""
 "Online IMAP-mappen kunnen gebruikt worden wanneer u berichten naar mappen "
 "filtert"
 
-#: kmreaderwin.cpp:1300
+#: kmreaderwin.cpp:1264
 msgid "Automatically delete older mails on POP servers"
 msgstr "Oudere berichten automatisch verwijderen van POP-servers"
 
-#: kmreaderwin.cpp:1338
-msgid "The email client for the K Desktop Environment."
+#: kmreaderwin.cpp:1302
+#, fuzzy
+msgid "The email client for the Trinity Desktop Environment."
 msgstr "Het e-mailprogramma van de K Desktop Environment."
 
-#: kmreaderwin.cpp:1346
+#: kmreaderwin.cpp:1310
 msgid ""
 "<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
 "<p>Please wait . . .</p>&nbsp;"
@@ -9172,7 +10138,7 @@ msgstr ""
 "<h2 style='margin-top: 0px;'>Mapinhoud wordt opgehaald</h2> "
 "<p>Even geduld. . .</p>&nbsp;"
 
-#: kmreaderwin.cpp:1354
+#: kmreaderwin.cpp:1318
 msgid ""
 "<h2 style='margin-top: 0px;'>Offline</h2>"
 "<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
@@ -9182,7 +10148,7 @@ msgstr ""
 "<p>KMail is op het moment in offline-modus. Klik <a href=\"kmail:goOnline\">"
 "hier</a> om online te gaan. . .</p>&nbsp;"
 
-#: kmreaderwin.cpp:1371
+#: kmreaderwin.cpp:1335
 msgid ""
 "_: %1: KMail version; %2: help:// URL; %3: homepage URL; %4: prior KMail "
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
@@ -9226,13 +10192,13 @@ msgstr ""
 "<p>Bedankt,</p>\n"
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; het team van KMail</p>"
 
-#: kmreaderwin.cpp:1394 kmreaderwin.cpp:1416
+#: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
 msgid ""
 "<li>%1</li>\n"
 msgstr ""
 "<li>%1</li>\n"
 
-#: kmreaderwin.cpp:1399
+#: kmreaderwin.cpp:1363
 msgid ""
 "<p>Please take a moment to fill in the KMail configuration panel at "
 "Settings-&gt;Configure KMail.\n"
@@ -9244,7 +10210,7 @@ msgstr ""
 "U moet tenminste één identiteit en een inkomend en uitgaand e-mailaccount "
 "aanmaken.</p>\n"
 
-#: kmreaderwin.cpp:1411
+#: kmreaderwin.cpp:1375
 msgid ""
 "<p><span style='font-size:125%; font-weight:bold;'>Important changes</span> "
 "(compared to KMail %1):</p>\n"
@@ -9252,24 +10218,33 @@ msgstr ""
 "<p><span style='font-size:125%; font-weight:bold;'>Belangrijke "
 "wijzigingen</span> (ten opzichte van KMail %1):</p>\n"
 
-#: kmreaderwin.cpp:1555
+#: kmreaderwin.cpp:1518
 msgid "( body part )"
 msgstr "( inhoud )"
 
-#: kmreaderwin.cpp:1854
+#: kmreaderwin.cpp:1890
 msgid "Could not send MDN."
 msgstr "Ontvangst- en gelezenbevestiging kon niet worden verzonden."
 
-#: kmreaderwin.cpp:1978
+#: kmreaderwin.cpp:1992
+#, fuzzy
+msgid "Copy Email Address"
+msgstr "E-mailadres"
+
+#: kmreaderwin.cpp:2044
 msgid "Decrypt With Chiasmus..."
 msgstr "Ontcijferen met Chiasmus..."
 
-#: kmreaderwin.cpp:2133 kmreaderwin.cpp:2169 kmreaderwin.cpp:2188
+#: kmreaderwin.cpp:2050
+msgid "Scroll To"
+msgstr ""
+
+#: kmreaderwin.cpp:2208 kmreaderwin.cpp:2244 kmreaderwin.cpp:2264
 #, c-format
 msgid "View Attachment: %1"
 msgstr "Bijlage tonen: %1"
 
-#: kmreaderwin.cpp:2181
+#: kmreaderwin.cpp:2257
 #, c-format
 msgid ""
 "_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
@@ -9280,15 +10255,15 @@ msgstr ""
 "[KMail: de bijlage bevat binaire gegevens. Er wordt nu getracht de eerste %n "
 "tekens te tonen.]"
 
-#: kmreaderwin.cpp:2277
+#: kmreaderwin.cpp:2353
 msgid "&Open with '%1'"
 msgstr "&Openen met '%1'"
 
-#: kmreaderwin.cpp:2279
+#: kmreaderwin.cpp:2355
 msgid "&Open With..."
 msgstr "&Openen met..."
 
-#: kmreaderwin.cpp:2281
+#: kmreaderwin.cpp:2357
 msgid ""
 "Open attachment '%1'?\n"
 "Note that opening an attachment may compromise your system's security."
@@ -9297,39 +10272,39 @@ msgstr ""
 "Bedenk dat het openen van een bijlage de veiligheid van uw systeem in gevaar "
 "kan brengen."
 
-#: kmreaderwin.cpp:2286
+#: kmreaderwin.cpp:2362
 msgid "Open Attachment?"
 msgstr "Bijlage openen?"
 
-#: kmreaderwin.cpp:2625
+#: kmreaderwin.cpp:2804
 msgid ""
 "Deleting an attachment might invalidate any digital signature on this message."
 msgstr ""
 "Het verwijderen van een bijlage kan de digitale ondertekening van het bericht "
 "ongeldig maken."
 
-#: kmreaderwin.cpp:2637
+#: kmreaderwin.cpp:2860
 msgid ""
 "Modifying an attachment might invalidate any digital signature on this message."
 msgstr ""
 "Het aanpassen van de bijlage kan de digitale handtekening van dit bericht "
 "ongeldig maken."
 
-#: kmreaderwin.cpp:2685
+#: kmreaderwin.cpp:2956
 msgid "Attachments:"
 msgstr "Bijlagen:"
 
-#: kmsearchpattern.cpp:898
+#: kmsearchpattern.cpp:913
 msgid ""
 "_: name used for a virgin filter\n"
 "unknown"
 msgstr "onbekend"
 
-#: kmsearchpattern.cpp:904
+#: kmsearchpattern.cpp:919
 msgid "(match any of the following)"
 msgstr "(komt overeen met enkele van de volgende)"
 
-#: kmsearchpattern.cpp:906
+#: kmsearchpattern.cpp:921
 msgid "(match all of the following)"
 msgstr "(komt overeen met al het volgende)"
 
@@ -9361,27 +10336,46 @@ msgstr "Leeftijd in dagen"
 msgid "Message Status"
 msgstr "Berichtstatus"
 
-#: kmsearchpatternedit.cpp:391
+#: kmsearchpatternedit.cpp:42
+#, fuzzy
+msgid "From"
+msgstr "&Van"
+
+#: kmsearchpatternedit.cpp:43 recipientseditor.cpp:100
+msgid "To"
+msgstr "Aan"
+
+#: kmsearchpatternedit.cpp:44 recipientseditor.cpp:102
+msgid "CC"
+msgstr "CC"
+
+#: kmsearchpatternedit.cpp:45
+#, fuzzy
+msgid "Reply To"
+msgstr "Beant&woorden aan"
+
+#: kmsearchpatternedit.cpp:46
+#, fuzzy
+msgid "Organization"
+msgstr "Organisatie:"
+
+#: kmsearchpatternedit.cpp:397
 msgid "Search Criteria"
 msgstr "Zoekcriteria"
 
-#: kmsearchpatternedit.cpp:408
+#: kmsearchpatternedit.cpp:414
 msgid "Match a&ll of the following"
 msgstr "Komt overeen met a&l het volgende"
 
-#: kmsearchpatternedit.cpp:409
+#: kmsearchpatternedit.cpp:415
 msgid "Match an&y of the following"
 msgstr "Komt overeen met &enkele van de volgende"
 
-#: kmsender.cpp:114
-msgid "Please create an account for sending and try again."
-msgstr "Maak een account aan voor het verzenden en probeer het opnieuw."
-
 #: kmsender.cpp:171
 msgid "Cannot add message to outbox folder"
 msgstr "Het bericht kan niet worden toegevoegd aan postvak uit."
 
-#: kmsender.cpp:373
+#: kmsender.cpp:374
 msgid ""
 "Critical error: Unable to process sent mail (out of space?)Moving failing "
 "message to \"sent-mail\" folder."
@@ -9389,7 +10383,7 @@ msgstr ""
 "Kritieke fout: de verzonden post kon niet worden verwerkt (onvoldoende "
 "schijfruimte?). Het falende bericht wordt naar de map \"verzonden\" verplaatst."
 
-#: kmsender.cpp:385
+#: kmsender.cpp:386
 msgid ""
 "Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
 "failed.\n"
@@ -9402,7 +10396,7 @@ msgstr ""
 "Probeer dit probleem a.u.b. te herstellen en het bericht handmatig te "
 "verplaatsen."
 
-#: kmsender.cpp:431
+#: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
 "Please set the email address of identity '%1' in the Identities section of the "
@@ -9412,7 +10406,7 @@ msgstr ""
 "Geef a.u.b. een e-mailadres op voor de identiteit %1 in de sectie Identiteiten "
 "van het configuratiedialoog en probeer het opnieuw."
 
-#: kmsender.cpp:453
+#: kmsender.cpp:454
 #, c-format
 msgid ""
 "_n: %n queued message successfully sent.\n"
@@ -9421,19 +10415,19 @@ msgstr ""
 "%n bericht uit de wachtrij met succes verzonden.\n"
 "%n berichten uit de wachtrij met succes verzonden."
 
-#: kmsender.cpp:456
+#: kmsender.cpp:457
 msgid "%1 of %2 queued messages successfully sent."
 msgstr "%1 van %2 berichten uit postvak uit met succes verzonden."
 
-#: kmsender.cpp:471
+#: kmsender.cpp:472
 msgid "Sending messages"
 msgstr "Berichten worden verzonden"
 
-#: kmsender.cpp:472
+#: kmsender.cpp:473
 msgid "Initiating sender process..."
 msgstr "Verzendproces wordt geïnitialiseerd..."
 
-#: kmsender.cpp:502
+#: kmsender.cpp:503
 msgid ""
 "You have chosen to send all queued email using an unencrypted transport, do you "
 "want to continue? "
@@ -9441,25 +10435,25 @@ msgstr ""
 "U hebt ervoor gekozen om uw berichten in de wachtrij te versturen via een "
 "onversleuteld transport. Wilt u doorgaan? "
 
-#: kmsender.cpp:504
+#: kmsender.cpp:505
 msgid "Send Unencrypted"
 msgstr "Onversleuteld verzenden"
 
-#: kmsender.cpp:556
+#: kmsender.cpp:557
 msgid "Unrecognized transport protocol. Unable to send message."
 msgstr "Onherkenbaar transportprotocol. Het bericht kon niet worden verzonden."
 
-#: kmsender.cpp:597
+#: kmsender.cpp:598
 msgid ""
 "_: %3: subject of message\n"
 "Sending message %1 of %2: %3"
 msgstr "Bericht %1 van %2 wordt verzonden: %3"
 
-#: kmsender.cpp:616
+#: kmsender.cpp:617
 msgid "Failed to send (some) queued messages."
 msgstr "Het verzenden van (sommige) berichten in de wachtrij is mislukt."
 
-#: kmsender.cpp:693
+#: kmsender.cpp:694
 msgid ""
 "Sending aborted:\n"
 "%1\n"
@@ -9476,11 +10470,11 @@ msgstr ""
 "Het volgende transportprotocol werd gebruikt:\n"
 "  %2"
 
-#: kmsender.cpp:701 kmsender.cpp:746
+#: kmsender.cpp:702 kmsender.cpp:747
 msgid "Sending aborted."
 msgstr "Verzenden afgebroken."
 
-#: kmsender.cpp:719
+#: kmsender.cpp:720
 msgid ""
 "<p>Sending failed:</p>"
 "<p>%1</p>"
@@ -9497,19 +10491,19 @@ msgstr ""
 "<p>Het volgende transportprotocol werd gebruikt:  %2</p> "
 "<p>Wilt u doorgaan met het verzenden van de overige berichten?</p>"
 
-#: kmsender.cpp:729
+#: kmsender.cpp:730
 msgid "Continue Sending"
 msgstr "Doorgaan met verzenden"
 
-#: kmsender.cpp:729
+#: kmsender.cpp:730
 msgid "&Continue Sending"
 msgstr "&Doorgaan met verzenden"
 
-#: kmsender.cpp:730
+#: kmsender.cpp:731
 msgid "&Abort Sending"
 msgstr "Verzenden &stoppen"
 
-#: kmsender.cpp:732
+#: kmsender.cpp:733
 msgid ""
 "Sending failed:\n"
 "%1\n"
@@ -9525,11 +10519,11 @@ msgstr ""
 "Het volgende transportprotocol werd gebruikt:\n"
 " %2"
 
-#: kmsender.cpp:930
+#: kmsender.cpp:931
 msgid "Please specify a mailer program in the settings."
 msgstr "Specificeer a.u.b. een mailerprogramma in KMail's instellingen."
 
-#: kmsender.cpp:931
+#: kmsender.cpp:932
 msgid ""
 "Sending failed:\n"
 "%1\n"
@@ -9546,21 +10540,21 @@ msgstr ""
 "Het volgende transportprotocol werd gebruikt:\n"
 "  %2"
 
-#: kmsender.cpp:979
+#: kmsender.cpp:980
 #, c-format
 msgid "Failed to execute mailer program %1"
 msgstr "Fout bij uitvoeren van mailerprogramma %1"
 
-#: kmsender.cpp:1029
+#: kmsender.cpp:1030
 msgid "Sendmail exited abnormally."
 msgstr "Sendmail stopte onverwacht."
 
-#: kmsender.cpp:1099
+#: kmsender.cpp:1100
 msgid "You need to supply a username and a password to use this SMTP server."
 msgstr ""
 "U dient een gebruikersnaam en wachtwoord op te geven voor deze SMTP-server."
 
-#: kmstartup.cpp:197
+#: kmstartup.cpp:198
 msgid ""
 "%1 already seems to be running on another display on this machine. Running %2 "
 "more than once can cause the loss of mail. You should not start %1 unless you "
@@ -9571,7 +10565,7 @@ msgstr ""
 "wordt niet aangeraden om %1 te starten, tenzij u zeker weet dat het programma "
 "niet actief is."
 
-#: kmstartup.cpp:207
+#: kmstartup.cpp:208
 msgid ""
 "%1 seems to be running on another display on this machine. Running %1 and %2 at "
 "the same time can cause the loss of mail. You should not start %2 unless you "
@@ -9582,7 +10576,7 @@ msgstr ""
 "wordt niet aangeraden om %2 te starten, tenzij u zeker weet dat %1 niet actief "
 "is."
 
-#: kmstartup.cpp:215
+#: kmstartup.cpp:216
 msgid ""
 "%1 already seems to be running on %2. Running %1 more than once can cause the "
 "loss of mail. You should not start %1 on this computer unless you are sure that "
@@ -9593,7 +10587,7 @@ msgstr ""
 "op deze computer te starten, tenzij u zeker weet dat het programma niet actief "
 "is op %2."
 
-#: kmstartup.cpp:221
+#: kmstartup.cpp:222
 msgid ""
 "%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
 "loss of mail. You should not start %2 on this computer unless you are sure that "
@@ -9603,24 +10597,24 @@ msgstr ""
 "leiden tot berichtenverlies. Het wordt niet aangeraden om %2 op deze computer "
 "te starten, tenzij u zeker weet dat %1 niet actief is op %3."
 
-#: kmstartup.cpp:231
+#: kmstartup.cpp:232
 #, c-format
 msgid "Start %1"
 msgstr "%1 starten"
 
-#: kmstartup.cpp:232
+#: kmstartup.cpp:233
 msgid "Exit"
 msgstr "Afsluiten"
 
-#: kmsystemtray.cpp:337
+#: kmsystemtray.cpp:357
 msgid "New Messages In"
 msgstr "Nieuwe berichten in"
 
-#: kmsystemtray.cpp:547
+#: kmsystemtray.cpp:567
 msgid "There are no unread messages"
 msgstr "Er zijn geen ongelezen berichten"
 
-#: kmsystemtray.cpp:549
+#: kmsystemtray.cpp:569
 #, c-format
 msgid ""
 "_n: There is 1 unread message.\n"
@@ -9902,51 +10896,56 @@ msgstr "Sieve-scripts beheren"
 msgid "Available Scripts"
 msgstr "Beschikbare scripts"
 
-#: managesievescriptsdialog.cpp:116
+#: managesievescriptsdialog.cpp:121
 msgid "No Sieve URL configured"
 msgstr "Geen Sieve-URL-adres ingesteld"
 
-#: managesievescriptsdialog.cpp:135
+#: managesievescriptsdialog.cpp:140
 msgid "Failed to fetch the list of scripts"
 msgstr "Kon de lijst met scripts niet ophalen"
 
-#: managesievescriptsdialog.cpp:160
+#: managesievescriptsdialog.cpp:165
 msgid "Delete Script"
 msgstr "Script verwijderen"
 
-#: managesievescriptsdialog.cpp:161
+#: managesievescriptsdialog.cpp:166
 msgid "Edit Script..."
 msgstr "Script bewerken..."
 
-#: managesievescriptsdialog.cpp:164
+#: managesievescriptsdialog.cpp:167
+#, fuzzy
+msgid "Deactivate Script"
+msgstr "Script verwijderen"
+
+#: managesievescriptsdialog.cpp:170
 msgid "New Script..."
 msgstr "Nieuw script..."
 
-#: managesievescriptsdialog.cpp:233
+#: managesievescriptsdialog.cpp:256
 msgid "Really delete script \"%1\" from the server?"
 msgstr "Wilt u het script \"%1\" van de server verwijderen?"
 
-#: managesievescriptsdialog.cpp:234
+#: managesievescriptsdialog.cpp:257
 msgid "Delete Sieve Script Confirmation"
 msgstr "Sieve-scriptbevestiging verwijderen"
 
-#: managesievescriptsdialog.cpp:278
+#: managesievescriptsdialog.cpp:300
 msgid "New Sieve Script"
 msgstr "Nieuw Sieve-script"
 
-#: managesievescriptsdialog.cpp:279
+#: managesievescriptsdialog.cpp:301
 msgid "Please enter a name for the new Sieve script:"
 msgstr "Geef een naam op voor het nieuwe Sieve-script:"
 
-#: managesievescriptsdialog.cpp:293
+#: managesievescriptsdialog.cpp:315
 msgid "Edit Sieve Script"
 msgstr "Sieve-script bewerken"
 
-#: managesievescriptsdialog.cpp:337
+#: managesievescriptsdialog.cpp:367
 msgid "The Sieve script was successfully uploaded."
 msgstr "Het Sieve-script is succesvol ge-upload."
 
-#: managesievescriptsdialog.cpp:338
+#: managesievescriptsdialog.cpp:368
 msgid "Sieve Script Upload"
 msgstr "Uploaden van Sieve-script"
 
@@ -9956,7 +10955,7 @@ msgid ""
 "&Reply"
 msgstr "Beantwoo&rden"
 
-#: messageactions.cpp:48 searchwindow.cpp:311
+#: messageactions.cpp:48 searchwindow.cpp:312
 msgid "&Reply..."
 msgstr "&Beantwoorden..."
 
@@ -9964,11 +10963,11 @@ msgstr "&Beantwoorden..."
 msgid "Reply to A&uthor..."
 msgstr "Af&zender beantwoorden..."
 
-#: messageactions.cpp:58 searchwindow.cpp:313
+#: messageactions.cpp:58 searchwindow.cpp:314
 msgid "Reply to &All..."
 msgstr "&Allen beantwoorden..."
 
-#: messageactions.cpp:63 searchwindow.cpp:316
+#: messageactions.cpp:63 searchwindow.cpp:317
 msgid "Reply to Mailing-&List..."
 msgstr "Beantwoorden aan d&iscussiegroep..."
 
@@ -10028,7 +11027,7 @@ msgstr "Markering voor &actie-item van bericht verwijderen"
 msgid "&Edit Message"
 msgstr "Bericht b&ewerken"
 
-#: messagecomposer.cpp:222
+#: messagecomposer.cpp:223
 msgid ""
 "<qt>"
 "<p>Structuring information returned by the Crypto plug-in could not be "
@@ -10040,7 +11039,7 @@ msgstr ""
 "niet op de juiste wijze worden verwerkt. Mogelijk is de plugin beschadigd.</p>"
 "<p>Neem contact op met uw systeembeheerder.</p></qt>"
 
-#: messagecomposer.cpp:226
+#: messagecomposer.cpp:227
 msgid ""
 "<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
 "successfully.</p>"
@@ -10060,7 +11059,7 @@ msgstr ""
 "<li><em>of</em> u geeft traditionele OpenPGP-instellingen op bij het tabblad "
 "\"Identiteit->Geavanceerd\" onder dezelfde menuoptie.</li></ul>"
 
-#: messagecomposer.cpp:444
+#: messagecomposer.cpp:445
 msgid ""
 "No suitable encoding could be found for your message.\n"
 "Please set an encoding using the 'Options' menu."
@@ -10068,7 +11067,7 @@ msgstr ""
 "Er is geen geschikte codering gevonden voor uw bericht.\n"
 "Stel a.u.b. een codering in via het menu 'Opties'."
 
-#: messagecomposer.cpp:556
+#: messagecomposer.cpp:557
 msgid ""
 "Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
 "bug."
@@ -10076,7 +11075,7 @@ msgstr ""
 "Het Chiasmus-backend kent geen functie met de naam \"x-encrypt\". Rapporteer "
 "deze bug a.u.b."
 
-#: messagecomposer.cpp:564
+#: messagecomposer.cpp:565
 msgid ""
 "The \"x-encrypt\" function does not accept the expected parameters. Please "
 "report this bug."
@@ -10084,11 +11083,11 @@ msgstr ""
 "De functie \"x-encrypt\" accepteerde niet de verwachte parameters. Rapporteer "
 "deze bug a.u.b."
 
-#: messagecomposer.cpp:572
+#: messagecomposer.cpp:573
 msgid "Chiasmus Encryption Error"
 msgstr "Versleutelingsfout met Chiasmus"
 
-#: messagecomposer.cpp:577
+#: messagecomposer.cpp:578
 msgid ""
 "Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
 "not return a byte array. Please report this bug."
@@ -10096,7 +11095,7 @@ msgstr ""
 "Het Chiasmus-backend retourneerde een onverwachte waarde. De functie "
 "\"x-encrypt\" resulteerde niet in een byte array. Rapporteer deze bug a.u.b."
 
-#: messagecomposer.cpp:638
+#: messagecomposer.cpp:636
 msgid ""
 "The inline OpenPGP crypto message format does not support encryption or signing "
 "of attachments.\n"
@@ -10106,19 +11105,19 @@ msgstr ""
 "ondertekening van bijlagen.\n"
 "Wilt u werkelijk de afgeraden ingebedde OpenPGP gebruiken?"
 
-#: messagecomposer.cpp:642
+#: messagecomposer.cpp:640
 msgid "Insecure Message Format"
 msgstr "Onveilig opgesteld bericht"
 
-#: messagecomposer.cpp:643
+#: messagecomposer.cpp:641
 msgid "Use Inline OpenPGP"
 msgstr "Inline OpenPGP gebruiken"
 
-#: messagecomposer.cpp:644
+#: messagecomposer.cpp:642
 msgid "Use OpenPGP/MIME"
 msgstr "OpenPGP/MIME gebruiken"
 
-#: messagecomposer.cpp:760
+#: messagecomposer.cpp:758
 msgid ""
 "Examination of the recipient's signing preferences yielded that you be asked "
 "whether or not to sign this message.\n"
@@ -10128,21 +11127,21 @@ msgstr ""
 "worden om dit bericht te ondertekenen of niet.\n"
 "Wilt u dit bericht ondertekenen?"
 
-#: messagecomposer.cpp:765 messagecomposer.cpp:788
+#: messagecomposer.cpp:763 messagecomposer.cpp:786
 msgid "Sign Message?"
 msgstr "Bericht ondertekenen?"
 
-#: messagecomposer.cpp:766 messagecomposer.cpp:789
+#: messagecomposer.cpp:764 messagecomposer.cpp:787
 msgid ""
 "_: to sign\n"
 "&Sign"
 msgstr "&Ondertekenen"
 
-#: messagecomposer.cpp:767 messagecomposer.cpp:790
+#: messagecomposer.cpp:765 messagecomposer.cpp:788
 msgid "Do &Not Sign"
 msgstr "&Niet ondertekenen"
 
-#: messagecomposer.cpp:784
+#: messagecomposer.cpp:782
 msgid ""
 "There are conflicting signing preferences for these recipients.\n"
 "Sign this message?"
@@ -10150,7 +11149,7 @@ msgstr ""
 "De ondertekeningsvoorkeuren voor deze ontvangers zijn verschillend.\n"
 "Wilt u dit bericht ondertekenen?"
 
-#: messagecomposer.cpp:806
+#: messagecomposer.cpp:804
 msgid ""
 "You have requested to sign this message, but no valid signing keys have been "
 "configured for this identity."
@@ -10158,15 +11157,15 @@ msgstr ""
 "U hebt verzocht om dit bericht te ondertekenen, maar er zijn geen geldige "
 "ondertekeningsleutels ingesteld voor deze identiteit."
 
-#: messagecomposer.cpp:810
+#: messagecomposer.cpp:808
 msgid "Send Unsigned?"
 msgstr "Niet-ondertekend verzenden?"
 
-#: messagecomposer.cpp:811
+#: messagecomposer.cpp:809
 msgid "Send &Unsigned"
 msgstr "&Niet-ondertekend verzenden"
 
-#: messagecomposer.cpp:826
+#: messagecomposer.cpp:824
 msgid ""
 "Some parts of this message will not be signed.\n"
 "Sending only partially signed messages might violate site policy.\n"
@@ -10177,7 +11176,7 @@ msgstr ""
 "webbeleid.\n"
 "Wilt u alle onderdelen ondertekenen?"
 
-#: messagecomposer.cpp:829
+#: messagecomposer.cpp:827
 msgid ""
 "This message will not be signed.\n"
 "Sending unsigned message might violate site policy.\n"
@@ -10187,23 +11186,23 @@ msgstr ""
 "Het verzenden niet-ondertekende berichten kan botsen met het webbeleid.\n"
 "Wilt u het bericht toch ondertekenen?"
 
-#: messagecomposer.cpp:833
+#: messagecomposer.cpp:831
 msgid "&Sign All Parts"
 msgstr "Alle berichtonderdelen onder&tekenen"
 
-#: messagecomposer.cpp:833
+#: messagecomposer.cpp:831
 msgid "&Sign"
 msgstr "&Ondertekenen"
 
-#: messagecomposer.cpp:835
+#: messagecomposer.cpp:833
 msgid "Unsigned-Message Warning"
 msgstr "Waarschuwing voor niet-ondertekend bericht"
 
-#: messagecomposer.cpp:837
+#: messagecomposer.cpp:835
 msgid "Send &As Is"
 msgstr "Zo &verzenden"
 
-#: messagecomposer.cpp:875
+#: messagecomposer.cpp:873
 msgid ""
 "Valid trusted encryption keys were found for all recipients.\n"
 "Encrypt this message?"
@@ -10211,7 +11210,7 @@ msgstr ""
 "Er zijn geldige vertrouwde sleutels gevonden voor alle ontvangers.\n"
 "Dit bericht versleutelen?"
 
-#: messagecomposer.cpp:877
+#: messagecomposer.cpp:875
 msgid ""
 "Examination of the recipient's encryption preferences yielded that you be asked "
 "whether or not to encrypt this message.\n"
@@ -10221,23 +11220,23 @@ msgstr ""
 "het bericht versleuteld moet worden of niet.\n"
 "Bericht versleutelen?"
 
-#: messagecomposer.cpp:882 messagecomposer.cpp:909
+#: messagecomposer.cpp:880 messagecomposer.cpp:907
 msgid "Encrypt Message?"
 msgstr "Bericht versleutelen?"
 
-#: messagecomposer.cpp:884
+#: messagecomposer.cpp:882
 msgid "Sign && &Encrypt"
 msgstr "Ondertekenen && v&ersleutelen"
 
-#: messagecomposer.cpp:887 messagecomposer.cpp:962
+#: messagecomposer.cpp:885 messagecomposer.cpp:960
 msgid "&Sign Only"
 msgstr "Alleen on&dertekenen"
 
-#: messagecomposer.cpp:888 messagecomposer.cpp:963
+#: messagecomposer.cpp:886 messagecomposer.cpp:961
 msgid "&Send As-Is"
 msgstr "Zo &verzenden"
 
-#: messagecomposer.cpp:905
+#: messagecomposer.cpp:903
 msgid ""
 "There are conflicting encryption preferences for these recipients.\n"
 "Encrypt this message?"
@@ -10245,11 +11244,11 @@ msgstr ""
 "De versleutelingsvoorkeuren voor deze ontvangers zijn verschillend.\n"
 "Dit bericht versleutelen?"
 
-#: messagecomposer.cpp:911
+#: messagecomposer.cpp:909
 msgid "Do &Not Encrypt"
 msgstr "&Niet versleutelen"
 
-#: messagecomposer.cpp:927
+#: messagecomposer.cpp:925
 msgid ""
 "You have requested to encrypt this message, and to encrypt a copy to yourself, "
 "but no valid trusted encryption keys have been configured for this identity."
@@ -10258,11 +11257,11 @@ msgstr ""
 "versleutelen, maar u hebt geen geldige vertrouwde sleutels ingesteld voor deze "
 "identiteit."
 
-#: messagecomposer.cpp:932
+#: messagecomposer.cpp:930
 msgid "Send Unencrypted?"
 msgstr "Onversleuteld verzenden?"
 
-#: messagecomposer.cpp:948
+#: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
 "Sending only partially encrypted messages might violate site policy and/or leak "
@@ -10274,7 +11273,7 @@ msgstr ""
 "en/of kan er voor zorgen dat er gevoelige informatie uitlekt.\n"
 "Wilt u alle delen toch versleutelen?"
 
-#: messagecomposer.cpp:952
+#: messagecomposer.cpp:950
 msgid ""
 "This message will not be encrypted.\n"
 "Sending unencrypted messages might violate site policy and/or leak sensitive "
@@ -10286,15 +11285,15 @@ msgstr ""
 "kan er voor zorgen dat er gevoelige informatie uitlekt.\n"
 "Wilt u de berichten toch versleutelen?"
 
-#: messagecomposer.cpp:957
+#: messagecomposer.cpp:955
 msgid "&Encrypt All Parts"
 msgstr "Alle berichtonderdelen versl&eutelen"
 
-#: messagecomposer.cpp:959
+#: messagecomposer.cpp:957
 msgid "Unencrypted Message Warning"
 msgstr "Waarschuwing onversleuteld bericht"
 
-#: messagecomposer.cpp:2040
+#: messagecomposer.cpp:2038
 msgid ""
 "<qt>"
 "<p>Error: The backend did not return any encoded data.</p>"
@@ -10306,7 +11305,7 @@ msgstr ""
 "<p>Dien a.u.b. een bugrapport in over deze programmafout:"
 "<br>%2</p></qt>"
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2111
 msgid ""
 "<qt>Not all characters fit into the chosen encoding."
 "<br>"
@@ -10316,19 +11315,29 @@ msgstr ""
 "<br>"
 "<br>Wilt u het bericht toch verzenden?</qt>"
 
-#: messagecomposer.cpp:2115
+#: messagecomposer.cpp:2113
 msgid "Some Characters Will Be Lost"
 msgstr "Sommige tekens zullen verloren gaan"
 
-#: messagecomposer.cpp:2116
+#: messagecomposer.cpp:2114
 msgid "Lose Characters"
 msgstr "Lettertekens verliezen"
 
-#: messagecomposer.cpp:2116
+#: messagecomposer.cpp:2114
 msgid "Change Encoding"
 msgstr "Codering veranderen"
 
-#: messagecomposer.cpp:2164
+#: messagecomposer.cpp:2149
+#, fuzzy
+msgid ""
+"This message could not be signed, since no valid signing keys have been found; "
+"this should actually never happen, please report this bug."
+msgstr ""
+"Dit bericht kon niet worden ondertekend, omdat het gekozen backend geen "
+"ondertekening ondersteunt. Dit zou eigenlijk niet mogen gebeuren. U wordt "
+"verzocht deze bug te rapporteren."
+
+#: messagecomposer.cpp:2168
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
@@ -10337,17 +11346,17 @@ msgstr ""
 "ondertekening ondersteunt. Dit zou eigenlijk niet mogen gebeuren. U wordt "
 "verzocht deze bug te rapporteren."
 
-#: messagecomposer.cpp:2185
+#: messagecomposer.cpp:2195
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr "GnuPG-auditlog voor ondertekeningen"
 
-#: messagecomposer.cpp:2190
+#: messagecomposer.cpp:2200
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
 msgstr "Het ondertekenen is mislukt. Controleer of gpg-agent actief is."
 
-#: messagecomposer.cpp:2213
+#: messagecomposer.cpp:2223
 msgid ""
 "This message could not be encrypted, since the chosen backend does not seem to "
 "support encryption; this should actually never happen, please report this bug."
@@ -10356,11 +11365,11 @@ msgstr ""
 "versleuteling ondersteunt. Dit zou eigenlijk niet mogen gebeuren. U wordt "
 "verzocht deze bug te rapporteren."
 
-#: messagecomposer.cpp:2233 messagecomposer.cpp:2278
+#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr "GnuPG-auditlog voor versleutelingen"
 
-#: messagecomposer.cpp:2255
+#: messagecomposer.cpp:2271
 msgid ""
 "This message could not be signed and encrypted, since the chosen backend does "
 "not seem to support combined signing and encryption; this should actually never "
@@ -10370,24 +11379,24 @@ msgstr ""
 "backend geen ondertekening en versleuteling ondersteunt. Dit zou eigenlijk niet "
 "mogen gebeuren. U wordt verzocht deze bug te rapporteren."
 
-#: newfolderdialog.cpp:58
+#: newfolderdialog.cpp:59
 msgid "New Folder"
 msgstr "Nieuwe map"
 
-#: newfolderdialog.cpp:65
+#: newfolderdialog.cpp:69
 #, c-format
 msgid "New Subfolder of %1"
 msgstr "Nieuwe submap van %1"
 
-#: newfolderdialog.cpp:81
+#: newfolderdialog.cpp:85
 msgid "Enter a name for the new folder."
 msgstr "Voer een naam in voor de nieuwe map."
 
-#: newfolderdialog.cpp:92
+#: newfolderdialog.cpp:96
 msgid "Mailbox &format:"
 msgstr "Postbus&formaat:"
 
-#: newfolderdialog.cpp:97
+#: newfolderdialog.cpp:101
 msgid ""
 "Select whether you want to store the messages in this folder as one file per  "
 "message (maildir) or as one big file (mbox). KMail uses maildir by default and "
@@ -10400,11 +11409,11 @@ msgstr ""
 "gebeuren. Wanneer u niet precies weet wat u hier moet doen dient u deze optie "
 "zo te laten staan."
 
-#: newfolderdialog.cpp:119
+#: newfolderdialog.cpp:124
 msgid "Folder &contains:"
 msgstr "Map be&vat:"
 
-#: newfolderdialog.cpp:124
+#: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
 "storage of groupware items such as tasks or notes. The default is mail. If you "
@@ -10415,92 +11424,72 @@ msgstr ""
 "e-mailberichten. Wanneer u niet weet wat u moet doen kunt u deze optie zo laten "
 "staan."
 
-#: newfolderdialog.cpp:160
+#: newfolderdialog.cpp:165
 msgid "Namespace for &folder:"
 msgstr "Name&space van map:"
 
-#: newfolderdialog.cpp:165
+#: newfolderdialog.cpp:170
 msgid "Select the personal namespace the folder should be created in."
 msgstr ""
 "Selecteer de persoonlijke namespace waar de map in aangemaakt dient te worden."
 
-#: newfolderdialog.cpp:188
+#: newfolderdialog.cpp:193
 msgid "Please specify a name for the new folder."
 msgstr "Geef een naam op voor de nieuwe map."
 
-#: newfolderdialog.cpp:189
+#: newfolderdialog.cpp:194
 msgid "No Name Specified"
 msgstr "Geen naam opgegeven"
 
-#: newfolderdialog.cpp:198
-msgid ""
-"Folder names cannot contain the / (slash) character; please choose another "
-"folder name."
-msgstr "Mapnamen kunnen niet het teken / bevatten; kies een andere mapnaam."
-
-#: newfolderdialog.cpp:204
-msgid ""
-"Folder names cannot start with a . (dot) character; please choose another "
-"folder name."
-msgstr ""
-"Mapnamen kunnen geen . (punt) bevatten; kies daarom een andere mapnaam."
-
-#: newfolderdialog.cpp:223
-msgid ""
-"Your IMAP server does not allow the character '%1'; please choose another "
-"folder name."
-msgstr ""
-"Uw IMAP-server ondersteunt het teken '%1' niet; kies een andere mapnaam."
-
-#: newfolderdialog.cpp:240
+#: newfolderdialog.cpp:216
 msgid "<qt>Failed to create folder <b>%1</b>, folder already exists.</qt>"
 msgstr ""
 "<qt>Het aanmaken van de map <b>%1</b> is mislukt. Deze map bestaat reeds.</qt>"
 
-#: newfolderdialog.cpp:246
+#: newfolderdialog.cpp:222
 msgid "<qt>Failed to create folder <b>%1</b>.</qt> "
 msgstr "<qt>De map <b>%1</b> kon niet worden aangemaakt.</qt>"
 
-#: objecttreeparser.cpp:450
+#: objecttreeparser.cpp:490
 msgid "Wrong Crypto Plug-In."
 msgstr "Onjuiste crypto-plugin."
 
-#: objecttreeparser.cpp:490 objecttreeparser.cpp:1909
+#: objecttreeparser.cpp:594 objecttreeparser.cpp:2130
 msgid "Different results for signatures"
 msgstr "Verschillende resultaten voor ondertekeningen"
 
-#: objecttreeparser.cpp:573
+#: objecttreeparser.cpp:667
 msgid "The crypto engine returned no cleartext data."
 msgstr "De crypto-engine gaf geen leesbare tekst terug."
 
-#: objecttreeparser.cpp:576 objecttreeparser.cpp:2350
-#: objecttreeparser.cpp:2393
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
+#: objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr "Status: "
 
-#: objecttreeparser.cpp:583
+#: objecttreeparser.cpp:677
 msgid "(unknown)"
 msgstr "(onbekend)"
 
-#: objecttreeparser.cpp:594 objecttreeparser.cpp:748
+#: objecttreeparser.cpp:688 objecttreeparser.cpp:903
 msgid "Crypto plug-in \"%1\" is not initialized."
 msgstr "Crypto-plugin %1 is niet geïnitialiseerd."
 
-#: objecttreeparser.cpp:598
+#: objecttreeparser.cpp:692
 msgid "Crypto plug-in \"%1\" cannot verify signatures."
 msgstr "Crypto-plugin \"%1\" kan geen handtekeningen verifiëren."
 
-#: objecttreeparser.cpp:603 objecttreeparser.cpp:756
+#: objecttreeparser.cpp:697 objecttreeparser.cpp:911
 msgid "No appropriate crypto plug-in was found."
 msgstr "Geen geschikte Crypto-plugin gevonden."
 
-#: objecttreeparser.cpp:606
+#: objecttreeparser.cpp:700
 msgid ""
 "_: %1 is either 'OpenPGP' or 'S/MIME'\n"
 "No %1 plug-in was found."
 msgstr "Geen %1-plugin gevonden."
 
-#: objecttreeparser.cpp:610
+#: objecttreeparser.cpp:704
 #, c-format
 msgid ""
 "The message is signed, but the validity of the signature cannot be verified.<br "
@@ -10509,32 +11498,37 @@ msgstr ""
 "Het bericht is ondertekend, maar de geldigheid van de ondertekening kon niet "
 "worden geverifieerd.<br />Reden: %1"
 
-#: objecttreeparser.cpp:667
+#: objecttreeparser.cpp:737
+#, fuzzy
+msgid "Encrypted data not shown"
+msgstr "Versleutelde gegevens worden niet getoond."
+
+#: objecttreeparser.cpp:755
 msgid "This message is encrypted."
 msgstr "Dit bericht is versleuteld."
 
-#: objecttreeparser.cpp:672
+#: objecttreeparser.cpp:760
 msgid "Decrypt Message"
 msgstr "Bericht decoderen"
 
-#: objecttreeparser.cpp:731 objecttreeparser.cpp:744 objecttreeparser.cpp:773
+#: objecttreeparser.cpp:886 objecttreeparser.cpp:899 objecttreeparser.cpp:928
 msgid "Encrypted data not shown."
 msgstr "Versleutelde gegevens worden niet getoond."
 
-#: objecttreeparser.cpp:734
+#: objecttreeparser.cpp:889
 msgid "Crypto plug-in \"%1\" could not decrypt the data."
 msgstr "De crypto-plugin \"%1\" kon de data niet ontcijferen."
 
-#: objecttreeparser.cpp:737
+#: objecttreeparser.cpp:892
 #, c-format
 msgid "Error: %1"
 msgstr "Fout: %1"
 
-#: objecttreeparser.cpp:752
+#: objecttreeparser.cpp:907
 msgid "Crypto plug-in \"%1\" cannot decrypt messages."
 msgstr "Crypto-plugin \"%1\" kan geen berichten ontcijferen."
 
-#: objecttreeparser.cpp:844
+#: objecttreeparser.cpp:1000
 msgid ""
 "<b>Note:</b> This HTML message may contain external references to images etc. "
 "For security/privacy reasons external references are not loaded. If you trust "
@@ -10547,7 +11541,7 @@ msgstr ""
 "referenties voor dit bericht ophalen door <a href=\"kmail:loadExternal\">"
 "hier te klikken</a>."
 
-#: objecttreeparser.cpp:854
+#: objecttreeparser.cpp:1010
 msgid ""
 "<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
 "code is shown. If you trust the sender of this message then you can activate "
@@ -10559,20 +11553,31 @@ msgstr ""
 "de opgemaakte HTML voor dit bericht activeren door <a href=\"kmail:showHTML\">"
 "hier</a> te klikken."
 
-#: objecttreeparser.cpp:1451
+#: objecttreeparser.cpp:1227
+msgid ""
+"This message is a <i>Toltec</i> Groupware object, it can only be viewed with "
+"Microsoft Outlook in combination with the Toltec connector."
+msgstr ""
+
+#: objecttreeparser.cpp:1239
+#, fuzzy
+msgid "Show Raw Message"
+msgstr "Bericht doorsturen"
+
+#: objecttreeparser.cpp:1658
 #, c-format
 msgid "Sorry, certificate could not be imported.<br>Reason: %1"
 msgstr "Het certificaat kon helaas niet geïmporteerd worden.<br>Reden: %1"
 
-#: objecttreeparser.cpp:1461
+#: objecttreeparser.cpp:1668
 msgid "Sorry, no certificates were found in this message."
 msgstr "Er waren geen certificaten gevonden in dit bericht."
 
-#: objecttreeparser.cpp:1464
+#: objecttreeparser.cpp:1671
 msgid "Certificate import status:"
 msgstr "Status van importeren certificaat:"
 
-#: objecttreeparser.cpp:1467
+#: objecttreeparser.cpp:1674
 #, c-format
 msgid ""
 "_n: 1 new certificate was imported.\n"
@@ -10581,7 +11586,7 @@ msgstr ""
 "1 nieuw certificaat werd geïmporteerd.\n"
 "%n nieuwe certificaten werden geïmporteerd."
 
-#: objecttreeparser.cpp:1470
+#: objecttreeparser.cpp:1677
 #, c-format
 msgid ""
 "_n: 1 certificate was unchanged.\n"
@@ -10590,7 +11595,7 @@ msgstr ""
 "1 certificaat is ongewijzigd.\n"
 "%n certificaten zijn ongewijzigd"
 
-#: objecttreeparser.cpp:1473
+#: objecttreeparser.cpp:1680
 #, c-format
 msgid ""
 "_n: 1 new secret key was imported.\n"
@@ -10599,7 +11604,7 @@ msgstr ""
 "1 nieuwe geheime sleutel werd geïmporteerd.\n"
 "%n nieuwe geheime sleutels werden geïmporteerd."
 
-#: objecttreeparser.cpp:1476
+#: objecttreeparser.cpp:1683
 #, c-format
 msgid ""
 "_n: 1 secret key was unchanged.\n"
@@ -10608,179 +11613,196 @@ msgstr ""
 "1 geheime sleutel is ongewijzigd.\n"
 "%n geheime sleutels zijn ongewijzigd."
 
-#: objecttreeparser.cpp:1485
+#: objecttreeparser.cpp:1692
 msgid "Sorry, no details on certificate import available."
 msgstr ""
 "Er zijn helaas geen details beschikbaar over het importeren van de "
 "certificaten."
 
-#: objecttreeparser.cpp:1488
+#: objecttreeparser.cpp:1695
 msgid "Certificate import details:"
 msgstr "Importdetails certificaat:"
 
-#: objecttreeparser.cpp:1491
+#: objecttreeparser.cpp:1698
 msgid "Failed: %1 (%2)"
 msgstr "Mislukt: %1 (%2)"
 
-#: objecttreeparser.cpp:1496
+#: objecttreeparser.cpp:1703
 msgid "New or changed: %1 (secret key available)"
 msgstr "Nieuw of veranderd: %1 (geheime sleutel beschikbaar)"
 
-#: objecttreeparser.cpp:1498
+#: objecttreeparser.cpp:1706
 #, c-format
 msgid "New or changed: %1"
 msgstr "Nieuw of veranderd: %1"
 
-#: objecttreeparser.cpp:1891
+#: objecttreeparser.cpp:2112
 msgid "Error: Signature not verified"
 msgstr "Fout: ondertekening is niet geverifieerd"
 
-#: objecttreeparser.cpp:1894
+#: objecttreeparser.cpp:2115
 msgid "Good signature"
 msgstr "Correcte ondertekening"
 
-#: objecttreeparser.cpp:1897
+#: objecttreeparser.cpp:2118
 msgid "<b>Bad</b> signature"
 msgstr "<b>Ongeldige</b> ondertekening"
 
-#: objecttreeparser.cpp:1900
+#: objecttreeparser.cpp:2121
 msgid "No public key to verify the signature"
 msgstr "Geen publieke sleutel om de ondertekening te verifiëren"
 
-#: objecttreeparser.cpp:1903
+#: objecttreeparser.cpp:2124
 msgid "No signature found"
 msgstr "Geen ondertekening gevonden"
 
-#: objecttreeparser.cpp:1906
+#: objecttreeparser.cpp:2127
 msgid "Error verifying the signature"
 msgstr "Fout bij het verifiëren van de ondertekening"
 
-#: objecttreeparser.cpp:1929
+#: objecttreeparser.cpp:2150
 msgid "No status information available."
 msgstr "Geen statusinformatie beschikbaar."
 
-#: objecttreeparser.cpp:1936 objecttreeparser.cpp:2020
+#: objecttreeparser.cpp:2157 objecttreeparser.cpp:2241
 msgid "Good signature."
 msgstr "Correcte ondertekening."
 
-#: objecttreeparser.cpp:1957
+#: objecttreeparser.cpp:2178
 msgid "One key has expired."
 msgstr "Een sleutel is verlopen."
 
-#: objecttreeparser.cpp:1961
+#: objecttreeparser.cpp:2182
 msgid "The signature has expired."
 msgstr "De ondertekening is verlopen."
 
-#: objecttreeparser.cpp:1966
+#: objecttreeparser.cpp:2187
 msgid "Unable to verify: key missing."
 msgstr "Verificatie kon niet worden uitgevoerd: sleutel ontbreekt."
 
-#: objecttreeparser.cpp:1973
+#: objecttreeparser.cpp:2194
 msgid "CRL not available."
 msgstr "CRL-lijst niet beschikbaar."
 
-#: objecttreeparser.cpp:1977
+#: objecttreeparser.cpp:2198
 msgid "Available CRL is too old."
 msgstr "Beschikbare CRL-lijst is te oud."
 
-#: objecttreeparser.cpp:1981
+#: objecttreeparser.cpp:2202
 msgid "A policy was not met."
 msgstr "Een van de regels werd niet vervuld."
 
-#: objecttreeparser.cpp:1985
+#: objecttreeparser.cpp:2206
 msgid "A system error occurred."
 msgstr "Er deed zich een systeemfout voor."
 
-#: objecttreeparser.cpp:1996
+#: objecttreeparser.cpp:2217
 msgid "One key has been revoked."
 msgstr "Een sleutel is teruggeroepen."
 
-#: objecttreeparser.cpp:2022
+#: objecttreeparser.cpp:2243
 msgid "<b>Bad</b> signature."
 msgstr "<b>Ongeldige</b> ondertekening."
 
-#: objecttreeparser.cpp:2049
+#: objecttreeparser.cpp:2270
 msgid "Invalid signature."
 msgstr "Ongeldige ondertekening."
 
-#: objecttreeparser.cpp:2051
+#: objecttreeparser.cpp:2272
 msgid "Not enough information to check signature validity."
 msgstr "Onvoldoende informatie om de ondertekening te controleren."
 
-#: objecttreeparser.cpp:2060
+#: objecttreeparser.cpp:2281
 msgid "Signature is valid."
 msgstr "Ondertekening is geldig."
 
-#: objecttreeparser.cpp:2062
+#: objecttreeparser.cpp:2283
 msgid "Signed by <a href=\"mailto:%1\">%2</a>."
 msgstr "Ondertekend door <a href=\"mailto:%1\">%2</a>."
 
-#: objecttreeparser.cpp:2066
+#: objecttreeparser.cpp:2287
 msgid "Unknown signature state"
 msgstr "Ongeldige ondertekeningsstatus"
 
-#: objecttreeparser.cpp:2070
+#: objecttreeparser.cpp:2291
 msgid "Show Details"
 msgstr "Details tonen"
 
-#: objecttreeparser.cpp:2082
+#: objecttreeparser.cpp:2308
 msgid "No Audit Log available"
 msgstr "Geen auditlog beschikbaar"
 
-#: objecttreeparser.cpp:2089
+#: objecttreeparser.cpp:2310
+#, fuzzy, c-format
+msgid "Error Retrieving Audit Log: %1"
+msgstr ""
+"Fout bij het ophalen van de quotagegevens van de server\n"
+"%1"
+
+#: objecttreeparser.cpp:2320
 msgid ""
 "_: The Audit Log is a detailed error log from the gnupg backend\n"
 "Show Audit Log"
 msgstr "Auditlog tonen"
 
-#: objecttreeparser.cpp:2097
+#: objecttreeparser.cpp:2331
 msgid "Hide Details"
 msgstr "Details verbergen"
 
-#: objecttreeparser.cpp:2124 objecttreeparser.cpp:2126
+#: objecttreeparser.cpp:2357 objecttreeparser.cpp:2359
 msgid "Encapsulated message"
 msgstr "Ingebed bericht"
 
-#: objecttreeparser.cpp:2135
+#: objecttreeparser.cpp:2368
+#, fuzzy
+msgid "Please wait while the message is being decrypted..."
+msgstr "Dit bericht is versleuteld."
+
+#: objecttreeparser.cpp:2370
 msgid "Encrypted message"
 msgstr "Versleuteld bericht"
 
-#: objecttreeparser.cpp:2137
+#: objecttreeparser.cpp:2372
 msgid "Encrypted message (decryption not possible)"
 msgstr "Versleuteld bericht (ontcijferen niet mogelijk)"
 
-#: objecttreeparser.cpp:2139
+#: objecttreeparser.cpp:2374
 #, c-format
 msgid "Reason: %1"
 msgstr "Reden:%1"
 
-#: objecttreeparser.cpp:2194
+#: objecttreeparser.cpp:2384
+#, fuzzy
+msgid "Please wait while the signature is being verified..."
+msgstr "De geldigheid van de ondertekening kon niet worden geverifieerd."
+
+#: objecttreeparser.cpp:2438
 msgid "[Details]"
 msgstr "[Details]"
 
-#: objecttreeparser.cpp:2233 objecttreeparser.cpp:2235
+#: objecttreeparser.cpp:2477 objecttreeparser.cpp:2479
 msgid "certificate"
 msgstr "certificaat"
 
-#: objecttreeparser.cpp:2242 objecttreeparser.cpp:2267
+#: objecttreeparser.cpp:2486 objecttreeparser.cpp:2511
 msgid "Warning:"
 msgstr "Waarschuwing:"
 
-#: objecttreeparser.cpp:2244
+#: objecttreeparser.cpp:2488
 msgid "Sender's mail address is not stored in the %1 used for signing."
 msgstr ""
 "Het e-mailadres van de afzender is niet opgeslagen in de %1, welke wordt "
 "gebruikt voor ondertekenen."
 
-#: objecttreeparser.cpp:2247
+#: objecttreeparser.cpp:2491
 msgid "sender: "
 msgstr "afzender: "
 
-#: objecttreeparser.cpp:2250
+#: objecttreeparser.cpp:2494
 msgid "stored: "
 msgstr "opgeslagen: "
 
-#: objecttreeparser.cpp:2269
+#: objecttreeparser.cpp:2513
 msgid ""
 "No mail address is stored in the %1 used for signing, so we cannot compare it "
 "to the sender's address %2."
@@ -10788,98 +11810,98 @@ msgstr ""
 "Er is geen e-mailadres opgeslagen in de %1, welke wordt gebruikt voor het "
 "ondertekenen. Hierdoor kunnen we die niet vergelijken met het afzenderadres %2."
 
-#: objecttreeparser.cpp:2292
+#: objecttreeparser.cpp:2536
 #, c-format
 msgid "Not enough information to check signature. %1"
 msgstr "Onvoldoende informatie om de handtekening te controleren. %1"
 
-#: objecttreeparser.cpp:2309 objecttreeparser.cpp:2387
+#: objecttreeparser.cpp:2553 objecttreeparser.cpp:2631
 msgid "Message was signed with unknown key."
 msgstr "Bericht was ondertekend met een onbekende sleutel."
 
-#: objecttreeparser.cpp:2311 objecttreeparser.cpp:2425
-#: objecttreeparser.cpp:2469
+#: objecttreeparser.cpp:2555 objecttreeparser.cpp:2669
+#: objecttreeparser.cpp:2713
 #, c-format
 msgid "Message was signed by %1."
 msgstr "Bericht was ondertekend door %1."
 
-#: objecttreeparser.cpp:2318 objecttreeparser.cpp:2327
-#: objecttreeparser.cpp:2338
+#: objecttreeparser.cpp:2562 objecttreeparser.cpp:2571
+#: objecttreeparser.cpp:2582
 #, c-format
 msgid "Message was signed with key %1."
 msgstr "Bericht was ondertekend met sleutel %1."
 
-#: objecttreeparser.cpp:2321
+#: objecttreeparser.cpp:2565
 msgid "Message was signed on %1 with key %2."
 msgstr "Bericht was ondertekend door %1, met sleutel %2."
 
-#: objecttreeparser.cpp:2330
+#: objecttreeparser.cpp:2574
 msgid "Message was signed by %3 on %1 with key %2"
 msgstr "Bericht was ondertekend door %3 op %1, met sleutel %2"
 
-#: objecttreeparser.cpp:2341
+#: objecttreeparser.cpp:2585
 msgid "Message was signed by %2 with key %1."
 msgstr "Bericht was ondertekend door %1, met sleutel %2."
 
-#: objecttreeparser.cpp:2379
+#: objecttreeparser.cpp:2623
 msgid "Message was signed on %1 with unknown key %2."
 msgstr "Bericht was op %1 ondertekend met onbekende sleutel %2."
 
-#: objecttreeparser.cpp:2383
+#: objecttreeparser.cpp:2627
 #, c-format
 msgid "Message was signed with unknown key %1."
 msgstr "Bericht was ondertekend met onbekende sleutel %1."
 
-#: objecttreeparser.cpp:2389
+#: objecttreeparser.cpp:2633
 msgid "The validity of the signature cannot be verified."
 msgstr "De geldigheid van de ondertekening kon niet worden geverifieerd."
 
-#: objecttreeparser.cpp:2421 objecttreeparser.cpp:2465
+#: objecttreeparser.cpp:2665 objecttreeparser.cpp:2709
 msgid "Message was signed by %2 (Key ID: %1)."
 msgstr "Bericht was ondertekend door %1 (sleutel-id: %2)."
 
-#: objecttreeparser.cpp:2431
+#: objecttreeparser.cpp:2675
 msgid "The signature is valid, but the key's validity is unknown."
 msgstr ""
 "De ondertekening is geldig, maar de betrouwbaarheid van de sleutel is onbekend."
 
-#: objecttreeparser.cpp:2435
+#: objecttreeparser.cpp:2679
 msgid "The signature is valid and the key is marginally trusted."
 msgstr "De ondertekening is geldig, en de sleutel is gedeeltelijk betrouwbaar."
 
-#: objecttreeparser.cpp:2439
+#: objecttreeparser.cpp:2683
 msgid "The signature is valid and the key is fully trusted."
 msgstr "De ondertekening is geldig en de sleutel is volledig betrouwbaar."
 
-#: objecttreeparser.cpp:2443
+#: objecttreeparser.cpp:2687
 msgid "The signature is valid and the key is ultimately trusted."
 msgstr "De ondertekening is geldig en de sleutel is ultiem betrouwbaar."
 
-#: objecttreeparser.cpp:2447
+#: objecttreeparser.cpp:2691
 msgid "The signature is valid, but the key is untrusted."
 msgstr "De ondertekening is geldig, maar de sleutel is onbetrouwbaar."
 
-#: objecttreeparser.cpp:2471
+#: objecttreeparser.cpp:2715
 msgid "Warning: The signature is bad."
 msgstr "Waarschuwing: ongeldige ondertekening."
 
-#: objecttreeparser.cpp:2495
+#: objecttreeparser.cpp:2739
 msgid "End of signed message"
 msgstr "Einde van ondertekend bericht"
 
-#: objecttreeparser.cpp:2501
+#: objecttreeparser.cpp:2745
 msgid "End of encrypted message"
 msgstr "Einde van versleuteld bericht"
 
-#: objecttreeparser.cpp:2508
+#: objecttreeparser.cpp:2752
 msgid "End of encapsulated message"
 msgstr "Einde van ingebed bericht"
 
-#: partNode.cpp:481
+#: partNode.cpp:505
 msgid "internal part"
 msgstr "Intern deel"
 
-#: partNode.cpp:483
+#: partNode.cpp:507
 msgid "body part"
 msgstr "tekstdeel"
 
@@ -10969,19 +11991,19 @@ msgstr "&Ga naar"
 msgid "F&older"
 msgstr "Ma&p"
 
-#. i18n: file kmail_part.rc line 115
+#. i18n: file kmail_part.rc line 116
 #: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
 #, no-c-format
 msgid "&Message"
 msgstr "Beri&cht"
 
-#. i18n: file kmail_part.rc line 121
+#. i18n: file kmail_part.rc line 122
 #: rc.cpp:24 rc.cpp:90 rc.cpp:123
 #, no-c-format
 msgid "Reply Special"
 msgstr "Speciaal antwoorden"
 
-#. i18n: file kmail_part.rc line 127
+#. i18n: file kmail_part.rc line 128
 #: rc.cpp:27 rc.cpp:93 rc.cpp:126
 #, no-c-format
 msgid "&Forward"
@@ -11146,158 +12168,170 @@ msgstr ""
 msgid "Never sign/encrypt when sa&ving as draft"
 msgstr "Nooit versleutelen bij het opslaan van een &concept"
 
-#. i18n: file customtemplates_base.ui line 180
-#: rc.cpp:194
+#. i18n: file customtemplates_base.ui line 118
+#: rc.cpp:194 rc.cpp:462
+#, no-c-format
+msgid "How does this work?"
+msgstr "Hoe werkt dit?"
+
+#. i18n: file customtemplates_base.ui line 169
+#: rc.cpp:197 templateparser.cpp:417
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "Aan: "
+
+#. i18n: file customtemplates_base.ui line 177
+#: rc.cpp:200 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "CC: "
+
+#. i18n: file customtemplates_base.ui line 234
+#: rc.cpp:203
 #, no-c-format
 msgid "Universal"
 msgstr "Algemeen"
 
-#. i18n: file customtemplates_base.ui line 185
-#: rc.cpp:197
+#. i18n: file customtemplates_base.ui line 239
+#: rc.cpp:206
 #, no-c-format
 msgid "Reply"
 msgstr "Beantwoorden"
 
-#. i18n: file customtemplates_base.ui line 190
-#: rc.cpp:200
+#. i18n: file customtemplates_base.ui line 244
+#: rc.cpp:209
 #, no-c-format
 msgid "Reply to All"
 msgstr "Allen beantwoorden"
 
-#. i18n: file customtemplates_base.ui line 195
-#: rc.cpp:203
+#. i18n: file customtemplates_base.ui line 249
+#: rc.cpp:212
 #, no-c-format
 msgid "Forward"
 msgstr "Doorsturen"
 
-#. i18n: file customtemplates_base.ui line 207
-#: rc.cpp:206
+#. i18n: file customtemplates_base.ui line 261
+#: rc.cpp:215
 #, no-c-format
 msgid "Shortc&ut:"
 msgstr "Snelt&oets:"
 
-#. i18n: file customtemplates_base.ui line 229
-#: rc.cpp:209
+#. i18n: file customtemplates_base.ui line 283
+#: rc.cpp:218
 #, no-c-format
 msgid "&Template type:"
 msgstr "Sjabloon&type:"
 
-#. i18n: file customtemplates_base.ui line 256
-#: rc.cpp:215 rc.cpp:456
-#, no-c-format
-msgid "How does this work?"
-msgstr "Hoe werkt dit?"
-
 #. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:218
+#: rc.cpp:224
 #, no-c-format
 msgid "Folder Properties"
 msgstr "Mapeigenschappen"
 
 #. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:227
+#: rc.cpp:233
 #, no-c-format
 msgid "Folder holds a &mailing list"
 msgstr "&Map bevat een discussiegroep"
 
 #. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:230
+#: rc.cpp:236
 #, no-c-format
 msgid "List &address:"
 msgstr "Post&adres:"
 
 #. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:233
+#: rc.cpp:239
 #, no-c-format
 msgid "N&ormal:"
 msgstr "N&ormaal:"
 
 #. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:236
+#: rc.cpp:242
 #, no-c-format
 msgid "Unr&ead:"
 msgstr "Ong&elezen:"
 
 #. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:242
+#: rc.cpp:248
 #, no-c-format
 msgid "Message Expiring"
 msgstr "Berichtenverloop"
 
 #. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:245
+#: rc.cpp:251
 #, no-c-format
 msgid "E&xpire after:"
 msgstr "Bericht&en bewaren tot:"
 
 #. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:248
+#: rc.cpp:254
 #, no-c-format
 msgid "Expire &read messages"
 msgstr "Gelezen berichten laten ve&rlopen"
 
 #. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:251
+#: rc.cpp:257
 #, no-c-format
 msgid "Expire a&fter:"
 msgstr "Berichten laten &verlopen na:"
 
 #. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:254
+#: rc.cpp:260
 #, no-c-format
 msgid "Expire &unread messages"
 msgstr "&Ongelezen berichten laten verlopen"
 
 #. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:257 rc.cpp:266
+#: rc.cpp:263 rc.cpp:272
 #, no-c-format
 msgid "Day(s)"
 msgstr "Dag(en)"
 
 #. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:260 rc.cpp:269
+#: rc.cpp:266 rc.cpp:275
 #, no-c-format
 msgid "Week(s)"
 msgstr "We(e)k(en)"
 
 #. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:263 rc.cpp:272
+#: rc.cpp:269 rc.cpp:278
 #, no-c-format
 msgid "Month(s)"
 msgstr "Maand(en)"
 
 #. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:275
+#: rc.cpp:281
 #, no-c-format
 msgid "Advanced"
 msgstr "Geavanceerd"
 
 #. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:278
+#: rc.cpp:284
 #, no-c-format
 msgid "Sender identit&y:"
 msgstr "&Identiteit van afzender:"
 
 #. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:281
+#: rc.cpp:287
 #, no-c-format
 msgid "&Storage format:"
 msgstr "Op&slagformaat:"
 
 #. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:284
+#: rc.cpp:290
 #, no-c-format
 msgid "&List displays:"
 msgstr "&Lijstweergaven:"
 
 #. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:293
+#: rc.cpp:299
 #, no-c-format
 msgid "Validate certificates using CRLs"
 msgstr "Certificaten met CRL's valideren"
 
 #. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:296
+#: rc.cpp:302
 #, no-c-format
 msgid ""
 "If this option is selected, S/MIME certificates are validated using Certificate "
@@ -11307,13 +12341,13 @@ msgstr ""
 "worden met Certificate Revocation Lists (CRL's)."
 
 #. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:299
+#: rc.cpp:305
 #, no-c-format
 msgid "Validate certificates online (OCSP)"
 msgstr "Certificaten online valideren (OCSP)"
 
 #. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:302
+#: rc.cpp:308
 #, no-c-format
 msgid ""
 "If this option is selected, S/MIME certificates are validated online using the "
@@ -11325,19 +12359,19 @@ msgstr ""
 "hieronder het URL-adres in van de OCSP-dienst."
 
 #. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:305
+#: rc.cpp:311
 #, no-c-format
 msgid "Online Certificate Validation"
 msgstr "Online certificaatvalidatie"
 
 #. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:308
+#: rc.cpp:314
 #, no-c-format
 msgid "OCSP responder URL:"
 msgstr "URL-adres OCSP-dienst:"
 
 #. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:311
+#: rc.cpp:317
 #, no-c-format
 msgid ""
 "Enter here the address of the server for online validation of certificates "
@@ -11347,25 +12381,25 @@ msgstr ""
 "(OCSP-dienst). Het URL-adres begint doorgaans met http://."
 
 #. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:314
+#: rc.cpp:320
 #, no-c-format
 msgid "OCSP responder signature:"
 msgstr "Handtekening OCSP-dienst:"
 
 #. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:317
+#: rc.cpp:323
 #, no-c-format
 msgid "Ignore service URL of certificates"
 msgstr "Service-URL van certificaten negeren"
 
 #. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:320
+#: rc.cpp:326
 #, no-c-format
 msgid "Do not check certificate policies"
 msgstr "Certificaatbeleid niet controleren"
 
 #. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:323
+#: rc.cpp:329
 #, no-c-format
 msgid ""
 "By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
@@ -11376,13 +12410,13 @@ msgstr ""
 "het beleid niet gecontroleerd."
 
 #. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:326
+#: rc.cpp:332
 #, no-c-format
 msgid "Never consult a CRL"
 msgstr "Nooit een CRL raadplegen"
 
 #. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:329
+#: rc.cpp:335
 #, no-c-format
 msgid ""
 "If this option is checked, Certificate Revocation Lists are never used to "
@@ -11392,13 +12426,13 @@ msgstr ""
 "gebruikt worden om S/MIME-certificaten te valideren."
 
 #. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:332
+#: rc.cpp:338
 #, no-c-format
 msgid "Fetch missing issuer certificates"
 msgstr "Ontbrekende uitgevers certificaten ophalen"
 
 #. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:335
+#: rc.cpp:341
 #, no-c-format
 msgid ""
 "If this option is checked, missing issuer certificates are fetched when "
@@ -11409,37 +12443,37 @@ msgstr ""
 "methoden, CRL's en OCSP)"
 
 #. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:338
+#: rc.cpp:344
 #, no-c-format
 msgid "HTTP Requests"
 msgstr "HTTP-verzoeken"
 
 #. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:341
+#: rc.cpp:347
 #, no-c-format
 msgid "Do not perform any HTTP requests"
 msgstr "Geen HTTP-verzoeken maken"
 
 #. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:344
+#: rc.cpp:350
 #, no-c-format
 msgid "Entirely disables the use of HTTP for S/MIME."
 msgstr "Schakelt het gebruik van HTTP voor S/MIME volledig uit."
 
 #. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:350
+#: rc.cpp:356
 #, no-c-format
 msgid "Use this proxy for HTTP requests: "
 msgstr "Deze proxy voor HTTP-verzoeken gebruiken: "
 
 #. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:353
+#: rc.cpp:359
 #, no-c-format
 msgid "Use system HTTP proxy:"
 msgstr "HTTP-proxy van systeem gebruiken:"
 
 #. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:356
+#: rc.cpp:362
 #, no-c-format
 msgid ""
 "If this option is selected, the value of the HTTP proxy shown on the right "
@@ -11451,7 +12485,7 @@ msgstr ""
 "omgevingsvariabele http_proxy.)"
 
 #. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:359
+#: rc.cpp:365
 #, no-c-format
 msgid ""
 "Enter here the location of your HTTP Proxy, which will be used for all HTTP "
@@ -11463,13 +12497,13 @@ msgstr ""
 "bijvoorbeeld mijnproxy.nergens.nl:3128."
 
 #. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:362
+#: rc.cpp:368
 #, no-c-format
 msgid "Ignore HTTP CRL distribution point of certificates"
 msgstr "HTTP CRL-distributiepunt van certificaten negeren"
 
 #. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:365
+#: rc.cpp:371
 #, no-c-format
 msgid ""
 "When looking for the location of a CRL, the to-be-tested certificate usually "
@@ -11485,31 +12519,31 @@ msgstr ""
 "HTTP-schema genegeerd wanneer er gezocht wordt naar een geschikte DP."
 
 #. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:368
+#: rc.cpp:374
 #, no-c-format
 msgid "LDAP Requests"
 msgstr "LDAP-verzoeken"
 
 #. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:371
+#: rc.cpp:377
 #, no-c-format
 msgid "Do not perform any LDAP requests"
 msgstr "Geen LDAP-verzoeken maken"
 
 #. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:374
+#: rc.cpp:380
 #, no-c-format
 msgid "Entirely disables the use of LDAP for S/MIME."
 msgstr "Schakelt het gebruik van LDAP voor S/MIME volledig uit."
 
 #. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:377
+#: rc.cpp:383
 #, no-c-format
 msgid "Ignore LDAP CRL distribution point of certificates"
 msgstr "LDAP CRL-distributiepunt van certificaat negeren"
 
 #. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:380
+#: rc.cpp:386
 #, no-c-format
 msgid ""
 "When looking for the location of a CRL, the to-be-tested certificate usually "
@@ -11525,13 +12559,13 @@ msgstr ""
 "LDAP-schema genegeerd wanneer er gezocht wordt naar een geschikte DP."
 
 #. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:383
+#: rc.cpp:389
 #, no-c-format
 msgid "Primary host for LDAP requests:"
 msgstr "Primaire host voor LDAP-verzoeken:"
 
 #. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:386
+#: rc.cpp:392
 #, no-c-format
 msgid ""
 "Entering a LDAP server here will make all LDAP requests go to that server "
@@ -11552,49 +12586,49 @@ msgstr ""
 "zal standaard poort 389 gebruikt worden (de standaard LDAP-poort)."
 
 #. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:390
+#: rc.cpp:396
 #, no-c-format
 msgid "Add Snippet"
 msgstr "Fragment toevoegen"
 
 #. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:393
+#: rc.cpp:399
 #, no-c-format
 msgid "&Add"
 msgstr "&Toevoegen"
 
 #. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:402
+#: rc.cpp:408
 #, no-c-format
 msgid "&Snippet:"
 msgstr "&Fragment:"
 
 #. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:405
+#: rc.cpp:411
 #, no-c-format
 msgid "Group:"
 msgstr "Groep:"
 
 #. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:408
+#: rc.cpp:414
 #, no-c-format
 msgid "Snippet Settings"
 msgstr "Fragmentinstellingen"
 
 #. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:411
+#: rc.cpp:417
 #, no-c-format
 msgid "Tooltips"
 msgstr "Hulpballonnen"
 
 #. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:414
+#: rc.cpp:420
 #, no-c-format
 msgid "Show snippet's text in &tooltip"
 msgstr "Fragmenttekst in hulpballon &tonen"
 
 #. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:417
+#: rc.cpp:423
 #, no-c-format
 msgid ""
 "Decides if a tooltip should be shown containing text from the bookmarked line"
@@ -11602,38 +12636,38 @@ msgstr ""
 "Bepaalt of een hulpballon de tekst van een gemarkeerde regel moet tonen"
 
 #. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:420
+#: rc.cpp:426
 #, no-c-format
 msgid "Variables"
 msgstr "Variabelen"
 
 #. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:423
+#: rc.cpp:429
 #, no-c-format
 msgid "Input Method for Variables"
 msgstr "Invoermethode voor variabelen"
 
 #. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:426
+#: rc.cpp:432
 #, no-c-format
 msgid "Single dialog for each variable within a snippet"
 msgstr "Enkel dialoogvenster voor iedere variabele in een fragment"
 
 #. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:429
+#: rc.cpp:435
 #, no-c-format
 msgid "An input dialog will be displayed for every variable within a snippet"
 msgstr ""
 "Een invoervenster zal getoond worden voor iedere variabele in een tekstfragment"
 
 #. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:432
+#: rc.cpp:438
 #, no-c-format
 msgid "One dialog for all variables within a snippet"
 msgstr "Een dialoog voor alle variabelen in een fragment"
 
 #. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:435
+#: rc.cpp:441
 #, no-c-format
 msgid ""
 "A single dialog will be displayed where you can enter the values for all "
@@ -11643,43 +12677,43 @@ msgstr ""
 "voor alle variabelen in een fragment"
 
 #. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:438
+#: rc.cpp:444
 #, no-c-format
 msgid "Delimiter:"
 msgstr "Scheiding:"
 
 #. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:441
+#: rc.cpp:447
 #, no-c-format
 msgid "TemplatesConfiguration"
 msgstr "TemplatesConfiguration"
 
 #. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:447
+#: rc.cpp:453
 #, no-c-format
 msgid "Reply to Sender"
 msgstr "Afzender beantwoorden"
 
 #. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:450
+#: rc.cpp:456
 #, no-c-format
 msgid "Reply to All / Reply to List"
 msgstr "Allen beantwoorden / naar lijst beantwoorden"
 
 #. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:453
+#: rc.cpp:459
 #, no-c-format
 msgid "Forward Message"
 msgstr "Bericht doorsturen"
 
 #. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:462
+#: rc.cpp:468
 #, no-c-format
 msgid "Warn when trying to send &unsigned messages"
 msgstr "Waarsch&uwen voor het verzenden van niet-ondertekende berichten"
 
 #. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:465
+#: rc.cpp:471
 #, no-c-format
 msgid "Check to be warned when sending unsigned messages."
 msgstr ""
@@ -11687,7 +12721,7 @@ msgstr ""
 "niet-ondertekende berichten."
 
 #. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:468
+#: rc.cpp:474
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -11707,14 +12741,14 @@ msgstr ""
 "</qt>"
 
 #. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:476
+#: rc.cpp:482
 #, no-c-format
 msgid "&Warn when trying to send unencrypted messages"
 msgstr ""
 "&Waarschuwen als er niet-versleutelde berichten zullen worden verstuurd"
 
 #. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:479
+#: rc.cpp:485
 #, no-c-format
 msgid "Check to be warned when sending unencrypted messages."
 msgstr ""
@@ -11722,7 +12756,7 @@ msgstr ""
 "niet-versleutelde berichten."
 
 #. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:482
+#: rc.cpp:488
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -11742,13 +12776,13 @@ msgstr ""
 "</qt>"
 
 #. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:490
+#: rc.cpp:496
 #, no-c-format
 msgid "Warn if &Receiver's Email Address is Not in Certificate"
 msgstr "Waarschuwen als e-mailad&res van ontvanger niet in certificaat staat"
 
 #. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:493
+#: rc.cpp:499
 #, no-c-format
 msgid "Check to be warned if the address is not in the certificate"
 msgstr ""
@@ -11756,7 +12790,7 @@ msgstr ""
 "certificaat staat"
 
 #. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:496
+#: rc.cpp:502
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -11777,7 +12811,7 @@ msgstr ""
 "</qt>"
 
 #. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:504
+#: rc.cpp:510
 #, no-c-format
 msgid "Warn if certificates/keys expire soon (configure thresholds below)"
 msgstr ""
@@ -11785,32 +12819,32 @@ msgstr ""
 "instellingen hieronder)"
 
 #. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:507
+#: rc.cpp:513
 #, no-c-format
 msgid "For signing"
 msgstr "Voor ondertekening"
 
 #. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:510
+#: rc.cpp:516
 #, no-c-format
 msgid "For encryption"
 msgstr "Voor versleuteling"
 
 #. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:513 rc.cpp:527 rc.cpp:541 rc.cpp:555 rc.cpp:569 rc.cpp:583
+#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
 #: rulewidgethandlermanager.cpp:1437
 #, no-c-format
 msgid " days"
 msgstr " dagen"
 
 #. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:516 rc.cpp:530 rc.cpp:544 rc.cpp:558 rc.cpp:572 rc.cpp:586
+#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
 #, no-c-format
 msgid "Select the number of days here"
 msgstr "Selecteer hier het aantal dagen"
 
 #. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:519
+#: rc.cpp:525
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -11830,7 +12864,7 @@ msgstr ""
 "</qt>"
 
 #. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:533
+#: rc.cpp:539
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -11850,7 +12884,7 @@ msgstr ""
 "</qt>"
 
 #. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:547
+#: rc.cpp:553
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -11870,7 +12904,7 @@ msgstr ""
 "</qt>"
 
 #. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:561
+#: rc.cpp:567
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -11890,7 +12924,7 @@ msgstr ""
 "</qt>"
 
 #. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:575 rc.cpp:589
+#: rc.cpp:581 rc.cpp:595
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -11910,56 +12944,56 @@ msgstr ""
 "</qt>"
 
 #. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:597
+#: rc.cpp:603
 #, no-c-format
 msgid "For root certificates:"
 msgstr "Voor hoofdcertificaten:"
 
 #. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:600
+#: rc.cpp:606
 #, no-c-format
 msgid "For intermediate CA certificates:"
 msgstr "Voor tijdelijke CA-certificaten:"
 
 #. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:603
+#: rc.cpp:609
 #, no-c-format
 msgid "For end-user certificates/keys:"
 msgstr "Voor certificaten/sleutels voor eindgebruikers:"
 
 #. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:606
+#: rc.cpp:612
 #, no-c-format
 msgid "Re-enable All \"Don't Ask Again\" Warnings"
 msgstr ""
 "Alle \"Deze vraag niet meer stellen\"-waarschuwingen opnieuw inschakelen"
 
 #. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:609
+#: rc.cpp:615
 #, no-c-format
 msgid "Template content"
 msgstr "Sjablooninhoud"
 
 #. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:612
+#: rc.cpp:618
 #, no-c-format
 msgid "Template shortcut"
 msgstr "Sjabloonsneltoets"
 
 #. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:615
+#: rc.cpp:621
 #, no-c-format
 msgid "Template type"
 msgstr "Sjabloontype"
 
-#. i18n: file kmail.kcfg line 59
-#: rc.cpp:618
+#. i18n: file kmail.kcfg line 61
+#: rc.cpp:624
 #, no-c-format
 msgid "Send queued mail on mail check"
 msgstr "Berichten in wachtrij verzenden bij berichtencontrole"
 
-#. i18n: file kmail.kcfg line 60
-#: rc.cpp:621
+#. i18n: file kmail.kcfg line 62
+#: rc.cpp:627
 #, no-c-format
 msgid ""
 "<qt>"
@@ -11972,8 +13006,8 @@ msgstr ""
 "e-mailcontroles, of dat u niet wilt dat berichten automatisch worden verzonden. "
 "</p></qt>"
 
-#. i18n: file kmail.kcfg line 70
-#: rc.cpp:624
+#. i18n: file kmail.kcfg line 72
+#: rc.cpp:630
 #, no-c-format
 msgid ""
 "Automatically move non-synced mails from folders with insufficient access "
@@ -11982,8 +13016,8 @@ msgstr ""
 "Niet-gesynchroniseerde e-mails automatisch verplaatsen vanuit mappen met "
 "onvoldoende toegangsrechten"
 
-#. i18n: file kmail.kcfg line 71
-#: rc.cpp:627
+#. i18n: file kmail.kcfg line 73
+#: rc.cpp:633
 #, no-c-format
 msgid ""
 "If there are new messages in a folder, which have not been uploaded to the "
@@ -11995,14 +13029,14 @@ msgstr ""
 "verzonden, maar de toegangsrechten voor die map te beperkt zijn, zullen deze "
 "berichten automatisch in de map \"lost + found\" geplaatst worden."
 
-#. i18n: file kmail.kcfg line 76
-#: rc.cpp:630
+#. i18n: file kmail.kcfg line 78
+#: rc.cpp:636
 #, no-c-format
 msgid "Allow local flags in read-only folders"
 msgstr "Lokale vlaggen toestaan in alleen-lezen-mappen"
 
-#. i18n: file kmail.kcfg line 85
-#: rc.cpp:633
+#. i18n: file kmail.kcfg line 87
+#: rc.cpp:639
 #, no-c-format
 msgid ""
 "This setting allows administrators to set a minimum delay between two mail "
@@ -12015,14 +13049,14 @@ msgstr ""
 "           \"De gebruiker zal niet in staat zijn een lagere waarde in te "
 "stellen."
 
-#. i18n: file kmail.kcfg line 91
-#: rc.cpp:637
+#. i18n: file kmail.kcfg line 93
+#: rc.cpp:643
 #, no-c-format
 msgid "The most recently selected folder in the folder selection dialog."
 msgstr "De meest recent geselecteerde map in het mappenselectiedialoog."
 
-#. i18n: file kmail.kcfg line 99
-#: rc.cpp:640
+#. i18n: file kmail.kcfg line 101
+#: rc.cpp:646
 #, no-c-format
 msgid ""
 "Disregard the users umask setting and use \"read-write for the user only\" "
@@ -12031,14 +13065,14 @@ msgstr ""
 "De umask-waarde van de gebruiker negeren en het bestaand lees- en schrijfbaar "
 "maken voor de gebruiker"
 
-#. i18n: file kmail.kcfg line 107
-#: rc.cpp:646
+#. i18n: file kmail.kcfg line 109
+#: rc.cpp:652
 #, no-c-format
 msgid "Policy for showing the system tray icon"
 msgstr "Beleid voor het weergeven van het systeemvakpictogram"
 
-#. i18n: file kmail.kcfg line 115
-#: rc.cpp:649
+#. i18n: file kmail.kcfg line 117
+#: rc.cpp:655
 #, no-c-format
 msgid ""
 "Close the application when the mainwindow is closed, even if there is a system "
@@ -12047,14 +13081,14 @@ msgstr ""
 "Programma afsluiten wanneer het hoofdvenster is gesloten, zelfs wanneer het "
 "systeemvakpictogram actief is."
 
-#. i18n: file kmail.kcfg line 119
-#: rc.cpp:652
+#. i18n: file kmail.kcfg line 121
+#: rc.cpp:658
 #, no-c-format
 msgid "Verbose new mail notification"
 msgstr "Uitvoerige notificatie voor nieuwe berichten"
 
-#. i18n: file kmail.kcfg line 120
-#: rc.cpp:655
+#. i18n: file kmail.kcfg line 122
+#: rc.cpp:661
 #, no-c-format
 msgid ""
 "If this option is enabled then for each folder the number of newly arrived "
@@ -12065,20 +13099,20 @@ msgstr ""
 "berichten getoond worden in de notificatie voor nieuwe berichten, anders krijgt "
 "u een eenvoudige melding 'Nieuwe berichten ontvangen'."
 
-#. i18n: file kmail.kcfg line 124
-#: rc.cpp:658
+#. i18n: file kmail.kcfg line 126
+#: rc.cpp:664
 #, no-c-format
 msgid "Specify e&ditor:"
 msgstr "Editor spe&cificeren:"
 
-#. i18n: file kmail.kcfg line 128
-#: rc.cpp:661
+#. i18n: file kmail.kcfg line 130
+#: rc.cpp:667
 #, no-c-format
 msgid "Use e&xternal editor instead of composer"
 msgstr "Externe editor gebr&uiken"
 
-#. i18n: file kmail.kcfg line 155
-#: rc.cpp:664
+#. i18n: file kmail.kcfg line 157
+#: rc.cpp:670
 #, no-c-format
 msgid ""
 "The threshold for when to warn the user that a folder is nearing its quota "
@@ -12087,20 +13121,20 @@ msgstr ""
 "De drempel voor wanneer de gebruiker gewaarschuwd dient te worden wanneer zijn "
 "quota wordt bereikt."
 
-#. i18n: file kmail.kcfg line 164
-#: rc.cpp:667
+#. i18n: file kmail.kcfg line 166
+#: rc.cpp:673
 #, no-c-format
 msgid "Enable groupware functionality"
 msgstr "Groupware-functionaliteit activ&eren"
 
-#. i18n: file kmail.kcfg line 170
-#: rc.cpp:670
+#. i18n: file kmail.kcfg line 172
+#: rc.cpp:676
 #, no-c-format
 msgid "Mangle From:/To: headers in replies to replies"
 msgstr "De kopschriften Van:/Aan: aanpassen bij antwoorden op uitnodigingen"
 
-#. i18n: file kmail.kcfg line 171
-#: rc.cpp:673
+#. i18n: file kmail.kcfg line 173
+#: rc.cpp:679
 #, no-c-format
 msgid ""
 "Microsoft Outlook has a number of shortcomings in its implementation of the "
@@ -12112,14 +13146,14 @@ msgstr ""
 "Outlook-gebruikers die uw antwoorden niet kunnen ontvangen kunt u deze optie "
 "proberen."
 
-#. i18n: file kmail.kcfg line 176
-#: rc.cpp:676
+#. i18n: file kmail.kcfg line 178
+#: rc.cpp:682
 #, no-c-format
 msgid "Send groupware invitations in the mail body"
 msgstr "Groupware-uitnodigingen in de berichttekst verzenden"
 
-#. i18n: file kmail.kcfg line 177
-#: rc.cpp:679
+#. i18n: file kmail.kcfg line 179
+#: rc.cpp:685
 #, no-c-format
 msgid ""
 "Microsoft Outlook has a number of shortcomings  in its implementation of the "
@@ -12132,16 +13166,38 @@ msgstr ""
 "Outlook-gebruikers die uw uitnodigingen niet kunnen ontvangen kunt u deze optie "
 "proberen."
 
-#. i18n: file kmail.kcfg line 182
-#: rc.cpp:682
+#. i18n: file kmail.kcfg line 184
+#: rc.cpp:688
 #, no-c-format
 msgid "Exchange compatible invitations naming"
 msgstr "Naamgeving uitnodigingen compatible houden met Exchange"
 
-#. i18n: file kmail.kcfg line 189
+#. i18n: file kmail.kcfg line 185
 #: rc.cpp:691
 #, no-c-format
 msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
+"has a problem understanding standards-compliant groupware e-mail. Turn this "
+"option on to send groupware invitations in a way that Microsoft Exchange "
+"understands."
+msgstr ""
+"Microsoft Outlook heeft, in combinatie met Microsoft Exchange, problemen met "
+"groupware-e-mail die zich aan de standaard houdt.\n"
+"Schakel deze optie in om groupware-uitnodigingen te versturen die correct "
+"kunnen worden verwerkt door Microsoft Exchange."
+
+#. i18n: file kmail.kcfg line 191
+#: rc.cpp:697
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#. i18n: file kmail.kcfg line 197
+#: rc.cpp:703
+#, no-c-format
+msgid ""
 "When this is checked, you will not see the mail composer window. Instead, all "
 "invitation mails are sent automatically. If you want to see the mail before "
 "sending it, you can uncheck this option. However, be aware that the text in the "
@@ -12154,14 +13210,14 @@ msgstr ""
 "van bewust dat de tekst in de opsteller in deiCalendar-syntaxis is, en het "
 "wordt niet aangeraden om dit handmatig te wijzigen."
 
-#. i18n: file kmail.kcfg line 205
-#: rc.cpp:694
+#. i18n: file kmail.kcfg line 213
+#: rc.cpp:706
 #, no-c-format
 msgid "Delete invitation emails after the reply to them has been sent"
 msgstr "Uitnodigingsemails verwijderen nadat een antwoord is verstuurd"
 
-#. i18n: file kmail.kcfg line 206
-#: rc.cpp:697
+#. i18n: file kmail.kcfg line 214
+#: rc.cpp:709
 #, no-c-format
 msgid ""
 "When this is checked, received invitation emails that have been replied to will "
@@ -12170,8 +13226,24 @@ msgstr ""
 "Wanneer dit is ingeschakeld zullen ontvangen uitnodigingsemails waarop "
 "geantwoord is verplaatst worden naar de prullenbak."
 
-#. i18n: file kmail.kcfg line 215
-#: rc.cpp:700
+#. i18n: file kmail.kcfg line 219
+#: rc.cpp:712
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#. i18n: file kmail.kcfg line 224
+#: rc.cpp:715
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#. i18n: file kmail.kcfg line 233
+#: rc.cpp:718
 #, no-c-format
 msgid ""
 "<p>Enabling this makes it possible to store the entries from the Kontact "
@@ -12184,8 +13256,8 @@ msgstr ""
 "Als u dit aanzet dient u ook de toepassingen in te stellen om gebruik te maken "
 "van de IMAP-gegevensbron. Dit kunt u doen in het TDE Configuratiecentrum.</p>"
 
-#. i18n: file kmail.kcfg line 220
-#: rc.cpp:703
+#. i18n: file kmail.kcfg line 238
+#: rc.cpp:721
 #, no-c-format
 msgid ""
 "<p>Usually you will not have any reason to see the folders that hold the IMAP "
@@ -12195,8 +13267,8 @@ msgstr ""
 "IMAP-gegevensbronnen bevatten. Maar wanneer u ze toch wilt zien, kunt u dat "
 "hier instellen.</p>"
 
-#. i18n: file kmail.kcfg line 229
-#: rc.cpp:706
+#. i18n: file kmail.kcfg line 247
+#: rc.cpp:724
 #, no-c-format
 msgid ""
 "<p>If the account used for storing groupware information \"\n"
@@ -12214,8 +13286,8 @@ msgstr ""
 "e-mail afhandelt\"\n"
 "           \"met een ander IMAP-account.</p>"
 
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:712
+#. i18n: file kmail.kcfg line 251
+#: rc.cpp:730
 #, no-c-format
 msgid ""
 "<p>Choose the storage format of the groupware folders. "
@@ -12237,8 +13309,8 @@ msgstr ""
 "u gebruik maakt met een Kolab-server of iets dat daarmee compatibel is.</li>"
 "</ul></p>"
 
-#. i18n: file kmail.kcfg line 242
-#: rc.cpp:715
+#. i18n: file kmail.kcfg line 260
+#: rc.cpp:733
 #, no-c-format
 msgid ""
 "<p>This chooses the parent of the IMAP resource folders.</p>"
@@ -12247,15 +13319,15 @@ msgstr ""
 "<p>Dit kiest de hoofdmap van de IMAP-gegevensbronmappen.</p>"
 "<p>De Kolab-server stelt standaard de IMAP-inbox in als hoofdmap.</p>"
 
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:718
+#. i18n: file kmail.kcfg line 265
+#: rc.cpp:736
 #, no-c-format
 msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
 msgstr ""
 "<p>Dit is de ID van het account dat de IMAP-gegevensbronmappen bevat.</p>"
 
-#. i18n: file kmail.kcfg line 252
-#: rc.cpp:721
+#. i18n: file kmail.kcfg line 270
+#: rc.cpp:739
 #, no-c-format
 msgid ""
 "<p>If you want to set the folder names of the IMAP storage to your local "
@@ -12272,20 +13344,14 @@ msgstr ""
 "wordt om van taal te veranderen.</p>"
 "<p>U dient deze optie niet aan te zetten tenzij het echt nodig is.</p>"
 
-#. i18n: file kmail.kcfg line 258
-#: rc.cpp:724
-#, no-c-format
-msgid "Only filter mails received in disconnected IMAP inbox."
-msgstr "Alleen berichten filteren in verbindingsloze IMAP-postvak in."
-
-#. i18n: file kmail.kcfg line 262
-#: rc.cpp:727
+#. i18n: file kmail.kcfg line 276
+#: rc.cpp:742
 #, no-c-format
 msgid "Also filter new mails received in groupware folders."
 msgstr "Ook nieuwe berichten filteren in groupware-mappen."
 
-#. i18n: file kmail.kcfg line 267
-#: rc.cpp:730
+#. i18n: file kmail.kcfg line 283
+#: rc.cpp:745
 #, no-c-format
 msgid ""
 "Synchronize groupware changes in DIMAP folders immediately when being online."
@@ -12293,8 +13359,8 @@ msgstr ""
 "Groupware-wijzigingen in verbindingsloze IMAP-mappen meteen synchroniseren "
 "wanneer u online gaat."
 
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:733
+#. i18n: file kmail.kcfg line 292
+#: rc.cpp:748
 #, no-c-format
 msgid ""
 "This value is used to decide whether the KMail Introduction should be "
@@ -12303,14 +13369,14 @@ msgstr ""
 "Deze waarde wordt gebruikt om te bepalen of de inleiding van KMail getoond moet "
 "worden."
 
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:736
+#. i18n: file kmail.kcfg line 299
+#: rc.cpp:751
 #, no-c-format
 msgid "Maximal number of connections per host"
 msgstr "Maximum aantal verbindingen per host"
 
-#. i18n: file kmail.kcfg line 284
-#: rc.cpp:739
+#. i18n: file kmail.kcfg line 300
+#: rc.cpp:754
 #, no-c-format
 msgid ""
 "This can be used to restrict the number of connections per host while checking "
@@ -12320,14 +13386,14 @@ msgstr ""
 "controleren op nieuwe berichten. Standaard is het aantal verbindingen onbeperkt "
 "(0)."
 
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:742
+#. i18n: file kmail.kcfg line 308
+#: rc.cpp:757
 #, no-c-format
 msgid "Show quick search line edit"
 msgstr "Snelzoeken tonen"
 
-#. i18n: file kmail.kcfg line 293
-#: rc.cpp:745
+#. i18n: file kmail.kcfg line 309
+#: rc.cpp:760
 #, no-c-format
 msgid ""
 "This option enables or disables the search line edit above the message list "
@@ -12336,26 +13402,20 @@ msgstr ""
 "Met deze optie kunt u de zoekregel boven de berichtenlijst aan- of uitzetten. U "
 "kunt met deze zoekregel snel bepaalde gegevens zoeken uit de berichtenlijst."
 
-#. i18n: file kmail.kcfg line 297
-#: rc.cpp:748
-#, no-c-format
-msgid "Show folder quick search line edit"
-msgstr "Snelzoeken tonen"
-
-#. i18n: file kmail.kcfg line 301
-#: rc.cpp:751
+#. i18n: file kmail.kcfg line 313
+#: rc.cpp:763
 #, no-c-format
 msgid "Hide local inbox if unused"
 msgstr "Lokaal postvak in verbergen indien ongebruikt"
 
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:754
+#. i18n: file kmail.kcfg line 321
+#: rc.cpp:766
 #, no-c-format
 msgid "Forward Inline As Default."
 msgstr "Standaard ingebed doorsturen."
 
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:757
+#. i18n: file kmail.kcfg line 325
+#: rc.cpp:769
 #, no-c-format
 msgid ""
 "Allow the semicolon charactor (';') to be used as separator in the message "
@@ -12364,21 +13424,21 @@ msgstr ""
 "Laat de puntkomma (;) gebruikt worden als scheidingsteken in de "
 "berichtopsteller."
 
-#. i18n: file kmail.kcfg line 316
-#: rc.cpp:760
+#. i18n: file kmail.kcfg line 328
+#: rc.cpp:772
 #, no-c-format
 msgid "Keep original charset when replying or forwarding if possible"
 msgstr ""
 "Originele tekenset behouden bij beantwoorden en doorsturen (indien mogelijk)"
 
-#. i18n: file kmail.kcfg line 320
-#: rc.cpp:763
+#. i18n: file kmail.kcfg line 332
+#: rc.cpp:775
 #, no-c-format
 msgid "A&utomatically insert signature"
 msgstr "Handtekening auto&matisch invoegen"
 
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:766
+#. i18n: file kmail.kcfg line 337
+#: rc.cpp:778
 #, no-c-format
 msgid ""
 "Remember this identity, so that it will be used in future composer windows as "
@@ -12389,8 +13449,8 @@ msgstr ""
 "wanneer u de volgende keer een bericht op gaat stellen.\n"
 "        "
 
-#. i18n: file kmail.kcfg line 329
-#: rc.cpp:770
+#. i18n: file kmail.kcfg line 341
+#: rc.cpp:782
 #, no-c-format
 msgid ""
 "Remember this folder for sent items, so that it will be used in future composer "
@@ -12399,8 +13459,8 @@ msgstr ""
 "Deze map voor verzonden items onthouden, zodat deze in de toekomst automatisch "
 "gebruikt wordt wanneer u de volgende keer een bericht op gaat stellen."
 
-#. i18n: file kmail.kcfg line 333
-#: rc.cpp:773
+#. i18n: file kmail.kcfg line 345
+#: rc.cpp:785
 #, no-c-format
 msgid ""
 "Remember this mail transport, so that it will be used in future composer "
@@ -12409,14 +13469,40 @@ msgstr ""
 "Onthoud dit berichtentransport, zodat deze in de toekomst automatisch gebruikt "
 "wordt wanneer u de volgende keer een bericht op gaat stellen."
 
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:776
+#. i18n: file kmail.kcfg line 350
+#: rc.cpp:788
+#, fuzzy, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows as "
+"well.\n"
+"        "
+msgstr ""
+"Deze identiteit onthouden, zodat deze in de toekomst automatischgebruikt wordt "
+"wanneer u de volgende keer een bericht op gaat stellen.\n"
+"        "
+
+#. i18n: file kmail.kcfg line 354
+#: rc.cpp:792
 #, no-c-format
 msgid "Word &wrap at column:"
 msgstr "Regels a&fbreken bij kolom:"
 
-#. i18n: file kmail.kcfg line 360
-#: rc.cpp:785
+#. i18n: file kmail.kcfg line 368
+#: rc.cpp:798
+#, fuzzy, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr "Maximaal aantal regels geadresseerden-editor."
+
+#. i18n: file kmail.kcfg line 370
+#: rc.cpp:801 rc.cpp:804
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and ask "
+"for a confirmation before sending the mail. The warning can be turned off."
+msgstr ""
+
+#. i18n: file kmail.kcfg line 390
+#: rc.cpp:810
 #, no-c-format
 msgid ""
 "Turn this option on to make Outlook &#8482; understand attachment names "
@@ -12425,14 +13511,14 @@ msgstr ""
 "Zet deze optie aan om ervoor te zorgen dat Outlook &#8482; de bijlagenamen "
 "begrijpt die niet-West-Europese tekens bevatten"
 
-#. i18n: file kmail.kcfg line 386
-#: rc.cpp:791
+#. i18n: file kmail.kcfg line 416
+#: rc.cpp:816
 #, no-c-format
 msgid "Automatically request &message disposition notifications"
 msgstr "Auto&matisch bevestigingen voor ontvangst en gelezen verzoeken"
 
-#. i18n: file kmail.kcfg line 387
-#: rc.cpp:794
+#. i18n: file kmail.kcfg line 417
+#: rc.cpp:819
 #, no-c-format
 msgid ""
 "<qt>"
@@ -12449,14 +13535,14 @@ msgstr ""
 "MDN-verzoek per bericht regelen in de opsteller via de menuoptie <em>Opties</em>"
 "&gt;<em>Ontvangst en gelezen-bevestiging verzoeken</em>.</p></qt>"
 
-#. i18n: file kmail.kcfg line 391
-#: rc.cpp:797
+#. i18n: file kmail.kcfg line 421
+#: rc.cpp:822
 #, no-c-format
 msgid "Use recent addresses for autocompletion"
 msgstr "Recente adressen gebruiken voor automatische aanvulling"
 
-#. i18n: file kmail.kcfg line 392
-#: rc.cpp:800
+#. i18n: file kmail.kcfg line 422
+#: rc.cpp:825
 #, no-c-format
 msgid ""
 "Disable this option if you do not want recently used addresses to appear in the "
@@ -12465,14 +13551,14 @@ msgstr ""
 "Schakel deze optie uit wanneer u geen recent gebruikte adressen wilt zien in de "
 "automatische aanvulling van de adresvelden."
 
-#. i18n: file kmail.kcfg line 413
-#: rc.cpp:803
+#. i18n: file kmail.kcfg line 443
+#: rc.cpp:828
 #, no-c-format
 msgid "Autosave interval:"
 msgstr "Automatisch opslaan iedere:"
 
-#. i18n: file kmail.kcfg line 414
-#: rc.cpp:806
+#. i18n: file kmail.kcfg line 444
+#: rc.cpp:831
 #, no-c-format
 msgid ""
 "A backup copy of the text in the composer window can be created regularly. The "
@@ -12483,38 +13569,50 @@ msgstr ""
 "kunt hier een tijdsinterval kiezen om een nieuwe backup te maken. U kunt het "
 "automatisch opslaan uitschakelen door hier een waarde van 0 in te vullen."
 
-#. i18n: file kmail.kcfg line 418
-#: rc.cpp:809
+#. i18n: file kmail.kcfg line 448
+#: rc.cpp:834
 #, no-c-format
 msgid "Insert signatures above quoted text"
 msgstr "Handtekening boven aangehaalde tekst invoegen"
 
-#. i18n: file kmail.kcfg line 425
-#: rc.cpp:812
+#. i18n: file kmail.kcfg line 455
+#: rc.cpp:837
 #, no-c-format
 msgid "Replace recognized prefi&x with \"Re:\""
 msgstr "Herkend voorvoegsel vervangen &door \"Re:\""
 
-#. i18n: file kmail.kcfg line 432
-#: rc.cpp:815
+#. i18n: file kmail.kcfg line 462
+#: rc.cpp:840
 #, no-c-format
 msgid "Replace recognized prefix with \"&Fwd:\""
 msgstr "Herkend voorvoegsel vervangen door \"&Fwd:\""
 
-#. i18n: file kmail.kcfg line 436
-#: rc.cpp:818
+#. i18n: file kmail.kcfg line 466
+#: rc.cpp:843
 #, no-c-format
 msgid "Use smart &quoting"
 msgstr "Intelligente aanhalingen gebr&uiken"
 
-#. i18n: file kmail.kcfg line 441
-#: rc.cpp:821
+#. i18n: file kmail.kcfg line 470
+#: rc.cpp:846
+#, fuzzy, no-c-format
+msgid "Remove the signature when replying"
+msgstr "De ondertekening is verlopen."
+
+#. i18n: file kmail.kcfg line 474
+#: rc.cpp:849
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#. i18n: file kmail.kcfg line 479
+#: rc.cpp:852
 #, no-c-format
 msgid "Type of addressee selector"
 msgstr "Selectietype geadresseerden"
 
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:824
+#. i18n: file kmail.kcfg line 481
+#: rc.cpp:855
 #, no-c-format
 msgid ""
 "Sets the type of the dialog for selecting recipients for To,\n"
@@ -12523,14 +13621,14 @@ msgstr ""
 "Bepaalt het type dialoogvenster voor het selecteren van\n"
 "            geadresseerden."
 
-#. i18n: file kmail.kcfg line 451
-#: rc.cpp:828
+#. i18n: file kmail.kcfg line 489
+#: rc.cpp:859
 #, no-c-format
 msgid "Type of recipients editor"
 msgstr "Type selectie geadresseerden"
 
-#. i18n: file kmail.kcfg line 453
-#: rc.cpp:831
+#. i18n: file kmail.kcfg line 491
+#: rc.cpp:862
 #, no-c-format
 msgid ""
 "Sets the type of the recipients editor for editing To,\n"
@@ -12539,14 +13637,14 @@ msgstr ""
 "Stelt in welke dialoogvenster in beeld komt voor het selecteren van "
 "geadresseerden (Aan, CC en BCC)."
 
-#. i18n: file kmail.kcfg line 468
-#: rc.cpp:835
+#. i18n: file kmail.kcfg line 506
+#: rc.cpp:866
 #, no-c-format
 msgid "Maximum number of recipient editor lines."
 msgstr "Maximaal aantal regels geadresseerden-editor."
 
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:838
+#. i18n: file kmail.kcfg line 512
+#: rc.cpp:869
 #, no-c-format
 msgid ""
 "List of message part types to strip off mails that are being forwarded inline."
@@ -12554,20 +13652,20 @@ msgstr ""
 "Lijst van berichtdelen die ontdaan worden van e-mailberichten die inline worden "
 "doorgestuurd."
 
-#. i18n: file kmail.kcfg line 478
-#: rc.cpp:841
+#. i18n: file kmail.kcfg line 516
+#: rc.cpp:872
 #, no-c-format
 msgid "The maximum size in MB that email attachments are allowed to have."
 msgstr "De maximale grootte in MB dat e-mailbijlagen mogen hebben."
 
-#. i18n: file kmail.kcfg line 483
-#: rc.cpp:844
+#. i18n: file kmail.kcfg line 521
+#: rc.cpp:875
 #, no-c-format
 msgid "Show the Text Snippet Management and Insertion Panel in the composer."
 msgstr "Fragmentbeheer en invoegpaneel tonen in opsteller."
 
-#. i18n: file kmail.kcfg line 490
-#: rc.cpp:847
+#. i18n: file kmail.kcfg line 528
+#: rc.cpp:878
 #, no-c-format
 msgid ""
 "Show the GnuPG Audit Log even after crypto operations that completed "
@@ -12575,8 +13673,15 @@ msgid ""
 msgstr ""
 "Auditlog tonen zelfs wanneer versleuteling en/of ondertekening geslaagd zijn."
 
-#. i18n: file kmail.kcfg line 530
-#: rc.cpp:850
+#. i18n: file kmail.kcfg line 557
+#: rc.cpp:881
+#, fuzzy, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr ""
+"Originele tekenset behouden bij beantwoorden en doorsturen (indien mogelijk)"
+
+#. i18n: file kmail.kcfg line 572
+#: rc.cpp:884
 #, no-c-format
 msgid ""
 "Some emails, especially those generated automatically, do not specify the "
@@ -12591,8 +13696,8 @@ msgstr ""
 "de codering in dat het meest gebruikt wordt in uw werelddeel. Als standaard "
 "waarde wordt de systeemwaarde gebruikt."
 
-#. i18n: file kmail.kcfg line 536
-#: rc.cpp:853
+#. i18n: file kmail.kcfg line 578
+#: rc.cpp:887
 #, no-c-format
 msgid ""
 "Changing this from its default 'Auto' will force the use of the specified "
@@ -12602,8 +13707,8 @@ msgstr ""
 "tekensetcodering van alle e-mailberichten geforceerd worden, ongeacht wat het "
 "bericht zelf opgeeft."
 
-#. i18n: file kmail.kcfg line 542
-#: rc.cpp:859
+#. i18n: file kmail.kcfg line 584
+#: rc.cpp:893
 #, no-c-format
 msgid ""
 "Enable this if you want smileys like :-) appearing in the message text to be "
@@ -12612,8 +13717,8 @@ msgstr ""
 "Schakel deze optie in om smileys als :-) in de tekst te laten vervangen door "
 "emoticons (kleine pictogrammetjes)."
 
-#. i18n: file kmail.kcfg line 547
-#: rc.cpp:865
+#. i18n: file kmail.kcfg line 589
+#: rc.cpp:899
 #, no-c-format
 msgid ""
 "Enable this option to show different levels of quoted text. Disable to hide the "
@@ -12622,33 +13727,47 @@ msgstr ""
 "Schakel deze optie in om de verschillende niveaus van aangehaalde tekst te "
 "kunnen zien. Schakel deze optie uit om de verschillende niveaus te verbergen."
 
-#. i18n: file kmail.kcfg line 550
-#: rc.cpp:868
+#. i18n: file kmail.kcfg line 592
+#: rc.cpp:902
 #, no-c-format
 msgid "Automatic collapse level:"
 msgstr "Automatisch inklappen bij niveau:"
 
-#. i18n: file kmail.kcfg line 558
-#: rc.cpp:871
+#. i18n: file kmail.kcfg line 600
+#: rc.cpp:905
 #, no-c-format
 msgid "Reduce font size for quoted text"
 msgstr "Lettergrootte verkleinen bij aangehaalde tekst"
 
-#. i18n: file kmail.kcfg line 559
-#: rc.cpp:874
+#. i18n: file kmail.kcfg line 601
+#: rc.cpp:908
 #, no-c-format
 msgid "Enable this option to show quoted text with a smaller font."
 msgstr ""
 "Schakel deze optie in om aangehaalde tekst te tonen in een kleiner lettertype."
 
-#. i18n: file kmail.kcfg line 570
-#: rc.cpp:877
+#. i18n: file kmail.kcfg line 612
+#: rc.cpp:911
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "Verzonden berichten v&ersleuteld opslaan"
+
+#. i18n: file kmail.kcfg line 613
+#: rc.cpp:914
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#. i18n: file kmail.kcfg line 618
+#: rc.cpp:917
 #, no-c-format
 msgid "Show user agent in fancy headers"
 msgstr "Gebruikersagent tonen in elegante koppen"
 
-#. i18n: file kmail.kcfg line 571
-#: rc.cpp:880
+#. i18n: file kmail.kcfg line 619
+#: rc.cpp:920
 #, no-c-format
 msgid ""
 "Enable this option to get the User-Agent and X-Mailer header lines displayed "
@@ -12657,32 +13776,32 @@ msgstr ""
 "Schakel deze optie in om de gebruikersagent en X-Mailer te tonen in de elegante "
 "berichtkoppen."
 
-#. i18n: file kmail.kcfg line 576
-#: rc.cpp:883
+#. i18n: file kmail.kcfg line 624
+#: rc.cpp:923
 #, no-c-format
 msgid "Allow to delete attachments of existing mails."
 msgstr "Verwijderen van bijlagen van bestaande e-mailberichten toestaan."
 
-#. i18n: file kmail.kcfg line 580
-#: rc.cpp:886
+#. i18n: file kmail.kcfg line 628
+#: rc.cpp:926
 #, no-c-format
 msgid "Allow to edit attachments of existing mails."
 msgstr "Bewerken van bijlagen van bestaande e-mailberichten toestaan."
 
-#. i18n: file kmail.kcfg line 585
-#: rc.cpp:889
+#. i18n: file kmail.kcfg line 633
+#: rc.cpp:929
 #, no-c-format
 msgid "Always decrypt messages when viewing or ask befor decrypting"
 msgstr "Altijd berichten decoderen bij weergave of vragen voor decodering"
 
-#. i18n: file kmail.kcfg line 599
-#: rc.cpp:892
+#. i18n: file kmail.kcfg line 647
+#: rc.cpp:932
 #, no-c-format
 msgid "Send Message Disposition Notifications with an empty sender."
 msgstr "Leesbevestiging verzenden met lege afzender."
 
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:895
+#. i18n: file kmail.kcfg line 648
+#: rc.cpp:935
 #, no-c-format
 msgid ""
 "Send Message Disposition Notifications with an empty sender string. Some "
@@ -12693,56 +13812,56 @@ msgstr ""
 "berichten weigeren. Wanneer u problemen ondervindt met het verzenden van "
 "leesbevestigingen dient u deze optie uit te zetten."
 
-#. i18n: file kmail.kcfg line 606
-#: rc.cpp:898
+#. i18n: file kmail.kcfg line 654
+#: rc.cpp:938
 #, no-c-format
 msgid "Phrases has been converted to templates"
 msgstr "Uitdrukkingen zijn omgezet naar sjablonen"
 
-#. i18n: file kmail.kcfg line 607
-#: rc.cpp:901
+#. i18n: file kmail.kcfg line 655
+#: rc.cpp:941
 #, no-c-format
 msgid "Old phrases have been converted to templates"
 msgstr "Oude uitdrukkingen zijn omgezet naar sjablonen"
 
-#. i18n: file kmail.kcfg line 611
-#: rc.cpp:904
+#. i18n: file kmail.kcfg line 659
+#: rc.cpp:944
 #, no-c-format
 msgid "Message template for new message"
 msgstr "Berichtsjabloon voor nieuw bericht"
 
-#. i18n: file kmail.kcfg line 616
-#: rc.cpp:907
+#. i18n: file kmail.kcfg line 664
+#: rc.cpp:947
 #, no-c-format
 msgid "Message template for reply"
 msgstr "Berichtsjabloon voor beantwoorden"
 
-#. i18n: file kmail.kcfg line 621
-#: rc.cpp:910
+#. i18n: file kmail.kcfg line 669
+#: rc.cpp:950
 #, no-c-format
 msgid "Message template for reply to all"
 msgstr "Berichtsjabloon voor allen beantwoorden"
 
-#. i18n: file kmail.kcfg line 626
-#: rc.cpp:913
+#. i18n: file kmail.kcfg line 674
+#: rc.cpp:953
 #, no-c-format
 msgid "Message template for forward"
 msgstr "Berichtsjabloon voor doorsturen"
 
-#. i18n: file kmail.kcfg line 631
-#: rc.cpp:916
+#. i18n: file kmail.kcfg line 679
+#: rc.cpp:956
 #, no-c-format
 msgid "Quote characters"
 msgstr "Tekens aanhalen"
 
-#. i18n: file kmail.kcfg line 640
-#: rc.cpp:919
+#. i18n: file kmail.kcfg line 688
+#: rc.cpp:959
 #, no-c-format
 msgid "Allow out-of-office settings to to be changeable by the user."
 msgstr "Toestaan dat de gebruiker afwezigheidsberichten mag veranderen."
 
-#. i18n: file kmail.kcfg line 644
-#: rc.cpp:922
+#. i18n: file kmail.kcfg line 692
+#: rc.cpp:962
 #, no-c-format
 msgid ""
 "Allow users to upload out-of-office sieve scripts, but disallow them changin "
@@ -12752,23 +13871,23 @@ msgstr ""
 "toestaan dat ze veranderingen aanbrengen in de instellingen (zoals het reageren "
 "op spam of alleen op een bepaald domein)."
 
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:925
+#. i18n: file kmail.kcfg line 696
+#: rc.cpp:965
 #, no-c-format
 msgid "Send out-of-office replies to mails coming from this domain only."
 msgstr ""
 "Afwezigheidsberichten alleen versturen naar e-mails die van dit domein komen."
 
-#. i18n: file kmail.kcfg line 652
-#: rc.cpp:928
+#. i18n: file kmail.kcfg line 700
+#: rc.cpp:968
 #, no-c-format
 msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
 msgstr ""
 "Toestaan dat afwezigheidsberichten worden verstuurd naar berichten die als spam "
 "zijn gemarkeerd."
 
-#. i18n: file kmail.kcfg line 656
-#: rc.cpp:931
+#. i18n: file kmail.kcfg line 704
+#: rc.cpp:971
 #, no-c-format
 msgid ""
 "Check if there is still an active out-of-office reply configured when starting "
@@ -12777,14 +13896,6 @@ msgstr ""
 "Controleren of er nog een afwezigheidsbericht is ingesteld bij het openen van "
 "KMail."
 
-#: recipientseditor.cpp:100
-msgid "To"
-msgstr "Aan"
-
-#: recipientseditor.cpp:102
-msgid "CC"
-msgstr "CC"
-
 #: recipientseditor.cpp:104
 msgid "BCC"
 msgstr "BCC"
@@ -12797,43 +13908,43 @@ msgstr "<Onbekend type geadresseerde>"
 msgid "Select type of recipient"
 msgstr "Selecteer het type geadresseerde"
 
-#: recipientseditor.cpp:181
+#: recipientseditor.cpp:163
+msgid "Set the list of email addresses to receive this message"
+msgstr ""
+
+#: recipientseditor.cpp:183
 msgid "Remove recipient line"
 msgstr "Geadresseerde-regel verwijderen"
 
-#: recipientseditor.cpp:737
+#: recipientseditor.cpp:739
 msgid "<b>To:</b><br/>"
 msgstr "<b>Aan:</b><br/>"
 
-#: recipientseditor.cpp:738
+#: recipientseditor.cpp:740
 msgid "<b>CC:</b><br/>"
 msgstr "<b>CC:</b><br/>"
 
-#: recipientseditor.cpp:739
+#: recipientseditor.cpp:741
 msgid "<b>BCC:</b><br/>"
 msgstr "<b>BCC:</b><br/>"
 
-#: recipientseditor.cpp:766
+#: recipientseditor.cpp:768
 msgid "Save List..."
 msgstr "Lijst opslaan..."
 
-#: recipientseditor.cpp:772
+#: recipientseditor.cpp:774
 msgid "Save recipients as distribution list"
 msgstr "Geadresseerden als distributielijst opslaan"
 
-#: recipientseditor.cpp:774
-msgid "Se&lect..."
-msgstr "Se&lecteren..."
-
-#: recipientseditor.cpp:777
+#: recipientseditor.cpp:779
 msgid "Select recipients from address book"
 msgstr "Geadresseerden uit adresboek selecteren"
 
-#: recipientseditor.cpp:810
+#: recipientseditor.cpp:812
 msgid "No recipients"
 msgstr "Geen geadresseerden"
 
-#: recipientseditor.cpp:811
+#: recipientseditor.cpp:813
 #, c-format
 msgid ""
 "_n: 1 recipient\n"
@@ -12842,7 +13953,7 @@ msgstr ""
 "1 geadresseerde\n"
 "%n geadresseerden"
 
-#: recipientseditor.cpp:914
+#: recipientseditor.cpp:917
 msgid "Truncating recipients list to %1 of %2 entries."
 msgstr "Geadresseerden worden opgedeeld in %1 van de %2 ingangen."
 
@@ -12938,11 +14049,11 @@ msgstr ""
 "Deze knop opent een apart dialoogvenster waarin u de ontvangers uit de "
 "beschikbare adressen kunt selecteren."
 
-#: redirectdialog.cpp:107
+#: redirectdialog.cpp:116
 msgid "You cannot redirect the message without an address."
 msgstr "U kunt geen berichten opnieuw verzenden zonder een adres op te geven."
 
-#: redirectdialog.cpp:108
+#: redirectdialog.cpp:117
 msgid "Empty Redirection Address"
 msgstr "Leeg adres bij opnieuw verzenden"
 
@@ -13078,37 +14189,37 @@ msgstr "Alleen z&oeken in:"
 msgid "I&nclude sub-folders"
 msgstr "I&nclusief submappen"
 
-#: searchwindow.cpp:226
+#: searchwindow.cpp:225
 msgid "Sender/Receiver"
 msgstr "Zender/Ontvanger"
 
-#: searchwindow.cpp:249
+#: searchwindow.cpp:250
 msgid "Search folder &name:"
 msgstr "&Naam voor zoekmap:"
 
-#: searchwindow.cpp:259
+#: searchwindow.cpp:260
 #, fuzzy
 msgid "Op&en Search Folder"
 msgstr "Volledige zoekopdracht openen"
 
-#: searchwindow.cpp:268
+#: searchwindow.cpp:269
 #, fuzzy
 msgid "Open &Message"
 msgstr "Bericht openen"
 
-#: searchwindow.cpp:274
+#: searchwindow.cpp:275
 msgid "AMiddleLengthText..."
 msgstr "Een middellange tekst..."
 
-#: searchwindow.cpp:275
+#: searchwindow.cpp:276
 msgid "Ready."
 msgstr "Gereed."
 
-#: searchwindow.cpp:356
+#: searchwindow.cpp:357
 msgid "Clear Selection"
 msgstr "Selectie opschonen"
 
-#: searchwindow.cpp:415
+#: searchwindow.cpp:416
 #, c-format
 msgid ""
 "_n: %n message searched\n"
@@ -13117,11 +14228,11 @@ msgstr ""
 "%n bericht doorzocht\n"
 "%n berichten doorzocht"
 
-#: searchwindow.cpp:418
+#: searchwindow.cpp:419
 msgid "Done."
 msgstr "Voltooid."
 
-#: searchwindow.cpp:419
+#: searchwindow.cpp:420
 msgid ""
 "_n: %n match in %1\n"
 "%n matches in %1"
@@ -13129,11 +14240,11 @@ msgstr ""
 "%n overeenkomst in %1\n"
 "%n overeenkomsten in %1"
 
-#: searchwindow.cpp:422
+#: searchwindow.cpp:423
 msgid "Search canceled."
 msgstr "Zoeken geannuleerd."
 
-#: searchwindow.cpp:423
+#: searchwindow.cpp:424
 msgid ""
 "_n: %n match so far in %1\n"
 "%n matches so far in %1"
@@ -13141,7 +14252,7 @@ msgstr ""
 "tot dusver %n overeenkomst in %1\n"
 "tot dusver %n overeenkomsten in %1"
 
-#: searchwindow.cpp:427
+#: searchwindow.cpp:428
 #, c-format
 msgid ""
 "_n: %n message\n"
@@ -13150,7 +14261,7 @@ msgstr ""
 "%n bericht\n"
 "%n berichten"
 
-#: searchwindow.cpp:428
+#: searchwindow.cpp:429
 #, c-format
 msgid ""
 "_n: %n match\n"
@@ -13159,7 +14270,7 @@ msgstr ""
 "%n overeenkomst\n"
 "%n overeenkomsten"
 
-#: searchwindow.cpp:429
+#: searchwindow.cpp:430
 msgid "Searching in %1. %2 searched so far"
 msgstr "Zoekende in %1. Tot dusver %2 doorzocht"
 
@@ -13191,19 +14302,19 @@ msgstr ""
 "Diagnostische gegevens over het Sieve-script worden verzameld...\n"
 "\n"
 
-#: sievedebugdialog.cpp:230
+#: sievedebugdialog.cpp:256
 msgid ""
 "Collecting data for account '%1'...\n"
 msgstr ""
 "Gegevens voor account '%1' worden verzameld...\n"
 
-#: sievedebugdialog.cpp:231
+#: sievedebugdialog.cpp:257
 msgid ""
 "------------------------------------------------------------\n"
 msgstr ""
 "------------------------------------------------------------\n"
 
-#: sievedebugdialog.cpp:239
+#: sievedebugdialog.cpp:265
 msgid ""
 "(Account does not support Sieve)\n"
 "\n"
@@ -13211,7 +14322,7 @@ msgstr ""
 "(Account ondersteunt geen Sieve)\n"
 "\n"
 
-#: sievedebugdialog.cpp:266
+#: sievedebugdialog.cpp:278
 msgid ""
 "(Account is not an IMAP account)\n"
 "\n"
@@ -13219,13 +14330,13 @@ msgstr ""
 "(Account is geen IMAP-account)\n"
 "\n"
 
-#: sievedebugdialog.cpp:286
+#: sievedebugdialog.cpp:298
 msgid ""
 "Contents of script '%1':\n"
 msgstr ""
 "Inhoud van script '%1':\n"
 
-#: sievedebugdialog.cpp:321
+#: sievedebugdialog.cpp:320
 msgid ""
 "(This script is empty.)\n"
 "\n"
@@ -13233,7 +14344,7 @@ msgstr ""
 "(Dit script is leeg.)\n"
 "\n"
 
-#: sievedebugdialog.cpp:326
+#: sievedebugdialog.cpp:325
 msgid ""
 "------------------------------------------------------------\n"
 "%1\n"
@@ -13245,23 +14356,23 @@ msgstr ""
 "------------------------------------------------------------\n"
 "\n"
 
-#: sievedebugdialog.cpp:342
+#: sievedebugdialog.cpp:341
 msgid ""
 "Sieve capabilities:\n"
 msgstr ""
 "Sieve-mogelijkheden:\n"
 
-#: sievedebugdialog.cpp:346
+#: sievedebugdialog.cpp:345
 msgid "(No special capabilities available)"
 msgstr "(Geen speciale mogelijkheden beschikbaar)"
 
-#: sievedebugdialog.cpp:355
+#: sievedebugdialog.cpp:354
 msgid ""
 "Available Sieve scripts:\n"
 msgstr ""
 "Beschikbare Sieve-scripts:\n"
 
-#: sievedebugdialog.cpp:359
+#: sievedebugdialog.cpp:358
 msgid ""
 "(No Sieve scripts available on this server)\n"
 "\n"
@@ -13269,7 +14380,7 @@ msgstr ""
 "(Geen Sieve-scripts beschikbaar op deze server)\n"
 "\n"
 
-#: sievedebugdialog.cpp:367
+#: sievedebugdialog.cpp:366
 msgid ""
 "Active script: %1\n"
 "\n"
@@ -13277,7 +14388,7 @@ msgstr ""
 "Actieve script: %1\n"
 "\n"
 
-#: sievedebugdialog.cpp:394 vacation.cpp:714
+#: sievedebugdialog.cpp:393 vacation.cpp:721
 msgid ""
 "Sieve script installed successfully on the server.\n"
 "Out of Office reply is now active."
@@ -13285,7 +14396,7 @@ msgstr ""
 "Sieve-script was succesvol geïnstalleerd op de server.\n"
 "Afwezigheidsantwoorden zijn nou ingeschakeld."
 
-#: sievedebugdialog.cpp:396 vacation.cpp:716
+#: sievedebugdialog.cpp:395 vacation.cpp:723
 msgid ""
 "Sieve script installed successfully on the server.\n"
 "Out of Office reply has been deactivated."
@@ -13379,18 +14490,22 @@ msgstr "Commando s&pecificeren:"
 msgid "New entry:"
 msgstr "Nieuwe ingang:"
 
-#: simplestringlisteditor.cpp:205
+#: simplestringlisteditor.cpp:214
 msgid "New Value"
 msgstr "Nieuwe waarde"
 
-#: simplestringlisteditor.cpp:225
+#: simplestringlisteditor.cpp:235
 msgid "Change Value"
 msgstr "Waarde wijzigen"
 
-#: snippetdlg.cpp:71
+#: snippetdlg.cpp:78
 msgid "Sh&ortcut:"
 msgstr "Snelt&oets:"
 
+#: snippetitem.cpp:133 snippetwidget.cpp:171
+msgid "GROUP"
+msgstr ""
+
 #: snippetwidget.cpp:148
 #, c-format
 msgid "Snippet %1"
@@ -13471,9 +14586,10 @@ msgid "Make value &default"
 msgstr "Instellen als stan&daard"
 
 #: subscriptiondialog.cpp:376
+#, fuzzy
 msgid ""
-"Currently subscriptions are not used for server %1\n"
-"do you want to enable subscriptions?"
+"Currently subscriptions are not used for server. %1\n"
+"Do you want to enable subscriptions?"
 msgstr ""
 "Huidige inschrijvingen worden niet gebruikt voor server %1\n"
 "Wilt u de inschrijvingen inschakelen?"
@@ -13490,28 +14606,33 @@ msgstr "Inschakelen"
 msgid "Do Not Enable"
 msgstr "Niet inschakelen"
 
-#: templateparser.cpp:238 templateparser.cpp:271
+#: templateparser.cpp:263 templateparser.cpp:296
 msgid "Cannot insert content from file %1: %2"
 msgstr "Kon de inhoud van het bestand %1 niet invoegen: %2"
 
-#: templateparser.cpp:1009 templateparser.cpp:1013
+#: templateparser.cpp:970
+#, fuzzy, c-format
+msgid "Attachment %1"
+msgstr "Bijlage: %1"
+
+#: templateparser.cpp:1150 templateparser.cpp:1154
 msgid "Pipe command exit with status %1: %2"
 msgstr "Het precommando stopte met code %1: %2"
 
-#: templateparser.cpp:1024 templateparser.cpp:1028
+#: templateparser.cpp:1165 templateparser.cpp:1169
 msgid "Pipe command killed by signal %1: %2"
 msgstr "Het precommando is gestopt met signaal %1: %2"
 
-#: templateparser.cpp:1040
+#: templateparser.cpp:1181
 msgid "Pipe command did not finish within %1 seconds: %2"
 msgstr "Precommando stopte niet binnen %1 seconden: %2"
 
-#: templateparser.cpp:1052 templateparser.cpp:1055
+#: templateparser.cpp:1193 templateparser.cpp:1196
 #, c-format
 msgid "Cannot write to process stdin: %1"
 msgstr "Kon niet schrijven naar de standaardinvoer van het proces: %1"
 
-#: templateparser.cpp:1063
+#: templateparser.cpp:1204
 #, c-format
 msgid "Cannot start pipe command from template: %1"
 msgstr "Kon het precommando niet uitvoeren vanuit het sjabloon: %1"
@@ -13586,15 +14707,16 @@ msgstr ""
 "-------------------------------------------------------\n"
 
 #: templatesconfiguration.cpp:392
+#, fuzzy
 msgid ""
 "%REM=\"Default forward template\"%-\n"
 "\n"
 "----------  %1  ----------\n"
 "\n"
 "Subject: %OFULLSUBJECT\n"
-"Date: %ODATE\n"
+"Date: %ODATE, %OTIMELONG\n"
 "From: %OFROMADDR\n"
-"To: %OTOADDR\n"
+"%OADDRESSEESADDR\n"
 "\n"
 "%TEXT\n"
 "-------------------------------------------------------\n"
@@ -13612,49 +14734,55 @@ msgstr ""
 "-------------------------------------------------------\n"
 
 #: templatesconfiguration.cpp:511
+#, fuzzy
 msgid ""
 "%REM=\"Default new message template\"%-\n"
-"%BLANK"
+"%BLANK\n"
+"%BLANK\n"
+"%BLANK\n"
 msgstr ""
 "%REM=\"Standaard sjabloon voor nieuw bericht\"%-\n"
 "%BLANK"
 
-#: templatesconfiguration.cpp:518
+#: templatesconfiguration.cpp:520
 #, fuzzy
 msgid ""
+"%CURSOR\n"
+"%BLANK\n"
 "%REM=\"Default reply template\"%-\n"
 "On %ODATEEN %OTIMELONGEN you wrote:\n"
 "%QUOTE\n"
-"%CURSOR\n"
 msgstr ""
 "%REM=\"Standaard antwoordsjabloon\"%-\n"
 "Op %ODATEEN %OTIMELONGEN schreef u:\n"
 "%QUOTE\n"
 "%CURSOR\n"
 
-#: templatesconfiguration.cpp:527
+#: templatesconfiguration.cpp:530
 #, fuzzy
 msgid ""
+"%CURSOR\n"
+"%BLANK\n"
 "%REM=\"Default reply all template\"%-\n"
 "On %ODATEEN %OTIMELONGEN %OFROMNAME wrote:\n"
 "%QUOTE\n"
-"%CURSOR\n"
 msgstr ""
 "%REM=\"Standaard sjabloon voor allen beantwoorden\"%-\n"
 "Op %ODATEEN %OTIMELONGEN schreef %OFROMNAME:\n"
 "%QUOTE\n"
 "%CURSOR\n"
 
-#: templatesconfiguration.cpp:536
+#: templatesconfiguration.cpp:541
+#, fuzzy
 msgid ""
 "%REM=\"Default forward template\"%-\n"
 "\n"
 "----------  Forwarded Message  ----------\n"
 "\n"
 "Subject: %OFULLSUBJECT\n"
-"Date: %ODATE\n"
+"Date: %ODATE, %OTIMELONG\n"
 "From: %OFROMADDR\n"
-"To: %OTOADDR\n"
+"%OADDRESSEESADDR\n"
 "\n"
 "%TEXT\n"
 "-------------------------------------------------------\n"
@@ -13691,158 +14819,163 @@ msgstr "Aangehaald bericht"
 msgid "Message Text as Is"
 msgstr "Berichttekst zoals het is"
 
-#: templatesinsertcommand.cpp:62 templatesinsertcommand.cpp:163
+#: templatesinsertcommand.cpp:62 templatesinsertcommand.cpp:166
 msgid "Message Id"
 msgstr "Bericht-ID"
 
-#: templatesinsertcommand.cpp:70 templatesinsertcommand.cpp:171
+#: templatesinsertcommand.cpp:70 templatesinsertcommand.cpp:174
 msgid "Date in Short Format"
 msgstr "Datum in kort formaat"
 
-#: templatesinsertcommand.cpp:74 templatesinsertcommand.cpp:175
+#: templatesinsertcommand.cpp:74 templatesinsertcommand.cpp:178
 msgid "Date in C Locale"
 msgstr "Datum in C-locale"
 
-#: templatesinsertcommand.cpp:78 templatesinsertcommand.cpp:179
+#: templatesinsertcommand.cpp:78 templatesinsertcommand.cpp:182
 msgid "Day of Week"
 msgstr "Dag van de week"
 
-#: templatesinsertcommand.cpp:82 templatesinsertcommand.cpp:183
+#: templatesinsertcommand.cpp:82 templatesinsertcommand.cpp:186
 msgid "Time"
 msgstr "Tijd"
 
-#: templatesinsertcommand.cpp:86 templatesinsertcommand.cpp:187
+#: templatesinsertcommand.cpp:86 templatesinsertcommand.cpp:190
 msgid "Time in Long Format"
 msgstr "Tijd in lang formaat"
 
-#: templatesinsertcommand.cpp:90 templatesinsertcommand.cpp:191
+#: templatesinsertcommand.cpp:90 templatesinsertcommand.cpp:194
 msgid "Time in C Locale"
 msgstr "Tijd in C-locale"
 
-#: templatesinsertcommand.cpp:94 templatesinsertcommand.cpp:195
+#: templatesinsertcommand.cpp:94 templatesinsertcommand.cpp:198
 msgid "To Field Address"
 msgstr "E-mailadres Aan-veld"
 
-#: templatesinsertcommand.cpp:98 templatesinsertcommand.cpp:199
+#: templatesinsertcommand.cpp:98 templatesinsertcommand.cpp:202
 msgid "To Field Name"
 msgstr "Naam Aan-veld"
 
-#: templatesinsertcommand.cpp:102 templatesinsertcommand.cpp:203
+#: templatesinsertcommand.cpp:102 templatesinsertcommand.cpp:206
 msgid "To Field First Name"
 msgstr "Voornaam Aan-veld"
 
-#: templatesinsertcommand.cpp:106 templatesinsertcommand.cpp:207
+#: templatesinsertcommand.cpp:106 templatesinsertcommand.cpp:210
 msgid "To Field Last Name"
 msgstr "Achternaam Aan-veld"
 
-#: templatesinsertcommand.cpp:110 templatesinsertcommand.cpp:211
+#: templatesinsertcommand.cpp:110 templatesinsertcommand.cpp:214
 msgid "CC Field Address"
 msgstr "E-mailadres CC-veld"
 
-#: templatesinsertcommand.cpp:114 templatesinsertcommand.cpp:215
+#: templatesinsertcommand.cpp:114 templatesinsertcommand.cpp:218
 msgid "CC Field Name"
 msgstr "Naam CC-veld"
 
-#: templatesinsertcommand.cpp:118 templatesinsertcommand.cpp:219
+#: templatesinsertcommand.cpp:118 templatesinsertcommand.cpp:222
 msgid "CC Field First Name"
 msgstr "Voornaam CC-veld"
 
-#: templatesinsertcommand.cpp:122 templatesinsertcommand.cpp:223
+#: templatesinsertcommand.cpp:122 templatesinsertcommand.cpp:226
 msgid "CC Field Last Name"
 msgstr "Achternaam CC-veld"
 
-#: templatesinsertcommand.cpp:126 templatesinsertcommand.cpp:227
+#: templatesinsertcommand.cpp:126 templatesinsertcommand.cpp:230
 msgid "From Field Address"
 msgstr "E-mailadres Van-veld"
 
-#: templatesinsertcommand.cpp:130 templatesinsertcommand.cpp:231
+#: templatesinsertcommand.cpp:130 templatesinsertcommand.cpp:234
 msgid "From Field Name"
 msgstr "Naam Van-veld"
 
-#: templatesinsertcommand.cpp:134 templatesinsertcommand.cpp:235
+#: templatesinsertcommand.cpp:134 templatesinsertcommand.cpp:238
 msgid "From Field First Name"
 msgstr "Voornaam Van-veld"
 
-#: templatesinsertcommand.cpp:138 templatesinsertcommand.cpp:239
+#: templatesinsertcommand.cpp:138 templatesinsertcommand.cpp:242
 msgid "From Field Last Name"
 msgstr "Achternaam Van-veld"
 
-#: templatesinsertcommand.cpp:146
+#: templatesinsertcommand.cpp:142
+#, fuzzy
+msgid "Addresses of all original recipients"
+msgstr "Extra geadresseerden"
+
+#: templatesinsertcommand.cpp:149
 msgid "Quoted Headers"
 msgstr "Aangehaalde berichtkoppen"
 
-#: templatesinsertcommand.cpp:150
+#: templatesinsertcommand.cpp:153
 msgid "Headers as Is"
 msgstr "Berichtkoppen zoals ze zijn"
 
-#: templatesinsertcommand.cpp:154 templatesinsertcommand.cpp:247
+#: templatesinsertcommand.cpp:157 templatesinsertcommand.cpp:250
 msgid "Header Content"
 msgstr "Berichtkopinhoud"
 
-#: templatesinsertcommand.cpp:160
+#: templatesinsertcommand.cpp:163
 msgid "Current Message"
 msgstr "Huidige bericht"
 
-#: templatesinsertcommand.cpp:253
+#: templatesinsertcommand.cpp:256
 msgid "Process With External Programs"
 msgstr "Proces met externe programma's"
 
-#: templatesinsertcommand.cpp:256
+#: templatesinsertcommand.cpp:259
 msgid "Insert Result of Command"
 msgstr "Uitvoer van commando invoegen"
 
-#: templatesinsertcommand.cpp:260
+#: templatesinsertcommand.cpp:263
 msgid "Pipe Original Message Body and Insert Result as Quoted Text"
 msgstr ""
 "Oorspronkelijke berichtinhoud doorsluizen door een programma en het resultaat "
 "daarvan invoegen als aangehaalde tekst"
 
-#: templatesinsertcommand.cpp:264
+#: templatesinsertcommand.cpp:267
 msgid "Pipe Original Message Body and Insert Result as Is"
 msgstr "Oorspronkelijke berichttekst doorsluizen en resultaat invoegen"
 
-#: templatesinsertcommand.cpp:268
+#: templatesinsertcommand.cpp:271
 msgid "Pipe Original Message with Headers and Insert Result as Is"
 msgstr ""
 "Oorspronkelijk bericht met berichtkoppen doorsluizen en resultaat invoegen"
 
-#: templatesinsertcommand.cpp:272
+#: templatesinsertcommand.cpp:275
 msgid "Pipe Current Message Body and Insert Result as Is"
 msgstr "Huidige berichtinhoud doorsluizen en resultaat invoegen"
 
-#: templatesinsertcommand.cpp:276
+#: templatesinsertcommand.cpp:279
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr "Huidige berichtinhoud doorsluizen en vervangen door resultaat"
 
-#: templatesinsertcommand.cpp:285
+#: templatesinsertcommand.cpp:288
 msgid "Set Cursor Position"
 msgstr "Cursorpositie instellen"
 
-#: templatesinsertcommand.cpp:289
+#: templatesinsertcommand.cpp:292
 msgid "Insert File Content"
 msgstr "Inhoud van bestand invoegen"
 
-#: templatesinsertcommand.cpp:293
+#: templatesinsertcommand.cpp:296
 msgid "DNL"
 msgstr "DNL"
 
-#: templatesinsertcommand.cpp:297
+#: templatesinsertcommand.cpp:300
 msgid "Template Comment"
 msgstr "Sjablooncommentaar"
 
-#: templatesinsertcommand.cpp:301
+#: templatesinsertcommand.cpp:304
 msgid "No Operation"
 msgstr "Geen handeling"
 
-#: templatesinsertcommand.cpp:305
+#: templatesinsertcommand.cpp:308
 msgid "Clear Generated Message"
 msgstr "Aangemaakt bericht wissen"
 
-#: templatesinsertcommand.cpp:309
+#: templatesinsertcommand.cpp:312
 msgid "Turn Debug On"
 msgstr "Debug-modus aanzetten"
 
-#: templatesinsertcommand.cpp:313
+#: templatesinsertcommand.cpp:316
 msgid "Turn Debug Off"
 msgstr "Debug-modus uitschakelen"
 
@@ -13961,57 +15094,67 @@ msgstr ""
 msgid "There is nothing to undo."
 msgstr "Er is niets om ongedaan te maken."
 
-#: urlhandlermanager.cpp:422
+#: urlhandlermanager.cpp:482
 msgid "Turn on HTML rendering for this message."
 msgstr "HTML voor dit bericht activeren."
 
-#: urlhandlermanager.cpp:424
+#: urlhandlermanager.cpp:484
 msgid "Load external references from the Internet for this message."
 msgstr "Externe referenties ophalen van het internet voor dit bericht."
 
-#: urlhandlermanager.cpp:426
+#: urlhandlermanager.cpp:486
 msgid "Work online."
 msgstr "Online werken."
 
-#: urlhandlermanager.cpp:428
+#: urlhandlermanager.cpp:488
 msgid "Decrypt message."
 msgstr "Bericht decoderen."
 
-#: urlhandlermanager.cpp:430
+#: urlhandlermanager.cpp:490
 msgid "Show signature details."
 msgstr "Ondertekeningsdetails tonen."
 
-#: urlhandlermanager.cpp:432
+#: urlhandlermanager.cpp:492
 msgid "Hide signature details."
 msgstr "Ondertekeningsdetails verbergen."
 
-#: urlhandlermanager.cpp:464
+#: urlhandlermanager.cpp:494
+#, fuzzy
+msgid "Hide attachment list"
+msgstr "Bijlage opslaan als"
+
+#: urlhandlermanager.cpp:496
+#, fuzzy
+msgid "Show attachment list"
+msgstr "Bijlagepictogram tonen"
+
+#: urlhandlermanager.cpp:528
 msgid "Expand all quoted text."
 msgstr "Aangehaalde tekst uitklappen."
 
-#: urlhandlermanager.cpp:466
+#: urlhandlermanager.cpp:531
 msgid "Collapse quoted text."
 msgstr "Aangehaalde tekst inklappen."
 
-#: urlhandlermanager.cpp:487
+#: urlhandlermanager.cpp:554
 msgid "Could not start certificate manager. Please check your installation."
 msgstr ""
 "Het Certificaatbeheer kon niet worden opgestart. Controleer uw installatie."
 
-#: urlhandlermanager.cpp:497
+#: urlhandlermanager.cpp:564
 #, c-format
 msgid "Show certificate 0x%1"
 msgstr "Certificaat 0x%1 tonen"
 
-#: urlhandlermanager.cpp:552
+#: urlhandlermanager.cpp:693
 msgid "Attachment #%1 (unnamed)"
 msgstr "Bijlage #%1 (naamloos)"
 
-#: urlhandlermanager.cpp:581
+#: urlhandlermanager.cpp:724
 msgid "Show GnuPG Audit Log for this operation"
 msgstr "GnuPG-auditlog tonen voor deze handeling"
 
-#: vacation.cpp:562
+#: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
 "\n"
@@ -14035,7 +15178,7 @@ msgstr ""
 "Met vriendelijke groet,\n"
 "-- <enter your name and e-mail address here>\n"
 
-#: vacation.cpp:606
+#: vacation.cpp:612
 msgid ""
 "Your server did not list \"vacation\" in its list of supported Sieve "
 "extensions;\n"
@@ -14047,11 +15190,11 @@ msgstr ""
 "Zonder deze kan KMail geen afwezigheidsantwoorden voor u installeren.\n"
 "Neem contact op met uw systeembeheerder."
 
-#: vacation.cpp:616
+#: vacation.cpp:622
 msgid "Configure \"Out of Office\" Replies"
 msgstr "Afwezigheidsantwoorden instellen"
 
-#: vacation.cpp:626
+#: vacation.cpp:632
 msgid ""
 "Someone (probably you) changed the vacation script on the server.\n"
 "KMail is no longer able to determine the parameters for the autoreplies.\n"
@@ -14061,7 +15204,7 @@ msgstr ""
 "KMail kan niet langer de parameters voor de automatische antwoorden bepalen.\n"
 "In plaats daarvan zullen de standaardwaarden worden gebruikt."
 
-#: vacation.cpp:651
+#: vacation.cpp:657
 msgid ""
 "There is still an active out-of-office reply configured.\n"
 "Do you want to edit it?"
@@ -14069,11 +15212,11 @@ msgstr ""
 "Er is nog steeds een afwezigheidsbericht ingesteld.\n"
 "Wilt u dit bewerken?"
 
-#: vacation.cpp:652
+#: vacation.cpp:658
 msgid "Out-of-office reply still active"
 msgstr "Afwezigheidsbericht nog ingesteld"
 
-#: vacation.cpp:653
+#: vacation.cpp:659
 msgid "Ignore"
 msgstr "Negeren"
 
@@ -14085,39 +15228,39 @@ msgstr "Instelling voor vakantiebericht:"
 msgid "&Activate vacation notifications"
 msgstr "Vakantieberichtgevingen &activeren"
 
-#: vacationdialog.cpp:76
+#: vacationdialog.cpp:78
 msgid "&Resend notification only after:"
 msgstr "Notificatie alleen opnieuw ve&rzenden na:"
 
-#: vacationdialog.cpp:82
+#: vacationdialog.cpp:84
 msgid "&Send responses for these addresses:"
 msgstr "Antwoorden &sturen voor deze adressen:"
 
-#: vacationdialog.cpp:87
+#: vacationdialog.cpp:89
 msgid "Do not send vacation replies to spam messages"
 msgstr "Geen afwezigheidsberichten naar spamberichten sturen"
 
-#: vacationdialog.cpp:93
+#: vacationdialog.cpp:95
 msgid "Only react to mail coming from domain"
 msgstr "Alleen reageren op e-mailberichten die komen van het domein"
 
-#: vcardviewer.cpp:41
+#: vcardviewer.cpp:45
 msgid "VCard Viewer"
 msgstr "VCard-weergaveprogramma"
 
-#: vcardviewer.cpp:42
+#: vcardviewer.cpp:46
 msgid "&Import"
 msgstr "&Importeren"
 
-#: vcardviewer.cpp:42
+#: vcardviewer.cpp:46
 msgid "&Next Card"
 msgstr "&Volgende kaartje"
 
-#: vcardviewer.cpp:42
+#: vcardviewer.cpp:46
 msgid "&Previous Card"
 msgstr "Vori&ge kaartje"
 
-#: vcardviewer.cpp:62
+#: vcardviewer.cpp:70
 msgid "Failed to parse vCard."
 msgstr "Kon vCard niet ontleden."
 
@@ -14321,7 +15464,7 @@ msgstr "Reclame"
 msgid "To Do"
 msgstr "Taak"
 
-#: kmsearchpattern.h:233
+#: kmsearchpattern.h:234
 msgid "Has Attachment"
 msgstr "Heeft bijlage"
 
@@ -14329,6 +15472,11 @@ msgstr "Heeft bijlage"
 msgid "%1 of %2 %3 used"
 msgstr "%1 van %2 %3 gebruikt"
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr "Pad"
+
 #: util.h:208
 msgid ""
 "A file named \"%1\" already exists. Are you sure you want to overwrite it?"
@@ -14339,5 +15487,31 @@ msgstr ""
 msgid "Overwrite File?"
 msgstr "Bestand overschrijven?"
 
+#~ msgid "Show folder quick search field"
+#~ msgstr "Snelzoeken voor mappen tonen"
+
+#~ msgid "Standard (Ical / Vcard)"
+#~ msgstr "Standaard (iCal / VCard)"
+
+#~ msgid ""
+#~ "_: recipient address field\n"
+#~ "&To:"
+#~ msgstr "&Naar:"
+
+#~ msgid "&Copy to (CC):"
+#~ msgstr "&CC:"
+
+#~ msgid "&Blind copy to (BCC):"
+#~ msgstr "&BCC:"
+
+#~ msgid "Retrieving new messages"
+#~ msgstr "Nieuwe berichten worden opgehaald"
+
+#~ msgid "Only filter mails received in disconnected IMAP inbox."
+#~ msgstr "Alleen berichten filteren in verbindingsloze IMAP-postvak in."
+
+#~ msgid "Show folder quick search line edit"
+#~ msgstr "Snelzoeken tonen"
+
 #~ msgid "Op&en"
 #~ msgstr "Op&enen"
author	Timothy Pearson <kb9vqf@pearsoncomputing.net>	2014-09-29 03:08:03 -0500
committer	Timothy Pearson <kb9vqf@pearsoncomputing.net>	2014-09-29 03:08:03 -0500
commit	242434109c14a494dee7738b9c343f5947d20506 (patch)
tree	ea25930767128361a7669f1a25a479a66ccdfbeb /tde-i18n-nl/messages/tdepim/kmail.po
parent	8819501c6a160b7ae106b1a968bc953b0f0bc465 (diff)
download	tde-i18n-242434109c14a494dee7738b9c343f5947d20506.tar.gz tde-i18n-242434109c14a494dee7738b9c343f5947d20506.zip