Automated l10n update (.po files)

1 files changed, 3391 insertions, 2257 deletions

diff --git a/tde-i18n-rw/messages/tdepim/kmail.po b/tde-i18n-rw/messages/tdepim/kmail.po
index a475eae81a3..ab13383faed 100644
--- a/tde-i18n-rw/messages/tdepim/kmail.po
+++ b/tde-i18n-rw/messages/tdepim/kmail.po
@@ -15,10 +15,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail 3.4\n"
-"POT-Creation-Date: 2008-08-19 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2005-05-25 18:51-0600\n"
 "Last-Translator: Steve Murphy <murf@e-tools.com>\n"
 "Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n"
+"Language: rw\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -123,7 +124,7 @@ msgstr "ya:  ' Imimerere Ubutumwa "
 msgid "multiple encryption keys per address"
 msgstr "Igikubo Bishunzwe: Utubuto Aderesi: "
 
-#: aboutdata.cpp:212 kmreaderwin.cpp:1336 kmstartup.cpp:148
+#: aboutdata.cpp:212 kmreaderwin.cpp:1300 kmstartup.cpp:149
 #: mailinglistpropertiesdialog.cpp:97
 #, fuzzy
 msgid "KMail"
@@ -176,7 +177,7 @@ msgstr "Gushaka icyiciro"
 
 #: accountdialog.cpp:368
 #, fuzzy
-msgid "Procmail loc&kfile:"
+msgid "Procmail loc&tdefile:"
 msgstr "Idosiye ya hafi"
 
 #: accountdialog.cpp:380
@@ -239,7 +240,7 @@ msgid "Check inter&val:"
 msgstr "Intera : "
 
 #: 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"
 
@@ -278,8 +279,8 @@ msgstr "in Bikorwa Ibaruwa Kugenzura "
 msgid "Account Type: POP Account"
 msgstr "konti nshya ya POP3"
 
-#: 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 "Rusange"
 
@@ -395,7 +396,7 @@ msgstr "By'ikirenga"
 msgid "Check &What the Server Supports"
 msgstr "i "
 
-#: accountdialog.cpp:782 accountdialog.cpp:1097 kmheaders.cpp:137
+#: accountdialog.cpp:782 accountdialog.cpp:1097 kmheaders.cpp:140
 #: kmtransport.cpp:502
 msgid "Encryption"
 msgstr "Gushyira umutekano:"
@@ -540,7 +541,7 @@ msgstr "Kwerekana Ububiko Buhishe"
 
 #: accountdialog.cpp:987
 #, fuzzy
-msgid "Show only s&ubscribed folders"
+msgid "Show only serverside s&ubscribed folders"
 msgstr "Erekana gusa amadosiye yanditswe"
 
 #: accountdialog.cpp:992
@@ -605,9 +606,9 @@ msgstr "Iyungurura"
 msgid "<none>"
 msgstr "<tacyo>"
 
-#: 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
 #, fuzzy
 msgid "inbox"
 msgstr "Agasanduku k'Ibyinjiye"
@@ -703,7 +704,7 @@ msgstr ""
 "Ubutumwa ku i Seriveri: ; , iyi Ihitamo Yahagaritswe . \n"
 "Amaseriveri OYA i Kuri Iyungurura Ubutumwa ku i Seriveri: ku . "
 
-#: accountdialog.cpp:1734 vacationdialog.cpp:163
+#: accountdialog.cpp:1734 vacationdialog.cpp:76 vacationdialog.cpp:165
 msgid ""
 "_n:  day\n"
 " days"
@@ -746,12 +747,12 @@ msgstr "kirimo ubusa"
 msgid "Edit Namespace '%1'"
 msgstr "Guhindura Umwanyazina"
 
-#: accountmanager.cpp:101
+#: accountmanager.cpp:103
 #, fuzzy, c-format
 msgid "Account %1"
 msgstr "Konti:"
 
-#: accountmanager.cpp:181
+#: accountmanager.cpp:183
 #, fuzzy
 msgid ""
 "Account %1 has no mailbox defined:\n"
@@ -762,27 +763,27 @@ msgstr ""
 "Ibaruwa Kugenzura... Byahagaritswe ; \n"
 "Kugenzura Konti: Igenamiterere . "
 
-#: accountmanager.cpp:196
+#: accountmanager.cpp:226
 #, fuzzy
 msgid "Checking account %1 for new mail"
 msgstr "Konti: %1 ya:  Gishya Ibaruwa "
 
-#: accountmanager.cpp:214 accountmanager.cpp:217 accountwizard.cpp:441
+#: accountmanager.cpp:244 accountmanager.cpp:247 accountwizard.cpp:441
 #: accountwizard.cpp:477
 #, fuzzy
 msgid "Local Account"
 msgstr "Fonts za hafi"
 
-#: accountmanager.cpp:220
+#: accountmanager.cpp:250
 #, fuzzy
 msgid "POP Account"
 msgstr "Aderesi ya POP3"
 
-#: accountmanager.cpp:223 accountmanager.cpp:225
+#: accountmanager.cpp:253 accountmanager.cpp:255
 msgid "IMAP Account"
 msgstr "Aderesi ya IMAP"
 
-#: accountmanager.cpp:308
+#: accountmanager.cpp:343
 #, fuzzy
 msgid ""
 "You need to add an account in the network section of the settings in order to "
@@ -907,13 +908,13 @@ msgstr "Bya hafi "
 msgid "Server Information"
 msgstr "Amakuru ya seriveri"
 
-#. 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 "Nta na kimwe"
 
-#: accountwizard.cpp:384 configuredialog.cpp:792
+#: accountwizard.cpp:384 configuredialog.cpp:794
 #, fuzzy
 msgid "Sendmail"
 msgstr "Ohereza ibaruwa"
@@ -923,14 +924,14 @@ msgstr "Ohereza ibaruwa"
 msgid "Check for supported security capabilities of %1..."
 msgstr "ya:  Umutekano Bya %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
 #, fuzzy
 msgid "<b>Evaluating filter rules:</b> "
 msgstr "<b> Akayunguruzo: : </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 ""
 
@@ -939,128 +940,128 @@ msgstr ""
 msgid "<b>Applying filter action:</b> %1"
 msgstr "<b> Akayunguruzo: Igikorwa : </b> %1 "
 
-#: antispamwizard.cpp:101
+#: antispamwizard.cpp:100
 #, fuzzy
 msgid "Anti-Spam Wizard"
 msgstr "Nyobora ya gahunda"
 
-#: antispamwizard.cpp:102
+#: antispamwizard.cpp:101
 #, fuzzy
 msgid "Anti-Virus Wizard"
 msgstr "Nyobora Konti "
 
-#: antispamwizard.cpp:106
+#: antispamwizard.cpp:105
 #, fuzzy
 msgid "Welcome to the KMail Anti-Spam Wizard"
 msgstr "Kuri i - "
 
-#: antispamwizard.cpp:107
+#: antispamwizard.cpp:106
 #, fuzzy
 msgid "Welcome to the KMail Anti-Virus Wizard"
 msgstr "Kuri i - "
 
-#: antispamwizard.cpp:113
+#: antispamwizard.cpp:112
 #, fuzzy
 msgid "Options to fine-tune the handling of spam messages"
 msgstr "Kuri - i Bya Ubutumwa "
 
-#: antispamwizard.cpp:119
+#: antispamwizard.cpp:118
 #, fuzzy
 msgid "Options to fine-tune the handling of virus messages"
 msgstr "Kuri - i Bya Ubutumwa "
 
-#: antispamwizard.cpp:131
+#: antispamwizard.cpp:130
 #, fuzzy
 msgid "Summary of changes to be made by this wizard"
 msgstr "Bya Amahinduka Kuri ku iyi "
 
-#: antispamwizard.cpp:200
+#: antispamwizard.cpp:199
 #, fuzzy
 msgid "Virus handling"
 msgstr "Umutwe ubanza"
 
-#: antispamwizard.cpp:284 antispamwizard.cpp:286 antispamwizard.cpp:572
+#: antispamwizard.cpp:283 antispamwizard.cpp:285 antispamwizard.cpp:577
 #, fuzzy
 msgid "Spam handling"
 msgstr "Ubwijime"
 
-#: antispamwizard.cpp:325 antispamwizard.cpp:327 antispamwizard.cpp:585
+#: antispamwizard.cpp:324 antispamwizard.cpp:326 antispamwizard.cpp:590
 msgid "Semi spam (unsure) handling"
 msgstr ""
 
-#: antispamwizard.cpp:387 antispamwizard.cpp:389 antispamwizard.cpp:593
+#: antispamwizard.cpp:386 antispamwizard.cpp:388 antispamwizard.cpp:598
 #, fuzzy
 msgid "Classify as spam"
 msgstr "Nka "
 
-#: antispamwizard.cpp:419 antispamwizard.cpp:421 antispamwizard.cpp:595
+#: antispamwizard.cpp:418 antispamwizard.cpp:420 antispamwizard.cpp:600
 #, fuzzy
 msgid "Classify as NOT spam"
 msgstr "Nka "
 
-#: antispamwizard.cpp:493
+#: antispamwizard.cpp:498
 #, fuzzy
 msgid "Scanning for %1..."
 msgstr "ya:  %1 ... "
 
-#: antispamwizard.cpp:524
+#: antispamwizard.cpp:529
 #, fuzzy
 msgid "Scanning for anti-spam tools finished."
 msgstr "ya:  - Ibikoresho Byarangiye . "
 
-#: antispamwizard.cpp:525
+#: antispamwizard.cpp:530
 #, fuzzy
 msgid "Scanning for anti-virus tools finished."
 msgstr "ya:  - Ibikoresho Byarangiye . "
 
-#: antispamwizard.cpp:528
+#: antispamwizard.cpp:533
 #, fuzzy
 msgid ""
 "<p>No spam detection tools have been found. Install your spam detection "
 "software and re-run this wizard.</p>"
 msgstr "<p> , Oya Ibikoresho Byabonetse . na - Gukoresha iyi . </p> "
 
-#: antispamwizard.cpp:531
+#: antispamwizard.cpp:536
 #, fuzzy
 msgid "Scanning complete. No anti-virus tools found."
 msgstr "Byuzuye . - Ibikoresho Byabonetse . "
 
-#: antispamwizard.cpp:555
+#: antispamwizard.cpp:560
 #, fuzzy
 msgid "<p>Messages classified as spam are marked as read."
 msgstr "<p> Bitondetswe Nka cy/byagarajwe Nka Soma . "
 
-#: antispamwizard.cpp:557
+#: antispamwizard.cpp:562
 #, fuzzy
 msgid "<p>Messages classified as spam are not marked as read."
 msgstr "<p> Bitondetswe Nka OYA cy/byagarajwe Nka Soma . "
 
-#: antispamwizard.cpp:560
+#: antispamwizard.cpp:565
 #, fuzzy
 msgid "<br>Spam messages are moved into the folder named <i>"
 msgstr "<br> Ubutumwa i Ububiko... &Cyitwa: <i> "
 
-#: antispamwizard.cpp:563
+#: antispamwizard.cpp:568
 #, fuzzy
 msgid "<br>Spam messages are not moved into a certain folder.</p>"
 msgstr "<br> Ubutumwa OYA A Ububiko... . </p> "
 
-#: antispamwizard.cpp:587
+#: antispamwizard.cpp:592
 #, fuzzy
 msgid "<p>The folder for messages classified as unsure (probably spam) is <i>"
 msgstr "<p> Ububiko... ya:  Ubutumwa Bitondetswe Nka ( ) ni <i> "
 
-#: antispamwizard.cpp:600
+#: antispamwizard.cpp:605
 #, fuzzy
 msgid "<p>The wizard will create the following filters:<ul>"
 msgstr "<p> Kurema i Muyunguruzi : <ul> "
 
-#: antispamwizard.cpp:603
+#: antispamwizard.cpp:608
 #, fuzzy
 msgid "<p>The wizard will replace the following filters:<ul>"
 msgstr "<p> Gusimbuza i Muyunguruzi : <ul> "
 
-#: antispamwizard.cpp:860
+#: antispamwizard.cpp:864
 #, fuzzy
 msgid ""
 "The wizard will search for any tools to do spam detection\n"
@@ -1068,7 +1069,7 @@ msgid ""
 msgstr ""
 "Shakisha ya:  Icyo ari cyo cyose Ibikoresho Kuri Imikorere Kuri Akazi Na: . "
 
-#: antispamwizard.cpp:864
+#: antispamwizard.cpp:868
 #, fuzzy
 msgid ""
 "<p>Here you can get some assistance in setting up KMail's filter rules to use "
@@ -1092,7 +1093,7 @@ msgstr ""
 "Ibikorwa: Igihe ; Gusiba i Akayunguruzo: Byaremwe ku i Kuri Kubona Inyuma Kuri "
 "i &Imyifatire . "
 
-#: antispamwizard.cpp:915
+#: antispamwizard.cpp:919
 #, fuzzy
 msgid ""
 "<p>Please select the tools to be used for the detection and go to the next "
@@ -1101,22 +1102,22 @@ msgstr ""
 "<p> Guhitamo i Ibikoresho Kuri Byakoreshejwe ya:  i na Gyayo Kuri i Ibikurikira "
 "> Ipaji: . "
 
-#: antispamwizard.cpp:941
+#: antispamwizard.cpp:945
 #, fuzzy
 msgid "&Mark detected spam messages as read"
 msgstr "Ubutumwa Nka Soma "
 
-#: antispamwizard.cpp:943
+#: antispamwizard.cpp:947
 #, fuzzy
 msgid "Mark messages which have been classified as spam as read."
 msgstr "Ubutumwa Bitondetswe Nka Nka Soma . "
 
-#: antispamwizard.cpp:946
+#: antispamwizard.cpp:950
 #, fuzzy
 msgid "Move &known spam to:"
 msgstr "Kuri : "
 
-#: antispamwizard.cpp:948
+#: antispamwizard.cpp:952
 #, fuzzy
 msgid ""
 "The default folder for spam messages is the trash folder, but you may change "
@@ -1125,12 +1126,12 @@ msgstr ""
 "Mburabuzi Ububiko... ya:  Ubutumwa ni i Agatebo njyamwanda Ububiko... , "
 "Gicurasi Guhindura... in i Ububiko... Reba munsi . "
 
-#: antispamwizard.cpp:962
+#: antispamwizard.cpp:966
 #, fuzzy
 msgid "Move &probable spam to:"
 msgstr "Kuri : "
 
-#: antispamwizard.cpp:964
+#: antispamwizard.cpp:968
 #, fuzzy
 msgid ""
 "The default folder is the inbox folder, but you may change that in the folder "
@@ -1143,12 +1144,12 @@ msgstr ""
 "<p> Byose Ibikoresho Gushigikira A Itondekanya: Nka . Byahiswemo A , Guhitamo A "
 "Ububiko... Nka . "
 
-#: antispamwizard.cpp:1064
+#: antispamwizard.cpp:1068
 #, fuzzy
 msgid "Check messages using the anti-virus tools"
 msgstr "Ubutumwa ikoresha i - Ibikoresho "
 
-#: antispamwizard.cpp:1066
+#: antispamwizard.cpp:1070
 #, fuzzy
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
@@ -1160,12 +1161,12 @@ msgstr ""
 "ku i Ibikoresho Muyunguruzi ku iyi na , ya:  Urugero: , Himura Ubutumwa Kuri A "
 "Bidasanzwe Ububiko... . "
 
-#: antispamwizard.cpp:1072
+#: antispamwizard.cpp:1076
 #, fuzzy
 msgid "Move detected viral messages to the selected folder"
 msgstr "Ubutumwa Kuri i Byahiswemo Ububiko... "
 
-#: antispamwizard.cpp:1074
+#: antispamwizard.cpp:1078
 #, fuzzy
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
@@ -1176,12 +1177,12 @@ msgstr ""
 "Ubutumwa A Ububiko... ni Byaremwe . Mburabuzi Ububiko... ni i Agatebo "
 "njyamwanda Ububiko... , Gicurasi Guhindura... in i Ububiko... Reba . "
 
-#: antispamwizard.cpp:1080
+#: antispamwizard.cpp:1084
 #, fuzzy
 msgid "Additionally, mark detected viral messages as read"
 msgstr ", Ikimenyetso Ubutumwa Nka Soma "
 
-#: antispamwizard.cpp:1083
+#: antispamwizard.cpp:1087
 #, fuzzy
 msgid ""
 "Mark messages which have been classified as virus-infected as read, as well as "
@@ -1190,7 +1191,161 @@ msgstr ""
 "Ubutumwa Bitondetswe Nka - Nka Soma , Nka Nka Kwimura Kuri i Byahiswemo "
 "Ububiko... . "
 
-#: 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 "Idosiye nshya"
+
+#: archivefolderdialog.cpp:70 importarchivedialog.cpp:54
+#, fuzzy
+msgid "&Folder:"
+msgstr "Ububiko"
+
+#: archivefolderdialog.cpp:80
+#, fuzzy
+msgid "F&ormat:"
+msgstr "Bisanzwe"
+
+#: 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 "Kugerekaho Idosiye"
+
+#: archivefolderdialog.cpp:111
+#, fuzzy
+msgid "&Delete folders after completion"
+msgstr "Ububiko Kuva: Seriveri: "
+
+#: archivefolderdialog.cpp:161
+#, fuzzy
+msgid "Please select the folder that should be archived."
+msgstr "i public Urufunguzo . "
+
+#: archivefolderdialog.cpp:162
+#, fuzzy
+msgid "No folder selected"
+msgstr "Nta wutanga watoranyijwe."
+
+#: 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 "Kuri Kurema Ububiko... "
+
+#: backupjob.cpp:153
+#, fuzzy
+msgid "Archiving failed."
+msgstr "Byanze . "
+
+#: 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 &Ubutumwa %n Ubutumwa "
+
+#: 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 "OYA &Ongera &Ubutumwa Kuri Ububiko... : "
+
+#: backupjob.cpp:251
+#, fuzzy
+msgid "Internal error while trying to retrieve a message from folder '%1'."
+msgstr "Ikosa Kuri Guhindura izina Ububiko... %1 "
+
+#: backupjob.cpp:321
+#, fuzzy
+msgid "Failed to write a message into the archive folder '%1'."
+msgstr "Ubutumwa Kuri i Byahiswemo Ububiko... "
+
+#: backupjob.cpp:360
+#, fuzzy
+msgid "Downloading a message in folder '%1' failed."
+msgstr "ki/bishaje Ubutumwa Kuva: Ububiko... %1 Byanze . "
+
+#: backupjob.cpp:362
+#, fuzzy
+msgid "Downloading a message in the current folder failed."
+msgstr "Byose Igikorwa in i KIGEZWEHO Ububiko... "
+
+#: backupjob.cpp:391
+#, fuzzy, c-format
+msgid "Archiving folder %1"
+msgstr "Ububiko "
+
+#: backupjob.cpp:393 importjob.cpp:210
+#, fuzzy
+msgid "Unable to open folder '%1'."
+msgstr "Ububiko... ' %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 "Kuri Gusuzuma: : Urufunguzo Ibuze . "
+
+#: backupjob.cpp:489
+#, fuzzy
+msgid "Archiving"
+msgstr "Akira"
+
+#: cachedimapjob.cpp:220 cachedimapjob.cpp:271 cachedimapjob.cpp:886
 #, fuzzy
 msgid "Error while deleting messages on the server: "
 msgstr "Ikosa Gusiba Ubutumwa ku i Seriveri: : "
@@ -1200,17 +1355,17 @@ msgstr "Ikosa Gusiba Ubutumwa ku i Seriveri: : "
 msgid "Error while retrieving message on the server: "
 msgstr "Ikosa &Ubutumwa ku i Seriveri: : "
 
-#: cachedimapjob.cpp:538
+#: cachedimapjob.cpp:541
 #, fuzzy
 msgid "Error while uploading folder"
 msgstr "Ikosa Koherezayo %1 Ububiko... "
 
-#: cachedimapjob.cpp:539
+#: cachedimapjob.cpp:542
 #, fuzzy
 msgid "Could not make the folder <b>%1</b> on the server."
 msgstr "OYA Ubwoko i Ububiko... <b> %1 </b> ku i Seriveri: . "
 
-#: cachedimapjob.cpp:540
+#: cachedimapjob.cpp:543
 #, fuzzy
 msgid ""
 "This could be because you do not have permission to do this, or because the "
@@ -1220,31 +1375,80 @@ msgstr ""
 "OYA Kuri iyi , Cyangwa i Ububiko... ni ku i Seriveri: ; i Ikosa &Ubutumwa Kuva: "
 "i Seriveri: Itumanaho ni : "
 
-#: cachedimapjob.cpp:626
+#: cachedimapjob.cpp:629
 #, fuzzy
 msgid "Error while deleting folder %1 on the server: "
 msgstr "Ikosa Gusiba Ububiko... %1 ku i Seriveri: : "
 
-#: cachedimapjob.cpp:679
+#: cachedimapjob.cpp:682
 #, fuzzy
 msgid "Error while reading folder %1 on the server: "
 msgstr "Ikosa Ububiko... %1 ku i Seriveri: : "
 
-#: 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
 #, fuzzy, c-format
 msgid "Error while trying to rename folder %1"
 msgstr "Ikosa Kuri Guhindura izina Ububiko... %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 "Bitabonerana"
+
+#: callback.cpp:97
+#, fuzzy, c-format
+msgid "Declined: %1"
+msgstr "Umurongo:%S"
+
+#: callback.cpp:99
+#, c-format
+msgid "Tentative: %1"
+msgstr ""
+
+#: callback.cpp:101
+#, fuzzy, c-format
+msgid "Accepted: %1"
+msgstr "Umugereka"
+
+#: callback.cpp:103
+#, fuzzy, c-format
+msgid "Delegated: %1"
+msgstr "Byasibwe"
+
+#: 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> Bya BIHUYE i Mwakirizi Bya iyi &Ubutumwa , "
 "<br> Hitamo... Bya i Amaderesi ni : "
 
-#: callback.cpp:176
+#: callback.cpp:222
 #, fuzzy
 msgid ""
 "<qt>Several of your identities match the receiver of this message,"
@@ -1253,7 +1457,7 @@ msgstr ""
 "<qt> Bya BIHUYE i Mwakirizi Bya iyi &Ubutumwa , "
 "<br> Hitamo... Bya i Amaderesi ni : "
 
-#: callback.cpp:183
+#: callback.cpp:233
 #, fuzzy
 msgid "Select Address"
 msgstr "Hitamo aderesi"
@@ -1283,7 +1487,7 @@ msgstr "Byashobotse kwimura musomyi"
 msgid "Error occurred while compacting \"%1\". Compaction aborted."
 msgstr "Ikosa \" %1 \" . Byahagaritswe . "
 
-#: configuredialog.cpp:155
+#: configuredialog.cpp:156
 #, fuzzy
 msgid ""
 "<qt>"
@@ -1294,165 +1498,165 @@ msgstr ""
 "<p> Igenamiterere BIHAMYE ku umuyobozi/uyobora . </p> "
 "<p> iyi ni Ikosa , Umuntu . </p> "
 
-#: configuredialog.cpp:217
+#: configuredialog.cpp:218
 #, fuzzy
 msgid "&Load Profile..."
 msgstr "Ibijyana Bishya..."
 
-#: configuredialog.cpp:305 simplestringlisteditor.cpp:85
+#: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "Ongeraho"
 
-#: 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 "&Guhindura..."
 
-#: configuredialog.cpp:307
+#: configuredialog.cpp:310
 msgid "&Rename"
 msgstr "Guhindura izina"
 
-#: configuredialog.cpp:308 configuredialog.cpp:3115 configuredialog.cpp:3164
+#: configuredialog.cpp:311 configuredialog.cpp:3228 configuredialog.cpp:3277
 msgid "Remo&ve"
 msgstr "Gukuraho"
 
-#: configuredialog.cpp:309
+#: configuredialog.cpp:312
 msgid "Set as &Default"
 msgstr "Bijye byizana"
 
-#: configuredialog.cpp:450
+#: configuredialog.cpp:453
 #, fuzzy
 msgid "<qt>Do you really want to remove the identity named <b>%1</b>?</qt>"
 msgstr "<qt> Kuri Gukuraho i Ikiranga &Cyitwa: <b> %1 </b> ? </qt> "
 
-#: configuredialog.cpp:452
+#: configuredialog.cpp:455
 #, fuzzy
 msgid "Remove Identity"
 msgstr "Vanaho Umwinjizo"
 
-#: configuredialog.cpp:493 configuredialog.cpp:3114
+#: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "Ongera..."
 
-#: configuredialog.cpp:495 configuredialog.cpp:3116
+#: configuredialog.cpp:498 configuredialog.cpp:3229
 msgid "Modify..."
 msgstr "Guhindura..."
 
-#: configuredialog.cpp:499
+#: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "Shyiraho nka Mburabuzi."
 
-#: configuredialog.cpp:562
+#: configuredialog.cpp:565
 #, fuzzy
 msgid "&Receiving"
 msgstr "Akira"
 
-#: configuredialog.cpp:570
+#: configuredialog.cpp:573
 #, fuzzy
 msgid "&Sending"
 msgstr "ikijyejuru"
 
-#: configuredialog.cpp:595
+#: configuredialog.cpp:598
 #, fuzzy
 msgid "Outgoing accounts (add at least one):"
 msgstr "Konti ( &Ongera Ku Rimwe ) : "
 
-#. 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 "Izina"
 
-#. 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 "Ubwoko"
 
-#: 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
 #, fuzzy
 msgid "A&dd..."
 msgstr "Ongeraho"
 
-#: configuredialog.cpp:633 configuredialog.cpp:1104
+#: configuredialog.cpp:636 configuredialog.cpp:1110
 msgid "R&emove"
 msgstr "Vanaho"
 
-#: configuredialog.cpp:640
+#: configuredialog.cpp:643
 #, fuzzy
 msgid "Set Default"
 msgstr "Shyiraho mburabuzi"
 
-#: configuredialog.cpp:650
+#: configuredialog.cpp:653
 #, fuzzy
 msgid "Common Options"
 msgstr "Uburyo bwo Guteranya"
 
-#. i18n: file kmail.kcfg line 382
-#: configuredialog.cpp:658 rc.cpp:788
+#. i18n: file kmail.kcfg line 412
+#: configuredialog.cpp:661 rc.cpp:813
 #, fuzzy, no-c-format
 msgid "Confirm &before send"
 msgstr "Mbere Kohereza "
 
-#: configuredialog.cpp:666
+#: configuredialog.cpp:669
 #, fuzzy
 msgid "Never Automatically"
 msgstr "Kwisubiza inyuma"
 
-#: configuredialog.cpp:667
+#: configuredialog.cpp:670
 #, fuzzy
 msgid "On Manual Mail Checks"
 msgstr "Amataruka y'ipaji akorwa"
 
-#: configuredialog.cpp:668
+#: configuredialog.cpp:671
 #, fuzzy
 msgid "On All Mail Checks"
 msgstr "Ku Biro Byose"
 
-#: configuredialog.cpp:676
+#: configuredialog.cpp:679
 #, fuzzy
 msgid "Send Now"
 msgstr "Hohereza nonaha"
 
-#: configuredialog.cpp:677
+#: configuredialog.cpp:680
 #, fuzzy
 msgid "Send Later"
 msgstr "Hohereza nyuma"
 
-#: configuredialog.cpp:687
+#: configuredialog.cpp:690
 #, fuzzy
 msgid "Allow 8-bit"
 msgstr "8 - "
 
-#: configuredialog.cpp:688
+#: configuredialog.cpp:691
 msgid "MIME Compliant (Quoted Printable)"
 msgstr ""
 
-#: configuredialog.cpp:701
+#: configuredialog.cpp:704
 #, fuzzy
 msgid "Send &messages in outbox folder:"
 msgstr "Ubutumwa in Ibyasohotse Ububiko... : "
 
-#: configuredialog.cpp:709
+#: configuredialog.cpp:712
 #, fuzzy
 msgid "Defa&ult send method:"
 msgstr "Kohereza Uburyo : "
 
-#: configuredialog.cpp:711
+#: configuredialog.cpp:714
 #, fuzzy
 msgid "Message &property:"
 msgstr "Indangakintu: : "
 
-#: configuredialog.cpp:713
+#: configuredialog.cpp:716
 #, fuzzy
 msgid "Defaul&t domain:"
 msgstr "Urubuga: : "
 
-#: configuredialog.cpp:717
+#: configuredialog.cpp:720
 #, fuzzy
 msgid ""
 "<qt>"
@@ -1463,29 +1667,29 @@ msgstr ""
 "<p> Mburabuzi Urubuga: ni Byakoreshejwe Kuri Byuzuye Imeli Amaderesi Bya i "
 "Izina: . </p> "
 
-#: configuredialog.cpp:741
+#: configuredialog.cpp:744
 #, fuzzy
 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
 #, fuzzy
 msgid "smtp (Default)"
 msgstr "(Mburabuzi)"
 
-#: configuredialog.cpp:768 configuredialog.cpp:945 configuredialog.cpp:993
+#: configuredialog.cpp:771 configuredialog.cpp:952 configuredialog.cpp:999
 #, fuzzy
 msgid "sendmail (Default)"
 msgstr "Koresha nka mburabuzi"
 
-#: configuredialog.cpp:799 kmtransport.cpp:248
+#: configuredialog.cpp:801 kmtransport.cpp:248
 #, fuzzy
 msgid "Add Transport"
 msgstr "Bibonerana"
 
-#: configuredialog.cpp:830
+#: configuredialog.cpp:832
 #, fuzzy
 msgid ""
 "_: %1: type of transport. Result used in Configure->Accounts->"
@@ -1494,12 +1698,12 @@ msgid ""
 "%1 (Default)"
 msgstr "%1(Mburabuzi)"
 
-#: configuredialog.cpp:854
+#: configuredialog.cpp:856
 #, fuzzy
 msgid "Modify Transport"
 msgstr "Guhindura igihe hagati y'amabyinisha"
 
-#: configuredialog.cpp:890
+#: configuredialog.cpp:892
 #, fuzzy, c-format
 msgid ""
 "_n: This identity has been changed to use the modified transport:\n"
@@ -1508,7 +1712,7 @@ msgstr ""
 "Ikiranga Byahinduwe Kuri Koresha i Mburabuzi : \n"
 "%n Byahinduwe Kuri Koresha i Mburabuzi : "
 
-#: configuredialog.cpp:921
+#: configuredialog.cpp:927
 #, fuzzy, c-format
 msgid ""
 "_n: This identity has been changed to use the default transport:\n"
@@ -1517,437 +1721,427 @@ msgstr ""
 "Ikiranga Byahinduwe Kuri Koresha i Mburabuzi : \n"
 "%n Byahinduwe Kuri Koresha i Mburabuzi : "
 
-#: configuredialog.cpp:1066
+#: configuredialog.cpp:1072
 #, fuzzy
 msgid "Incoming accounts (add at least one):"
 msgstr "Konti ( &Ongera Ku Rimwe ) : "
 
-#: 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 "Ububiko"
 
-#: configuredialog.cpp:1112
+#: configuredialog.cpp:1118
 #, fuzzy
 msgid "Chec&k mail on startup"
 msgstr "Ibaruwa ku Gutangira  "
 
-#: configuredialog.cpp:1118
+#: configuredialog.cpp:1124
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Name=Imenyesha"
 
-#: configuredialog.cpp:1123
+#: configuredialog.cpp:1129
 #, fuzzy
 msgid "&Beep"
 msgstr "Kugumishaho"
 
-#: configuredialog.cpp:1131
+#: configuredialog.cpp:1137
 #, fuzzy
 msgid "Deta&iled new mail notification"
 msgstr "Gishya Ibaruwa Ikimenyetso "
 
-#: configuredialog.cpp:1135
+#: configuredialog.cpp:1141
 #, fuzzy
 msgid "Show for each folder the number of newly arrived messages"
 msgstr "ya:  Ububiko... i Umubare Bya Ubutumwa "
 
-#: configuredialog.cpp:1143
+#: configuredialog.cpp:1149
 #, fuzzy
 msgid "Other Actio&ns"
 msgstr "akandi kamanyatso"
 
-#: configuredialog.cpp:1221
+#: configuredialog.cpp:1227
 #, fuzzy
 msgid "Unknown account type selected"
 msgstr "Konti: Ubwoko: Byahiswemo "
 
-#: configuredialog.cpp:1230
+#: configuredialog.cpp:1236
 #, fuzzy
 msgid "Unable to create account"
 msgstr "Kuri Kurema Konti: "
 
-#: configuredialog.cpp:1236 kmacctseldlg.cpp:36
+#: configuredialog.cpp:1242 kmacctseldlg.cpp:36
 #, fuzzy
 msgid "Add Account"
 msgstr "Ongera konti..."
 
-#: configuredialog.cpp:1288
+#: configuredialog.cpp:1294
 #, fuzzy
 msgid "Unable to locate account"
 msgstr "Kuri Konti: "
 
-#: configuredialog.cpp:1315
+#: configuredialog.cpp:1321
 #, fuzzy
 msgid "Modify Account"
 msgstr "hindura imigaragarire"
 
-#: configuredialog.cpp:1360 configuredialog.cpp:1440
+#: configuredialog.cpp:1366 configuredialog.cpp:1446
 #, fuzzy
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt> Kuri Konti: <b> %1 </b> . </qt> "
 
-#: configuredialog.cpp:1491
+#: configuredialog.cpp:1497
 #, fuzzy
 msgid "Color&s"
 msgstr "Amabara"
 
-#: configuredialog.cpp:1497
+#: configuredialog.cpp:1503
 #, fuzzy
 msgid "La&yout"
 msgstr "Imigaragarire"
 
-#: configuredialog.cpp:1503
+#: configuredialog.cpp:1509
 #, fuzzy
 msgid "M&essage List"
 msgstr "ubutumwa"
 
-#: configuredialog.cpp:1509
+#: configuredialog.cpp:1515
 #, fuzzy
 msgid "Message W&indow"
 msgstr "Amadirishya y'Ubutumwa"
 
-#: configuredialog.cpp:1515
+#: configuredialog.cpp:1521
 #, fuzzy
 msgid "System &Tray"
 msgstr "Name=Igitwara cya Sisitemu"
 
-#: configuredialog.cpp:1531
+#: configuredialog.cpp:1537
 #, fuzzy
 msgid "Message Body"
 msgstr "Umubiri w'ubutumwa nka"
 
-#: configuredialog.cpp:1532
+#: configuredialog.cpp:1538
 #, fuzzy
 msgid "Message List"
 msgstr "ubutumwa"
 
-#: configuredialog.cpp:1533
+#: configuredialog.cpp:1539
 #, fuzzy
 msgid "Message List - New Messages"
 msgstr "Kubona Ubutumwa bushya"
 
-#: configuredialog.cpp:1534
+#: configuredialog.cpp:1540
 #, fuzzy
 msgid "Message List - Unread Messages"
 msgstr "Ubutumwa Butasomwe Bukurikira"
 
-#: configuredialog.cpp:1535
+#: configuredialog.cpp:1541
 msgid "Message List - Important Messages"
 msgstr ""
 
-#: configuredialog.cpp:1536
+#: configuredialog.cpp:1542
 #, fuzzy
 msgid "Message List - Todo Messages"
 msgstr "Ubutumwa bwashizweho umukono"
 
-#: configuredialog.cpp:1537
+#: configuredialog.cpp:1543
 #, fuzzy
 msgid "Message List - Date Field"
 msgstr "Gusimbuza n'Umwanya Byatanzwe"
 
-#: configuredialog.cpp:1538 configuredialog.cpp:1859
+#: configuredialog.cpp:1544 configuredialog.cpp:1868
 #, fuzzy
 msgid "Folder List"
 msgstr "Ububiko Mbere"
 
-#: configuredialog.cpp:1539 configuredialog.cpp:1702
+#: configuredialog.cpp:1545 configuredialog.cpp:1708
 #, fuzzy
 msgid "Quoted Text - First Level"
 msgstr "Urwego rwa mbere"
 
-#: configuredialog.cpp:1540 configuredialog.cpp:1703
+#: configuredialog.cpp:1546 configuredialog.cpp:1709
 #, fuzzy
 msgid "Quoted Text - Second Level"
 msgstr "UmwandikoNyamwiyandika- Icyiciro"
 
-#: configuredialog.cpp:1541 configuredialog.cpp:1704
+#: configuredialog.cpp:1547 configuredialog.cpp:1710
 msgid "Quoted Text - Third Level"
 msgstr ""
 
-#: configuredialog.cpp:1542
+#: configuredialog.cpp:1548
 #, fuzzy
 msgid "Fixed Width Font"
 msgstr "Ubugari bw'imyandikire budahinduka"
 
-#: configuredialog.cpp:1543 kmcomposewin.cpp:356
+#: configuredialog.cpp:1549 kmcomposewin.cpp:386
 msgid "Composer"
 msgstr "Umuhimbyi"
 
-#: configuredialog.cpp:1544
+#: configuredialog.cpp:1550
 #, fuzzy
 msgid "Printing Output"
 msgstr "Ubwiza bw'Icapa"
 
-#: configuredialog.cpp:1559
+#: configuredialog.cpp:1565
 #, fuzzy
 msgid "&Use custom fonts"
 msgstr "Guhanga Imyandikire: "
 
-#: configuredialog.cpp:1575
+#: configuredialog.cpp:1581
 #, fuzzy
 msgid "Apply &to:"
 msgstr "Gukoresha ku"
 
-#: configuredialog.cpp:1699
+#: configuredialog.cpp:1705
 #, fuzzy
 msgid "Composer Background"
 msgstr "Ku mbuganyuma"
 
-#: configuredialog.cpp:1700
+#: configuredialog.cpp:1706
 #, fuzzy
 msgid "Alternative Background Color"
 msgstr "Ibara y'imbuganyuma y'ipaji"
 
-#: configuredialog.cpp:1701
+#: configuredialog.cpp:1707
 msgid "Normal Text"
 msgstr "Umwandiko usanzwe"
 
-#: configuredialog.cpp:1705
+#: configuredialog.cpp:1711
 msgid "Link"
 msgstr "Ihuza"
 
-#: configuredialog.cpp:1706
+#: configuredialog.cpp:1712
 msgid "Followed Link"
 msgstr "Ihuza Rikurikiwe"
 
-#: configuredialog.cpp:1707
+#: configuredialog.cpp:1713
 #, fuzzy
 msgid "Misspelled Words"
 msgstr "Amagambo yanditswe nabi:"
 
 #. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1708 rc.cpp:444
+#: configuredialog.cpp:1714 rc.cpp:450
 #, fuzzy, no-c-format
 msgid "New Message"
 msgstr "Ubutumwa Bushya..."
 
-#: configuredialog.cpp:1709
+#: configuredialog.cpp:1715
 #, fuzzy
 msgid "Unread Message"
 msgstr "Ubutumwa Butasomwe Bukurikira"
 
-#: configuredialog.cpp:1710
+#: configuredialog.cpp:1716
 #, fuzzy
 msgid "Important Message"
 msgstr "Ubutumwa bugera ako kanya"
 
-#: configuredialog.cpp:1711
+#: configuredialog.cpp:1717
 #, fuzzy
 msgid "Todo Message"
 msgstr "Kohereza Ubutumwa"
 
-#: configuredialog.cpp:1712
+#: configuredialog.cpp:1718
 #, fuzzy
 msgid "OpenPGP Message - Encrypted"
 msgstr "Ubutumwa buriho umutekano"
 
-#: configuredialog.cpp:1713
+#: configuredialog.cpp:1719
 #, fuzzy
 msgid "OpenPGP Message - Valid Signature with Trusted Key"
 msgstr "- Na: "
 
-#: configuredialog.cpp:1714
+#: configuredialog.cpp:1720
 #, fuzzy
 msgid "OpenPGP Message - Valid Signature with Untrusted Key"
 msgstr "- Na: "
 
-#: configuredialog.cpp:1715
+#: configuredialog.cpp:1721
 msgid "OpenPGP Message - Unchecked Signature"
 msgstr ""
 
-#: configuredialog.cpp:1716
+#: configuredialog.cpp:1722
 #, fuzzy
 msgid "OpenPGP Message - Bad Signature"
 msgstr "Ubutumwa budafite umukono mu buryo b'wikorana buhanga"
 
-#: configuredialog.cpp:1717
+#: configuredialog.cpp:1723
 msgid "Border Around Warning Prepending HTML Messages"
 msgstr ""
 
-#: configuredialog.cpp:1718
+#: configuredialog.cpp:1724
 msgid "Folder Name and Size When Close to Quota"
 msgstr ""
 
-#: configuredialog.cpp:1719
+#: configuredialog.cpp:1725
 msgid "HTML Status Bar Background - No HTML Message"
 msgstr ""
 
-#: configuredialog.cpp:1720
+#: configuredialog.cpp:1726
 msgid "HTML Status Bar Foreground - No HTML Message"
 msgstr ""
 
-#: configuredialog.cpp:1721
+#: configuredialog.cpp:1727
 msgid "HTML Status Bar Background - HTML Message"
 msgstr ""
 
-#: configuredialog.cpp:1722
+#: configuredialog.cpp:1728
 msgid "HTML Status Bar Foreground - HTML Message"
 msgstr ""
 
-#: configuredialog.cpp:1734
+#: configuredialog.cpp:1740
 #, fuzzy
 msgid "&Use custom colors"
 msgstr "Koresha amabara anoze:"
 
-#: configuredialog.cpp:1749
+#: configuredialog.cpp:1755
 #, fuzzy
 msgid "Recycle colors on deep &quoting"
 msgstr "Amabara ku Njyakuzimu "
 
-#: configuredialog.cpp:1757
+#: configuredialog.cpp:1763
 msgid "Close to quota threshold"
 msgstr ""
 
-#: configuredialog.cpp:1763
+#: configuredialog.cpp:1770
 #, c-format
 msgid "%"
 msgstr ""
 
-#: configuredialog.cpp:1855
+#: configuredialog.cpp:1864
 #, fuzzy
 msgid "Lon&g folder list"
 msgstr "Ububiko... Urutonde "
 
-#: configuredialog.cpp:1856
+#: configuredialog.cpp:1865
 #, fuzzy
 msgid "Shor&t folder list"
 msgstr "Ububiko... Urutonde "
 
-#: configuredialog.cpp:1865
+#: configuredialog.cpp:1874
 #, fuzzy
 msgid "Abo&ve the message pane"
 msgstr "i &Ubutumwa "
 
-#: configuredialog.cpp:1866
+#: configuredialog.cpp:1875
 #, fuzzy
 msgid "&Below the message pane"
 msgstr "i &Ubutumwa "
 
-#: configuredialog.cpp:1869
+#: configuredialog.cpp:1878
 msgid "Message Structure Viewer Placement"
 msgstr ""
 
-#: configuredialog.cpp:1874
+#: configuredialog.cpp:1883
 #, fuzzy
 msgid "Show &never"
 msgstr "Nta na rimwe "
 
-#: configuredialog.cpp:1875
+#: configuredialog.cpp:1884
 #, fuzzy
 msgid "Show only for non-plaintext &messages"
 msgstr "ya:  - plaintext Ubutumwa "
 
-#: configuredialog.cpp:1876
+#: configuredialog.cpp:1885
 #, fuzzy
 msgid "Show alway&s"
 msgstr "Erekana Burigihe"
 
-#: configuredialog.cpp:1879
+#: configuredialog.cpp:1888
 #, fuzzy
 msgid "Message Structure Viewer"
 msgstr "Ubutumwa bw'umutekano"
 
-#: configuredialog.cpp:1885
+#: configuredialog.cpp:1894
 #, fuzzy
 msgid "&Do not show a message preview pane"
 msgstr "OYA Herekana %S A &Ubutumwa Ibibanjirije "
 
-#: configuredialog.cpp:1886
+#: configuredialog.cpp:1895
 #, fuzzy
 msgid "Show the message preview pane belo&w the message list"
 msgstr "i &Ubutumwa Ibibanjirije munsi i &Ubutumwa Urutonde "
 
-#: configuredialog.cpp:1887
+#: configuredialog.cpp:1896
 #, fuzzy
 msgid "Show the message preview pane ne&xt to the message list"
 msgstr "i &Ubutumwa Ibibanjirije Ibikurikira > Kuri i &Ubutumwa Urutonde "
 
-#: configuredialog.cpp:1890
+#: configuredialog.cpp:1899
 #, fuzzy
 msgid "Message Preview Pane"
 msgstr "Izina ry'igaragaza ry'ubutumwa:"
 
-#: configuredialog.cpp:1908
+#: configuredialog.cpp:1917
 #, fuzzy
 msgid "Show favorite folder view"
 msgstr "Ububiko... Urutonde "
 
-#: configuredialog.cpp:1912
-#, fuzzy
-msgid "Show folder quick search field"
-msgstr "Shakisha Umurongo: Kwandika "
-
-#: configuredialog.cpp:1983
+#: configuredialog.cpp:1986
 #, fuzzy
 msgid "Sta&ndard format (%1)"
 msgstr "Standard Imiterere ( %1 ) "
 
-#: configuredialog.cpp:1984
+#: configuredialog.cpp:1987
 #, fuzzy
 msgid "Locali&zed format (%1)"
 msgstr "Imiterere ( %1 ) "
 
-#: configuredialog.cpp:1985
+#: configuredialog.cpp:1988
 #, fuzzy
 msgid "Fancy for&mat (%1)"
 msgstr "Imiterere ( %1 ) "
 
-#: configuredialog.cpp:1986
+#: configuredialog.cpp:1989
 #, fuzzy
 msgid "C&ustom format (Shift+F1 for help):"
 msgstr "Kunozaidosiyeya Imiterere ( + ya:  Ifashayobora ) : "
 
-#: configuredialog.cpp:2003
+#: configuredialog.cpp:2006
 msgid "General Options"
 msgstr "Amahitamo Rusange"
 
-#: configuredialog.cpp:2006
-#, fuzzy
-msgid "Show Quick Search"
-msgstr "Gusubizaho Ishakisha Ryihuta"
-
-#: configuredialog.cpp:2008
+#: configuredialog.cpp:2009
 #, fuzzy
 msgid "Display messa&ge sizes"
 msgstr "&Ubutumwa Ingano "
 
-#: configuredialog.cpp:2010
+#: configuredialog.cpp:2011
 #, fuzzy
 msgid "Show crypto &icons"
 msgstr "Udushushondanga "
 
-#: configuredialog.cpp:2012
+#: configuredialog.cpp:2013
 #, fuzzy
 msgid "Show attachment icon"
 msgstr "Umugereka Agashushondanga "
 
-#: configuredialog.cpp:2015
+#: configuredialog.cpp:2016
 #, fuzzy
 msgid "&Threaded message list"
 msgstr "&Ubutumwa Urutonde "
 
-#: configuredialog.cpp:2033
+#: configuredialog.cpp:2032
 #, fuzzy
 msgid "Threaded Message List Options"
 msgstr "Amahitamo y'UrupapuroRusesuye"
 
-#: configuredialog.cpp:2037
+#: configuredialog.cpp:2036
 #, fuzzy
 msgid "Always &keep threads open"
 msgstr "Gumana: Igikorwa Gufungura "
 
-#: configuredialog.cpp:2040
+#: configuredialog.cpp:2039
 #, fuzzy
 msgid "Threads default to o&pen"
 msgstr "Mburabuzi Kuri Gufungura "
 
-#: configuredialog.cpp:2043
+#: configuredialog.cpp:2042
 #, fuzzy
 msgid "Threads default to closed"
 msgstr "Mburabuzi Kuri "
 
-#: configuredialog.cpp:2046
+#: configuredialog.cpp:2045
 #, fuzzy
 msgid ""
 "Open threads that contain ne&w, unread or important messages and open watched "
@@ -1956,12 +2150,12 @@ msgstr ""
 "Gufungura Igikorwa Gishya , Bidasomye: %S Cyangwa By'ingirakamaro Ubutumwa na "
 "Gufungura Igikorwa . "
 
-#: configuredialog.cpp:2056
+#: configuredialog.cpp:2055
 #, fuzzy
 msgid "Date Display"
 msgstr "Gusiba Iyerekana"
 
-#: configuredialog.cpp:2073
+#: configuredialog.cpp:2072
 #, fuzzy
 msgid ""
 "<qt>"
@@ -2024,130 +2218,179 @@ msgstr ""
 "<li> - Igihe in Bikurikije umubare Ifishi %S: ( - ) </li> </ul> "
 "<p> <strong> Ikindi Iyinjiza Inyuguti . </strong> </p> </qt> "
 
-#: configuredialog.cpp:2187
+#: configuredialog.cpp:2185
 #, fuzzy
 msgid ""
 "Changing the global threading setting will override all folder specific values."
 msgstr "i &Rusange Igenamiterere Byose Ububiko... Uduciro . "
 
-#: configuredialog.cpp:2224
+#: configuredialog.cpp:2221
+msgid "Close message window after replying or forwarding"
+msgstr ""
+
+#: configuredialog.cpp:2225
 #, fuzzy
 msgid "Show HTML stat&us bar"
 msgstr "Imimerere Umurongo "
 
-#: configuredialog.cpp:2228
+#: configuredialog.cpp:2229
 #, fuzzy
 msgid "Show s&pam status in fancy headers"
 msgstr "Imimerere in Imitwe "
 
-#. i18n: file kmail.kcfg line 541
-#: configuredialog.cpp:2232 rc.cpp:856
+#. i18n: file kmail.kcfg line 583
+#: configuredialog.cpp:2233 rc.cpp:890
 #, fuzzy, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr "ku Amarangamutima "
 
-#: configuredialog.cpp:2236
+#: configuredialog.cpp:2237
 #, fuzzy
 msgid "Use smaller font for quoted text"
 msgstr "Gitoya Imyandikire ya:  Umwandiko "
 
-#. i18n: file kmail.kcfg line 546
-#: configuredialog.cpp:2240 rc.cpp:862
+#. i18n: file kmail.kcfg line 588
+#: configuredialog.cpp:2241 rc.cpp:896
 #, fuzzy, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr "Kwagura /Gusenyuka Gushyiraho akugarizo "
 
-#: 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
 #, fuzzy
 msgid "Fallback ch&aracter encoding:"
 msgstr "Inyuguti: Imisobekere: : "
 
-#: configuredialog.cpp:2325 configuredialog.cpp:2382 kmreaderwin.cpp:650
+#: configuredialog.cpp:2338 configuredialog.cpp:2400 kmreaderwin.cpp:584
 msgid "Auto"
 msgstr "mwi-/nyamwi-"
 
-#: configuredialog.cpp:2336
+#: configuredialog.cpp:2349
 #, fuzzy
 msgid "&Override character encoding:"
 msgstr "Inyuguti: Imisobekere: : "
 
-#. i18n: file kmail.kcfg line 103
-#: configuredialog.cpp:2462 rc.cpp:643
+#. i18n: file kmail.kcfg line 105
+#: configuredialog.cpp:2486 rc.cpp:649
 #, fuzzy, no-c-format
 msgid "Enable system tray icon"
 msgstr "Sisitemu Agasanduku Agashushondanga "
 
-#: configuredialog.cpp:2468
+#: configuredialog.cpp:2492
 #, fuzzy
 msgid "System Tray Mode"
 msgstr "Ububiko bwa sisitemu"
 
-#: configuredialog.cpp:2476
+#: configuredialog.cpp:2500
 #, fuzzy
 msgid "Always show KMail in system tray"
 msgstr "Herekana %S in Sisitemu Agasanduku "
 
-#: configuredialog.cpp:2479
+#: configuredialog.cpp:2503
 #, fuzzy
 msgid "Only show KMail in system tray if there are unread messages"
 msgstr "Herekana %S in Sisitemu Agasanduku NIBA Bidasomye: %S Ubutumwa "
 
-#: configuredialog.cpp:2539 identitydialog.cpp:384
+#: configuredialog.cpp:2563 identitydialog.cpp:408
 #, fuzzy
 msgid "&Templates"
 msgstr "Gusimbuza"
 
-#: configuredialog.cpp:2545
+#: configuredialog.cpp:2569
 #, fuzzy
 msgid "&Custom Templates"
 msgstr "Gusimbuza"
 
-#: configuredialog.cpp:2551
+#: configuredialog.cpp:2575
 msgid "&Subject"
 msgstr "Ikivugwaho"
 
-#: configuredialog.cpp:2558
+#: configuredialog.cpp:2582
 #, fuzzy
 msgid "Cha&rset"
 msgstr "KubonezaInyuguti:"
 
-#: configuredialog.cpp:2564
+#: configuredialog.cpp:2588
 #, fuzzy
 msgid "H&eaders"
 msgstr "Umutwe"
 
-#: configuredialog.cpp:2570
+#: configuredialog.cpp:2594
 msgid ""
 "_: Config->Composer->Attachments\n"
 "A&ttachments"
 msgstr ""
 
-#: 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
 #, fuzzy
 msgid "No autosave"
 msgstr "NyaMwishyingura "
 
-#: configuredialog.cpp:2661
+#: configuredialog.cpp:2741
+#, fuzzy
+msgid "Default Forwarding Type:"
+msgstr "Urubuga: : "
+
+#: configuredialog.cpp:2744
+#, fuzzy
+msgid "Inline"
+msgstr "Mumurongo"
+
+#: configuredialog.cpp:2745
+#, fuzzy
+msgid "As Attachment"
+msgstr "Ifite Imigereka"
+
+#: configuredialog.cpp:2753
 #, fuzzy
 msgid "Configure Completion Order"
 msgstr "Kuboneza seriveri yo gucapa"
 
-#: configuredialog.cpp:2669 kmlineeditspell.cpp:136
+#: configuredialog.cpp:2761 kmlineeditspell.cpp:159
 #, fuzzy
 msgid "Edit Recent Addresses..."
 msgstr "Aderesi ... "
 
-#: configuredialog.cpp:2676 kmedit.cpp:540
+#: configuredialog.cpp:2768 kmedit.cpp:633
 #, fuzzy
 msgid "External Editor"
 msgstr "Abahinduzi bo hanze"
 
-#: configuredialog.cpp:2707
+#: configuredialog.cpp:2799
 #, fuzzy, c-format
 msgid "<b>%f</b> will be replaced with the filename to edit."
 msgstr "<b> %f </b> Na: i Izina ry'idosiye: Kuri Kwandika . "
 
-#: configuredialog.cpp:2817
+#: configuredialog.cpp:2930
 #, fuzzy
 msgid ""
 "<qt>The following placeholders are supported in the reply phrases:"
@@ -2167,88 +2410,88 @@ msgstr ""
 "<br> <b> % % </b> : ku ijana Shyiraho Umukono , <b> % _ </b> : Umwanya , <b> "
 "%L </b> : </qt> "
 
-#: configuredialog.cpp:2830
+#: configuredialog.cpp:2943
 #, fuzzy
 msgid "Lang&uage:"
 msgstr "Ururimi:"
 
-#: configuredialog.cpp:2839 configuredialog.cpp:3087 configuredialog.cpp:3303
-#: configuredialog.cpp:3498
+#: configuredialog.cpp:2952 configuredialog.cpp:3200 configuredialog.cpp:3416
+#: configuredialog.cpp:3611
 #, fuzzy
 msgid "Re&move"
 msgstr "Gukuraho"
 
-#: configuredialog.cpp:2853
+#: configuredialog.cpp:2966
 #, fuzzy
 msgid "Reply to se&nder:"
 msgstr "Subiza Uwohereje"
 
-#: configuredialog.cpp:2861
+#: configuredialog.cpp:2974
 #, fuzzy
 msgid "Repl&y to all:"
 msgstr "Gusubiza Bose"
 
-#: configuredialog.cpp:2869
+#: configuredialog.cpp:2982
 #, fuzzy
 msgid "&Forward:"
 msgstr "Imbere"
 
 #. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2877 rc.cpp:459
+#: configuredialog.cpp:2990 rc.cpp:465
 #, fuzzy, no-c-format
 msgid "&Quote indicator:"
 msgstr "Ikiranga impugukirwa"
 
-#: configuredialog.cpp:2922 kmmessage.cpp:3960
+#: configuredialog.cpp:3035 kmmessage.cpp:4048
 msgid "On %D, you wrote:"
 msgstr ""
 
-#: configuredialog.cpp:2923 kmmessage.cpp:3962
+#: configuredialog.cpp:3036 kmmessage.cpp:4050
 msgid "On %D, %F wrote:"
 msgstr ""
 
-#: configuredialog.cpp:2924 kmmessage.cpp:3964
+#: configuredialog.cpp:3037 kmmessage.cpp:4052
 #, fuzzy
 msgid "Forwarded Message"
 msgstr "Kohereza Ubutumwa"
 
-#: configuredialog.cpp:2925
+#: configuredialog.cpp:3038
 #, fuzzy
 msgid ">%_"
 msgstr ">%_"
 
-#: configuredialog.cpp:3074
+#: configuredialog.cpp:3187
 #, fuzzy
 msgid "Repl&y Subject Prefixes"
 msgstr "Ibiranga umwanya"
 
-#: configuredialog.cpp:3078 configuredialog.cpp:3107
+#: configuredialog.cpp:3191 configuredialog.cpp:3220
 #, fuzzy
 msgid ""
 "Recognize any sequence of the following prefixes\n"
 "(entries are case-insensitive regular expressions):"
 msgstr "Icyo ari cyo cyose Bya i ( Ibyinjijwe - Ibisanzwe ) : "
 
-#: configuredialog.cpp:3088 configuredialog.cpp:3499
+#: configuredialog.cpp:3201 configuredialog.cpp:3612
 #, fuzzy
 msgid "Mod&ify..."
 msgstr "Guhindura..."
 
-#: configuredialog.cpp:3089
+#: configuredialog.cpp:3202
 #, fuzzy
 msgid "Enter new reply prefix:"
 msgstr "Gishya Subiza Imbanziriza : "
 
-#: configuredialog.cpp:3103
+#: configuredialog.cpp:3216
 msgid "For&ward Subject Prefixes"
 msgstr ""
 
-#: configuredialog.cpp:3117
+#: configuredialog.cpp:3230
 #, fuzzy
 msgid "Enter new forward prefix:"
 msgstr "Gishya Imbere Imbanziriza : "
 
-#: configuredialog.cpp:3156
+#: configuredialog.cpp:3269
 #, fuzzy
 msgid ""
 "This list is checked for every outgoing message from the top to the bottom for "
@@ -2257,98 +2500,98 @@ msgstr ""
 "Urutonde ni Ivivuwe ya:  buri &Ubutumwa Kuva: i Hejuru: Kuri i Hasi: ya:  A "
 "KubonezaInyuguti: ifite Byose Bya ngombwa Inyuguti . "
 
-#: configuredialog.cpp:3165
+#: configuredialog.cpp:3278
 #, fuzzy
 msgid "Enter charset:"
 msgstr "KubonezaInyuguti: : "
 
-#: configuredialog.cpp:3171
+#: configuredialog.cpp:3284
 #, fuzzy
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr "~Umwimerere KubonezaInyuguti: Ryari: Cyangwa ( NIBA ) "
 
-#: configuredialog.cpp:3205
+#: configuredialog.cpp:3318
 #, fuzzy
 msgid "This charset is not supported."
 msgstr "KubonezaInyuguti: ni OYA . "
 
-#: configuredialog.cpp:3256
+#: configuredialog.cpp:3369
 #, fuzzy
 msgid "&Use custom message-id suffix"
 msgstr "Guhanga &Ubutumwa - ID Ingereka "
 
-#: configuredialog.cpp:3269
+#: configuredialog.cpp:3382
 #, fuzzy
 msgid "Custom message-&id suffix:"
 msgstr "Kunozaidosiyeya &Ubutumwa - ID Ingereka : "
 
-#: configuredialog.cpp:3283
+#: configuredialog.cpp:3396
 #, fuzzy
 msgid "Define custom mime header fields:"
 msgstr "Guhanga Umutwe Amashami: : "
 
-#: configuredialog.cpp:3291
+#: configuredialog.cpp:3404
 msgid "Value"
 msgstr "Agaciro"
 
-#: configuredialog.cpp:3299
+#: configuredialog.cpp:3412
 msgid "Ne&w"
 msgstr "Bishya"
 
 #. 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 "Izina:"
 
-#: configuredialog.cpp:3321
+#: configuredialog.cpp:3434
 msgid "&Value:"
 msgstr "Agaciro:"
 
-#. i18n: file kmail.kcfg line 359
-#: configuredialog.cpp:3468 rc.cpp:782
+#. i18n: file kmail.kcfg line 389
+#: configuredialog.cpp:3581 rc.cpp:807
 #, fuzzy, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr "- Umugereka "
 
-#: configuredialog.cpp:3471
+#: configuredialog.cpp:3584
 #, fuzzy
 msgid ""
 "Turn this option on to make Outlook(tm) understand attachment names containing "
 "non-English characters"
 msgstr "iyi Ihitamo ku Kuri Ubwoko ( ) Umugereka Amazina - Inyuguti "
 
-#: configuredialog.cpp:3482
+#: configuredialog.cpp:3595
 #, fuzzy
 msgid "E&nable detection of missing attachments"
 msgstr "Bya Ibuze Imigereka: "
 
-#: configuredialog.cpp:3489
+#: configuredialog.cpp:3602
 #, fuzzy
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr ""
 "Icyo ari cyo cyose Bya i Urufunguzo Amagambo Nka Kuri Kugerekaho A Idosiye : "
 
-#: configuredialog.cpp:3500
+#: configuredialog.cpp:3613
 #, fuzzy
 msgid "Enter new key word:"
 msgstr "Gishya Urufunguzo ijambo : "
 
-#: configuredialog.cpp:3521 configuredialog.cpp:3522 kmcomposewin.cpp:2232
-#: kmcomposewin.cpp:2233
+#: configuredialog.cpp:3634 configuredialog.cpp:3635 kmcomposewin.cpp:2297
+#: kmcomposewin.cpp:2298
 #, fuzzy
 msgid "attachment"
 msgstr "Umugereka"
 
-#: configuredialog.cpp:3523 configuredialog.cpp:3524 kmcomposewin.cpp:2234
-#: kmcomposewin.cpp:2235
+#: configuredialog.cpp:3636 configuredialog.cpp:3637 kmcomposewin.cpp:2299
+#: kmcomposewin.cpp:2300
 #, fuzzy
 msgid "attached"
 msgstr "gereka"
 
-#: configuredialog.cpp:3542
+#: configuredialog.cpp:3655
 #, fuzzy
 msgid ""
 "You have chosen to encode attachment names containing non-English characters in "
@@ -2364,31 +2607,31 @@ msgstr ""
 "icyitonderwa Gicurasi Kurema - Bisanzwe Ubutumwa , na ni Ubutumwa OYA ku "
 "Bisanzwe - Ibaruwa ; , Oya Ikindi , OYA Gushoboza iyi Ihitamo . "
 
-#: configuredialog.cpp:3569
+#: configuredialog.cpp:3682
 #, fuzzy
 msgid "&Reading"
 msgstr "Umutwempangano"
 
-#: configuredialog.cpp:3575
+#: configuredialog.cpp:3688
 #, fuzzy
 msgid "Composing"
 msgstr "ibirindiro"
 
-#: configuredialog.cpp:3581
+#: configuredialog.cpp:3694
 msgid "Warnings"
 msgstr "Amabwiriza"
 
-#: configuredialog.cpp:3587
+#: configuredialog.cpp:3700
 #, fuzzy
 msgid "S/MIME &Validation"
 msgstr "S /"
 
-#: configuredialog.cpp:3593
+#: configuredialog.cpp:3706
 #, fuzzy
 msgid "Crypto Backe&nds"
 msgstr "Impera y'inyuma"
 
-#: configuredialog.cpp:3624
+#: configuredialog.cpp:3737
 #, fuzzy
 msgid ""
 "<qt>"
@@ -2418,7 +2661,7 @@ msgstr ""
 "<p> <b> icyitonderwa : </b> Gushyiraho iyi Ihitamo ku A - Ububiko... Ishingiro "
 "Kuva: i <i> </i> Ibikubiyemo Bya Idirishya . </p> </qt> "
 
-#: configuredialog.cpp:3641
+#: configuredialog.cpp:3754
 #, fuzzy
 msgid ""
 "<qt>"
@@ -2443,7 +2686,7 @@ msgstr ""
 "<p> , NIBA Kuri , ya:  Urugero: , Reba Ishusho in Ubutumwa OYA Kuri , Gushoboza "
 "iyi Ihitamo , Bya i . </p> </qt> "
 
-#: configuredialog.cpp:3654
+#: configuredialog.cpp:3767
 #, fuzzy
 msgid ""
 "<qt>"
@@ -2471,22 +2714,22 @@ msgid ""
 "customer relationship management, it has been made available.</li></ul></qt>"
 msgstr "<qt><h3>e. G. Yongeye kwoherezwa. G."
 
-#: configuredialog.cpp:3687
+#: configuredialog.cpp:3800
 #, fuzzy
 msgid "HTML Messages"
 msgstr "ubutumwa"
 
-#: configuredialog.cpp:3690
+#: configuredialog.cpp:3803
 #, fuzzy
 msgid "Prefer H&TML to plain text"
 msgstr "Kuri Byuzuye Umwandiko "
 
-#: configuredialog.cpp:3694
+#: configuredialog.cpp:3807
 #, fuzzy
 msgid "Allow messages to load e&xternal references from the Internet"
 msgstr "Ubutumwa Kuri Ibirimo external Indango Kuva: i "
 
-#: configuredialog.cpp:3699
+#: configuredialog.cpp:3812
 #, fuzzy
 msgid ""
 "<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
@@ -2498,131 +2741,131 @@ msgstr ""
 "href=\"whatsthis:%1\"> Bigyanye ... </a> <a href=\"whatsthis:%2\"> "
 "Bigyanye external Indango ... </a> "
 
-#: configuredialog.cpp:3711
+#: configuredialog.cpp:3824
 #, fuzzy
 msgid "Encrypted Messages"
 msgstr "&Ubutumwa "
 
-#: configuredialog.cpp:3713
+#: configuredialog.cpp:3826
 #, fuzzy
 msgid "Attempt decryption of encrypted messages when viewing"
 msgstr "Shyiraho Umutekano Ubutumwa "
 
-#: configuredialog.cpp:3718
+#: configuredialog.cpp:3831
 #, fuzzy
 msgid "Message Disposition Notifications"
 msgstr "Name=Amamenyesha Sisitemu"
 
-#: configuredialog.cpp:3730
+#: configuredialog.cpp:3843
 #, fuzzy
 msgid "Send policy:"
 msgstr "Itegeko : "
 
-#: configuredialog.cpp:3732 kmmessage.cpp:1361 kmmessage.cpp:1368
+#: configuredialog.cpp:3845 kmmessage.cpp:1381 kmmessage.cpp:1388
 msgid "&Ignore"
 msgstr "Kureka"
 
-#: configuredialog.cpp:3735
+#: configuredialog.cpp:3848
 #, fuzzy
 msgid "As&k"
 msgstr "Kubaza"
 
-#: configuredialog.cpp:3738
+#: configuredialog.cpp:3851
 msgid "&Deny"
 msgstr "Anga"
 
-#: configuredialog.cpp:3741
+#: configuredialog.cpp:3854
 #, fuzzy
 msgid "Al&ways send"
 msgstr "Hohereza buri gihe"
 
-#: configuredialog.cpp:3759
+#: configuredialog.cpp:3872
 #, fuzzy
 msgid "Quote original message:"
 msgstr "~Umwimerere &Ubutumwa : "
 
-#: configuredialog.cpp:3761
+#: configuredialog.cpp:3874
 #, fuzzy
 msgid "Nothin&g"
 msgstr "Nta na kimwe"
 
-#: configuredialog.cpp:3764
+#: configuredialog.cpp:3877
 #, fuzzy
 msgid "&Full message"
 msgstr "&Ubutumwa "
 
-#: configuredialog.cpp:3767
+#: configuredialog.cpp:3880
 #, fuzzy
 msgid "Onl&y headers"
 msgstr "Imitwe "
 
-#: configuredialog.cpp:3773
+#: configuredialog.cpp:3886
 #, fuzzy
 msgid "Do not send MDNs in response to encrypted messages"
 msgstr "OYA Kohereza in Kuri Bishunzwe: Ubutumwa "
 
-#: configuredialog.cpp:3777
+#: configuredialog.cpp:3890
 #, fuzzy
 msgid ""
 "<b>WARNING:</b> Unconditionally returning confirmations undermines your "
 "privacy. <a href=\"whatsthis:%1\">More...</a>"
 msgstr "<b> : </b> Agenga . <a href=\"whatsthis:%1\"> ... </a> "
 
-#: configuredialog.cpp:3786
+#: configuredialog.cpp:3899
 #, fuzzy
 msgid "Certificate && Key Bundle Attachments"
 msgstr "Izina Alt ry'usohora Impamyabushobozi"
 
-#: configuredialog.cpp:3789
+#: configuredialog.cpp:3902
 #, fuzzy
 msgid "Automatically import keys and certificates"
 msgstr "Kuzana Utubuto na Impamyabushobozi "
 
-#: configuredialog.cpp:3850
+#: configuredialog.cpp:3963
 #, fuzzy
 msgid ""
 "Changing the global HTML setting will override all folder specific values."
 msgstr "i &Rusange Igenamiterere Byose Ububiko... Uduciro . "
 
-#: configuredialog.cpp:4138
+#: configuredialog.cpp:4251
 #, fuzzy
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr "9."
 
 #. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4247 rc.cpp:347
+#: configuredialog.cpp:4360 rc.cpp:353
 #, fuzzy, no-c-format
 msgid "no proxy"
 msgstr "Nta nyabubasha"
 
-#: configuredialog.cpp:4248
+#: configuredialog.cpp:4361
 #, fuzzy
 msgid "(Current system setting: %1)"
 msgstr "( Sisitemu Igenamiterere : %1 ) "
 
-#: configuredialog.cpp:4425
+#: configuredialog.cpp:4538
 #, fuzzy
 msgid "&Folders"
 msgstr "Ububiko"
 
-#: configuredialog.cpp:4428
+#: configuredialog.cpp:4541
 #, fuzzy
 msgid "&Groupware"
 msgstr "Izina ry'Itsinda :"
 
-#: configuredialog.cpp:4449
+#: configuredialog.cpp:4562
 #, fuzzy
 msgid ""
 "_: Corresponds to Folder->Move All Messages to Trash\n"
 "Ask for co&nfirmation before moving all messages to trash"
 msgstr "ya:  Iyemeza Mbere Kwimura Byose Ubutumwa Kuri Agatebo njyamwanda "
 
-#: configuredialog.cpp:4456
+#: configuredialog.cpp:4569
 #, fuzzy
 msgid "E&xclude important messages from expiry"
 msgstr "By'ingirakamaro Ubutumwa Kuva: "
 
-#: configuredialog.cpp:4467
+#: configuredialog.cpp:4580
 #, fuzzy
 msgid ""
 "_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
@@ -2630,28 +2873,28 @@ msgid ""
 "When trying to find unread messages:"
 msgstr "Kuri Gushaka Bidasomye: %S Ubutumwa : "
 
-#: configuredialog.cpp:4470
+#: configuredialog.cpp:4583
 #, fuzzy
 msgid ""
 "_: continuation of \"When trying to find unread messages:\"\n"
 "Do not Loop"
 msgstr "OYA "
 
-#: configuredialog.cpp:4472
+#: configuredialog.cpp:4585
 #, fuzzy
 msgid ""
 "_: continuation of \"When trying to find unread messages:\"\n"
 "Loop in Current Folder"
 msgstr "in "
 
-#: configuredialog.cpp:4474
+#: configuredialog.cpp:4587
 #, fuzzy
 msgid ""
 "_: continuation of \"When trying to find unread messages:\"\n"
 "Loop in All Folders"
 msgstr "in "
 
-#: configuredialog.cpp:4487
+#: configuredialog.cpp:4600
 #, fuzzy
 msgid ""
 "_: to be continued with \"jump to first new message\", \"jump to first unread "
@@ -2659,63 +2902,77 @@ msgid ""
 "When entering a folder:"
 msgstr "A Ububiko... : "
 
-#: configuredialog.cpp:4490
+#: configuredialog.cpp:4603
 #, fuzzy
 msgid ""
 "_: continuation of \"When entering a folder:\"\n"
 "Jump to First New Message"
 msgstr "Kuri "
 
-#: configuredialog.cpp:4492
+#: configuredialog.cpp:4605
 #, fuzzy
 msgid ""
 "_: continuation of \"When entering a folder:\"\n"
 "Jump to First Unread or New Message"
 msgstr "Kuri Cyangwa "
 
-#: configuredialog.cpp:4494
+#: configuredialog.cpp:4607
 #, fuzzy
 msgid ""
 "_: continuation of \"When entering a folder:\"\n"
 "Jump to Last Selected Message"
 msgstr "Kuri "
 
-#: configuredialog.cpp:4501
+#: configuredialog.cpp:4609
+#, fuzzy
+msgid ""
+"_: continuation of \"When entering a folder:\"\n"
+"Jump to Newest Message"
+msgstr "Kuri "
+
+#: configuredialog.cpp:4611
+#, fuzzy
+msgid ""
+"_: continuation of \"When entering a folder:\"\n"
+"Jump to Oldest Message"
+msgstr "Kuri "
+
+#: configuredialog.cpp:4618
 #, fuzzy
 msgid "Mar&k selected message as read after"
 msgstr "Byahiswemo &Ubutumwa Nka Soma Nyuma "
 
-#: configuredialog.cpp:4505
+#: configuredialog.cpp:4622
 msgid " sec"
 msgstr " sec"
 
-#: configuredialog.cpp:4518
+#: configuredialog.cpp:4635
 #, fuzzy
 msgid "Ask for action after &dragging messages to another folder"
 msgstr "ya:  Igikorwa Nyuma Ubutumwa Kuri Ububiko... "
 
-#: configuredialog.cpp:4529
+#: configuredialog.cpp:4646
 #, fuzzy
 msgid ""
 "_: to be continued with \"flat files\" and \"directories\", resp.\n"
 "By default, &message folders on disk are:"
 msgstr "Mburabuzi , &Ubutumwa Ububiko ku Disiki%1 : "
 
-#: configuredialog.cpp:4532
+#: configuredialog.cpp:4649
 #, fuzzy
 msgid ""
 "_: continuation of \"By default, &message folders on disk are\"\n"
 "Flat Files (\"mbox\" format)"
 msgstr "( \" \" Imiterere ) "
 
-#: configuredialog.cpp:4534
+#: configuredialog.cpp:4651
 #, fuzzy
 msgid ""
 "_: continuation of \"By default, &message folders on disk are\"\n"
 "Directories (\"maildir\" format)"
 msgstr "( \" \" Imiterere ) "
 
-#: configuredialog.cpp:4537
+#: configuredialog.cpp:4654
 #, fuzzy
 msgid ""
 "_: what's this help\n"
@@ -2731,40 +2988,40 @@ msgid ""
 "</qt>"
 msgstr "<qt><p>G. G."
 
-#: configuredialog.cpp:4562
+#: configuredialog.cpp:4679
 #, fuzzy
 msgid "Open this folder on startup:"
 msgstr "Gufungura iyi Ububiko... ku Gutangira  : "
 
-#: configuredialog.cpp:4570
+#: configuredialog.cpp:4687
 #, fuzzy
 msgid "Empty local &trash folder on program exit"
 msgstr "Bya hafi Agatebo njyamwanda Ububiko... ku Porogaramu &Kuvamo "
 
-#: configuredialog.cpp:4578
+#: configuredialog.cpp:4695
 #, fuzzy
 msgid "Enable full text &indexing"
 msgstr "Cyuzuye Umwandiko gushyiraho umugereka "
 
-#: configuredialog.cpp:4588
+#: configuredialog.cpp:4705
 #, fuzzy
 msgid "Quota units: "
 msgstr "Ikiranga impugukirwa"
 
-#: configuredialog.cpp:4590 quotajobs.h:86
+#: configuredialog.cpp:4707 quotajobs.h:86
 msgid "KB"
 msgstr ""
 
-#: configuredialog.cpp:4591 quotajobs.h:91
+#: configuredialog.cpp:4708 quotajobs.h:91
 #, fuzzy
 msgid "MB"
 msgstr "MB"
 
-#: configuredialog.cpp:4592 quotajobs.h:96
+#: configuredialog.cpp:4709 quotajobs.h:96
 msgid "GB"
 msgstr ""
 
-#: configuredialog.cpp:4601
+#: configuredialog.cpp:4718
 #, fuzzy
 msgid ""
 "_: what's this help\n"
@@ -2796,7 +3053,7 @@ msgstr ""
 "Shakisha Tangira &vendorShortName; Kuva: i Hasi: Bya i &Ubutumwa Urutonde na "
 "Gukomeza Kuri i Ibanjirije Ububiko... ku Ihitamo ni Byahiswemo . </p> </qt> "
 
-#: configuredialog.cpp:4618
+#: configuredialog.cpp:4735
 #, fuzzy
 msgid ""
 "_: what's this help\n"
@@ -2817,162 +3074,170 @@ msgstr ""
 " i Ubutumwa ) . </p> "
 "<p> , i Umubarendanga Kuri , Gukomeza Kuri Koresha iyi Igikorwa ni . </p> </qt> "
 
-#: configuredialog.cpp:4694
+#: configuredialog.cpp:4811
 #, fuzzy
 msgid "&IMAP Resource Folder Options"
 msgstr "&Gusubizaho uburyo bushaje "
 
-#: configuredialog.cpp:4698
+#: configuredialog.cpp:4815
 #, fuzzy
 msgid "&Enable IMAP resource functionality"
 msgstr "Ibikorana: "
 
-#: configuredialog.cpp:4699
+#: configuredialog.cpp:4816
 #, fuzzy
 msgid "This enables the IMAP storage for the Kontact applications"
 msgstr "i ya:  i Porogaramu "
 
-#: configuredialog.cpp:4712
+#: configuredialog.cpp:4829
 #, fuzzy
 msgid "&Format used for the groupware folders:"
 msgstr "Byakoreshejwe ya:  i Ububiko : "
 
-#: configuredialog.cpp:4714
+#: configuredialog.cpp:4831
 #, fuzzy
 msgid ""
 "Choose the format to use to store the contents of the groupware folders."
 msgstr "i Imiterere Kuri Koresha Kuri i Ibigize Bya i Ububiko . "
 
-#: configuredialog.cpp:4723
-#, fuzzy
-msgid "Standard (Ical / Vcard)"
-msgstr "Standard ( /) "
+#: configuredialog.cpp:4840
+msgid "Deprecated Kolab1 (iCal/vCard)"
+msgstr ""
 
-#: configuredialog.cpp:4723
+#: configuredialog.cpp:4840
 #, fuzzy
-msgid "Kolab (XML)"
+msgid "Kolab2 (XML)"
 msgstr "XML Irambuye"
 
-#: configuredialog.cpp:4731
+#: configuredialog.cpp:4848
 #, fuzzy
 msgid "&Language of the groupware folders:"
 msgstr "Bya i Ububiko : "
 
-#: configuredialog.cpp:4734
+#: configuredialog.cpp:4851
 #, fuzzy
 msgid "Set the language of the folder names"
 msgstr "i Ururimi: Bya i Ububiko... Amazina "
 
-#: configuredialog.cpp:4743
+#: configuredialog.cpp:4860
 msgid "English"
 msgstr "Icyongereza"
 
-#: configuredialog.cpp:4743
+#: configuredialog.cpp:4860
 msgid "German"
 msgstr "Ikidage"
 
-#: configuredialog.cpp:4743
+#: configuredialog.cpp:4860
 msgid "French"
 msgstr "Igifaransa"
 
-#: configuredialog.cpp:4743
+#: configuredialog.cpp:4860
 msgid "Dutch"
 msgstr "Igihorandi"
 
-#: configuredialog.cpp:4752
+#: configuredialog.cpp:4869
 #, fuzzy
 msgid "Set the parent of the resource folders"
 msgstr "i Bya i Ibikorana: Ububiko "
 
-#: configuredialog.cpp:4781
+#: configuredialog.cpp:4898
 #, fuzzy
 msgid "&Hide groupware folders"
 msgstr "Ububiko "
 
-#: configuredialog.cpp:4785
+#: configuredialog.cpp:4902
 #, fuzzy
 msgid ""
 "When this is checked, you will not see the IMAP resource folders in the folder "
 "tree."
 msgstr "iyi ni Ivivuwe , OYA i Ibikorana: Ububiko in i Ububiko... &Igiti . "
 
-#: configuredialog.cpp:4792
+#: configuredialog.cpp:4909
 #, fuzzy
 msgid "&Only show groupware folders for this account"
 msgstr "Ububiko in Konti: : "
 
-#: configuredialog.cpp:4796
+#: configuredialog.cpp:4913
 #, fuzzy
 msgid ""
 "When this is checked, you will not see normal  mail folders in the folder tree "
 "for the account configured for groupware."
 msgstr "iyi ni Ivivuwe , OYA i Ibikorana: Ububiko in i Ububiko... &Igiti . "
 
-#: configuredialog.cpp:4804
+#: configuredialog.cpp:4921
 msgid "Synchronize groupware changes immediately"
 msgstr ""
 
-#: configuredialog.cpp:4806
+#: configuredialog.cpp:4923
 msgid ""
 "Synchronize groupware changes in disconnected IMAP folders immediately when "
 "being online."
 msgstr ""
 
-#: configuredialog.cpp:4818
+#: configuredialog.cpp:4935
 #, fuzzy
 msgid "Groupware Compatibility && Legacy Options"
 msgstr "Amahitamo y'ikorana."
 
-#: configuredialog.cpp:4823
+#: configuredialog.cpp:4940
 msgid "&Enable groupware functionality"
 msgstr ""
 
-#: configuredialog.cpp:4831
+#: configuredialog.cpp:4948
 #, fuzzy
 msgid "Mangle From:/To: headers in replies to invitations"
 msgstr ": /: Imitwe in Kuri "
 
-#: configuredialog.cpp:4832
+#: configuredialog.cpp:4949
 #, fuzzy
 msgid ""
 "Turn this option on in order to make Outlook(tm) understand your answers to "
 "invitation replies"
 msgstr "iyi Ihitamo ku in Itondekanya Kuri Ubwoko ( ) Kuri "
 
-#: configuredialog.cpp:4837
+#: configuredialog.cpp:4954
 #, fuzzy
 msgid "Send invitations in the mail body"
 msgstr "in i Ibaruwa Umubiri "
 
-#: configuredialog.cpp:4838
+#: configuredialog.cpp:4955
 #, fuzzy
 msgid ""
 "Turn this option on in order to make Outlook(tm) understand your answers to "
 "invitations"
 msgstr "iyi Ihitamo ku in Itondekanya Kuri Ubwoko ( ) Kuri "
 
-#: configuredialog.cpp:4846
+#: configuredialog.cpp:4963
 #, fuzzy
 msgid "Exchange compatible invitation naming"
 msgstr "Isunika Ryikoresha"
 
-#. i18n: file kmail.kcfg line 183
-#: configuredialog.cpp:4847 rc.cpp:685
-#, no-c-format
+#: configuredialog.cpp:4964
 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 ""
 
-#. 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 "- Umugereka "
+
+#: 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
 #, fuzzy, no-c-format
 msgid "Automatic invitation sending"
 msgstr "Isunika Ryikoresha"
 
-#: configuredialog.cpp:4854
+#: configuredialog.cpp:4978
 #, fuzzy
 msgid ""
 "When this is on, the user will not see the mail composer window. Invitation "
@@ -2981,7 +3246,7 @@ msgstr ""
 "iyi ni ku , i Umukoresha OYA i Ibaruwa &Uhimba Idirishya . Yoherejwe: mu buryo "
 "bwikora: "
 
-#: configuredialog.cpp:4867
+#: configuredialog.cpp:4991
 #, fuzzy
 msgid ""
 "<qt>Invitations are normally sent as attachments to a mail. This switch changes "
@@ -2999,17 +3264,17 @@ msgstr ""
 "Abantu Imeli Porogaramu OYA i , i Ubutumwa Kureba IGIHARWE . "
 "<br> Imeli Porogaramu Kuri Akazi Na: iyi . </qt> "
 
-#: configuredialog.cpp:4922
+#: configuredialog.cpp:5048
 #, fuzzy
 msgid "<Choose a Folder>"
 msgstr "< A > "
 
-#: configuredialog.cpp:5026
+#: configuredialog.cpp:5154
 #, fuzzy
 msgid "&Resource folders are subfolders of:"
 msgstr "Ububiko Bya : "
 
-#: configuredialog.cpp:5029
+#: configuredialog.cpp:5157
 #, fuzzy
 msgid "&Resource folders are in account:"
 msgstr "Ububiko in Konti: : "
@@ -3091,35 +3356,35 @@ msgid ""
 "Not available"
 msgstr "Ntibibonetse)"
 
-#: customtemplates.cpp:87
+#: customtemplates.cpp:100
 #, fuzzy
 msgid ""
 "_: Message->\n"
 "Universal"
 msgstr "&Ongera ugerageze"
 
-#: customtemplates.cpp:88 customtemplates.cpp:131
+#: customtemplates.cpp:101 customtemplates.cpp:180
 #, fuzzy
 msgid ""
 "_: Message->\n"
 "Reply"
 msgstr "&Ongera ugerageze"
 
-#: customtemplates.cpp:89 customtemplates.cpp:133
+#: customtemplates.cpp:102 customtemplates.cpp:182
 #, fuzzy
 msgid ""
 "_: Message->\n"
 "Reply to All"
 msgstr "&Ongera ugerageze"
 
-#: customtemplates.cpp:90 customtemplates.cpp:135
+#: customtemplates.cpp:103 customtemplates.cpp:184
 #, fuzzy
 msgid ""
 "_: Message->\n"
 "Forward"
 msgstr "Imbere"
 
-#: customtemplates.cpp:93
+#: customtemplates.cpp:106
 msgid ""
 "<qt>"
 "<p>Here you can add, edit, and delete custom message templates to use when you "
@@ -3134,53 +3399,75 @@ msgid ""
 "to <i>Universal</i> templates.</p></qt>"
 msgstr ""
 
-#: customtemplates.cpp:107 templatesconfiguration.cpp:105
+#: customtemplates.cpp:120 templatesconfiguration.cpp:105
 msgid "<a href=\"whatsthis:%1\">How does this work?</a>"
 msgstr ""
 
-#: customtemplates.cpp:137
+#: customtemplates.cpp:122
+#, fuzzy
+msgid "Additional recipients of the message when forwarding"
+msgstr "Shyiraho Umutekano Ubutumwa "
+
+#: 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
 #, fuzzy
 msgid ""
 "_: Message->\n"
 "Unknown"
 msgstr "Imbere"
 
-#: customtemplates.cpp:347 customtemplates.cpp:364
+#: customtemplates.cpp:420 customtemplates.cpp:437
 msgid "Key Conflict"
 msgstr ""
 
-#: 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?"
 msgstr ""
 
-#: customtemplates.cpp:365
+#: customtemplates.cpp:438
 #, fuzzy
 msgid ""
 "The selected shortcut is already used, would you still like to continue with "
 "the assignment?"
 msgstr "Byahiswemo Iy'ibusamo ni Byakoreshejwe , Guhitamo A Rimwe . "
 
-#: distributionlistdialog.cpp:96
+#: distributionlistdialog.cpp:97
 #, fuzzy
 msgid "Save Distribution List"
 msgstr "Kubika "
 
-#: distributionlistdialog.cpp:97
+#: distributionlistdialog.cpp:98
 #, fuzzy
 msgid "Save List"
 msgstr "Kubika "
 
-#: distributionlistdialog.cpp:106
+#: distributionlistdialog.cpp:107
 msgid "Name:"
 msgstr "Izina:"
 
-#: distributionlistdialog.cpp:116 recipientspicker.cpp:390
+#: distributionlistdialog.cpp:117 recipientspicker.cpp:390
 msgid "Email"
 msgstr "imeli"
 
-#: distributionlistdialog.cpp:170
+#: distributionlistdialog.cpp:169
 #, fuzzy
 msgid ""
 "There are no recipients in your list. First select some recipients, then try "
@@ -3189,122 +3476,122 @@ msgstr ""
 "Oya Abandikiwe... in Urutonde . Guhitamo Abandikiwe... , Hanyuma Kugerageza "
 "Nanone . "
 
-#: distributionlistdialog.cpp:185
+#: distributionlistdialog.cpp:184
 msgid "New Distribution List"
 msgstr "Urutonde Rushya rw'Ikwirakwiza"
 
-#: distributionlistdialog.cpp:186
+#: distributionlistdialog.cpp:185
 msgid "Please enter name:"
 msgstr "Andika izina:"
 
-#: distributionlistdialog.cpp:197
+#: distributionlistdialog.cpp:198
 #, fuzzy
 msgid ""
 "<qt>Distribution list with the given name <b>%1</b> already exists. Please "
 "select a different name.</qt>"
 msgstr "<qt> Urutonde Na: i Izina: <b> %1 </b> . Guhitamo A Izina: . </qt> "
 
-#: editorwatcher.cpp:86
+#: editorwatcher.cpp:76
 #, fuzzy
 msgid "Edit with:"
 msgstr "Ikiranga"
 
-#: editorwatcher.cpp:169
+#: editorwatcher.cpp:161
 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 ""
 
-#: editorwatcher.cpp:170
+#: editorwatcher.cpp:163
 #, fuzzy
 msgid "Unable to edit attachment"
 msgstr "Izina ry'umugereka"
 
-#: encodingdetector.cpp:1250 encodingdetector.cpp:1352
+#: encodingdetector.cpp:1170 encodingdetector.cpp:1272
 msgid ""
 "_: @item Text character set\n"
 "Unicode"
 msgstr ""
 
-#: encodingdetector.cpp:1252 encodingdetector.cpp:1322
+#: encodingdetector.cpp:1172 encodingdetector.cpp:1242
 msgid ""
 "_: @item Text character set\n"
 "Cyrillic"
 msgstr ""
 
-#: encodingdetector.cpp:1254 encodingdetector.cpp:1337
+#: encodingdetector.cpp:1174 encodingdetector.cpp:1257
 msgid ""
 "_: @item Text character set\n"
 "Western European"
 msgstr ""
 
-#: encodingdetector.cpp:1256 encodingdetector.cpp:1319
+#: encodingdetector.cpp:1176 encodingdetector.cpp:1239
 msgid ""
 "_: @item Text character set\n"
 "Central European"
 msgstr ""
 
-#: encodingdetector.cpp:1258 encodingdetector.cpp:1325
+#: encodingdetector.cpp:1178 encodingdetector.cpp:1245
 msgid ""
 "_: @item Text character set\n"
 "Greek"
 msgstr ""
 
-#: encodingdetector.cpp:1260 encodingdetector.cpp:1328
+#: encodingdetector.cpp:1180 encodingdetector.cpp:1248
 msgid ""
 "_: @item Text character set\n"
 "Hebrew"
 msgstr ""
 
-#: encodingdetector.cpp:1262 encodingdetector.cpp:1334
+#: encodingdetector.cpp:1182 encodingdetector.cpp:1254
 msgid ""
 "_: @item Text character set\n"
 "Turkish"
 msgstr ""
 
-#: encodingdetector.cpp:1264 encodingdetector.cpp:1331
+#: encodingdetector.cpp:1184 encodingdetector.cpp:1251
 msgid ""
 "_: @item Text character set\n"
 "Japanese"
 msgstr ""
 
-#: encodingdetector.cpp:1266 encodingdetector.cpp:1316
+#: encodingdetector.cpp:1186 encodingdetector.cpp:1236
 msgid ""
 "_: @item Text character set\n"
 "Baltic"
 msgstr ""
 
-#: encodingdetector.cpp:1268 encodingdetector.cpp:1313
+#: encodingdetector.cpp:1188 encodingdetector.cpp:1233
 msgid ""
 "_: @item Text character set\n"
 "Arabic"
 msgstr ""
 
-#: encodingdetector.cpp:1340
+#: encodingdetector.cpp:1260
 msgid ""
 "_: @item Text character set\n"
 "Chinese Traditional"
 msgstr ""
 
-#: encodingdetector.cpp:1343
+#: encodingdetector.cpp:1263
 msgid ""
 "_: @item Text character set\n"
 "Chinese Simplified"
 msgstr ""
 
-#: encodingdetector.cpp:1346
+#: encodingdetector.cpp:1266
 msgid ""
 "_: @item Text character set\n"
 "Korean"
 msgstr ""
 
-#: encodingdetector.cpp:1349
+#: encodingdetector.cpp:1269
 msgid ""
 "_: @item Text character set\n"
 "Thai"
 msgstr ""
 
-#: expirejob.cpp:164
+#: expirejob.cpp:177
 #, fuzzy
 msgid ""
 "_n: Removing 1 old message from folder %1...\n"
@@ -3313,12 +3600,12 @@ msgstr ""
 "1 ki/bishaje &Ubutumwa Kuva: Ububiko... %1 ... \n"
 "%n ki/bishaje Ubutumwa Kuva: Ububiko... %1 "
 
-#: expirejob.cpp:171
+#: expirejob.cpp:184
 #, fuzzy
 msgid "Cannot expire messages from folder %1: destination folder %2 not found"
 msgstr "Ubutumwa Kuva: Ububiko... %1 : Ishyika: Ububiko... %2 OYA Byabonetse "
 
-#: expirejob.cpp:186
+#: expirejob.cpp:199
 #, fuzzy
 msgid ""
 "_n: Moving 1 old message from folder %1 to folder %2...\n"
@@ -3327,7 +3614,7 @@ msgstr ""
 "1 ki/bishaje &Ubutumwa Kuva: Ububiko... %1 Kuri Ububiko... %2 ... \n"
 "%n ki/bishaje Ubutumwa Kuva: Ububiko... %1 Kuri Ububiko... %2 ... "
 
-#: expirejob.cpp:214
+#: expirejob.cpp:227
 #, fuzzy
 msgid ""
 "_n: Removed 1 old message from folder %1.\n"
@@ -3336,7 +3623,7 @@ msgstr ""
 "1 ki/bishaje &Ubutumwa Kuva: Ububiko... %1 . \n"
 "%n ki/bishaje Ubutumwa Kuva: Ububiko... %1 . "
 
-#: expirejob.cpp:220
+#: expirejob.cpp:233
 #, fuzzy
 msgid ""
 "_n: Moved 1 old message from folder %1 to folder %2.\n"
@@ -3345,22 +3632,22 @@ msgstr ""
 "1 ki/bishaje &Ubutumwa Kuva: Ububiko... %1 Kuri Ububiko... %2 . \n"
 "%n ki/bishaje Ubutumwa Kuva: Ububiko... %1 Kuri Ububiko... %2 . "
 
-#: expirejob.cpp:227
+#: expirejob.cpp:240
 #, fuzzy
 msgid "Removing old messages from folder %1 failed."
 msgstr "ki/bishaje Ubutumwa Kuva: Ububiko... %1 Byanze . "
 
-#: expirejob.cpp:231
+#: expirejob.cpp:244
 #, fuzzy
 msgid "Moving old messages from folder %1 to folder %2 failed."
 msgstr "ki/bishaje Ubutumwa Kuva: Ububiko... %1 Kuri Ububiko... %2 Byanze . "
 
-#: expirejob.cpp:237
+#: expirejob.cpp:250
 #, fuzzy
 msgid "Removing old messages from folder %1 was canceled."
 msgstr "ki/bishaje Ubutumwa Kuva: Ububiko... %1 Kureka . "
 
-#: expirejob.cpp:241
+#: expirejob.cpp:254
 #, fuzzy
 msgid "Moving old messages from folder %1 to folder %2 was canceled."
 msgstr "ki/bishaje Ubutumwa Kuva: Ububiko... %1 Kuri Ububiko... %2 Kureka . "
@@ -3405,91 +3692,108 @@ msgid ""
 "Note: Expiry action will be applied immediately after confirming settings."
 msgstr "icyitonderwa : Igikorwa Byashyizweho Ako kanya Nyuma Igenamiterere . "
 
-#: expirypropertiesdialog.cpp:163
+#: expirypropertiesdialog.cpp:167
 #, fuzzy
 msgid "Please select a folder to expire messages into."
 msgstr "Guhitamo A Ububiko... Kuri Ubutumwa . "
 
-#: expirypropertiesdialog.cpp:164
+#: expirypropertiesdialog.cpp:168
 #, fuzzy
 msgid "No Folder Selected"
 msgstr "Nta wutanga watoranyijwe."
 
-#: favoritefolderview.cpp:90
+#: expirypropertiesdialog.cpp:176
 #, fuzzy
-msgid "Favorite Folders"
-msgstr "Idosiye nshya"
+msgid ""
+"Please select a different folder than the current folder to expire message "
+"into."
+msgstr "Guhitamo A Ububiko... Kuri Ubutumwa . "
 
-#: favoritefolderview.cpp:326
+#: expirypropertiesdialog.cpp:178
 #, fuzzy
-msgid "Remove From Favorites"
-msgstr "Gukuraho inyuguti"
+msgid "Wrong Folder Selected"
+msgstr "Nta wutanga watoranyijwe."
 
-#: favoritefolderview.cpp:328 favoritefolderview.cpp:378
+#: favoritefolderview.cpp:90
 #, fuzzy
-msgid "Rename Favorite"
-msgstr "Hindura izina ry'ububiko"
+msgid "Favorite Folders"
+msgstr "Idosiye nshya"
 
-#: favoritefolderview.cpp:337 kmfoldertree.cpp:1153 kmmainwidget.cpp:2767
+#: favoritefolderview.cpp:337 kmfoldertree.cpp:1190 kmmainwidget.cpp:2790
 #, fuzzy
 msgid "&Assign Shortcut..."
 msgstr "&Ihinanzira Riri Ryonyine"
 
-#: favoritefolderview.cpp:338 kmfoldertree.cpp:1158
+#: favoritefolderview.cpp:338 kmfoldertree.cpp:1195
 #, fuzzy
 msgid "Expire..."
 msgstr "Kwimura..."
 
-#: favoritefolderview.cpp:341
+#: favoritefolderview.cpp:342
+#, fuzzy
+msgid "Remove From Favorites"
+msgstr "Gukuraho inyuguti"
+
+#: favoritefolderview.cpp:344 favoritefolderview.cpp:389
+#, fuzzy
+msgid "Rename Favorite"
+msgstr "Hindura izina ry'ububiko"
+
+#: favoritefolderview.cpp:347
 #, fuzzy
 msgid "Add Favorite Folder..."
 msgstr "Idosiye nshya..."
 
-#: favoritefolderview.cpp:395
+#: favoritefolderview.cpp:406
 #, fuzzy
 msgid "Local Inbox"
 msgstr "Agasanduku k'ubutumwa "
 
-#: favoritefolderview.cpp:397
+#: favoritefolderview.cpp:408
 #, c-format
 msgid "Inbox of %1"
 msgstr ""
 
-#: favoritefolderview.cpp:401
+#: favoritefolderview.cpp:412
 msgid "%1 on %2"
 msgstr ""
 
-#: favoritefolderview.cpp:403
+#: favoritefolderview.cpp:414
 msgid "%1 (local)"
 msgstr ""
 
-#: favoritefolderview.cpp:443
+#: favoritefolderview.cpp:454
 #, fuzzy
 msgid "Add Favorite Folder"
 msgstr "Idosiye nshya"
 
-#: filterimporterexporter.cpp:51
+#: filterimporterexporter.cpp:50
 #, fuzzy
 msgid "Select Filters"
 msgstr "Guhitamo Ububiko"
 
-#: filterimporterexporter.cpp:58
+#: filterimporterexporter.cpp:61
 #, fuzzy
 msgid "Filters"
 msgstr "Akayunguruzo:"
 
-#: filterimporterexporter.cpp:182
+#: filterimporterexporter.cpp:67
+#, fuzzy
+msgid "Unselect All"
+msgstr "Guhitamo Umwandiko"
+
+#: filterimporterexporter.cpp:213
 #, fuzzy
 msgid "Import Filters"
 msgstr "Kuzana Idosiye"
 
-#: filterimporterexporter.cpp:189
+#: filterimporterexporter.cpp:220
 msgid ""
 "The selected file is not readable. Your file access permissions might be "
 "insufficient."
 msgstr ""
 
-#: filterimporterexporter.cpp:204
+#: filterimporterexporter.cpp:235
 #, fuzzy
 msgid "Export Filters"
 msgstr "Kohereza hanze byanze"
@@ -3580,8 +3884,8 @@ msgstr ""
 "OYA Kwandika i Idosiye %1 : \n"
 "\" %2 \" ni i Ikosa Umwirondoro: . "
 
-#: 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
 #, fuzzy
 msgid "KMail Error"
 msgstr "Ikosa "
@@ -3637,88 +3941,104 @@ msgstr ""
 "Izina: Cyangwa i Cyuzuye Imeli Aderesi: Bya i Umukoresha ; i Ifashayinjira ya:  "
 "Konti: ku i Seriveri: Rimwe ni . "
 
-#: folderdiaacltab.cpp:106 folderdiaacltab.cpp:341
+#: folderdiaacltab.cpp:103 recipientseditor.cpp:776
+msgid "Se&lect..."
+msgstr "Guhitamo..."
+
+#: folderdiaacltab.cpp:106 folderdiaacltab.cpp:340
 msgid "Permissions"
 msgstr "Uruhushya"
 
-#: folderdiaacltab.cpp:247
+#: folderdiaacltab.cpp:118
+msgid "<b>Note: </b>Renaming requires write permissions on the parent folder."
+msgstr ""
+
+#: folderdiaacltab.cpp:245
 #, fuzzy
 msgid "Custom Permissions"
 msgstr "Kunozaidosiyeya "
 
-#: folderdiaacltab.cpp:249
+#: folderdiaacltab.cpp:247
 #, fuzzy
 msgid "Custom Permissions (%1)"
 msgstr "Kunozaidosiyeya ( %1 ) "
 
-#: folderdiaacltab.cpp:340
+#: folderdiaacltab.cpp:339
 #, fuzzy
 msgid "User Id"
 msgstr "koresha Indango"
 
-#: folderdiaacltab.cpp:352
+#: folderdiaacltab.cpp:351
 #, fuzzy
 msgid "Add Entry..."
 msgstr "Kongeraho Icyinjira..."
 
-#: folderdiaacltab.cpp:353
+#: folderdiaacltab.cpp:352
 #, fuzzy
 msgid "Modify Entry..."
 msgstr "Guhindura Icyingira..."
 
-#: folderdiaacltab.cpp:354
+#: folderdiaacltab.cpp:353
 msgid "Remove Entry"
 msgstr "Vanaho Umwinjizo"
 
-#: folderdiaacltab.cpp:426
+#: folderdiaacltab.cpp:428
 #, fuzzy
 msgid "Error retrieving user permissions."
 msgstr "Ikosa Umukoresha Uruhushya . "
 
-#: folderdiaacltab.cpp:431
+#: folderdiaacltab.cpp:430
+#, fuzzy
+msgid ""
+"You might not have enough permissions to see the permissions of this folder."
+msgstr "OYA Soma /Kwandika Kuri Agatebo njyamwanda Ububiko... . "
+
+#: folderdiaacltab.cpp:435
 #, fuzzy
-msgid "Information not retrieved from server yet, please use \"Check Mail\"."
+msgid ""
+"Information not retrieved from server, you need to use \"Check Mail\" and have "
+"administrative privileges on the folder."
 msgstr "OYA Kuva: Seriveri: , Koresha \" \" . "
 
-#: folderdiaacltab.cpp:446 folderdiaquotatab.cpp:114
+#: folderdiaacltab.cpp:450 folderdiaquotatab.cpp:114
 #, fuzzy
 msgid "Error: no IMAP account defined for this folder"
 msgstr "Ikosa : Oya Konti: ya:  iyi Ububiko... "
 
-#: folderdiaacltab.cpp:452 folderdiaquotatab.cpp:120
+#: folderdiaacltab.cpp:456 folderdiaquotatab.cpp:120
 #, fuzzy
 msgid "Connecting to server %1, please wait..."
 msgstr "Kuri Seriveri: %1 , Tegereza ... "
 
-#: folderdiaacltab.cpp:470 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:843
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
+#: kmfoldercachedimap.cpp:902
 #, fuzzy, c-format
 msgid "Error connecting to server %1"
 msgstr "Ikosa mu kwihuza kuri seriveri."
 
-#: folderdiaacltab.cpp:490 folderdiaacltab.cpp:517
+#: folderdiaacltab.cpp:494 folderdiaacltab.cpp:522
 #, fuzzy
 msgid "This IMAP server does not have support for access control lists (ACL)"
 msgstr "Seriveri: OYA Gushigikira ya:  Igenzura Intonde ( ) "
 
-#: folderdiaacltab.cpp:519
+#: folderdiaacltab.cpp:524
 #, fuzzy, c-format
 msgid ""
 "Error retrieving access control list (ACL) from server\n"
 "%1"
 msgstr "Ikosa Igenzura Urutonde ( ) Kuva: %1 "
 
-#: folderdiaacltab.cpp:564
+#: folderdiaacltab.cpp:569
 #, fuzzy
 msgid "Modify Permissions"
 msgstr "Kugaragaza Impushya "
 
-#: folderdiaacltab.cpp:598
+#: folderdiaacltab.cpp:603
 #, fuzzy
 msgid "Add Permissions"
 msgstr "Impushya zihanitse"
 
-#: folderdiaacltab.cpp:631
+#: folderdiaacltab.cpp:636
 #, fuzzy
 msgid ""
 "Do you really want to remove your own permissions for this folder? You will not "
@@ -3752,8 +4072,8 @@ msgstr ""
 msgid "Select Folder"
 msgstr "Guhitamo Ububiko"
 
-#: 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 "Ububiko bwo hafi"
 
@@ -3788,7 +4108,7 @@ msgstr ""
 "Ububiko... , Kanda i Akabuto munsi na Hanyuma Kanda i Urufunguzo ( S ) Kuri Na: "
 "iyi Ububiko... . </qt> "
 
-#: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:526 snippetdlg.cpp:93
+#: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:530 snippetdlg.cpp:100
 #, fuzzy
 msgid "The selected shortcut is already used, please select a different one."
 msgstr "Byahiswemo Iy'ibusamo ni Byakoreshejwe , Guhitamo A Rimwe . "
@@ -3805,13 +4125,23 @@ msgstr "Koporora hano"
 msgid "C&ancel"
 msgstr "Kureka"
 
-#: headeritem.cpp:157 headeritem.cpp:164
+#: folderutil.cpp:93
+#, fuzzy
+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> Ububiko... Kyasibwe: %S Na: i Konti: <b> %1 </b> "
+"Ibaruwa . Ububiko... i Konti: Gishya Ibaruwa Kugarura Kuri i Ububiko... . </qt> "
+
+#: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
 msgstr "Kitazwi"
 
-#: 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
 #, fuzzy
 msgid "No Subject"
 msgstr "Nta kivugwaho"
@@ -3832,52 +4162,52 @@ msgstr "i Shakisha Byose Ubutumwa Nanone . "
 msgid "Stat&us:"
 msgstr "Imimerere:"
 
-#: headerlistquicksearch.cpp:72
+#: headerlistquicksearch.cpp:73
 #, fuzzy
 msgid "Any Status"
 msgstr "Imiterere y'umwanda"
 
-#: headerlistquicksearch.cpp:91
+#: headerlistquicksearch.cpp:93
 #, fuzzy
 msgid "Open Full Search"
 msgstr "Gusibiramo Ishaka"
 
-#: headerstyle.cpp:169 headerstyle.cpp:296 headerstyle.cpp:647
-#: headerstyle.cpp:860
+#: headerstyle.cpp:170 headerstyle.cpp:298 headerstyle.cpp:765
+#: headerstyle.cpp:974
 #, fuzzy
 msgid "[vCard]"
 msgstr "vCard"
 
-#: headerstyle.cpp:174 headerstyle.cpp:314 headerstyle.cpp:672
-#: headerstyle.cpp:797
+#: headerstyle.cpp:175 headerstyle.cpp:316 headerstyle.cpp:790
+#: headerstyle.cpp:998
 #, fuzzy
 msgid "CC: "
 msgstr "KopiKubandi"
 
-#: headerstyle.cpp:177 headerstyle.cpp:318 headerstyle.cpp:679
-#: headerstyle.cpp:800
+#: headerstyle.cpp:178 headerstyle.cpp:320 headerstyle.cpp:797
+#: headerstyle.cpp:1008
 #, fuzzy
 msgid "BCC: "
 msgstr "KopikubandiBihishiwe:"
 
-#: headerstyle.cpp:272 headerstyle.cpp:685
+#: headerstyle.cpp:274 headerstyle.cpp:803
 msgid "Date: "
 msgstr "Itariki:"
 
-#: headerstyle.cpp:292 headerstyle.cpp:639 headerstyle.cpp:865
+#: headerstyle.cpp:294 headerstyle.cpp:757 headerstyle.cpp:979
 msgid "From: "
 msgstr "Kuva:"
 
-#: headerstyle.cpp:310 headerstyle.cpp:665 headerstyle.cpp:873
+#: headerstyle.cpp:312 headerstyle.cpp:783 headerstyle.cpp:988
 msgid "To: "
 msgstr "Kuri:"
 
-#: headerstyle.cpp:322
+#: headerstyle.cpp:324
 #, fuzzy
 msgid "Reply to: "
 msgstr "Subiza- Kuri:"
 
-#: headerstyle.cpp:408
+#: headerstyle.cpp:410
 #, fuzzy
 msgid ""
 "%1% probability of being spam.\n"
@@ -3890,26 +4220,49 @@ msgstr ""
 "Icyegeranyo : \n"
 "%2 "
 
-#: headerstyle.cpp:609
+#: headerstyle.cpp:612
 #, fuzzy
 msgid "Launch IM"
 msgstr "Fungura idosiye"
 
-#: headerstyle.cpp:642
+#: headerstyle.cpp:660
+msgid "Night"
+msgstr ""
+
+#: headerstyle.cpp:669
+#, fuzzy
+msgid "Morning"
+msgstr "Amabwiriza"
+
+#: headerstyle.cpp:678
+#, fuzzy
+msgid "Afternoon"
+msgstr "Nyuma"
+
+#: headerstyle.cpp:687
+msgid "Evening"
+msgstr ""
+
+#: headerstyle.cpp:724
+#, fuzzy
+msgid "Sender's Current Time:"
+msgstr "Ikiranga : "
+
+#: headerstyle.cpp:760
 #, fuzzy
 msgid "(resent from %1)"
 msgstr "( Kuva: %1 ) "
 
-#: headerstyle.cpp:694
+#: headerstyle.cpp:812
 #, fuzzy
 msgid "User-Agent: "
 msgstr "Byihutirwa"
 
-#: headerstyle.cpp:703
+#: headerstyle.cpp:821
 msgid "X-Mailer: "
 msgstr ""
 
-#: headerstyle.cpp:723
+#: headerstyle.cpp:843
 #, fuzzy
 msgid "Spam Status:"
 msgstr "Imimerere:"
@@ -3982,17 +4335,17 @@ msgstr ""
 "<br> G "
 "<br> e </qt> "
 
-#: identitydialog.cpp:90
+#: identitydialog.cpp:93
 #, fuzzy
 msgid "Edit Identity"
 msgstr "Ikiranga"
 
-#: identitydialog.cpp:118
+#: identitydialog.cpp:121
 #, fuzzy
 msgid "&Your name:"
 msgstr "Izina ryawe:"
 
-#: identitydialog.cpp:120
+#: identitydialog.cpp:123
 #, fuzzy
 msgid ""
 "<qt>"
@@ -4008,11 +4361,11 @@ msgstr ""
 "Inyuma ; </p> "
 "<p> NIBA iyi Ahatanditseho Izina: OYA Kugaragara , i Imeli Aderesi: . </p> </qt> "
 
-#: identitydialog.cpp:132
+#: identitydialog.cpp:135
 msgid "Organi&zation:"
 msgstr "Ikigo:"
 
-#: identitydialog.cpp:134
+#: identitydialog.cpp:137
 #, fuzzy
 msgid ""
 "<qt>"
@@ -4027,17 +4380,20 @@ msgstr ""
 "Inyuma . </p> "
 "<p> ni ( na Bisanzwe ) Kuri iyi Ahatanditseho . </p> </qt> "
 
-#: identitydialog.cpp:147
+#: identitydialog.cpp:149
 #, fuzzy
 msgid "&Email address:"
 msgstr "Aderesi ya imeli:"
 
-#: 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 ""
@@ -4046,29 +4402,53 @@ msgstr ""
 "<p> Umwanya Cyuzuye Imeli Aderesi: . </p> "
 "<p> iyi Ahatanditseho , Cyangwa Kubona , Abantu Kuri . </p> </qt> "
 
-#: identitydialog.cpp:161
+#: identitydialog.cpp:165
+#, fuzzy
+msgid "Email a&liases:"
+msgstr "Aderesi ya imeli:"
+
+#: 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
 #, fuzzy
 msgid "Cryptograph&y"
 msgstr "Uburyo bw'icapa nyaziya"
 
-#: identitydialog.cpp:168 identitydialog.cpp:192 identitydialog.cpp:217
-#: identitydialog.cpp:243
+#: identitydialog.cpp:192 identitydialog.cpp:216 identitydialog.cpp:241
+#: identitydialog.cpp:267
 #, fuzzy
 msgid "Chang&e..."
 msgstr "Guhindura..."
 
-#: identitydialog.cpp:169
+#: identitydialog.cpp:193
 #, fuzzy
 msgid "Your OpenPGP Signature Key"
 msgstr "Comment=Umukono GufunguraPGP Utandukanyijwe"
 
-#: identitydialog.cpp:170
+#: identitydialog.cpp:194
 #, fuzzy
 msgid ""
 "Select the OpenPGP key which should be used to digitally sign your messages."
 msgstr "i Urufunguzo Byakoreshejwe Kuri Shyiraho Umukono Ubutumwa . "
 
-#: identitydialog.cpp:174
+#: identitydialog.cpp:198
 #, fuzzy
 msgid ""
 "<qt>"
@@ -4086,17 +4466,17 @@ msgstr ""
 "<p> Gushaka Inyuma Birenzeho Bigyanye Utubuto Ku < A > HTTP : //www . . org </a> "
 "</p> </qt> "
 
-#: identitydialog.cpp:181
+#: identitydialog.cpp:205
 #, fuzzy
 msgid "OpenPGP signing key:"
 msgstr "Ishirwaho umukono Urufunguzo : "
 
-#: identitydialog.cpp:193
+#: identitydialog.cpp:217
 #, fuzzy
 msgid "Your OpenPGP Encryption Key"
 msgstr "Urufunguzo rw'isobeka:"
 
-#: identitydialog.cpp:194
+#: identitydialog.cpp:218
 #, fuzzy
 msgid ""
 "Select the OpenPGP key which should be used when encrypting to yourself and for "
@@ -4104,7 +4484,7 @@ msgid ""
 msgstr ""
 "i Urufunguzo Byakoreshejwe Ryari: Kuri na ya:  i \" \" Ikiranga in i &Uhimba . "
 
-#: identitydialog.cpp:199
+#: identitydialog.cpp:223
 #, fuzzy
 msgid ""
 "<qt>"
@@ -4124,24 +4504,24 @@ msgstr ""
 "<p> Gushaka Inyuma Birenzeho Bigyanye Utubuto Ku < A > HTTP : //www . . org </a> "
 "</qt> "
 
-#: identitydialog.cpp:206
+#: identitydialog.cpp:230
 #, fuzzy
 msgid "OpenPGP encryption key:"
 msgstr "Bishunzwe: Urufunguzo : "
 
-#: identitydialog.cpp:218
+#: identitydialog.cpp:242
 #, fuzzy
 msgid "Your S/MIME Signature Certificate"
 msgstr "S /"
 
-#: identitydialog.cpp:219
+#: identitydialog.cpp:243
 #, fuzzy
 msgid ""
 "Select the S/MIME certificate which should be used to digitally sign your "
 "messages."
 msgstr "i S /Impamyabushobozi: Byakoreshejwe Kuri Shyiraho Umukono Ubutumwa . "
 
-#: identitydialog.cpp:223
+#: identitydialog.cpp:247
 #, fuzzy
 msgid ""
 "<qt>"
@@ -4156,17 +4536,17 @@ msgstr ""
 "<p> iyi Ahatanditseho , OYA Kuri Shyiraho Umukono ikoresha S /; Bisanzwe "
 "Ibaruwa Imimaro OYA . </p> </qt> "
 
-#: identitydialog.cpp:228
+#: identitydialog.cpp:252
 #, fuzzy
 msgid "S/MIME signing certificate:"
 msgstr "S /Ishirwaho umukono Impamyabushobozi: : "
 
-#: identitydialog.cpp:244
+#: identitydialog.cpp:268
 #, fuzzy
 msgid "Your S/MIME Encryption Certificate"
 msgstr "S /"
 
-#: identitydialog.cpp:245
+#: identitydialog.cpp:269
 #, fuzzy
 msgid ""
 "Select the S/MIME certificate which should be used when encrypting to yourself "
@@ -4175,7 +4555,7 @@ msgstr ""
 "i S /Impamyabushobozi: Byakoreshejwe Ryari: Kuri na ya:  i \" \" Ikiranga in i "
 "&Uhimba . "
 
-#: identitydialog.cpp:250
+#: identitydialog.cpp:274
 #, fuzzy
 msgid ""
 "<qt>"
@@ -4191,26 +4571,26 @@ msgstr ""
 "<p> iyi Ahatanditseho , OYA Kuri Shyiraho Umutekano Amakopi Bya Ubutumwa Kuri "
 "ikoresha S /; Bisanzwe Ibaruwa Imimaro OYA . </p> </qt> "
 
-#: identitydialog.cpp:256
+#: identitydialog.cpp:280
 #, fuzzy
 msgid "S/MIME encryption certificate:"
 msgstr "S /Bishunzwe: Impamyabushobozi: : "
 
-#: identitydialog.cpp:277
+#: identitydialog.cpp:301
 #, fuzzy
 msgid "Preferred crypto message format:"
 msgstr "&Ubutumwa Imiterere : "
 
-#: identitydialog.cpp:290
+#: identitydialog.cpp:314
 msgid "&Advanced"
 msgstr "Urwego rwo hejuru"
 
-#: identitydialog.cpp:300
+#: identitydialog.cpp:324
 #, fuzzy
 msgid "&Reply-To address:"
 msgstr "Aderesi yo gusubirizaho:"
 
-#: identitydialog.cpp:302
+#: identitydialog.cpp:326
 #, fuzzy
 msgid ""
 "<qt>"
@@ -4231,12 +4611,12 @@ msgstr ""
 "Itsinda Aderesi: . </p> "
 "<p> in , iyi Umwanya Ahatanditseho . </p> </qt> "
 
-#: identitydialog.cpp:319
+#: identitydialog.cpp:343
 #, fuzzy
 msgid "&BCC addresses:"
 msgstr "Amaderesi : "
 
-#: identitydialog.cpp:321
+#: identitydialog.cpp:345
 #, fuzzy
 msgid ""
 "<qt>"
@@ -4259,56 +4639,61 @@ msgstr ""
 "Abandikiwe... . </p> "
 "<p> in , iyi Umwanya Ahatanditseho . </p> </qt> "
 
-#: identitydialog.cpp:337
+#: identitydialog.cpp:361
 #, fuzzy
 msgid "D&ictionary:"
 msgstr "Inkoranya:"
 
-#: identitydialog.cpp:346
+#: identitydialog.cpp:370
 #, fuzzy
 msgid "Sent-mail &folder:"
 msgstr "- Ibaruwa Ububiko... : "
 
-#: identitydialog.cpp:355
+#: identitydialog.cpp:379
 #, fuzzy
 msgid "&Drafts folder:"
 msgstr "Ububiko... : "
 
-#: identitydialog.cpp:364
+#: identitydialog.cpp:388
 #, fuzzy
 msgid "&Templates folder:"
 msgstr "Ububiko... : "
 
-#: identitydialog.cpp:369
+#: identitydialog.cpp:393
 #, fuzzy
 msgid "Special &transport:"
 msgstr "Urupapuro Rwihariye"
 
-#: identitydialog.cpp:386 kmfolderdia.cpp:717
+#: identitydialog.cpp:410 kmfolderdia.cpp:808
 #, fuzzy
 msgid "&Use custom message templates"
 msgstr "Guhanga &Ubutumwa - ID Ingereka "
 
-#: identitydialog.cpp:392 kmfolderdia.cpp:725
+#: identitydialog.cpp:416 kmfolderdia.cpp:816
 msgid "&Copy global templates"
 msgstr ""
 
-#: identitydialog.cpp:407
+#: identitydialog.cpp:431
 #, fuzzy
 msgid "&Signature"
 msgstr "Isinya"
 
-#: identitydialog.cpp:411
+#: identitydialog.cpp:435
 #, fuzzy
 msgid "&Picture"
 msgstr "Ishusho"
 
-#: identitydialog.cpp:486 identitydialog.cpp:498 kmcomposewin.cpp:4004
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
 #, fuzzy
 msgid "Invalid Email Address"
 msgstr "Imeli"
 
-#: identitydialog.cpp:518
+#: identitydialog.cpp:530
+#, fuzzy
+msgid "Invalid Email Alias \"%1\""
+msgstr "Imeli"
+
+#: identitydialog.cpp:551
 #, fuzzy
 msgid ""
 "One of the configured OpenPGP signing keys does not contain any user ID with "
@@ -4320,7 +4705,7 @@ msgstr ""
 "Aderesi: ya:  iyi Ikiranga ( %1 ) . \n"
 "Igisubizo in Iburira Ubutumwa ku i Ryari: Kuri Gusuzuma: Na: iyi Iboneza . "
 
-#: identitydialog.cpp:527
+#: identitydialog.cpp:560
 #, fuzzy
 msgid ""
 "One of the configured OpenPGP encryption keys does not contain any user ID with "
@@ -4329,7 +4714,7 @@ msgstr ""
 "Bya i Bishunzwe: Utubuto OYA Icyo ari cyo cyose Umukoresha Na: i Imeli Aderesi: "
 "ya:  iyi Ikiranga ( %1 ) . "
 
-#: identitydialog.cpp:534
+#: identitydialog.cpp:567
 #, fuzzy
 msgid ""
 "One of the configured S/MIME signing certificates does not contain the "
@@ -4341,7 +4726,7 @@ msgstr ""
 "Ikiranga ( %1 ) . \n"
 "Igisubizo in Iburira Ubutumwa ku i Ryari: Kuri Gusuzuma: Na: iyi Iboneza . "
 
-#: identitydialog.cpp:543
+#: identitydialog.cpp:576
 #, fuzzy
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
@@ -4350,22 +4735,22 @@ msgstr ""
 "Bya i S /Bishunzwe: Impamyabushobozi OYA i Imeli Aderesi: ya:  iyi Ikiranga ( "
 "%1 ) . "
 
-#: identitydialog.cpp:551
+#: identitydialog.cpp:584
 #, fuzzy
 msgid "Email Address Not Found in Key/Certificates"
 msgstr "in /"
 
-#: identitydialog.cpp:562
+#: identitydialog.cpp:595
 #, fuzzy
 msgid "The signature file is not valid"
 msgstr "Isinya Idosiye ni OYA Byemewe "
 
-#: identitydialog.cpp:582
+#: identitydialog.cpp:615
 #, fuzzy
 msgid "Edit Identity \"%1\""
 msgstr "Kwandika icyinjizwa cy'umubarendanga"
 
-#: identitydialog.cpp:606
+#: identitydialog.cpp:640
 #, fuzzy
 msgid ""
 "The custom sent-mail folder for identity \"%1\" does not exist (anymore); "
@@ -4374,7 +4759,7 @@ msgstr ""
 "Guhanga Yoherejwe: - Ibaruwa Ububiko... ya:  Ikiranga \" %1 \" OYA ( ) ; , i "
 "Mburabuzi Yoherejwe: - Ibaruwa Ububiko... Byakoreshejwe . "
 
-#: identitydialog.cpp:617
+#: identitydialog.cpp:651
 #, fuzzy
 msgid ""
 "The custom drafts folder for identity \"%1\" does not exist (anymore); "
@@ -4383,7 +4768,7 @@ msgstr ""
 "Guhanga Inyandiko z'agateganyo Ububiko... ya:  Ikiranga \" %1 \" OYA ( ) ; , i "
 "Mburabuzi Inyandiko z'agateganyo Ububiko... Byakoreshejwe . "
 
-#: identitydialog.cpp:628
+#: identitydialog.cpp:662
 #, fuzzy
 msgid ""
 "The custom templates folder for identity \"%1\" does not exist (anymore); "
@@ -4409,37 +4794,37 @@ msgstr "Ikiranga"
 msgid "Email Address"
 msgstr "Imeli"
 
-#: imapaccountbase.cpp:291 popaccount.cpp:154
+#: imapaccountbase.cpp:293 popaccount.cpp:154
 #, fuzzy
 msgid "You need to supply a username and a password to access this mailbox."
 msgstr ""
 "Kuri A Izina ry'ukoresha na A Ijambobanga Kuri iyi Agasanduku k'ubutumwa . "
 
-#: imapaccountbase.cpp:296
+#: imapaccountbase.cpp:298
 msgid "Authorization Dialog"
 msgstr ""
 
-#: imapaccountbase.cpp:297 popaccount.cpp:155
+#: imapaccountbase.cpp:299 popaccount.cpp:155
 #, fuzzy
 msgid "Account:"
 msgstr "Konti:"
 
-#: imapaccountbase.cpp:318
+#: imapaccountbase.cpp:320
 #, fuzzy, c-format
 msgid "Could not start process for %1."
 msgstr "OYA Tangira &vendorShortName; ya:  %1 . "
 
-#: imapaccountbase.cpp:399
+#: imapaccountbase.cpp:403
 #, fuzzy
 msgid "Error while trying to subscribe to %1:"
 msgstr "Ikosa Kuri Kwiyandikisha Kuri %1 : "
 
-#: imapaccountbase.cpp:637
+#: imapaccountbase.cpp:645
 #, fuzzy
 msgid "Retrieving Namespaces"
 msgstr "Gukuramo imyanya isigara"
 
-#: imapaccountbase.cpp:728
+#: imapaccountbase.cpp:736
 #, fuzzy
 msgid ""
 "KMail has detected a prefix entry in the configuration of the account \"%1\" "
@@ -4448,30 +4833,30 @@ msgstr ""
 "A Imbanziriza Icyinjijwe in i Iboneza Bya i Konti: \" %1 \" ni Na: i "
 "Gushigikira Bya Imyanyazina . "
 
-#: imapaccountbase.cpp:742 imapaccountbase.cpp:756
+#: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 #, fuzzy
 msgid ""
 "The configuration was automatically migrated but you should check your account "
 "configuration."
 msgstr "Iboneza mu buryo bwikora: Kugenzura Konti: Iboneza . "
 
-#: imapaccountbase.cpp:760
+#: imapaccountbase.cpp:768
 #, fuzzy
 msgid ""
 "It was not possible to migrate your configuration automatically so please check "
 "your account configuration."
 msgstr "OYA Kuri Iboneza mu buryo bwikora: Kugenzura Konti: Iboneza . "
 
-#: imapaccountbase.cpp:874 imapaccountbase.cpp:875
+#: imapaccountbase.cpp:882 imapaccountbase.cpp:883
 msgid "<unknown>"
 msgstr "<kitazwi>"
 
-#: imapaccountbase.cpp:876
+#: imapaccountbase.cpp:884
 #, fuzzy
 msgid "Error while uploading message"
 msgstr "Ikosa Koherezayo %1 &Ubutumwa "
 
-#: imapaccountbase.cpp:878
+#: imapaccountbase.cpp:886
 #, fuzzy
 msgid ""
 "Could not upload the message dated %1 from <i>%2</i> with subject <i>%3</i> "
@@ -4479,32 +4864,32 @@ msgid ""
 msgstr ""
 "OYA Gushyiraho i &Ubutumwa %1 Kuva: %2 Na: Ikivugwaho: %3 ku i Seriveri: . "
 
-#: imapaccountbase.cpp:880
+#: imapaccountbase.cpp:888
 #, fuzzy
 msgid "The destination folder was: <b>%1</b>."
 msgstr "Ububiko bw'Ishyika"
 
-#: imapaccountbase.cpp:882
+#: imapaccountbase.cpp:890
 msgid "The server reported:"
 msgstr ""
 
-#: imapaccountbase.cpp:892
+#: imapaccountbase.cpp:900
 #, fuzzy
 msgid "No detailed quota information available."
 msgstr "Imimerere Ibisobanuro: Bihari . "
 
-#: imapaccountbase.cpp:903
+#: imapaccountbase.cpp:911
 msgid "The folder is too close to its quota limit. (%1)"
 msgstr ""
 
-#: imapaccountbase.cpp:905
+#: imapaccountbase.cpp:913
 msgid ""
 "\n"
 "Since you do not have write privileges on this folder, please ask the owner of "
 "the folder to free up some space in it."
 msgstr ""
 
-#: imapaccountbase.cpp:951
+#: imapaccountbase.cpp:959
 #, fuzzy
 msgid ""
 "The connection to the server %1 was unexpectedly closed or timed out. It will "
@@ -4512,27 +4897,27 @@ msgid ""
 msgstr ""
 "Ukwihuza Kuri i Seriveri: %1 Cyangwa Inyuma . - mu buryo bwikora: NIBA . "
 
-#: imapaccountbase.cpp:957
+#: imapaccountbase.cpp:965
 #, fuzzy
 msgid "The connection to account %1 was broken."
 msgstr "Ukwihuza Kuri Konti: %1 . "
 
-#: imapaccountbase.cpp:960
+#: imapaccountbase.cpp:968
 #, fuzzy
 msgid "The connection to account %1 timed out."
 msgstr "Ukwihuza Kuri Konti: %1 Inyuma . "
 
-#: imapaccountbase.cpp:1245
+#: imapaccountbase.cpp:1253
 #, fuzzy
 msgid "Error while uploading status of messages to server: "
 msgstr "Ikosa Koherezayo %1 Imimerere Bya Ubutumwa Kuri Seriveri: : "
 
-#: imapaccountbase.cpp:1290 listjob.cpp:118
+#: imapaccountbase.cpp:1298 listjob.cpp:118
 #, fuzzy
 msgid "retrieving folders"
 msgstr "Ububiko "
 
-#: imapjob.cpp:153 kmfolderimap.cpp:496
+#: imapjob.cpp:153 kmfolderimap.cpp:490
 #, fuzzy
 msgid "Uploading message data"
 msgstr "&Ubutumwa Ibyatanzwe "
@@ -4562,50 +4947,387 @@ msgstr "Na: Ikivugwaho: : "
 msgid "Error while retrieving messages from the server."
 msgstr "Ikosa Ubutumwa Kuva: i Seriveri: . "
 
-#: imapjob.cpp:483
+#: imapjob.cpp:485
 #, fuzzy
 msgid "Error while retrieving information on the structure of a message."
 msgstr "Ikosa Ibisobanuro: ku i Imiterere Bya A &Ubutumwa . "
 
-#: imapjob.cpp:541
+#: imapjob.cpp:543
 #, fuzzy
 msgid "Uploading message data failed."
 msgstr "&Ubutumwa Ibyatanzwe Byanze . "
 
-#: imapjob.cpp:546
+#: imapjob.cpp:548
 #, fuzzy
 msgid "Uploading message data completed."
 msgstr "&Ubutumwa Ibyatanzwe Byarangiye . "
 
-#: imapjob.cpp:650
+#: imapjob.cpp:652
 #, fuzzy
 msgid "Error while copying messages."
 msgstr "Ikosa Gukoporora Ubutumwa . "
 
-#: keyresolver.cpp:234
+#: importarchivedialog.cpp:36
+#, fuzzy
+msgid "Import Archive"
+msgstr "Ubushyinguro"
+
+#: importarchivedialog.cpp:87
+msgid "Please select an archive file that should be imported."
+msgstr ""
+
+#: importarchivedialog.cpp:88
+#, fuzzy
+msgid "No archive file selected"
+msgstr "Nta wutanga watoranyijwe."
+
+#: importarchivedialog.cpp:93
+#, fuzzy
+msgid "Please select the folder where the archive should be imported to."
+msgstr "Guhitamo A Ububiko... Kuri Ubutumwa . "
+
+#: importarchivedialog.cpp:94
+#, fuzzy
+msgid "No target folder selected"
+msgstr "Nta wutanga watoranyijwe."
+
+#: 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 Gishya Ibanga Urufunguzo cyavuye ahandi/cyatumijwe . \n"
+"%n Gishya Ibanga Utubuto cyavuye ahandi/cyatumijwe . "
+
+#: importjob.cpp:83
+#, fuzzy
+msgid "Import finished."
+msgstr "Kuzana Idosiye"
+
+#: importjob.cpp:98
+#, fuzzy
+msgid "Failed to import the archive into folder '%1'."
+msgstr "Kuri Kurema Ububiko... "
+
+#: importjob.cpp:105
+#, fuzzy
+msgid "Importing archive failed."
+msgstr "Ubwihisho Idosiye "
+
+#: importjob.cpp:114 importjob.cpp:287
+#, fuzzy
+msgid "Unable to create subfolder for folder '%1'."
+msgstr "Kuri Kurema Ububiko... "
+
+#: importjob.cpp:214
+#, fuzzy, c-format
+msgid "Importing folder %1"
+msgstr "Guhindura izina ry'Ububiko..."
+
+#: importjob.cpp:234
+#, fuzzy
+msgid "Failed to add a message to the folder '%1'."
+msgstr "OYA &Ongera &Ubutumwa Kuri Ububiko... : "
+
+#: importjob.cpp:254
+#, fuzzy
+msgid "Failed to upload a message to the IMAP server."
+msgstr "Ubutumwa ku i Seriveri: "
+
+#: 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 "Ubushyinguro"
+
+#: keyresolver.cpp:306
 msgid ""
 "One or more of your configured OpenPGP encryption keys or S/MIME certificates "
 "is not fully trusted for encryption."
 msgstr ""
 
-#: keyresolver.cpp:240
+#: keyresolver.cpp:309
+msgid ""
+"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
+"\"%1\" is not fully trusted for encryption."
+msgstr ""
+
+#: keyresolver.cpp:315
 msgid ""
 "\n"
 "The following keys are only marginally trusted: \n"
 msgstr ""
 
-#: keyresolver.cpp:244
+#: keyresolver.cpp:319
 msgid ""
 "\n"
 "The following keys or certificates have unknown trust level: \n"
 msgstr ""
 
-#: keyresolver.cpp:248
+#: keyresolver.cpp:323
+msgid ""
+"\n"
+"The following keys or certificates are <b>revoked</b>: \n"
+msgstr ""
+
+#: keyresolver.cpp:327
 #, fuzzy
 msgid "Not Fully Trusted Encryption Keys"
 msgstr "Urufunguzo rw'isobeka:"
 
-#: 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> Ishirwaho umukono Urufunguzo </p> < p Itunganya = Hagati > <b> %1 </b> "
+"( %2 ) </p> "
+"<p> Yarenze igihe: in Birutwa A &Umunsi . </p> \n"
+"<p> Ishirwaho umukono Urufunguzo </p> < p Itunganya = Hagati > <b> %1 </b> "
+"( %2 ) </p> "
+"<p> Yarenze igihe: in Birutwa %n iminsi . </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> Bishunzwe: Urufunguzo </p> < p Itunganya = Hagati > <b> %1 </b> ( %2 ) </p> "
+"<p> Yarenze igihe: in Birutwa A &Umunsi . </p> \n"
+"<p> Bishunzwe: Urufunguzo </p> < p Itunganya = Hagati > <b> %1 </b> ( %2 ) </p> "
+"<p> Yarenze igihe: in Birutwa %n iminsi . </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> Urufunguzo ya:  </p> < p Itunganya = Hagati > <b> %1 </b> ( %2 ) </p> "
+"<p> Yarenze igihe: in Birutwa A &Umunsi . </p> \n"
+"<p> Urufunguzo ya:  </p> < p Itunganya = Hagati > <b> %1 </b> ( %2 ) </p> "
+"<p> Yarenze igihe: in Birutwa %n iminsi . </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> Imizi Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %3 </b> </p> "
+"<p> ya:  S /Ishirwaho umukono Impamyabushobozi: </p> < p Itunganya = Hagati > "
+"<b> %1 </b> ( Urujyano Umubare %2 ) </p> "
+"<p> Yarenze igihe: in Birutwa A &Umunsi . </p> \n"
+"<p> Imizi Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %3 </b> </p> "
+"<p> ya:  S /Ishirwaho umukono Impamyabushobozi: </p> < p Itunganya = Hagati > "
+"<b> %1 </b> ( Urujyano Umubare %2 ) </p> "
+"<p> Yarenze igihe: in Birutwa %n iminsi . </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> Imizi Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %3 </b> </p> "
+"<p> ya:  S /Bishunzwe: Impamyabushobozi: </p> < p Itunganya = Hagati > <b> "
+"%1 </b> ( Urujyano Umubare %2 ) </p> "
+"<p> Yarenze igihe: in Birutwa A &Umunsi . </p> \n"
+"<p> Imizi Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %3 </b> </p> "
+"<p> ya:  S /Bishunzwe: Impamyabushobozi: </p> < p Itunganya = Hagati > <b> "
+"%1 </b> ( Urujyano Umubare %2 ) </p> "
+"<p> Yarenze igihe: in Birutwa %n iminsi . </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> Imizi Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %3 </b> </p> "
+"<p> ya:  S /Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %1 </b> "
+"( Urujyano Umubare %2 ) </p> "
+"<p> Yarenze igihe: in Birutwa A &Umunsi . </p> \n"
+"<p> Imizi Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %3 </b> </p> "
+"<p> ya:  S /Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %1 </b> "
+"( Urujyano Umubare %2 ) </p> "
+"<p> Yarenze igihe: in Birutwa %n iminsi . </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> Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %3 </b> </p> "
+"<p> ya:  S /Ishirwaho umukono Impamyabushobozi: </p> < p Itunganya = Hagati > "
+"<b> %1 </b> ( Urujyano Umubare %2 ) </p> "
+"<p> Yarenze igihe: in Birutwa A &Umunsi . </p> \n"
+"<p> Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %3 </b> </p> "
+"<p> ya:  S /Ishirwaho umukono Impamyabushobozi: </p> < p Itunganya = Hagati > "
+"<b> %1 </b> ( Urujyano Umubare %2 ) </p> "
+"<p> Yarenze igihe: in Birutwa %n iminsi . </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> Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %3 </b> </p> "
+"<p> ya:  S /Bishunzwe: Impamyabushobozi: </p> < p Itunganya = Hagati > <b> "
+"%1 </b> ( Urujyano Umubare %2 ) </p> "
+"<p> Yarenze igihe: in Birutwa A &Umunsi . </p> \n"
+"<p> Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %3 </b> </p> "
+"<p> ya:  S /Bishunzwe: Impamyabushobozi: </p> < p Itunganya = Hagati > <b> "
+"%1 </b> ( Urujyano Umubare %2 ) </p> "
+"<p> Yarenze igihe: in Birutwa %n iminsi . </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> Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %3 </b> </p> "
+"<p> ya:  S /Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %1 </b> "
+"( Urujyano Umubare %2 ) </p> "
+"<p> Yarenze igihe: in Birutwa A &Umunsi . </p> \n"
+"<p> Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %3 </b> </p> "
+"<p> ya:  S /Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %1 </b> "
+"( Urujyano Umubare %2 ) </p> "
+"<p> Yarenze igihe: in Birutwa %n iminsi . </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> S /Ishirwaho umukono Impamyabushobozi: </p> < p Itunganya = Hagati > <b> "
+"%1 </b> ( Urujyano Umubare %2 ) </p> "
+"<p> Yarenze igihe: in Birutwa A &Umunsi . </p> \n"
+"<p> S /Ishirwaho umukono Impamyabushobozi: </p> < p Itunganya = Hagati > <b> "
+"%1 </b> ( Urujyano Umubare %2 ) </p> "
+"<p> Yarenze igihe: in Birutwa %n iminsi . </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> S /Bishunzwe: Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %1 </b> "
+"( Urujyano Umubare %2 ) </p> "
+"<p> Yarenze igihe: in Birutwa A &Umunsi . </p> \n"
+"<p> S /Bishunzwe: Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %1 </b> "
+"( Urujyano Umubare %2 ) </p> "
+"<p> Yarenze igihe: in Birutwa %n iminsi . </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> S /Impamyabushobozi: ya:  </p> < p Itunganya = Hagati > <b> %1 </b> "
+"( Urujyano Umubare %2 ) </p> "
+"<p> Yarenze igihe: in Birutwa A &Umunsi . </p> \n"
+"<p> S /Impamyabushobozi: ya:  </p> < p Itunganya = Hagati > <b> %1 </b> "
+"( Urujyano Umubare %2 ) </p> "
+"<p> Yarenze igihe: in Birutwa %n iminsi . </p> "
+
+#: keyresolver.cpp:724
+#, fuzzy
+msgid "OpenPGP Key Expired"
+msgstr "Urufunguzo %1 "
+
+#: keyresolver.cpp:725
+#, fuzzy
+msgid "S/MIME Certificate Expired"
+msgstr "S /"
+
+#: keyresolver.cpp:750
 #, fuzzy
 msgid ""
 "_n: "
@@ -4621,7 +5343,7 @@ msgstr ""
 "( %2 ) </p> "
 "<p> Yarenze igihe: in Birutwa %n iminsi . </p> "
 
-#: keyresolver.cpp:558
+#: keyresolver.cpp:755
 #, fuzzy
 msgid ""
 "_n: "
@@ -4635,7 +5357,7 @@ msgstr ""
 "<p> Bishunzwe: Urufunguzo </p> < p Itunganya = Hagati > <b> %1 </b> ( %2 ) </p> "
 "<p> Yarenze igihe: in Birutwa %n iminsi . </p> "
 
-#: keyresolver.cpp:563
+#: keyresolver.cpp:760
 #, fuzzy
 msgid ""
 "_n: "
@@ -4649,7 +5371,7 @@ msgstr ""
 "<p> Urufunguzo ya:  </p> < p Itunganya = Hagati > <b> %1 </b> ( %2 ) </p> "
 "<p> Yarenze igihe: in Birutwa %n iminsi . </p> "
 
-#: keyresolver.cpp:573
+#: keyresolver.cpp:770
 #, fuzzy
 msgid ""
 "_n: "
@@ -4671,7 +5393,7 @@ msgstr ""
 "<b> %1 </b> ( Urujyano Umubare %2 ) </p> "
 "<p> Yarenze igihe: in Birutwa %n iminsi . </p> "
 
-#: keyresolver.cpp:580
+#: keyresolver.cpp:777
 #, fuzzy
 msgid ""
 "_n: "
@@ -4693,7 +5415,7 @@ msgstr ""
 "%1 </b> ( Urujyano Umubare %2 ) </p> "
 "<p> Yarenze igihe: in Birutwa %n iminsi . </p> "
 
-#: keyresolver.cpp:587
+#: keyresolver.cpp:784
 #, fuzzy
 msgid ""
 "_n: "
@@ -4713,7 +5435,7 @@ msgstr ""
 "( Urujyano Umubare %2 ) </p> "
 "<p> Yarenze igihe: in Birutwa %n iminsi . </p> "
 
-#: keyresolver.cpp:595
+#: keyresolver.cpp:792
 #, fuzzy
 msgid ""
 "_n: "
@@ -4735,7 +5457,7 @@ msgstr ""
 "<b> %1 </b> ( Urujyano Umubare %2 ) </p> "
 "<p> Yarenze igihe: in Birutwa %n iminsi . </p> "
 
-#: keyresolver.cpp:602
+#: keyresolver.cpp:799
 #, fuzzy
 msgid ""
 "_n: "
@@ -4757,7 +5479,7 @@ msgstr ""
 "%1 </b> ( Urujyano Umubare %2 ) </p> "
 "<p> Yarenze igihe: in Birutwa %n iminsi . </p> "
 
-#: keyresolver.cpp:609
+#: keyresolver.cpp:806
 #, fuzzy
 msgid ""
 "_n: "
@@ -4777,7 +5499,7 @@ msgstr ""
 "( Urujyano Umubare %2 ) </p> "
 "<p> Yarenze igihe: in Birutwa %n iminsi . </p> "
 
-#: keyresolver.cpp:618
+#: keyresolver.cpp:815
 #, fuzzy
 msgid ""
 "_n: "
@@ -4795,7 +5517,7 @@ msgstr ""
 "%1 </b> ( Urujyano Umubare %2 ) </p> "
 "<p> Yarenze igihe: in Birutwa %n iminsi . </p> "
 
-#: keyresolver.cpp:623
+#: keyresolver.cpp:820
 #, fuzzy
 msgid ""
 "_n: "
@@ -4813,7 +5535,7 @@ msgstr ""
 "( Urujyano Umubare %2 ) </p> "
 "<p> Yarenze igihe: in Birutwa %n iminsi . </p> "
 
-#: keyresolver.cpp:628
+#: keyresolver.cpp:825
 #, fuzzy
 msgid ""
 "_n: "
@@ -4831,16 +5553,16 @@ msgstr ""
 "( Urujyano Umubare %2 ) </p> "
 "<p> Yarenze igihe: in Birutwa %n iminsi . </p> "
 
-#: keyresolver.cpp:634
+#: keyresolver.cpp:832
 msgid "OpenPGP Key Expires Soon"
 msgstr ""
 
-#: keyresolver.cpp:635
+#: keyresolver.cpp:833
 #, fuzzy
 msgid "S/MIME Certificate Expires Soon"
 msgstr "S /"
 
-#: keyresolver.cpp:668
+#: keyresolver.cpp:867
 #, fuzzy
 msgid ""
 "One or more of your configured OpenPGP encryption keys or S/MIME certificates "
@@ -4855,12 +5577,12 @@ msgstr ""
 "Hitamo... Kuri Gukomeza , na i Utubuto Nyuma ku , Kuri Kugaragaza i Utubuto "
 "Kuri Koresha . "
 
-#: keyresolver.cpp:676 keyresolver.cpp:989 keyresolver.cpp:1016
+#: keyresolver.cpp:875 keyresolver.cpp:1204 keyresolver.cpp:1231
 #, fuzzy
 msgid "Unusable Encryption Keys"
 msgstr "Urufunguzo rw'isobeka:"
 
-#: keyresolver.cpp:712
+#: keyresolver.cpp:911
 #, fuzzy
 msgid ""
 "One or more of your configured OpenPGP signing keys or S/MIME signing "
@@ -4875,12 +5597,12 @@ msgstr ""
 "Hitamo... Kuri Gukomeza , na i Utubuto Nyuma ku , Kuri Kugaragaza i Utubuto "
 "Kuri Koresha . "
 
-#: keyresolver.cpp:720 keyresolver.cpp:1043 keyresolver.cpp:1059
+#: keyresolver.cpp:919 keyresolver.cpp:1258 keyresolver.cpp:1274
 #, fuzzy
 msgid "Unusable Signing Keys"
 msgstr "Gutoranya Buto Ifungura"
 
-#: keyresolver.cpp:980
+#: keyresolver.cpp:1195
 #, fuzzy
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
@@ -4895,7 +5617,7 @@ msgstr ""
 ", OYA Byemewe Bishunzwe: Utubuto ya:  iyi Ikiranga . \n"
 "Gicurasi Gukomeza Kuri , OYA Kuri Soma Ubutumwa NIBA . "
 
-#: keyresolver.cpp:1007
+#: keyresolver.cpp:1222
 #, fuzzy
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
@@ -4910,7 +5632,7 @@ msgstr ""
 ", OYA Byemewe S /Bishunzwe: Impamyabushobozi ya:  iyi Ikiranga . \n"
 "Gicurasi Gukomeza Kuri , OYA Kuri Soma Ubutumwa NIBA . "
 
-#: keyresolver.cpp:1037
+#: keyresolver.cpp:1252
 #, fuzzy
 msgid ""
 "Examination of recipient's signing preferences yielded that the message should "
@@ -4922,11 +5644,11 @@ msgstr ""
 "; \n"
 ", OYA Byemewe Ishirwaho umukono Impamyabushobozi ya:  iyi Ikiranga . "
 
-#: keyresolver.cpp:1044
+#: keyresolver.cpp:1259
 msgid "Do Not OpenPGP-Sign"
 msgstr ""
 
-#: keyresolver.cpp:1053
+#: keyresolver.cpp:1268
 #, fuzzy
 msgid ""
 "Examination of recipient's signing preferences yielded that the message should "
@@ -4938,12 +5660,12 @@ msgstr ""
 "Abandikiwe... ; \n"
 ", OYA Byemewe S /Ishirwaho umukono Impamyabushobozi ya:  iyi Ikiranga . "
 
-#: keyresolver.cpp:1060
+#: keyresolver.cpp:1275
 #, fuzzy
 msgid "Do Not S/MIME-Sign"
 msgstr "S /- "
 
-#: keyresolver.cpp:1116
+#: keyresolver.cpp:1331
 #, fuzzy
 msgid ""
 "Examination of recipient's signing preferences showed no common type of "
@@ -4954,12 +5676,12 @@ msgstr ""
 "umukono Utubuto . \n"
 "&Ubutumwa Ishirwaho umukono ? "
 
-#: keyresolver.cpp:1120
+#: keyresolver.cpp:1335
 #, fuzzy
 msgid "No signing possible"
 msgstr "Ishirwaho umukono "
 
-#: keyresolver.cpp:1275
+#: keyresolver.cpp:1490
 #, fuzzy
 msgid ""
 "You did not select an encryption key for yourself (encrypt to self). You will "
@@ -4968,18 +5690,18 @@ msgstr ""
 "OYA Guhitamo Bishunzwe: Urufunguzo ya:  ( Shyiraho Umutekano Kuri ) . OYA Kuri "
 "&Ubutumwa NIBA Shyiraho Umutekano . "
 
-#: keyresolver.cpp:1279 keyresolver.cpp:1303 keyresolver.cpp:1317
+#: keyresolver.cpp:1494 keyresolver.cpp:1518 keyresolver.cpp:1532
 #, fuzzy
 msgid "Missing Key Warning"
 msgstr "Iburira ry'ibura ry'ibimenyetso."
 
-#: 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
 #, fuzzy
 msgid "&Encrypt"
 msgstr "Shyiraho Umutekano"
 
-#: keyresolver.cpp:1296
+#: keyresolver.cpp:1511
 #, fuzzy
 msgid ""
 "You did not select an encryption key for the recipient of this message; "
@@ -4988,7 +5710,7 @@ msgstr ""
 "OYA Guhitamo Bishunzwe: Urufunguzo ya:  i Uwandikiwe Bya iyi &Ubutumwa ; , i "
 "&Ubutumwa OYA Bishunzwe: . "
 
-#: keyresolver.cpp:1299
+#: keyresolver.cpp:1514
 #, fuzzy
 msgid ""
 "You did not select an encryption key for any of the recipients of this message; "
@@ -4997,12 +5719,12 @@ msgstr ""
 "OYA Guhitamo Bishunzwe: Urufunguzo ya:  Icyo ari cyo cyose Bya i Abandikiwe... "
 "Bya iyi &Ubutumwa ; , i &Ubutumwa OYA Bishunzwe: . "
 
-#: keyresolver.cpp:1304 messagecomposer.cpp:933
+#: keyresolver.cpp:1519 messagecomposer.cpp:931
 #, fuzzy
 msgid "Send &Unencrypted"
 msgstr "Kohereza ibidasobetse"
 
-#: keyresolver.cpp:1309
+#: keyresolver.cpp:1524
 #, fuzzy
 msgid ""
 "You did not select an encryption key for one of the recipients: this person "
@@ -5011,7 +5733,7 @@ msgstr ""
 "OYA Guhitamo Bishunzwe: Urufunguzo ya:  Rimwe Bya i Abandikiwe... : iyi OYA "
 "Kuri i &Ubutumwa NIBA Shyiraho Umutekano . "
 
-#: keyresolver.cpp:1312
+#: keyresolver.cpp:1527
 #, fuzzy
 msgid ""
 "You did not select encryption keys for some of the recipients: these persons "
@@ -5020,61 +5742,63 @@ msgstr ""
 "OYA Guhitamo Bishunzwe: Utubuto ya:  Bya i Abandikiwe... : OYA Kuri i &Ubutumwa "
 "NIBA Shyiraho Umutekano . "
 
-#: keyresolver.cpp:1367
+#: keyresolver.cpp:1585
 #, fuzzy
 msgid "Encryption Key Selection"
 msgstr "Kopi y'urufunguzo rw'ishiraho ry'umutekano"
 
-#: 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 ""
 "ni A Na: i Bishunzwe: Urufunguzo ( S ) ya:  \" %1 \" . \n"
 "\n"
 "- Guhitamo i Urufunguzo ( S ) Byakoreshejwe ya:  iyi Uwandikiwe . "
 
-#: 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 ""
 "Byemewe na Bishunzwe: Urufunguzo Byabonetse ya:  \" %1 \" . \n"
 "\n"
 "i Urufunguzo ( S ) Byakoreshejwe ya:  iyi Uwandikiwe . "
 
-#: 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 ""
 "Rimwe Urufunguzo \" %1 \" . \n"
 "\n"
 "i Urufunguzo ( S ) Byakoreshejwe ya:  iyi Uwandikiwe . "
 
-#: keyresolver.cpp:1567
+#: keyresolver.cpp:1800
 #, fuzzy
 msgid "Name Selection"
 msgstr "Guhitamo Ipaji"
 
-#: keyresolver.cpp:1567
+#: keyresolver.cpp:1800
 #, fuzzy
 msgid "Which name shall the contact '%1' have in your addressbook?"
 msgstr "Izina: i Umuntu ' %1 ' in ? "
 
-#: kmaccount.cpp:49 kmaccount.cpp:381 kmsender.cpp:538
+#: kmaccount.cpp:49 kmaccount.cpp:381 kmsender.cpp:539
 #, fuzzy, c-format
 msgid "Executing precommand %1"
 msgstr "Ikosa mu gutangiza ibwiriza ry'ishakisha '%1'."
@@ -5110,12 +5834,12 @@ msgstr ""
 msgid "Checking account: %1"
 msgstr "Konti: : "
 
-#: kmacctimap.cpp:398 kmfolderimap.cpp:858
+#: kmacctimap.cpp:398 kmfolderimap.cpp:852
 #, fuzzy
 msgid " completed"
 msgstr "Byarangiye"
 
-#: kmacctimap.cpp:607 kmheaders.cpp:1275
+#: kmacctimap.cpp:607 kmheaders.cpp:1313
 #, fuzzy
 msgid "Unable to process messages: "
 msgstr "Kuri Ubutumwa : "
@@ -5152,14 +5876,14 @@ msgstr "Byanze : OYA Gufunga %1 . "
 msgid "Moving message %3 of %2 from %1."
 msgstr "&Ubutumwa %3 Bya %2 Kuva: %1 . "
 
-#: kmacctlocal.cpp:244
+#: kmacctlocal.cpp:245
 #, fuzzy
 msgid "<qt>Cannot remove mail from mailbox <b>%1</b>:<br>%2</qt>"
 msgstr ""
 "<qt> Gukuraho Ibaruwa Kuva: Agasanduku k'ubutumwa <b> %1 </b> : "
 "<br> %2 </qt> "
 
-#: kmacctlocal.cpp:254
+#: kmacctlocal.cpp:255
 #, fuzzy
 msgid ""
 "_n: Fetched 1 message from mailbox %1.\n"
@@ -5212,45 +5936,45 @@ msgstr "Byatandukanye"
 msgid "&Maildir mailbox"
 msgstr "Agasanduku k'ubutumwa "
 
-#: kmailicalifaceimpl.cpp:90 kmfolderdia.cpp:448 newfolderdialog.cpp:125
+#: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "Ibaruwa"
 
-#: kmailicalifaceimpl.cpp:91 kmfolderdia.cpp:449 newfolderdialog.cpp:126
+#: kmailicalifaceimpl.cpp:94 kmfolderdia.cpp:507 newfolderdialog.cpp:131
 msgid "Calendar"
 msgstr "Kalindari"
 
-#: kmailicalifaceimpl.cpp:92 kmfolderdia.cpp:450 newfolderdialog.cpp:127
+#: kmailicalifaceimpl.cpp:95 kmfolderdia.cpp:508 newfolderdialog.cpp:132
 msgid "Contacts"
 msgstr "Aho kubariza"
 
-#: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:451 newfolderdialog.cpp:128
+#: kmailicalifaceimpl.cpp:96 kmfolderdia.cpp:509 newfolderdialog.cpp:133
 msgid "Notes"
 msgstr "Ibisobanuro"
 
-#: kmailicalifaceimpl.cpp:94 kmfolderdia.cpp:452 newfolderdialog.cpp:129
+#: kmailicalifaceimpl.cpp:97 kmfolderdia.cpp:510 newfolderdialog.cpp:134
 msgid "Tasks"
 msgstr "Ibikorwa"
 
-#: kmailicalifaceimpl.cpp:95 kmfolderdia.cpp:453 newfolderdialog.cpp:130
+#: kmailicalifaceimpl.cpp:98 kmfolderdia.cpp:511 newfolderdialog.cpp:135
 msgid "Journal"
 msgstr "Ikinyamakuru"
 
-#: kmailicalifaceimpl.cpp:667
+#: kmailicalifaceimpl.cpp:684
 msgid "%1's %2"
 msgstr ""
 
-#: kmailicalifaceimpl.cpp:681
+#: kmailicalifaceimpl.cpp:700
 #, fuzzy
 msgid "My %1 (%2)"
 msgstr "Byanze"
 
-#: kmailicalifaceimpl.cpp:685
+#: kmailicalifaceimpl.cpp:704 kmailicalifaceimpl.cpp:708
 #, c-format
 msgid "My %1"
 msgstr ""
 
-#: kmailicalifaceimpl.cpp:1726
+#: kmailicalifaceimpl.cpp:1777
 #, fuzzy
 msgid ""
 "KMail will now create the required groupware folders as subfolders of %1; if "
@@ -5259,17 +5983,17 @@ msgstr ""
 "NONEAHA Kurema i Bya ngombwa Ububiko Nka Bya %1 ; NIBA OYA iyi , Kureka na i "
 "Ibikorana: Yahagaritswe "
 
-#: kmailicalifaceimpl.cpp:1736
+#: kmailicalifaceimpl.cpp:1787
 #, fuzzy
 msgid "%1: no folder found. It will be created."
 msgstr "%1 : Oya Ububiko... Byabonetse , Kurema "
 
-#: kmailicalifaceimpl.cpp:1738
+#: kmailicalifaceimpl.cpp:1789
 #, fuzzy
 msgid "%1: found folder %2. It will be set as the main groupware folder."
 msgstr "%1 : Byabonetse Ububiko... %2 , Gushyiraho Nka Ububiko... "
 
-#: kmailicalifaceimpl.cpp:1744
+#: kmailicalifaceimpl.cpp:1795
 #, fuzzy
 msgid ""
 "<qt>KMail found the following groupware folders in %1 and needs to perform the "
@@ -5279,87 +6003,102 @@ msgstr ""
 "<qt> Byabonetse i Ububiko in %1 na Kuri i Ibikorwa: : %2 "
 "<br> OYA iyi , Kureka na i Ibikorana: Yahagaritswe "
 
-#: kmailicalifaceimpl.cpp:1751
+#: kmailicalifaceimpl.cpp:1802
 #, fuzzy
 msgid "Standard Groupware Folders"
 msgstr "Standard "
 
-#: kmailicalifaceimpl.cpp:1953
+#: kmailicalifaceimpl.cpp:1992
+#, fuzzy
+msgid "Default folder"
+msgstr "Gusiba ububiko"
+
+#: kmailicalifaceimpl.cpp:1993
+msgid "There are multiple %1 default folders, please choose one:"
+msgstr ""
+
+#: kmailicalifaceimpl.cpp:2019
 #, fuzzy
 msgid "You do not have read/write permission to your %1 folder."
 msgstr "OYA Soma /Kwandika Kuri %1 Ububiko... . "
 
-#: kmailicalifaceimpl.cpp:2007
+#: kmailicalifaceimpl.cpp:2073
 #, fuzzy
 msgid "You do not have read/write permission to your folder."
 msgstr "OYA Soma /Kwandika Kuri %1 Ububiko... . "
 
-#: kmcommands.cpp:300
+#: kmcommands.cpp:304
 msgid "Please wait"
 msgstr "Ba wihanganye"
 
-#: kmcommands.cpp:302 kmcommands.cpp:403
+#: kmcommands.cpp:306 kmcommands.cpp:407
 #, fuzzy, c-format
 msgid ""
 "_n: Please wait while the message is transferred\n"
 "Please wait while the %n messages are transferred"
 msgstr "Tegereza i &Ubutumwa ni Tegereza i %n Ubutumwa Yoherejwe "
 
-#: kmcommands.cpp:594
+#: kmcommands.cpp:598
 #, fuzzy
 msgid "Address copied to clipboard."
 msgstr "Kuri Ububikokoporora . "
 
-#: kmcommands.cpp:601
+#: kmcommands.cpp:605
 #, fuzzy
 msgid "URL copied to clipboard."
 msgstr "Kuri Ububikokoporora . "
 
-#: kmcommands.cpp:638
+#: kmcommands.cpp:642
 #, fuzzy
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr "<qt>Urifuzakuyisimbura."
 
-#: kmcommands.cpp:639 kmcommands.cpp:939 kmkernel.cpp:1940
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2050
 #, fuzzy
 msgid "Save to File"
 msgstr "Kubika Kuri Idosiye "
 
-#: kmcommands.cpp:639 kmcommands.cpp:939 kmkernel.cpp:1940
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2050
 msgid "&Replace"
 msgstr "Gusimbuza"
 
-#: kmcommands.cpp:739
+#: kmcommands.cpp:743
 #, fuzzy
 msgid "Message as Plain Text"
 msgstr "Nka "
 
-#: 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 ""
 
-#: kmcommands.cpp:938 kmkernel.cpp:1939
+#: kmcommands.cpp:965 kmkernel.cpp:2049
 #, fuzzy
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
 msgstr "Urifuzakuyisimbura."
 
-#: kmcommands.cpp:982
+#: kmcommands.cpp:1009
 msgid "Open Message"
 msgstr "Gufungura Ubutumwa"
 
-#: kmcommands.cpp:1020 kmcommands.cpp:1048
+#: kmcommands.cpp:1047 kmcommands.cpp:1075
 #, fuzzy
 msgid "The file does not contain a message."
 msgstr "Idosiye OYA A &Ubutumwa . "
 
-#: kmcommands.cpp:1066
+#: kmcommands.cpp:1093
 #, fuzzy
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "Idosiye ifite Igikubo Ubutumwa . i Itangira &Ubutumwa ni . "
 
-#: kmcommands.cpp:1363
+#: kmcommands.cpp:1404
 #, fuzzy
 msgid ""
 "\n"
@@ -5373,96 +6112,96 @@ msgstr ""
 "\n"
 "\n"
 
-#: kmcommands.cpp:1697 kmheaders.cpp:1407
+#: kmcommands.cpp:1750 kmheaders.cpp:1445
 #, fuzzy
 msgid "Filtering messages"
 msgstr "Amagambo y'Isiba"
 
-#: kmcommands.cpp:1705 kmheaders.cpp:1415
+#: kmcommands.cpp:1758 kmheaders.cpp:1453
 #, fuzzy
 msgid "Filtering message %1 of %2"
 msgstr "&Ubutumwa %3 Bya %2 Kuva: %1 . "
 
-#: kmcommands.cpp:1715
+#: kmcommands.cpp:1768
 #, fuzzy
 msgid "Not enough free disk space?"
 msgstr "Nta mwanya uhagije kuri disiki uriho ubusa"
 
-#: kmcommands.cpp:1881 kmfoldertree.cpp:1891
+#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
 #, fuzzy
 msgid "Move to This Folder"
 msgstr "Kuri "
 
-#: kmcommands.cpp:1883 kmfoldertree.cpp:1893
+#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
 #, fuzzy
 msgid "Copy to This Folder"
 msgstr "Kuri "
 
-#: kmcommands.cpp:1959
+#: kmcommands.cpp:2012
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr ""
 
-#: kmcommands.cpp:2133
+#: kmcommands.cpp:2186
 #, fuzzy
 msgid "Moving messages"
 msgstr "Ubutumwa "
 
-#: kmcommands.cpp:2133
+#: kmcommands.cpp:2186
 msgid "Deleting messages"
 msgstr "Amagambo y'Isiba"
 
-#: kmcommands.cpp:2406
+#: kmcommands.cpp:2471
 #, fuzzy
 msgid "Opening URL..."
 msgstr "Gufungura dosiye..."
 
-#: kmcommands.cpp:2413
+#: kmcommands.cpp:2478
 #, fuzzy
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt> Kuri Gukora <b> %1 </b> ? </qt> "
 
-#: kmcommands.cpp:2414
+#: kmcommands.cpp:2479
 msgid "Execute"
 msgstr "Gukora"
 
-#: kmcommands.cpp:2495
+#: kmcommands.cpp:2561
 #, fuzzy
 msgid "Found no attachments to save."
 msgstr "Oya Imigereka: Kuri Kubika . "
 
-#: kmcommands.cpp:2508
+#: kmcommands.cpp:2574
 #, fuzzy
 msgid "Save Attachments To"
 msgstr "Kubika "
 
-#: kmcommands.cpp:2528
+#: kmcommands.cpp:2594
 #, fuzzy
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr "Umugereka."
 
-#: kmcommands.cpp:2556
+#: kmcommands.cpp:2622
 #, fuzzy
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr "Umugereka . %1 "
 
-#: kmcommands.cpp:2595
+#: kmcommands.cpp:2661
 #, fuzzy
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr "Idosiyeyahaweizinaisanzweho. Wifuzakurisimbura."
 
-#: kmcommands.cpp:2597
+#: kmcommands.cpp:2663
 msgid "File Already Exists"
 msgstr "Idosiye isanzwe ihari"
 
-#: kmcommands.cpp:2597 util.h:211
+#: kmcommands.cpp:2663 util.h:211
 msgid "&Overwrite"
 msgstr "Gusimbuza"
 
-#: kmcommands.cpp:2619
+#: kmcommands.cpp:2685
 #, fuzzy
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
@@ -5471,22 +6210,22 @@ msgstr ""
 "Inzira %s %1 Bya i &Ubutumwa ni Bishunzwe: . Kuri Gumana: i Bishunzwe: Ryari: "
 "Mu kubika ? "
 
-#: kmcommands.cpp:2621 kmcommands.cpp:2630
+#: kmcommands.cpp:2687 kmcommands.cpp:2696
 #, fuzzy
 msgid "KMail Question"
 msgstr "Ikibazo ky'ibaruwa ya HTML"
 
-#: kmcommands.cpp:2621
+#: kmcommands.cpp:2687
 #, fuzzy
 msgid "Keep Encryption"
 msgstr "Gushyira umutekano:"
 
-#: kmcommands.cpp:2621 kmcommands.cpp:2630
+#: kmcommands.cpp:2687 kmcommands.cpp:2696
 #, fuzzy
 msgid "Do Not Keep"
 msgstr "Wihanagura"
 
-#: kmcommands.cpp:2628
+#: kmcommands.cpp:2694
 #, fuzzy
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
@@ -5494,12 +6233,12 @@ msgid ""
 msgstr ""
 "Inzira %s %1 Bya i &Ubutumwa ni . Kuri Gumana: i Isinya Ryari: Mu kubika ? "
 
-#: kmcommands.cpp:2630
+#: kmcommands.cpp:2696
 #, fuzzy
 msgid "Keep Signature"
 msgstr "Isinya"
 
-#: kmcommands.cpp:2703
+#: kmcommands.cpp:2769
 #, fuzzy
 msgid ""
 "_: %2 is detailed error description\n"
@@ -5509,12 +6248,12 @@ msgstr ""
 "OYA Kwandika i Idosiye %1 : \n"
 "%2 "
 
-#: kmcommands.cpp:2728
+#: kmcommands.cpp:2794
 #, fuzzy, c-format
 msgid "Could not write the file %1."
 msgstr "OYA Kwandika i Idosiye %1 . "
 
-#: kmcommands.cpp:2952
+#: kmcommands.cpp:3018
 #, fuzzy
 msgid ""
 "There is no Address Book entry for this email address. Add them to the Address "
@@ -5524,7 +6263,7 @@ msgstr ""
 "ni Oya Icyinjijwe ya:  iyi Imeli Aderesi: . Kuri i na Hanyuma &Ongera By'ako "
 "kanya Amaderesi ikoresha Bikunzwe Umukiriya . "
 
-#: kmcommands.cpp:2955
+#: kmcommands.cpp:3021
 #, fuzzy
 msgid ""
 "More than one Address Book entry uses this email address:\n"
@@ -5535,23 +6274,23 @@ msgstr ""
 "%1 \n"
 "ni OYA Kuri Kuri Na: . "
 
-#: kmcommands.cpp:3179 kmcomposewin.cpp:5128 objecttreeparser.cpp:1632
+#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
 #, fuzzy
 msgid ""
 "Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
 "this bug."
 msgstr "Impera y'inyuma OYA i \" x - - Utubuto \" Umumaro . Icyegeranyo iyi . "
 
-#: 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
 #, fuzzy
 msgid "Chiasmus Backend Error"
 msgstr "Ikosa "
 
-#: kmcommands.cpp:3192 kmcomposewin.cpp:5141 objecttreeparser.cpp:1644
+#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
 #, fuzzy
 msgid ""
 "Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
@@ -5560,7 +6299,7 @@ msgstr ""
 "Garuka Agaciro: Kuva: Impera y'inyuma : \" x - - Utubuto \" Umumaro OYA Garuka "
 "A Ikurikiranyanyuguti Urutonde . Icyegeranyo iyi . "
 
-#: kmcommands.cpp:3201 kmcomposewin.cpp:5150 objecttreeparser.cpp:1652
+#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
 #, fuzzy
 msgid ""
 "No keys have been found. Please check that a valid key path has been set in the "
@@ -5569,18 +6308,18 @@ msgstr ""
 "Utubuto Byabonetse . Kugenzura A Byemewe Urufunguzo Inzira: Gushyiraho in i "
 "Iboneza . "
 
-#: kmcommands.cpp:3208 objecttreeparser.cpp:1659
+#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
 msgid "Chiasmus Decryption Key Selection"
 msgstr ""
 
-#: kmcommands.cpp:3220 objecttreeparser.cpp:1671
+#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
 #, fuzzy
 msgid ""
 "Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
 "bug."
 msgstr "Impera y'inyuma OYA i \" x - \" Umumaro . Icyegeranyo iyi . "
 
-#: kmcommands.cpp:3231 objecttreeparser.cpp:1679
+#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
 #, fuzzy
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
@@ -5588,12 +6327,12 @@ msgid ""
 msgstr ""
 "\" x - \" Umumaro OYA Kwemera i Ikitezwe: $(ARG1) Ibigenga . Icyegeranyo iyi . "
 
-#: kmcommands.cpp:3239 kmcommands.cpp:3265 objecttreeparser.cpp:1685
+#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
 #, fuzzy
 msgid "Chiasmus Decryption Error"
 msgstr "Ikosa "
 
-#: kmcommands.cpp:3270 objecttreeparser.cpp:1691
+#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
 #, fuzzy
 msgid ""
 "Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
@@ -5602,122 +6341,157 @@ msgstr ""
 "Garuka Agaciro: Kuva: Impera y'inyuma : \" x - \" Umumaro OYA Garuka A Bayite "
 "Imbonerahamwe . Icyegeranyo iyi . "
 
-#: kmcommands.cpp:3425
-#, fuzzy
-msgid "This attachment has been deleted."
-msgstr "Imigereka: Nka ku Uwohereza . "
-
-#: kmcommands.cpp:3427
-msgid "The attachment '%1' has been deleted."
-msgstr ""
-
-#: kmcommands.cpp:3541
+#: kmcommands.cpp:3581
 msgid ""
 "From: %1\n"
 "To: %2\n"
 "Subject: %3"
 msgstr ""
 
-#: kmcommands.cpp:3551
+#: kmcommands.cpp:3591
 #, fuzzy, c-format
 msgid "Mail: %1"
 msgstr "Ibaruwa"
 
-#: kmcomposewin.cpp:233
-#, fuzzy
-msgid "Select email address(es)"
-msgstr "Imeli Aderesi: ( ) "
-
-#: kmcomposewin.cpp:286
+#: kmcomposewin.cpp:207
 #, fuzzy
-msgid "Sticky"
-msgstr "Gufatisha"
-
-#: 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
-msgid "Size"
-msgstr "Ingano"
+msgid "Select an identity for this message"
+msgstr "ku Isubizwa ya:  iyi &Ubutumwa . "
 
-#: kmcomposewin.cpp:368 kmmimeparttree.cpp:66
-msgid "Encoding"
-msgstr "Imisobekere:"
+#: kmcomposewin.cpp:211
+msgid "Select the dictionary to use when spell-checking this message"
+msgstr ""
 
-#: kmcomposewin.cpp:375 kmcomposewin.cpp:3247
-msgid "Compress"
-msgstr "Kwegeranya"
+#: kmcomposewin.cpp:216
+msgid "Select the sent-mail folder where a copy of this message will be saved"
+msgstr ""
 
-#: kmcomposewin.cpp:377
-msgid "Encrypt"
-msgstr "Shyiraho Umutekano"
+#: kmcomposewin.cpp:220
+msgid "Select the outgoing account to use for sending this message"
+msgstr ""
 
-#: kmcomposewin.cpp:379
-msgid "Sign"
-msgstr "Shyiraho Umukono"
+#: kmcomposewin.cpp:224
+msgid "Set the \"From:\" email address for this message"
+msgstr ""
 
-#: kmcomposewin.cpp:590 kmcomposewin.cpp:3616
-#, fuzzy
-msgid "Name of the attachment:"
-msgstr "Izina ry'umugereka"
+#: kmcomposewin.cpp:228
+msgid "Set the \"Reply-To:\" email address for this message"
+msgstr ""
 
-#: kmcomposewin.cpp:828
+#: kmcomposewin.cpp:248
 #, fuzzy
-msgid ""
-"Autosaving the message as %1 failed.\n"
-"Reason: %2"
-msgstr ""
-"i &Ubutumwa Nka %1 Byanze . \n"
-": %2 "
+msgid "Select email address(es)"
+msgstr "Imeli Aderesi: ( ) "
 
-#: kmcomposewin.cpp:832
+#: kmcomposewin.cpp:295
 #, fuzzy
-msgid "Autosaving Failed"
-msgstr "Imenyekanisha Ryononekaye."
+msgid "Set a subject for this message"
+msgstr "Ikivugwaho: Bya &Ubutumwa "
 
-#: kmcomposewin.cpp:970
+#: kmcomposewin.cpp:297
 #, fuzzy
 msgid "&Identity:"
 msgstr "Ikiranga"
 
-#: kmcomposewin.cpp:974
+#: kmcomposewin.cpp:298
 msgid "&Dictionary:"
 msgstr "Inkoranya:"
 
-#: kmcomposewin.cpp:978
+#: kmcomposewin.cpp:299
 #, fuzzy
 msgid "&Sent-Mail folder:"
 msgstr "- Ububiko... : "
 
-#: kmcomposewin.cpp:982
+#: kmcomposewin.cpp:300
 #, fuzzy
 msgid "&Mail transport:"
 msgstr "Utuyunguruzo twa:"
 
-#: kmcomposewin.cpp:986
+#: kmcomposewin.cpp:301
 #, fuzzy
 msgid ""
 "_: sender address field\n"
 "&From:"
 msgstr "Aderesi y'uwohereza nshya:"
 
-#: kmcomposewin.cpp:992
+#: kmcomposewin.cpp:302
 #, fuzzy
 msgid "&Reply to:"
 msgstr "Subiza- Kuri:"
 
-#: kmcomposewin.cpp:1000
+#: kmcomposewin.cpp:303
+#, fuzzy
+msgid "S&ubject:"
+msgstr "Ikivugwaho:"
+
+#: kmcomposewin.cpp:305
+#, fuzzy
+msgid "Sticky"
+msgstr "Gufatisha"
+
+#: 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 "Ingano"
+
+#: kmcomposewin.cpp:399 kmmimeparttree.cpp:66
+msgid "Encoding"
+msgstr "Imisobekere:"
+
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+msgid "Compress"
+msgstr "Kwegeranya"
+
+#: kmcomposewin.cpp:408
+msgid "Encrypt"
+msgstr "Shyiraho Umutekano"
+
+#: kmcomposewin.cpp:410
+msgid "Sign"
+msgstr "Shyiraho Umukono"
+
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#, fuzzy
+msgid "Name of the attachment:"
+msgstr "Izina ry'umugereka"
+
+#: kmcomposewin.cpp:868
 #, fuzzy
 msgid ""
-"_: recipient address field\n"
-"&To:"
-msgstr "Aderesi y'uwohererejwe"
+"Autosaving the message as %1 failed.\n"
+"Reason: %2"
+msgstr ""
+"i &Ubutumwa Nka %1 Byanze . \n"
+": %2 "
 
-#: kmcomposewin.cpp:1002
+#: kmcomposewin.cpp:872
+#, fuzzy
+msgid "Autosaving Failed"
+msgstr "Imenyekanisha Ryononekaye."
+
+#: kmcomposewin.cpp:1042
 #, fuzzy
 msgid "Primary Recipients"
 msgstr "ingano y'ifatizo"
 
-#: kmcomposewin.cpp:1003
+#: kmcomposewin.cpp:1043
 #, fuzzy
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email.</qt>"
@@ -5725,17 +6499,12 @@ msgstr ""
 "<qt> Imeli Amaderesi Gushyira in iyi Umwanya Akira A Gukoporora Bya i Imeli . "
 "</qt> "
 
-#: kmcomposewin.cpp:1010
-#, fuzzy
-msgid "&Copy to (CC):"
-msgstr "Kuri ( ) : "
-
-#: kmcomposewin.cpp:1012
+#: kmcomposewin.cpp:1052
 #, fuzzy
 msgid "Additional Recipients"
 msgstr "Ingingo Nyongera"
 
-#: kmcomposewin.cpp:1013
+#: kmcomposewin.cpp:1053
 #, fuzzy
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
@@ -5747,17 +6516,12 @@ msgstr ""
 "ni i Nka Byose i Amaderesi in i <b> : </b> Umwanya in i Mwakirizi Bya i ( ) ni "
 "A , OYA i Uwandikiwe . </qt> "
 
-#: kmcomposewin.cpp:1025
-#, fuzzy
-msgid "&Blind copy to (BCC):"
-msgstr "Gukoporora Kuri ( ) : "
-
-#: kmcomposewin.cpp:1027
+#: kmcomposewin.cpp:1067
 #, fuzzy
 msgid "Hidden Recipients"
 msgstr "Impapuro zihishe"
 
-#: kmcomposewin.cpp:1028
+#: kmcomposewin.cpp:1068
 #, fuzzy
 msgid ""
 "<qt>Essentially the same thing as the <b>Copy To:</b> "
@@ -5767,367 +6531,381 @@ msgstr ""
 "<qt> i Nka i <b> : </b> Umwanya in Byose Ikindi Abandikiwe... OYA A Gukoporora "
 ". </qt> "
 
-#: kmcomposewin.cpp:1060
-#, fuzzy
-msgid "S&ubject:"
-msgstr "Ikivugwaho:"
-
-#: kmcomposewin.cpp:1198 kmcomposewin.cpp:1220
+#: kmcomposewin.cpp:1236 kmcomposewin.cpp:1258
 #, fuzzy
 msgid "&Send Mail"
 msgstr "Ohereza Ibaruwa"
 
-#: kmcomposewin.cpp:1202 kmcomposewin.cpp:1224
+#: kmcomposewin.cpp:1240 kmcomposewin.cpp:1262
 #, fuzzy
 msgid "&Send Mail Via"
 msgstr "Ohereza Ibaruwa"
 
-#: 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 "Hohereza nyuma"
 
-#: kmcomposewin.cpp:1207 kmcomposewin.cpp:1217
+#: kmcomposewin.cpp:1245 kmcomposewin.cpp:1255
 #, fuzzy
 msgid "Send &Later Via"
 msgstr "Hohereza nyuma"
 
-#: kmcomposewin.cpp:1255
+#: kmcomposewin.cpp:1293
 #, fuzzy
 msgid "Save as &Draft"
 msgstr "Kubika Nka "
 
-#: kmcomposewin.cpp:1258
+#: kmcomposewin.cpp:1296
 #, fuzzy
 msgid "Save as &Template"
 msgstr "Gusimbuza"
 
-#: kmcomposewin.cpp:1261
+#: kmcomposewin.cpp:1299
 #, fuzzy
 msgid "&Insert File..."
 msgstr "Kongeramo Idosiye..."
 
-#: kmcomposewin.cpp:1264
+#: kmcomposewin.cpp:1302
 #, fuzzy
 msgid "&Insert File Recent"
 msgstr "Idosiye "
 
-#: kmcomposewin.cpp:1271
+#: kmcomposewin.cpp:1309
 msgid "&Address Book"
 msgstr "Agatabo k'Aderesi"
 
-#: kmcomposewin.cpp:1274
+#: kmcomposewin.cpp:1312
 #, fuzzy
 msgid "&New Composer"
 msgstr "&Uhimba"
 
-#: kmcomposewin.cpp:1278
+#: kmcomposewin.cpp:1316
 #, fuzzy
 msgid "New Main &Window"
 msgstr "Idirishya Rishya"
 
-#: kmcomposewin.cpp:1283
+#: kmcomposewin.cpp:1321
 #, fuzzy
 msgid "Select &Recipients..."
 msgstr "Abandikiwe..."
 
-#: kmcomposewin.cpp:1285
+#: kmcomposewin.cpp:1323
 #, fuzzy
 msgid "Save &Distribution List..."
 msgstr "Kubika ... "
 
-#: kmcomposewin.cpp:1307
+#: kmcomposewin.cpp:1345
 #, fuzzy
 msgid "Pa&ste as Quotation"
 msgstr "Komeka nk'Akuguruzo n'Akugariro"
 
-#: kmcomposewin.cpp:1310
+#: kmcomposewin.cpp:1348
 #, fuzzy
 msgid "Paste as Attac&hment"
 msgstr "Nka "
 
-#: kmcomposewin.cpp:1313
+#: kmcomposewin.cpp:1351
 #, fuzzy
 msgid "Add &Quote Characters"
 msgstr "Inyuguti z'impugukirwa isoza"
 
-#: kmcomposewin.cpp:1316
+#: kmcomposewin.cpp:1356
 #, fuzzy
 msgid "Re&move Quote Characters"
 msgstr "Gukuraho inyuguti"
 
-#: kmcomposewin.cpp:1320
+#: kmcomposewin.cpp:1362
 #, fuzzy
 msgid "Cl&ean Spaces"
 msgstr "Amapaji ya Man"
 
-#. 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
 #, fuzzy, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "Izina ry'imyandikire idahinduka"
 
-#: kmcomposewin.cpp:1328
+#: kmcomposewin.cpp:1370
 #, fuzzy
 msgid "&Urgent"
 msgstr "Byihutirwa"
 
-#: kmcomposewin.cpp:1331
+#: kmcomposewin.cpp:1373
 msgid "&Request Disposition Notification"
 msgstr ""
 
-#: kmcomposewin.cpp:1336
+#: kmcomposewin.cpp:1378
 #, fuzzy
 msgid "Se&t Encoding"
 msgstr "Gushyiraho Isobeka"
 
-#: kmcomposewin.cpp:1339
+#: kmcomposewin.cpp:1381
 #, fuzzy
 msgid "&Wordwrap"
 msgstr "Ifunika ry'Ijambo"
 
-#: kmcomposewin.cpp:1344
+#: kmcomposewin.cpp:1386
 msgid "&Snippets"
 msgstr ""
 
-#: kmcomposewin.cpp:1350
+#: kmcomposewin.cpp:1392
 #, fuzzy
 msgid "&Automatic Spellchecking"
 msgstr "IgenzuraMyandikire Ryikoresha"
 
-#: kmcomposewin.cpp:1360
+#: kmcomposewin.cpp:1402
 #, fuzzy
 msgid "Auto-Detect"
 msgstr "Byibona"
 
-#: kmcomposewin.cpp:1365
+#: kmcomposewin.cpp:1407
 #, fuzzy
 msgid "Formatting (HTML)"
 msgstr "Ihinduramiterere"
 
-#: kmcomposewin.cpp:1369
+#: kmcomposewin.cpp:1411
 #, fuzzy
 msgid "&All Fields"
 msgstr "Imyanya Yose"
 
-#: kmcomposewin.cpp:1372
+#: kmcomposewin.cpp:1414
 #, fuzzy
 msgid "&Identity"
 msgstr "Ikiranga"
 
-#: kmcomposewin.cpp:1375
+#: kmcomposewin.cpp:1417
 #, fuzzy
 msgid "&Dictionary"
 msgstr "Inkoranyamagambo"
 
-#: kmcomposewin.cpp:1378
+#: kmcomposewin.cpp:1420
 #, fuzzy
 msgid "&Sent-Mail Folder"
 msgstr "Ama dosiye adasanzwe"
 
-#: kmcomposewin.cpp:1381
+#: kmcomposewin.cpp:1423
 #, fuzzy
 msgid "&Mail Transport"
 msgstr "Gufunika bibonerana"
 
-#: kmcomposewin.cpp:1384
+#: kmcomposewin.cpp:1426
 #, fuzzy
 msgid "&From"
 msgstr "Bivuye"
 
-#: kmcomposewin.cpp:1387
+#: kmcomposewin.cpp:1429
 #, fuzzy
 msgid "&Reply To"
 msgstr "Subiza kanaka"
 
-#: kmcomposewin.cpp:1391
+#: kmcomposewin.cpp:1433
 #, fuzzy
 msgid "&To"
 msgstr "Kuri"
 
-#: kmcomposewin.cpp:1394
+#: kmcomposewin.cpp:1436
 #, fuzzy
 msgid "&CC"
 msgstr "Kopi kuri"
 
-#: kmcomposewin.cpp:1397
+#: kmcomposewin.cpp:1439
 #, fuzzy
 msgid "&BCC"
 msgstr "Ikopi ku bataboneka"
 
-#: kmcomposewin.cpp:1401
+#: kmcomposewin.cpp:1443
 #, fuzzy
 msgid "S&ubject"
 msgstr "Ikivugwaho"
 
-#: kmcomposewin.cpp:1406
+#: kmcomposewin.cpp:1448
 #, fuzzy
 msgid "Append S&ignature"
 msgstr "Isinya"
 
-#: kmcomposewin.cpp:1409
+#: kmcomposewin.cpp:1451
 #, fuzzy
 msgid "Prepend S&ignature"
 msgstr "Isinya"
 
-#: kmcomposewin.cpp:1413
+#: kmcomposewin.cpp:1455
 msgid "Insert Signature At C&ursor Position"
 msgstr ""
 
-#: kmcomposewin.cpp:1417
+#: kmcomposewin.cpp:1459
 #, fuzzy
 msgid "Attach &Public Key..."
 msgstr "Gerekaho Ipaji ya webu..."
 
-#: kmcomposewin.cpp:1420
+#: kmcomposewin.cpp:1462
 #, fuzzy
 msgid "Attach &My Public Key"
 msgstr "Ifunguzo ngenga"
 
-#: kmcomposewin.cpp:1423 kmcomposewin.cpp:2272
+#: kmcomposewin.cpp:1465 kmcomposewin.cpp:2337
 #, fuzzy
 msgid "&Attach File..."
 msgstr "Kugerekaho Idosiye"
 
-#: kmcomposewin.cpp:1426
+#: kmcomposewin.cpp:1468
 #, fuzzy
 msgid "&Remove Attachment"
 msgstr "Kubika umugereka"
 
-#: kmcomposewin.cpp:1429
+#: kmcomposewin.cpp:1471
 #, fuzzy
 msgid "&Save Attachment As..."
 msgstr "Kubika ... "
 
-#: kmcomposewin.cpp:1432
+#: kmcomposewin.cpp:1474
 #, fuzzy
 msgid "Attachment Pr&operties"
 msgstr "Ibiranga Inyandiko"
 
-#: kmcomposewin.cpp:1442
+#: kmcomposewin.cpp:1484
 #, fuzzy
 msgid "&Spellchecker..."
 msgstr "Igenzurandikire..."
 
-#: kmcomposewin.cpp:1446 kmcomposewin.cpp:1449
+#: kmcomposewin.cpp:1488 kmcomposewin.cpp:1491
 #, fuzzy
 msgid "Encrypt Message with Chiasmus..."
 msgstr "Na: ... "
 
-#: kmcomposewin.cpp:1457
+#: kmcomposewin.cpp:1499
 #, fuzzy
 msgid "&Encrypt Message"
 msgstr "Shyiraho umutekano kuri iyi imeli"
 
-#: kmcomposewin.cpp:1460
+#: kmcomposewin.cpp:1502
 #, fuzzy
 msgid "&Sign Message"
 msgstr "Kohereza Ubutumwa"
 
-#: kmcomposewin.cpp:1507
+#: kmcomposewin.cpp:1549
 #, fuzzy
 msgid "&Cryptographic Message Format"
 msgstr "Imiterere Ihinduranya Gishushanyo (GIF)"
 
-#: 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 "Bisanzwe"
 
-#: kmcomposewin.cpp:1516 kmcomposewin.cpp:4972
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
 msgid "Bulleted List (Disc)"
 msgstr ""
 
-#: kmcomposewin.cpp:1517 kmcomposewin.cpp:4974
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
 msgid "Bulleted List (Circle)"
 msgstr ""
 
-#: kmcomposewin.cpp:1518 kmcomposewin.cpp:4976
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
 msgid "Bulleted List (Square)"
 msgstr ""
 
-#: kmcomposewin.cpp:1519 kmcomposewin.cpp:4978
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
 #, fuzzy
 msgid "Ordered List (Decimal)"
 msgstr "Bishyirwa ku Murongo (byihuta cyane)"
 
-#: kmcomposewin.cpp:1520 kmcomposewin.cpp:4980
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
 #, fuzzy
 msgid "Ordered List (Alpha lower)"
 msgstr "( Ntoya ) "
 
-#: kmcomposewin.cpp:1521 kmcomposewin.cpp:4982
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
 #, fuzzy
 msgid "Ordered List (Alpha upper)"
 msgstr "( Nkuru ) "
 
-#: kmcomposewin.cpp:1523
+#: kmcomposewin.cpp:1566
 msgid "Select Style"
 msgstr "Hitamo uburyo"
 
-#: kmcomposewin.cpp:1537
+#: kmcomposewin.cpp:1569
+#, fuzzy
+msgid "Select a list style"
+msgstr "Hitamo uburyo"
+
+#: kmcomposewin.cpp:1574
+#, fuzzy
+msgid "Select a font"
+msgstr "Guhitamo Umwandiko"
+
+#: kmcomposewin.cpp:1579
+#, fuzzy
+msgid "Select a font size"
+msgstr "Hitamo idosiye y'ijwi"
+
+#: kmcomposewin.cpp:1583
 msgid "Align Left"
 msgstr "Kuringaniza Ibumoso"
 
-#: kmcomposewin.cpp:1541
+#: kmcomposewin.cpp:1587
 msgid "Align Right"
 msgstr "Kuringaniza Iburyo"
 
-#: kmcomposewin.cpp:1544
+#: kmcomposewin.cpp:1590
 msgid "Align Center"
 msgstr "Gutondeka Hagati"
 
-#: kmcomposewin.cpp:1547
+#: kmcomposewin.cpp:1593
 msgid "&Bold"
 msgstr "Bitsindagiyev"
 
-#: kmcomposewin.cpp:1550
+#: kmcomposewin.cpp:1596
 msgid "&Italic"
 msgstr "Biberamye"
 
-#: kmcomposewin.cpp:1553
+#: kmcomposewin.cpp:1599
 msgid "&Underline"
 msgstr "Gucaho umurongo"
 
-#: kmcomposewin.cpp:1556
+#: kmcomposewin.cpp:1602
 #, fuzzy
 msgid "Reset Font Settings"
 msgstr "Ongera utangire bushya Ibyashizweho"
 
-#: kmcomposewin.cpp:1559
+#: kmcomposewin.cpp:1605
 msgid "Text Color..."
 msgstr "Ibara ry'Inyandiko..."
 
-#: kmcomposewin.cpp:1573
+#: kmcomposewin.cpp:1619
 #, fuzzy
 msgid "Configure KMail..."
 msgstr "Kuboneza Imeli..."
 
-#: kmcomposewin.cpp:1582
+#: kmcomposewin.cpp:1628
 #, fuzzy
 msgid " Spellcheck: %1 "
 msgstr "Igenzuranyuguti"
 
-#: kmcomposewin.cpp:1583 kmcomposewin.cpp:1597
+#: kmcomposewin.cpp:1629 kmcomposewin.cpp:1643
 #, fuzzy
 msgid " Column: %1 "
 msgstr "Inkingi"
 
-#: kmcomposewin.cpp:1584 kmcomposewin.cpp:1595
+#: kmcomposewin.cpp:1630 kmcomposewin.cpp:1641
 #, fuzzy
 msgid " Line: %1 "
 msgstr "Umurongo:%S"
 
-#: kmcomposewin.cpp:2188
+#: kmcomposewin.cpp:2252
 #, fuzzy
 msgid "Re&save as Template"
 msgstr "Gusimbuza"
 
-#: kmcomposewin.cpp:2189
+#: kmcomposewin.cpp:2253
 #, fuzzy
 msgid "&Save as Draft"
 msgstr "Kubika Nka "
 
-#: kmcomposewin.cpp:2191
+#: kmcomposewin.cpp:2255
 #, fuzzy
 msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
@@ -6135,7 +6913,7 @@ msgid ""
 msgstr ""
 "Kubika iyi &Ubutumwa in i Ububiko... . Hanyuma na Yoherejwe: Ku A Nyuma Igihe . "
 
-#: kmcomposewin.cpp:2193
+#: kmcomposewin.cpp:2257
 #, fuzzy
 msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
@@ -6143,17 +6921,17 @@ msgid ""
 msgstr ""
 "Kubika iyi &Ubutumwa in i Ububiko... . Hanyuma na Yoherejwe: Ku A Nyuma Igihe . "
 
-#: kmcomposewin.cpp:2197
+#: kmcomposewin.cpp:2261
 #, fuzzy
 msgid "Do you want to save the message for later or discard it?"
 msgstr "Kuri Kubika i &Ubutumwa ya:  Nyuma Cyangwa Kwanga ? "
 
-#: kmcomposewin.cpp:2198
+#: kmcomposewin.cpp:2262
 #, fuzzy
 msgid "Close Composer"
 msgstr "Funga "
 
-#: kmcomposewin.cpp:2268
+#: kmcomposewin.cpp:2333
 #, fuzzy
 msgid ""
 "The message you have composed seems to refer to an attached file but you have "
@@ -6163,17 +6941,17 @@ msgstr ""
 "&Ubutumwa Kuri Kuri Idosiye OYA . \n"
 "Kuri Kugerekaho A Idosiye Kuri &Ubutumwa ? "
 
-#: kmcomposewin.cpp:2271
+#: kmcomposewin.cpp:2336
 #, fuzzy
 msgid "File Attachment Reminder"
 msgstr "Idosiye "
 
-#: kmcomposewin.cpp:2273
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Send as Is"
 msgstr "Nka "
 
-#: kmcomposewin.cpp:2350
+#: kmcomposewin.cpp:2415
 #, fuzzy
 msgid ""
 "<qt>"
@@ -6185,27 +6963,27 @@ msgstr ""
 "<p> Kuri Kugaragaza i Cyuzuye Inzira: NIBA Kuri Kugerekaho A Idosiye . </p> "
 "</qt> "
 
-#: kmcomposewin.cpp:2359
+#: kmcomposewin.cpp:2424
 msgid ""
 "<qt>"
 "<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
 msgstr ""
 
-#: kmcomposewin.cpp:2697
+#: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "Kugerekaho Idosiye"
 
 #. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2698 rc.cpp:57
+#: kmcomposewin.cpp:2778 rc.cpp:57
 #, fuzzy, no-c-format
 msgid "&Attach"
 msgstr "Kugerekaho"
 
-#: kmcomposewin.cpp:2878
+#: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "Kongeramo Idosiye"
 
-#: kmcomposewin.cpp:3048
+#: kmcomposewin.cpp:3129
 #, fuzzy
 msgid ""
 "<qt>"
@@ -6216,63 +6994,63 @@ msgstr ""
 "<p> Ikosa Kuri Kwohereza hanze... i Urufunguzo Kuva: i Impera y'inyuma : </p> "
 "<p> <b> %1 "
 
-#: kmcomposewin.cpp:3052
+#: kmcomposewin.cpp:3133
 #, fuzzy
 msgid "Key Export Failed"
 msgstr "Kohereza hanze byanze"
 
-#: kmcomposewin.cpp:3079
+#: kmcomposewin.cpp:3160
 #, fuzzy
 msgid "Exporting key..."
 msgstr "Urufunguzo ... "
 
-#: kmcomposewin.cpp:3090
+#: kmcomposewin.cpp:3171
 #, fuzzy, c-format
 msgid "OpenPGP key 0x%1"
 msgstr "Urufunguzo %1 "
 
-#: kmcomposewin.cpp:3105
+#: kmcomposewin.cpp:3186
 msgid "Attach Public OpenPGP Key"
 msgstr ""
 
-#: kmcomposewin.cpp:3106
+#: kmcomposewin.cpp:3187
 #, fuzzy
 msgid "Select the public key which should be attached."
 msgstr "i public Urufunguzo . "
 
-#: kmcomposewin.cpp:3128 kmmimeparttree.cpp:137 kmreaderwin.cpp:1967
+#: kmcomposewin.cpp:3209 kmmimeparttree.cpp:135 kmreaderwin.cpp:2032
 #, fuzzy
 msgid ""
 "_: to open\n"
 "Open"
 msgstr "Gufungura "
 
-#: kmcomposewin.cpp:3130 kmmimeparttree.cpp:138 kmreaderwin.cpp:1968
+#: kmcomposewin.cpp:3211 kmmimeparttree.cpp:136 kmreaderwin.cpp:2033
 msgid "Open With..."
 msgstr "Fungura ukoresha..."
 
-#: kmcomposewin.cpp:3132
+#: kmcomposewin.cpp:3213
 msgid ""
 "_: to view\n"
 "View"
 msgstr ""
 
-#: kmcomposewin.cpp:3135
+#: kmcomposewin.cpp:3216
 #, fuzzy
 msgid "Edit With..."
 msgstr "Andika inyandiko- porogaramu"
 
-#: kmcomposewin.cpp:3143
+#: kmcomposewin.cpp:3224
 #, fuzzy
 msgid "Add Attachment..."
 msgstr "Nk'umugereko"
 
-#: kmcomposewin.cpp:3232 kmcomposewin.cpp:3240
+#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
 #, fuzzy
 msgid "KMail could not compress the file."
 msgstr "OYA Kwegeranya i Idosiye . "
 
-#: kmcomposewin.cpp:3246
+#: kmcomposewin.cpp:3326
 #, fuzzy
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
@@ -6281,47 +7059,47 @@ msgstr ""
 "Byegeranijwe Idosiye ni Kinini i ~Umwimerere . Kuri Gumana: i ~Umwimerere Rimwe "
 "? "
 
-#: kmcomposewin.cpp:3247
+#: kmcomposewin.cpp:3327
 msgid "Keep"
 msgstr "Kugumishaho"
 
-#: kmcomposewin.cpp:3313 kmcomposewin.cpp:3321
+#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
 #, fuzzy
 msgid "KMail could not uncompress the file."
 msgstr "OYA i Idosiye . "
 
-#: kmcomposewin.cpp:3519
+#: kmcomposewin.cpp:3601
 #, fuzzy
 msgid "Save Attachment As"
 msgstr "Kubika "
 
-#: kmcomposewin.cpp:3769 kmedit.cpp:178
+#: kmcomposewin.cpp:3856 kmedit.cpp:178
 #, fuzzy
 msgid "Add as Text"
 msgstr "Nka "
 
-#: kmcomposewin.cpp:3770 kmedit.cpp:179
+#: kmcomposewin.cpp:3857 kmedit.cpp:179
 #, fuzzy
 msgid "Add as Attachment"
 msgstr "Nka "
 
-#: 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 ""
 
-#: kmcomposewin.cpp:3773
+#: kmcomposewin.cpp:3860
 #, fuzzy
 msgid "Paste as text or attachment?"
 msgstr "Nka "
 
-#: 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 "Kitiswe"
 
-#: kmcomposewin.cpp:3873
+#: kmcomposewin.cpp:3961
 #, fuzzy
 msgid ""
 "<qt>"
@@ -6335,12 +7113,12 @@ msgstr ""
 "Cyangwa S /) Bishunzwe: Urufunguzo Kuri Koresha ya:  iyi . </p> "
 "<p> Guhitamo i Urufunguzo ( S ) Kuri Koresha in i Ikiranga Iboneza . </p> </qt> "
 
-#: kmcomposewin.cpp:3880
+#: kmcomposewin.cpp:3968
 #, fuzzy
 msgid "Undefined Encryption Key"
 msgstr "Urufunguzo rw'isobeka:"
 
-#: kmcomposewin.cpp:3924
+#: kmcomposewin.cpp:4015
 #, fuzzy
 msgid ""
 "<qt>"
@@ -6353,12 +7131,12 @@ msgstr ""
 "Kugaragaza... i ( Cyangwa S /) Ishirwaho umukono Urufunguzo Kuri Koresha . </p> "
 "<p> Guhitamo i Urufunguzo Kuri Koresha in i Ikiranga Iboneza . </p> </qt> "
 
-#: kmcomposewin.cpp:3931
+#: kmcomposewin.cpp:4022
 #, fuzzy
 msgid "Undefined Signing Key"
 msgstr "Gutoranya Buto Ifungura"
 
-#: kmcomposewin.cpp:4016
+#: kmcomposewin.cpp:4129
 #, fuzzy
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
@@ -6367,12 +7145,12 @@ msgstr ""
 "ni in Ntibicometse kuri interineti Ubwoko , Ubutumwa in i Ibyasohotse &Kugeza "
 "Gyayo kiri kuri interineti . "
 
-#: kmcomposewin.cpp:4018 kmkernel.cpp:1243
+#: kmcomposewin.cpp:4131 kmkernel.cpp:1285
 #, fuzzy
 msgid "Online/Offline"
 msgstr "Interineti Funga: Yego/Oya"
 
-#: kmcomposewin.cpp:4033
+#: kmcomposewin.cpp:4146
 #, fuzzy
 msgid ""
 "You must enter your email address in the From: field. You should also set your "
@@ -6382,7 +7160,7 @@ msgstr ""
 "Injiza Imeli Aderesi: in i : Umwanya . Gushyiraho Imeli Aderesi: ya:  Byose , "
 "OYA Kuri Injiza ya:  &Ubutumwa . "
 
-#: kmcomposewin.cpp:4044
+#: kmcomposewin.cpp:4157
 #, fuzzy
 msgid ""
 "You must specify at least one receiver,either in the To: field or as CC or as "
@@ -6390,67 +7168,67 @@ msgid ""
 msgstr ""
 "Kugaragaza Ku Rimwe Mwakirizi , in i : Umwanya Cyangwa Nka Cyangwa Nka . "
 
-#: kmcomposewin.cpp:4052
+#: kmcomposewin.cpp:4165
 #, fuzzy
 msgid "To field is missing.Send message anyway?"
 msgstr "OYA Kugaragaza A Ikivugwaho: . &Ubutumwa ? "
 
-#: kmcomposewin.cpp:4054
+#: kmcomposewin.cpp:4167
 #, fuzzy
 msgid "No To: specified"
 msgstr "Bitaragaragazwa"
 
-#: kmcomposewin.cpp:4079
+#: kmcomposewin.cpp:4192
 #, fuzzy
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "OYA Kugaragaza A Ikivugwaho: . &Ubutumwa ? "
 
-#: kmcomposewin.cpp:4081
+#: kmcomposewin.cpp:4194
 #, fuzzy
 msgid "No Subject Specified"
 msgstr "Bitaragaragazwa"
 
-#: kmcomposewin.cpp:4082
+#: kmcomposewin.cpp:4195
 #, fuzzy
 msgid "S&end as Is"
 msgstr "Nka "
 
-#: kmcomposewin.cpp:4083
+#: kmcomposewin.cpp:4196
 #, fuzzy
 msgid "&Specify the Subject"
 msgstr "i "
 
-#: kmcomposewin.cpp:4121
+#: kmcomposewin.cpp:4234
 #, fuzzy
 msgid "&Keep markup, do not sign/encrypt"
 msgstr ", OYA Shyiraho Umukono /Shyiraho Umutekano "
 
-#: kmcomposewin.cpp:4122
+#: kmcomposewin.cpp:4235
 #, fuzzy
 msgid "&Keep markup, do not encrypt"
 msgstr ", OYA Shyiraho Umutekano "
 
-#: kmcomposewin.cpp:4123
+#: kmcomposewin.cpp:4236
 #, fuzzy
 msgid "&Keep markup, do not sign"
 msgstr ", OYA Shyiraho Umukono "
 
-#: kmcomposewin.cpp:4125
+#: kmcomposewin.cpp:4238
 #, fuzzy
 msgid "Sign/Encrypt (delete markup)"
 msgstr "/( Gusiba ) "
 
-#: kmcomposewin.cpp:4126
+#: kmcomposewin.cpp:4239
 #, fuzzy
 msgid "Encrypt (delete markup)"
 msgstr "( Gusiba ) "
 
-#: kmcomposewin.cpp:4127
+#: kmcomposewin.cpp:4240
 #, fuzzy
 msgid "Sign (delete markup)"
 msgstr "( Gusiba ) "
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4242
 #, fuzzy
 msgid ""
 "<qt>"
@@ -6461,12 +7239,12 @@ msgstr ""
 "<p> Ishirwaho umukono /Bya Ubutumwa ni OYA ; </p> "
 "<p> Kuri Gusiba ? </p> </qt> "
 
-#: kmcomposewin.cpp:4131
+#: kmcomposewin.cpp:4244
 #, fuzzy
 msgid "Sign/Encrypt Message?"
 msgstr "Shyiraho umutekano kuri iyi imeli"
 
-#: kmcomposewin.cpp:4180
+#: kmcomposewin.cpp:4293
 #, fuzzy
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
@@ -6475,51 +7253,72 @@ msgstr ""
 "Guhanga Inyandiko z'agateganyo Ububiko... ya:  Ikiranga \" %1 \" OYA ( ) ; , i "
 "Mburabuzi Inyandiko z'agateganyo Ububiko... Byakoreshejwe . "
 
-#: kmcomposewin.cpp:4326
+#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#, fuzzy
+msgid "Please create an account for sending and try again."
+msgstr "Kurema Konti: ya:  na Kugerageza Nanone . "
+
+#: kmcomposewin.cpp:4456
 #, fuzzy
 msgid "About to send email..."
 msgstr "Kuri Kohereza Imeli ... "
 
-#: kmcomposewin.cpp:4327
+#: kmcomposewin.cpp:4457
 msgid "Send Confirmation"
 msgstr "Kohereza iyemeza"
 
-#: kmcomposewin.cpp:4328 redirectdialog.cpp:82
+#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
 #, fuzzy
 msgid "&Send Now"
 msgstr "Hohereza nonaha"
 
-#: 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 "Abandikiwe... "
+
+#: kmcomposewin.cpp:4482
+#, fuzzy
+msgid "&Edit Recipients"
+msgstr "Ingingo Nyongera"
+
+#: kmcomposewin.cpp:4728
 #, fuzzy
 msgid "Spellcheck: on"
 msgstr "Igenzuranyuguti"
 
-#: kmcomposewin.cpp:4551
+#: kmcomposewin.cpp:4730
 #, fuzzy
 msgid "Spellcheck: off"
 msgstr "Igenzuranyuguti"
 
-#: kmcomposewin.cpp:4608
+#: kmcomposewin.cpp:4787
 #, fuzzy
 msgid " Spell check canceled."
 msgstr "Kugenzura Kureka . "
 
-#: kmcomposewin.cpp:4611
+#: kmcomposewin.cpp:4790
 #, fuzzy
 msgid " Spell check stopped."
 msgstr "Kugenzura Kyahagariswe . "
 
-#: kmcomposewin.cpp:4614
+#: kmcomposewin.cpp:4793
 #, fuzzy
 msgid " Spell check complete."
 msgstr "Kugenzura Byuzuye . "
 
-#: kmcomposewin.cpp:4798 kmcomposewin.cpp:4806
+#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
 #, fuzzy
 msgid "Spellchecker"
 msgstr "Igenzuranyuguti"
 
-#: kmcomposewin.cpp:5115
+#: kmcomposewin.cpp:5304
 #, fuzzy
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
@@ -6529,62 +7328,73 @@ msgstr ""
 "Kugena Imiterere A Kuri Koresha ya:  Bishunzwe: Itangira . \n"
 "iyi in i tab Bya i Kugena Imiterere Ipaji: . "
 
-#: kmcomposewin.cpp:5119
+#: kmcomposewin.cpp:5308
 #, fuzzy
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
 msgstr "Nka Gushigikira . Kuri Na: - - Gushoboza - . "
 
-#: kmcomposewin.cpp:5122
+#: kmcomposewin.cpp:5311
 msgid "No Chiasmus Backend Configured"
 msgstr ""
 
-#: kmcomposewin.cpp:5153
+#: kmcomposewin.cpp:5342
 #, fuzzy
 msgid "No Chiasmus Keys Found"
 msgstr "Nta bihuzagihe byabonetse"
 
-#: kmcomposewin.cpp:5157
+#: kmcomposewin.cpp:5346
 #, fuzzy
 msgid "Chiasmus Encryption Key Selection"
 msgstr "Imimerere y'Ihitamo nyongerewe"
 
-#: kmcomposewin.cpp:5189
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will be signed"
 msgstr "ku %1 . "
 
-#: kmcomposewin.cpp:5189
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will not be signed"
 msgstr "ku %1 . "
 
-#: kmcomposewin.cpp:5190
+#: kmcomposewin.cpp:5379
 #, fuzzy
 msgid "Message will be encrypted"
 msgstr "Ubutumwa buriho umutekano"
 
-#: kmcomposewin.cpp:5190
+#: kmcomposewin.cpp:5379
 #, fuzzy
 msgid "Message will not be encrypted"
 msgstr "Na: Ikivugwaho: : "
 
-#: kmedit.cpp:391
+#: kmedit.cpp:458
 #, fuzzy
 msgid "Unable to start external editor."
 msgstr "Kuri Tangira &vendorShortName; external Muhinduzi . "
 
-#: kmedit.cpp:442
-msgid "Suggestions"
+#: kmedit.cpp:522
+#, fuzzy
+msgid "No Suggestions"
 msgstr "ibyifuzo"
 
-#: kmedit.cpp:494
+#: kmedit.cpp:529
+#, fuzzy
+msgid "Add to Dictionary"
+msgstr "Inkoranyamagambo"
+
+#: kmedit.cpp:530
+#, fuzzy
+msgid "Ignore All"
+msgstr "Kureka"
+
+#: kmedit.cpp:587
 #, fuzzy
 msgid "Automatic spellchecking is not possible on text with markup."
 msgstr "ni OYA ku Umwandiko Na: . "
 
-#: kmedit.cpp:538
+#: kmedit.cpp:631
 #, fuzzy
 msgid ""
 "The external editor is still running.\n"
@@ -6593,39 +7403,44 @@ msgstr ""
 "external Muhinduzi ni . \n"
 "i external Muhinduzi Cyangwa Gufungura ? "
 
-#: kmedit.cpp:541
+#: kmedit.cpp:634
 #, fuzzy
 msgid "Abort Editor"
 msgstr "Umuhinduzi w'inyandiko"
 
-#: kmedit.cpp:541
+#: kmedit.cpp:634
 #, fuzzy
 msgid "Leave Editor Open"
 msgstr "Gufungura "
 
-#: kmedit.cpp:565
+#: kmedit.cpp:661
 #, fuzzy
 msgid "Spellcheck - KMail"
 msgstr "Igenzuranyandiko:"
 
-#: kmedit.cpp:734
+#: kmedit.cpp:884
 #, fuzzy
 msgid ""
 "ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
 "properly configured and in your PATH."
 msgstr "/OYA Yatangiye: . Ubwoko Cyangwa na in . "
 
-#: kmedit.cpp:743
+#: kmedit.cpp:893
 #, fuzzy
 msgid "ISpell/Aspell seems to have crashed."
 msgstr "/Kuri . "
 
-#: kmedit.cpp:752
+#: kmedit.cpp:902
 #, fuzzy
 msgid "No misspellings encountered."
 msgstr "Amaburira yabonetse"
 
-#: kmfawidgets.cpp:102
+#: kmfawidgets.cpp:39
+#, fuzzy
+msgid "Open Address Book"
+msgstr "Gufungura in "
+
+#: kmfawidgets.cpp:107
 msgid "Select Sound File"
 msgstr "Hitamo idosiye y'ijwi"
 
@@ -6655,221 +7470,252 @@ msgstr ""
 "<br> in Akayunguruzo: <b> %2 </b> . "
 "<br> Kwirengagiza "
 
-#: kmfilteraction.cpp:598
+#: kmfilteraction.cpp:601
 #, fuzzy
 msgid "Confirm Delivery"
 msgstr "Guhamya Gusiba"
 
-#: kmfilteraction.cpp:634
+#: kmfilteraction.cpp:637
 #, fuzzy
 msgid "Set Transport To"
 msgstr "Bitabonerana"
 
-#: kmfilteraction.cpp:665
+#: kmfilteraction.cpp:668
 #, fuzzy
 msgid "Set Reply-To To"
 msgstr "Subiza-Kuri:"
 
-#: kmfilteraction.cpp:701
+#: kmfilteraction.cpp:704
 #, fuzzy
 msgid "Set Identity To"
 msgstr "Ikiranga mburabuzi"
 
-#: kmfilteraction.cpp:784
+#: kmfilteraction.cpp:787
 #, fuzzy
 msgid "Mark As"
 msgstr "Garagaza"
 
-#: kmfilteraction.cpp:789
+#: kmfilteraction.cpp:792
 #, fuzzy
 msgid ""
 "_: msg status\n"
 "Important"
 msgstr "iri gushyiraho paji"
 
-#: kmfilteraction.cpp:790
+#: kmfilteraction.cpp:793
 #, fuzzy
 msgid ""
 "_: msg status\n"
 "Read"
 msgstr "byahagaze"
 
-#: kmfilteraction.cpp:791
+#: kmfilteraction.cpp:794
 #, fuzzy
 msgid ""
 "_: msg status\n"
 "Unread"
 msgstr "Bidasomye"
 
-#: kmfilteraction.cpp:792
+#: kmfilteraction.cpp:795
 #, fuzzy
 msgid ""
 "_: msg status\n"
 "Replied"
 msgstr "byahagaze"
 
-#: kmfilteraction.cpp:793
+#: kmfilteraction.cpp:796
 #, fuzzy
 msgid ""
 "_: msg status\n"
 "Forwarded"
 msgstr "byahagaze"
 
-#: kmfilteraction.cpp:794
+#: kmfilteraction.cpp:797
 #, fuzzy
 msgid ""
 "_: msg status\n"
 "Old"
 msgstr "bigenda buhoro "
 
-#: kmfilteraction.cpp:795
+#: kmfilteraction.cpp:798
 #, fuzzy
 msgid ""
 "_: msg status\n"
 "New"
 msgstr "Gishya"
 
-#: kmfilteraction.cpp:796
+#: kmfilteraction.cpp:799
 #, fuzzy
 msgid ""
 "_: msg status\n"
 "Watched"
 msgstr "Imiterere"
 
-#: kmfilteraction.cpp:797
+#: kmfilteraction.cpp:800
 #, fuzzy
 msgid ""
 "_: msg status\n"
 "Ignored"
 msgstr "byahagaze"
 
-#: kmfilteraction.cpp:798
+#: kmfilteraction.cpp:801
 #, fuzzy
 msgid ""
 "_: msg status\n"
 "Spam"
 msgstr "Imiterere"
 
-#: kmfilteraction.cpp:799
+#: kmfilteraction.cpp:802
 #, fuzzy
 msgid ""
 "_: msg status\n"
 "Ham"
 msgstr "kidobya"
 
-#: kmfilteraction.cpp:883
+#: kmfilteraction.cpp:886
 msgid "Send Fake MDN"
 msgstr ""
 
-#: kmfilteraction.cpp:888
+#: kmfilteraction.cpp:891
 #, fuzzy
 msgid ""
 "_: MDN type\n"
 "Ignore"
 msgstr "Kureka"
 
-#: kmfilteraction.cpp:889
+#: kmfilteraction.cpp:892
 msgid ""
 "_: MDN type\n"
 "Displayed"
 msgstr ""
 
-#: kmfilteraction.cpp:890
+#: kmfilteraction.cpp:893
 #, fuzzy
 msgid ""
 "_: MDN type\n"
 "Deleted"
 msgstr "Delete"
 
-#: kmfilteraction.cpp:891
+#: kmfilteraction.cpp:894
 msgid ""
 "_: MDN type\n"
 "Dispatched"
 msgstr ""
 
-#: kmfilteraction.cpp:892
+#: kmfilteraction.cpp:895
 msgid ""
 "_: MDN type\n"
 "Processed"
 msgstr ""
 
-#: kmfilteraction.cpp:893
+#: kmfilteraction.cpp:896
 msgid ""
 "_: MDN type\n"
 "Denied"
 msgstr ""
 
-#: kmfilteraction.cpp:894
+#: kmfilteraction.cpp:897
 msgid ""
 "_: MDN type\n"
 "Failed"
 msgstr ""
 
-#: kmfilteraction.cpp:963
+#: kmfilteraction.cpp:966
 #, fuzzy
 msgid "Remove Header"
 msgstr "Kugeza ku mutwempangano"
 
-#: kmfilteraction.cpp:1036
+#: kmfilteraction.cpp:1039
 #, fuzzy
 msgid "Add Header"
 msgstr "Umutwe"
 
-#: kmfilteraction.cpp:1063
+#: kmfilteraction.cpp:1066
 #, fuzzy
 msgid "With value:"
 msgstr "Agaciro: : "
 
-#: kmfilteraction.cpp:1177
+#: kmfilteraction.cpp:1180
 #, fuzzy
 msgid "Rewrite Header"
 msgstr "Kwinjizamo umutwempangano"
 
-#: kmfilteraction.cpp:1213
+#: kmfilteraction.cpp:1216
 #, fuzzy
 msgid "Replace:"
 msgstr "Gusimbura:"
 
-#: kmfilteraction.cpp:1220
+#: kmfilteraction.cpp:1223
 msgid "With:"
 msgstr "Na:"
 
-#: kmfilteraction.cpp:1340
+#: kmfilteraction.cpp:1343
 #, fuzzy
 msgid "Move Into Folder"
 msgstr "Himurira ku bubiko:"
 
-#: kmfilteraction.cpp:1390
+#: kmfilteraction.cpp:1393
 #, fuzzy
 msgid "Copy Into Folder"
 msgstr "kopororera ku nyandiko"
 
-#: kmfilteraction.cpp:1452
+#: kmfilteraction.cpp:1467
 #, fuzzy
 msgid "Forward To"
 msgstr "Imbere"
 
-#: 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 "Gusimbuza"
+
+#: kmfilteraction.cpp:1525
+msgid "The template used when forwarding"
+msgstr ""
+
+#: 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 "Guhanga &Ubutumwa - ID Ingereka "
+
+#: kmfilteraction.cpp:1622
+#, fuzzy
+msgid "Forward to %1 with template %2"
+msgstr "Guhanga &Ubutumwa - ID Ingereka "
+
+#: kmfilteraction.cpp:1643
 #, fuzzy
 msgid "Redirect To"
 msgstr "Hindura inzira ry'Ikosa"
 
-#: kmfilteraction.cpp:1605
+#: kmfilteraction.cpp:1683
 #, fuzzy
 msgid "Execute Command"
 msgstr "Gukora Ibwirizwa Sheli"
 
-#: kmfilteraction.cpp:1702
+#: kmfilteraction.cpp:1780
 #, fuzzy
 msgid "Pipe Through"
 msgstr "Umurongo Uceyemo"
 
-#: kmfilteraction.cpp:1809
+#: kmfilteraction.cpp:1887
 #, fuzzy
 msgid "Play Sound"
 msgstr "Gukina ijwi"
 
-#: kmfilterdlg.cpp:51
+#: kmfilterdlg.cpp:55
 #, fuzzy
 msgid ""
 "<qt>"
@@ -6882,7 +7728,7 @@ msgstr ""
 "<p> ku Icyo ari cyo cyose Akayunguruzo: Kuri Kwandika ikoresha i Amagenzura in "
 "i Iburyo: - Bya i Ikiganiro . </p> </qt> "
 
-#: kmfilterdlg.cpp:57
+#: kmfilterdlg.cpp:61
 #, fuzzy
 msgid ""
 "<qt>"
@@ -6898,7 +7744,7 @@ msgstr ""
 "Guhindura... Nyuma ku . </p> "
 "<p> iyi Akabuto , Isubiranyuma iyi ku ku i <em> </em> Akabuto . </p> </qt> "
 
-#: kmfilterdlg.cpp:64
+#: kmfilterdlg.cpp:68
 #, fuzzy
 msgid ""
 "<qt>"
@@ -6910,7 +7756,7 @@ msgstr ""
 "<p> iyi Akabuto Kuri Gukoporora A Akayunguruzo: . </p> "
 "<p> iyi Akabuto , Isubiranyuma iyi ku ku i <em> </em> Akabuto . </p> </qt> "
 
-#: kmfilterdlg.cpp:68
+#: kmfilterdlg.cpp:72
 #, fuzzy
 msgid ""
 "<qt>"
@@ -6926,7 +7772,7 @@ msgstr ""
 "<p> ni Oya Kuri Kubona i Akayunguruzo: Inyuma Rimwe ni Kyasibwe: %S , Buri gihe "
 "i Ikiganiro ku <em> </em> Kuri Kwanga i Amahinduka . </p> </qt> "
 
-#: kmfilterdlg.cpp:75
+#: kmfilterdlg.cpp:79
 #, fuzzy
 msgid ""
 "<qt>"
@@ -6943,7 +7789,7 @@ msgstr ""
 "Ubutumwa : Akayunguruzo: Itangira . </p> "
 "<p> iyi Akabuto , Isubiranyuma iyi ku ku i <em> </em> Akabuto . </p> </qt> "
 
-#: kmfilterdlg.cpp:81
+#: kmfilterdlg.cpp:85
 #, fuzzy
 msgid ""
 "<qt>"
@@ -6962,7 +7808,7 @@ msgstr ""
 "Ubutumwa : Akayunguruzo: Itangira . </p> "
 "<p> iyi Akabuto , Isubiranyuma iyi ku ku i <em> </em> Akabuto . </p> </qt> "
 
-#: kmfilterdlg.cpp:89
+#: kmfilterdlg.cpp:93
 #, fuzzy
 msgid ""
 "<qt>"
@@ -6981,7 +7827,7 @@ msgstr ""
 "Ubutumwa : Akayunguruzo: Itangira . </p> "
 "<p> iyi Akabuto , Isubiranyuma iyi ku ku i <em> </em> Akabuto . </p> </qt> "
 
-#: kmfilterdlg.cpp:97
+#: kmfilterdlg.cpp:101
 #, fuzzy
 msgid ""
 "<qt>"
@@ -6998,7 +7844,7 @@ msgstr ""
 "Ubutumwa : Akayunguruzo: Itangira . </p> "
 "<p> iyi Akabuto , Isubiranyuma iyi ku ku i <em> </em> Akabuto . </p> </qt> "
 
-#: kmfilterdlg.cpp:103
+#: kmfilterdlg.cpp:107
 #, fuzzy
 msgid ""
 "<qt>"
@@ -7015,7 +7861,7 @@ msgstr ""
 "<p> A Akayunguruzo: na Kikoresha Inyuma , Kanda iyi Akabuto na Guhitamo <em> "
 "</em> ku <em> </em> in i Ikiganiro . </p> </qt> "
 
-#: kmfilterdlg.cpp:110
+#: kmfilterdlg.cpp:114
 #, fuzzy
 msgid ""
 "<qt>"
@@ -7033,131 +7879,136 @@ msgstr ""
 "Tegereza... ku i Seriveri: , Cyangwa NIBA Kuri Guhindura... i Kuri Itagi: i "
 "Ubutumwa . </p> </qt> "
 
-#: kmfilterdlg.cpp:129
+#: kmfilterdlg.cpp:133
 #, fuzzy
 msgid "POP3 Filter Rules"
 msgstr "Amategeko y'umuyunguruzi"
 
-#: kmfilterdlg.cpp:129
+#: kmfilterdlg.cpp:133
 msgid "Filter Rules"
 msgstr "Amategeko y'umuyunguruzi"
 
-#: kmfilterdlg.cpp:151
+#: kmfilterdlg.cpp:155
 #, fuzzy
 msgid "Available Filters"
 msgstr "Mucapyi ziboneka:"
 
-#: kmfilterdlg.cpp:164
+#: kmfilterdlg.cpp:168
 #, fuzzy
 msgid "A&dvanced"
 msgstr "Urwego rwo hejuru"
 
-#: kmfilterdlg.cpp:171
+#: kmfilterdlg.cpp:175
 #, fuzzy
 msgid "Filter Criteria"
 msgstr "Muyunguruzi w'ibigenderwandaho"
 
-#: kmfilterdlg.cpp:175
+#: kmfilterdlg.cpp:179
 #, fuzzy
 msgid "Filter Action"
 msgstr "Itoranya rya Muyunguruzi"
 
-#: kmfilterdlg.cpp:178
+#: kmfilterdlg.cpp:182
 #, fuzzy
 msgid "Global Options"
 msgstr "Amahitamo Rusange"
 
-#: kmfilterdlg.cpp:179
+#: kmfilterdlg.cpp:183
 #, fuzzy
 msgid "Always &show matched 'Download Later' messages in confirmation dialog"
 msgstr "Herekana %S ' Ubutumwa in Iyemeza Ikiganiro "
 
-#: kmfilterdlg.cpp:184
+#: kmfilterdlg.cpp:188
 #, fuzzy
 msgid "Filter Actions"
 msgstr "Amahitamo ya muyunguruzi"
 
-#: kmfilterdlg.cpp:189
+#: kmfilterdlg.cpp:193
 msgid "Advanced Options"
 msgstr "Amahitamo yo mu rwego rwo hejuru"
 
-#: kmfilterdlg.cpp:197
+#: kmfilterdlg.cpp:201
 #, fuzzy
 msgid "Apply this filter to incoming messages:"
 msgstr "iyi Akayunguruzo: Kuri Ubutumwa : "
 
-#: kmfilterdlg.cpp:201
+#: kmfilterdlg.cpp:205
 #, fuzzy
 msgid "from all accounts"
 msgstr "Kuva: Byose Konti "
 
-#: kmfilterdlg.cpp:204
+#: kmfilterdlg.cpp:208
 #, fuzzy
 msgid "from all but online IMAP accounts"
 msgstr "Kuva: Byose kiri kuri interineti Konti "
 
-#: kmfilterdlg.cpp:207
+#: kmfilterdlg.cpp:211
 #, fuzzy
 msgid "from checked accounts only"
 msgstr "Kuva: Ivivuwe Konti "
 
-#: kmfilterdlg.cpp:213
+#: kmfilterdlg.cpp:217
 msgid "Account Name"
 msgstr "Izina rya konti"
 
-#: kmfilterdlg.cpp:220
+#: kmfilterdlg.cpp:224
 #, fuzzy
 msgid "Apply this filter to &sent messages"
 msgstr "iyi Akayunguruzo: Kuri Yoherejwe: Ubutumwa "
 
-#: kmfilterdlg.cpp:223
+#: kmfilterdlg.cpp:227
 #, fuzzy
 msgid "Apply this filter on manual &filtering"
 msgstr "iyi Akayunguruzo: ku Bikorwa Iyungurura "
 
-#: kmfilterdlg.cpp:226
+#: kmfilterdlg.cpp:230
 #, fuzzy
 msgid "If this filter &matches, stop processing here"
 msgstr "iyi Akayunguruzo: , Guhagarara Inonosora "
 
-#: kmfilterdlg.cpp:230
+#: kmfilterdlg.cpp:234
 #, fuzzy
 msgid "Add this filter to the Apply Filter menu"
 msgstr "iyi Akayunguruzo: Kuri i Ibikubiyemo "
 
-#: kmfilterdlg.cpp:232
+#: kmfilterdlg.cpp:236
 msgid "Shortcut:"
 msgstr "Ihinanzira:"
 
-#: kmfilterdlg.cpp:238
+#: kmfilterdlg.cpp:242
 #, fuzzy
 msgid "Additionally add this filter to the toolbar"
 msgstr "&Ongera iyi Akayunguruzo: Kuri i Umwanyabikoresho "
 
-#: kmfilterdlg.cpp:243
+#: kmfilterdlg.cpp:247
 #, fuzzy
 msgid "Icon for this filter:"
 msgstr "ya:  iyi Akayunguruzo: : "
 
-#: kmfilterdlg.cpp:608
+#: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "Hejuru"
 
-#: kmfilterdlg.cpp:609
+#: kmfilterdlg.cpp:613
 msgid "Down"
 msgstr "Hasi"
 
-#: kmfilterdlg.cpp:628
+#: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "Guhindura Izina..."
 
 #. 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 "Gishya"
 
-#: kmfilterdlg.cpp:744
+#: kmfilterdlg.cpp:645
+#, fuzzy
+msgid "Select Source Folders"
+msgstr "ya:  "
+
+#: kmfilterdlg.cpp:756
 #, fuzzy
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
@@ -7168,19 +8019,19 @@ msgstr ""
 "Byashyizweho Ryari: N'intoki Iyungurura na Ryari: Iyungurura kiri kuri "
 "interineti Ibaruwa . "
 
-#: kmfilterdlg.cpp:774
+#: kmfilterdlg.cpp:786
 #, fuzzy
 msgid ""
 "The following filters have not been saved because they were invalid (e.g. "
 "containing no actions or no search rules)."
 msgstr "G."
 
-#: kmfilterdlg.cpp:935
+#: kmfilterdlg.cpp:947
 #, fuzzy
 msgid "Rename Filter"
 msgstr "Hindura izina ry'ububiko"
 
-#: kmfilterdlg.cpp:936
+#: kmfilterdlg.cpp:948
 #, fuzzy
 msgid ""
 "Rename filter \"%1\" to:\n"
@@ -7189,22 +8040,27 @@ msgstr ""
 "Akayunguruzo: \" %1 \" Kuri : \n"
 "( i Umwanya ubusa ya:  Kikoresha ) "
 
-#: kmfilterdlg.cpp:1113
+#: kmfilterdlg.cpp:973
+#, fuzzy
+msgid "Select Folders to Filter"
+msgstr "Na: "
+
+#: kmfilterdlg.cpp:1136
 #, fuzzy
 msgid "Please select an action."
 msgstr "Guhitamo Igikorwa . "
 
-#: kmfilterdlg.cpp:1280
+#: kmfilterdlg.cpp:1303
 #, fuzzy
 msgid "&Download mail"
 msgstr "Ibaruwa "
 
-#: kmfilterdlg.cpp:1281
+#: kmfilterdlg.cpp:1304
 #, fuzzy
 msgid "Download mail la&ter"
 msgstr "Ibaruwa Nyuma "
 
-#: kmfilterdlg.cpp:1282
+#: kmfilterdlg.cpp:1305
 #, fuzzy
 msgid "D&elete mail from server"
 msgstr "Ibaruwa Kuva: Seriveri: "
@@ -7214,11 +8070,36 @@ msgstr "Ibaruwa Kuva: Seriveri: "
 msgid "<qt>Error while creating file <b>%1</b>:<br>%2</qt>"
 msgstr "<qt> Ikosa Kurema Idosiye <b> %1 </b> : <br> %2 </qt> "
 
-#: kmfolder.cpp:272
+#: kmfolder.cpp:276
 #, fuzzy
 msgid "Failed to create folder"
 msgstr "Kuri Kurema Ububiko... "
 
+#: kmfolder.cpp:907
+#, fuzzy
+msgid ""
+"Folder names cannot contain the / (slash) character; please choose another "
+"folder name."
+msgstr ""
+"Amazina i /( AKARONGOKABERAMYE ) Inyuguti: ; Hitamo... Ububiko... Izina: . "
+
+#: kmfolder.cpp:913
+#, fuzzy
+msgid ""
+"Folder names cannot start with a . (dot) character; please choose another "
+"folder name."
+msgstr ""
+"Amazina Tangira &vendorShortName; Na: A . ( Akadomo ) Inyuguti: ; Hitamo... "
+"Ububiko... Izina: "
+
+#: kmfolder.cpp:932
+#, fuzzy
+msgid ""
+"Your IMAP server does not allow the character '%1'; please choose another "
+"folder name."
+msgstr ""
+"Seriveri: OYA Emera i Inyuguti: ' %1 ' ; Hitamo... Ububiko... Izina: . "
+
 #: kmfoldercachedimap.cpp:107
 #, fuzzy
 msgid "Troubleshooting IMAP Cache"
@@ -7278,24 +8159,24 @@ msgstr "Ububiko in Konti: : "
 msgid "Refresh &Cache"
 msgstr "Kuvugurura Ibishushanyo"
 
-#: 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."
 msgstr ""
 
-#: 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."
 msgstr ""
 
-#: kmfoldercachedimap.cpp:562
+#: kmfoldercachedimap.cpp:612
 #, fuzzy
 msgid "You must synchronize with the server before renaming IMAP folders."
 msgstr "Kuringaniza Na: i Seriveri: Mbere Guhindura izina Ububiko . "
 
-#: kmfoldercachedimap.cpp:679
+#: kmfoldercachedimap.cpp:735
 #, fuzzy
 msgid ""
 "No account setup for this folder.\n"
@@ -7304,7 +8185,7 @@ msgstr ""
 "Konti: Imikorere ya:  iyi Ububiko... . \n"
 "Kugerageza A Mbere iyi . "
 
-#: kmfoldercachedimap.cpp:683
+#: kmfoldercachedimap.cpp:739
 #, fuzzy
 msgid ""
 "Are you sure you want to refresh the IMAP cache of the folder %1 and all its "
@@ -7314,174 +8195,173 @@ msgstr ""
 "Kuri Kugira gishya i Ubwihisho Bya i Ububiko... %1 na Byose ? \n"
 "Gukuraho Byose Amahinduka Byakozwe Kuri Ububiko . "
 
-#: kmfoldercachedimap.cpp:687 kmmainwidget.cpp:1352
+#: kmfoldercachedimap.cpp:743 kmmainwidget.cpp:1316
 #, fuzzy
 msgid "Refresh IMAP Cache"
 msgstr "Kuvugurura Ibishushanyo"
 
-#: kmfoldercachedimap.cpp:688 kmmainwidget.cpp:1352
+#: kmfoldercachedimap.cpp:744 kmmainwidget.cpp:1316
 msgid "&Refresh"
 msgstr "Kugira gishya"
 
-#: kmfoldercachedimap.cpp:711
+#: kmfoldercachedimap.cpp:767
 #, fuzzy
 msgid "The index of this folder has been recreated."
 msgstr "Umubarendanga Bya iyi Ububiko... . "
 
-#: kmfoldercachedimap.cpp:721
+#: kmfoldercachedimap.cpp:777
 #, fuzzy
 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?"
 msgstr "%1 ni OYA in Leta ( Leta %2 ) . Kuri Kugarura Kuri Leta na ? "
 
-#: kmfoldercachedimap.cpp:721
+#: kmfoldercachedimap.cpp:777
 #, fuzzy
 msgid "Reset && Sync"
 msgstr "Gutangiza bushya Urwego"
 
-#: kmfoldercachedimap.cpp:741
+#: kmfoldercachedimap.cpp:798
 #, fuzzy
 msgid "Synchronization skipped"
 msgstr "iringaniza ryuzuye"
 
-#: kmfoldercachedimap.cpp:831
+#: kmfoldercachedimap.cpp:890
 #, fuzzy
 msgid "Synchronizing"
 msgstr "Kuringaniza"
 
-#: kmfoldercachedimap.cpp:850
+#: kmfoldercachedimap.cpp:909
 #, fuzzy, c-format
 msgid "Connecting to %1"
 msgstr "Kwihuza na\"%1\"..."
 
-#: kmfoldercachedimap.cpp:872
+#: kmfoldercachedimap.cpp:934
 #, fuzzy
 msgid "Checking permissions"
 msgstr "Uruhushya "
 
-#: kmfoldercachedimap.cpp:886
+#: kmfoldercachedimap.cpp:956
 #, fuzzy
 msgid "Renaming folder"
 msgstr "Guhindura izina ry'Ububiko..."
 
-#: kmfoldercachedimap.cpp:948
+#: kmfoldercachedimap.cpp:1021
 #, fuzzy
 msgid "Retrieving folderlist"
 msgstr "Gukuramo ububiko"
 
-#: kmfoldercachedimap.cpp:952
+#: kmfoldercachedimap.cpp:1026
 #, fuzzy
 msgid "Error while retrieving the folderlist"
 msgstr "Ikosa i "
 
-#: kmfoldercachedimap.cpp:959
+#: kmfoldercachedimap.cpp:1035
 #, fuzzy
 msgid "Retrieving subfolders"
 msgstr "Gukuramo ububiko"
 
-#: kmfoldercachedimap.cpp:966
+#: kmfoldercachedimap.cpp:1043
 #, fuzzy
 msgid "Deleting folders from server"
 msgstr "Ububiko Kuva: Seriveri: "
 
-#: kmfoldercachedimap.cpp:981
+#: kmfoldercachedimap.cpp:1058
 #, fuzzy
 msgid "Retrieving message list"
 msgstr "&Ubutumwa Urutonde "
 
-#: kmfoldercachedimap.cpp:994
+#: kmfoldercachedimap.cpp:1071
 #, fuzzy
 msgid "No messages to delete..."
 msgstr "Ubutumwa Kuri Gusiba ... "
 
-#: kmfoldercachedimap.cpp:1005
+#: kmfoldercachedimap.cpp:1082
 #, fuzzy
 msgid "Expunging deleted messages"
 msgstr "Kyasibwe: %S Ubutumwa "
 
-#: kmfoldercachedimap.cpp:1019
-#, fuzzy
-msgid "Retrieving new messages"
-msgstr "Gishya Ubutumwa "
+#: kmfoldercachedimap.cpp:1096
+#, fuzzy, c-format
+msgid ""
+"_n: Retrieving one new message\n"
+"Retrieving %n new messages"
+msgstr ""
+"1 Gishya &Ubutumwa in %1 \n"
+"%n Gishya Ubutumwa in %1 "
 
-#: kmfoldercachedimap.cpp:1031
+#: kmfoldercachedimap.cpp:1108
 #, fuzzy
 msgid "No new messages from server"
 msgstr "Gishya Ubutumwa Kuva: Seriveri: "
 
-#: kmfoldercachedimap.cpp:1064
+#: kmfoldercachedimap.cpp:1141
 #, fuzzy
 msgid "Checking annotation support"
 msgstr "Inyandiko nyongera Gushigikira "
 
-#: kmfoldercachedimap.cpp:1111
+#: kmfoldercachedimap.cpp:1191
 #, fuzzy
 msgid "Retrieving annotations"
 msgstr "Gukuramo porogaramu"
 
-#: kmfoldercachedimap.cpp:1133
+#: kmfoldercachedimap.cpp:1213
 #, fuzzy
 msgid "Setting annotations"
 msgstr "Izengurutsa rimwe"
 
-#: kmfoldercachedimap.cpp:1174
+#: kmfoldercachedimap.cpp:1260
 #, fuzzy
 msgid "Setting permissions"
 msgstr "Uruhushya "
 
-#: kmfoldercachedimap.cpp:1193
+#: kmfoldercachedimap.cpp:1279
 #, fuzzy
 msgid "Retrieving permissions"
 msgstr "Uruhushya "
 
-#: kmfoldercachedimap.cpp:1203
+#: kmfoldercachedimap.cpp:1306
 #, fuzzy
 msgid "Getting quota information"
 msgstr "Izengurutsa rimwe"
 
-#: kmfoldercachedimap.cpp:1218
-#, fuzzy
-msgid "Updating cache file"
-msgstr "Ubwihisho Idosiye "
-
-#: kmfoldercachedimap.cpp:1244
+#: kmfoldercachedimap.cpp:1321
 #, fuzzy
 msgid "Synchronization done"
 msgstr "Byakozwe "
 
-#: kmfoldercachedimap.cpp:1326
+#: kmfoldercachedimap.cpp:1464
 #, fuzzy
 msgid "Uploading messages to server"
 msgstr "Ubutumwa Kuri Seriveri: "
 
-#: 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>"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:1344
+#: kmfoldercachedimap.cpp:1482
 msgid "Acces rights revoked"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:1347 kmfoldercachedimap.cpp:1402
-#: kmfoldercachedimap.cpp:1447
+#: kmfoldercachedimap.cpp:1485 kmfoldercachedimap.cpp:1545
+#: kmfoldercachedimap.cpp:1596
 #, fuzzy
 msgid "No messages to upload to server"
 msgstr "Ubutumwa Kuri Gushyiraho Kuri Seriveri: "
 
-#: kmfoldercachedimap.cpp:1366 kmfoldercachedimap.cpp:1410
+#: kmfoldercachedimap.cpp:1504 kmfoldercachedimap.cpp:1553
 #, fuzzy
 msgid "Uploading status of messages to server"
 msgstr "Imimerere Bya Ubutumwa Kuri Seriveri: "
 
-#: kmfoldercachedimap.cpp:1490
+#: kmfoldercachedimap.cpp:1647
 #, fuzzy
 msgid "Creating subfolders on server"
 msgstr "ku Seriveri: "
 
-#: kmfoldercachedimap.cpp:1546
+#: kmfoldercachedimap.cpp:1707
 #, fuzzy
 msgid ""
 "<qt>"
@@ -7493,26 +8373,26 @@ msgstr ""
 "<p> i Ububiko... <b> %1 </b> Kyasibwe: %S . Kuri Gusiba Kuva: i Seriveri: ? </p> "
 "</qt> "
 
-#: kmfoldercachedimap.cpp:1558
+#: kmfoldercachedimap.cpp:1719
 #, fuzzy
 msgid "Deleting removed messages from server"
 msgstr "Cyavanyweho Ubutumwa Kuva: Seriveri: "
 
-#: kmfoldercachedimap.cpp:1592
+#: kmfoldercachedimap.cpp:1758
 #, fuzzy
 msgid "Checking folder validity"
 msgstr "Ububiko... Ukugira agaciro "
 
-#: kmfoldercachedimap.cpp:1806
+#: kmfoldercachedimap.cpp:1972
 msgid "Folder listing failed in interesting ways."
 msgstr ""
 
-#: kmfoldercachedimap.cpp:1888
+#: kmfoldercachedimap.cpp:2058
 #, fuzzy, c-format
 msgid "Retrieving folders for namespace %1"
 msgstr "Ububiko ya:  %1 "
 
-#: kmfoldercachedimap.cpp:2130
+#: kmfoldercachedimap.cpp:2300
 #, fuzzy
 msgid ""
 "<qt>"
@@ -7523,11 +8403,11 @@ msgstr ""
 "<p> i Ububiko... <b> %1 </b> Kyasibwe: %S . Kuri Gusiba Kuva: i Seriveri: ? </p> "
 "</qt> "
 
-#: kmfoldercachedimap.cpp:2411
+#: kmfoldercachedimap.cpp:2597
 msgid "Aborted"
 msgstr "Byahagaritswe"
 
-#: kmfoldercachedimap.cpp:2592
+#: kmfoldercachedimap.cpp:2812
 #, fuzzy
 msgid ""
 "The IMAP server %1 does not have support for IMAP annotations. The XML storage "
@@ -7536,7 +8416,7 @@ msgstr ""
 "Seriveri: %1 OYA Gushigikira ya:  . Byakoreshejwe ku iyi Seriveri: ; - Kugena "
 "Imiterere . "
 
-#: kmfoldercachedimap.cpp:2620
+#: kmfoldercachedimap.cpp:2840
 #, fuzzy
 msgid ""
 "The IMAP server %1 doesn't have support for imap annotations. The XML storage "
@@ -7545,16 +8425,16 @@ msgstr ""
 "Seriveri: %1 OYA Gushigikira ya:  . Byakoreshejwe ku iyi Seriveri: ; - Kugena "
 "Imiterere . "
 
-#: kmfoldercachedimap.cpp:2729
+#: kmfoldercachedimap.cpp:2951
 #, fuzzy
 msgid "Error while setting annotation: "
 msgstr "Ikosa Igenamiterere Inyandiko nyongera : "
 
-#: kmfoldercachedimap.cpp:2857 kmfoldercachedimap.cpp:2860
+#: kmfoldercachedimap.cpp:3079 kmfoldercachedimap.cpp:3082
 msgid "lost+found"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:2895
+#: kmfoldercachedimap.cpp:3117
 #, fuzzy
 msgid ""
 "<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
@@ -7569,11 +8449,11 @@ msgstr ""
 ". </p> "
 "<p> Kuri Himura Ubutumwa Kuri Ububiko... NONEAHA ? </p> "
 
-#: kmfoldercachedimap.cpp:2901
+#: kmfoldercachedimap.cpp:3123
 msgid "Insufficient access rights"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:2907
+#: kmfoldercachedimap.cpp:3129
 #, fuzzy
 msgid ""
 "<p>There are new messages in this folder (%1), which have not been uploaded to "
@@ -7589,63 +8469,70 @@ msgstr ""
 ". </p> "
 "<p> Kuri Himura Ubutumwa Kuri Ububiko... NONEAHA ? </p> "
 
-#: kmfoldercachedimap.cpp:2914 kmkernel.cpp:1801
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1903
 #, fuzzy
 msgid "Do Not Move"
 msgstr "Ntubike"
 
-#: kmfoldercachedimap.cpp:2916
+#: kmfoldercachedimap.cpp:3138
 #, fuzzy
 msgid "Move Messages to Folder"
 msgstr "Kuri "
 
-#: kmfolderdia.cpp:83
+#: kmfolderdia.cpp:84
 #, fuzzy
 msgid "Permissions (ACL)"
 msgstr "Uruhushya"
 
 #. 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 "Rusange"
 
-#: kmfolderdia.cpp:124
+#: kmfolderdia.cpp:125
 msgid "Templates"
 msgstr ""
 
-#: kmfolderdia.cpp:133
+#: kmfolderdia.cpp:134
 #, fuzzy
 msgid "Access Control"
 msgstr "Igenzura ActiveX"
 
-#: kmfolderdia.cpp:140
+#: kmfolderdia.cpp:141
 #, fuzzy
 msgid "Quota"
 msgstr "Igiteranyo"
 
+#: 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
 #, fuzzy, no-c-format
 msgid "Use custom &icons"
 msgstr "Guhanga Udushushondanga "
 
-#: kmfolderdia.cpp:304
+#: kmfolderdia.cpp:361
 #, fuzzy
 msgid "&Normal:"
 msgstr "Bisanzwe"
 
-#: kmfolderdia.cpp:319
+#: kmfolderdia.cpp:376
 #, fuzzy
 msgid "&Unread:"
 msgstr "Bidasomye:"
 
-#: kmfolderdia.cpp:356
+#: kmfolderdia.cpp:413
 #, fuzzy
 msgid "Act on new/unread mail in this folder"
 msgstr "ku Gishya /Bidasomye: %S Ibaruwa in iyi Ububiko... "
 
-#: kmfolderdia.cpp:358
+#: kmfolderdia.cpp:415
 #, fuzzy
 msgid ""
 "<qt>"
@@ -7666,17 +8553,17 @@ msgstr ""
 "/Ibanjirije Ububiko... Na: Bidasomye: %S Ubutumwa . ni ya:  Icyo ari cyo cyose "
 "Gishya /Bidasomye: %S Ibaruwa in Agatebo njyamwanda na Ububiko... . </p> </qt> "
 
-#: kmfolderdia.cpp:374
+#: kmfolderdia.cpp:431
 #, fuzzy
 msgid "Include this folder in mail checks"
 msgstr "iyi Ububiko... in Ibaruwa "
 
-#: kmfolderdia.cpp:385
+#: kmfolderdia.cpp:442
 #, fuzzy
 msgid "Keep replies in this folder"
 msgstr "in iyi Ububiko... "
 
-#: kmfolderdia.cpp:387
+#: kmfolderdia.cpp:444
 #, fuzzy
 msgid ""
 "Check this option if you want replies you write to mails in this folder to be "
@@ -7686,37 +8573,37 @@ msgstr ""
 "iyi Ihitamo NIBA Kwandika Kuri in iyi Ububiko... Kuri Gushyira in iyi "
 "Ububiko... Nyuma , Bya in i Yoherejwe: - Ibaruwa Ububiko... . "
 
-#: kmfolderdia.cpp:402
+#: kmfolderdia.cpp:459
 #, fuzzy
 msgid "Show Sender/Receiver Column in List of Messages"
 msgstr "/in Bya "
 
-#: kmfolderdia.cpp:404
+#: kmfolderdia.cpp:461
 #, fuzzy
 msgid "Sho&w column:"
 msgstr "Kwerekana Inkingi"
 
 #. 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 "Uwohereza"
 
 #. 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 "Umwakirizi"
 
-#: kmfolderdia.cpp:423
+#: kmfolderdia.cpp:480
 #, fuzzy
 msgid "&Sender identity:"
 msgstr "Ikiranga : "
 
-#: kmfolderdia.cpp:429
+#: kmfolderdia.cpp:486
 #, fuzzy
 msgid ""
 "Select the sender identity to be used when writing new mail or replying to mail "
@@ -7730,17 +8617,17 @@ msgstr ""
 "Uwohereza Imeli Aderesi: , Isinya na Ishirwaho umukono Cyangwa Bishunzwe: "
 "Utubuto mu buryo bwikora: . Gushyiraho Hejuru in i Iboneza Ikiganiro . ( - > ) "
 
-#: kmfolderdia.cpp:442
+#: kmfolderdia.cpp:500
 #, fuzzy
 msgid "&Folder contents:"
 msgstr "Ibigize : "
 
-#: kmfolderdia.cpp:475
+#: kmfolderdia.cpp:533
 #, fuzzy
 msgid "Generate free/&busy and activate alarms for:"
 msgstr "Kigenga /Irahuze na Kureka bigakora Impuruza ya:  : "
 
-#: kmfolderdia.cpp:482
+#: kmfolderdia.cpp:540
 #, fuzzy
 msgid ""
 "This setting defines which users sharing this folder should get \"busy\" "
@@ -7768,31 +8655,42 @@ msgstr ""
 "A Isosiyeti - Ububiko... Na: Bitari ngombwa Ibyabaye in Koresha \" \" guhera ni "
 "OYA Gyayo Kuri Ibyabaye . "
 
-#: kmfolderdia.cpp:497
+#: kmfolderdia.cpp:555
 msgid "Nobody"
 msgstr "Nta numwe"
 
-#: kmfolderdia.cpp:498
+#: kmfolderdia.cpp:556
 #, fuzzy
 msgid "Admins of This Folder"
 msgstr "Bya "
 
-#: kmfolderdia.cpp:499
+#: kmfolderdia.cpp:557
 #, fuzzy
 msgid "All Readers of This Folder"
 msgstr "Bya "
 
-#: kmfolderdia.cpp:502
+#: kmfolderdia.cpp:560
 msgid ""
 "This setting allows you to disable alarms for folders shared by others. "
 msgstr ""
 
-#: kmfolderdia.cpp:506
+#: kmfolderdia.cpp:562
 #, fuzzy
-msgid "Block free/&busy and alarms locally"
+msgid "Block alarms locally"
 msgstr "Kigenga /Irahuze na Kureka bigakora Impuruza ya:  : "
 
-#: 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
 #, fuzzy
 msgid ""
 "You have configured this folder to contain groupware information and the "
@@ -7805,82 +8703,82 @@ msgstr ""
 "Ububiko ni Gushyiraho . iyi Ububiko... Kubura Rimwe i Iboneza Ikiganiro ni . "
 "Kuri Gukuraho i Ububiko... Nanone , Kuri Kwangira Bya Ububiko Kuri Kuri . "
 
-#: kmfolderdir.cpp:184
+#: kmfolderdir.cpp:209
 #, fuzzy
 msgid "<qt>Cannot enter folder <b>%1</b>.</qt>"
 msgstr "<qt> Injiza Ububiko... <b> %1 </b> . </qt> "
 
-#: kmfolderdir.cpp:192
+#: kmfolderdir.cpp:217
 #, fuzzy
 msgid "<qt>Folder <b>%1</b> is unreadable.</qt>"
 msgstr "<qt> <b> %1 </b> ni . </qt> "
 
-#: kmfolderimap.cpp:251
+#: kmfolderimap.cpp:247
 #, fuzzy
 msgid "Removing folder"
 msgstr "Guhindura izina ry'Ububiko..."
 
-#: kmfolderimap.cpp:252 searchjob.cpp:270
+#: kmfolderimap.cpp:248 searchjob.cpp:270
 #, c-format
 msgid "URL: %1"
 msgstr ""
 
-#: kmfolderimap.cpp:267
+#: kmfolderimap.cpp:263
 #, fuzzy
 msgid "Error while removing a folder."
 msgstr "Ikosa A Ububiko... . "
 
-#: kmfolderimap.cpp:497
+#: kmfolderimap.cpp:491
 #, fuzzy, c-format
 msgid "Destination folder: %1"
 msgstr "Ububiko bw'Ishyika"
 
-#: kmfolderimap.cpp:1068
+#: kmfolderimap.cpp:1069
 #, fuzzy
 msgid "checking"
 msgstr "Kugenzura..."
 
-#: kmfolderimap.cpp:1118
+#: kmfolderimap.cpp:1119
 #, fuzzy
 msgid "Error while querying the server status."
 msgstr "Ikosa i Seriveri: Imimerere . "
 
-#: kmfolderimap.cpp:1233
+#: kmfolderimap.cpp:1234
 #, fuzzy
 msgid "Retrieving message status"
 msgstr "&Ubutumwa Imimerere "
 
-#: kmfolderimap.cpp:1248 kmfolderimap.cpp:1343
+#: kmfolderimap.cpp:1249 kmfolderimap.cpp:1344
 #, fuzzy
 msgid "Retrieving messages"
 msgstr "Ubutumwa "
 
-#: kmfolderimap.cpp:1273
+#: kmfolderimap.cpp:1274
 #, fuzzy, c-format
 msgid "Error while listing the contents of the folder %1."
 msgstr "Ikosa i Ibigize Bya i Ububiko... %1 . "
 
-#: kmfolderimap.cpp:1694
+#: kmfolderimap.cpp:1695
 #, fuzzy
 msgid "Error while retrieving messages."
 msgstr "Ikosa Ubutumwa . "
 
-#: kmfolderimap.cpp:1763
+#: kmfolderimap.cpp:1764
 #, fuzzy
 msgid "Error while creating a folder."
 msgstr "Ikosa Kurema A Ububiko... . "
 
-#: kmfolderimap.cpp:2130
+#: kmfolderimap.cpp:2131
 #, fuzzy
 msgid "updating message counts"
 msgstr "Ivugurura &Ubutumwa "
 
-#: kmfolderimap.cpp:2154
+#: kmfolderimap.cpp:2155
 #, fuzzy
 msgid "Error while getting folder information."
 msgstr "Ikosa Ububiko... Ibisobanuro: . "
 
-#: kmfolderindex.cpp:334
+#: kmfolderindex.cpp:369
 #, fuzzy
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
@@ -7891,21 +8789,21 @@ msgstr ""
 "Umubarendanga Kuva: Ibaruwa Ububiko... , Ibisobanuro: , Imimerere Amabendera , "
 "Gicurasi . Kuri Umubarendanga Idosiye ? "
 
-#: kmfolderindex.cpp:337
+#: kmfolderindex.cpp:372
 #, fuzzy
 msgid "Downgrade"
 msgstr "Yimuwe"
 
-#: kmfolderindex.cpp:337
+#: kmfolderindex.cpp:372
 #, fuzzy
 msgid "Do Not Downgrade"
 msgstr "(Itimuwe)"
 
-#: 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 ""
 "Ibaruwa Umubarendanga ya:  ' %1 ' ni Kuva: Kitazwi Verisiyo Bya ( %2 ) . \n"
 "Umubarendanga Kuva: Ibaruwa Ububiko... , Ibisobanuro: , Imimerere Amabendera , "
@@ -7930,27 +8828,27 @@ msgstr ""
 msgid "Folder `%1' changed; recreating index."
 msgstr "` %1 ' Byahinduwe ; Umubarendanga . "
 
-#: kmfoldermaildir.cpp:252
+#: kmfoldermaildir.cpp:253
 #, fuzzy
 msgid "Could not sync maildir folder."
 msgstr "OYA Ububiko... . "
 
-#: kmfoldermaildir.cpp:417
+#: kmfoldermaildir.cpp:418
 #, fuzzy
 msgid "Message could not be added to the folder, possibly disk space is low."
 msgstr "OYA Kyongewe Kuri i Ububiko... , Disiki%1 Umwanya ni hasi . "
 
-#: kmfoldermaildir.cpp:510
+#: kmfoldermaildir.cpp:514
 #, fuzzy
 msgid "KMFolderMaildir::addMsg: abnormally terminating to prevent data loss."
 msgstr ": : : Kuri Ibyatanzwe . "
 
-#: kmfoldermaildir.cpp:884 kmfoldermbox.cpp:794
+#: kmfoldermaildir.cpp:888 kmfoldermbox.cpp:799
 #, fuzzy
 msgid "Writing index file"
 msgstr "Umubarendanga Idosiye "
 
-#: kmfoldermaildir.cpp:892 kmfoldermbox.cpp:803
+#: kmfoldermaildir.cpp:896 kmfoldermbox.cpp:808
 #, fuzzy
 msgid ""
 "Your outbox contains messages which were most-likely not created by KMail;\n"
@@ -7959,7 +8857,7 @@ msgstr ""
 "Ibyasohotse ifite Ubutumwa - OYA Byaremwe ku ; \n"
 "Gukuraho Kuva: NIBA OYA Kuri Kohereza . "
 
-#: kmfoldermbox.cpp:111
+#: kmfoldermbox.cpp:112
 #, fuzzy
 msgid ""
 "Cannot open file \"%1\":\n"
@@ -7968,7 +8866,7 @@ msgstr ""
 "Gufungura Idosiye \" %1 \" : \n"
 "%2 "
 
-#: kmfoldermbox.cpp:128
+#: kmfoldermbox.cpp:129
 #, fuzzy
 msgid ""
 "<qt>"
@@ -7985,27 +8883,27 @@ msgstr ""
 "<p> Soma i Icyinjijwe in i <a href=\"%1\"> Icyiciro Bya i Bikorwa Bya </a> "
 "ya:  Ibisobanuro: Bigyanye Kuri iyi Kuva: Nanone . </p> </qt> "
 
-#: kmfoldermbox.cpp:152 kmfoldermbox.cpp:158
+#: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
 #, fuzzy
 msgid "Index Out of Date"
 msgstr "Bya "
 
-#: kmfoldermbox.cpp:165
+#: kmfoldermbox.cpp:166
 #, fuzzy
 msgid "Folder `%1' changed. Recreating index."
 msgstr "` %1 ' Byahinduwe . Umubarendanga . "
 
-#: kmfoldermbox.cpp:298
+#: kmfoldermbox.cpp:300
 #, fuzzy
 msgid "Could not sync index file <b>%1</b>: %2"
 msgstr "OYA Umubarendanga Idosiye <b> %1 </b> : %2 "
 
-#: kmfoldermbox.cpp:298
+#: kmfoldermbox.cpp:300
 #, fuzzy
 msgid "Internal error. Please copy down the details and report a bug."
 msgstr "Ikosamoimbere."
 
-#: kmfoldermbox.cpp:597
+#: kmfoldermbox.cpp:602
 #, fuzzy, c-format
 msgid ""
 "_n: Creating index file: one message done\n"
@@ -8014,17 +8912,17 @@ msgstr ""
 "Umubarendanga Idosiye : Rimwe &Ubutumwa Umubarendanga Idosiye : %n Ubutumwa "
 "Byakozwe "
 
-#: kmfoldermbox.cpp:1038
+#: kmfoldermbox.cpp:1043
 #, fuzzy
 msgid "Could not add message to folder: "
 msgstr "OYA &Ongera &Ubutumwa Kuri Ububiko... : "
 
-#: kmfoldermbox.cpp:1119
+#: kmfoldermbox.cpp:1127
 #, fuzzy
 msgid "Could not add message to folder:"
 msgstr "OYA &Ongera &Ubutumwa Kuri Ububiko... : "
 
-#: kmfoldermbox.cpp:1121
+#: kmfoldermbox.cpp:1129
 #, fuzzy
 msgid "Could not add message to folder (No space left on device?)"
 msgstr ""
@@ -8035,12 +8933,12 @@ msgstr ""
 msgid "Are you sure you want to expire old messages?"
 msgstr "Kuri ki/bishaje Ubutumwa ? "
 
-#: kmfoldermgr.cpp:69 kmmainwidget.cpp:1366
+#: kmfoldermgr.cpp:69 kmmainwidget.cpp:1330
 #, fuzzy
 msgid "Expire Old Messages?"
 msgstr "ubutumwa bwagaragajwe"
 
-#: kmfoldermgr.cpp:69 kmmainwidget.cpp:1366
+#: kmfoldermgr.cpp:69 kmmainwidget.cpp:1330
 #, fuzzy
 msgid "Expire"
 msgstr "Brarenze igihe"
@@ -8054,7 +8952,7 @@ msgstr ""
 "' %1 ' OYA Kugaragara Kuri A Ububiko... . \n"
 "Himura i Idosiye Inyuma Bya i . "
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1325
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1368
 #, fuzzy
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
@@ -8063,7 +8961,7 @@ msgstr ""
 "Uruhushya Bya i Ububiko... ' %1 ' ; \n"
 "Ubwoko Reba na Guhindura i Ibirimo: Bya iyi Ububiko... . "
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1317
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1360
 #, fuzzy
 msgid ""
 "KMail could not create folder '%1';\n"
@@ -8083,7 +8981,7 @@ msgstr ""
 msgid "Could Not Create Folder"
 msgstr "Kuri Kurema Ububiko... "
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1611
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1676
 #, fuzzy
 msgid ""
 "Cannot create file `%1' in %2.\n"
@@ -8092,251 +8990,255 @@ msgstr ""
 "Kurema Idosiye ` %1 ' in %2 . \n"
 "Tangira &vendorShortName; . "
 
-#: kmfolderseldlg.cpp:96 kmfolderseldlg.cpp:380 kmfolderseldlg.cpp:414
-#: kmfolderseldlg.cpp:416
-msgid "Path"
-msgstr ""
-
-#: 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 "Idosiye yungirije nshya..."
 
-#: kmfolderseldlg.cpp:446 kmfolderseldlg.cpp:466
+#: kmfolderseldlg.cpp:26 kmfolderseldlg.cpp:48
 #, fuzzy
 msgid "Create a new subfolder under the currently selected folder"
 msgstr "A Gishya i Byahiswemo Ububiko... "
 
-#: 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
 #, fuzzy
 msgid "View Columns"
 msgstr "hisha inkingi"
 
-#: kmfoldertree.cpp:388
+#: kmfoldertree.cpp:409
 #, fuzzy
 msgid "Unread Column"
 msgstr "Koresha Isimbuka-mbonerahamwe Inkingi"
 
-#: kmfoldertree.cpp:389
+#: kmfoldertree.cpp:410
 #, fuzzy
 msgid "Total Column"
 msgstr "Igiteranyo cyose ku nkingi"
 
-#: kmfoldertree.cpp:390
+#: kmfoldertree.cpp:411
 #, fuzzy
 msgid "Size Column"
 msgstr "hisha inkingi"
 
-#: kmfoldertree.cpp:567 kmfoldertree.cpp:1059
+#: kmfoldertree.cpp:591 kmfoldertree.cpp:1094
 #, fuzzy
 msgid "Searches"
 msgstr "Gushaka"
 
-#: kmfoldertree.cpp:884
+#: kmfoldertree.cpp:920
 #, fuzzy
 msgid "<qt>Go to the next unread message in folder <b>%1</b>?</qt>"
 msgstr ""
 "<qt> Kuri i Ibikurikira > Bidasomye: %S &Ubutumwa in Ububiko... <b> %1 </b> "
 "? </qt> "
 
-#: kmfoldertree.cpp:886
+#: kmfoldertree.cpp:922
 #, fuzzy
 msgid "Go to Next Unread Message"
 msgstr "Kuri "
 
-#: kmfoldertree.cpp:887
+#: kmfoldertree.cpp:923
 #, fuzzy
 msgid "Go To"
 msgstr "Kujya ku..."
 
-#: kmfoldertree.cpp:887
+#: kmfoldertree.cpp:923
 #, fuzzy
 msgid "Do Not Go To"
 msgstr "Utudomo Hejuru"
 
-#: kmfoldertree.cpp:1057 kmmainwidget.cpp:2757
+#: kmfoldertree.cpp:1092 kmmainwidget.cpp:2780
 msgid "&New Folder..."
 msgstr "Idosiye nshya..."
 
-#: kmfoldertree.cpp:1068 kmmainwidget.cpp:2645
+#: kmfoldertree.cpp:1103 kmmainwidget.cpp:2668
 #, fuzzy
 msgid "Check &Mail"
 msgstr "Soma Ibaruwa"
 
-#: kmfoldertree.cpp:1084
+#: kmfoldertree.cpp:1119
 #, fuzzy
 msgid "&Copy Folder To"
 msgstr "&Ububiko Rugo"
 
-#: kmfoldertree.cpp:1090
+#: kmfoldertree.cpp:1125
 #, fuzzy
 msgid "&Move Folder To"
 msgstr "&Ububiko Rugo"
 
-#: kmfoldertree.cpp:1104
+#: kmfoldertree.cpp:1141
 #, fuzzy
 msgid "Add to Favorite Folders"
 msgstr "Standard "
 
-#: kmfoldertree.cpp:1123
+#: kmfoldertree.cpp:1160
 #, fuzzy
-msgid "Subscription..."
+msgid "Serverside Subscription..."
 msgstr "Kwiyandikisha"
 
-#: kmfoldertree.cpp:1126
+#: kmfoldertree.cpp:1163
 #, fuzzy
 msgid "Local Subscription..."
 msgstr "Kwiyandikisha"
 
-#: kmfoldertree.cpp:1133
+#: kmfoldertree.cpp:1170
 #, fuzzy
 msgid "Refresh Folder List"
 msgstr "Gukuraho idosiye: %s"
 
-#: kmfoldertree.cpp:1140 kmmainwidget.cpp:3737
+#: kmfoldertree.cpp:1177 kmmainwidget.cpp:3771
 #, fuzzy
 msgid "&Troubleshoot IMAP Cache..."
 msgstr "Gufasha mu gihe ky'ibibazo"
 
-#: 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> Kurema Ububiko... <b> %1 </b> Bya Uruhushya ku i Seriveri: . Kuri Kurema , "
 "ask umuyobozi/uyobora Kuri Kuri . </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 "Bidasomye"
 
-#: 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 "Igiteranyo"
 
-#: kmfoldertree.cpp:1951
+#: kmfoldertree.cpp:1989
 #, fuzzy
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> here because a folder with the same "
 "name already exists.</qt>"
 msgstr "<qt> Kuri Kurema Ububiko... <b> %1 </b> , Ububiko... . </qt> "
 
-#: kmfoldertree.cpp:1961
+#: kmfoldertree.cpp:2000
 #, fuzzy
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> because it is not completely copied "
 "itself.</qt>"
 msgstr "<qt> Himura Ububiko... <b> %1 </b> A munsi . </qt> "
 
-#: kmfoldertree.cpp:1970
+#: kmfoldertree.cpp:2010
 #, fuzzy
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> into a subfolder below itself.</qt>"
 msgstr "<qt> Himura Ububiko... <b> %1 </b> A munsi . </qt> "
 
-#: kmfoldertree.cpp:2012
+#: kmfoldertree.cpp:2055
 msgid "Moving the selected folders is not possible"
 msgstr ""
 
-#: kmheaders.cpp:130
+#: kmheaders.cpp:132
 msgid "Status"
 msgstr "Imimerere"
 
-#: kmheaders.cpp:131 kmsearchpattern.h:218
+#: kmheaders.cpp:133 kmsearchpattern.h:218
 msgid "Important"
 msgstr "By'ingirakamaro"
 
-#: kmheaders.cpp:132
+#: kmheaders.cpp:134
 msgid "Action Item"
 msgstr ""
 
-#: kmheaders.cpp:133
+#: kmheaders.cpp:135
 msgid "Attachment"
 msgstr "Umugereka"
 
-#: kmheaders.cpp:134
+#: kmheaders.cpp:136 kmsearchpattern.h:233
+#, fuzzy
+msgid "Invitation"
+msgstr "Inyandiko"
+
+#: kmheaders.cpp:137
 #, fuzzy
 msgid "Spam/Ham"
 msgstr "GamaStp"
 
-#: kmheaders.cpp:135
+#: kmheaders.cpp:138
 msgid "Watched/Ignored"
 msgstr ""
 
-#: kmheaders.cpp:136
+#: kmheaders.cpp:139
 msgid "Signature"
 msgstr "Isinya"
 
-#: 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 "Ikivugwaho"
 
-#: 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 "Itariki"
 
-#: kmheaders.cpp:772 kmheaders.cpp:2601
+#: kmheaders.cpp:801 kmheaders.cpp:2643
 #, fuzzy
 msgid "Order of Arrival"
 msgstr "( Bya ) "
 
-#: kmheaders.cpp:777 kmheaders.cpp:2606
+#: kmheaders.cpp:806 kmheaders.cpp:2648
 #, fuzzy
 msgid " (Status)"
 msgstr "(Imimerere"
 
-#: kmheaders.cpp:1360
+#: kmheaders.cpp:1398
 #, fuzzy, c-format
 msgid ""
 "_n: 1 unsent\n"
 "%n unsent"
 msgstr "1 %n "
 
-#: kmheaders.cpp:1360
+#: kmheaders.cpp:1398
 #, fuzzy
 msgid "0 unsent"
 msgstr "0 %S "
 
-#: kmheaders.cpp:1362
+#: kmheaders.cpp:1400
 #, fuzzy, c-format
 msgid ""
 "_n: 1 unread\n"
 "%n unread"
 msgstr "1 %n Bidasomye: %S "
 
-#: kmheaders.cpp:1362
+#: kmheaders.cpp:1400
 #, fuzzy
 msgid "0 unread"
 msgstr "0 %S Bidasomye: %S "
 
-#: kmheaders.cpp:1364
+#: kmheaders.cpp:1402
 #, fuzzy
 msgid ""
 "_n: 1 message, %1.\n"
 "%n messages, %1."
 msgstr "Ubutumwa."
 
-#: kmheaders.cpp:1365
+#: kmheaders.cpp:1403
 #, fuzzy
 msgid "0 messages"
 msgstr "0 %S Ubutumwa "
 
-#: kmheaders.cpp:1367
+#: kmheaders.cpp:1405
 #, fuzzy
 msgid ""
 "_: %1 = n messages, m unread.\n"
 "%1 Folder is read-only."
 msgstr "%1 ni Soma - . "
 
-#: kmheaders.cpp:1560
+#: kmheaders.cpp:1598
 #, fuzzy, c-format
 msgid ""
 "_n: <qt>Do you really want to delete the selected message?"
@@ -8349,55 +9251,55 @@ msgstr ""
 "<qt> Kuri Gusiba i %n Byahiswemo Ubutumwa ? "
 "<br> Kyasibwe: %S , . </qt> "
 
-#: kmheaders.cpp:1562
+#: kmheaders.cpp:1600
 msgid "Delete Messages"
 msgstr "Gusiba Ubutumwa"
 
-#: kmheaders.cpp:1562
+#: kmheaders.cpp:1600
 msgid "Delete Message"
 msgstr "Gusiba Ubutumwa"
 
-#: kmheaders.cpp:1586
+#: kmheaders.cpp:1624
 #, fuzzy
 msgid "Messages deleted successfully."
 msgstr "Kyasibwe: %S . "
 
-#: kmheaders.cpp:1586
+#: kmheaders.cpp:1624
 #, fuzzy
 msgid "Messages moved successfully"
 msgstr "Ibaruwa yoherejwe neza."
 
-#: kmheaders.cpp:1609
+#: kmheaders.cpp:1647
 #, fuzzy
 msgid "Deleting messages failed."
 msgstr "Ubutumwa Byanze . "
 
-#: kmheaders.cpp:1609
+#: kmheaders.cpp:1647
 #, fuzzy
 msgid "Moving messages failed."
 msgstr "Ubutumwa Byanze . "
 
-#: kmheaders.cpp:1612
+#: kmheaders.cpp:1650
 #, fuzzy
 msgid "Deleting messages canceled."
 msgstr "Ubutumwa Kureka . "
 
-#: kmheaders.cpp:1612
+#: kmheaders.cpp:1650
 #, fuzzy
 msgid "Moving messages canceled."
 msgstr "Ubutumwa Kureka . "
 
-#: 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 "Gukoporora kuri"
 
-#: 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 "Imura kuri"
 
-#: kmheaders.cpp:2774 kmheaders.cpp:2814
+#: kmheaders.cpp:2818 kmheaders.cpp:2858
 #, fuzzy
 msgid ""
 "Failure modifying %1\n"
@@ -8406,102 +9308,114 @@ msgstr ""
 "%1 \n"
 "( Umwanya Ibumoso: ku APAREYE ? ) "
 
-#: kmkernel.cpp:684
+#: kmkernel.cpp:712
 #, fuzzy
 msgid "Certificate Signature Request"
 msgstr "Agaciro k'umukono w'impamyabushobozi"
 
-#: kmkernel.cpp:687
+#: kmkernel.cpp:715
 #, fuzzy
 msgid "Please create a certificate from attachment and return to sender."
 msgstr "Kurema A Impamyabushobozi: Kuva: Umugereka na Garuka Kuri Uwohereza . "
 
-#: kmkernel.cpp:1210
+#: kmkernel.cpp:1246
 #, fuzzy
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 "ni Gushyiraho Kuri Ntibicometse kuri interineti ; Byose urusobe Ibikorwa "
 
-#: kmkernel.cpp:1220
+#: kmkernel.cpp:1256
 #, fuzzy
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr "ni Gushyiraho Kuri kiri kuri interineti ; Byose urusobe Ibikorwa "
 
-#: kmkernel.cpp:1241
+#: kmkernel.cpp:1283
 #, fuzzy
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "ni in Ntibicometse kuri interineti Ubwoko . Kuri ? "
 
-#: kmkernel.cpp:1244 kmmainwidget.cpp:1899
+#: kmkernel.cpp:1286 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr "Korera hanze ya interneti"
 
-#: kmkernel.cpp:1245 kmmainwidget.cpp:1897
+#: kmkernel.cpp:1287 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr "Korera hanze ya interneti"
 
-#: kmkernel.cpp:1379
+#: kmkernel.cpp:1429
 #, fuzzy
 msgid "You do not have read/write permission to your inbox folder."
 msgstr "OYA Soma /Kwandika Kuri Agasanduku k'Ibyinjiye Ububiko... . "
 
-#: kmkernel.cpp:1387
+#: kmkernel.cpp:1437
 #, fuzzy
 msgid "outbox"
 msgstr "Ibyasohotse"
 
-#: kmkernel.cpp:1389
+#: kmkernel.cpp:1439
 #, fuzzy
 msgid "You do not have read/write permission to your outbox folder."
 msgstr "OYA Soma /Kwandika Kuri Ibyasohotse Ububiko... . "
 
-#: kmkernel.cpp:1406
+#: kmkernel.cpp:1456
 #, fuzzy
 msgid "sent-mail"
 msgstr "Ohereza Ibaruwa"
 
-#: kmkernel.cpp:1408
+#: kmkernel.cpp:1458
 #, fuzzy
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr "OYA Soma /Kwandika Kuri Yoherejwe: - Ibaruwa Ububiko... . "
 
-#: kmkernel.cpp:1415
+#: kmkernel.cpp:1465
 #, fuzzy
 msgid "trash"
 msgstr "Agatebo njyamwanda"
 
-#: kmkernel.cpp:1417
+#: kmkernel.cpp:1467
 #, fuzzy
 msgid "You do not have read/write permission to your trash folder."
 msgstr "OYA Soma /Kwandika Kuri Agatebo njyamwanda Ububiko... . "
 
-#: kmkernel.cpp:1424
+#: kmkernel.cpp:1474
 #, fuzzy
 msgid "drafts"
 msgstr "Inyandiko z'agateganyo"
 
-#: kmkernel.cpp:1426
+#: kmkernel.cpp:1476
 #, fuzzy
 msgid "You do not have read/write permission to your drafts folder."
 msgstr "OYA Soma /Kwandika Kuri Inyandiko z'agateganyo Ububiko... . "
 
-#: kmkernel.cpp:1435
+#: kmkernel.cpp:1485
 #, fuzzy
 msgid "templates"
 msgstr "Gusimbuza"
 
-#: kmkernel.cpp:1437
+#: kmkernel.cpp:1487
 #, fuzzy
 msgid "You do not have read/write permission to your templates folder."
 msgstr "OYA Soma /Kwandika Kuri Agatebo njyamwanda Ububiko... . "
 
-#: kmkernel.cpp:1480 searchwindow.cpp:255 searchwindow.cpp:490
-#: searchwindow.cpp:633
+#: kmkernel.cpp:1531 searchwindow.cpp:256 searchwindow.cpp:477
 #, fuzzy
 msgid "Last Search"
 msgstr "Gusibiramo Ishaka"
 
-#: 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
 #, fuzzy
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
@@ -8517,7 +9431,7 @@ msgstr ""
 "Gusimbuza Icyo ari cyo cyose Idosiye Na: i Izina: in <i> %7 </i> . "
 "<p> <strong> nka %3 Kuri Himura i Ibaruwa Idosiye NONEAHA ? </strong> </qt> "
 
-#: kmkernel.cpp:1789
+#: kmkernel.cpp:1891
 #, fuzzy
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
@@ -8531,17 +9445,17 @@ msgstr ""
 "iyi Ububiko... ya:  . "
 "<p> <strong> nka %3 Kuri Himura i Ibaruwa Idosiye NONEAHA ? </strong> </qt> "
 
-#: kmkernel.cpp:1798
+#: kmkernel.cpp:1900
 #, fuzzy
 msgid "Migrate Mail Files?"
 msgstr "Imura ibiranga byose?"
 
-#: kmkernel.cpp:2023
+#: kmkernel.cpp:2135
 #, fuzzy
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr "A Ikosa na NONEAHA "
 
-#: kmkernel.cpp:2025
+#: kmkernel.cpp:2137
 #, fuzzy, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -8552,91 +9466,91 @@ msgstr ""
 "Ikosa : \n"
 "%1 "
 
-#: kmkernel.cpp:2158 kmmainwidget.cpp:1176
+#: kmkernel.cpp:2270 kmmainwidget.cpp:1151
 #, fuzzy
 msgid "Empty Trash"
 msgstr "&Gusiga ubusa mu Gatebo"
 
-#: kmkernel.cpp:2159
+#: kmkernel.cpp:2271
 #, fuzzy
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Kuri ubusa i Agatebo njyamwanda Ububiko Bya Byose Konti ? "
 
-#: kmlineeditspell.cpp:105
+#: kmlineeditspell.cpp:134
 #, fuzzy
 msgid "vCard Import Failed"
 msgstr "Kuzana Idosiye"
 
-#: kmlineeditspell.cpp:116
+#: kmlineeditspell.cpp:135
 #, fuzzy
 msgid "<qt>Unable to access <b>%1</b>.</qt>"
 msgstr "<qt> Kuri <b> %1 </b> . </qt> "
 
-#: kmlineeditspell.cpp:168 recipientspicker.cpp:578
+#: kmlineeditspell.cpp:194 recipientspicker.cpp:578
 #, fuzzy
 msgid "Recent Addresses"
 msgstr "Aderesi "
 
-#: kmmainwidget.cpp:611
+#: kmmainwidget.cpp:601
 msgid "S&earch:"
 msgstr "Gushakisha:"
 
-#: kmmainwidget.cpp:674 kmmainwidget.cpp:1709
+#: kmmainwidget.cpp:664 kmmainwidget.cpp:1686
 #, fuzzy
 msgid "Move Message to Folder"
 msgstr "Kuri "
 
-#: kmmainwidget.cpp:679 kmmainwidget.cpp:1818
+#: kmmainwidget.cpp:669 kmmainwidget.cpp:1795
 #, fuzzy
 msgid "Copy Message to Folder"
 msgstr "Kuri "
 
-#: kmmainwidget.cpp:684 kmmainwidget.cpp:1697
+#: kmmainwidget.cpp:674 kmmainwidget.cpp:1674
 #, fuzzy
 msgid "Jump to Folder"
 msgstr "kopororera ku nyandiko"
 
-#: kmmainwidget.cpp:743
+#: kmmainwidget.cpp:717
 #, fuzzy
 msgid "Remove Duplicate Messages"
 msgstr "Isubiramo yo Gusiba Ubutumwa"
 
-#: kmmainwidget.cpp:748
+#: kmmainwidget.cpp:722
 #, fuzzy
 msgid "Abort Current Operation"
 msgstr "Uburyo buriho"
 
-#: kmmainwidget.cpp:753
+#: kmmainwidget.cpp:727
 #, fuzzy
 msgid "Focus on Next Folder"
 msgstr "ku "
 
-#: kmmainwidget.cpp:758
+#: kmmainwidget.cpp:732
 #, fuzzy
 msgid "Focus on Previous Folder"
 msgstr "ku "
 
-#: kmmainwidget.cpp:763
+#: kmmainwidget.cpp:737
 #, fuzzy
 msgid "Select Folder with Focus"
 msgstr "Na: "
 
-#: kmmainwidget.cpp:768
+#: kmmainwidget.cpp:742
 #, fuzzy
 msgid "Focus on Next Message"
 msgstr "ku "
 
-#: kmmainwidget.cpp:773
+#: kmmainwidget.cpp:747
 #, fuzzy
 msgid "Focus on Previous Message"
 msgstr "ku "
 
-#: kmmainwidget.cpp:778
+#: kmmainwidget.cpp:752
 #, fuzzy
 msgid "Select Message with Focus"
 msgstr "Na: "
 
-#: kmmainwidget.cpp:977
+#: kmmainwidget.cpp:951
 #, fuzzy
 msgid ""
 "_n: 1 new message in %1\n"
@@ -8645,7 +9559,7 @@ msgstr ""
 "1 Gishya &Ubutumwa in %1 \n"
 "%n Gishya Ubutumwa in %1 "
 
-#: kmmainwidget.cpp:993
+#: kmmainwidget.cpp:967
 #, fuzzy
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
@@ -8653,46 +9567,46 @@ msgid ""
 "<br>%1"
 msgstr "<b> Ibaruwa </b> <br> %1 "
 
-#: kmmainwidget.cpp:997
+#: kmmainwidget.cpp:971
 #, fuzzy
 msgid "New mail arrived"
 msgstr "Ibaruwa "
 
-#: kmmainwidget.cpp:1128
+#: kmmainwidget.cpp:1100
 #, fuzzy, c-format
 msgid "Properties of Folder %1"
 msgstr "Bya %1 "
 
-#: kmmainwidget.cpp:1149
+#: kmmainwidget.cpp:1124
 #, fuzzy
 msgid "This folder does not have any expiry options set"
 msgstr "Ububiko... OYA Icyo ari cyo cyose Amahitamo Gushyiraho "
 
-#: kmmainwidget.cpp:1157
+#: kmmainwidget.cpp:1132
 #, fuzzy
 msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 msgstr "<qt> Kuri i Ububiko... <b> %1 </b> ? </qt> "
 
-#: kmmainwidget.cpp:1158
+#: kmmainwidget.cpp:1133
 #, fuzzy
 msgid "Expire Folder"
 msgstr "Gufungura Ububiko"
 
-#: kmmainwidget.cpp:1159
+#: kmmainwidget.cpp:1134
 #, fuzzy
 msgid "&Expire"
 msgstr "Brarenze igihe"
 
-#: kmmainwidget.cpp:1176
+#: kmmainwidget.cpp:1151
 msgid "Move to Trash"
 msgstr "Kwimura kugira Ute"
 
-#: kmmainwidget.cpp:1178
+#: kmmainwidget.cpp:1153
 #, fuzzy
 msgid "Are you sure you want to empty the trash folder?"
 msgstr "Kuri ubusa i Agatebo njyamwanda Ububiko... ? "
 
-#: kmmainwidget.cpp:1179
+#: kmmainwidget.cpp:1154
 #, fuzzy
 msgid ""
 "<qt>Are you sure you want to move all messages from folder <b>%1</b> "
@@ -8701,17 +9615,29 @@ msgstr ""
 "<qt> Kuri Himura Byose Ubutumwa Kuva: Ububiko... <b> %1 </b> "
 "Kuri i Agatebo njyamwanda ? "
 
-#: kmmainwidget.cpp:1198
+#: kmmainwidget.cpp:1173
 #, fuzzy
 msgid "Moved all messages to the trash"
 msgstr "Byose Ubutumwa Kuri i Agatebo njyamwanda "
 
-#: 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 "Kuri Kurema Ububiko... "
+
+#: kmmainwidget.cpp:1209
 #, fuzzy
 msgid "Delete Search"
 msgstr "Gusibiramo Ishaka"
 
-#: kmmainwidget.cpp:1221
+#: kmmainwidget.cpp:1210
 #, fuzzy
 msgid ""
 "<qt>Are you sure you want to delete the search <b>%1</b>?"
@@ -8720,16 +9646,16 @@ msgstr ""
 "<qt> Kuri Gusiba i Shakisha <b> %1 </b> ? "
 "<br> Ubutumwa Bihari in ~Umwimerere Ububiko... . "
 
-#: kmmainwidget.cpp:1225
+#: kmmainwidget.cpp:1214
 msgid "Delete Folder"
 msgstr "Gusiba ububiko"
 
-#: kmmainwidget.cpp:1228
+#: kmmainwidget.cpp:1217
 #, fuzzy
 msgid "<qt>Are you sure you want to delete the empty folder <b>%1</b>?</qt>"
 msgstr "<qt> Kuri Gusiba i ubusa Ububiko... <b> %1 </b> ? </qt> "
 
-#: kmmainwidget.cpp:1233
+#: kmmainwidget.cpp:1222
 #, fuzzy
 msgid ""
 "<qt>Are you sure you want to delete the empty folder <b>%1</b> "
@@ -8741,7 +9667,7 @@ msgstr ""
 "<qt> Kuri Gusiba i ubusa Ububiko... <b> %1 </b> na Byose ? OYA ubusa na Ibigize "
 "Nka . </qt> "
 
-#: kmmainwidget.cpp:1242
+#: kmmainwidget.cpp:1231
 #, fuzzy
 msgid ""
 "<qt>Are you sure you want to delete the folder <b>%1</b>"
@@ -8750,7 +9676,7 @@ msgid ""
 "and are permanently deleted.</qt>"
 msgstr "<qt> Kuri Gusiba i Ububiko... <b> %1 </b> , Ibigize ? </qt> "
 
-#: kmmainwidget.cpp:1249
+#: kmmainwidget.cpp:1238
 #, fuzzy
 msgid ""
 "<qt>Are you sure you want to delete the folder <b>%1</b> "
@@ -8759,17 +9685,7 @@ msgid ""
 "and are permanently deleted.</qt>"
 msgstr "<qt> Kuri Gusiba i Ububiko... <b> %1 </b> na Byose , Ibigize ? </qt> "
 
-#: kmmainwidget.cpp:1268
-#, fuzzy
-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> Ububiko... Kyasibwe: %S Na: i Konti: <b> %1 </b> "
-"Ibaruwa . Ububiko... i Konti: Gishya Ibaruwa Kugarura Kuri i Ububiko... . </qt> "
-
-#: kmmainwidget.cpp:1349
+#: kmmainwidget.cpp:1313
 #, fuzzy
 msgid ""
 "Are you sure you want to refresh the IMAP cache?\n"
@@ -8778,12 +9694,12 @@ msgstr ""
 "Kuri Kugira gishya i Ubwihisho ? \n"
 "Gukuraho Byose Amahinduka Byakozwe Kuri Ububiko . "
 
-#: kmmainwidget.cpp:1365
+#: kmmainwidget.cpp:1329
 #, fuzzy
 msgid "Are you sure you want to expire all old messages?"
 msgstr "Kuri Byose ki/bishaje Ubutumwa ? "
 
-#: kmmainwidget.cpp:1389
+#: kmmainwidget.cpp:1353
 #, fuzzy
 msgid ""
 "Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
@@ -8793,16 +9709,16 @@ msgstr ""
 "Bya in Ibaruwa Ubwoko Birenzeho Kuri \" \" na Gicurasi Kwongeraho i Sisitemu ku "
 "Ikindi na Umutekano . "
 
-#: kmmainwidget.cpp:1392 kmmainwidget.cpp:1416 kmsender.cpp:503
+#: kmmainwidget.cpp:1356 kmmainwidget.cpp:1380 kmsender.cpp:504
 msgid "Security Warning"
 msgstr "Iburira ry'Umutekano"
 
-#: kmmainwidget.cpp:1393
+#: kmmainwidget.cpp:1357
 #, fuzzy
 msgid "Use HTML"
 msgstr "Ongera HTML"
 
-#: kmmainwidget.cpp:1413
+#: kmmainwidget.cpp:1377
 #, fuzzy
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
@@ -8812,22 +9728,22 @@ msgstr ""
 "external Indango in HTML Ibaruwa Ubwoko Birenzeho Kuri \" \" na Gicurasi "
 "Kwongeraho i Sisitemu ku Ikindi na Umutekano . "
 
-#: kmmainwidget.cpp:1417
+#: kmmainwidget.cpp:1381
 #, fuzzy
 msgid "Load External References"
 msgstr "Kwinjiza Indango"
 
-#: kmmainwidget.cpp:1658
+#: kmmainwidget.cpp:1634
 #, fuzzy
 msgid "Filter on Mailing-List..."
 msgstr "ku - ... "
 
-#: kmmainwidget.cpp:1663
+#: kmmainwidget.cpp:1639
 #, fuzzy
 msgid "Filter on Mailing-List %1..."
 msgstr "ku - %1 ... "
 
-#: kmmainwidget.cpp:1761
+#: kmmainwidget.cpp:1738
 #, fuzzy
 msgid ""
 "KMail's Out of Office Reply functionality relies on server-side filtering. You "
@@ -8837,592 +9753,599 @@ msgstr ""
 "Bya ku Seriveri: - Iyungurura . OYA Seriveri: ya:  iyi . \n"
 "iyi ku i \" \" tab Bya i Konti: Iboneza . "
 
-#: kmmainwidget.cpp:1766
+#: kmmainwidget.cpp:1743
 #, fuzzy
 msgid "No Server-Side Filtering Configured"
 msgstr "Nta gacomekwamo gakwiye kagenywe."
 
-#: kmmainwidget.cpp:1793
+#: kmmainwidget.cpp:1770
 #, fuzzy
-msgid "Could not start certificate manager; please check your installation."
+msgid ""
+"Could not start certificate manager 'kleopatra'; please check your "
+"installation."
 msgstr ""
 "OYA Tangira &vendorShortName; Impamyabushobozi: Muyobozi ; Kugenzura "
 "iyinjizaporogaramu . "
 
-#: kmmainwidget.cpp:1810
+#: kmmainwidget.cpp:1787
 #, fuzzy
 msgid ""
 "Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
 msgstr "OYA Tangira &vendorShortName; ( ) ; Kugenzura iyinjizaporogaramu . "
 
-#: kmmainwidget.cpp:2485
+#: kmmainwidget.cpp:2508
 #, fuzzy
 msgid "Forward With Custom Template"
 msgstr "Guhanga &Ubutumwa - ID Ingereka "
 
-#: kmmainwidget.cpp:2494
+#: kmmainwidget.cpp:2517
 #, fuzzy
 msgid "Reply With Custom Template"
 msgstr "Guhanga &Ubutumwa - ID Ingereka "
 
-#: kmmainwidget.cpp:2502
+#: kmmainwidget.cpp:2525
 #, fuzzy
 msgid "Reply to All With Custom Template"
 msgstr "Guhanga &Ubutumwa - ID Ingereka "
 
-#: kmmainwidget.cpp:2597 kmmainwidget.cpp:2602 kmmainwidget.cpp:2607
+#: kmmainwidget.cpp:2620 kmmainwidget.cpp:2625 kmmainwidget.cpp:2630
 #, fuzzy
 msgid "(no custom templates)"
 msgstr "Guhanga &Ubutumwa - ID Ingereka "
 
-#: kmmainwidget.cpp:2622 kmmimeparttree.cpp:141
+#: kmmainwidget.cpp:2645 kmmimeparttree.cpp:139
 msgid "Save &As..."
 msgstr "Kubika nka..."
 
-#: kmmainwidget.cpp:2629
+#: kmmainwidget.cpp:2652
 #, fuzzy
 msgid "&Compact All Folders"
 msgstr "Kugabanya ubunini bw'ububiko"
 
-#: kmmainwidget.cpp:2633
+#: kmmainwidget.cpp:2656
 #, fuzzy
 msgid "&Expire All Folders"
 msgstr "&Kwagura Ububiko Bwose"
 
-#: kmmainwidget.cpp:2637
+#: kmmainwidget.cpp:2660
 msgid "&Refresh Local IMAP Cache"
 msgstr ""
 
-#: kmmainwidget.cpp:2641
+#: kmmainwidget.cpp:2664
 #, fuzzy
 msgid "Empty All &Trash Folders"
 msgstr "Gusiga Ubusa mu Bubiko"
 
-#: kmmainwidget.cpp:2649
+#: kmmainwidget.cpp:2672
 #, fuzzy
 msgid "Check Mail in Favorite Folders"
 msgstr "in "
 
-#: kmmainwidget.cpp:2656
+#: kmmainwidget.cpp:2679
 #, fuzzy
 msgid "Check Mail &In"
 msgstr "Genzura amahuza"
 
-#: kmmainwidget.cpp:2666
+#: kmmainwidget.cpp:2689
 #, fuzzy
 msgid "&Send Queued Messages"
 msgstr "Kwohereza Ubutumwa"
 
-#: kmmainwidget.cpp:2669
+#: kmmainwidget.cpp:2692
 #, fuzzy
 msgid "Online Status (unknown)"
 msgstr "( Kitazwi ) "
 
-#: kmmainwidget.cpp:2673
+#: kmmainwidget.cpp:2696
 #, fuzzy
 msgid "Send Queued Messages Via"
 msgstr "Kwohereza Ubutumwa"
 
-#: kmmainwidget.cpp:2684
+#: kmmainwidget.cpp:2707
 #, fuzzy
 msgid "&Address Book..."
 msgstr "Igitabo kya ma aderesi..."
 
-#: kmmainwidget.cpp:2689
+#: kmmainwidget.cpp:2712
 #, fuzzy
 msgid "Certificate Manager..."
 msgstr "Uyobora Impamyabushobozi"
 
-#: kmmainwidget.cpp:2694
+#: kmmainwidget.cpp:2717
 msgid "GnuPG Log Viewer..."
 msgstr ""
 
-#: kmmainwidget.cpp:2699
+#: kmmainwidget.cpp:2722
 #, fuzzy
 msgid "&Import Messages..."
 msgstr "Shakisha Ubutumwa..."
 
-#: kmmainwidget.cpp:2704
+#: kmmainwidget.cpp:2727
 #, fuzzy
 msgid "&Debug Sieve..."
 msgstr "Bika..."
 
-#: kmmainwidget.cpp:2710
+#: kmmainwidget.cpp:2733
 #, fuzzy
 msgid "Edit \"Out of Office\" Replies..."
 msgstr "\" Bya \" ... "
 
-#: kmmainwidget.cpp:2716
+#: kmmainwidget.cpp:2739
 #, fuzzy
 msgid "Filter &Log Viewer..."
 msgstr "Ikyinjizwa ky'akayungirizo"
 
-#: kmmainwidget.cpp:2719
+#: kmmainwidget.cpp:2742
 #, fuzzy
 msgid "&Anti-Spam Wizard..."
 msgstr "Nyobora y'Ifishi..."
 
-#: kmmainwidget.cpp:2721
+#: kmmainwidget.cpp:2744
 #, fuzzy
 msgid "&Anti-Virus Wizard..."
 msgstr "Nyobora y'Ifishi..."
 
-#: kmmainwidget.cpp:2725 kmreadermainwin.cpp:316
+#: kmmainwidget.cpp:2748 kmreadermainwin.cpp:367
 msgid "&Move to Trash"
 msgstr "&Kwimurira mu Gatebo"
 
-#: kmmainwidget.cpp:2726 kmreadermainwin.cpp:317
+#: kmmainwidget.cpp:2749 kmreadermainwin.cpp:368
 #, fuzzy
 msgid "Move message to trashcan"
 msgstr "&Ubutumwa Kuri "
 
-#: kmmainwidget.cpp:2738
+#: kmmainwidget.cpp:2761
 #, fuzzy
 msgid "M&ove Thread to Trash"
 msgstr "Kuri "
 
-#: kmmainwidget.cpp:2739
+#: kmmainwidget.cpp:2762
 #, fuzzy
 msgid "Move thread to trashcan"
 msgstr "Igikorwa Kuri "
 
-#: kmmainwidget.cpp:2743
+#: kmmainwidget.cpp:2766
 #, fuzzy
 msgid "Delete T&hread"
 msgstr "Siba Ikarita"
 
-#: kmmainwidget.cpp:2747
+#: kmmainwidget.cpp:2770
 #, fuzzy
 msgid "&Find Messages..."
 msgstr "Shaka muri ubu butumwa..."
 
-#: kmmainwidget.cpp:2750
+#: kmmainwidget.cpp:2773
 #, fuzzy
 msgid "&Find in Message..."
 msgstr "in ... "
 
-#: kmmainwidget.cpp:2753
+#: kmmainwidget.cpp:2776
 #, fuzzy
 msgid "Select &All Messages"
 msgstr "Guhitamo Ibikorwa Byose"
 
-#: kmmainwidget.cpp:2760
+#: kmmainwidget.cpp:2783
 msgid "&Properties"
 msgstr "Indangabintu"
 
-#: kmmainwidget.cpp:2763
+#: kmmainwidget.cpp:2786
 #, fuzzy
 msgid "&Mailing List Management..."
 msgstr "Ilisiti y'amabaruwa"
 
-#: kmmainwidget.cpp:2772
+#: kmmainwidget.cpp:2795
 #, fuzzy
 msgid "Mark All Messages as &Read"
 msgstr "Nka "
 
-#: kmmainwidget.cpp:2775
+#: kmmainwidget.cpp:2798
 #, fuzzy
 msgid "&Expiration Settings"
 msgstr "Amagenamiterere mburabuzi"
 
-#: kmmainwidget.cpp:2778
+#: kmmainwidget.cpp:2801
 #, fuzzy
 msgid "&Compact Folder"
 msgstr "Kugabanya ubunini bw'ububiko"
 
-#: kmmainwidget.cpp:2781
+#: kmmainwidget.cpp:2804
 #, fuzzy
 msgid "Check Mail &in This Folder"
 msgstr "in "
 
-#: kmmainwidget.cpp:2793
+#: kmmainwidget.cpp:2816
+#, fuzzy
+msgid "&Archive Folder..."
+msgstr "Idosiye nshya..."
+
+#: kmmainwidget.cpp:2820
 #, fuzzy
 msgid "Prefer &HTML to Plain Text"
 msgstr "Kuri "
 
-#: kmmainwidget.cpp:2796
+#: kmmainwidget.cpp:2823
 #, fuzzy
 msgid "Load E&xternal References"
 msgstr "Kwinjiza Indango"
 
-#: kmmainwidget.cpp:2799
+#: kmmainwidget.cpp:2826
 #, fuzzy
 msgid "&Thread Messages"
 msgstr "Soma Ubutumwa"
 
-#: kmmainwidget.cpp:2802
+#: kmmainwidget.cpp:2829
 #, fuzzy
 msgid "Thread Messages also by &Subject"
 msgstr "ku "
 
-#: kmmainwidget.cpp:2805
+#: kmmainwidget.cpp:2832
 #, fuzzy
 msgid "Copy Folder"
 msgstr "kopororera ku nyandiko"
 
-#: kmmainwidget.cpp:2807
+#: kmmainwidget.cpp:2834
 #, fuzzy
 msgid "Cut Folder"
 msgstr "Ububiko"
 
-#: kmmainwidget.cpp:2809
+#: kmmainwidget.cpp:2836
 #, fuzzy
 msgid "Paste Folder"
 msgstr "Idosiye nshya"
 
-#: kmmainwidget.cpp:2812
+#: kmmainwidget.cpp:2839
 #, fuzzy
 msgid "Copy Messages"
 msgstr "Ubutumwa"
 
-#: kmmainwidget.cpp:2814
+#: kmmainwidget.cpp:2841
 #, fuzzy
 msgid "Cut Messages"
 msgstr "Ubutumwa"
 
-#: kmmainwidget.cpp:2816
+#: kmmainwidget.cpp:2843
 #, fuzzy
 msgid "Paste Messages"
 msgstr "Gusiba Ubutumwa"
 
-#: kmmainwidget.cpp:2820
+#: kmmainwidget.cpp:2847
 #, fuzzy
 msgid "&New Message..."
 msgstr "Ubutumwa Bushya..."
 
-#: kmmainwidget.cpp:2823 kmmainwidget.cpp:2915
+#: kmmainwidget.cpp:2850 kmmainwidget.cpp:2927
 #, fuzzy
 msgid "New Message From &Template"
 msgstr "Gishya Ubutumwa Kuva: Seriveri: "
 
-#: kmmainwidget.cpp:2831
+#: kmmainwidget.cpp:2858
 #, fuzzy
 msgid "New Message t&o Mailing-List..."
 msgstr "Kuri - ... "
 
-#: kmmainwidget.cpp:2836 kmreadermainwin.cpp:327 searchwindow.cpp:320
+#: kmmainwidget.cpp:2863 kmreadermainwin.cpp:378 searchwindow.cpp:321
 #, fuzzy
 msgid ""
 "_: Message->\n"
 "&Forward"
 msgstr "Imbere"
 
-#: kmmainwidget.cpp:2840 kmreadermainwin.cpp:330 searchwindow.cpp:329
+#: kmmainwidget.cpp:2867 kmreadermainwin.cpp:381 searchwindow.cpp:330
 #, fuzzy
 msgid "&Inline..."
 msgstr "Mumurongo"
 
-#: kmmainwidget.cpp:2846 kmreadermainwin.cpp:336 searchwindow.cpp:325
+#: kmmainwidget.cpp:2873 kmreadermainwin.cpp:387 searchwindow.cpp:326
 #, fuzzy
 msgid ""
 "_: Message->Forward->\n"
 "As &Attachment..."
 msgstr "Ongera wohereze ku bandi nk'imigereka"
 
-#: kmmainwidget.cpp:2852 kmreadermainwin.cpp:342 searchwindow.cpp:341
+#: kmmainwidget.cpp:2879 kmreadermainwin.cpp:393 searchwindow.cpp:342
 #, fuzzy
 msgid ""
 "_: Message->Forward->\n"
 "As Di&gest..."
 msgstr "Ongera wohereze ku bandi nk'imigereka"
 
-#: kmmainwidget.cpp:2858 kmreadermainwin.cpp:348 searchwindow.cpp:346
+#: kmmainwidget.cpp:2885 kmreadermainwin.cpp:399 searchwindow.cpp:347
 msgid ""
 "_: Message->Forward->\n"
 "&Redirect..."
 msgstr ""
 
-#: kmmainwidget.cpp:2885
+#: kmmainwidget.cpp:2897
 #, fuzzy
 msgid "Send A&gain..."
 msgstr "Ongera wohereze"
 
-#: kmmainwidget.cpp:2890
+#: kmmainwidget.cpp:2902
 #, fuzzy
 msgid "&Create Filter"
 msgstr "Kurema Ububiko"
 
-#: kmmainwidget.cpp:2893
+#: kmmainwidget.cpp:2905
 #, fuzzy
 msgid "Filter on &Subject..."
 msgstr "ku ... "
 
-#: kmmainwidget.cpp:2898
+#: kmmainwidget.cpp:2910
 #, fuzzy
 msgid "Filter on &From..."
 msgstr "ku ... "
 
-#: kmmainwidget.cpp:2903
+#: kmmainwidget.cpp:2915
 #, fuzzy
 msgid "Filter on &To..."
 msgstr "ku ... "
 
-#: kmmainwidget.cpp:2908
+#: kmmainwidget.cpp:2920
 #, fuzzy
 msgid "Filter on Mailing-&List..."
 msgstr "ku - ... "
 
-#: kmmainwidget.cpp:2921
+#: kmmainwidget.cpp:2933
 #, fuzzy
 msgid "Mark &Thread"
 msgstr "garagaza( urudodo)"
 
-#: kmmainwidget.cpp:2924
+#: kmmainwidget.cpp:2936
 #, fuzzy
 msgid "Mark Thread as &Read"
 msgstr "Nka "
 
-#: kmmainwidget.cpp:2925
+#: kmmainwidget.cpp:2937
 #, fuzzy
 msgid "Mark all messages in the selected thread as read"
 msgstr "Byose Ubutumwa in i Byahiswemo Igikorwa Nka Soma "
 
-#: kmmainwidget.cpp:2930
+#: kmmainwidget.cpp:2942
 #, fuzzy
 msgid "Mark Thread as &New"
 msgstr "Nka "
 
-#: kmmainwidget.cpp:2931
+#: kmmainwidget.cpp:2943
 #, fuzzy
 msgid "Mark all messages in the selected thread as new"
 msgstr "Byose Ubutumwa in i Byahiswemo Igikorwa Nka Gishya "
 
-#: kmmainwidget.cpp:2936
+#: kmmainwidget.cpp:2948
 #, fuzzy
 msgid "Mark Thread as &Unread"
 msgstr "Nka "
 
-#: kmmainwidget.cpp:2937
+#: kmmainwidget.cpp:2949
 #, fuzzy
 msgid "Mark all messages in the selected thread as unread"
 msgstr "Byose Ubutumwa in i Byahiswemo Igikorwa Nka Bidasomye: %S "
 
-#: kmmainwidget.cpp:2945
+#: kmmainwidget.cpp:2957
 #, fuzzy
 msgid "Mark Thread as &Important"
 msgstr "Nka "
 
-#: kmmainwidget.cpp:2948
+#: kmmainwidget.cpp:2960
 msgid "Remove &Important Thread Mark"
 msgstr ""
 
-#: kmmainwidget.cpp:2951
+#: kmmainwidget.cpp:2963
 #, fuzzy
 msgid "Mark Thread as &Action Item"
 msgstr "Nka "
 
-#: kmmainwidget.cpp:2954
+#: kmmainwidget.cpp:2966
 #, fuzzy
 msgid "Remove &Action Item Thread Mark"
 msgstr "Ubutumwa bugera ako kanya"
 
-#: kmmainwidget.cpp:2958
+#: kmmainwidget.cpp:2970
 msgid "&Watch Thread"
 msgstr "Kureba Igikorwa"
 
-#: kmmainwidget.cpp:2962
+#: kmmainwidget.cpp:2974
 msgid "&Ignore Thread"
 msgstr "Rengagiza Igikorwa"
 
-#: kmmainwidget.cpp:2970
+#: kmmainwidget.cpp:2982
 #, fuzzy
 msgid "Save A&ttachments..."
 msgstr "Kubika ... "
 
-#: kmmainwidget.cpp:2980
+#: kmmainwidget.cpp:2992
 #, fuzzy
 msgid "Appl&y All Filters"
 msgstr "Gukoresha Muyunguruzi"
 
-#. 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
 #, fuzzy, no-c-format
 msgid "A&pply Filter"
 msgstr "Gukoresha Muyunguruzi"
 
-#: kmmainwidget.cpp:2992
+#: kmmainwidget.cpp:3004
 msgid ""
 "_: View->\n"
 "&Unread Count"
 msgstr ""
 
-#: kmmainwidget.cpp:2994
+#: kmmainwidget.cpp:3006
 #, fuzzy
 msgid "Choose how to display the count of unread messages"
 msgstr "Kuri Kugaragaza: i IBARA Bya Bidasomye: %S Ubutumwa "
 
-#: kmmainwidget.cpp:2996
+#: kmmainwidget.cpp:3008
 #, fuzzy
 msgid ""
 "_: View->Unread Count\n"
 "View in &Separate Column"
 msgstr "in "
 
-#: kmmainwidget.cpp:3002
+#: kmmainwidget.cpp:3014
 msgid ""
 "_: View->Unread Count\n"
 "View After &Folder Name"
 msgstr ""
 
-#: kmmainwidget.cpp:3009
+#: kmmainwidget.cpp:3021
 #, fuzzy
 msgid ""
 "_: View->\n"
 "&Total Column"
 msgstr "Igiteranyo cyose ku nkingi"
 
-#: kmmainwidget.cpp:3012
+#: kmmainwidget.cpp:3024
 #, fuzzy
 msgid ""
 "Toggle display of column showing the total number of messages in folders."
 msgstr ""
 "Kugaragaza: Bya Inkingi i Igiteranyo: %S Umubare Bya Ubutumwa in Ububiko . "
 
-#: kmmainwidget.cpp:3014
+#: kmmainwidget.cpp:3026
 #, fuzzy
 msgid ""
 "_: View->\n"
 "&Size Column"
 msgstr "Igiteranyo cyose ku nkingi"
 
-#: kmmainwidget.cpp:3017
+#: kmmainwidget.cpp:3029
 #, fuzzy
 msgid "Toggle display of column showing the total size of messages in folders."
 msgstr ""
 "Kugaragaza: Bya Inkingi i Igiteranyo: %S Umubare Bya Ubutumwa in Ububiko . "
 
-#: kmmainwidget.cpp:3020
+#: kmmainwidget.cpp:3032
 #, fuzzy
 msgid ""
 "_: View->\n"
 "&Expand Thread"
 msgstr "Kwegura ibikorwa byose"
 
-#: kmmainwidget.cpp:3021
+#: kmmainwidget.cpp:3033
 #, fuzzy
 msgid "Expand the current thread"
 msgstr "i KIGEZWEHO Igikorwa "
 
-#: kmmainwidget.cpp:3026
+#: kmmainwidget.cpp:3038
 #, fuzzy
 msgid ""
 "_: View->\n"
 "&Collapse Thread"
 msgstr "Gusenyuka ibikorwa byose"
 
-#: kmmainwidget.cpp:3027
+#: kmmainwidget.cpp:3039
 #, fuzzy
 msgid "Collapse the current thread"
 msgstr "i KIGEZWEHO Igikorwa "
 
-#: kmmainwidget.cpp:3032
+#: kmmainwidget.cpp:3044
 #, fuzzy
 msgid ""
 "_: View->\n"
 "Ex&pand All Threads"
 msgstr "Kwegura ibikorwa byose"
 
-#: kmmainwidget.cpp:3033
+#: kmmainwidget.cpp:3045
 #, fuzzy
 msgid "Expand all threads in the current folder"
 msgstr "Byose Igikorwa in i KIGEZWEHO Ububiko... "
 
-#: kmmainwidget.cpp:3038
+#: kmmainwidget.cpp:3050
 #, fuzzy
 msgid ""
 "_: View->\n"
 "C&ollapse All Threads"
 msgstr "Gusenyuka ibikorwa byose"
 
-#: kmmainwidget.cpp:3039
+#: kmmainwidget.cpp:3051
 #, fuzzy
 msgid "Collapse all threads in the current folder"
 msgstr "Byose Igikorwa in i KIGEZWEHO Ububiko... "
 
-#: kmmainwidget.cpp:3044 kmreadermainwin.cpp:322
+#: kmmainwidget.cpp:3056 kmreadermainwin.cpp:373
 #, fuzzy
 msgid "&View Source"
 msgstr "Reba inkomoko y'Ipaji"
 
-#: kmmainwidget.cpp:3048
+#: kmmainwidget.cpp:3060
 #, fuzzy
 msgid "&Display Message"
 msgstr "Kwerekana agasandukubutumwa"
 
-#: kmmainwidget.cpp:3054
+#: kmmainwidget.cpp:3066
 #, fuzzy
 msgid "&Next Message"
 msgstr "Ubutumwa Bukurikiraho"
 
-#: kmmainwidget.cpp:3055
+#: kmmainwidget.cpp:3067
 #, fuzzy
 msgid "Go to the next message"
 msgstr "Kuri i Ibikurikira > &Ubutumwa "
 
-#: kmmainwidget.cpp:3059
+#: kmmainwidget.cpp:3071
 #, fuzzy
 msgid "Next &Unread Message"
 msgstr "Ubutumwa Butasomwe Bukurikira"
 
-#: kmmainwidget.cpp:3061
+#: kmmainwidget.cpp:3073
 #, fuzzy
 msgid "Go to the next unread message"
 msgstr "Kuri i Ibikurikira > Bidasomye: %S &Ubutumwa "
 
 #. i18n("Go to the next important message") ),
-#: kmmainwidget.cpp:3072
+#: kmmainwidget.cpp:3084
 #, fuzzy
 msgid "&Previous Message"
 msgstr "Ubutumwa Bubanza"
 
-#: kmmainwidget.cpp:3073
+#: kmmainwidget.cpp:3085
 #, fuzzy
 msgid "Go to the previous message"
 msgstr "Kuri i Ibanjirije &Ubutumwa "
 
-#: kmmainwidget.cpp:3077
+#: kmmainwidget.cpp:3089
 #, fuzzy
 msgid "Previous Unread &Message"
 msgstr "Ubutumwa Butasomwe Bubanza"
 
-#: kmmainwidget.cpp:3079
+#: kmmainwidget.cpp:3091
 #, fuzzy
 msgid "Go to the previous unread message"
 msgstr "Kuri i Ibanjirije Bidasomye: %S &Ubutumwa "
 
-#: kmmainwidget.cpp:3091
+#: kmmainwidget.cpp:3103
 #, fuzzy
 msgid "Next Unread &Folder"
 msgstr "Ubutumwa Butasomwe Bukurikira"
 
-#: kmmainwidget.cpp:3092
+#: kmmainwidget.cpp:3104
 #, fuzzy
 msgid "Go to the next folder with unread messages"
 msgstr "Kuri i Ibikurikira > Ububiko... Na: Bidasomye: %S Ubutumwa "
 
-#: kmmainwidget.cpp:3100
+#: kmmainwidget.cpp:3112
 #, fuzzy
 msgid "Previous Unread F&older"
 msgstr "Ubutumwa Butasomwe Bubanza"
 
-#: kmmainwidget.cpp:3101
+#: kmmainwidget.cpp:3113
 #, fuzzy
 msgid "Go to the previous folder with unread messages"
 msgstr "Kuri i Ibanjirije Ububiko... Na: Bidasomye: %S Ubutumwa "
 
-#: kmmainwidget.cpp:3108
+#: kmmainwidget.cpp:3120
 #, fuzzy
 msgid ""
 "_: Go->\n"
 "Next Unread &Text"
 msgstr "&Next"
 
-#: kmmainwidget.cpp:3109
+#: kmmainwidget.cpp:3121
 #, fuzzy
 msgid "Go to the next unread text"
 msgstr "Kuri i Ibikurikira > Bidasomye: %S Umwandiko "
 
-#: kmmainwidget.cpp:3110
+#: kmmainwidget.cpp:3122
 #, fuzzy
 msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
@@ -9431,60 +10354,65 @@ msgstr ""
 "Hasi KIGEZWEHO &Ubutumwa . Ku Impera Bya KIGEZWEHO &Ubutumwa , Gyayo Kuri "
 "Ibikurikira > Bidasomye: %S &Ubutumwa . "
 
-#: kmmainwidget.cpp:3117
+#: kmmainwidget.cpp:3129
+#, fuzzy
+msgid "Show Quick Search"
+msgstr "Gusubizaho Ishakisha Ryihuta"
+
+#: kmmainwidget.cpp:3136
 #, fuzzy
 msgid "Configure &Filters..."
 msgstr "Kuboneza Imyandikire..."
 
-#: kmmainwidget.cpp:3119
+#: kmmainwidget.cpp:3138
 #, fuzzy
 msgid "Configure &POP Filters..."
 msgstr "Kuboneza Imyandikire..."
 
-#: kmmainwidget.cpp:3121
+#: kmmainwidget.cpp:3140
 #, fuzzy
 msgid "Manage &Sieve Scripts..."
 msgstr "Yobora apareyi z'Umutekano..."
 
-#: kmmainwidget.cpp:3124
+#: kmmainwidget.cpp:3143
 #, fuzzy
 msgid "KMail &Introduction"
 msgstr "Intangiriro"
 
-#: kmmainwidget.cpp:3125
+#: kmmainwidget.cpp:3144
 #, fuzzy
 msgid "Display KMail's Welcome Page"
 msgstr "Kugaragaza amashusho ku ipaji"
 
-#: kmmainwidget.cpp:3131
+#: kmmainwidget.cpp:3150
 msgid "Configure &Notifications..."
 msgstr "Kuboneza amamenyesha..."
 
-#: kmmainwidget.cpp:3136
+#: kmmainwidget.cpp:3155
 #, fuzzy
 msgid "&Configure KMail..."
 msgstr "Kuboneza Imeli..."
 
-#: kmmainwidget.cpp:3431
+#: kmmainwidget.cpp:3454
 #, fuzzy
 msgid "E&mpty Trash"
 msgstr "&Gusiga ubusa mu Gatebo"
 
-#: kmmainwidget.cpp:3431
+#: kmmainwidget.cpp:3455
 #, fuzzy
 msgid "&Move All Messages to Trash"
 msgstr "Kuri "
 
-#: kmmainwidget.cpp:3434
+#: kmmainwidget.cpp:3464
 #, fuzzy
 msgid "&Delete Search"
 msgstr "Gusibiramo Ishaka"
 
-#: kmmainwidget.cpp:3434
+#: kmmainwidget.cpp:3465
 msgid "&Delete Folder"
 msgstr "Gusiba ububiko"
 
-#: kmmainwidget.cpp:3615
+#: kmmainwidget.cpp:3649
 #, fuzzy, c-format
 msgid ""
 "_n: Removed %n duplicate message.\n"
@@ -9493,27 +10421,27 @@ msgstr ""
 "%n Gusubiramo &Ubutumwa . \n"
 "%n Gusubiramo Ubutumwa . "
 
-#: kmmainwidget.cpp:3617
+#: kmmainwidget.cpp:3651
 #, fuzzy
 msgid "No duplicate messages found."
 msgstr "Gusubiramo Ubutumwa Byabonetse . "
 
-#: kmmainwidget.cpp:3687
+#: kmmainwidget.cpp:3721
 #, fuzzy, c-format
 msgid "Filter %1"
 msgstr "Akayunguruzo:"
 
-#: kmmainwidget.cpp:3821
+#: kmmainwidget.cpp:3855
 #, fuzzy
 msgid "Subscription"
 msgstr "Kwiyandikisha"
 
-#: kmmainwidget.cpp:3838
+#: kmmainwidget.cpp:3872
 #, fuzzy
 msgid "Local Subscription"
 msgstr "Kwiyandikisha"
 
-#: kmmainwidget.cpp:3971
+#: kmmainwidget.cpp:4007
 #, fuzzy
 msgid "Out of office reply active"
 msgstr "\" Bya \" ... "
@@ -9527,7 +10455,7 @@ msgstr "Idirishya Rishya"
 msgid " Initializing..."
 msgstr "Gutangiza..."
 
-#: kmmessage.cpp:1316
+#: kmmessage.cpp:1336
 #, fuzzy
 msgid ""
 "This message contains a request to return a notification about your reception "
@@ -9539,7 +10467,7 @@ msgstr ""
 ". \n"
 "Kureka i Kubaza... Cyangwa Kohereza A \" \" Cyangwa Bisanzwe . "
 
-#: kmmessage.cpp:1321
+#: kmmessage.cpp:1341
 #, fuzzy
 msgid ""
 "This message contains a request to send a notification about your reception of "
@@ -9553,7 +10481,7 @@ msgstr ""
 "ifite A Inonosora ni cy/byagarajwe Nka \" Bya ngombwa \" , ni Kitazwi Kuri . \n"
 "Kureka i Kubaza... Cyangwa Kohereza A \" Byanze \" . "
 
-#: kmmessage.cpp:1328
+#: kmmessage.cpp:1348
 #, fuzzy
 msgid ""
 "This message contains a request to send a notification about your reception of "
@@ -9567,7 +10495,7 @@ msgstr ""
 "ni Kuri Kohereza i Ikimenyetso Kuri Birenzeho Rimwe Aderesi: . \n"
 "Kureka i Kubaza... Cyangwa Kohereza A \" \" Cyangwa Bisanzwe . "
 
-#: kmmessage.cpp:1335
+#: kmmessage.cpp:1355
 #, fuzzy
 msgid ""
 "This message contains a request to send a notification about your reception of "
@@ -9581,7 +10509,7 @@ msgstr ""
 "ni Oya Garuka - Inzira: Gushyiraho . \n"
 "Kureka i Kubaza... Cyangwa Kohereza A \" \" Cyangwa Bisanzwe . "
 
-#: kmmessage.cpp:1341
+#: kmmessage.cpp:1361
 #, fuzzy
 msgid ""
 "This message contains a request to send a notification about your reception of "
@@ -9597,59 +10525,68 @@ msgstr ""
 ". \n"
 "Kureka i Kubaza... Cyangwa Kohereza A \" \" Cyangwa Bisanzwe . "
 
-#: kmmessage.cpp:1359 kmmessage.cpp:1366
+#: kmmessage.cpp:1379 kmmessage.cpp:1386
 #, fuzzy
 msgid "Message Disposition Notification Request"
 msgstr "Ikibazo ky'Iranga ry'ukoresha "
 
-#: kmmessage.cpp:1361
+#: kmmessage.cpp:1381
 #, fuzzy
 msgid "Send \"&denied\""
 msgstr "Ohereza amakuru"
 
-#: kmmessage.cpp:1361 kmmessage.cpp:1368
+#: kmmessage.cpp:1381 kmmessage.cpp:1388
 msgid "&Send"
 msgstr "Ohereza"
 
-#: kmmessage.cpp:1436
+#: kmmessage.cpp:1458
 #, fuzzy
 msgid ""
 "Header \"Disposition-Notification-Options\" contained required, but unknown "
 "parameter"
 msgstr "\" - - \" Bya ngombwa , Kitazwi Ikintu "
 
-#: kmmessage.cpp:1628
+#: kmmessage.cpp:1650
 #, fuzzy
 msgid "Receipt: "
 msgstr "Umukoresha"
 
-#: kmmessage.cpp:3128 urlhandlermanager.cpp:551
+#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
 #, fuzzy, c-format
 msgid "Attachment: %1"
 msgstr "Umugereka"
 
-#: kmmimeparttree.cpp:139 kmreaderwin.cpp:1969
+#: kmmessage.cpp:3199
+#, fuzzy
+msgid "This attachment has been deleted."
+msgstr "Imigereka: Nka ku Uwohereza . "
+
+#: kmmessage.cpp:3201
+msgid "The attachment '%1' has been deleted."
+msgstr ""
+
+#: kmmimeparttree.cpp:137 kmreaderwin.cpp:2034
 msgid ""
 "_: to view something\n"
 "View"
 msgstr ""
 
-#: kmmimeparttree.cpp:147
+#: kmmimeparttree.cpp:145
 #, fuzzy
 msgid "Save All Attachments..."
 msgstr "Kubika imigereka yose"
 
-#: kmmimeparttree.cpp:154 kmreaderwin.cpp:1975 kmreaderwin.cpp:2626
+#: kmmimeparttree.cpp:152 kmreaderwin.cpp:2041 kmreaderwin.cpp:2805
 #, fuzzy
 msgid "Delete Attachment"
 msgstr "Kubika umugereka"
 
-#: kmmimeparttree.cpp:157 kmreaderwin.cpp:1973 kmreaderwin.cpp:2638
+#: kmmimeparttree.cpp:155 kmreaderwin.cpp:2039 kmreaderwin.cpp:2861
 #, fuzzy
 msgid "Edit Attachment"
 msgstr "Umugereka"
 
-#: kmmimeparttree.cpp:370
+#: kmmimeparttree.cpp:368
 msgid "Unspecified Binary Data"
 msgstr ""
 
@@ -9871,248 +10808,260 @@ msgstr "Nta kivugwaho"
 msgid "unknown"
 msgstr "ntibizwi"
 
-#: kmreadermainwin.cpp:477 searchwindow.cpp:352
+#: kmreadermainwin.cpp:515 searchwindow.cpp:353
 #, fuzzy
 msgid "Save Attachments..."
 msgstr "Kubika ... "
 
-#: kmreaderwin.cpp:562
+#: kmreaderwin.cpp:489
 #, fuzzy
 msgid ""
 "_: View->\n"
 "&Headers"
 msgstr "Imitwe"
 
-#: kmreaderwin.cpp:563
+#: kmreaderwin.cpp:490
 #, fuzzy
 msgid "Choose display style of message headers"
 msgstr "Kugaragaza: Imisusire Bya &Ubutumwa Imitwe "
 
-#: kmreaderwin.cpp:568
+#: kmreaderwin.cpp:495
 #, fuzzy
 msgid ""
 "_: View->headers->\n"
 "&Enterprise Headers"
 msgstr "Standard "
 
-#: kmreaderwin.cpp:571
+#: kmreaderwin.cpp:498
 #, fuzzy
 msgid "Show the list of headers in Enterprise style"
 msgstr "i Urutonde Bya Imitwe in A Imiterere "
 
-#: kmreaderwin.cpp:575
+#: kmreaderwin.cpp:502
 msgid ""
 "_: View->headers->\n"
 "&Fancy Headers"
 msgstr ""
 
-#: kmreaderwin.cpp:578
+#: kmreaderwin.cpp:505
 #, fuzzy
 msgid "Show the list of headers in a fancy format"
 msgstr "i Urutonde Bya Imitwe in A Imiterere "
 
-#: kmreaderwin.cpp:582
+#: kmreaderwin.cpp:509
 msgid ""
 "_: View->headers->\n"
 "&Brief Headers"
 msgstr ""
 
-#: kmreaderwin.cpp:585
+#: kmreaderwin.cpp:512
 #, fuzzy
 msgid "Show brief list of message headers"
 msgstr "Urutonde Bya &Ubutumwa Imitwe "
 
-#: kmreaderwin.cpp:589
+#: kmreaderwin.cpp:516
 #, fuzzy
 msgid ""
 "_: View->headers->\n"
 "&Standard Headers"
 msgstr "Standard "
 
-#: kmreaderwin.cpp:592
+#: kmreaderwin.cpp:519
 #, fuzzy
 msgid "Show standard list of message headers"
 msgstr "Bisanzwe Urutonde Bya &Ubutumwa Imitwe "
 
-#: kmreaderwin.cpp:596
+#: kmreaderwin.cpp:523
 msgid ""
 "_: View->headers->\n"
 "&Long Headers"
 msgstr ""
 
-#: kmreaderwin.cpp:599
+#: kmreaderwin.cpp:526
 #, fuzzy
 msgid "Show long list of message headers"
 msgstr "Birebire Urutonde Bya &Ubutumwa Imitwe "
 
-#: kmreaderwin.cpp:603
+#: kmreaderwin.cpp:530
 msgid ""
 "_: View->headers->\n"
 "&All Headers"
 msgstr ""
 
-#: kmreaderwin.cpp:606
+#: kmreaderwin.cpp:533
 #, fuzzy
 msgid "Show all message headers"
 msgstr "Byose &Ubutumwa Imitwe "
 
-#: kmreaderwin.cpp:612
+#: kmreaderwin.cpp:539
 #, fuzzy
 msgid ""
 "_: View->\n"
 "&Attachments"
 msgstr "Imigereka"
 
-#: kmreaderwin.cpp:613
+#: kmreaderwin.cpp:540
 #, fuzzy
 msgid "Choose display style of attachments"
 msgstr "Kugaragaza: Imisusire Bya Imigereka: "
 
-#: kmreaderwin.cpp:617
+#: kmreaderwin.cpp:544
 msgid ""
 "_: View->attachments->\n"
 "&As Icons"
 msgstr ""
 
-#: kmreaderwin.cpp:620
+#: kmreaderwin.cpp:547
 #, fuzzy
 msgid "Show all attachments as icons. Click to see them."
 msgstr "Byose Imigereka: Nka Udushushondanga . Kuri . "
 
-#: kmreaderwin.cpp:624
+#: kmreaderwin.cpp:551
 msgid ""
 "_: View->attachments->\n"
 "&Smart"
 msgstr ""
 
-#: kmreaderwin.cpp:627
+#: kmreaderwin.cpp:554
 #, fuzzy
 msgid "Show attachments as suggested by sender."
 msgstr "Imigereka: Nka ku Uwohereza . "
 
-#: kmreaderwin.cpp:631
+#: kmreaderwin.cpp:558
 #, fuzzy
 msgid ""
 "_: View->attachments->\n"
 "&Inline"
 msgstr "Garagaza imigereka ku murongo "
 
-#: kmreaderwin.cpp:634
+#: kmreaderwin.cpp:561
 #, fuzzy
 msgid "Show all attachments inline (if possible)"
 msgstr "Byose Imigereka: Mumurongo ( NIBA ) "
 
-#: kmreaderwin.cpp:638
+#: kmreaderwin.cpp:565
 msgid ""
 "_: View->attachments->\n"
 "&Hide"
 msgstr ""
 
-#: kmreaderwin.cpp:641
+#: kmreaderwin.cpp:568
 #, fuzzy
 msgid "Do not show attachments in the message viewer"
 msgstr "OYA Herekana %S Imigereka: in i &Ubutumwa "
 
-#: kmreaderwin.cpp:646
+#: kmreaderwin.cpp:572
+#, fuzzy
+msgid ""
+"_: View->attachments->\n"
+"In Header &Only"
+msgstr "Garagaza imigereka ku murongo "
+
+#: kmreaderwin.cpp:575
+#, fuzzy
+msgid "Show Attachments only in the header of the mail"
+msgstr "Byose Imigereka: Nka Udushushondanga . Kuri . "
+
+#: kmreaderwin.cpp:580
 #, fuzzy
 msgid "&Set Encoding"
 msgstr "Gushyiraho Isobeka"
 
-#: kmreaderwin.cpp:654
+#: kmreaderwin.cpp:588
 #, fuzzy
 msgid "New Message To..."
 msgstr "Ubutumwa Bushya..."
 
-#: kmreaderwin.cpp:657
+#: kmreaderwin.cpp:591
 #, fuzzy
 msgid "Reply To..."
 msgstr "Subiza- Kuri:"
 
-#: kmreaderwin.cpp:660
+#: kmreaderwin.cpp:594
 #, fuzzy
 msgid "Forward To..."
 msgstr "Ijambo ry'Imbere"
 
-#: kmreaderwin.cpp:663
+#: kmreaderwin.cpp:597
 #, fuzzy
 msgid "Add to Address Book"
 msgstr "Ongera ku gatabo k'aderesi..."
 
-#: kmreaderwin.cpp:666
+#: kmreaderwin.cpp:600
 #, fuzzy
 msgid "Open in Address Book"
 msgstr "Gufungura in "
 
-#: kmreaderwin.cpp:670
+#: kmreaderwin.cpp:604
 #, fuzzy
 msgid "Select All Text"
 msgstr "Guhitamo Umwandiko"
 
-#: kmreaderwin.cpp:672
+#: kmreaderwin.cpp:606 kmreaderwin.cpp:1994
 msgid "Copy Link Address"
 msgstr "Gukoporora Aderesi y'Ihuza"
 
-#: kmreaderwin.cpp:674
+#: kmreaderwin.cpp:608
 #, fuzzy
 msgid "Open URL"
 msgstr "Gufungura "
 
-#: kmreaderwin.cpp:676
+#: kmreaderwin.cpp:610
 #, fuzzy
 msgid "Bookmark This Link"
 msgstr "Shiraho akamenyetso kuri ir'ihuza"
 
-#: kmreaderwin.cpp:680
+#: kmreaderwin.cpp:614
 #, fuzzy
 msgid "Save Link As..."
 msgstr "Bika iri huza nka..."
 
-#: kmreaderwin.cpp:687
+#: kmreaderwin.cpp:621
 #, fuzzy
 msgid "Chat &With..."
 msgstr "Inkuta z'Igishushanyo..."
 
-#: kmreaderwin.cpp:1294
+#: kmreaderwin.cpp:1258
 #, fuzzy
 msgid "Full namespace support for IMAP"
 msgstr "Gushigikira ya:  "
 
-#: kmreaderwin.cpp:1295
+#: kmreaderwin.cpp:1259
 #, fuzzy
 msgid "Offline mode"
 msgstr "Ubwoko "
 
-#: kmreaderwin.cpp:1296
+#: kmreaderwin.cpp:1260
 #, fuzzy
 msgid "Sieve script management and editing"
 msgstr "IYANDIKA &Ukuyobora na Guhindura "
 
-#: kmreaderwin.cpp:1297
+#: kmreaderwin.cpp:1261
 #, fuzzy
 msgid "Account specific filtering"
 msgstr "Iyungurura "
 
-#: kmreaderwin.cpp:1298
+#: kmreaderwin.cpp:1262
 #, fuzzy
 msgid "Filtering of incoming mail for online IMAP accounts"
 msgstr "Bya Ibaruwa ya:  kiri kuri interineti Konti "
 
-#: kmreaderwin.cpp:1299
+#: kmreaderwin.cpp:1263
 #, fuzzy
 msgid "Online IMAP folders can be used when filtering into folders"
 msgstr "Ububiko Byakoreshejwe Ryari: Iyungurura Ububiko "
 
-#: kmreaderwin.cpp:1300
+#: kmreaderwin.cpp:1264
 #, fuzzy
 msgid "Automatically delete older mails on POP servers"
 msgstr "Gusiba ku Amaseriveri "
 
-#: kmreaderwin.cpp:1338
+#: kmreaderwin.cpp:1302
 #, fuzzy
-msgid "The email client for the K Desktop Environment."
+msgid "The email client for the Trinity Desktop Environment."
 msgstr "Imeli Umukiriya ya:  i . "
 
-#: kmreaderwin.cpp:1346
+#: kmreaderwin.cpp:1310
 #, fuzzy
 msgid ""
 "<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
@@ -10121,7 +11070,7 @@ msgstr ""
 "< H2 Imisusire = ' Marije - Hejuru: : ; ' > </h2> "
 "<p> Tegereza . . . </p> &nbsp; "
 
-#: kmreaderwin.cpp:1354
+#: kmreaderwin.cpp:1318
 #, fuzzy
 msgid ""
 "<h2 style='margin-top: 0px;'>Offline</h2>"
@@ -10132,7 +11081,7 @@ msgstr ""
 "<p> ni in Ntibicometse kuri interineti Ubwoko . <a href=\"kmail:goOnline\"> </a> "
 "Kuri Gyayo kiri kuri interineti . . . </p> &nbsp; "
 
-#: kmreaderwin.cpp:1371
+#: kmreaderwin.cpp:1335
 #, fuzzy
 msgid ""
 "_: %1: KMail version; %2: help:// URL; %3: homepage URL; %4: prior KMail "
@@ -10174,14 +11123,14 @@ msgstr ""
 "<p> , </p> \n"
 "< p Imisusire = ' Marije - Hasi: : > &nbsp; &nbsp; </p> "
 
-#: kmreaderwin.cpp:1394 kmreaderwin.cpp:1416
+#: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
 #, fuzzy
 msgid ""
 "<li>%1</li>\n"
 msgstr ""
 "<li>%1</li>\n"
 
-#: kmreaderwin.cpp:1399
+#: kmreaderwin.cpp:1363
 #, fuzzy
 msgid ""
 "<p>Please take a moment to fill in the KMail configuration panel at "
@@ -10192,7 +11141,7 @@ msgstr ""
 "<p> A Kuri Kuzuza in i Iboneza Umwanya Ku - &gt; . \n"
 "Kuri Kurema Ku A Mburabuzi Ikiranga na Nka Nka Ibaruwa Konti: . </p> \n"
 
-#: kmreaderwin.cpp:1411
+#: kmreaderwin.cpp:1375
 #, fuzzy
 msgid ""
 "<p><span style='font-size:125%; font-weight:bold;'>Important changes</span> "
@@ -10201,26 +11150,35 @@ msgstr ""
 "<p> < Imisusire = ' Imyandikire - Ingano: : % ; Imyandikire - Uburemere : "
 "Bitsindagiye ; ' > Amahinduka < /> ( Kuri %1 ) : </p> \n"
 
-#: kmreaderwin.cpp:1555
+#: kmreaderwin.cpp:1518
 #, fuzzy
 msgid "( body part )"
 msgstr "( Umubiri Inzira %s ) "
 
-#: kmreaderwin.cpp:1854
+#: kmreaderwin.cpp:1890
 #, fuzzy
 msgid "Could not send MDN."
 msgstr "OYA Kohereza . "
 
-#: kmreaderwin.cpp:1978
+#: kmreaderwin.cpp:1992
+#, fuzzy
+msgid "Copy Email Address"
+msgstr "Imeli"
+
+#: kmreaderwin.cpp:2044
 msgid "Decrypt With Chiasmus..."
 msgstr ""
 
-#: 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
 #, fuzzy, c-format
 msgid "View Attachment: %1"
 msgstr "Imigereka:"
 
-#: kmreaderwin.cpp:2181
+#: kmreaderwin.cpp:2257
 #, fuzzy, c-format
 msgid ""
 "_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
@@ -10229,15 +11187,15 @@ msgstr ""
 "[ : ifite Nyabibiri Ibyatanzwe . Kuri Herekana %S Itangira Inyuguti: . ] \n"
 "[ : ifite Nyabibiri Ibyatanzwe . Kuri Herekana %S Itangira %n Inyuguti . ] "
 
-#: kmreaderwin.cpp:2277
+#: kmreaderwin.cpp:2353
 msgid "&Open with '%1'"
 msgstr "Gufungurira muri '%1'"
 
-#: kmreaderwin.cpp:2279
+#: kmreaderwin.cpp:2355
 msgid "&Open With..."
 msgstr "Gufungurira mu..."
 
-#: kmreaderwin.cpp:2281
+#: kmreaderwin.cpp:2357
 #, fuzzy
 msgid ""
 "Open attachment '%1'?\n"
@@ -10246,39 +11204,39 @@ msgstr ""
 "Gufungura Umugereka ' %1 ' ? \n"
 "icyitonderwa Gufungura %S Umugereka Gicurasi Umutekano . "
 
-#: kmreaderwin.cpp:2286
+#: kmreaderwin.cpp:2362
 #, fuzzy
 msgid "Open Attachment?"
 msgstr "Gufungura ? "
 
-#: kmreaderwin.cpp:2625
+#: kmreaderwin.cpp:2804
 msgid ""
 "Deleting an attachment might invalidate any digital signature on this message."
 msgstr ""
 
-#: kmreaderwin.cpp:2637
+#: kmreaderwin.cpp:2860
 msgid ""
 "Modifying an attachment might invalidate any digital signature on this message."
 msgstr ""
 
-#: kmreaderwin.cpp:2685
+#: kmreaderwin.cpp:2956
 #, fuzzy
 msgid "Attachments:"
 msgstr "Umugereka"
 
-#: kmsearchpattern.cpp:898
+#: kmsearchpattern.cpp:913
 #, fuzzy
 msgid ""
 "_: name used for a virgin filter\n"
 "unknown"
 msgstr "Kitazwi"
 
-#: kmsearchpattern.cpp:904
+#: kmsearchpattern.cpp:919
 #, fuzzy
 msgid "(match any of the following)"
 msgstr "( BIHUYE Icyo ari cyo cyose Bya i ) "
 
-#: kmsearchpattern.cpp:906
+#: kmsearchpattern.cpp:921
 #, fuzzy
 msgid "(match all of the following)"
 msgstr "( BIHUYE Byose Bya i ) "
@@ -10318,32 +11276,50 @@ msgstr "< in iminsi > "
 msgid "Message Status"
 msgstr "ubutumwa"
 
-#: kmsearchpatternedit.cpp:391
+#: kmsearchpatternedit.cpp:42
+#, fuzzy
+msgid "From"
+msgstr "Bivuye"
+
+#: kmsearchpatternedit.cpp:43 recipientseditor.cpp:100
+msgid "To"
+msgstr "Kuri"
+
+#: kmsearchpatternedit.cpp:44 recipientseditor.cpp:102
+msgid "CC"
+msgstr "KopiKubandi"
+
+#: kmsearchpatternedit.cpp:45
+#, fuzzy
+msgid "Reply To"
+msgstr "Subiza kanaka"
+
+#: kmsearchpatternedit.cpp:46
+#, fuzzy
+msgid "Organization"
+msgstr "Ikigo:"
+
+#: kmsearchpatternedit.cpp:397
 #, fuzzy
 msgid "Search Criteria"
 msgstr "Ibigenderwaho mu ishaka"
 
-#: kmsearchpatternedit.cpp:408
+#: kmsearchpatternedit.cpp:414
 #, fuzzy
 msgid "Match a&ll of the following"
 msgstr "Huza ibikurikira byose"
 
-#: kmsearchpatternedit.cpp:409
+#: kmsearchpatternedit.cpp:415
 #, fuzzy
 msgid "Match an&y of the following"
 msgstr "Huza ikyarikyo kyose mu bikurikira"
 
-#: kmsender.cpp:114
-#, fuzzy
-msgid "Please create an account for sending and try again."
-msgstr "Kurema Konti: ya:  na Kugerageza Nanone . "
-
 #: kmsender.cpp:171
 #, fuzzy
 msgid "Cannot add message to outbox folder"
 msgstr "&Ongera &Ubutumwa Kuri Ibyasohotse Ububiko... "
 
-#: kmsender.cpp:373
+#: kmsender.cpp:374
 #, fuzzy
 msgid ""
 "Critical error: Unable to process sent mail (out of space?)Moving failing "
@@ -10352,7 +11328,7 @@ msgstr ""
 "Ikosa : Kuri Yoherejwe: Ibaruwa ( Inyuma Bya Umwanya ? ) &Ubutumwa Kuri \" "
 "Yoherejwe: - Ibaruwa \" Ububiko... . "
 
-#: kmsender.cpp:385
+#: kmsender.cpp:386
 #, fuzzy
 msgid ""
 "Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
@@ -10365,7 +11341,7 @@ msgstr ""
 "Bya Disiki%1 Umwanya Cyangwa Kwandika . Kugerageza Kuri i na Himura i &Ubutumwa "
 "N'intoki . "
 
-#: kmsender.cpp:431
+#: kmsender.cpp:432
 #, fuzzy
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
@@ -10376,7 +11352,7 @@ msgstr ""
 "Gushyiraho i Imeli Aderesi: Bya Ikiranga ' %1 ' in i Icyiciro Bya i Iboneza "
 "Ikiganiro na Hanyuma Kugerageza Nanone . "
 
-#: kmsender.cpp:453
+#: kmsender.cpp:454
 #, fuzzy, c-format
 msgid ""
 "_n: %n queued message successfully sent.\n"
@@ -10385,22 +11361,22 @@ msgstr ""
 "%n Yashizwe ku murongo &Ubutumwa Yoherejwe: . \n"
 "%n Yashizwe ku murongo Ubutumwa Yoherejwe: . "
 
-#: kmsender.cpp:456
+#: kmsender.cpp:457
 #, fuzzy
 msgid "%1 of %2 queued messages successfully sent."
 msgstr "%1 Bya %2 Yashizwe ku murongo Ubutumwa Yoherejwe: . "
 
-#: kmsender.cpp:471
+#: kmsender.cpp:472
 #, fuzzy
 msgid "Sending messages"
 msgstr "Mu kwohereza ubutumwa"
 
-#: kmsender.cpp:472
+#: kmsender.cpp:473
 #, fuzzy
 msgid "Initiating sender process..."
 msgstr "Uwohereza ... "
 
-#: kmsender.cpp:502
+#: kmsender.cpp:503
 #, fuzzy
 msgid ""
 "You have chosen to send all queued email using an unencrypted transport, do you "
@@ -10408,29 +11384,29 @@ msgid ""
 msgstr ""
 "Kuri Kohereza Byose Yashizwe ku murongo Imeli ikoresha , Kuri Gukomeza ? "
 
-#: kmsender.cpp:504
+#: kmsender.cpp:505
 #, fuzzy
 msgid "Send Unencrypted"
 msgstr "Kohereza ibidasobetse"
 
-#: kmsender.cpp:556
+#: kmsender.cpp:557
 #, fuzzy
 msgid "Unrecognized transport protocol. Unable to send message."
 msgstr "Porotokole . Kuri Kohereza &Ubutumwa . "
 
-#: kmsender.cpp:597
+#: kmsender.cpp:598
 #, fuzzy
 msgid ""
 "_: %3: subject of message\n"
 "Sending message %1 of %2: %3"
 msgstr "&Ubutumwa %1 Bya %2 : %3 "
 
-#: kmsender.cpp:616
+#: kmsender.cpp:617
 #, fuzzy
 msgid "Failed to send (some) queued messages."
 msgstr "Kuri Kohereza ( ) Yashizwe ku murongo Ubutumwa . "
 
-#: kmsender.cpp:693
+#: kmsender.cpp:694
 #, fuzzy
 msgid ""
 "Sending aborted:\n"
@@ -10441,12 +11417,12 @@ msgid ""
 "  %2"
 msgstr "G."
 
-#: kmsender.cpp:701 kmsender.cpp:746
+#: kmsender.cpp:702 kmsender.cpp:747
 #, fuzzy
 msgid "Sending aborted."
 msgstr "Byahagaritswe . "
 
-#: kmsender.cpp:719
+#: kmsender.cpp:720
 #, fuzzy
 msgid ""
 "<p>Sending failed:</p>"
@@ -10458,22 +11434,22 @@ msgid ""
 "<p>Do you want me to continue sending the remaining messages?</p>"
 msgstr "<p>G."
 
-#: kmsender.cpp:729
+#: kmsender.cpp:730
 #, fuzzy
 msgid "Continue Sending"
 msgstr "Gukomeza "
 
-#: kmsender.cpp:729
+#: kmsender.cpp:730
 #, fuzzy
 msgid "&Continue Sending"
 msgstr "Gukomeza "
 
-#: kmsender.cpp:730
+#: kmsender.cpp:731
 #, fuzzy
 msgid "&Abort Sending"
 msgstr "Gushungura ubujyejuru"
 
-#: kmsender.cpp:732
+#: kmsender.cpp:733
 #, fuzzy
 msgid ""
 "Sending failed:\n"
@@ -10484,12 +11460,12 @@ msgid ""
 " %2"
 msgstr "G."
 
-#: kmsender.cpp:930
+#: kmsender.cpp:931
 #, fuzzy
 msgid "Please specify a mailer program in the settings."
 msgstr "Kugaragaza A Uwanditse Porogaramu in i Igenamiterere . "
 
-#: kmsender.cpp:931
+#: kmsender.cpp:932
 #, fuzzy
 msgid ""
 "Sending failed:\n"
@@ -10506,22 +11482,22 @@ msgstr ""
 "Porotokole Byakoreshejwe : \n"
 "%2 "
 
-#: kmsender.cpp:979
+#: kmsender.cpp:980
 #, fuzzy, c-format
 msgid "Failed to execute mailer program %1"
 msgstr "Kuri Gukora Uwanditse Porogaramu %1 "
 
-#: kmsender.cpp:1029
+#: kmsender.cpp:1030
 msgid "Sendmail exited abnormally."
 msgstr ""
 
-#: kmsender.cpp:1099
+#: kmsender.cpp:1100
 #, fuzzy
 msgid "You need to supply a username and a password to use this SMTP server."
 msgstr ""
 "Kuri A Izina ry'ukoresha na A Ijambobanga Kuri Koresha iyi Seriveri: . "
 
-#: kmstartup.cpp:197
+#: kmstartup.cpp:198
 #, fuzzy
 msgid ""
 "%1 already seems to be running on another display on this machine. Running %2 "
@@ -10531,7 +11507,7 @@ msgstr ""
 "%1 Kuri ku Kugaragaza: ku iyi Imashini: . %2 Birenzeho Rimwe i Bya Ibaruwa . "
 "OYA Tangira &vendorShortName; %1 ni OYA . "
 
-#: kmstartup.cpp:207
+#: kmstartup.cpp:208
 #, fuzzy
 msgid ""
 "%1 seems to be running on another display on this machine. Running %1 and %2 at "
@@ -10541,7 +11517,7 @@ msgstr ""
 "%1 Kuri ku Kugaragaza: ku iyi Imashini: . %1 na %2 Ku i Igihe i Bya Ibaruwa . "
 "OYA Tangira &vendorShortName; %2 %1 ni OYA . "
 
-#: kmstartup.cpp:215
+#: kmstartup.cpp:216
 #, fuzzy
 msgid ""
 "%1 already seems to be running on %2. Running %1 more than once can cause the "
@@ -10551,7 +11527,7 @@ msgstr ""
 "%1 Kuri ku %2 . %1 Birenzeho Rimwe i Bya Ibaruwa . OYA Tangira "
 "&vendorShortName; %1 ku iyi ni OYA ku %2 . "
 
-#: kmstartup.cpp:221
+#: kmstartup.cpp:222
 #, fuzzy
 msgid ""
 "%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
@@ -10561,26 +11537,26 @@ msgstr ""
 "%1 Kuri ku %3 . %1 na %2 Ku i Igihe i Bya Ibaruwa . OYA Tangira "
 "&vendorShortName; %2 ku iyi %1 ni OYA ku %3 . "
 
-#: kmstartup.cpp:231
+#: kmstartup.cpp:232
 #, fuzzy, c-format
 msgid "Start %1"
 msgstr "Gutangira..."
 
-#: kmstartup.cpp:232
+#: kmstartup.cpp:233
 msgid "Exit"
 msgstr "Gusohoka"
 
-#: kmsystemtray.cpp:337
+#: kmsystemtray.cpp:357
 #, fuzzy
 msgid "New Messages In"
 msgstr "Kubona Ubutumwa bushya"
 
-#: kmsystemtray.cpp:547
+#: kmsystemtray.cpp:567
 #, fuzzy
 msgid "There are no unread messages"
 msgstr "Oya Bidasomye: %S Ubutumwa "
 
-#: kmsystemtray.cpp:549
+#: kmsystemtray.cpp:569
 #, fuzzy, c-format
 msgid ""
 "_n: There is 1 unread message.\n"
@@ -10888,61 +11864,66 @@ msgstr "Yobora ama site"
 msgid "Available Scripts"
 msgstr "Mugaragaza Ziboneka"
 
-#: managesievescriptsdialog.cpp:116
+#: managesievescriptsdialog.cpp:121
 msgid "No Sieve URL configured"
 msgstr ""
 
-#: managesievescriptsdialog.cpp:135
+#: managesievescriptsdialog.cpp:140
 #, fuzzy
 msgid "Failed to fetch the list of scripts"
 msgstr "Kuri i Urutonde Bya Inyandikoporogaramu "
 
-#: managesievescriptsdialog.cpp:160
+#: managesievescriptsdialog.cpp:165
 #, fuzzy
 msgid "Delete Script"
 msgstr "Gusiba ibyamamaza"
 
-#: managesievescriptsdialog.cpp:161
+#: managesievescriptsdialog.cpp:166
 #, fuzzy
 msgid "Edit Script..."
 msgstr "Andika inyandiko- porogaramu"
 
-#: managesievescriptsdialog.cpp:164
+#: managesievescriptsdialog.cpp:167
+#, fuzzy
+msgid "Deactivate Script"
+msgstr "Gusiba ibyamamaza"
+
+#: managesievescriptsdialog.cpp:170
 #, fuzzy
 msgid "New Script..."
 msgstr "Inyandikoporogaramu..."
 
-#: managesievescriptsdialog.cpp:233
+#: managesievescriptsdialog.cpp:256
 #, fuzzy
 msgid "Really delete script \"%1\" from the server?"
 msgstr "Gusiba IYANDIKA \" %1 \" Kuva: i Seriveri: ? "
 
-#: managesievescriptsdialog.cpp:234
+#: managesievescriptsdialog.cpp:257
 #, fuzzy
 msgid "Delete Sieve Script Confirmation"
 msgstr "Iboneza rya java.ini ntiritunganye"
 
-#: managesievescriptsdialog.cpp:278
+#: managesievescriptsdialog.cpp:300
 #, fuzzy
 msgid "New Sieve Script"
 msgstr "Seriveri y'amakuru"
 
-#: managesievescriptsdialog.cpp:279
+#: managesievescriptsdialog.cpp:301
 #, fuzzy
 msgid "Please enter a name for the new Sieve script:"
 msgstr "Injiza A Izina: ya:  i Gishya IYANDIKA : "
 
-#: managesievescriptsdialog.cpp:293
+#: managesievescriptsdialog.cpp:315
 #, fuzzy
 msgid "Edit Sieve Script"
 msgstr "Andika inyandiko-porogaramu"
 
-#: managesievescriptsdialog.cpp:337
+#: managesievescriptsdialog.cpp:367
 #, fuzzy
 msgid "The Sieve script was successfully uploaded."
 msgstr "IYANDIKA . "
 
-#: managesievescriptsdialog.cpp:338
+#: managesievescriptsdialog.cpp:368
 #, fuzzy
 msgid "Sieve Script Upload"
 msgstr "Gutoranya amadosiye yo kuzana"
@@ -10954,7 +11935,7 @@ msgid ""
 "&Reply"
 msgstr "&Ongera ugerageze"
 
-#: messageactions.cpp:48 searchwindow.cpp:311
+#: messageactions.cpp:48 searchwindow.cpp:312
 #, fuzzy
 msgid "&Reply..."
 msgstr "Subiza"
@@ -10964,12 +11945,12 @@ msgstr "Subiza"
 msgid "Reply to A&uthor..."
 msgstr "Kuri ... "
 
-#: messageactions.cpp:58 searchwindow.cpp:313
+#: messageactions.cpp:58 searchwindow.cpp:314
 #, fuzzy
 msgid "Reply to &All..."
 msgstr "Gusubiza Bose"
 
-#: messageactions.cpp:63 searchwindow.cpp:316
+#: messageactions.cpp:63 searchwindow.cpp:317
 #, fuzzy
 msgid "Reply to Mailing-&List..."
 msgstr "Kuri - ... "
@@ -11042,7 +12023,7 @@ msgstr "Ubutumwa bugera ako kanya"
 msgid "&Edit Message"
 msgstr "Hindura ubutumwa nki gishya"
 
-#: messagecomposer.cpp:222
+#: messagecomposer.cpp:223
 #, fuzzy
 msgid ""
 "<qt>"
@@ -11051,7 +12032,7 @@ msgid ""
 "<p>Please contact your system administrator.</p></qt>"
 msgstr "<qt><p>Shakishauyoboraurwungano."
 
-#: messagecomposer.cpp:226
+#: messagecomposer.cpp:227
 #, fuzzy
 msgid ""
 "<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
@@ -11069,7 +12050,7 @@ msgstr ""
 "<li> <em> </em> Kureka bigakora A - ikoresha i - > - > - Ikiganiro . </li> "
 "<li> <em> Cyangwa </em> Kugaragaza Igenamiterere ku i - > tab . </li> </ul> "
 
-#: messagecomposer.cpp:444
+#: messagecomposer.cpp:445
 #, fuzzy
 msgid ""
 "No suitable encoding could be found for your message.\n"
@@ -11078,7 +12059,7 @@ msgstr ""
 "Imisobekere: Byabonetse ya:  &Ubutumwa . \n"
 "Gushyiraho Imisobekere: ikoresha i ' Ibikubiyemo . "
 
-#: messagecomposer.cpp:556
+#: messagecomposer.cpp:557
 #, fuzzy
 msgid ""
 "Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
@@ -11086,7 +12067,7 @@ msgid ""
 msgstr ""
 "Impera y'inyuma OYA i \" x - Shyiraho Umutekano \" Umumaro . Icyegeranyo iyi . "
 
-#: messagecomposer.cpp:564
+#: messagecomposer.cpp:565
 #, fuzzy
 msgid ""
 "The \"x-encrypt\" function does not accept the expected parameters. Please "
@@ -11095,12 +12076,12 @@ msgstr ""
 "\" x - Shyiraho Umutekano \" Umumaro OYA Kwemera i Ikitezwe: $(ARG1) Ibigenga . "
 "Icyegeranyo iyi "
 
-#: messagecomposer.cpp:572
+#: messagecomposer.cpp:573
 #, fuzzy
 msgid "Chiasmus Encryption Error"
 msgstr "Ikosa "
 
-#: messagecomposer.cpp:577
+#: messagecomposer.cpp:578
 #, fuzzy
 msgid ""
 "Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
@@ -11109,7 +12090,7 @@ msgstr ""
 "Garuka Agaciro: Kuva: Impera y'inyuma : \" x - Shyiraho Umutekano \" Umumaro "
 "OYA Garuka A Bayite Imbonerahamwe . Icyegeranyo iyi . "
 
-#: messagecomposer.cpp:638
+#: messagecomposer.cpp:636
 #, fuzzy
 msgid ""
 "The inline OpenPGP crypto message format does not support encryption or signing "
@@ -11120,22 +12101,22 @@ msgstr ""
 "umukono Bya Imigereka: . \n"
 "Koresha Bitemewe. Mumurongo ? "
 
-#: messagecomposer.cpp:642
+#: messagecomposer.cpp:640
 #, fuzzy
 msgid "Insecure Message Format"
 msgstr "Imiterere Y'ubutumwa"
 
-#: messagecomposer.cpp:643
+#: messagecomposer.cpp:641
 #, fuzzy
 msgid "Use Inline OpenPGP"
 msgstr "Gukoresha GufunguraGL"
 
-#: messagecomposer.cpp:644
+#: messagecomposer.cpp:642
 #, fuzzy
 msgid "Use OpenPGP/MIME"
 msgstr "Gukoresha GufunguraGL"
 
-#: messagecomposer.cpp:760
+#: messagecomposer.cpp:758
 #, fuzzy
 msgid ""
 "Examination of the recipient's signing preferences yielded that you be asked "
@@ -11146,24 +12127,24 @@ msgstr ""
 "&Ubutumwa . \n"
 "iyi &Ubutumwa ? "
 
-#: messagecomposer.cpp:765 messagecomposer.cpp:788
+#: messagecomposer.cpp:763 messagecomposer.cpp:786
 #, fuzzy
 msgid "Sign Message?"
 msgstr "Kohereza Ubutumwa"
 
-#: messagecomposer.cpp:766 messagecomposer.cpp:789
+#: messagecomposer.cpp:764 messagecomposer.cpp:787
 #, fuzzy
 msgid ""
 "_: to sign\n"
 "&Sign"
 msgstr "Ikimenyetso+"
 
-#: messagecomposer.cpp:767 messagecomposer.cpp:790
+#: messagecomposer.cpp:765 messagecomposer.cpp:788
 #, fuzzy
 msgid "Do &Not Sign"
 msgstr "Kutohereza"
 
-#: messagecomposer.cpp:784
+#: messagecomposer.cpp:782
 #, fuzzy
 msgid ""
 "There are conflicting signing preferences for these recipients.\n"
@@ -11172,7 +12153,7 @@ msgstr ""
 "Ishirwaho umukono Ibya&hiswemo ya:  Abandikiwe... . \n"
 "iyi &Ubutumwa ? "
 
-#: messagecomposer.cpp:806
+#: messagecomposer.cpp:804
 #, fuzzy
 msgid ""
 "You have requested to sign this message, but no valid signing keys have been "
@@ -11181,17 +12162,17 @@ msgstr ""
 "Kuri Shyiraho Umukono iyi &Ubutumwa , Oya Byemewe Ishirwaho umukono Utubuto ya: "
 " iyi Ikiranga "
 
-#: messagecomposer.cpp:810
+#: messagecomposer.cpp:808
 #, fuzzy
 msgid "Send Unsigned?"
 msgstr "Bitashizweho umukono"
 
-#: messagecomposer.cpp:811
+#: messagecomposer.cpp:809
 #, fuzzy
 msgid "Send &Unsigned"
 msgstr "Bitashizweho umukono"
 
-#: messagecomposer.cpp:826
+#: messagecomposer.cpp:824
 #, fuzzy
 msgid ""
 "Some parts of this message will not be signed.\n"
@@ -11202,7 +12183,7 @@ msgstr ""
 "Ubutumwa &Ipaji Itegeko . \n"
 "Byose ? "
 
-#: messagecomposer.cpp:829
+#: messagecomposer.cpp:827
 #, fuzzy
 msgid ""
 "This message will not be signed.\n"
@@ -11213,27 +12194,27 @@ msgstr ""
 "Bitashizweho umukono &Ubutumwa &Ipaji Itegeko . \n"
 "&Ubutumwa ? "
 
-#: messagecomposer.cpp:833
+#: messagecomposer.cpp:831
 #, fuzzy
 msgid "&Sign All Parts"
 msgstr "imbonerahamwe zose"
 
-#: messagecomposer.cpp:833
+#: messagecomposer.cpp:831
 #, fuzzy
 msgid "&Sign"
 msgstr "Shyiraho Umukono"
 
-#: messagecomposer.cpp:835
+#: messagecomposer.cpp:833
 #, fuzzy
 msgid "Unsigned-Message Warning"
 msgstr "Ubutumwa bufunitse"
 
-#: messagecomposer.cpp:837
+#: messagecomposer.cpp:835
 #, fuzzy
 msgid "Send &As Is"
 msgstr "Kubika nka"
 
-#: messagecomposer.cpp:875
+#: messagecomposer.cpp:873
 #, fuzzy
 msgid ""
 "Valid trusted encryption keys were found for all recipients.\n"
@@ -11242,7 +12223,7 @@ msgstr ""
 "Bishunzwe: Utubuto Byabonetse ya:  Byose Abandikiwe... . \n"
 "iyi &Ubutumwa ? "
 
-#: messagecomposer.cpp:877
+#: messagecomposer.cpp:875
 #, fuzzy
 msgid ""
 "Examination of the recipient's encryption preferences yielded that you be asked "
@@ -11253,27 +12234,27 @@ msgstr ""
 ". \n"
 "iyi &Ubutumwa ? "
 
-#: messagecomposer.cpp:882 messagecomposer.cpp:909
+#: messagecomposer.cpp:880 messagecomposer.cpp:907
 #, fuzzy
 msgid "Encrypt Message?"
 msgstr "Shyiraho umutekano kuri iyi imeli"
 
-#: messagecomposer.cpp:884
+#: messagecomposer.cpp:882
 #, fuzzy
 msgid "Sign && &Encrypt"
 msgstr "Shyiraho Umutekano"
 
-#: messagecomposer.cpp:887 messagecomposer.cpp:962
+#: messagecomposer.cpp:885 messagecomposer.cpp:960
 #, fuzzy
 msgid "&Sign Only"
 msgstr "Imirongo gusa"
 
-#: messagecomposer.cpp:888 messagecomposer.cpp:963
+#: messagecomposer.cpp:886 messagecomposer.cpp:961
 #, fuzzy
 msgid "&Send As-Is"
 msgstr "Kohereza amadosiye"
 
-#: messagecomposer.cpp:905
+#: messagecomposer.cpp:903
 #, fuzzy
 msgid ""
 "There are conflicting encryption preferences for these recipients.\n"
@@ -11282,12 +12263,12 @@ msgstr ""
 "Bishunzwe: Ibya&hiswemo ya:  Abandikiwe... . \n"
 "iyi &Ubutumwa ? "
 
-#: messagecomposer.cpp:911
+#: messagecomposer.cpp:909
 #, fuzzy
 msgid "Do &Not Encrypt"
 msgstr "Ntushireho umutekano kuri iyi imeli"
 
-#: messagecomposer.cpp:927
+#: messagecomposer.cpp:925
 #, fuzzy
 msgid ""
 "You have requested to encrypt this message, and to encrypt a copy to yourself, "
@@ -11296,12 +12277,12 @@ msgstr ""
 "Kuri Shyiraho Umutekano iyi &Ubutumwa , na Kuri Shyiraho Umutekano A Gukoporora "
 "Kuri , Oya Byemewe Bishunzwe: Utubuto ya:  iyi Ikiranga . "
 
-#: messagecomposer.cpp:932
+#: messagecomposer.cpp:930
 #, fuzzy
 msgid "Send Unencrypted?"
 msgstr "Kohereza ibidasobetse"
 
-#: messagecomposer.cpp:948
+#: messagecomposer.cpp:946
 #, fuzzy
 msgid ""
 "Some parts of this message will not be encrypted.\n"
@@ -11313,7 +12294,7 @@ msgstr ""
 "Bishunzwe: Ubutumwa &Ipaji Itegeko na /Cyangwa Ibisobanuro: . \n"
 "Byose ? "
 
-#: messagecomposer.cpp:952
+#: messagecomposer.cpp:950
 #, fuzzy
 msgid ""
 "This message will not be encrypted.\n"
@@ -11325,17 +12306,17 @@ msgstr ""
 "Ubutumwa &Ipaji Itegeko na /Cyangwa Ibisobanuro: . \n"
 "Ubutumwa ? "
 
-#: messagecomposer.cpp:957
+#: messagecomposer.cpp:955
 #, fuzzy
 msgid "&Encrypt All Parts"
 msgstr "Aligoritime y'ishirwaho ry'umutekano:"
 
-#: messagecomposer.cpp:959
+#: messagecomposer.cpp:957
 #, fuzzy
 msgid "Unencrypted Message Warning"
 msgstr "Ubutumwa butoherejwe"
 
-#: messagecomposer.cpp:2040
+#: messagecomposer.cpp:2038
 #, fuzzy
 msgid ""
 "<qt>"
@@ -11348,7 +12329,7 @@ msgstr ""
 "<p> Icyegeranyo iyi : "
 "<br> %2 </p> </qt> "
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2111
 #, fuzzy
 msgid ""
 "<qt>Not all characters fit into the chosen encoding."
@@ -11356,22 +12337,31 @@ msgid ""
 "<br>Send the message anyway?</qt>"
 msgstr "<qt> Byose Inyuguti i Imisobekere: . <br> <br> i &Ubutumwa ? </qt> "
 
-#: messagecomposer.cpp:2115
+#: messagecomposer.cpp:2113
 #, fuzzy
 msgid "Some Characters Will Be Lost"
 msgstr "Kwimura Inyuguti Ibumoso"
 
-#: messagecomposer.cpp:2116
+#: messagecomposer.cpp:2114
 #, fuzzy
 msgid "Lose Characters"
 msgstr "Kugera ku nyuguti"
 
-#: messagecomposer.cpp:2116
+#: messagecomposer.cpp:2114
 #, fuzzy
 msgid "Change Encoding"
 msgstr "Imisobekere y'Inyuguti"
 
-#: 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 ""
+"&Ubutumwa OYA , guhera i Impera y'inyuma OYA Kuri Gushigikira Ishirwaho umukono "
+"; iyi Nta na rimwe , Icyegeranyo iyi . "
+
+#: messagecomposer.cpp:2168
 #, fuzzy
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
@@ -11380,17 +12370,17 @@ msgstr ""
 "&Ubutumwa OYA , guhera i Impera y'inyuma OYA Kuri Gushigikira Ishirwaho umukono "
 "; iyi Nta na rimwe , Icyegeranyo iyi . "
 
-#: messagecomposer.cpp:2185
+#: messagecomposer.cpp:2195
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2190
+#: messagecomposer.cpp:2200
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
 msgstr ""
 
-#: messagecomposer.cpp:2213
+#: messagecomposer.cpp:2223
 #, fuzzy
 msgid ""
 "This message could not be encrypted, since the chosen backend does not seem to "
@@ -11399,11 +12389,11 @@ msgstr ""
 "&Ubutumwa OYA Bishunzwe: , guhera i Impera y'inyuma OYA Kuri Gushigikira "
 "Bishunzwe: ; iyi Nta na rimwe , Icyegeranyo iyi . "
 
-#: messagecomposer.cpp:2233 messagecomposer.cpp:2278
+#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2255
+#: messagecomposer.cpp:2271
 #, fuzzy
 msgid ""
 "This message could not be signed and encrypted, since the chosen backend does "
@@ -11413,26 +12403,26 @@ msgstr ""
 "&Ubutumwa OYA na Bishunzwe: , guhera i Impera y'inyuma OYA Kuri Gushigikira "
 "Ishirwaho umukono na Bishunzwe: ; iyi Nta na rimwe , Icyegeranyo iyi . "
 
-#: newfolderdialog.cpp:58
+#: newfolderdialog.cpp:59
 msgid "New Folder"
 msgstr "Idosiye nshya"
 
-#: newfolderdialog.cpp:65
+#: newfolderdialog.cpp:69
 #, fuzzy, c-format
 msgid "New Subfolder of %1"
 msgstr "Bya %1 "
 
-#: newfolderdialog.cpp:81
+#: newfolderdialog.cpp:85
 #, fuzzy
 msgid "Enter a name for the new folder."
 msgstr "A Izina: ya:  i Gishya Ububiko... . "
 
-#: newfolderdialog.cpp:92
+#: newfolderdialog.cpp:96
 #, fuzzy
 msgid "Mailbox &format:"
 msgstr "Imiterere : "
 
-#: newfolderdialog.cpp:97
+#: newfolderdialog.cpp:101
 #, fuzzy
 msgid ""
 "Select whether you want to store the messages in this folder as one file per  "
@@ -11444,12 +12434,12 @@ msgstr ""
 "Rimwe Idosiye ( ) . ku Mburabuzi na iyi Kuri Byahinduwe in . , iyi Ihitamo Nka "
 "- ni . "
 
-#: newfolderdialog.cpp:119
+#: newfolderdialog.cpp:124
 #, fuzzy
 msgid "Folder &contains:"
 msgstr "ifite : "
 
-#: newfolderdialog.cpp:124
+#: newfolderdialog.cpp:129
 #, fuzzy
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
@@ -11459,109 +12449,84 @@ msgstr ""
 "i Gishya Ububiko... Kuri Byakoreshejwe ya:  Ibaruwa Bya ya:  Bya Ibigize Nka "
 "Ibikorwa Cyangwa Ibisobanuro . Mburabuzi ni Ibaruwa . , iyi Ihitamo Nka - ni . "
 
-#: newfolderdialog.cpp:160
+#: newfolderdialog.cpp:165
 #, fuzzy
 msgid "Namespace for &folder:"
 msgstr "ya:  Ububiko... : "
 
-#: newfolderdialog.cpp:165
+#: newfolderdialog.cpp:170
 #, fuzzy
 msgid "Select the personal namespace the folder should be created in."
 msgstr "i Bwite i Ububiko... Byaremwe in . "
 
-#: newfolderdialog.cpp:188
+#: newfolderdialog.cpp:193
 #, fuzzy
 msgid "Please specify a name for the new folder."
 msgstr "Kugaragaza A Izina: ya:  i Gishya Ububiko... . "
 
-#: newfolderdialog.cpp:189
+#: newfolderdialog.cpp:194
 #, fuzzy
 msgid "No Name Specified"
 msgstr "Bitaragaragazwa"
 
-#: newfolderdialog.cpp:198
-#, fuzzy
-msgid ""
-"Folder names cannot contain the / (slash) character; please choose another "
-"folder name."
-msgstr ""
-"Amazina i /( AKARONGOKABERAMYE ) Inyuguti: ; Hitamo... Ububiko... Izina: . "
-
-#: newfolderdialog.cpp:204
-#, fuzzy
-msgid ""
-"Folder names cannot start with a . (dot) character; please choose another "
-"folder name."
-msgstr ""
-"Amazina Tangira &vendorShortName; Na: A . ( Akadomo ) Inyuguti: ; Hitamo... "
-"Ububiko... Izina: "
-
-#: newfolderdialog.cpp:223
-#, fuzzy
-msgid ""
-"Your IMAP server does not allow the character '%1'; please choose another "
-"folder name."
-msgstr ""
-"Seriveri: OYA Emera i Inyuguti: ' %1 ' ; Hitamo... Ububiko... Izina: . "
-
-#: newfolderdialog.cpp:240
+#: newfolderdialog.cpp:216
 #, fuzzy
 msgid "<qt>Failed to create folder <b>%1</b>, folder already exists.</qt>"
 msgstr "<qt> Kuri Kurema Ububiko... <b> %1 </b> , Ububiko... . </qt> "
 
-#: newfolderdialog.cpp:246
+#: newfolderdialog.cpp:222
 #, fuzzy
 msgid "<qt>Failed to create folder <b>%1</b>.</qt> "
 msgstr "<qt> Kuri Kurema Ububiko... <b> %1 </b> . </qt> "
 
-#: objecttreeparser.cpp:450
+#: objecttreeparser.cpp:490
 #, fuzzy
 msgid "Wrong Crypto Plug-In."
 msgstr "Icomeka ry'Iyuzuza Ijambo"
 
-#: objecttreeparser.cpp:490 objecttreeparser.cpp:1909
+#: objecttreeparser.cpp:594 objecttreeparser.cpp:2130
 #, fuzzy
 msgid "Different results for signatures"
 msgstr "ibisubizo ya:  "
 
-#: objecttreeparser.cpp:573
+#: objecttreeparser.cpp:667
 #, fuzzy
 msgid "The crypto engine returned no cleartext data."
 msgstr "Oya Ibyatanzwe . "
 
-#: objecttreeparser.cpp:576 objecttreeparser.cpp:2350
-#: objecttreeparser.cpp:2393
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
+#: objecttreeparser.cpp:2637
 #, fuzzy
 msgid "Status: "
 msgstr "Imimerere:"
 
-#: objecttreeparser.cpp:583
+#: objecttreeparser.cpp:677
 msgid "(unknown)"
 msgstr "(bitazwi)"
 
-#: objecttreeparser.cpp:594 objecttreeparser.cpp:748
+#: objecttreeparser.cpp:688 objecttreeparser.cpp:903
 #, fuzzy
 msgid "Crypto plug-in \"%1\" is not initialized."
 msgstr "- in \" %1 \" ni OYA . "
 
-#: objecttreeparser.cpp:598
+#: objecttreeparser.cpp:692
 #, fuzzy
 msgid "Crypto plug-in \"%1\" cannot verify signatures."
 msgstr "- in \" %1 \" Gusuzuma: . "
 
-#: objecttreeparser.cpp:603 objecttreeparser.cpp:756
+#: objecttreeparser.cpp:697 objecttreeparser.cpp:911
 #, fuzzy
 msgid "No appropriate crypto plug-in was found."
 msgstr "- in Byabonetse . "
 
-#: objecttreeparser.cpp:606
+#: objecttreeparser.cpp:700
 #, fuzzy
 msgid ""
 "_: %1 is either 'OpenPGP' or 'S/MIME'\n"
 "No %1 plug-in was found."
 msgstr "%1 - in Byabonetse . "
 
-#: objecttreeparser.cpp:610
+#: objecttreeparser.cpp:704
 #, fuzzy, c-format
 msgid ""
 "The message is signed, but the validity of the signature cannot be verified.<br "
@@ -11569,37 +12534,42 @@ msgid ""
 msgstr ""
 "&Ubutumwa ni , i Ukugira agaciro Bya i Isinya Byagenzuwe . <br /> : %1 "
 
-#: objecttreeparser.cpp:667
+#: objecttreeparser.cpp:737
+#, fuzzy
+msgid "Encrypted data not shown"
+msgstr "Ibyatanzwe OYA . "
+
+#: objecttreeparser.cpp:755
 #, fuzzy
 msgid "This message is encrypted."
 msgstr "Yoherejwe: Ubutumwa Bishunzwe: "
 
-#: objecttreeparser.cpp:672
+#: objecttreeparser.cpp:760
 #, fuzzy
 msgid "Decrypt Message"
 msgstr "Shyiraho umutekano kuri iyi imeli"
 
-#: objecttreeparser.cpp:731 objecttreeparser.cpp:744 objecttreeparser.cpp:773
+#: objecttreeparser.cpp:886 objecttreeparser.cpp:899 objecttreeparser.cpp:928
 #, fuzzy
 msgid "Encrypted data not shown."
 msgstr "Ibyatanzwe OYA . "
 
-#: objecttreeparser.cpp:734
+#: objecttreeparser.cpp:889
 #, fuzzy
 msgid "Crypto plug-in \"%1\" could not decrypt the data."
 msgstr "- in \" %1 \" OYA i Ibyatanzwe . "
 
-#: objecttreeparser.cpp:737
+#: objecttreeparser.cpp:892
 #, c-format
 msgid "Error: %1"
 msgstr "Ikosa:%1"
 
-#: objecttreeparser.cpp:752
+#: objecttreeparser.cpp:907
 #, fuzzy
 msgid "Crypto plug-in \"%1\" cannot decrypt messages."
 msgstr "- in \" %1 \" Ubutumwa . "
 
-#: objecttreeparser.cpp:844
+#: objecttreeparser.cpp:1000
 #, fuzzy
 msgid ""
 "<b>Note:</b> This HTML message may contain external references to images etc. "
@@ -11612,7 +12582,7 @@ msgstr ""
 "Ibirimo i external Indango ya:  iyi &Ubutumwa <a href=\"kmail:loadExternal\"> "
 "ku </a> . "
 
-#: objecttreeparser.cpp:854
+#: objecttreeparser.cpp:1010
 #, fuzzy
 msgid ""
 "<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
@@ -11624,22 +12594,33 @@ msgstr ""
 "Uwohereza Bya iyi &Ubutumwa Hanyuma Kureka bigakora Byahanaguwe Kugaragaza: ya: "
 " iyi &Ubutumwa <a href=\"kmail:showHTML\"> ku </a> . "
 
-#: 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 "Kohereza Ubutumwa"
+
+#: objecttreeparser.cpp:1658
 #, fuzzy, c-format
 msgid "Sorry, certificate could not be imported.<br>Reason: %1"
 msgstr ", Impamyabushobozi: OYA cyavuye ahandi/cyatumijwe . <br> : %1 "
 
-#: objecttreeparser.cpp:1461
+#: objecttreeparser.cpp:1668
 #, fuzzy
 msgid "Sorry, no certificates were found in this message."
 msgstr ", Oya Impamyabushobozi Byabonetse in iyi &Ubutumwa . "
 
-#: objecttreeparser.cpp:1464
+#: objecttreeparser.cpp:1671
 #, fuzzy
 msgid "Certificate import status:"
 msgstr "Kuzana Imimerere : "
 
-#: objecttreeparser.cpp:1467
+#: objecttreeparser.cpp:1674
 #, fuzzy, c-format
 msgid ""
 "_n: 1 new certificate was imported.\n"
@@ -11648,7 +12629,7 @@ msgstr ""
 "1 Gishya Impamyabushobozi: cyavuye ahandi/cyatumijwe . \n"
 "%n Gishya Impamyabushobozi cyavuye ahandi/cyatumijwe . "
 
-#: objecttreeparser.cpp:1470
+#: objecttreeparser.cpp:1677
 #, fuzzy, c-format
 msgid ""
 "_n: 1 certificate was unchanged.\n"
@@ -11657,7 +12638,7 @@ msgstr ""
 "1 Impamyabushobozi: . \n"
 "%n Impamyabushobozi . "
 
-#: objecttreeparser.cpp:1473
+#: objecttreeparser.cpp:1680
 #, fuzzy, c-format
 msgid ""
 "_n: 1 new secret key was imported.\n"
@@ -11666,7 +12647,7 @@ msgstr ""
 "1 Gishya Ibanga Urufunguzo cyavuye ahandi/cyatumijwe . \n"
 "%n Gishya Ibanga Utubuto cyavuye ahandi/cyatumijwe . "
 
-#: objecttreeparser.cpp:1476
+#: objecttreeparser.cpp:1683
 #, fuzzy, c-format
 msgid ""
 "_n: 1 secret key was unchanged.\n"
@@ -11675,211 +12656,226 @@ msgstr ""
 "1 Ibanga Urufunguzo . \n"
 "%n Ibanga Utubuto . "
 
-#: objecttreeparser.cpp:1485
+#: objecttreeparser.cpp:1692
 #, fuzzy
 msgid "Sorry, no details on certificate import available."
 msgstr ", Oya Birambuye ku Impamyabushobozi: Kuzana Bihari . "
 
-#: objecttreeparser.cpp:1488
+#: objecttreeparser.cpp:1695
 #, fuzzy
 msgid "Certificate import details:"
 msgstr "Kuzana Birambuye : "
 
-#: objecttreeparser.cpp:1491
+#: objecttreeparser.cpp:1698
 #, fuzzy
 msgid "Failed: %1 (%2)"
 msgstr "Byanze"
 
-#: objecttreeparser.cpp:1496
+#: objecttreeparser.cpp:1703
 #, fuzzy
 msgid "New or changed: %1 (secret key available)"
 msgstr "Cyangwa Byahinduwe : %1 ( Ibanga Urufunguzo Bihari ) "
 
-#: objecttreeparser.cpp:1498
+#: objecttreeparser.cpp:1706
 #, fuzzy, c-format
 msgid "New or changed: %1"
 msgstr "Cyangwa Byahinduwe : %1 "
 
-#: objecttreeparser.cpp:1891
+#: objecttreeparser.cpp:2112
 #, fuzzy
 msgid "Error: Signature not verified"
 msgstr "Ikosa : OYA Byagenzuwe "
 
-#: objecttreeparser.cpp:1894
+#: objecttreeparser.cpp:2115
 #, fuzzy
 msgid "Good signature"
 msgstr "Isinya "
 
-#: objecttreeparser.cpp:1897
+#: objecttreeparser.cpp:2118
 #, fuzzy
 msgid "<b>Bad</b> signature"
 msgstr "<b> </b> Isinya "
 
-#: objecttreeparser.cpp:1900
+#: objecttreeparser.cpp:2121
 #, fuzzy
 msgid "No public key to verify the signature"
 msgstr "public Urufunguzo Kuri Gusuzuma: i Isinya "
 
-#: objecttreeparser.cpp:1903
+#: objecttreeparser.cpp:2124
 #, fuzzy
 msgid "No signature found"
 msgstr "Isinya Byabonetse "
 
-#: objecttreeparser.cpp:1906
+#: objecttreeparser.cpp:2127
 #, fuzzy
 msgid "Error verifying the signature"
 msgstr "Ikosa i Isinya "
 
-#: objecttreeparser.cpp:1929
+#: objecttreeparser.cpp:2150
 #, fuzzy
 msgid "No status information available."
 msgstr "Imimerere Ibisobanuro: Bihari . "
 
-#: objecttreeparser.cpp:1936 objecttreeparser.cpp:2020
+#: objecttreeparser.cpp:2157 objecttreeparser.cpp:2241
 #, fuzzy
 msgid "Good signature."
 msgstr "Isinya . "
 
-#: objecttreeparser.cpp:1957
+#: objecttreeparser.cpp:2178
 #, fuzzy
 msgid "One key has expired."
 msgstr "Urufunguzo Byarengeje igihe . "
 
-#: objecttreeparser.cpp:1961
+#: objecttreeparser.cpp:2182
 #, fuzzy
 msgid "The signature has expired."
 msgstr "Isinya Byarengeje igihe . "
 
-#: objecttreeparser.cpp:1966
+#: objecttreeparser.cpp:2187
 #, fuzzy
 msgid "Unable to verify: key missing."
 msgstr "Kuri Gusuzuma: : Urufunguzo Ibuze . "
 
-#: objecttreeparser.cpp:1973
+#: objecttreeparser.cpp:2194
 #, fuzzy
 msgid "CRL not available."
 msgstr "OYA Bihari . "
 
-#: objecttreeparser.cpp:1977
+#: objecttreeparser.cpp:2198
 #, fuzzy
 msgid "Available CRL is too old."
 msgstr "ni ki/bishaje . "
 
-#: objecttreeparser.cpp:1981
+#: objecttreeparser.cpp:2202
 #, fuzzy
 msgid "A policy was not met."
 msgstr "A Itegeko OYA . "
 
-#: objecttreeparser.cpp:1985
+#: objecttreeparser.cpp:2206
 #, fuzzy
 msgid "A system error occurred."
 msgstr "A Sisitemu Ikosa . "
 
-#: objecttreeparser.cpp:1996
+#: objecttreeparser.cpp:2217
 #, fuzzy
 msgid "One key has been revoked."
 msgstr "Urufunguzo Byavanywemo . "
 
-#: objecttreeparser.cpp:2022
+#: objecttreeparser.cpp:2243
 #, fuzzy
 msgid "<b>Bad</b> signature."
 msgstr "<b> </b> Isinya . "
 
-#: objecttreeparser.cpp:2049
+#: objecttreeparser.cpp:2270
 #, fuzzy
 msgid "Invalid signature."
 msgstr "Isinya "
 
-#: objecttreeparser.cpp:2051
+#: objecttreeparser.cpp:2272
 #, fuzzy
 msgid "Not enough information to check signature validity."
 msgstr "Ibisobanuro: Kuri Kugenzura Isinya . %1 "
 
-#: objecttreeparser.cpp:2060
+#: objecttreeparser.cpp:2281
 #, fuzzy
 msgid "Signature is valid."
 msgstr "Isinya"
 
-#: objecttreeparser.cpp:2062
+#: objecttreeparser.cpp:2283
 msgid "Signed by <a href=\"mailto:%1\">%2</a>."
 msgstr ""
 
-#: objecttreeparser.cpp:2066
+#: objecttreeparser.cpp:2287
 msgid "Unknown signature state"
 msgstr ""
 
-#: objecttreeparser.cpp:2070
+#: objecttreeparser.cpp:2291
 #, fuzzy
 msgid "Show Details"
 msgstr "Birambuye"
 
-#: objecttreeparser.cpp:2082
+#: objecttreeparser.cpp:2308
 #, fuzzy
 msgid "No Audit Log available"
 msgstr "Ntibonetse"
 
-#: objecttreeparser.cpp:2089
+#: objecttreeparser.cpp:2310
+#, fuzzy, c-format
+msgid "Error Retrieving Audit Log: %1"
+msgstr "Ikosa Igenzura Urutonde ( ) Kuva: %1 "
+
+#: objecttreeparser.cpp:2320
 msgid ""
 "_: The Audit Log is a detailed error log from the gnupg backend\n"
 "Show Audit Log"
 msgstr ""
 
-#: objecttreeparser.cpp:2097
+#: objecttreeparser.cpp:2331
 #, fuzzy
 msgid "Hide Details"
 msgstr "Birambuye"
 
-#: objecttreeparser.cpp:2124 objecttreeparser.cpp:2126
+#: objecttreeparser.cpp:2357 objecttreeparser.cpp:2359
 #, fuzzy
 msgid "Encapsulated message"
 msgstr "&Ubutumwa "
 
-#: objecttreeparser.cpp:2135
+#: objecttreeparser.cpp:2368
+#, fuzzy
+msgid "Please wait while the message is being decrypted..."
+msgstr "Yoherejwe: Ubutumwa Bishunzwe: "
+
+#: objecttreeparser.cpp:2370
 #, fuzzy
 msgid "Encrypted message"
 msgstr "&Ubutumwa "
 
-#: objecttreeparser.cpp:2137
+#: objecttreeparser.cpp:2372
 #, fuzzy
 msgid "Encrypted message (decryption not possible)"
 msgstr "&Ubutumwa ( OYA ) "
 
-#: objecttreeparser.cpp:2139
+#: objecttreeparser.cpp:2374
 #, fuzzy, c-format
 msgid "Reason: %1"
 msgstr "Impamvu"
 
-#: objecttreeparser.cpp:2194
+#: objecttreeparser.cpp:2384
+#, fuzzy
+msgid "Please wait while the signature is being verified..."
+msgstr "Ukugira agaciro Bya i Isinya Byagenzuwe . "
+
+#: objecttreeparser.cpp:2438
 #, fuzzy
 msgid "[Details]"
 msgstr "Birambuye"
 
-#: objecttreeparser.cpp:2233 objecttreeparser.cpp:2235
+#: objecttreeparser.cpp:2477 objecttreeparser.cpp:2479
 #, fuzzy
 msgid "certificate"
 msgstr "Impamyabushobozi"
 
-#: objecttreeparser.cpp:2242 objecttreeparser.cpp:2267
+#: objecttreeparser.cpp:2486 objecttreeparser.cpp:2511
 msgid "Warning:"
 msgstr "Iburira:"
 
-#: objecttreeparser.cpp:2244
+#: objecttreeparser.cpp:2488
 #, fuzzy
 msgid "Sender's mail address is not stored in the %1 used for signing."
 msgstr ""
 "Ibaruwa Aderesi: ni OYA in i %1 Byakoreshejwe ya:  Ishirwaho umukono . "
 
-#: objecttreeparser.cpp:2247
+#: objecttreeparser.cpp:2491
 #, fuzzy
 msgid "sender: "
 msgstr "Uwohereza"
 
-#: objecttreeparser.cpp:2250
+#: objecttreeparser.cpp:2494
 #, fuzzy
 msgid "stored: "
 msgstr "bishunguwe"
 
-#: objecttreeparser.cpp:2269
+#: objecttreeparser.cpp:2513
 #, fuzzy
 msgid ""
 "No mail address is stored in the %1 used for signing, so we cannot compare it "
@@ -11888,114 +12884,114 @@ msgstr ""
 "Ibaruwa Aderesi: ni in i %1 Byakoreshejwe ya:  Ishirwaho umukono , Twebwe "
 "Kugereranya # Kuri i Aderesi: %2 . "
 
-#: objecttreeparser.cpp:2292
+#: objecttreeparser.cpp:2536
 #, fuzzy, c-format
 msgid "Not enough information to check signature. %1"
 msgstr "Ibisobanuro: Kuri Kugenzura Isinya . %1 "
 
-#: objecttreeparser.cpp:2309 objecttreeparser.cpp:2387
+#: objecttreeparser.cpp:2553 objecttreeparser.cpp:2631
 #, fuzzy
 msgid "Message was signed with unknown key."
 msgstr "Na: Kitazwi Urufunguzo . "
 
-#: objecttreeparser.cpp:2311 objecttreeparser.cpp:2425
-#: objecttreeparser.cpp:2469
+#: objecttreeparser.cpp:2555 objecttreeparser.cpp:2669
+#: objecttreeparser.cpp:2713
 #, fuzzy, c-format
 msgid "Message was signed by %1."
 msgstr "ku %1 . "
 
-#: objecttreeparser.cpp:2318 objecttreeparser.cpp:2327
-#: objecttreeparser.cpp:2338
+#: objecttreeparser.cpp:2562 objecttreeparser.cpp:2571
+#: objecttreeparser.cpp:2582
 #, fuzzy, c-format
 msgid "Message was signed with key %1."
 msgstr "Na: Urufunguzo %1 . "
 
-#: objecttreeparser.cpp:2321
+#: objecttreeparser.cpp:2565
 #, fuzzy
 msgid "Message was signed on %1 with key %2."
 msgstr "ku %1 Na: Urufunguzo %2 . "
 
-#: objecttreeparser.cpp:2330
+#: objecttreeparser.cpp:2574
 #, fuzzy
 msgid "Message was signed by %3 on %1 with key %2"
 msgstr "ku %3 ku %1 Na: Urufunguzo %2 "
 
-#: objecttreeparser.cpp:2341
+#: objecttreeparser.cpp:2585
 #, fuzzy
 msgid "Message was signed by %2 with key %1."
 msgstr "ku %2 Na: Urufunguzo %1 . "
 
-#: objecttreeparser.cpp:2379
+#: objecttreeparser.cpp:2623
 #, fuzzy
 msgid "Message was signed on %1 with unknown key %2."
 msgstr "ku %1 Na: Kitazwi Urufunguzo %2 . "
 
-#: objecttreeparser.cpp:2383
+#: objecttreeparser.cpp:2627
 #, fuzzy, c-format
 msgid "Message was signed with unknown key %1."
 msgstr "Na: Kitazwi Urufunguzo %1 . "
 
-#: objecttreeparser.cpp:2389
+#: objecttreeparser.cpp:2633
 #, fuzzy
 msgid "The validity of the signature cannot be verified."
 msgstr "Ukugira agaciro Bya i Isinya Byagenzuwe . "
 
-#: objecttreeparser.cpp:2421 objecttreeparser.cpp:2465
+#: objecttreeparser.cpp:2665 objecttreeparser.cpp:2709
 #, fuzzy
 msgid "Message was signed by %2 (Key ID: %1)."
 msgstr "ku %2 ( : %1 ) . "
 
-#: objecttreeparser.cpp:2431
+#: objecttreeparser.cpp:2675
 #, fuzzy
 msgid "The signature is valid, but the key's validity is unknown."
 msgstr "Isinya ni Byemewe , i Ukugira agaciro ni Kitazwi . "
 
-#: objecttreeparser.cpp:2435
+#: objecttreeparser.cpp:2679
 #, fuzzy
 msgid "The signature is valid and the key is marginally trusted."
 msgstr "Isinya ni Byemewe na i Urufunguzo ni . "
 
-#: objecttreeparser.cpp:2439
+#: objecttreeparser.cpp:2683
 #, fuzzy
 msgid "The signature is valid and the key is fully trusted."
 msgstr "Isinya ni Byemewe na i Urufunguzo ni . "
 
-#: objecttreeparser.cpp:2443
+#: objecttreeparser.cpp:2687
 #, fuzzy
 msgid "The signature is valid and the key is ultimately trusted."
 msgstr "Isinya ni Byemewe na i Urufunguzo ni . "
 
-#: objecttreeparser.cpp:2447
+#: objecttreeparser.cpp:2691
 #, fuzzy
 msgid "The signature is valid, but the key is untrusted."
 msgstr "Isinya ni Byemewe , i Urufunguzo ni Bitizewe . "
 
-#: objecttreeparser.cpp:2471
+#: objecttreeparser.cpp:2715
 #, fuzzy
 msgid "Warning: The signature is bad."
 msgstr ": Isinya ni . "
 
-#: objecttreeparser.cpp:2495
+#: objecttreeparser.cpp:2739
 #, fuzzy
 msgid "End of signed message"
 msgstr "Impera Bya &Ubutumwa "
 
-#: objecttreeparser.cpp:2501
+#: objecttreeparser.cpp:2745
 #, fuzzy
 msgid "End of encrypted message"
 msgstr "Impera Bya Bishunzwe: &Ubutumwa "
 
-#: objecttreeparser.cpp:2508
+#: objecttreeparser.cpp:2752
 #, fuzzy
 msgid "End of encapsulated message"
 msgstr "Impera Bya &Ubutumwa "
 
-#: partNode.cpp:481
+#: partNode.cpp:505
 #, fuzzy
 msgid "internal part"
 msgstr "By'imbere Inzira %s "
 
-#: partNode.cpp:483
+#: partNode.cpp:507
 #, fuzzy
 msgid "body part"
 msgstr "Umubiri Inzira %s "
@@ -12095,19 +13091,19 @@ msgstr "Gyayo"
 msgid "F&older"
 msgstr "Ububiko"
 
-#. 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 "&Ubutumwa"
 
-#. i18n: file kmail_part.rc line 121
+#. i18n: file kmail_part.rc line 122
 #: rc.cpp:24 rc.cpp:90 rc.cpp:123
 #, fuzzy, no-c-format
 msgid "Reply Special"
 msgstr "Bidasanzwe"
 
-#. 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"
@@ -12266,158 +13262,170 @@ msgstr ""
 "Shyiraho Umukono /Shyiraho Umutekano Ryari: Mu kubika Nka Inyandiko "
 "y'agateganyo "
 
-#. 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 ""
+
+#. i18n: file customtemplates_base.ui line 169
+#: rc.cpp:197 templateparser.cpp:417
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "Kuri:"
+
+#. i18n: file customtemplates_base.ui line 177
+#: rc.cpp:200 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "KopiKubandi"
+
+#. i18n: file customtemplates_base.ui line 234
+#: rc.cpp:203
 #, fuzzy, no-c-format
 msgid "Universal"
 msgstr "Rusange"
 
-#. i18n: file customtemplates_base.ui line 185
-#: rc.cpp:197
+#. i18n: file customtemplates_base.ui line 239
+#: rc.cpp:206
 #, fuzzy, no-c-format
 msgid "Reply"
 msgstr "Subiza kanaka"
 
-#. i18n: file customtemplates_base.ui line 190
-#: rc.cpp:200
+#. i18n: file customtemplates_base.ui line 244
+#: rc.cpp:209
 #, fuzzy, no-c-format
 msgid "Reply to All"
 msgstr "Gusubiza Bose"
 
-#. i18n: file customtemplates_base.ui line 195
-#: rc.cpp:203
+#. i18n: file customtemplates_base.ui line 249
+#: rc.cpp:212
 #, fuzzy, no-c-format
 msgid "Forward"
 msgstr "Gya Imbere"
 
-#. i18n: file customtemplates_base.ui line 207
-#: rc.cpp:206
+#. i18n: file customtemplates_base.ui line 261
+#: rc.cpp:215
 #, fuzzy, no-c-format
 msgid "Shortc&ut:"
 msgstr "Ihinanzira:"
 
-#. i18n: file customtemplates_base.ui line 229
-#: rc.cpp:209
+#. i18n: file customtemplates_base.ui line 283
+#: rc.cpp:218
 #, fuzzy, no-c-format
 msgid "&Template type:"
 msgstr "Gusimbuza"
 
-#. i18n: file customtemplates_base.ui line 256
-#: rc.cpp:215 rc.cpp:456
-#, no-c-format
-msgid "How does this work?"
-msgstr ""
-
 #. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:218
+#: rc.cpp:224
 #, no-c-format
 msgid "Folder Properties"
 msgstr "Ibiranga ububiko"
 
 #. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:227
+#: rc.cpp:233
 #, fuzzy, no-c-format
 msgid "Folder holds a &mailing list"
 msgstr "A Urutonde "
 
 #. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:230
+#: rc.cpp:236
 #, fuzzy, no-c-format
 msgid "List &address:"
 msgstr "Aderesi: : "
 
 #. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:233
+#: rc.cpp:239
 #, fuzzy, no-c-format
 msgid "N&ormal:"
 msgstr "Bisanzwe"
 
 #. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:236
+#: rc.cpp:242
 #, fuzzy, no-c-format
 msgid "Unr&ead:"
 msgstr "Bidasomye:"
 
 #. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:242
+#: rc.cpp:248
 #, fuzzy, no-c-format
 msgid "Message Expiring"
 msgstr "Ubutumwa bufunitse"
 
 #. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:245
+#: rc.cpp:251
 #, fuzzy, no-c-format
 msgid "E&xpire after:"
 msgstr "Nyuma : "
 
 #. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:248
+#: rc.cpp:254
 #, fuzzy, no-c-format
 msgid "Expire &read messages"
 msgstr "Soma Ubutumwa "
 
 #. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:251
+#: rc.cpp:257
 #, fuzzy, no-c-format
 msgid "Expire a&fter:"
 msgstr "Nyuma : "
 
 #. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:254
+#: rc.cpp:260
 #, fuzzy, no-c-format
 msgid "Expire &unread messages"
 msgstr "Bidasomye: %S Ubutumwa "
 
 #. 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 "U(I)munsi"
 
 #. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:260 rc.cpp:269
+#: rc.cpp:266 rc.cpp:275
 #, fuzzy, no-c-format
 msgid "Week(s)"
 msgstr "ibyumweru"
 
 #. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:263 rc.cpp:272
+#: rc.cpp:269 rc.cpp:278
 #, fuzzy, no-c-format
 msgid "Month(s)"
 msgstr "amezi"
 
 #. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:275
+#: rc.cpp:281
 #, no-c-format
 msgid "Advanced"
 msgstr "Urwego rwo hejuru"
 
 #. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:278
+#: rc.cpp:284
 #, fuzzy, no-c-format
 msgid "Sender identit&y:"
 msgstr "Ikiranga : "
 
 #. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:281
+#: rc.cpp:287
 #, fuzzy, no-c-format
 msgid "&Storage format:"
 msgstr "Imiterere : "
 
 #. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:284
+#: rc.cpp:290
 #, fuzzy, no-c-format
 msgid "&List displays:"
 msgstr "URL yo kugaragaza"
 
 #. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:293
+#: rc.cpp:299
 #, fuzzy, no-c-format
 msgid "Validate certificates using CRLs"
 msgstr "Impamyabushobozi ikoresha "
 
 #. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:296
+#: rc.cpp:302
 #, fuzzy, no-c-format
 msgid ""
 "If this option is selected, S/MIME certificates are validated using Certificate "
@@ -12425,13 +13433,13 @@ msgid ""
 msgstr "iyi Ihitamo ni Byahiswemo , S /Impamyabushobozi ikoresha ( ) . "
 
 #. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:299
+#: rc.cpp:305
 #, fuzzy, no-c-format
 msgid "Validate certificates online (OCSP)"
 msgstr "Impamyabushobozi kiri kuri interineti ( ) "
 
 #. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:302
+#: rc.cpp:308
 #, fuzzy, no-c-format
 msgid ""
 "If this option is selected, S/MIME certificates are validated online using the "
@@ -12442,19 +13450,19 @@ msgstr ""
 "( ) . in i Bya i munsi . "
 
 #. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:305
+#: rc.cpp:311
 #, fuzzy, no-c-format
 msgid "Online Certificate Validation"
 msgstr "Inyemeza (iyemeza: "
 
 #. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:308
+#: rc.cpp:314
 #, no-c-format
 msgid "OCSP responder URL:"
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:311
+#: rc.cpp:317
 #, fuzzy, no-c-format
 msgid ""
 "Enter here the address of the server for online validation of certificates "
@@ -12464,25 +13472,25 @@ msgstr ""
 "Impamyabushobozi ( ) . ni Itangira... Na: HTTP : //. "
 
 #. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:314
+#: rc.cpp:320
 #, fuzzy, no-c-format
 msgid "OCSP responder signature:"
 msgstr "Isinya : "
 
 #. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:317
+#: rc.cpp:323
 #, fuzzy, no-c-format
 msgid "Ignore service URL of certificates"
 msgstr "Serivisi Bya Impamyabushobozi "
 
 #. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:320
+#: rc.cpp:326
 #, fuzzy, no-c-format
 msgid "Do not check certificate policies"
 msgstr "OYA Kugenzura Impamyabushobozi: Amategeko: "
 
 #. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:323
+#: rc.cpp:329
 #, fuzzy, no-c-format
 msgid ""
 "By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
@@ -12493,13 +13501,13 @@ msgstr ""
 "Ivivuwe . "
 
 #. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:326
+#: rc.cpp:332
 #, fuzzy, no-c-format
 msgid "Never consult a CRL"
 msgstr "A "
 
 #. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:329
+#: rc.cpp:335
 #, fuzzy, no-c-format
 msgid ""
 "If this option is checked, Certificate Revocation Lists are never used to "
@@ -12509,13 +13517,13 @@ msgstr ""
 "/Impamyabushobozi . "
 
 #. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:332
+#: rc.cpp:338
 #, fuzzy, no-c-format
 msgid "Fetch missing issuer certificates"
 msgstr "Ibuze Wasohoye Impamyabushobozi "
 
 #. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:335
+#: rc.cpp:341
 #, fuzzy, no-c-format
 msgid ""
 "If this option is checked, missing issuer certificates are fetched when "
@@ -12525,37 +13533,37 @@ msgstr ""
 "Byombi Kwemeza , na ) "
 
 #. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:338
+#: rc.cpp:344
 #, fuzzy, no-c-format
 msgid "HTTP Requests"
 msgstr "Ibisabwa"
 
 #. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:341
+#: rc.cpp:347
 #, fuzzy, no-c-format
 msgid "Do not perform any HTTP requests"
 msgstr "OYA Icyo ari cyo cyose "
 
 #. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:344
+#: rc.cpp:350
 #, fuzzy, no-c-format
 msgid "Entirely disables the use of HTTP for S/MIME."
 msgstr "i Koresha Bya ya:  S /. "
 
 #. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:350
+#: rc.cpp:356
 #, fuzzy, no-c-format
 msgid "Use this proxy for HTTP requests: "
 msgstr "iyi Porogisi ya:  : "
 
 #. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:353
+#: rc.cpp:359
 #, fuzzy, no-c-format
 msgid "Use system HTTP proxy:"
 msgstr "Sisitemu Porogisi : "
 
 #. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:356
+#: rc.cpp:362
 #, fuzzy, no-c-format
 msgid ""
 "If this option is selected, the value of the HTTP proxy shown on the right "
@@ -12566,7 +13574,7 @@ msgstr ""
 "Impinduragaciro ) Byakoreshejwe ya:  Icyo ari cyo cyose Kubaza... . "
 
 #. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:359
+#: rc.cpp:365
 #, fuzzy, no-c-format
 msgid ""
 "Enter here the location of your HTTP Proxy, which will be used for all HTTP "
@@ -12575,13 +13583,13 @@ msgid ""
 msgstr "Ubuhano."
 
 #. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:362
+#: rc.cpp:368
 #, fuzzy, no-c-format
 msgid "Ignore HTTP CRL distribution point of certificates"
 msgstr "Ikwirakwiza Akadomo Bya Impamyabushobozi "
 
 #. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:365
+#: rc.cpp:371
 #, fuzzy, no-c-format
 msgid ""
 "When looking for the location of a CRL, the to-be-tested certificate usually "
@@ -12595,31 +13603,31 @@ msgstr ""
 "Ihitamo Byose Ibyinjijwe ikoresha i Igishusho Ryari: ya:  A . "
 
 #. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:368
+#: rc.cpp:374
 #, fuzzy, no-c-format
 msgid "LDAP Requests"
 msgstr "Ibisabwa"
 
 #. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:371
+#: rc.cpp:377
 #, fuzzy, no-c-format
 msgid "Do not perform any LDAP requests"
 msgstr "OYA Icyo ari cyo cyose "
 
 #. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:374
+#: rc.cpp:380
 #, fuzzy, no-c-format
 msgid "Entirely disables the use of LDAP for S/MIME."
 msgstr "i Koresha Bya ya:  S /. "
 
 #. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:377
+#: rc.cpp:383
 #, fuzzy, no-c-format
 msgid "Ignore LDAP CRL distribution point of certificates"
 msgstr "Ikwirakwiza Akadomo Bya Impamyabushobozi "
 
 #. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:380
+#: rc.cpp:386
 #, fuzzy, no-c-format
 msgid ""
 "When looking for the location of a CRL, the to-be-tested certificate usually "
@@ -12633,13 +13641,13 @@ msgstr ""
 "Ihitamo Byose Ibyinjijwe ikoresha i Igishusho Ryari: ya:  A . "
 
 #. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:383
+#: rc.cpp:389
 #, fuzzy, no-c-format
 msgid "Primary host for LDAP requests:"
 msgstr "Inturo: ya:  : "
 
 #. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:386
+#: rc.cpp:392
 #, fuzzy, no-c-format
 msgid ""
 "Entering a LDAP server here will make all LDAP requests go to that server "
@@ -12658,86 +13666,86 @@ msgstr ""
 "Byakoreshejwe . "
 
 #. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:390
+#: rc.cpp:396
 #, no-c-format
 msgid "Add Snippet"
 msgstr ""
 
 #. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:393
+#: rc.cpp:399
 #, fuzzy, no-c-format
 msgid "&Add"
 msgstr "Ongeraho"
 
 #. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:402
+#: rc.cpp:408
 #, no-c-format
 msgid "&Snippet:"
 msgstr ""
 
 #. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:405
+#: rc.cpp:411
 #, fuzzy, no-c-format
 msgid "Group:"
 msgstr "Izina ry'Itsinda :"
 
 #. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:408
+#: rc.cpp:414
 #, fuzzy, no-c-format
 msgid "Snippet Settings"
 msgstr "Ongera utangire bushya Ibyashizweho"
 
 #. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:411
+#: rc.cpp:417
 #, no-c-format
 msgid "Tooltips"
 msgstr ""
 
 #. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:414
+#: rc.cpp:420
 #, no-c-format
 msgid "Show snippet's text in &tooltip"
 msgstr ""
 
 #. 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"
 msgstr ""
 
 #. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:420
+#: rc.cpp:426
 #, no-c-format
 msgid "Variables"
 msgstr ""
 
 #. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:423
+#: rc.cpp:429
 #, no-c-format
 msgid "Input Method for Variables"
 msgstr ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 "
@@ -12745,49 +13753,49 @@ msgid ""
 msgstr ""
 
 #. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:438
+#: rc.cpp:444
 #, fuzzy, no-c-format
 msgid "Delimiter:"
 msgstr "bitagira imbibi"
 
 #. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:441
+#: rc.cpp:447
 #, fuzzy, no-c-format
 msgid "TemplatesConfiguration"
 msgstr "Iboneza ry'Ingano"
 
 #. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:447
+#: rc.cpp:453
 #, fuzzy, no-c-format
 msgid "Reply to Sender"
 msgstr "Subiza Uwohereje"
 
 #. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:450
+#: rc.cpp:456
 #, fuzzy, no-c-format
 msgid "Reply to All / Reply to List"
 msgstr "Gusubiza Bose"
 
 #. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:453
+#: rc.cpp:459
 #, fuzzy, no-c-format
 msgid "Forward Message"
 msgstr "Kohereza Ubutumwa"
 
 #. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:462
+#: rc.cpp:468
 #, fuzzy, no-c-format
 msgid "Warn when trying to send &unsigned messages"
 msgstr "Ryari: Kuri Kohereza Bitashizweho umukono Ubutumwa "
 
 #. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:465
+#: rc.cpp:471
 #, fuzzy, no-c-format
 msgid "Check to be warned when sending unsigned messages."
 msgstr "Kuri Ryari: Bitashizweho umukono Ubutumwa . "
 
 #. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:468
+#: rc.cpp:474
 #, fuzzy, no-c-format
 msgid ""
 "<qt>\n"
@@ -12807,19 +13815,19 @@ msgstr ""
 "</qt> "
 
 #. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:476
+#: rc.cpp:482
 #, fuzzy, no-c-format
 msgid "&Warn when trying to send unencrypted messages"
 msgstr "Ryari: Kuri Kohereza Ubutumwa "
 
 #. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:479
+#: rc.cpp:485
 #, fuzzy, no-c-format
 msgid "Check to be warned when sending unencrypted messages."
 msgstr "Kuri Ryari: Ubutumwa . "
 
 #. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:482
+#: rc.cpp:488
 #, fuzzy, no-c-format
 msgid ""
 "<qt>\n"
@@ -12839,19 +13847,19 @@ msgstr ""
 "</qt> "
 
 #. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:490
+#: rc.cpp:496
 #, fuzzy, no-c-format
 msgid "Warn if &Receiver's Email Address is Not in Certificate"
 msgstr "NIBA ni in "
 
 #. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:493
+#: rc.cpp:499
 #, fuzzy, no-c-format
 msgid "Check to be warned if the address is not in the certificate"
 msgstr "Kuri NIBA i Aderesi: ni OYA in i Impamyabushobozi: "
 
 #. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:496
+#: rc.cpp:502
 #, fuzzy, no-c-format
 msgid ""
 "<qt>\n"
@@ -12871,38 +13879,38 @@ msgstr ""
 "</qt> "
 
 #. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:504
+#: rc.cpp:510
 #, fuzzy, no-c-format
 msgid "Warn if certificates/keys expire soon (configure thresholds below)"
 msgstr "NIBA Impamyabushobozi /Utubuto ( Kugena Imiterere munsi ) "
 
 #. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:507
+#: rc.cpp:513
 #, fuzzy, no-c-format
 msgid "For signing"
 msgstr "Ishirwaho umukono "
 
 #. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:510
+#: rc.cpp:516
 #, fuzzy, no-c-format
 msgid "For encryption"
 msgstr "Bishunzwe: "
 
 #. 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
 #, fuzzy, no-c-format
 msgid " days"
 msgstr "iminsi"
 
 #. 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
 #, fuzzy, no-c-format
 msgid "Select the number of days here"
 msgstr "i Umubare Bya iminsi "
 
 #. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:519
+#: rc.cpp:525
 #, fuzzy, no-c-format
 msgid ""
 "<qt>\n"
@@ -12921,7 +13929,7 @@ msgstr ""
 "</qt> "
 
 #. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:533
+#: rc.cpp:539
 #, fuzzy, no-c-format
 msgid ""
 "<qt>\n"
@@ -12940,7 +13948,7 @@ msgstr ""
 "</qt> "
 
 #. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:547
+#: rc.cpp:553
 #, fuzzy, no-c-format
 msgid ""
 "<qt>\n"
@@ -12960,7 +13968,7 @@ msgstr ""
 "</qt> "
 
 #. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:561
+#: rc.cpp:567
 #, fuzzy, no-c-format
 msgid ""
 "<qt>\n"
@@ -12979,7 +13987,7 @@ msgstr ""
 "</qt> "
 
 #. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:575 rc.cpp:589
+#: rc.cpp:581 rc.cpp:595
 #, fuzzy, no-c-format
 msgid ""
 "<qt>\n"
@@ -12998,55 +14006,55 @@ msgstr ""
 "</qt> "
 
 #. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:597
+#: rc.cpp:603
 #, fuzzy, no-c-format
 msgid "For root certificates:"
 msgstr "Imizi Impamyabushobozi : "
 
 #. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:600
+#: rc.cpp:606
 #, fuzzy, no-c-format
 msgid "For intermediate CA certificates:"
 msgstr "Impamyabushobozi : "
 
 #. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:603
+#: rc.cpp:609
 #, fuzzy, no-c-format
 msgid "For end-user certificates/keys:"
 msgstr "Impera - Umukoresha Impamyabushobozi /Utubuto : "
 
 #. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:606
+#: rc.cpp:612
 #, fuzzy, no-c-format
 msgid "Re-enable All \"Don't Ask Again\" Warnings"
 msgstr "- Gushoboza \" \" "
 
 #. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:609
+#: rc.cpp:615
 #, fuzzy, no-c-format
 msgid "Template content"
 msgstr "Ibigize : "
 
 #. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:612
+#: rc.cpp:618
 #, fuzzy, no-c-format
 msgid "Template shortcut"
 msgstr "Gusimbuza"
 
 #. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:615
+#: rc.cpp:621
 #, fuzzy, no-c-format
 msgid "Template type"
 msgstr "Gusimbuza"
 
-#. i18n: file kmail.kcfg line 59
-#: rc.cpp:618
+#. i18n: file kmail.kcfg line 61
+#: rc.cpp:624
 #, fuzzy, no-c-format
 msgid "Send queued mail on mail check"
 msgstr "Yashizwe ku murongo Ibaruwa ku Ibaruwa Kugenzura "
 
-#. i18n: file kmail.kcfg line 60
-#: rc.cpp:621
+#. i18n: file kmail.kcfg line 62
+#: rc.cpp:627
 #, fuzzy, no-c-format
 msgid ""
 "<qt>"
@@ -13059,16 +14067,16 @@ msgstr ""
 "Ibaruwa , Cyangwa OYA Ubutumwa Kuri Yoherejwe: mu buryo bwikora: Ku Byose . </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 "
 "rights"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 71
-#: rc.cpp:627
+#. i18n: file kmail.kcfg line 73
+#: rc.cpp:633
 #, fuzzy, no-c-format
 msgid ""
 "If there are new messages in a folder, which have not been uploaded to the "
@@ -13082,14 +14090,14 @@ msgstr ""
 ". </p> "
 "<p> Kuri Himura Ubutumwa Kuri Ububiko... NONEAHA ? </p> "
 
-#. 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 ""
 
-#. 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 "
@@ -13098,42 +14106,42 @@ msgid ""
 "set here."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 91
-#: rc.cpp:637
+#. i18n: file kmail.kcfg line 93
+#: rc.cpp:643
 #, fuzzy, no-c-format
 msgid "The most recently selected folder in the folder selection dialog."
 msgstr "Byahiswemo Ububiko... in i Ububiko... Ihitamo Ikiganiro . "
 
-#. 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\" "
 "instead"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 107
-#: rc.cpp:646
+#. i18n: file kmail.kcfg line 109
+#: rc.cpp:652
 #, fuzzy, no-c-format
 msgid "Policy for showing the system tray icon"
 msgstr "ya:  i Sisitemu Agasanduku Agashushondanga "
 
-#. 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 "
 "tray icon active."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 119
-#: rc.cpp:652
+#. i18n: file kmail.kcfg line 121
+#: rc.cpp:658
 #, fuzzy, no-c-format
 msgid "Verbose new mail notification"
 msgstr "Gishya Ibaruwa Ikimenyetso "
 
-#. i18n: file kmail.kcfg line 120
-#: rc.cpp:655
+#. i18n: file kmail.kcfg line 122
+#: rc.cpp:661
 #, fuzzy, no-c-format
 msgid ""
 "If this option is enabled then for each folder the number of newly arrived "
@@ -13143,40 +14151,40 @@ msgstr ""
 "iyi Ihitamo ni Bikora Hanyuma ya:  Ububiko... i Umubare Bya Ubutumwa ni in i "
 "Gishya Ibaruwa Ikimenyetso ; , Kubona A Byoroheje ' Ibaruwa &Ubutumwa . "
 
-#. i18n: file kmail.kcfg line 124
-#: rc.cpp:658
+#. i18n: file kmail.kcfg line 126
+#: rc.cpp:664
 #, fuzzy, no-c-format
 msgid "Specify e&ditor:"
 msgstr "Muhinduzi : "
 
-#. i18n: file kmail.kcfg line 128
-#: rc.cpp:661
+#. i18n: file kmail.kcfg line 130
+#: rc.cpp:667
 #, fuzzy, no-c-format
 msgid "Use e&xternal editor instead of composer"
 msgstr "external Muhinduzi Bya &Uhimba "
 
-#. 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 "
 "limit."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 164
-#: rc.cpp:667
+#. i18n: file kmail.kcfg line 166
+#: rc.cpp:673
 #, fuzzy, no-c-format
 msgid "Enable groupware functionality"
 msgstr "Kubashisha ibonerana"
 
-#. i18n: file kmail.kcfg line 170
-#: rc.cpp:670
+#. i18n: file kmail.kcfg line 172
+#: rc.cpp:676
 #, fuzzy, no-c-format
 msgid "Mangle From:/To: headers in replies to replies"
 msgstr ": /: Imitwe in Kuri "
 
-#. i18n: file kmail.kcfg line 171
-#: rc.cpp:673
+#. i18n: file kmail.kcfg line 173
+#: rc.cpp:679
 #, fuzzy, no-c-format
 msgid ""
 "Microsoft Outlook has a number of shortcomings in its implementation of the "
@@ -13186,14 +14194,14 @@ msgstr ""
 "A Umubare Bya in Bya i Bisanzwe ; iyi Ihitamo Rimwe Bya . Na: Abakoresha OYA "
 "Kuri Kubona , Kugerageza Igenamiterere iyi Ihitamo . "
 
-#. i18n: file kmail.kcfg line 176
-#: rc.cpp:676
+#. i18n: file kmail.kcfg line 178
+#: rc.cpp:682
 #, fuzzy, no-c-format
 msgid "Send groupware invitations in the mail body"
 msgstr "in i Ibaruwa Umubiri "
 
-#. i18n: file kmail.kcfg line 177
-#: rc.cpp:679
+#. i18n: file kmail.kcfg line 179
+#: rc.cpp:685
 #, fuzzy, no-c-format
 msgid ""
 "Microsoft Outlook has a number of shortcomings  in its implementation of the "
@@ -13204,14 +14212,32 @@ msgstr ""
 "A Umubare Bya in Bya i Bisanzwe ; iyi Ihitamo Rimwe Bya . Na: Abakoresha OYA "
 "Kuri Kubona , Kugerageza Igenamiterere iyi Ihitamo . "
 
-#. i18n: file kmail.kcfg line 182
-#: rc.cpp:682
+#. i18n: file kmail.kcfg line 184
+#: rc.cpp:688
 #, fuzzy, no-c-format
 msgid "Exchange compatible invitations naming"
 msgstr "Isunika Ryikoresha"
 
-#. 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 ""
+
+#. 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
 #, fuzzy, no-c-format
 msgid ""
 "When this is checked, you will not see the mail composer window. Instead, all "
@@ -13224,22 +14250,38 @@ msgstr ""
 "bwikora: . Kuri i Ibaruwa Mbere , Kuramo ivivura iyi Ihitamo . , i Umwandiko in "
 "i &Uhimba Idirishya ni in , na OYA Kugerageza ku . "
 
-#. 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 ""
 
-#. 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 "
 "be moved to the Trash folder, once the reply has been successfully sent."
 msgstr ""
 
-#. 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
 #, fuzzy, no-c-format
 msgid ""
 "<p>Enabling this makes it possible to store the entries from the Kontact "
@@ -13251,8 +14293,8 @@ msgstr ""
 "<p> Kuri Gushyiraho iyi Ihitamo Gushyiraho i Porogaramu Kuri Koresha i "
 "Ibikorana: ; iyi ni Byakozwe in i MukusanyaTDE . </p> "
 
-#. i18n: file kmail.kcfg line 220
-#: rc.cpp:703
+#. i18n: file kmail.kcfg line 238
+#: rc.cpp:721
 #, fuzzy, no-c-format
 msgid ""
 "<p>Usually you will not have any reason to see the folders that hold the IMAP "
@@ -13261,8 +14303,8 @@ msgstr ""
 "<p> OYA Icyo ari cyo cyose Impamvu Kuri i Ububiko Gufata i Ibikorana . NIBA "
 "Kuri , Gushyiraho "
 
-#. 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"
@@ -13273,8 +14315,8 @@ msgid ""
 "          \"mail via an additional online IMAP account.</p>"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:712
+#. i18n: file kmail.kcfg line 251
+#: rc.cpp:730
 #, fuzzy, no-c-format
 msgid ""
 "<p>Choose the storage format of the groupware folders. "
@@ -13293,8 +14335,8 @@ msgstr ""
 "<li> Imiterere A Guhanga Urugero Birenzeho i Rimwe Byakoreshejwe in . Imiterere "
 "Bihuye neza , Ryari: ikoresha A Seriveri: Cyangwa A . </li> </ul> </p> "
 
-#. i18n: file kmail.kcfg line 242
-#: rc.cpp:715
+#. i18n: file kmail.kcfg line 260
+#: rc.cpp:733
 #, fuzzy, no-c-format
 msgid ""
 "<p>This chooses the parent of the IMAP resource folders.</p>"
@@ -13303,14 +14345,14 @@ msgstr ""
 "<p> i Bya i Ibikorana: Ububiko . </p> "
 "<p> Mburabuzi , i Seriveri: i Agasanduku k'Ibyinjiye Kuri i . </p> "
 
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:718
+#. i18n: file kmail.kcfg line 265
+#: rc.cpp:736
 #, fuzzy, no-c-format
 msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
 msgstr "<p> ni i Bya i Konti: i Ibikorana: Ububiko . </p> "
 
-#. i18n: file kmail.kcfg line 252
-#: rc.cpp:721
+#. i18n: file kmail.kcfg line 270
+#: rc.cpp:739
 #, fuzzy, no-c-format
 msgid ""
 "<p>If you want to set the folder names of the IMAP storage to your local "
@@ -13326,41 +14368,35 @@ msgstr ""
 "iyi , guhera Indimi . </p> "
 "<p> OYA Gushyiraho iyi Kuri . </p> "
 
-#. i18n: file kmail.kcfg line 258
-#: rc.cpp:724
-#, no-c-format
-msgid "Only filter mails received in disconnected IMAP inbox."
-msgstr ""
-
-#. 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 ""
 
-#. 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."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:733
+#. i18n: file kmail.kcfg line 292
+#: rc.cpp:748
 #, fuzzy, no-c-format
 msgid ""
 "This value is used to decide whether the KMail Introduction should be "
 "displayed."
 msgstr "Agaciro: ni Byakoreshejwe Kuri i . "
 
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:736
+#. i18n: file kmail.kcfg line 299
+#: rc.cpp:751
 #, fuzzy, no-c-format
 msgid "Maximal number of connections per host"
 msgstr "Umubare Bya Ukwihuza Inturo: "
 
-#. i18n: file kmail.kcfg line 284
-#: rc.cpp:739
+#. i18n: file kmail.kcfg line 300
+#: rc.cpp:754
 #, fuzzy, no-c-format
 msgid ""
 "This can be used to restrict the number of connections per host while checking "
@@ -13369,14 +14405,14 @@ msgstr ""
 "Byakoreshejwe Kuri i Umubare Bya Ukwihuza Inturo: Kugenzura... ya:  Gishya "
 "Ibaruwa . Mburabuzi i Umubare Bya Ukwihuza ni Bitarangira ( 0 %S ) . "
 
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:742
+#. i18n: file kmail.kcfg line 308
+#: rc.cpp:757
 #, fuzzy, no-c-format
 msgid "Show quick search line edit"
 msgstr "Shakisha Umurongo: Kwandika "
 
-#. i18n: file kmail.kcfg line 293
-#: rc.cpp:745
+#. i18n: file kmail.kcfg line 309
+#: rc.cpp:760
 #, fuzzy, no-c-format
 msgid ""
 "This option enables or disables the search line edit above the message list "
@@ -13385,46 +14421,40 @@ msgstr ""
 "Ihitamo Cyangwa i Shakisha Umurongo: Kwandika hejuru i &Ubutumwa Urutonde "
 "Byakoreshejwe Kuri Shakisha i Ibisobanuro: in i &Ubutumwa Urutonde . "
 
-#. i18n: file kmail.kcfg line 297
-#: rc.cpp:748
-#, fuzzy, no-c-format
-msgid "Show folder quick search line edit"
-msgstr "Shakisha Umurongo: Kwandika "
-
-#. 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 ""
 
-#. 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 ""
 
-#. 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 "
 "composer."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 316
-#: rc.cpp:760
+#. i18n: file kmail.kcfg line 328
+#: rc.cpp:772
 #, fuzzy, no-c-format
 msgid "Keep original charset when replying or forwarding if possible"
 msgstr "~Umwimerere KubonezaInyuguti: Ryari: Cyangwa NIBA "
 
-#. i18n: file kmail.kcfg line 320
-#: rc.cpp:763
+#. i18n: file kmail.kcfg line 332
+#: rc.cpp:775
 #, fuzzy, no-c-format
 msgid "A&utomatically insert signature"
 msgstr "Kongeraho... Isinya "
 
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:766
+#. i18n: file kmail.kcfg line 337
+#: rc.cpp:778
 #, fuzzy, no-c-format
 msgid ""
 "Remember this identity, so that it will be used in future composer windows as "
@@ -13433,8 +14463,8 @@ msgid ""
 msgstr ""
 "iyi Ikiranga , Byakoreshejwe in &Uhimba Windows Nka . \n"
 
-#. i18n: file kmail.kcfg line 329
-#: rc.cpp:770
+#. i18n: file kmail.kcfg line 341
+#: rc.cpp:782
 #, fuzzy, no-c-format
 msgid ""
 "Remember this folder for sent items, so that it will be used in future composer "
@@ -13442,36 +14472,60 @@ msgid ""
 msgstr ""
 "iyi Ububiko... ya:  Yoherejwe: Ibigize , Byakoreshejwe in &Uhimba Windows Nka . "
 
-#. i18n: file kmail.kcfg line 333
-#: rc.cpp:773
+#. i18n: file kmail.kcfg line 345
+#: rc.cpp:785
 #, fuzzy, no-c-format
 msgid ""
 "Remember this mail transport, so that it will be used in future composer "
 "windows as well."
 msgstr "iyi Ibaruwa , Byakoreshejwe in &Uhimba Windows Nka . "
 
-#. 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 ""
+"iyi Ikiranga , Byakoreshejwe in &Uhimba Windows Nka . \n"
+
+#. i18n: file kmail.kcfg line 354
+#: rc.cpp:792
 #, fuzzy, no-c-format
 msgid "Word &wrap at column:"
 msgstr "Gufunika Ku Inkingi : "
 
-#. 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 "NIBA Imizi Impamyabushobozi: Yarenze igihe: in Birutwa : "
+
+#. 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
 #, fuzzy, no-c-format
 msgid ""
 "Turn this option on to make Outlook &#8482; understand attachment names "
 "containing non-English characters"
 msgstr "iyi Ihitamo ku Kuri Ubwoko & # ; Umugereka Amazina - Inyuguti "
 
-#. i18n: file kmail.kcfg line 386
-#: rc.cpp:791
+#. i18n: file kmail.kcfg line 416
+#: rc.cpp:816
 #, fuzzy, no-c-format
 msgid "Automatically request &message disposition notifications"
 msgstr "Kubaza... &Ubutumwa Ibimenyetso "
 
-#. i18n: file kmail.kcfg line 387
-#: rc.cpp:794
+#. i18n: file kmail.kcfg line 417
+#: rc.cpp:819
 #, fuzzy, no-c-format
 msgid ""
 "<qt>"
@@ -13486,14 +14540,14 @@ msgstr ""
 "<p> Ihitamo i Mburabuzi ; Gushoboza Cyangwa Kwangira ku A - &Ubutumwa Ishingiro "
 "in i &Uhimba , Ibikubiyemo Ikintu <em> </em> - > <em> </em> . </p> </qt> "
 
-#. i18n: file kmail.kcfg line 391
-#: rc.cpp:797
+#. i18n: file kmail.kcfg line 421
+#: rc.cpp:822
 #, fuzzy, no-c-format
 msgid "Use recent addresses for autocompletion"
 msgstr "Amaderesi ya:  Nyamwirangiza "
 
-#. i18n: file kmail.kcfg line 392
-#: rc.cpp:800
+#. i18n: file kmail.kcfg line 422
+#: rc.cpp:825
 #, fuzzy, no-c-format
 msgid ""
 "Disable this option if you do not want recently used addresses to appear in the "
@@ -13502,14 +14556,14 @@ msgstr ""
 "iyi Ihitamo NIBA OYA Byakoreshejwe Amaderesi Kuri Kugaragara in i Nyamwirangiza "
 "Urutonde in i Aderesi: Amashami: . "
 
-#. i18n: file kmail.kcfg line 413
-#: rc.cpp:803
+#. i18n: file kmail.kcfg line 443
+#: rc.cpp:828
 #, fuzzy, no-c-format
 msgid "Autosave interval:"
 msgstr "Intera : "
 
-#. i18n: file kmail.kcfg line 414
-#: rc.cpp:806
+#. i18n: file kmail.kcfg line 444
+#: rc.cpp:831
 #, fuzzy, no-c-format
 msgid ""
 "A backup copy of the text in the composer window can be created regularly. The "
@@ -13520,38 +14574,50 @@ msgstr ""
 "Byakoreshejwe Kuri Kurema i Ibyashyinguwe ni Gushyiraho . Kwangira ku "
 "Igenamiterere Kuri i Agaciro: 0 %S . "
 
-#. 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 ""
 
-#. i18n: file kmail.kcfg line 425
-#: rc.cpp:812
+#. i18n: file kmail.kcfg line 455
+#: rc.cpp:837
 #, fuzzy, no-c-format
 msgid "Replace recognized prefi&x with \"Re:\""
 msgstr "Imbanziriza Na: \" : \" "
 
-#. i18n: file kmail.kcfg line 432
-#: rc.cpp:815
+#. i18n: file kmail.kcfg line 462
+#: rc.cpp:840
 #, fuzzy, no-c-format
 msgid "Replace recognized prefix with \"&Fwd:\""
 msgstr "Imbanziriza Na: \" : \" "
 
-#. i18n: file kmail.kcfg line 436
-#: rc.cpp:818
+#. i18n: file kmail.kcfg line 466
+#: rc.cpp:843
 #, fuzzy, no-c-format
 msgid "Use smart &quoting"
 msgstr "Cyiza "
 
-#. 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 "Isinya Byarengeje igihe . "
+
+#. 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
 #, fuzzy, no-c-format
 msgid "Type of addressee selector"
 msgstr "Bya Uwandikiwe itoranya "
 
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:824
+#. i18n: file kmail.kcfg line 481
+#: rc.cpp:855
 #, fuzzy, no-c-format
 msgid ""
 "Sets the type of the dialog for selecting recipients for To,\n"
@@ -13560,14 +14626,14 @@ msgstr ""
 "i Ubwoko: Bya i Ikiganiro ya:  Abandikiwe... ya:  , \n"
 "na . "
 
-#. i18n: file kmail.kcfg line 451
-#: rc.cpp:828
+#. i18n: file kmail.kcfg line 489
+#: rc.cpp:859
 #, fuzzy, no-c-format
 msgid "Type of recipients editor"
 msgstr "Bya Abandikiwe... Muhinduzi "
 
-#. i18n: file kmail.kcfg line 453
-#: rc.cpp:831
+#. i18n: file kmail.kcfg line 491
+#: rc.cpp:862
 #, fuzzy, no-c-format
 msgid ""
 "Sets the type of the recipients editor for editing To,\n"
@@ -13576,41 +14642,47 @@ msgstr ""
 "i Ubwoko: Bya i Abandikiwe... Muhinduzi ya:  Guhindura , \n"
 "na . "
 
-#. i18n: file kmail.kcfg line 468
-#: rc.cpp:835
+#. i18n: file kmail.kcfg line 506
+#: rc.cpp:866
 #, fuzzy, no-c-format
 msgid "Maximum number of recipient editor lines."
 msgstr "Umubare Bya Uwandikiwe Muhinduzi Imirongo . "
 
-#. 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."
 msgstr ""
 
-#. 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 ""
 
-#. 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 ""
 
-#. 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 "
 "successfully."
 msgstr ""
 
-#. 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 "~Umwimerere KubonezaInyuguti: Ryari: Cyangwa NIBA "
+
+#. i18n: file kmail.kcfg line 572
+#: rc.cpp:884
 #, fuzzy, no-c-format
 msgid ""
 "Some emails, especially those generated automatically, do not specify the "
@@ -13624,8 +14696,8 @@ msgstr ""
 "Kugena Imiterere . Kuri i Inyuguti: Imisobekere: Byakoreshejwe in Inzira %s Bya "
 "i . A Mburabuzi i Imisobekere: ya:  i Sisitemu ni Byakoreshejwe . "
 
-#. i18n: file kmail.kcfg line 536
-#: rc.cpp:853
+#. i18n: file kmail.kcfg line 578
+#: rc.cpp:887
 #, fuzzy, no-c-format
 msgid ""
 "Changing this from its default 'Auto' will force the use of the specified "
@@ -13634,8 +14706,8 @@ msgstr ""
 "iyi Kuva: Mburabuzi ' Gushyiraho Ingufu i Koresha Bya i Imisobekere: ya:  Byose "
 ", Bya Kugaragaza . "
 
-#. i18n: file kmail.kcfg line 542
-#: rc.cpp:859
+#. i18n: file kmail.kcfg line 584
+#: rc.cpp:893
 #, fuzzy, no-c-format
 msgid ""
 "Enable this if you want smileys like :-) appearing in the message text to be "
@@ -13644,8 +14716,8 @@ msgstr ""
 "iyi NIBA nka : - ) in i &Ubutumwa Umwandiko Kuri ku Amarangamutima ( Gitoya "
 "Amashusho ) . "
 
-#. i18n: file kmail.kcfg line 547
-#: rc.cpp:865
+#. i18n: file kmail.kcfg line 589
+#: rc.cpp:899
 #, fuzzy, no-c-format
 msgid ""
 "Enable this option to show different levels of quoted text. Disable to hide the "
@@ -13654,64 +14726,78 @@ msgstr ""
 "iyi Ihitamo Kuri Herekana %S Intera Bya Umwandiko . Kuri Gushisha i Intera Bya "
 "Umwandiko . "
 
-#. i18n: file kmail.kcfg line 550
-#: rc.cpp:868
+#. i18n: file kmail.kcfg line 592
+#: rc.cpp:902
 #, fuzzy, no-c-format
 msgid "Automatic collapse level:"
 msgstr "Gusenyuka urwego : "
 
-#. i18n: file kmail.kcfg line 558
-#: rc.cpp:871
+#. i18n: file kmail.kcfg line 600
+#: rc.cpp:905
 #, fuzzy, no-c-format
 msgid "Reduce font size for quoted text"
 msgstr "Imyandikire Ingano: ya:  Umwandiko "
 
-#. i18n: file kmail.kcfg line 559
-#: rc.cpp:874
+#. i18n: file kmail.kcfg line 601
+#: rc.cpp:908
 #, fuzzy, no-c-format
 msgid "Enable this option to show quoted text with a smaller font."
 msgstr "iyi Ihitamo Kuri Herekana %S Umwandiko Na: A Gitoya Imyandikire . "
 
-#. 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 "Yoherejwe: Ubutumwa Bishunzwe: "
+
+#. 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
 #, fuzzy, no-c-format
 msgid "Show user agent in fancy headers"
 msgstr "Imimerere in Imitwe "
 
-#. 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 "
 "when using fancy headers."
 msgstr ""
 
-#. 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 ""
 
-#. 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 ""
 
-#. 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 ""
 
-#. i18n: file kmail.kcfg line 599
-#: rc.cpp:892
+#. i18n: file kmail.kcfg line 647
+#: rc.cpp:932
 #, fuzzy, no-c-format
 msgid "Send Message Disposition Notifications with an empty sender."
 msgstr "Name=Amamenyesha Sisitemu"
 
-#. 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 "
@@ -13719,90 +14805,82 @@ msgid ""
 "problems sending MDNs, uncheck this option."
 msgstr ""
 
-#. 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 ""
 
-#. 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 ""
 
-#. i18n: file kmail.kcfg line 611
-#: rc.cpp:904
+#. i18n: file kmail.kcfg line 659
+#: rc.cpp:944
 #, fuzzy, no-c-format
 msgid "Message template for new message"
 msgstr "Kubona Ubutumwa bushya"
 
-#. 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 ""
 
-#. 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 ""
 
-#. 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 ""
 
-#. i18n: file kmail.kcfg line 631
-#: rc.cpp:916
+#. i18n: file kmail.kcfg line 679
+#: rc.cpp:956
 #, fuzzy, no-c-format
 msgid "Quote characters"
 msgstr "Inyuguti z'impugukirwa isoza"
 
-#. 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 ""
 
-#. 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 "
 "any settings, such as the domain to react to and the spam reaction switch."
 msgstr ""
 
-#. 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 ""
 
-#. 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 ""
 
-#. 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 "
 "KMail."
 msgstr ""
 
-#: recipientseditor.cpp:100
-msgid "To"
-msgstr "Kuri"
-
-#: recipientseditor.cpp:102
-msgid "CC"
-msgstr "KopiKubandi"
-
 #: recipientseditor.cpp:104
 msgid "BCC"
 msgstr "BCC"
@@ -13817,58 +14895,58 @@ msgstr "Uwohereza n'Uwohererejwe"
 msgid "Select type of recipient"
 msgstr "Ubwoko: Bya Uwandikiwe "
 
-#: recipientseditor.cpp:181
+#: recipientseditor.cpp:163
+msgid "Set the list of email addresses to receive this message"
+msgstr ""
+
+#: recipientseditor.cpp:183
 #, fuzzy
 msgid "Remove recipient line"
 msgstr "Uwandikiwe Umurongo: "
 
-#: recipientseditor.cpp:737
+#: recipientseditor.cpp:739
 #, fuzzy
 msgid "<b>To:</b><br/>"
 msgstr "<b>Urugero</b>: %1<br>"
 
-#: recipientseditor.cpp:738
+#: recipientseditor.cpp:740
 #, fuzzy
 msgid "<b>CC:</b><br/>"
 msgstr "<b>CC:"
 
-#: recipientseditor.cpp:739
+#: recipientseditor.cpp:741
 #, fuzzy
 msgid "<b>BCC:</b><br/>"
 msgstr "<b>BCC:"
 
-#: recipientseditor.cpp:766
+#: recipientseditor.cpp:768
 #, fuzzy
 msgid "Save List..."
 msgstr "Kubika ... "
 
-#: recipientseditor.cpp:772
+#: recipientseditor.cpp:774
 #, fuzzy
 msgid "Save recipients as distribution list"
 msgstr "Kubika Abandikiwe... Nka Ikwirakwiza Urutonde "
 
-#: recipientseditor.cpp:774
-msgid "Se&lect..."
-msgstr "Guhitamo..."
-
-#: recipientseditor.cpp:777
+#: recipientseditor.cpp:779
 #, fuzzy
 msgid "Select recipients from address book"
 msgstr "Abandikiwe... Kuva: Aderesi: Igitabo "
 
-#: recipientseditor.cpp:810
+#: recipientseditor.cpp:812
 #, fuzzy
 msgid "No recipients"
 msgstr "Abandikiwe... "
 
-#: recipientseditor.cpp:811
+#: recipientseditor.cpp:813
 #, fuzzy, c-format
 msgid ""
 "_n: 1 recipient\n"
 "%n recipients"
 msgstr "1 %n Abandikiwe... "
 
-#: recipientseditor.cpp:914
+#: recipientseditor.cpp:917
 #, fuzzy
 msgid "Truncating recipients list to %1 of %2 entries."
 msgstr "Abandikiwe... Urutonde Kuri %1 Bya %2 Ibyinjijwe . "
@@ -13974,12 +15052,12 @@ msgid ""
 msgstr ""
 "Akabuto A Ikiganiro Guhitamo Abandikiwe... Inyuma Bya Byose Bihari Amaderesi . "
 
-#: redirectdialog.cpp:107
+#: redirectdialog.cpp:116
 #, fuzzy
 msgid "You cannot redirect the message without an address."
 msgstr "i &Ubutumwa Aderesi: . "
 
-#: redirectdialog.cpp:108
+#: redirectdialog.cpp:117
 #, fuzzy
 msgid "Empty Redirection Address"
 msgstr "Kwinjiza aderesi y'uwohereza "
@@ -14139,52 +15217,52 @@ msgstr "in : "
 msgid "I&nclude sub-folders"
 msgstr "- Ububiko "
 
-#: searchwindow.cpp:226
+#: searchwindow.cpp:225
 #, fuzzy
 msgid "Sender/Receiver"
 msgstr "Umwakirizi"
 
-#: searchwindow.cpp:249
+#: searchwindow.cpp:250
 #, fuzzy
 msgid "Search folder &name:"
 msgstr "Ububiko... Izina: : "
 
-#: searchwindow.cpp:259
+#: searchwindow.cpp:260
 #, fuzzy
 msgid "Op&en Search Folder"
 msgstr "Gusibiramo Ishaka"
 
-#: searchwindow.cpp:268
+#: searchwindow.cpp:269
 #, fuzzy
 msgid "Open &Message"
 msgstr "Gufungura Ubutumwa"
 
-#: searchwindow.cpp:274
+#: searchwindow.cpp:275
 msgid "AMiddleLengthText..."
 msgstr "UmwandikoUringaniye..."
 
-#: searchwindow.cpp:275
+#: searchwindow.cpp:276
 msgid "Ready."
 msgstr "Cyiteguye."
 
-#: searchwindow.cpp:356
+#: searchwindow.cpp:357
 #, fuzzy
 msgid "Clear Selection"
 msgstr "Itoranya rya Muyunguruzi"
 
-#: searchwindow.cpp:415
+#: searchwindow.cpp:416
 #, fuzzy, c-format
 msgid ""
 "_n: %n message searched\n"
 "%n messages searched"
 msgstr "%n &Ubutumwa %n Ubutumwa "
 
-#: searchwindow.cpp:418
+#: searchwindow.cpp:419
 #, fuzzy
 msgid "Done."
 msgstr "Byakozwe"
 
-#: searchwindow.cpp:419
+#: searchwindow.cpp:420
 #, fuzzy
 msgid ""
 "_n: %n match in %1\n"
@@ -14193,12 +15271,12 @@ msgstr ""
 "%n BIHUYE ( %1 ) \n"
 "%n ( %1 ) "
 
-#: searchwindow.cpp:422
+#: searchwindow.cpp:423
 #, fuzzy
 msgid "Search canceled."
 msgstr "Kureka "
 
-#: searchwindow.cpp:423
+#: searchwindow.cpp:424
 #, fuzzy
 msgid ""
 "_n: %n match so far in %1\n"
@@ -14207,14 +15285,14 @@ msgstr ""
 "%n BIHUYE Far ( %1 ) \n"
 "%n Far ( %1 ) "
 
-#: searchwindow.cpp:427
+#: searchwindow.cpp:428
 #, fuzzy, c-format
 msgid ""
 "_n: %n message\n"
 "%n messages"
 msgstr "Ubutumwa."
 
-#: searchwindow.cpp:428
+#: searchwindow.cpp:429
 #, fuzzy, c-format
 msgid ""
 "_n: %n match\n"
@@ -14223,7 +15301,7 @@ msgstr ""
 "1 match found.\n"
 "%n matches found."
 
-#: searchwindow.cpp:429
+#: searchwindow.cpp:430
 #, fuzzy
 msgid "Searching in %1. %2 searched so far"
 msgstr "in %1 ( &Ubutumwa %2 ) "
@@ -14261,19 +15339,19 @@ msgstr ""
 "Ibisobanuro: Bigyanye Gushigikira ... \n"
 "\n"
 
-#: sievedebugdialog.cpp:230
+#: sievedebugdialog.cpp:256
 #, fuzzy
 msgid ""
 "Collecting data for account '%1'...\n"
 msgstr ""
 "Ibyatanzwe ya:  Konti: ' %1 ' ... \n"
 
-#: sievedebugdialog.cpp:231
+#: sievedebugdialog.cpp:257
 msgid ""
 "------------------------------------------------------------\n"
 msgstr ""
 
-#: sievedebugdialog.cpp:239
+#: sievedebugdialog.cpp:265
 #, fuzzy
 msgid ""
 "(Account does not support Sieve)\n"
@@ -14282,7 +15360,7 @@ msgstr ""
 "( OYA Gushigikira ) \n"
 "\n"
 
-#: sievedebugdialog.cpp:266
+#: sievedebugdialog.cpp:278
 #, fuzzy
 msgid ""
 "(Account is not an IMAP account)\n"
@@ -14291,14 +15369,14 @@ msgstr ""
 "( ni OYA Konti: ) \n"
 "\n"
 
-#: sievedebugdialog.cpp:286
+#: sievedebugdialog.cpp:298
 #, fuzzy
 msgid ""
 "Contents of script '%1':\n"
 msgstr ""
 "Bya IYANDIKA ' %1 ' : \n"
 
-#: sievedebugdialog.cpp:321
+#: sievedebugdialog.cpp:320
 #, fuzzy
 msgid ""
 "(This script is empty.)\n"
@@ -14307,7 +15385,7 @@ msgstr ""
 "( IYANDIKA ni ubusa . ) \n"
 "\n"
 
-#: sievedebugdialog.cpp:326
+#: sievedebugdialog.cpp:325
 msgid ""
 "------------------------------------------------------------\n"
 "%1\n"
@@ -14315,25 +15393,25 @@ msgid ""
 "\n"
 msgstr ""
 
-#: sievedebugdialog.cpp:342
+#: sievedebugdialog.cpp:341
 #, fuzzy
 msgid ""
 "Sieve capabilities:\n"
 msgstr "Kubaza ubushobozi bwa seriveri"
 
-#: sievedebugdialog.cpp:346
+#: sievedebugdialog.cpp:345
 #, fuzzy
 msgid "(No special capabilities available)"
 msgstr "( Bidasanzwe Bihari ) "
 
-#: sievedebugdialog.cpp:355
+#: sievedebugdialog.cpp:354
 #, fuzzy
 msgid ""
 "Available Sieve scripts:\n"
 msgstr ""
 "Inyandikoporogaramu : \n"
 
-#: sievedebugdialog.cpp:359
+#: sievedebugdialog.cpp:358
 #, fuzzy
 msgid ""
 "(No Sieve scripts available on this server)\n"
@@ -14342,7 +15420,7 @@ msgstr ""
 "( Inyandikoporogaramu Bihari ku iyi Seriveri: ) \n"
 "\n"
 
-#: sievedebugdialog.cpp:367
+#: sievedebugdialog.cpp:366
 #, fuzzy
 msgid ""
 "Active script: %1\n"
@@ -14351,7 +15429,7 @@ msgstr ""
 "IYANDIKA : %1 \n"
 "\n"
 
-#: sievedebugdialog.cpp:394 vacation.cpp:714
+#: sievedebugdialog.cpp:393 vacation.cpp:721
 #, fuzzy
 msgid ""
 "Sieve script installed successfully on the server.\n"
@@ -14360,7 +15438,7 @@ msgstr ""
 "IYANDIKA yakorewe iyinjizaporogaramu ku i Seriveri: . \n"
 "Bya Subiza ni NONEAHA Gikora . "
 
-#: sievedebugdialog.cpp:396 vacation.cpp:716
+#: sievedebugdialog.cpp:395 vacation.cpp:723
 #, fuzzy
 msgid ""
 "Sieve script installed successfully on the server.\n"
@@ -14464,21 +15542,25 @@ msgstr "command : "
 msgid "New entry:"
 msgstr "Icyinjijwe : "
 
-#: simplestringlisteditor.cpp:205
+#: simplestringlisteditor.cpp:214
 #, fuzzy
 msgid "New Value"
 msgstr "Umubare mushya%S"
 
-#: simplestringlisteditor.cpp:225
+#: simplestringlisteditor.cpp:235
 #, fuzzy
 msgid "Change Value"
 msgstr "Guhindura Urwego"
 
-#: snippetdlg.cpp:71
+#: snippetdlg.cpp:78
 #, fuzzy
 msgid "Sh&ortcut:"
 msgstr "Ihinanzira:"
 
+#: snippetitem.cpp:133 snippetwidget.cpp:171
+msgid "GROUP"
+msgstr ""
+
 #: snippetwidget.cpp:148
 #, c-format
 msgid "Snippet %1"
@@ -14564,8 +15646,8 @@ msgstr "Bijye byizana"
 #: 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 ""
 "Kwiyandikisha OYA Byakoreshejwe ya:  Seriveri: %1 \n"
 "Kuri Gushoboza Kwiyandikisha ? "
@@ -14584,37 +15666,42 @@ msgstr "Gushoboza"
 msgid "Do Not Enable"
 msgstr "Yanzwe"
 
-#: templateparser.cpp:238 templateparser.cpp:271
+#: templateparser.cpp:263 templateparser.cpp:296
 #, fuzzy
 msgid "Cannot insert content from file %1: %2"
 msgstr ""
 "Gufungura Idosiye \" %1 \" : \n"
 "%2 "
 
-#: templateparser.cpp:1009 templateparser.cpp:1013
+#: templateparser.cpp:970
+#, fuzzy, c-format
+msgid "Attachment %1"
+msgstr "Umugereka"
+
+#: templateparser.cpp:1150 templateparser.cpp:1154
 #, fuzzy
 msgid "Pipe command exit with status %1: %2"
 msgstr ""
 "Na: Inyandikoporogaramu %1 : \n"
 "%2 "
 
-#: templateparser.cpp:1024 templateparser.cpp:1028
+#: templateparser.cpp:1165 templateparser.cpp:1169
 msgid "Pipe command killed by signal %1: %2"
 msgstr ""
 
-#: templateparser.cpp:1040
+#: templateparser.cpp:1181
 #, fuzzy
 msgid "Pipe command did not finish within %1 seconds: %2"
 msgstr ""
 "Na: Inyandikoporogaramu %1 : \n"
 "%2 "
 
-#: templateparser.cpp:1052 templateparser.cpp:1055
+#: templateparser.cpp:1193 templateparser.cpp:1196
 #, c-format
 msgid "Cannot write to process stdin: %1"
 msgstr ""
 
-#: templateparser.cpp:1063
+#: templateparser.cpp:1204
 #, c-format
 msgid "Cannot start pipe command from template: %1"
 msgstr ""
@@ -14668,9 +15755,9 @@ msgid ""
 "----------  %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"
@@ -14679,35 +15766,39 @@ msgstr ""
 #: templatesconfiguration.cpp:511
 msgid ""
 "%REM=\"Default new message template\"%-\n"
-"%BLANK"
+"%BLANK\n"
+"%BLANK\n"
+"%BLANK\n"
 msgstr ""
 
-#: templatesconfiguration.cpp:518
+#: templatesconfiguration.cpp:520
 msgid ""
+"%CURSOR\n"
+"%BLANK\n"
 "%REM=\"Default reply template\"%-\n"
 "On %ODATEEN %OTIMELONGEN you wrote:\n"
 "%QUOTE\n"
-"%CURSOR\n"
 msgstr ""
 
-#: templatesconfiguration.cpp:527
+#: templatesconfiguration.cpp:530
 msgid ""
+"%CURSOR\n"
+"%BLANK\n"
 "%REM=\"Default reply all template\"%-\n"
 "On %ODATEEN %OTIMELONGEN %OFROMNAME wrote:\n"
 "%QUOTE\n"
-"%CURSOR\n"
 msgstr ""
 
-#: templatesconfiguration.cpp:536
+#: templatesconfiguration.cpp:541
 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"
@@ -14738,177 +15829,182 @@ msgstr "&Ubutumwa "
 msgid "Message Text as Is"
 msgstr "ubutumwa"
 
-#: templatesinsertcommand.cpp:62 templatesinsertcommand.cpp:163
+#: templatesinsertcommand.cpp:62 templatesinsertcommand.cpp:166
 #, fuzzy
 msgid "Message Id"
 msgstr "Umubiri w'ubutumwa nka"
 
-#: templatesinsertcommand.cpp:70 templatesinsertcommand.cpp:171
+#: templatesinsertcommand.cpp:70 templatesinsertcommand.cpp:174
 msgid "Date in Short Format"
 msgstr ""
 
-#: templatesinsertcommand.cpp:74 templatesinsertcommand.cpp:175
+#: templatesinsertcommand.cpp:74 templatesinsertcommand.cpp:178
 msgid "Date in C Locale"
 msgstr ""
 
-#: templatesinsertcommand.cpp:78 templatesinsertcommand.cpp:179
+#: templatesinsertcommand.cpp:78 templatesinsertcommand.cpp:182
 msgid "Day of Week"
 msgstr ""
 
-#: templatesinsertcommand.cpp:82 templatesinsertcommand.cpp:183
+#: templatesinsertcommand.cpp:82 templatesinsertcommand.cpp:186
 msgid "Time"
 msgstr ""
 
-#: templatesinsertcommand.cpp:86 templatesinsertcommand.cpp:187
+#: templatesinsertcommand.cpp:86 templatesinsertcommand.cpp:190
 msgid "Time in Long Format"
 msgstr ""
 
-#: templatesinsertcommand.cpp:90 templatesinsertcommand.cpp:191
+#: templatesinsertcommand.cpp:90 templatesinsertcommand.cpp:194
 msgid "Time in C Locale"
 msgstr ""
 
-#: templatesinsertcommand.cpp:94 templatesinsertcommand.cpp:195
+#: templatesinsertcommand.cpp:94 templatesinsertcommand.cpp:198
 #, fuzzy
 msgid "To Field Address"
 msgstr "Aderesi ya imeli:"
 
-#: templatesinsertcommand.cpp:98 templatesinsertcommand.cpp:199
+#: templatesinsertcommand.cpp:98 templatesinsertcommand.cpp:202
 #, fuzzy
 msgid "To Field Name"
 msgstr "Izina: : "
 
-#: templatesinsertcommand.cpp:102 templatesinsertcommand.cpp:203
+#: templatesinsertcommand.cpp:102 templatesinsertcommand.cpp:206
 #, fuzzy
 msgid "To Field First Name"
 msgstr "Izina: : "
 
-#: templatesinsertcommand.cpp:106 templatesinsertcommand.cpp:207
+#: templatesinsertcommand.cpp:106 templatesinsertcommand.cpp:210
 #, fuzzy
 msgid "To Field Last Name"
 msgstr "Izina: : "
 
-#: templatesinsertcommand.cpp:110 templatesinsertcommand.cpp:211
+#: templatesinsertcommand.cpp:110 templatesinsertcommand.cpp:214
 #, fuzzy
 msgid "CC Field Address"
 msgstr "Amaderesi : "
 
-#: templatesinsertcommand.cpp:114 templatesinsertcommand.cpp:215
+#: templatesinsertcommand.cpp:114 templatesinsertcommand.cpp:218
 #, fuzzy
 msgid "CC Field Name"
 msgstr "Izina: : "
 
-#: templatesinsertcommand.cpp:118 templatesinsertcommand.cpp:219
+#: templatesinsertcommand.cpp:118 templatesinsertcommand.cpp:222
 #, fuzzy
 msgid "CC Field First Name"
 msgstr "Izina: : "
 
-#: templatesinsertcommand.cpp:122 templatesinsertcommand.cpp:223
+#: templatesinsertcommand.cpp:122 templatesinsertcommand.cpp:226
 #, fuzzy
 msgid "CC Field Last Name"
 msgstr "Izina: : "
 
-#: templatesinsertcommand.cpp:126 templatesinsertcommand.cpp:227
+#: templatesinsertcommand.cpp:126 templatesinsertcommand.cpp:230
 #, fuzzy
 msgid "From Field Address"
 msgstr "Aderesi ya imeli:"
 
-#: templatesinsertcommand.cpp:130 templatesinsertcommand.cpp:231
+#: templatesinsertcommand.cpp:130 templatesinsertcommand.cpp:234
 #, fuzzy
 msgid "From Field Name"
 msgstr "Aderesi ya imeli:"
 
-#: templatesinsertcommand.cpp:134 templatesinsertcommand.cpp:235
+#: templatesinsertcommand.cpp:134 templatesinsertcommand.cpp:238
 #, fuzzy
 msgid "From Field First Name"
 msgstr "Aderesi ya imeli:"
 
-#: templatesinsertcommand.cpp:138 templatesinsertcommand.cpp:239
+#: templatesinsertcommand.cpp:138 templatesinsertcommand.cpp:242
 #, fuzzy
 msgid "From Field Last Name"
 msgstr "Aderesi ya imeli:"
 
-#: templatesinsertcommand.cpp:146
+#: templatesinsertcommand.cpp:142
+#, fuzzy
+msgid "Addresses of all original recipients"
+msgstr "Ingingo Nyongera"
+
+#: templatesinsertcommand.cpp:149
 #, fuzzy
 msgid "Quoted Headers"
 msgstr "Inyuguti z'impugukirwa isoza"
 
-#: templatesinsertcommand.cpp:150
+#: templatesinsertcommand.cpp:153
 #, fuzzy
 msgid "Headers as Is"
 msgstr "Umutwe"
 
-#: templatesinsertcommand.cpp:154 templatesinsertcommand.cpp:247
+#: templatesinsertcommand.cpp:157 templatesinsertcommand.cpp:250
 #, fuzzy
 msgid "Header Content"
 msgstr "Ibigize : "
 
-#: templatesinsertcommand.cpp:160
+#: templatesinsertcommand.cpp:163
 #, fuzzy
 msgid "Current Message"
 msgstr "Itariki Y'Uyu Munsi"
 
-#: templatesinsertcommand.cpp:253
+#: templatesinsertcommand.cpp:256
 msgid "Process With External Programs"
 msgstr ""
 
-#: templatesinsertcommand.cpp:256
+#: templatesinsertcommand.cpp:259
 #, fuzzy
 msgid "Insert Result of Command"
 msgstr "Kongeramo Idosiye..."
 
-#: templatesinsertcommand.cpp:260
+#: templatesinsertcommand.cpp:263
 msgid "Pipe Original Message Body and Insert Result as Quoted Text"
 msgstr ""
 
-#: templatesinsertcommand.cpp:264
+#: templatesinsertcommand.cpp:267
 msgid "Pipe Original Message Body and Insert Result as Is"
 msgstr ""
 
-#: templatesinsertcommand.cpp:268
+#: templatesinsertcommand.cpp:271
 msgid "Pipe Original Message with Headers and Insert Result as Is"
 msgstr ""
 
-#: templatesinsertcommand.cpp:272
+#: templatesinsertcommand.cpp:275
 msgid "Pipe Current Message Body and Insert Result as Is"
 msgstr ""
 
-#: templatesinsertcommand.cpp:276
+#: templatesinsertcommand.cpp:279
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr ""
 
-#: templatesinsertcommand.cpp:285
+#: templatesinsertcommand.cpp:288
 msgid "Set Cursor Position"
 msgstr ""
 
-#: templatesinsertcommand.cpp:289
+#: templatesinsertcommand.cpp:292
 #, fuzzy
 msgid "Insert File Content"
 msgstr "Idosiye "
 
-#: templatesinsertcommand.cpp:293
+#: templatesinsertcommand.cpp:296
 msgid "DNL"
 msgstr ""
 
-#: templatesinsertcommand.cpp:297
+#: templatesinsertcommand.cpp:300
 #, fuzzy
 msgid "Template Comment"
 msgstr "Ibigize : "
 
-#: templatesinsertcommand.cpp:301
+#: templatesinsertcommand.cpp:304
 #, fuzzy
 msgid "No Operation"
 msgstr "Igikorwa "
 
-#: templatesinsertcommand.cpp:305
+#: templatesinsertcommand.cpp:308
 #, fuzzy
 msgid "Clear Generated Message"
 msgstr "&Ubutumwa "
 
-#: templatesinsertcommand.cpp:309
+#: templatesinsertcommand.cpp:312
 msgid "Turn Debug On"
 msgstr ""
 
-#: templatesinsertcommand.cpp:313
+#: templatesinsertcommand.cpp:316
 msgid "Turn Debug Off"
 msgstr ""
 
@@ -15025,66 +16121,76 @@ msgstr ""
 msgid "There is nothing to undo."
 msgstr "ni Nta na kimwe Kuri Isubiranyuma . "
 
-#: urlhandlermanager.cpp:422
+#: urlhandlermanager.cpp:482
 #, fuzzy
 msgid "Turn on HTML rendering for this message."
 msgstr "ku Isubizwa ya:  iyi &Ubutumwa . "
 
-#: urlhandlermanager.cpp:424
+#: urlhandlermanager.cpp:484
 #, fuzzy
 msgid "Load external references from the Internet for this message."
 msgstr "external Indango Kuva: i ya:  iyi &Ubutumwa . "
 
-#: urlhandlermanager.cpp:426
+#: urlhandlermanager.cpp:486
 #, fuzzy
 msgid "Work online."
 msgstr "Korera hanze ya interneti"
 
-#: urlhandlermanager.cpp:428
+#: urlhandlermanager.cpp:488
 #, fuzzy
 msgid "Decrypt message."
 msgstr "&Ubutumwa "
 
-#: urlhandlermanager.cpp:430
+#: urlhandlermanager.cpp:490
 #, fuzzy
 msgid "Show signature details."
 msgstr "Isinya Byabonetse "
 
-#: urlhandlermanager.cpp:432
+#: urlhandlermanager.cpp:492
 #, fuzzy
 msgid "Hide signature details."
 msgstr "Isinya . "
 
-#: urlhandlermanager.cpp:464
+#: urlhandlermanager.cpp:494
+#, fuzzy
+msgid "Hide attachment list"
+msgstr "Kubika "
+
+#: urlhandlermanager.cpp:496
+#, fuzzy
+msgid "Show attachment list"
+msgstr "Umugereka Agashushondanga "
+
+#: urlhandlermanager.cpp:528
 #, fuzzy
 msgid "Expand all quoted text."
 msgstr "Byose Umwandiko . "
 
-#: urlhandlermanager.cpp:466
+#: urlhandlermanager.cpp:531
 #, fuzzy
 msgid "Collapse quoted text."
 msgstr "Umwandiko . "
 
-#: urlhandlermanager.cpp:487
+#: urlhandlermanager.cpp:554
 #, fuzzy
 msgid "Could not start certificate manager. Please check your installation."
 msgstr "Genzuraiyinjizaryawe."
 
-#: urlhandlermanager.cpp:497
+#: urlhandlermanager.cpp:564
 #, fuzzy, c-format
 msgid "Show certificate 0x%1"
 msgstr "Impamyabushobozi: %1 "
 
-#: urlhandlermanager.cpp:552
+#: urlhandlermanager.cpp:693
 #, fuzzy
 msgid "Attachment #%1 (unnamed)"
 msgstr "# %1 ( Kitiswe ) "
 
-#: urlhandlermanager.cpp:581
+#: urlhandlermanager.cpp:724
 msgid "Show GnuPG Audit Log for this operation"
 msgstr ""
 
-#: vacation.cpp:562
+#: vacation.cpp:566
 #, fuzzy
 msgid ""
 "I am out of office till %1.\n"
@@ -15106,7 +16212,7 @@ msgstr ""
 "Telefone : + . : + Mbaye mbashimiye , \n"
 "- - < Injiza Izina: na Imeli Aderesi: > \n"
 
-#: vacation.cpp:606
+#: vacation.cpp:612
 #, fuzzy
 msgid ""
 "Your server did not list \"vacation\" in its list of supported Sieve "
@@ -15118,12 +16224,12 @@ msgstr ""
 ", Kwinjiza porogaramu Inyuma - Bya - Ofise ya:  . \n"
 "Umuntu Sisitemu umuyobozi/uyobora . "
 
-#: vacation.cpp:616
+#: vacation.cpp:622
 #, fuzzy
 msgid "Configure \"Out of Office\" Replies"
 msgstr "\" Bya \" "
 
-#: vacation.cpp:626
+#: vacation.cpp:632
 #, fuzzy
 msgid ""
 "Someone (probably you) changed the vacation script on the server.\n"
@@ -15134,17 +16240,17 @@ msgstr ""
 "ni Oya Kuri i Ibigenga ya:  i . \n"
 "Uduciro Byakoreshejwe . "
 
-#: vacation.cpp:651
+#: vacation.cpp:657
 msgid ""
 "There is still an active out-of-office reply configured.\n"
 "Do you want to edit it?"
 msgstr ""
 
-#: vacation.cpp:652
+#: vacation.cpp:658
 msgid "Out-of-office reply still active"
 msgstr ""
 
-#: vacation.cpp:653
+#: vacation.cpp:659
 #, fuzzy
 msgid "Ignore"
 msgstr "Kureka"
@@ -15159,45 +16265,45 @@ msgstr "Ibimenyetso Kuri Yoherejwe: : "
 msgid "&Activate vacation notifications"
 msgstr "Ibimenyetso "
 
-#: vacationdialog.cpp:76
+#: vacationdialog.cpp:78
 #, fuzzy
 msgid "&Resend notification only after:"
 msgstr "Ikimenyetso Nyuma : "
 
-#: vacationdialog.cpp:82
+#: vacationdialog.cpp:84
 #, fuzzy
 msgid "&Send responses for these addresses:"
 msgstr "ya:  Amaderesi : "
 
-#: vacationdialog.cpp:87
+#: vacationdialog.cpp:89
 #, fuzzy
 msgid "Do not send vacation replies to spam messages"
 msgstr "OYA Kohereza in Kuri Bishunzwe: Ubutumwa "
 
-#: vacationdialog.cpp:93
+#: vacationdialog.cpp:95
 msgid "Only react to mail coming from domain"
 msgstr ""
 
-#: vcardviewer.cpp:41
+#: vcardviewer.cpp:45
 #, fuzzy
 msgid "VCard Viewer"
 msgstr "Igaragaza ry'Akugara"
 
-#: vcardviewer.cpp:42
+#: vcardviewer.cpp:46
 msgid "&Import"
 msgstr "Kuzana"
 
-#: vcardviewer.cpp:42
+#: vcardviewer.cpp:46
 #, fuzzy
 msgid "&Next Card"
 msgstr "Ikarita nshya"
 
-#: vcardviewer.cpp:42
+#: vcardviewer.cpp:46
 #, fuzzy
 msgid "&Previous Card"
 msgstr "umwaka ushize"
 
-#: vcardviewer.cpp:62
+#: vcardviewer.cpp:70
 #, fuzzy
 msgid "Failed to parse vCard."
 msgstr "Kuri . "
@@ -15427,7 +16533,7 @@ msgstr "am"
 msgid "To Do"
 msgstr "Gukora"
 
-#: kmsearchpattern.h:233
+#: kmsearchpattern.h:234
 #, fuzzy
 msgid "Has Attachment"
 msgstr "Ifite Imigereka"
@@ -15436,6 +16542,11 @@ msgstr "Ifite Imigereka"
 msgid "%1 of %2 %3 used"
 msgstr ""
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr ""
+
 #: util.h:208
 msgid ""
 "A file named \"%1\" already exists. Are you sure you want to overwrite it?"
@@ -15446,6 +16557,36 @@ msgid "Overwrite File?"
 msgstr "Gusimbuza Idosiye?"
 
 #, fuzzy
+#~ msgid "Show folder quick search field"
+#~ msgstr "Shakisha Umurongo: Kwandika "
+
+#, fuzzy
+#~ msgid "Standard (Ical / Vcard)"
+#~ msgstr "Standard ( /) "
+
+#, fuzzy
+#~ msgid ""
+#~ "_: recipient address field\n"
+#~ "&To:"
+#~ msgstr "Aderesi y'uwohererejwe"
+
+#, fuzzy
+#~ msgid "&Copy to (CC):"
+#~ msgstr "Kuri ( ) : "
+
+#, fuzzy
+#~ msgid "&Blind copy to (BCC):"
+#~ msgstr "Gukoporora Kuri ( ) : "
+
+#, fuzzy
+#~ msgid "Retrieving new messages"
+#~ msgstr "Gishya Ubutumwa "
+
+#, fuzzy
+#~ msgid "Show folder quick search line edit"
+#~ msgstr "Shakisha Umurongo: Kwandika "
+
+#, fuzzy
 #~ msgid "Op&en"
 #~ msgstr "Gufungura"
 
@@ -16013,9 +17154,6 @@ msgstr "Gusimbuza Idosiye?"
 #~ msgid "Always"
 #~ msgstr "Buri gihe"
 
-#~ msgid "After"
-#~ msgstr "Nyuma"
-
 #, fuzzy
 #~ msgid "Warn if CA certificate e&xpires in less than:"
 #~ msgstr "NIBA Impamyabushobozi: Yarenze igihe: in Birutwa : "
@@ -16041,10 +17179,6 @@ msgstr "Gusimbuza Idosiye?"
 #~ msgstr "NIBA Isinya Impamyabushobozi: Yarenze igihe: in Birutwa : "
 
 #, fuzzy
-#~ msgid "Warn if root certificate expires in &less than:"
-#~ msgstr "NIBA Imizi Impamyabushobozi: Yarenze igihe: in Birutwa : "
-
-#, fuzzy
 #~ msgid "Warn if signer's email address is &not in certificate"
 #~ msgstr "NIBA Imeli Aderesi: ni OYA in Impamyabushobozi: "