Automated l10n update (.po files)

1 files changed, 3382 insertions, 2240 deletions

diff --git a/tde-i18n-eo/messages/tdepim/kmail.po b/tde-i18n-eo/messages/tdepim/kmail.po
index 710f99bc120..17c3b9ad12f 100644
--- a/tde-i18n-eo/messages/tdepim/kmail.po
+++ b/tde-i18n-eo/messages/tdepim/kmail.po
@@ -9,10 +9,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
-"POT-Creation-Date: 2008-08-19 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2007-11-17 19:41+0100\n"
 "Last-Translator: Oliver Kellogg <okellogg@users.sourceforge.net>\n"
 "Language-Team: Esperanto <kde-i18n-eo@kde.org>\n"
+"Language: eo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -104,7 +105,7 @@ msgstr "Tempopunkto de 'transsendo finita'-statmesaĝoj"
 msgid "multiple encryption keys per address"
 msgstr "pluraj ĉifroŝlosiloj po adreso"
 
-#: aboutdata.cpp:212 kmreaderwin.cpp:1336 kmstartup.cpp:148
+#: aboutdata.cpp:212 kmreaderwin.cpp:1300 kmstartup.cpp:149
 #: mailinglistpropertiesdialog.cpp:97
 msgid "KMail"
 msgstr "KMail"
@@ -148,7 +149,8 @@ msgid "Locking Method"
 msgstr "Ŝlosometodo"
 
 #: accountdialog.cpp:368
-msgid "Procmail loc&kfile:"
+#, fuzzy
+msgid "Procmail loc&tdefile:"
 msgstr "Procmail-ŝ&losodosiero"
 
 #: accountdialog.cpp:380
@@ -203,7 +205,7 @@ msgid "Check inter&val:"
 msgstr "&Kontrolintervalo (minutoj):"
 
 #: 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"
 
@@ -237,8 +239,8 @@ msgstr "En&meti en la kontrolon"
 msgid "Account Type: POP Account"
 msgstr "Kontotipo: POP-konto"
 
-#: 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 "Ĝ&enerale"
 
@@ -339,7 +341,7 @@ msgstr "&Kromaĵoj"
 msgid "Check &What the Server Supports"
 msgstr "Rigardi &kion la servilo subtenas"
 
-#: accountdialog.cpp:782 accountdialog.cpp:1097 kmheaders.cpp:137
+#: accountdialog.cpp:782 accountdialog.cpp:1097 kmheaders.cpp:140
 #: kmtransport.cpp:502
 msgid "Encryption"
 msgstr "Ĉifrado"
@@ -461,7 +463,8 @@ msgid "Sho&w hidden folders"
 msgstr "&Montri kaŝitajn leterujojn"
 
 #: accountdialog.cpp:987
-msgid "Show only s&ubscribed folders"
+#, fuzzy
+msgid "Show only serverside s&ubscribed folders"
 msgstr "Montri nur &subskribitajn leterujojn"
 
 #: accountdialog.cpp:992
@@ -517,9 +520,9 @@ msgstr "&Filtroago"
 msgid "<none>"
 msgstr "<neniu>"
 
-#: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:244
-#: kmfoldercachedimap.cpp:2085 kmfolderimap.cpp:204 kmfolderimap.cpp:907
-#: kmkernel.cpp:1374 subscriptiondialog.cpp:172
+#: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
+#: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
+#: kmkernel.cpp:1424 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "ricevitaj"
 
@@ -616,7 +619,7 @@ msgstr ""
 "Ĉar kelkaj serviloj ne korekte publikigi siajn eblecojn, vi ankoraŭ havas la "
 "eblecon ŝalti la \"Filtru mesaĝojn\"."
 
-#: accountdialog.cpp:1734 vacationdialog.cpp:163
+#: accountdialog.cpp:1734 vacationdialog.cpp:76 vacationdialog.cpp:165
 msgid ""
 "_n:  day\n"
 " days"
@@ -660,12 +663,12 @@ msgstr "Malplenigi"
 msgid "Edit Namespace '%1'"
 msgstr "Redakti Nomspacon '%1'"
 
-#: accountmanager.cpp:101
+#: accountmanager.cpp:103
 #, c-format
 msgid "Account %1"
 msgstr "Konto %1"
 
-#: accountmanager.cpp:181
+#: accountmanager.cpp:183
 msgid ""
 "Account %1 has no mailbox defined:\n"
 "mail checking aborted;\n"
@@ -675,24 +678,24 @@ msgstr ""
 "Rigardo je nova poŝto ĉesigita.\n"
 "Kontrolu vian kontagordon."
 
-#: accountmanager.cpp:196
+#: accountmanager.cpp:226
 msgid "Checking account %1 for new mail"
 msgstr "Rigardi konton %1 je nova poŝto."
 
-#: accountmanager.cpp:214 accountmanager.cpp:217 accountwizard.cpp:441
+#: accountmanager.cpp:244 accountmanager.cpp:247 accountwizard.cpp:441
 #: accountwizard.cpp:477
 msgid "Local Account"
 msgstr "Loka konto"
 
-#: accountmanager.cpp:220
+#: accountmanager.cpp:250
 msgid "POP Account"
 msgstr "POPa konto"
 
-#: accountmanager.cpp:223 accountmanager.cpp:225
+#: accountmanager.cpp:253 accountmanager.cpp:255
 msgid "IMAP Account"
 msgstr "IMAP-konto"
 
-#: accountmanager.cpp:308
+#: accountmanager.cpp:343
 msgid ""
 "You need to add an account in the network section of the settings in order to "
 "receive mail."
@@ -799,13 +802,13 @@ msgstr ""
 msgid "Server Information"
 msgstr "Informoj pri Servilo"
 
-#. 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 "Neniu"
 
-#: accountwizard.cpp:384 configuredialog.cpp:792
+#: accountwizard.cpp:384 configuredialog.cpp:794
 msgid "Sendmail"
 msgstr "per Sendmail"
 
@@ -813,13 +816,13 @@ msgstr "per Sendmail"
 msgid "Check for supported security capabilities of %1..."
 msgstr ""
 
-#: actionscheduler.cpp:598 kmfiltermgr.cpp:152 kmfiltermgr.cpp:255
-#: kmfiltermgr.cpp:293
+#: actionscheduler.cpp:598 kmfiltermgr.cpp:150 kmfiltermgr.cpp:253
+#: kmfiltermgr.cpp:291
 msgid "<b>Evaluating filter rules:</b> "
 msgstr "<b>Kalkulante filtroregulojn:</b> "
 
-#: actionscheduler.cpp:605 kmfiltermgr.cpp:159 kmfiltermgr.cpp:262
-#: kmfiltermgr.cpp:299
+#: actionscheduler.cpp:605 kmfiltermgr.cpp:157 kmfiltermgr.cpp:260
+#: kmfiltermgr.cpp:297
 msgid "<b>Filter rules have matched.</b>"
 msgstr "<b>Filtroreguloj konvenis.</b>"
 
@@ -828,114 +831,114 @@ msgstr "<b>Filtroreguloj konvenis.</b>"
 msgid "<b>Applying filter action:</b> %1"
 msgstr "<b>Aplikante filtroagon:</b> %1"
 
-#: antispamwizard.cpp:101
+#: antispamwizard.cpp:100
 msgid "Anti-Spam Wizard"
 msgstr "Kontraŭdisafiŝada helpilo"
 
-#: antispamwizard.cpp:102
+#: antispamwizard.cpp:101
 msgid "Anti-Virus Wizard"
 msgstr "Kontraŭvirusa helpilo"
 
-#: antispamwizard.cpp:106
+#: antispamwizard.cpp:105
 msgid "Welcome to the KMail Anti-Spam Wizard"
 msgstr "Bonvenon al la kontraŭdisafiŝada helpilo de KMail."
 
-#: antispamwizard.cpp:107
+#: antispamwizard.cpp:106
 msgid "Welcome to the KMail Anti-Virus Wizard"
 msgstr "Bonvenon al la kontraŭvirusa helpilo deKMailo."
 
-#: antispamwizard.cpp:113
+#: antispamwizard.cpp:112
 msgid "Options to fine-tune the handling of spam messages"
 msgstr ""
 
-#: antispamwizard.cpp:119
+#: antispamwizard.cpp:118
 msgid "Options to fine-tune the handling of virus messages"
 msgstr ""
 
-#: antispamwizard.cpp:131
+#: antispamwizard.cpp:130
 msgid "Summary of changes to be made by this wizard"
 msgstr ""
 
-#: antispamwizard.cpp:200
+#: antispamwizard.cpp:199
 msgid "Virus handling"
 msgstr "Virusa agmaniero"
 
-#: antispamwizard.cpp:284 antispamwizard.cpp:286 antispamwizard.cpp:572
+#: antispamwizard.cpp:283 antispamwizard.cpp:285 antispamwizard.cpp:577
 msgid "Spam handling"
 msgstr "Desafiŝada agmaniero"
 
-#: antispamwizard.cpp:325 antispamwizard.cpp:327 antispamwizard.cpp:585
+#: antispamwizard.cpp:324 antispamwizard.cpp:326 antispamwizard.cpp:590
 msgid "Semi spam (unsure) handling"
 msgstr "Desafiŝada (necerta) agmaniero"
 
-#: antispamwizard.cpp:387 antispamwizard.cpp:389 antispamwizard.cpp:593
+#: antispamwizard.cpp:386 antispamwizard.cpp:388 antispamwizard.cpp:598
 msgid "Classify as spam"
 msgstr "Klasifiki kiel disafiŝado"
 
-#: antispamwizard.cpp:419 antispamwizard.cpp:421 antispamwizard.cpp:595
+#: antispamwizard.cpp:418 antispamwizard.cpp:420 antispamwizard.cpp:600
 msgid "Classify as NOT spam"
 msgstr "Klasifiki kiel nedisafiŝado"
 
-#: antispamwizard.cpp:493
+#: antispamwizard.cpp:498
 msgid "Scanning for %1..."
 msgstr "Trarigardante pri %1..."
 
-#: antispamwizard.cpp:524
+#: antispamwizard.cpp:529
 msgid "Scanning for anti-spam tools finished."
 msgstr "Trarigardo por kontraŭdisafiŝadiloj finiĝis."
 
-#: antispamwizard.cpp:525
+#: antispamwizard.cpp:530
 msgid "Scanning for anti-virus tools finished."
 msgstr "Trarigardo por kontraŭvirusiloj finiĝis."
 
-#: antispamwizard.cpp:528
+#: antispamwizard.cpp:533
 msgid ""
 "<p>No spam detection tools have been found. Install your spam detection "
 "software and re-run this wizard.</p>"
 msgstr ""
 
-#: antispamwizard.cpp:531
+#: antispamwizard.cpp:536
 msgid "Scanning complete. No anti-virus tools found."
 msgstr "Trarigardo finiĝis. Neniu kontraŭvirusilo trovita."
 
-#: antispamwizard.cpp:555
+#: antispamwizard.cpp:560
 msgid "<p>Messages classified as spam are marked as read."
 msgstr ""
 "Mesaĝoj kiuj estas klasifikitaj kiel disafiŝadaj estas markitaj kiel legitaj."
 
-#: antispamwizard.cpp:557
+#: antispamwizard.cpp:562
 msgid "<p>Messages classified as spam are not marked as read."
 msgstr ""
 "Mesaĝoj kiuj estas klasifikitaj kiel disafiŝadaj ne estas markitaj kiel "
 "legitaj."
 
-#: antispamwizard.cpp:560
+#: antispamwizard.cpp:565
 msgid "<br>Spam messages are moved into the folder named <i>"
 msgstr ""
 
-#: antispamwizard.cpp:563
+#: antispamwizard.cpp:568
 msgid "<br>Spam messages are not moved into a certain folder.</p>"
 msgstr ""
 
-#: antispamwizard.cpp:587
+#: antispamwizard.cpp:592
 msgid "<p>The folder for messages classified as unsure (probably spam) is <i>"
 msgstr ""
 
-#: antispamwizard.cpp:600
+#: antispamwizard.cpp:605
 msgid "<p>The wizard will create the following filters:<ul>"
 msgstr ""
 
-#: antispamwizard.cpp:603
+#: antispamwizard.cpp:608
 msgid "<p>The wizard will replace the following filters:<ul>"
 msgstr ""
 
-#: antispamwizard.cpp:860
+#: antispamwizard.cpp:864
 msgid ""
 "The wizard will search for any tools to do spam detection\n"
 "and setup KMail to work with them."
 msgstr ""
 
-#: antispamwizard.cpp:864
+#: antispamwizard.cpp:868
 #, fuzzy
 msgid ""
 "<p>Here you can get some assistance in setting up KMail's filter rules to use "
@@ -960,35 +963,35 @@ msgstr ""
 "iom tempon. Estas eble forigi la regolujn, por ke vi haviĝu la antaŭan "
 "konduton.</p>"
 
-#: antispamwizard.cpp:915
+#: antispamwizard.cpp:919
 msgid ""
 "<p>Please select the tools to be used for the detection and go to the next "
 "page.</p>"
 msgstr ""
 
-#: antispamwizard.cpp:941
+#: antispamwizard.cpp:945
 msgid "&Mark detected spam messages as read"
 msgstr "&Marki disafiŝadajn mesaĝojn kiel legitaj"
 
-#: antispamwizard.cpp:943
+#: antispamwizard.cpp:947
 msgid "Mark messages which have been classified as spam as read."
 msgstr "Marki mesaĝojn kiuj estas klasifikitaj kiel disafiŝadaj legitaj."
 
-#: antispamwizard.cpp:946
+#: antispamwizard.cpp:950
 msgid "Move &known spam to:"
 msgstr "Movi &konatan disafiŝadon al:"
 
-#: antispamwizard.cpp:948
+#: antispamwizard.cpp:952
 msgid ""
 "The default folder for spam messages is the trash folder, but you may change "
 "that in the folder view below."
 msgstr ""
 
-#: antispamwizard.cpp:962
+#: antispamwizard.cpp:966
 msgid "Move &probable spam to:"
 msgstr "Movi &probablan disafiŝadon al:"
 
-#: antispamwizard.cpp:964
+#: antispamwizard.cpp:968
 msgid ""
 "The default folder is the inbox folder, but you may change that in the folder "
 "view below."
@@ -996,11 +999,11 @@ msgid ""
 "capable tool, you can't select a folder as well."
 msgstr ""
 
-#: antispamwizard.cpp:1064
+#: antispamwizard.cpp:1068
 msgid "Check messages using the anti-virus tools"
 msgstr "Klasifiki mesaĝojn per kontraŭvirusiloj"
 
-#: antispamwizard.cpp:1066
+#: antispamwizard.cpp:1070
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
@@ -1011,11 +1014,11 @@ msgstr ""
 "filtrojn. La mesaĝoj normale estas markitaj de la iloj tiel, ke la sekvantaj "
 "filtroj povas reagi al tio kaj ekzemple movi la fimesaĝon al speciala leterujo."
 
-#: antispamwizard.cpp:1072
+#: antispamwizard.cpp:1076
 msgid "Move detected viral messages to the selected folder"
 msgstr "Movi ekkonitan virusmesaĝon al la elektita leterujo"
 
-#: antispamwizard.cpp:1074
+#: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
 "messages into a predefined folder is created. The default folder is the trash "
@@ -1025,11 +1028,11 @@ msgstr ""
 "movi tiujn mesaĝojn al difinita leterujo. La norma leterujo estas la rubujo, "
 "sed vi povas ŝanĝi tiun en la leteruja rigardo."
 
-#: antispamwizard.cpp:1080
+#: antispamwizard.cpp:1084
 msgid "Additionally, mark detected viral messages as read"
 msgstr "Aldone marki ekkonitan fimesaĝon kiel legitan"
 
-#: antispamwizard.cpp:1083
+#: antispamwizard.cpp:1087
 msgid ""
 "Mark messages which have been classified as virus-infected as read, as well as "
 "moving them to the selected folder."
@@ -1037,7 +1040,163 @@ msgstr ""
 "Kaj marku mesaĝojn, kiuj estas klasifikitaj kiel virusaj, legitaj kaj movu ilin "
 "al la elektita leterujo."
 
-#: 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 "Alglui leterujon"
+
+#: archivefolderdialog.cpp:70 importarchivedialog.cpp:54
+#, fuzzy
+msgid "&Folder:"
+msgstr "&Leterujoj"
+
+#: archivefolderdialog.cpp:80
+#, fuzzy
+msgid "F&ormat:"
+msgstr "N&ormala:"
+
+#: 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 "Kunsendi dosieron"
+
+#: archivefolderdialog.cpp:111
+#, fuzzy
+msgid "&Delete folders after completion"
+msgstr "Forigante leterujojn de la servilo"
+
+#: archivefolderdialog.cpp:161
+#, fuzzy
+msgid "Please select the folder that should be archived."
+msgstr "Elekti la publikan ŝlosilon kunsendendan."
+
+#: archivefolderdialog.cpp:162
+#, fuzzy
+msgid "No folder selected"
+msgstr "Neniu leterujo elektita"
+
+#: 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 "Ne eblis krei dosierujon"
+
+#: backupjob.cpp:153
+#, fuzzy
+msgid "Archiving failed."
+msgstr "Transsendo fiaskis."
+
+#: 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 mesaĝo priserĉita\n"
+"%n mesaĝoj priserĉitaj"
+
+#: 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 "Ne eblas aldoni mesaĝon al leterujo: "
+
+#: backupjob.cpp:251
+#, fuzzy
+msgid "Internal error while trying to retrieve a message from folder '%1'."
+msgstr "Eraro dum provo de nomŝanĝo de la leterujo %1"
+
+#: backupjob.cpp:321
+#, fuzzy
+msgid "Failed to write a message into the archive folder '%1'."
+msgstr "Movi ekkonitan virusmesaĝon al la elektita leterujo"
+
+#: backupjob.cpp:360
+#, fuzzy
+msgid "Downloading a message in folder '%1' failed."
+msgstr "Forigo de malnovaj mesaĝoj de leterujo %1 fiaskis."
+
+#: backupjob.cpp:362
+#, fuzzy
+msgid "Downloading a message in the current folder failed."
+msgstr "Faldi ĉiujn fadenojn en la nuna leterujo"
+
+#: backupjob.cpp:391
+#, fuzzy, c-format
+msgid "Archiving folder %1"
+msgstr "Reprenante leterujojn"
+
+#: backupjob.cpp:393 importjob.cpp:210
+#, fuzzy
+msgid "Unable to open folder '%1'."
+msgstr "Nekonata leterujo '%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 "Ne eblas kontroli: Ŝlosilo mankas."
+
+#: backupjob.cpp:489
+#, fuzzy
+msgid "Archiving"
+msgstr "&Ricevado"
+
+#: cachedimapjob.cpp:220 cachedimapjob.cpp:271 cachedimapjob.cpp:886
 msgid "Error while deleting messages on the server: "
 msgstr "Eraro dum forigo de mesaĝoj en la servilo: "
 
@@ -1045,15 +1204,15 @@ msgstr "Eraro dum forigo de mesaĝoj en la servilo: "
 msgid "Error while retrieving message on the server: "
 msgstr "Eraro dum retrovo de mesaĝoj en la servilo: "
 
-#: cachedimapjob.cpp:538
+#: cachedimapjob.cpp:541
 msgid "Error while uploading folder"
 msgstr "Eraro dum alŝuto de leterujo"
 
-#: cachedimapjob.cpp:539
+#: cachedimapjob.cpp:542
 msgid "Could not make the folder <b>%1</b> on the server."
 msgstr "Ne eblas krei leterujon <b>%1</b> en la servilo."
 
-#: cachedimapjob.cpp:540
+#: cachedimapjob.cpp:543
 msgid ""
 "This could be because you do not have permission to do this, or because the "
 "folder is already present on the server; the error message from the server "
@@ -1062,28 +1221,78 @@ msgstr ""
 "Tio estas ebla, ĉar vi ne havas la rajton por fari ĝin, aŭ ĉar la leterujo jam "
 "ekzistas en la servilo. La erarmesaĝon de la komunikado estas ĉi tie:"
 
-#: cachedimapjob.cpp:626
+#: cachedimapjob.cpp:629
 msgid "Error while deleting folder %1 on the server: "
 msgstr "Eraro dum forigo de la leterujo %1 en la servilo: "
 
-#: cachedimapjob.cpp:679
+#: cachedimapjob.cpp:682
 msgid "Error while reading folder %1 on the server: "
 msgstr "Eraro dum legado de la leterujo %1: "
 
-#: cachedimapjob.cpp:794
+#: cachedimapjob.cpp:811
+msgid ""
+"Error while trying to subscribe to the renamed folder %1.\n"
+"Renaming itself was successful, but the renamed folder might disappear from the "
+"folder list after the next sync since it is unsubscribed on the server.\n"
+"You can try to manually subscribe to the folder yourself.\n"
+"\n"
+"%2"
+msgstr ""
+
+#: cachedimapjob.cpp:857
 #, c-format
 msgid "Error while trying to rename folder %1"
 msgstr "Eraro dum provo de nomŝanĝo de la leterujo %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 "Meti transportomanieron al"
+
+#: callback.cpp:97
+#, fuzzy, c-format
+msgid "Declined: %1"
+msgstr " Linio: %1 "
+
+#: callback.cpp:99
+#, c-format
+msgid "Tentative: %1"
+msgstr ""
+
+#: callback.cpp:101
+#, fuzzy, c-format
+msgid "Accepted: %1"
+msgstr "Kunsendaĵo: %1"
+
+#: callback.cpp:103
+#, fuzzy, c-format
+msgid "Delegated: %1"
+msgstr "Forigita"
+
+#: 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>Neniu de viaj identecoj korespondas al la mesaĝadresato. "
 "<br>Elektu vian adreson el la sekvantaj:"
 
-#: callback.cpp:176
+#: callback.cpp:222
 msgid ""
 "<qt>Several of your identities match the receiver of this message,"
 "<br>please choose which of the following addresses is yours:"
@@ -1091,7 +1300,7 @@ msgstr ""
 "<qt>Iuj el viaj identecoj korespondas al la mesaĝadresato. "
 "<br>Elektu vian adreson el la sekvantaj:"
 
-#: callback.cpp:183
+#: callback.cpp:233
 msgid "Select Address"
 msgstr "Elekti retpoŝtan adreson"
 
@@ -1116,7 +1325,7 @@ msgstr "Leterujo \"%1\" sukcese densigita"
 msgid "Error occurred while compacting \"%1\". Compaction aborted."
 msgstr "Eraro dum densigo de \"%1\". Densigo ĉesigita."
 
-#: configuredialog.cpp:155
+#: configuredialog.cpp:156
 msgid ""
 "<qt>"
 "<p>This setting has been fixed by your administrator.</p>"
@@ -1126,146 +1335,146 @@ msgstr ""
 "<p>Tiu agordo estas fiksita de via administristo.</p> "
 "<p>Se vi pensas, ke ĉi tiu estas eraro, kontaktu lin.</p></qt>"
 
-#: configuredialog.cpp:217
+#: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "Ŝ&arĝi profilon..."
 
-#: configuredialog.cpp:305 simplestringlisteditor.cpp:85
+#: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "&Aldoni..."
 
-#: 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 "Ŝ&anĝi..."
 
-#: configuredialog.cpp:307
+#: configuredialog.cpp:310
 msgid "&Rename"
 msgstr "&Alinomi"
 
-#: configuredialog.cpp:308 configuredialog.cpp:3115 configuredialog.cpp:3164
+#: configuredialog.cpp:311 configuredialog.cpp:3228 configuredialog.cpp:3277
 msgid "Remo&ve"
 msgstr "&Forigi"
 
-#: configuredialog.cpp:309
+#: configuredialog.cpp:312
 msgid "Set as &Default"
 msgstr "Uzi kiel &apriora"
 
-#: configuredialog.cpp:450
+#: configuredialog.cpp:453
 msgid "<qt>Do you really want to remove the identity named <b>%1</b>?</qt>"
 msgstr "<qt>Ĉu vi vere volas forigi la identecon nomitan <b>%1</b>?</qt>"
 
-#: configuredialog.cpp:452
+#: configuredialog.cpp:455
 msgid "Remove Identity"
 msgstr "Forigi identecon"
 
-#: configuredialog.cpp:493 configuredialog.cpp:3114
+#: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "Aldoni..."
 
-#: configuredialog.cpp:495 configuredialog.cpp:3116
+#: configuredialog.cpp:498 configuredialog.cpp:3229
 msgid "Modify..."
 msgstr "Ŝanĝi..."
 
-#: configuredialog.cpp:499
+#: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "Uzi kiel apriora"
 
-#: configuredialog.cpp:562
+#: configuredialog.cpp:565
 msgid "&Receiving"
 msgstr "&Ricevado"
 
-#: configuredialog.cpp:570
+#: configuredialog.cpp:573
 msgid "&Sending"
 msgstr "&Sendado"
 
-#: configuredialog.cpp:595
+#: configuredialog.cpp:598
 msgid "Outgoing accounts (add at least one):"
 msgstr "Elirantaj Kontoj (aldonu almenaŭ unu):"
 
-#. 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 "Nomo"
 
-#. 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 "Tipo"
 
-#: configuredialog.cpp:618 configuredialog.cpp:1089 configuredialog.cpp:2836
-#: configuredialog.cpp:3087 configuredialog.cpp:3164 configuredialog.cpp:3498
+#: configuredialog.cpp:621 configuredialog.cpp:1095 configuredialog.cpp:2949
+#: configuredialog.cpp:3200 configuredialog.cpp:3277 configuredialog.cpp:3611
 msgid "A&dd..."
 msgstr "&Aldoni..."
 
-#: configuredialog.cpp:633 configuredialog.cpp:1104
+#: configuredialog.cpp:636 configuredialog.cpp:1110
 msgid "R&emove"
 msgstr "&Forigi"
 
-#: configuredialog.cpp:640
+#: configuredialog.cpp:643
 msgid "Set Default"
 msgstr "Uzi kiel apriora"
 
-#: configuredialog.cpp:650
+#: configuredialog.cpp:653
 msgid "Common Options"
 msgstr "Ĝeneralaj opcioj"
 
-#. i18n: file kmail.kcfg line 382
-#: configuredialog.cpp:658 rc.cpp:788
+#. i18n: file kmail.kcfg line 412
+#: configuredialog.cpp:661 rc.cpp:813
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "&Konfirmi antaŭ sendo"
 
-#: configuredialog.cpp:666
+#: configuredialog.cpp:669
 msgid "Never Automatically"
 msgstr "Neniam aŭtomate"
 
-#: configuredialog.cpp:667
+#: configuredialog.cpp:670
 msgid "On Manual Mail Checks"
 msgstr "Ĉe manaj retleterkontroladoj"
 
-#: configuredialog.cpp:668
+#: configuredialog.cpp:671
 msgid "On All Mail Checks"
 msgstr "Ĉe ĉiuj retleterkontroladoj"
 
-#: configuredialog.cpp:676
+#: configuredialog.cpp:679
 msgid "Send Now"
 msgstr "Sendi tuj"
 
-#: configuredialog.cpp:677
+#: configuredialog.cpp:680
 msgid "Send Later"
 msgstr "Sendi poste"
 
-#: configuredialog.cpp:687
+#: configuredialog.cpp:690
 msgid "Allow 8-bit"
 msgstr "8bitaj signoj"
 
-#: configuredialog.cpp:688
+#: configuredialog.cpp:691
 msgid "MIME Compliant (Quoted Printable)"
 msgstr "MIME-kongrua (\"quoted printable\")"
 
-#: configuredialog.cpp:701
+#: configuredialog.cpp:704
 msgid "Send &messages in outbox folder:"
 msgstr "&Sendi mesaĝojn en elira leterujo:"
 
-#: configuredialog.cpp:709
+#: configuredialog.cpp:712
 msgid "Defa&ult send method:"
 msgstr "&Apriora sendmetodo:"
 
-#: configuredialog.cpp:711
+#: configuredialog.cpp:714
 msgid "Message &property:"
 msgstr "&Eco de mesaĝo:"
 
-#: configuredialog.cpp:713
+#: configuredialog.cpp:716
 msgid "Defaul&t domain:"
 msgstr "Nor&ma domajno:"
 
-#: configuredialog.cpp:717
+#: configuredialog.cpp:720
 msgid ""
 "<qt>"
 "<p>The default domain is used to complete email addresses that only consist of "
@@ -1275,25 +1484,25 @@ msgstr ""
 "<p>La apriora domajno estas uzata por kompletigi la retpoŝtadresojn, kiuj nur "
 "konsistas de uzantulaj nomoj.</p></qt>"
 
-#: configuredialog.cpp:741
+#: configuredialog.cpp:744
 msgid ""
 "_: %1: name; %2: number appended to it to make it unique among a list of names\n"
 "%1 %2"
 msgstr "%1 %2"
 
-#: configuredialog.cpp:766 configuredialog.cpp:943 configuredialog.cpp:991
+#: configuredialog.cpp:769 configuredialog.cpp:950 configuredialog.cpp:997
 msgid "smtp (Default)"
 msgstr "smtp (Apriora)"
 
-#: configuredialog.cpp:768 configuredialog.cpp:945 configuredialog.cpp:993
+#: configuredialog.cpp:771 configuredialog.cpp:952 configuredialog.cpp:999
 msgid "sendmail (Default)"
 msgstr "sendmail (Apriora)"
 
-#: configuredialog.cpp:799 kmtransport.cpp:248
+#: configuredialog.cpp:801 kmtransport.cpp:248
 msgid "Add Transport"
 msgstr "Aldoni transporton"
 
-#: configuredialog.cpp:830
+#: configuredialog.cpp:832
 msgid ""
 "_: %1: type of transport. Result used in Configure->Accounts->"
 "Sending listview, \"type\" column, first row, to indicate that this is the "
@@ -1301,387 +1510,378 @@ msgid ""
 "%1 (Default)"
 msgstr "%1 (Apriora)"
 
-#: configuredialog.cpp:854
+#: configuredialog.cpp:856
 msgid "Modify Transport"
 msgstr "Ŝanĝi transporton"
 
-#: configuredialog.cpp:890
+#: configuredialog.cpp:892
 #, c-format
 msgid ""
 "_n: This identity has been changed to use the modified transport:\n"
 "These %n identities have been changed to use the modified transport:"
 msgstr ""
 
-#: configuredialog.cpp:921
+#: configuredialog.cpp:927
 #, c-format
 msgid ""
 "_n: This identity has been changed to use the default transport:\n"
 "These %n identities have been changed to use the default transport:"
 msgstr ""
 
-#: configuredialog.cpp:1066
+#: configuredialog.cpp:1072
 msgid "Incoming accounts (add at least one):"
 msgstr "Enirantaj Kontoj (aldonu almenaŭ unu):"
 
-#: 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 "Leterujo"
 
-#: configuredialog.cpp:1112
+#: configuredialog.cpp:1118
 msgid "Chec&k mail on startup"
 msgstr "&Rigardi je nova poŝto dum lanĉo"
 
-#: configuredialog.cpp:1118
+#: configuredialog.cpp:1124
 msgid "New Mail Notification"
 msgstr "Nova Poŝtsciigo"
 
-#: configuredialog.cpp:1123
+#: configuredialog.cpp:1129
 msgid "&Beep"
 msgstr "&Pepi"
 
-#: configuredialog.cpp:1131
+#: configuredialog.cpp:1137
 msgid "Deta&iled new mail notification"
 msgstr "Detale nova poŝtsc&iigo"
 
-#: configuredialog.cpp:1135
+#: configuredialog.cpp:1141
 msgid "Show for each folder the number of newly arrived messages"
 msgstr "Montri pri ĉiu leterujo la nombron de la novaj mesaĝoj"
 
-#: configuredialog.cpp:1143
+#: configuredialog.cpp:1149
 msgid "Other Actio&ns"
 msgstr "Aliaj &agoj"
 
-#: configuredialog.cpp:1221
+#: configuredialog.cpp:1227
 msgid "Unknown account type selected"
 msgstr "Vi elektis nekonata kontotipon"
 
-#: configuredialog.cpp:1230
+#: configuredialog.cpp:1236
 msgid "Unable to create account"
 msgstr "Ne eblis krei konton"
 
-#: configuredialog.cpp:1236 kmacctseldlg.cpp:36
+#: configuredialog.cpp:1242 kmacctseldlg.cpp:36
 msgid "Add Account"
 msgstr "Aldoni konton"
 
-#: configuredialog.cpp:1288
+#: configuredialog.cpp:1294
 msgid "Unable to locate account"
 msgstr "Ne eblis trovi la kontosituon"
 
-#: configuredialog.cpp:1315
+#: configuredialog.cpp:1321
 msgid "Modify Account"
 msgstr "Ŝanĝi konton"
 
-#: configuredialog.cpp:1360 configuredialog.cpp:1440
+#: configuredialog.cpp:1366 configuredialog.cpp:1446
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt>Ne eblis trovi la konton <b>%1</b>.</qt>"
 
-#: configuredialog.cpp:1491
+#: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "&Koloroj"
 
-#: configuredialog.cpp:1497
+#: configuredialog.cpp:1503
 msgid "La&yout"
 msgstr "&Aranĝo"
 
-#: configuredialog.cpp:1503
+#: configuredialog.cpp:1509
 msgid "M&essage List"
 msgstr "M&esaĝolisto"
 
-#: configuredialog.cpp:1509
+#: configuredialog.cpp:1515
 msgid "Message W&indow"
 msgstr "Mesaĝofenestro"
 
-#: configuredialog.cpp:1515
+#: configuredialog.cpp:1521
 msgid "System &Tray"
 msgstr "&Sistemlistelo"
 
-#: configuredialog.cpp:1531
+#: configuredialog.cpp:1537
 msgid "Message Body"
 msgstr "Mesaĝokorpo"
 
-#: configuredialog.cpp:1532
+#: configuredialog.cpp:1538
 msgid "Message List"
 msgstr "Mesaĝolisto"
 
-#: configuredialog.cpp:1533
+#: configuredialog.cpp:1539
 msgid "Message List - New Messages"
 msgstr "Mesaĝolisto - Novaj Mesaĝoj"
 
-#: configuredialog.cpp:1534
+#: configuredialog.cpp:1540
 msgid "Message List - Unread Messages"
 msgstr "Mesaĝolisto - Nelegitaj Mesaĝoj"
 
-#: configuredialog.cpp:1535
+#: configuredialog.cpp:1541
 msgid "Message List - Important Messages"
 msgstr "Mesaĝolisto - Gravaj Mesaĝoj"
 
-#: configuredialog.cpp:1536
+#: configuredialog.cpp:1542
 msgid "Message List - Todo Messages"
 msgstr "Mesaĝolisto - Farendaj Mesaĝoj"
 
-#: configuredialog.cpp:1537
+#: configuredialog.cpp:1543
 msgid "Message List - Date Field"
 msgstr "Mesaĝolisto - Dato"
 
-#: configuredialog.cpp:1538 configuredialog.cpp:1859
+#: configuredialog.cpp:1544 configuredialog.cpp:1868
 msgid "Folder List"
 msgstr "Leterujolisto"
 
-#: configuredialog.cpp:1539 configuredialog.cpp:1702
+#: configuredialog.cpp:1545 configuredialog.cpp:1708
 msgid "Quoted Text - First Level"
 msgstr "Citita teksto - unua nivelo"
 
-#: configuredialog.cpp:1540 configuredialog.cpp:1703
+#: configuredialog.cpp:1546 configuredialog.cpp:1709
 msgid "Quoted Text - Second Level"
 msgstr "Citita teksto - dua nivelo"
 
-#: configuredialog.cpp:1541 configuredialog.cpp:1704
+#: configuredialog.cpp:1547 configuredialog.cpp:1710
 msgid "Quoted Text - Third Level"
 msgstr "Citita teksto - tria nivelo"
 
-#: configuredialog.cpp:1542
+#: configuredialog.cpp:1548
 msgid "Fixed Width Font"
 msgstr "Egallarĝa tiparo"
 
-#: configuredialog.cpp:1543 kmcomposewin.cpp:356
+#: configuredialog.cpp:1549 kmcomposewin.cpp:386
 msgid "Composer"
 msgstr "Mesaĝredaktilo"
 
-#: configuredialog.cpp:1544
+#: configuredialog.cpp:1550
 msgid "Printing Output"
 msgstr "Elpresaĵo"
 
-#: configuredialog.cpp:1559
+#: configuredialog.cpp:1565
 msgid "&Use custom fonts"
 msgstr "Uzi &proprajn tiparojn"
 
-#: configuredialog.cpp:1575
+#: configuredialog.cpp:1581
 msgid "Apply &to:"
 msgstr "Apliki &al:"
 
-#: configuredialog.cpp:1699
+#: configuredialog.cpp:1705
 msgid "Composer Background"
 msgstr "Redaktilofono"
 
-#: configuredialog.cpp:1700
+#: configuredialog.cpp:1706
 msgid "Alternative Background Color"
 msgstr "Alia fonkoloro"
 
-#: configuredialog.cpp:1701
+#: configuredialog.cpp:1707
 msgid "Normal Text"
 msgstr "Normala teksto"
 
-#: configuredialog.cpp:1705
+#: configuredialog.cpp:1711
 msgid "Link"
 msgstr "Ligo"
 
-#: configuredialog.cpp:1706
+#: configuredialog.cpp:1712
 msgid "Followed Link"
 msgstr "Vizitita URL-ligo"
 
-#: configuredialog.cpp:1707
+#: configuredialog.cpp:1713
 msgid "Misspelled Words"
 msgstr "Malkorekte skribataj vortoj"
 
 #. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1708 rc.cpp:444
+#: configuredialog.cpp:1714 rc.cpp:450
 #, no-c-format
 msgid "New Message"
 msgstr "Nova mesaĝo"
 
-#: configuredialog.cpp:1709
+#: configuredialog.cpp:1715
 msgid "Unread Message"
 msgstr "Nelegita mesaĝo"
 
-#: configuredialog.cpp:1710
+#: configuredialog.cpp:1716
 msgid "Important Message"
 msgstr "Grava mesaĝo"
 
-#: configuredialog.cpp:1711
+#: configuredialog.cpp:1717
 msgid "Todo Message"
 msgstr "Farenda Mesaĝo"
 
-#: configuredialog.cpp:1712
+#: configuredialog.cpp:1718
 msgid "OpenPGP Message - Encrypted"
 msgstr "PGP-mesaĝo - ĉifrita"
 
-#: configuredialog.cpp:1713
+#: configuredialog.cpp:1719
 msgid "OpenPGP Message - Valid Signature with Trusted Key"
 msgstr "OpenPGP-mesaĝo - valida subskribo per fidata ŝlosilo"
 
-#: configuredialog.cpp:1714
+#: configuredialog.cpp:1720
 msgid "OpenPGP Message - Valid Signature with Untrusted Key"
 msgstr "OpenPGP-mesaĝo - valida subskribo per nefidata ŝlosilo"
 
-#: configuredialog.cpp:1715
+#: configuredialog.cpp:1721
 msgid "OpenPGP Message - Unchecked Signature"
 msgstr "OpenPGP-mesaĝo - nekontrolita subskribo"
 
-#: configuredialog.cpp:1716
+#: configuredialog.cpp:1722
 msgid "OpenPGP Message - Bad Signature"
 msgstr "OpenPGP-mesaĝo - malbona subskribo"
 
-#: configuredialog.cpp:1717
+#: configuredialog.cpp:1723
 msgid "Border Around Warning Prepending HTML Messages"
 msgstr "Marĝena averto ĉirkaŭ HTML-mesaĝo"
 
-#: 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 "Fonkoloro de statolistelo - No HTML-mesaĝo"
 
-#: configuredialog.cpp:1720
+#: configuredialog.cpp:1726
 msgid "HTML Status Bar Foreground - No HTML Message"
 msgstr "Tekstkoloro de statolistelo - No HTML-mesaĝo"
 
-#: configuredialog.cpp:1721
+#: configuredialog.cpp:1727
 msgid "HTML Status Bar Background - HTML Message"
 msgstr "Fonkoloro de statolistelo - HTML-mesaĝo"
 
-#: configuredialog.cpp:1722
+#: configuredialog.cpp:1728
 msgid "HTML Status Bar Foreground - HTML Message"
 msgstr "Tekstkoloro de statolistelo - HTML-mesaĝo"
 
-#: configuredialog.cpp:1734
+#: configuredialog.cpp:1740
 msgid "&Use custom colors"
 msgstr "Uzi &proprajn kolorojn"
 
-#: configuredialog.cpp:1749
+#: configuredialog.cpp:1755
 msgid "Recycle colors on deep &quoting"
 msgstr "&Recikligi kolorojn ĉe profunda citado"
 
-#: 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
 msgid "Lon&g folder list"
 msgstr "Lon&ga leterujolisto"
 
-#: configuredialog.cpp:1856
+#: configuredialog.cpp:1865
 msgid "Shor&t folder list"
 msgstr "Mall&onga leterujolisto"
 
-#: configuredialog.cpp:1865
+#: configuredialog.cpp:1874
 msgid "Abo&ve the message pane"
 msgstr "Supe&r la mesaĝfenestro"
 
-#: configuredialog.cpp:1866
+#: configuredialog.cpp:1875
 msgid "&Below the message pane"
 msgstr "Su&b la mesaĝfenestro"
 
-#: configuredialog.cpp:1869
+#: configuredialog.cpp:1878
 msgid "Message Structure Viewer Placement"
 msgstr "Mesaĝstrukturvidigila loko"
 
-#: configuredialog.cpp:1874
+#: configuredialog.cpp:1883
 msgid "Show &never"
 msgstr "Montri &neniam"
 
-#: configuredialog.cpp:1875
+#: configuredialog.cpp:1884
 msgid "Show only for non-plaintext &messages"
 msgstr "Nurmontro ĉe nenurtektaj &mesaĝoj"
 
-#: configuredialog.cpp:1876
+#: configuredialog.cpp:1885
 msgid "Show alway&s"
 msgstr "Montri ĉi&am"
 
-#: configuredialog.cpp:1879
+#: configuredialog.cpp:1888
 msgid "Message Structure Viewer"
 msgstr "Mesaĝstrukturvidigilo"
 
-#: configuredialog.cpp:1885
+#: configuredialog.cpp:1894
 msgid "&Do not show a message preview pane"
 msgstr "N&e montri mesaĝan antaŭrigardofenestron"
 
-#: configuredialog.cpp:1886
+#: configuredialog.cpp:1895
 msgid "Show the message preview pane belo&w the message list"
 msgstr "Montri mesaĝan antaŭrigardofenestron su&b la mesaĝolisto"
 
-#: configuredialog.cpp:1887
+#: configuredialog.cpp:1896
 msgid "Show the message preview pane ne&xt to the message list"
 msgstr "Montri mesaĝan antaŭrigardofenestron apu&d la mesaĝolisto"
 
-#: configuredialog.cpp:1890
+#: configuredialog.cpp:1899
 msgid "Message Preview Pane"
 msgstr "Mesaĝan antaŭrigardofenestron"
 
-#: configuredialog.cpp:1908
+#: configuredialog.cpp:1917
 #, fuzzy
 msgid "Show favorite folder view"
 msgstr "Mall&onga leterujolisto"
 
-#: configuredialog.cpp:1912
-#, fuzzy
-msgid "Show folder quick search field"
-msgstr "Montri rapidserĉan liniredaktilon"
-
-#: configuredialog.cpp:1983
+#: configuredialog.cpp:1986
 msgid "Sta&ndard format (%1)"
 msgstr "&Normala formato (%1)"
 
-#: configuredialog.cpp:1984
+#: configuredialog.cpp:1987
 msgid "Locali&zed format (%1)"
 msgstr "Formato laŭ &lokaĵo (%1)"
 
-#: configuredialog.cpp:1985
+#: configuredialog.cpp:1988
 msgid "Fancy for&mat (%1)"
 msgstr "&Bela formato (%1)"
 
-#: configuredialog.cpp:1986
+#: configuredialog.cpp:1989
 msgid "C&ustom format (Shift+F1 for help):"
 msgstr "&Propra formato (Majuskl+F1 por helpo)"
 
-#: configuredialog.cpp:2003
+#: configuredialog.cpp:2006
 msgid "General Options"
 msgstr "Ĝeneralaj opcioj"
 
-#: configuredialog.cpp:2006
-msgid "Show Quick Search"
-msgstr "Montri rapidserĉon"
-
-#: configuredialog.cpp:2008
+#: configuredialog.cpp:2009
 msgid "Display messa&ge sizes"
 msgstr "&Montri mesaĝgrandecojn"
 
-#: configuredialog.cpp:2010
+#: configuredialog.cpp:2011
 msgid "Show crypto &icons"
 msgstr "Montri ĉ&ifro-piktogramojn"
 
-#: configuredialog.cpp:2012
+#: configuredialog.cpp:2013
 msgid "Show attachment icon"
 msgstr "Montri kunsendaĵan piktogramon"
 
-#: configuredialog.cpp:2015
+#: configuredialog.cpp:2016
 msgid "&Threaded message list"
 msgstr "&Fadenigita mesaĝolisto"
 
-#: configuredialog.cpp:2033
+#: configuredialog.cpp:2032
 msgid "Threaded Message List Options"
 msgstr "Opcioj pri Fadenigita Mesaĝolisto"
 
-#: configuredialog.cpp:2037
+#: configuredialog.cpp:2036
 msgid "Always &keep threads open"
 msgstr "&Fadenoj ĉiam malfermitaj"
 
-#: configuredialog.cpp:2040
+#: configuredialog.cpp:2039
 msgid "Threads default to o&pen"
 msgstr "Fadenoj apriore &malfermitaj"
 
-#: configuredialog.cpp:2043
+#: configuredialog.cpp:2042
 msgid "Threads default to closed"
 msgstr "Fadenoj apriore fermitaj"
 
-#: configuredialog.cpp:2046
+#: configuredialog.cpp:2045
 msgid ""
 "Open threads that contain ne&w, unread or important messages and open watched "
 "threads."
@@ -1689,11 +1889,11 @@ msgstr ""
 "M&alfermu fadenojn, kiuj enhavas novajn, nelegitajn aŭ gravajn mesaĝojn kaj "
 "malfermu observatajn fadenojn."
 
-#: configuredialog.cpp:2056
+#: configuredialog.cpp:2055
 msgid "Date Display"
 msgstr "Montro de la dato"
 
-#: configuredialog.cpp:2073
+#: configuredialog.cpp:2072
 msgid ""
 "<qt>"
 "<p><strong>These expressions may be used for the date:</strong></p>"
@@ -1753,115 +1953,164 @@ msgstr ""
 "<li>Z - tempozono kiel numero (-0500)</li></ul>"
 "<p><strong>Ĉiuj aliaj literoj estas sen signifo.</strong></p></qt>"
 
-#: configuredialog.cpp:2187
+#: configuredialog.cpp:2185
 msgid ""
 "Changing the global threading setting will override all folder specific values."
 msgstr ""
 "Ŝanĝo de la malloka agordo pri fadenoj anstataŭigos ĉiujn agordojn faritajn por "
 "apartaj dosierujoj."
 
-#: configuredialog.cpp:2224
+#: configuredialog.cpp:2221
+msgid "Close message window after replying or forwarding"
+msgstr ""
+
+#: configuredialog.cpp:2225
 msgid "Show HTML stat&us bar"
 msgstr "Montr&i HTML-statlistelon"
 
-#: configuredialog.cpp:2228
+#: configuredialog.cpp:2229
 msgid "Show s&pam status in fancy headers"
 msgstr "Montri disafiŝadan statuson en detalaj kaplinioj"
 
-#. i18n: file kmail.kcfg line 541
-#: configuredialog.cpp:2232 rc.cpp:856
+#. i18n: file kmail.kcfg line 583
+#: configuredialog.cpp:2233 rc.cpp:890
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr ""
 
-#: configuredialog.cpp:2236
+#: configuredialog.cpp:2237
 msgid "Use smaller font for quoted text"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 546
-#: configuredialog.cpp:2240 rc.cpp:862
+#. i18n: file kmail.kcfg line 588
+#: configuredialog.cpp:2241 rc.cpp:896
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr ""
 
-#: configuredialog.cpp:2315
+#: configuredialog.cpp:2245
+msgid "Show current sender time"
+msgstr ""
+
+#: configuredialog.cpp:2262
+msgid ""
+"Close the standalone message window after replying or forwarding the message"
+msgstr ""
+
+#: configuredialog.cpp:2328
 msgid "Fallback ch&aracter encoding:"
 msgstr "Ref&ala signokodo:"
 
-#: configuredialog.cpp:2325 configuredialog.cpp:2382 kmreaderwin.cpp:650
+#: configuredialog.cpp:2338 configuredialog.cpp:2400 kmreaderwin.cpp:584
 msgid "Auto"
 msgstr "Aŭtomate"
 
-#: configuredialog.cpp:2336
+#: configuredialog.cpp:2349
 msgid "&Override character encoding:"
 msgstr "Ŝanĝi &signokodon"
 
-#. i18n: file kmail.kcfg line 103
-#: configuredialog.cpp:2462 rc.cpp:643
+#. i18n: file kmail.kcfg line 105
+#: configuredialog.cpp:2486 rc.cpp:649
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr "Ebligi sistemlistelan piktogramon"
 
-#: configuredialog.cpp:2468
+#: configuredialog.cpp:2492
 msgid "System Tray Mode"
 msgstr "Sistemlistela maniero"
 
-#: configuredialog.cpp:2476
+#: configuredialog.cpp:2500
 msgid "Always show KMail in system tray"
 msgstr "Ĉi&am vidigi Poŝtilon en sistemlistelo"
 
-#: configuredialog.cpp:2479
+#: configuredialog.cpp:2503
 msgid "Only show KMail in system tray if there are unread messages"
 msgstr "Vidigo Poŝtilon en sistemlistelo, kiam ekzistas nelegitaj mesaĝoj"
 
-#: configuredialog.cpp:2539 identitydialog.cpp:384
+#: configuredialog.cpp:2563 identitydialog.cpp:408
 msgid "&Templates"
 msgstr "Sha&blonoj"
 
-#: configuredialog.cpp:2545
+#: configuredialog.cpp:2569
 msgid "&Custom Templates"
 msgstr "&Propraj Shablonoj"
 
-#: configuredialog.cpp:2551
+#: configuredialog.cpp:2575
 msgid "&Subject"
 msgstr "&Temo"
 
-#: configuredialog.cpp:2558
+#: configuredialog.cpp:2582
 msgid "Cha&rset"
 msgstr "&Signaro"
 
-#: configuredialog.cpp:2564
+#: configuredialog.cpp:2588
 msgid "H&eaders"
 msgstr "&Kaplinioj"
 
-#: configuredialog.cpp:2570
+#: configuredialog.cpp:2594
 msgid ""
 "_: Config->Composer->Attachments\n"
 "A&ttachments"
 msgstr "A&ldonoj"
 
-#: configuredialog.cpp:2654
+#: configuredialog.cpp:2633
+msgid ""
+"When replying, add quote signs in front of all lines of the quoted text,\n"
+"even when the line was created by adding an additional linebreak while\n"
+"word-wrapping the text."
+msgstr ""
+
+#: configuredialog.cpp:2643
+msgid ""
+"When replying, only quote the selected text instead of the complete message "
+"when there is text selected in the message window."
+msgstr ""
+
+#: configuredialog.cpp:2704
+msgid "Warn if too many recipients are specified"
+msgstr ""
+
+#: configuredialog.cpp:2716
+msgid "Warn if more than this many recipients are specified"
+msgstr ""
+
+#: configuredialog.cpp:2732
 msgid "No autosave"
 msgstr "Neniu aŭtomata konservo"
 
-#: configuredialog.cpp:2661
+#: configuredialog.cpp:2741
+#, fuzzy
+msgid "Default Forwarding Type:"
+msgstr "Nor&ma domajno:"
+
+#: configuredialog.cpp:2744
+#, fuzzy
+msgid "Inline"
+msgstr "E&ntekstigi..."
+
+#: configuredialog.cpp:2745
+#, fuzzy
+msgid "As Attachment"
+msgstr "Kun kunsendaĵo"
+
+#: configuredialog.cpp:2753
 msgid "Configure Completion Order"
 msgstr "Agordi Kompletigan Sinsekvon"
 
-#: configuredialog.cpp:2669 kmlineeditspell.cpp:136
+#: configuredialog.cpp:2761 kmlineeditspell.cpp:159
 msgid "Edit Recent Addresses..."
 msgstr "Redakti lastajn adresojn..."
 
-#: configuredialog.cpp:2676 kmedit.cpp:540
+#: configuredialog.cpp:2768 kmedit.cpp:633
 msgid "External Editor"
 msgstr "Ekstera redaktilo"
 
-#: configuredialog.cpp:2707
+#: configuredialog.cpp:2799
 #, c-format
 msgid "<b>%f</b> will be replaced with the filename to edit."
 msgstr "<b>%f</b>estos anstataŭigata de la redaktenda dosiernomo."
 
-#: configuredialog.cpp:2817
+#: configuredialog.cpp:2930
 msgid ""
 "<qt>The following placeholders are supported in the reply phrases:"
 "<br><b>%D</b>: date, <b>%S</b>: subject,"
@@ -1879,76 +2128,76 @@ msgstr ""
 "<br><b>%C</b>: kopiricevanto, <b>%c</b>: kopiricevantulaj adreso kaj nomo,"
 "<br><b>%%</b>: procentsigno, <b>%_</b>: spacsigno, <b>%L</b>: linirompo</qt>"
 
-#: configuredialog.cpp:2830
+#: configuredialog.cpp:2943
 msgid "Lang&uage:"
 msgstr "&Lingvo:"
 
-#: configuredialog.cpp:2839 configuredialog.cpp:3087 configuredialog.cpp:3303
-#: configuredialog.cpp:3498
+#: configuredialog.cpp:2952 configuredialog.cpp:3200 configuredialog.cpp:3416
+#: configuredialog.cpp:3611
 msgid "Re&move"
 msgstr "&Forigi"
 
-#: configuredialog.cpp:2853
+#: configuredialog.cpp:2966
 msgid "Reply to se&nder:"
 msgstr "&Respondo al sendinto:"
 
-#: configuredialog.cpp:2861
+#: configuredialog.cpp:2974
 msgid "Repl&y to all:"
 msgstr "Respondo al ĉ&iuj:"
 
-#: configuredialog.cpp:2869
+#: configuredialog.cpp:2982
 msgid "&Forward:"
 msgstr "&Plusendo:"
 
 #. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2877 rc.cpp:459
+#: configuredialog.cpp:2990 rc.cpp:465
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr "&Citado-prefikso:"
 
-#: configuredialog.cpp:2922 kmmessage.cpp:3960
+#: configuredialog.cpp:3035 kmmessage.cpp:4048
 msgid "On %D, you wrote:"
 msgstr "Je %D, vi skribis:"
 
-#: configuredialog.cpp:2923 kmmessage.cpp:3962
+#: configuredialog.cpp:3036 kmmessage.cpp:4050
 msgid "On %D, %F wrote:"
 msgstr "Je %D, %F skribis:"
 
-#: configuredialog.cpp:2924 kmmessage.cpp:3964
+#: configuredialog.cpp:3037 kmmessage.cpp:4052
 msgid "Forwarded Message"
 msgstr "Plusendita mesaĝo"
 
-#: configuredialog.cpp:2925
+#: configuredialog.cpp:3038
 msgid ">%_"
 msgstr ">%_"
 
-#: configuredialog.cpp:3074
+#: configuredialog.cpp:3187
 msgid "Repl&y Subject Prefixes"
 msgstr "Temo&prefiksoj por respondo"
 
-#: configuredialog.cpp:3078 configuredialog.cpp:3107
+#: configuredialog.cpp:3191 configuredialog.cpp:3220
 msgid ""
 "Recognize any sequence of the following prefixes\n"
 "(entries are case-insensitive regular expressions):"
 msgstr "Rekoni la sekvajn prefiksojn (uskleco ne gravas):"
 
-#: configuredialog.cpp:3088 configuredialog.cpp:3499
+#: configuredialog.cpp:3201 configuredialog.cpp:3612
 msgid "Mod&ify..."
 msgstr "Ŝa&nĝi..."
 
-#: configuredialog.cpp:3089
+#: configuredialog.cpp:3202
 msgid "Enter new reply prefix:"
 msgstr "Entajpi novan respondoprefikson:"
 
-#: configuredialog.cpp:3103
+#: configuredialog.cpp:3216
 msgid "For&ward Subject Prefixes"
 msgstr "&Temoprefiksoj por plusendo"
 
-#: configuredialog.cpp:3117
+#: configuredialog.cpp:3230
 msgid "Enter new forward prefix:"
 msgstr "Entajpi novan plusendo-prefikson:"
 
-#: configuredialog.cpp:3156
+#: configuredialog.cpp:3269
 msgid ""
 "This list is checked for every outgoing message from the top to the bottom for "
 "a charset that contains all required characters."
@@ -1956,57 +2205,57 @@ msgstr ""
 "Tiu listo estas kontrolata ĉe ĉiu sendata retletero de supre malsupren pri "
 "signaro, kiuj enhvas ĉiujn necesajn signojn."
 
-#: configuredialog.cpp:3165
+#: configuredialog.cpp:3278
 msgid "Enter charset:"
 msgstr "Doni aldonendan signaron:"
 
-#: configuredialog.cpp:3171
+#: configuredialog.cpp:3284
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr "&Lasi la originan signaron ĉe respondoj kaj plusendoj (se eblas)"
 
-#: configuredialog.cpp:3205
+#: configuredialog.cpp:3318
 msgid "This charset is not supported."
 msgstr "Tiu signaro ne estas subtenata."
 
-#: configuredialog.cpp:3256
+#: configuredialog.cpp:3369
 msgid "&Use custom message-id suffix"
 msgstr "&Uzi propran sufikson por mesaĝ-identigiloj:"
 
-#: configuredialog.cpp:3269
+#: configuredialog.cpp:3382
 msgid "Custom message-&id suffix:"
 msgstr "&Propra sufikso por mesaĝ-identigiloj:"
 
-#: configuredialog.cpp:3283
+#: configuredialog.cpp:3396
 msgid "Define custom mime header fields:"
 msgstr "Difini proprajn MIME-kapliniojn:"
 
-#: configuredialog.cpp:3291
+#: configuredialog.cpp:3404
 msgid "Value"
 msgstr "Valoro"
 
-#: configuredialog.cpp:3299
+#: configuredialog.cpp:3412
 msgid "Ne&w"
 msgstr "No&va"
 
 #. 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 "&Nomo:"
 
-#: configuredialog.cpp:3321
+#: configuredialog.cpp:3434
 msgid "&Value:"
 msgstr "&Valoro:"
 
-#. i18n: file kmail.kcfg line 359
-#: configuredialog.cpp:3468 rc.cpp:782
+#. i18n: file kmail.kcfg line 389
+#: configuredialog.cpp:3581 rc.cpp:807
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Nomigi kunsendaĵojn kompreneble por MS-Outlook"
 
-#: configuredialog.cpp:3471
+#: configuredialog.cpp:3584
 msgid ""
 "Turn this option on to make Outlook(tm) understand attachment names containing "
 "non-English characters"
@@ -2014,29 +2263,29 @@ msgstr ""
 "Marku tiun opcion por certigi, ke MS-Outlook povas kompreni kunsendaĵnomoj kun "
 "neanglaj literoj"
 
-#: configuredialog.cpp:3482
+#: configuredialog.cpp:3595
 msgid "E&nable detection of missing attachments"
 msgstr "Ebligi ekkonon de ma&nkaj kunsendaĵoj"
 
-#: configuredialog.cpp:3489
+#: configuredialog.cpp:3602
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr "Ekkoni iun de la sekvaj vortoj kiel intenco kunsendi dosieron:"
 
-#: configuredialog.cpp:3500
+#: configuredialog.cpp:3613
 msgid "Enter new key word:"
 msgstr "Entajpi novan vorton:"
 
-#: configuredialog.cpp:3521 configuredialog.cpp:3522 kmcomposewin.cpp:2232
-#: kmcomposewin.cpp:2233
+#: configuredialog.cpp:3634 configuredialog.cpp:3635 kmcomposewin.cpp:2297
+#: kmcomposewin.cpp:2298
 msgid "attachment"
 msgstr "kunsendaĵo"
 
-#: configuredialog.cpp:3523 configuredialog.cpp:3524 kmcomposewin.cpp:2234
-#: kmcomposewin.cpp:2235
+#: configuredialog.cpp:3636 configuredialog.cpp:3637 kmcomposewin.cpp:2299
+#: kmcomposewin.cpp:2300
 msgid "attached"
 msgstr "kunsendita"
 
-#: configuredialog.cpp:3542
+#: configuredialog.cpp:3655
 msgid ""
 "You have chosen to encode attachment names containing non-English characters in "
 "a way that is understood by Outlook(tm) and other mail clients that do not "
@@ -2053,27 +2302,27 @@ msgstr ""
 "mesaĝoj ne estas kompreneblaj de poŝtiloj, kiuj uzas la normon. Tial vi nur "
 "ebligu tiun opcion, se vi havas bonan kaŭzon."
 
-#: configuredialog.cpp:3569
+#: configuredialog.cpp:3682
 msgid "&Reading"
 msgstr "&Legante"
 
-#: configuredialog.cpp:3575
+#: configuredialog.cpp:3688
 msgid "Composing"
 msgstr "Mesaĝredaktilo"
 
-#: configuredialog.cpp:3581
+#: configuredialog.cpp:3694
 msgid "Warnings"
 msgstr "Averto"
 
-#: configuredialog.cpp:3587
+#: configuredialog.cpp:3700
 msgid "S/MIME &Validation"
 msgstr "Programk&ontrolo de S/MIME"
 
-#: configuredialog.cpp:3593
+#: configuredialog.cpp:3706
 msgid "Crypto Backe&nds"
 msgstr "Ĉifro&kromaĵoj"
 
-#: configuredialog.cpp:3624
+#: configuredialog.cpp:3737
 msgid ""
 "<qt>"
 "<p>Messages sometimes come in both formats. This option controls whether you "
@@ -2104,7 +2353,7 @@ msgstr ""
 "<p><b>Noto:</b> Vi povas ŝanĝi tion por ĉiu leterujo en la <i>Leterujo</i>"
 "-menuo de la Retpoŝtilo precipa fenestro.</p></qt>"
 
-#: configuredialog.cpp:3641
+#: configuredialog.cpp:3754
 msgid ""
 "<qt>"
 "<p>Some mail advertisements are in HTML and contain references to, for example, "
@@ -2129,7 +2378,7 @@ msgstr ""
 "<p>Se vi tamen deziras vidi bildojn en HTML, vi povas ŝalti tiun funkcion, sed "
 "estu avertita pri la implikaĵoj.</p></qt>"
 
-#: configuredialog.cpp:3654
+#: configuredialog.cpp:3767
 msgid ""
 "<qt>"
 "<h3>Message Disposition Notification Policy</h3>"
@@ -2174,22 +2423,22 @@ msgstr ""
 "pli bona ol sendo de konfirmoj. La skribinto ja scios, ke la mesaĝo estas "
 "agita. Li nur ne scios, tdeio okazis al ĝi.</li> "
 "<li><em>Ĉiam sendu</em>: Ĉiam sendas la postulitan ricevkonfirmon. Tio "
-"signifas, ke la skribinto scios, tdeio okazis al la mesaĝo. Nur uzu tion ekzemple "
-"por klienta prizorgado.</li> </ul> </qt>"
+"signifas, ke la skribinto scios, tdeio okazis al la mesaĝo. Nur uzu tion "
+"ekzemple por klienta prizorgado.</li> </ul> </qt>"
 
-#: configuredialog.cpp:3687
+#: configuredialog.cpp:3800
 msgid "HTML Messages"
 msgstr "HTML-mesaĝoj"
 
-#: configuredialog.cpp:3690
+#: configuredialog.cpp:3803
 msgid "Prefer H&TML to plain text"
 msgstr "&Preferi HTMLon al plena teksto"
 
-#: configuredialog.cpp:3694
+#: configuredialog.cpp:3807
 msgid "Allow messages to load e&xternal references from the Internet"
 msgstr "Permesi al mesaĝoj &ŝargadon de eksteraj refrencoj el la reto"
 
-#: configuredialog.cpp:3699
+#: configuredialog.cpp:3812
 msgid ""
 "<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
 "will be compromised by present and anticipated security exploits. <a "
@@ -2201,61 +2450,61 @@ msgstr ""
 "Havigu detalojn pri HTML-leteroj...</a> <a href=\"whatsthis:%2\">"
 "Havigu detalojn pri eksteraj ligiloj...</a>"
 
-#: configuredialog.cpp:3711
+#: configuredialog.cpp:3824
 #, fuzzy
 msgid "Encrypted Messages"
 msgstr "Ĉifrita mesaĝo"
 
-#: configuredialog.cpp:3713
+#: configuredialog.cpp:3826
 #, fuzzy
 msgid "Attempt decryption of encrypted messages when viewing"
 msgstr "Aŭtomate &ĉifri mesaĝojn kiam eble"
 
-#: configuredialog.cpp:3718
+#: configuredialog.cpp:3831
 msgid "Message Disposition Notifications"
 msgstr "Ricevkonfirmoj"
 
-#: configuredialog.cpp:3730
+#: configuredialog.cpp:3843
 msgid "Send policy:"
 msgstr "Sendreguloj:"
 
-#: configuredialog.cpp:3732 kmmessage.cpp:1361 kmmessage.cpp:1368
+#: configuredialog.cpp:3845 kmmessage.cpp:1381 kmmessage.cpp:1388
 msgid "&Ignore"
 msgstr "&Ignori"
 
-#: configuredialog.cpp:3735
+#: configuredialog.cpp:3848
 msgid "As&k"
 msgstr "&Demandi"
 
-#: configuredialog.cpp:3738
+#: configuredialog.cpp:3851
 msgid "&Deny"
 msgstr "&Rifuzi"
 
-#: configuredialog.cpp:3741
+#: configuredialog.cpp:3854
 msgid "Al&ways send"
 msgstr "Ĉ&iam sendi"
 
-#: configuredialog.cpp:3759
+#: configuredialog.cpp:3872
 msgid "Quote original message:"
 msgstr "Citi originalan mesaĝon:"
 
-#: configuredialog.cpp:3761
+#: configuredialog.cpp:3874
 msgid "Nothin&g"
 msgstr "N&enio"
 
-#: configuredialog.cpp:3764
+#: configuredialog.cpp:3877
 msgid "&Full message"
 msgstr "&Tuta mesaĝo"
 
-#: configuredialog.cpp:3767
+#: configuredialog.cpp:3880
 msgid "Onl&y headers"
 msgstr "Nu&r kaplinioj"
 
-#: configuredialog.cpp:3773
+#: configuredialog.cpp:3886
 msgid "Do not send MDNs in response to encrypted messages"
 msgstr "Ne sendi ricevkonfirmon post ricevo de ĉifrita mesaĝo"
 
-#: configuredialog.cpp:3777
+#: configuredialog.cpp:3890
 msgid ""
 "<b>WARNING:</b> Unconditionally returning confirmations undermines your "
 "privacy. <a href=\"whatsthis:%1\">More...</a>"
@@ -2263,134 +2512,148 @@ msgstr ""
 "<b>Averto:</b> Senkondiĉaj ricevkonfirmoj eble kontraŭas vian privatecon. <a "
 "href=\"whatsthis:%1\">Detaloj...</a>"
 
-#: configuredialog.cpp:3786
+#: configuredialog.cpp:3899
 msgid "Certificate && Key Bundle Attachments"
 msgstr "Atestila kaj ŝlosila pakkunsendaĵo"
 
-#: configuredialog.cpp:3789
+#: configuredialog.cpp:3902
 msgid "Automatically import keys and certificates"
 msgstr "Importi aŭtomate testilojn kaj ŝlosilojn"
 
-#: configuredialog.cpp:3850
+#: configuredialog.cpp:3963
 msgid ""
 "Changing the global HTML setting will override all folder specific values."
 msgstr ""
 "Ŝanĝo de la malloka agordo pri HTML, anstataŭos ĉiujn agordojn faritajn por "
 "apartaj dosierujoj."
 
-#: configuredialog.cpp:4138
+#: configuredialog.cpp:4251
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4247 rc.cpp:347
+#: configuredialog.cpp:4360 rc.cpp:353
 #, no-c-format
 msgid "no proxy"
 msgstr ""
 
-#: configuredialog.cpp:4248
+#: configuredialog.cpp:4361
 msgid "(Current system setting: %1)"
 msgstr ""
 
-#: configuredialog.cpp:4425
+#: configuredialog.cpp:4538
 msgid "&Folders"
 msgstr "&Leterujoj"
 
-#: configuredialog.cpp:4428
+#: configuredialog.cpp:4541
 msgid "&Groupware"
 msgstr "&Grupa programaro"
 
-#: configuredialog.cpp:4449
+#: configuredialog.cpp:4562
 msgid ""
 "_: Corresponds to Folder->Move All Messages to Trash\n"
 "Ask for co&nfirmation before moving all messages to trash"
 msgstr "Petas ko&nfirmon antaŭ movas ĉiujn mesaĝojn al rubujo"
 
-#: configuredialog.cpp:4456
+#: configuredialog.cpp:4569
 msgid "E&xclude important messages from expiry"
 msgstr "E&scepti gravajn mesaĝojn el forigo post la limtago"
 
-#: configuredialog.cpp:4467
+#: configuredialog.cpp:4580
 msgid ""
 "_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
 "in all folders\".\n"
 "When trying to find unread messages:"
 msgstr "Provante trovi nelegitajn msaĝojn:"
 
-#: configuredialog.cpp:4470
+#: configuredialog.cpp:4583
 msgid ""
 "_: continuation of \"When trying to find unread messages:\"\n"
 "Do not Loop"
 msgstr "Ne relanĉi"
 
-#: configuredialog.cpp:4472
+#: configuredialog.cpp:4585
 msgid ""
 "_: continuation of \"When trying to find unread messages:\"\n"
 "Loop in Current Folder"
 msgstr "Relanĉi en la nuna leterujo"
 
-#: configuredialog.cpp:4474
+#: configuredialog.cpp:4587
 msgid ""
 "_: continuation of \"When trying to find unread messages:\"\n"
 "Loop in All Folders"
 msgstr "Relanĉi en ĉiuj leterujoj"
 
-#: configuredialog.cpp:4487
+#: configuredialog.cpp:4600
 msgid ""
 "_: to be continued with \"jump to first new message\", \"jump to first unread "
 "or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr "Enirante leterujon:"
 
-#: configuredialog.cpp:4490
+#: configuredialog.cpp:4603
 msgid ""
 "_: continuation of \"When entering a folder:\"\n"
 "Jump to First New Message"
 msgstr "Iri al la unua nova mesaĝo"
 
-#: configuredialog.cpp:4492
+#: configuredialog.cpp:4605
 msgid ""
 "_: continuation of \"When entering a folder:\"\n"
 "Jump to First Unread or New Message"
 msgstr "Iri al la unua nelegita aŭ nova mesaĝo"
 
-#: configuredialog.cpp:4494
+#: configuredialog.cpp:4607
 msgid ""
 "_: continuation of \"When entering a folder:\"\n"
 "Jump to Last Selected Message"
 msgstr "Iri al la laste elektita mesaĝo"
 
-#: configuredialog.cpp:4501
+#: configuredialog.cpp:4609
+#, fuzzy
+msgid ""
+"_: continuation of \"When entering a folder:\"\n"
+"Jump to Newest Message"
+msgstr "Iri al la unua nova mesaĝo"
+
+#: configuredialog.cpp:4611
+#, fuzzy
+msgid ""
+"_: continuation of \"When entering a folder:\"\n"
+"Jump to Oldest Message"
+msgstr "Iri al la unua nova mesaĝo"
+
+#: configuredialog.cpp:4618
 msgid "Mar&k selected message as read after"
 msgstr "Mar&ki elektitan mesaĝon kiel legita"
 
-#: configuredialog.cpp:4505
+#: configuredialog.cpp:4622
 msgid " sec"
 msgstr " sek"
 
-#: configuredialog.cpp:4518
+#: configuredialog.cpp:4635
 msgid "Ask for action after &dragging messages to another folder"
 msgstr "&Demandi pri ago post la treno de mesaĝoj al alia leterujo"
 
-#: configuredialog.cpp:4529
+#: configuredialog.cpp:4646
 msgid ""
 "_: to be continued with \"flat files\" and \"directories\", resp.\n"
 "By default, &message folders on disk are:"
 msgstr "Apriore, &leterujoj sur la disko estos:"
 
-#: configuredialog.cpp:4532
+#: configuredialog.cpp:4649
 msgid ""
 "_: continuation of \"By default, &message folders on disk are\"\n"
 "Flat Files (\"mbox\" format)"
 msgstr "grandaj dosieroj (\"mbox-formato\")"
 
-#: configuredialog.cpp:4534
+#: configuredialog.cpp:4651
 msgid ""
 "_: continuation of \"By default, &message folders on disk are\"\n"
 "Directories (\"maildir\" format)"
 msgstr "dosierujoj (\"maildir\"-formato)"
 
-#: configuredialog.cpp:4537
+#: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
 "<qt>"
@@ -2414,35 +2677,35 @@ msgstr ""
 "leteroj troviĝas en apartaj dosieroj. Tio bezonas iom pli da spaco surdiske, "
 "sed estas pli fortika.</p></qt>"
 
-#: configuredialog.cpp:4562
+#: configuredialog.cpp:4679
 msgid "Open this folder on startup:"
 msgstr "Malfermi ĉi tiun leterujon dum lanĉo:"
 
-#: configuredialog.cpp:4570
+#: configuredialog.cpp:4687
 msgid "Empty local &trash folder on program exit"
 msgstr "&Malplenigi rubujon dum programfino"
 
-#: configuredialog.cpp:4578
+#: configuredialog.cpp:4695
 msgid "Enable full text &indexing"
 msgstr ""
 
-#: configuredialog.cpp:4588
+#: configuredialog.cpp:4705
 msgid "Quota units: "
 msgstr "Unuo por stororezervado:"
 
-#: configuredialog.cpp:4590 quotajobs.h:86
+#: configuredialog.cpp:4707 quotajobs.h:86
 msgid "KB"
 msgstr "KB"
 
-#: configuredialog.cpp:4591 quotajobs.h:91
+#: configuredialog.cpp:4708 quotajobs.h:91
 msgid "MB"
 msgstr "MB"
 
-#: configuredialog.cpp:4592 quotajobs.h:96
+#: configuredialog.cpp:4709 quotajobs.h:96
 msgid "GB"
 msgstr "GB"
 
-#: configuredialog.cpp:4601
+#: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
 "<qt>"
@@ -2471,7 +2734,7 @@ msgstr ""
 "<p>Simile, se la opcio estas elektitaj kaj vi serĉas antaŭan nelegitan mesaĝon, "
 "la serĉo rekomenciĝos malsupre de la listo se supre neniu plu estas.</p></qt>"
 
-#: configuredialog.cpp:4618
+#: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
 "<qt>"
@@ -2484,70 +2747,71 @@ msgid ""
 "KMail while this operation is running.</p></qt>"
 msgstr ""
 
-#: configuredialog.cpp:4694
+#: configuredialog.cpp:4811
 msgid "&IMAP Resource Folder Options"
 msgstr "Leterujopcioj de la &IMAP-Risurco"
 
-#: configuredialog.cpp:4698
+#: configuredialog.cpp:4815
 msgid "&Enable IMAP resource functionality"
 msgstr "&Ebligi la funciecon de la IMAP-risurcon"
 
-#: configuredialog.cpp:4699
+#: configuredialog.cpp:4816
 msgid "This enables the IMAP storage for the Kontact applications"
 msgstr "Tio ebligas la IMAP-memoron por la Kontaktaj aplikaĵoj"
 
-#: configuredialog.cpp:4712
+#: configuredialog.cpp:4829
 msgid "&Format used for the groupware folders:"
 msgstr "&Formo uzata por grupprogramaj leterujoj:"
 
-#: configuredialog.cpp:4714
+#: configuredialog.cpp:4831
 msgid ""
 "Choose the format to use to store the contents of the groupware folders."
 msgstr ""
 "Elektu la formon por uzo pro konservo de la enhavo de la grupprogramaj "
 "leterujoj."
 
-#: configuredialog.cpp:4723
-msgid "Standard (Ical / Vcard)"
-msgstr "Norma (Ical / Vcard)"
+#: configuredialog.cpp:4840
+msgid "Deprecated Kolab1 (iCal/vCard)"
+msgstr ""
 
-#: configuredialog.cpp:4723
-msgid "Kolab (XML)"
+#: configuredialog.cpp:4840
+#, fuzzy
+msgid "Kolab2 (XML)"
 msgstr "Kolabo (XML)"
 
-#: configuredialog.cpp:4731
+#: configuredialog.cpp:4848
 msgid "&Language of the groupware folders:"
 msgstr "&Lingvo de la grupoprogramaraj leterujoj:"
 
-#: configuredialog.cpp:4734
+#: configuredialog.cpp:4851
 msgid "Set the language of the folder names"
 msgstr "Agordi la lingvon de la leterujaj nomoj"
 
-#: configuredialog.cpp:4743
+#: configuredialog.cpp:4860
 msgid "English"
 msgstr "Angla"
 
-#: configuredialog.cpp:4743
+#: configuredialog.cpp:4860
 msgid "German"
 msgstr "Germana"
 
-#: configuredialog.cpp:4743
+#: configuredialog.cpp:4860
 msgid "French"
 msgstr "Franca"
 
-#: configuredialog.cpp:4743
+#: configuredialog.cpp:4860
 msgid "Dutch"
 msgstr "Nederlanda"
 
-#: configuredialog.cpp:4752
+#: configuredialog.cpp:4869
 msgid "Set the parent of the resource folders"
 msgstr "Agordi la superujon de la risurcleterujoj"
 
-#: configuredialog.cpp:4781
+#: configuredialog.cpp:4898
 msgid "&Hide groupware folders"
 msgstr "&Kaŝi grupoprogramarajn leterujojn"
 
-#: configuredialog.cpp:4785
+#: configuredialog.cpp:4902
 msgid ""
 "When this is checked, you will not see the IMAP resource folders in the folder "
 "tree."
@@ -2555,11 +2819,11 @@ msgstr ""
 "Kiam tiu estas markita, vi ne vidos la IMAP-risurcajn leterujojn en la leteruja "
 "arbo."
 
-#: configuredialog.cpp:4792
+#: configuredialog.cpp:4909
 msgid "&Only show groupware folders for this account"
 msgstr "Nur montri gruppr&ogramajn dosieruojojn por ĉi konto"
 
-#: configuredialog.cpp:4796
+#: configuredialog.cpp:4913
 msgid ""
 "When this is checked, you will not see normal  mail folders in the folder tree "
 "for the account configured for groupware."
@@ -2567,29 +2831,29 @@ msgstr ""
 "Kiam tiu estas markita, vi ne vidos la kutimajn leterujojn en la leteruja arbo "
 "de la konto agordita por grupprogramoj."
 
-#: 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
 msgid "Groupware Compatibility && Legacy Options"
 msgstr "Grupprograma kongrueco kaj heredaj opcioj"
 
-#: configuredialog.cpp:4823
+#: configuredialog.cpp:4940
 msgid "&Enable groupware functionality"
 msgstr "&Ebligi la grupoprogramara funkciecon"
 
-#: configuredialog.cpp:4831
+#: configuredialog.cpp:4948
 msgid "Mangle From:/To: headers in replies to invitations"
 msgstr "Sanĝi De/Al-kaplinioj je respondoj de invitoj"
 
-#: configuredialog.cpp:4832
+#: configuredialog.cpp:4949
 msgid ""
 "Turn this option on in order to make Outlook(tm) understand your answers to "
 "invitation replies"
@@ -2597,11 +2861,11 @@ msgstr ""
 "Ŝaltu tiun opcion por certigi, ke MS-Outlook komprenas viajn respondojn pri "
 "invitoj"
 
-#: configuredialog.cpp:4837
+#: configuredialog.cpp:4954
 msgid "Send invitations in the mail body"
 msgstr "Sendi invitojn en la tekstparto"
 
-#: configuredialog.cpp:4838
+#: configuredialog.cpp:4955
 msgid ""
 "Turn this option on in order to make Outlook(tm) understand your answers to "
 "invitations"
@@ -2609,27 +2873,36 @@ msgstr ""
 "Ŝaltu tiun opcion por certigi, ke MS-Outlook komprenas viajn respondojn pri "
 "invitoj"
 
-#: configuredialog.cpp:4846
+#: configuredialog.cpp:4963
 msgid "Exchange compatible invitation naming"
 msgstr "Interŝanĝi kongruan invitnomadon"
 
-#. 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 "Nomigi kunsendaĵojn kompreneble por MS-Outlook"
+
+#: configuredialog.cpp:4971
+msgid ""
+"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+msgstr ""
+
+#. i18n: file kmail.kcfg line 196
+#: configuredialog.cpp:4977 rc.cpp:700
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr "Aŭtomata invitosendo"
 
-#: configuredialog.cpp:4854
+#: configuredialog.cpp:4978
 msgid ""
 "When this is on, the user will not see the mail composer window. Invitation "
 "mails are sent automatically"
@@ -2637,7 +2910,7 @@ msgstr ""
 "Se tiu estas elektita, la uzanto ne vidos la leterredaktilon. Invitaj leteroj "
 "aŭtomate estos sendataj."
 
-#: configuredialog.cpp:4867
+#: configuredialog.cpp:4991
 msgid ""
 "<qt>Invitations are normally sent as attachments to a mail. This switch changes "
 "the invitation mails to be sent in the text of the mail instead; this is "
@@ -2655,15 +2928,15 @@ msgstr ""
 "ne havas poŝtilojn, kiuj ne komprenas ĝin, ĝi montriĝas tre strange. "
 "<br>La aliaj homoj povas plulabori kun tio.</qt>"
 
-#: configuredialog.cpp:4922
+#: configuredialog.cpp:5048
 msgid "<Choose a Folder>"
 msgstr "<Elekti leterujon>"
 
-#: configuredialog.cpp:5026
+#: configuredialog.cpp:5154
 msgid "&Resource folders are subfolders of:"
 msgstr "&Risurcleterujoj estas subleterujoj de:"
 
-#: configuredialog.cpp:5029
+#: configuredialog.cpp:5157
 msgid "&Resource folders are in account:"
 msgstr "&Risurcleterujoj estas en la konto:"
 
@@ -2731,31 +3004,31 @@ msgid ""
 "Not available"
 msgstr "Ne uzebla"
 
-#: customtemplates.cpp:87
+#: customtemplates.cpp:100
 msgid ""
 "_: Message->\n"
 "Universal"
 msgstr "Universala"
 
-#: customtemplates.cpp:88 customtemplates.cpp:131
+#: customtemplates.cpp:101 customtemplates.cpp:180
 msgid ""
 "_: Message->\n"
 "Reply"
 msgstr "Respondi"
 
-#: customtemplates.cpp:89 customtemplates.cpp:133
+#: customtemplates.cpp:102 customtemplates.cpp:182
 msgid ""
 "_: Message->\n"
 "Reply to All"
 msgstr "Respondi al ĉiuj"
 
-#: customtemplates.cpp:90 customtemplates.cpp:135
+#: customtemplates.cpp:103 customtemplates.cpp:184
 msgid ""
 "_: Message->\n"
 "Forward"
 msgstr "Plusendi"
 
-#: customtemplates.cpp:93
+#: customtemplates.cpp:106
 msgid ""
 "<qt>"
 "<p>Here you can add, edit, and delete custom message templates to use when you "
@@ -2770,169 +3043,191 @@ 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 "Aŭtomate &ĉifri mesaĝojn kiam eble"
+
+#: customtemplates.cpp:123
+msgid "Additional recipients who get a copy of the message when forwarding"
+msgstr ""
+
+#: customtemplates.cpp:124
+msgid ""
+"When using this template for forwarding, the default recipients are those you "
+"enter here. This is a comma-separated list of mail addresses."
+msgstr ""
+
+#: customtemplates.cpp:125
+msgid ""
+"When using this template for forwarding, the recipients you enter here will by "
+"default get a copy of this message. This is a comma-separated list of mail "
+"addresses."
+msgstr ""
+
+#: customtemplates.cpp:186
 msgid ""
 "_: Message->\n"
 "Unknown"
 msgstr "Nekonata"
 
-#: 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
 msgid ""
 "The selected shortcut is already used, would you still like to continue with "
 "the assignment?"
 msgstr ""
 
-#: distributionlistdialog.cpp:96
+#: distributionlistdialog.cpp:97
 msgid "Save Distribution List"
 msgstr "Savi Dissendoliston"
 
-#: distributionlistdialog.cpp:97
+#: distributionlistdialog.cpp:98
 msgid "Save List"
 msgstr "Savi Liston"
 
-#: distributionlistdialog.cpp:106
+#: distributionlistdialog.cpp:107
 msgid "Name:"
 msgstr "Nomo:"
 
-#: distributionlistdialog.cpp:116 recipientspicker.cpp:390
+#: distributionlistdialog.cpp:117 recipientspicker.cpp:390
 msgid "Email"
 msgstr "Retpoŝto"
 
-#: distributionlistdialog.cpp:170
+#: distributionlistdialog.cpp:169
 msgid ""
 "There are no recipients in your list. First select some recipients, then try "
 "again."
 msgstr ""
 
-#: distributionlistdialog.cpp:185
+#: distributionlistdialog.cpp:184
 msgid "New Distribution List"
 msgstr "Nova Dissendolisto"
 
-#: distributionlistdialog.cpp:186
+#: distributionlistdialog.cpp:185
 msgid "Please enter name:"
 msgstr "Bonvolu entajpi nomon:"
 
-#: distributionlistdialog.cpp:197
+#: distributionlistdialog.cpp:198
 msgid ""
 "<qt>Distribution list with the given name <b>%1</b> already exists. Please "
 "select a different name.</qt>"
 msgstr ""
 
-#: editorwatcher.cpp:86
+#: editorwatcher.cpp:76
 #, fuzzy
 msgid "Edit with:"
 msgstr "Redakti identecon"
 
-#: 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 "Nomo de la kunsendaĵo:"
 
-#: 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
 msgid ""
 "_n: Removing 1 old message from folder %1...\n"
 "Removing %n old messages from folder %1..."
@@ -2940,13 +3235,13 @@ msgstr ""
 "Forigante %n malnovan mesaĝon de leterujo %1...\n"
 "Forigante %n malnovajn mesaĝojn de leterujo %1..."
 
-#: expirejob.cpp:171
+#: expirejob.cpp:184
 msgid "Cannot expire messages from folder %1: destination folder %2 not found"
 msgstr ""
 "Ne eblas forigi mesaĝojn post la limtago de le lterujo %1: celleterujo %2 ne "
 "trovebla"
 
-#: expirejob.cpp:186
+#: expirejob.cpp:199
 msgid ""
 "_n: Moving 1 old message from folder %1 to folder %2...\n"
 "Moving %n old messages from folder %1 to folder %2..."
@@ -2954,7 +3249,7 @@ msgstr ""
 "Movante %n malnovan mesaĝon de leterujo %1 al leterujo %2...\n"
 "Movante %n malnovajn mesaĝojn de leterujo %1 al leterujo %2..."
 
-#: expirejob.cpp:214
+#: expirejob.cpp:227
 msgid ""
 "_n: Removed 1 old message from folder %1.\n"
 "Removed %n old messages from folder %1."
@@ -2962,7 +3257,7 @@ msgstr ""
 "Foriginte %n malnovan mesaĝon de leterujo %1.\n"
 "Foriginte %n malnovajn mesaĝojn de leterujo %1."
 
-#: expirejob.cpp:220
+#: expirejob.cpp:233
 msgid ""
 "_n: Moved 1 old message from folder %1 to folder %2.\n"
 "Moved %n old messages from folder %1 to folder %2."
@@ -2970,19 +3265,19 @@ msgstr ""
 "Movinte %n malnovan mesaĝon de leterujo %1 al leterujo %2.\n"
 "Movinte %n malnovajn mesaĝojn de leterujo %1 al leterujo %2."
 
-#: expirejob.cpp:227
+#: expirejob.cpp:240
 msgid "Removing old messages from folder %1 failed."
 msgstr "Forigo de malnovaj mesaĝoj de leterujo %1 fiaskis."
 
-#: expirejob.cpp:231
+#: expirejob.cpp:244
 msgid "Moving old messages from folder %1 to folder %2 failed."
 msgstr "Movo de malnovaj mesaĝoj de leterujo %1 al leterujo %2 fiaskis."
 
-#: expirejob.cpp:237
+#: expirejob.cpp:250
 msgid "Removing old messages from folder %1 was canceled."
 msgstr "Forigo de malnovaj mesaĝoj de leterujo %1 estis ĉesigata."
 
-#: expirejob.cpp:241
+#: expirejob.cpp:254
 msgid "Moving old messages from folder %1 to folder %2 was canceled."
 msgstr "Movo de malnovaj mesaĝoj de leterujo %1 al leterujo %2 estis ĉesigata."
 
@@ -3019,87 +3314,104 @@ msgid ""
 "Note: Expiry action will be applied immediately after confirming settings."
 msgstr ""
 
-#: expirypropertiesdialog.cpp:163
+#: expirypropertiesdialog.cpp:167
 msgid "Please select a folder to expire messages into."
 msgstr "Bonvolu elekti leterujon en kiun eksvalidigi mesaĝojn."
 
-#: expirypropertiesdialog.cpp:164
+#: expirypropertiesdialog.cpp:168
 msgid "No Folder Selected"
 msgstr "Neniu leterujo elektita"
 
+#: expirypropertiesdialog.cpp:176
+#, fuzzy
+msgid ""
+"Please select a different folder than the current folder to expire message "
+"into."
+msgstr "Bonvolu elekti leterujon en kiun eksvalidigi mesaĝojn."
+
+#: expirypropertiesdialog.cpp:178
+#, fuzzy
+msgid "Wrong Folder Selected"
+msgstr "Neniu leterujo elektita"
+
 #: favoritefolderview.cpp:90
 #, fuzzy
 msgid "Favorite Folders"
 msgstr "Alglui leterujon"
 
-#: favoritefolderview.cpp:326
+#: favoritefolderview.cpp:337 kmfoldertree.cpp:1190 kmmainwidget.cpp:2790
+msgid "&Assign Shortcut..."
+msgstr "&Asigni fulmoklavon..."
+
+#: favoritefolderview.cpp:338 kmfoldertree.cpp:1195
+msgid "Expire..."
+msgstr "Malnovigi..."
+
+#: favoritefolderview.cpp:342
 #, fuzzy
 msgid "Remove From Favorites"
 msgstr "&Forigi citsignojn..."
 
-#: favoritefolderview.cpp:328 favoritefolderview.cpp:378
+#: favoritefolderview.cpp:344 favoritefolderview.cpp:389
 #, fuzzy
 msgid "Rename Favorite"
 msgstr "Alinomi filtrilon"
 
-#: favoritefolderview.cpp:337 kmfoldertree.cpp:1153 kmmainwidget.cpp:2767
-msgid "&Assign Shortcut..."
-msgstr "&Asigni fulmoklavon..."
-
-#: favoritefolderview.cpp:338 kmfoldertree.cpp:1158
-msgid "Expire..."
-msgstr "Malnovigi..."
-
-#: favoritefolderview.cpp:341
+#: favoritefolderview.cpp:347
 #, fuzzy
 msgid "Add Favorite Folder..."
 msgstr "&Nova leterujo..."
 
-#: favoritefolderview.cpp:395
+#: favoritefolderview.cpp:406
 #, fuzzy
 msgid "Local Inbox"
 msgstr "Loka poŝtkesto"
 
-#: 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 "Alglui leterujon"
 
-#: filterimporterexporter.cpp:51
+#: filterimporterexporter.cpp:50
 #, fuzzy
 msgid "Select Filters"
 msgstr "Elekti leterujon"
 
-#: filterimporterexporter.cpp:58
+#: filterimporterexporter.cpp:61
 #, fuzzy
 msgid "Filters"
 msgstr "Filtrilo %1"
 
-#: filterimporterexporter.cpp:182
+#: filterimporterexporter.cpp:67
+#, fuzzy
+msgid "Unselect All"
+msgstr "Elekti kompletan tekston"
+
+#: filterimporterexporter.cpp:213
 #, fuzzy
 msgid "Import Filters"
 msgstr "vCard-importo fiaskis"
 
-#: 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 "Ŝlosileksporto fiaskis"
@@ -3178,8 +3490,8 @@ msgstr ""
 "Ne eblas skribi la dosieron %1:\n"
 "\"%2\" estas la detala eraropriskribo."
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2706 kmcommands.cpp:2730
-#: kmmainwidget.cpp:1795 kmmainwidget.cpp:1812 urlhandlermanager.cpp:489
+#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "KMail eraro"
 
@@ -3227,61 +3539,78 @@ msgstr ""
 "simpla uzantonomo aŭ la tuta retpoŝtadreso de la uzanto. La saluton de via "
 "konto en la servilo informos pri tio."
 
-#: folderdiaacltab.cpp:106 folderdiaacltab.cpp:341
+#: folderdiaacltab.cpp:103 recipientseditor.cpp:776
+msgid "Se&lect..."
+msgstr "E&lekti..."
+
+#: folderdiaacltab.cpp:106 folderdiaacltab.cpp:340
 msgid "Permissions"
 msgstr "Rajtoj"
 
-#: folderdiaacltab.cpp:247
+#: folderdiaacltab.cpp:118
+msgid "<b>Note: </b>Renaming requires write permissions on the parent folder."
+msgstr ""
+
+#: folderdiaacltab.cpp:245
 msgid "Custom Permissions"
 msgstr "Propraj rajtoj"
 
-#: folderdiaacltab.cpp:249
+#: folderdiaacltab.cpp:247
 msgid "Custom Permissions (%1)"
 msgstr "Propraj rajtoj (%1)"
 
-#: folderdiaacltab.cpp:340
+#: folderdiaacltab.cpp:339
 msgid "User Id"
 msgstr "Uzantonomo"
 
-#: folderdiaacltab.cpp:352
+#: folderdiaacltab.cpp:351
 msgid "Add Entry..."
 msgstr "Aldoni eron..."
 
-#: folderdiaacltab.cpp:353
+#: folderdiaacltab.cpp:352
 msgid "Modify Entry..."
 msgstr "Ŝanĝi eron..."
 
-#: folderdiaacltab.cpp:354
+#: folderdiaacltab.cpp:353
 msgid "Remove Entry"
 msgstr "Forigi eron"
 
-#: folderdiaacltab.cpp:426
+#: folderdiaacltab.cpp:428
 msgid "Error retrieving user permissions."
 msgstr "Eraro dum preno de la uzantulaj rajtoj."
 
-#: folderdiaacltab.cpp:431
-msgid "Information not retrieved from server yet, please use \"Check Mail\"."
+#: folderdiaacltab.cpp:430
+#, fuzzy
+msgid ""
+"You might not have enough permissions to see the permissions of this folder."
+msgstr "Vi ne havas legan aŭ skriban permeson por la rubujo."
+
+#: folderdiaacltab.cpp:435
+#, fuzzy
+msgid ""
+"Information not retrieved from server, you need to use \"Check Mail\" and have "
+"administrative privileges on the folder."
 msgstr "Informoj ne prenitaj de la servilo, uzu \"Rigardi je nova poŝto\"."
 
-#: folderdiaacltab.cpp:446 folderdiaquotatab.cpp:114
+#: folderdiaacltab.cpp:450 folderdiaquotatab.cpp:114
 msgid "Error: no IMAP account defined for this folder"
 msgstr "Eraro: neniu IMAP-konto difinita en tiu leterujo"
 
-#: folderdiaacltab.cpp:452 folderdiaquotatab.cpp:120
+#: folderdiaacltab.cpp:456 folderdiaquotatab.cpp:120
 msgid "Connecting to server %1, please wait..."
 msgstr "Konektante al servilo %1, bv. atendi.."
 
-#: folderdiaacltab.cpp:470 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:843
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
+#: kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr "Eraro dum konekto al servilo %1"
 
-#: folderdiaacltab.cpp:490 folderdiaacltab.cpp:517
+#: folderdiaacltab.cpp:494 folderdiaacltab.cpp:522
 msgid "This IMAP server does not have support for access control lists (ACL)"
 msgstr "Tiu IMAP-servilo ne subtenas atingokontrollistojn (AKL)"
 
-#: folderdiaacltab.cpp:519
+#: folderdiaacltab.cpp:524
 #, c-format
 msgid ""
 "Error retrieving access control list (ACL) from server\n"
@@ -3290,15 +3619,15 @@ msgstr ""
 "Eraro dum preno de la atingokontrollisto (AKL) de la servilo\n"
 "%1"
 
-#: folderdiaacltab.cpp:564
+#: folderdiaacltab.cpp:569
 msgid "Modify Permissions"
 msgstr "Ŝanĝi rajtojn"
 
-#: folderdiaacltab.cpp:598
+#: folderdiaacltab.cpp:603
 msgid "Add Permissions"
 msgstr "Aldoni rajtojn"
 
-#: folderdiaacltab.cpp:631
+#: folderdiaacltab.cpp:636
 msgid ""
 "Do you really want to remove your own permissions for this folder? You will not "
 "be able to access it afterwards."
@@ -3335,8 +3664,8 @@ msgstr "Uzado:"
 msgid "Select Folder"
 msgstr "Elekti leterujon"
 
-#: 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 "Lokaj mesaĝujoj"
 
@@ -3364,7 +3693,7 @@ msgid ""
 "this folder.</qt>"
 msgstr ""
 
-#: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:526 snippetdlg.cpp:93
+#: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:530 snippetdlg.cpp:100
 msgid "The selected shortcut is already used, please select a different one."
 msgstr ""
 
@@ -3380,13 +3709,20 @@ msgstr "&Kopii ĉi tien"
 msgid "C&ancel"
 msgstr "Re&zigni"
 
-#: headeritem.cpp:157 headeritem.cpp:164
+#: folderutil.cpp:93
+msgid ""
+"<qt>The folder you deleted was associated with the account <b>%1</b> "
+"which delivered mail into it. The folder the account delivers new mail into was "
+"reset to the main Inbox folder.</qt>"
+msgstr ""
+
+#: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
 msgstr "Nekonata"
 
-#: headeritem.cpp:171 headerstyle.cpp:140 headerstyle.cpp:238
-#: headerstyle.cpp:442 headerstyle.cpp:625 headerstyle.cpp:778
-#: kmmainwidget.cpp:1057
+#: headeritem.cpp:193 headerstyle.cpp:141 headerstyle.cpp:240
+#: headerstyle.cpp:445 headerstyle.cpp:743 headerstyle.cpp:898
+#: kmmainwidget.cpp:1029
 msgid "No Subject"
 msgstr "sen temo"
 
@@ -3406,47 +3742,47 @@ msgstr ""
 msgid "Stat&us:"
 msgstr "Stat&o:"
 
-#: headerlistquicksearch.cpp:72
+#: headerlistquicksearch.cpp:73
 msgid "Any Status"
 msgstr "Iu stato"
 
-#: headerlistquicksearch.cpp:91
+#: headerlistquicksearch.cpp:93
 #, fuzzy
 msgid "Open Full Search"
 msgstr "Forviŝi serĉon"
 
-#: headerstyle.cpp:169 headerstyle.cpp:296 headerstyle.cpp:647
-#: headerstyle.cpp:860
+#: headerstyle.cpp:170 headerstyle.cpp:298 headerstyle.cpp:765
+#: headerstyle.cpp:974
 msgid "[vCard]"
 msgstr "[vizikarto]"
 
-#: headerstyle.cpp:174 headerstyle.cpp:314 headerstyle.cpp:672
-#: headerstyle.cpp:797
+#: headerstyle.cpp:175 headerstyle.cpp:316 headerstyle.cpp:790
+#: headerstyle.cpp:998
 msgid "CC: "
 msgstr "Kopio: "
 
-#: headerstyle.cpp:177 headerstyle.cpp:318 headerstyle.cpp:679
-#: headerstyle.cpp:800
+#: headerstyle.cpp:178 headerstyle.cpp:320 headerstyle.cpp:797
+#: headerstyle.cpp:1008
 msgid "BCC: "
 msgstr "Nevidebla kopio: "
 
-#: headerstyle.cpp:272 headerstyle.cpp:685
+#: headerstyle.cpp:274 headerstyle.cpp:803
 msgid "Date: "
 msgstr "Dato: "
 
-#: headerstyle.cpp:292 headerstyle.cpp:639 headerstyle.cpp:865
+#: headerstyle.cpp:294 headerstyle.cpp:757 headerstyle.cpp:979
 msgid "From: "
 msgstr "De: "
 
-#: headerstyle.cpp:310 headerstyle.cpp:665 headerstyle.cpp:873
+#: headerstyle.cpp:312 headerstyle.cpp:783 headerstyle.cpp:988
 msgid "To: "
 msgstr "Al: "
 
-#: headerstyle.cpp:322
+#: headerstyle.cpp:324
 msgid "Reply to: "
 msgstr "Respondo al:"
 
-#: headerstyle.cpp:408
+#: headerstyle.cpp:410
 msgid ""
 "%1% probability of being spam.\n"
 "\n"
@@ -3454,23 +3790,46 @@ msgid ""
 "%2"
 msgstr ""
 
-#: headerstyle.cpp:609
+#: headerstyle.cpp:612
 msgid "Launch IM"
 msgstr ""
 
-#: headerstyle.cpp:642
+#: headerstyle.cpp:660
+msgid "Night"
+msgstr ""
+
+#: headerstyle.cpp:669
+#, fuzzy
+msgid "Morning"
+msgstr "Averto"
+
+#: headerstyle.cpp:678
+#, fuzzy
+msgid "Afternoon"
+msgstr "Post"
+
+#: headerstyle.cpp:687
+msgid "Evening"
+msgstr ""
+
+#: headerstyle.cpp:724
+#, fuzzy
+msgid "Sender's Current Time:"
+msgstr "&Sendantula identeco:"
+
+#: headerstyle.cpp:760
 msgid "(resent from %1)"
 msgstr "(resendita de %1)"
 
-#: headerstyle.cpp:694
+#: headerstyle.cpp:812
 msgid "User-Agent: "
 msgstr ""
 
-#: headerstyle.cpp:703
+#: headerstyle.cpp:821
 msgid "X-Mailer: "
 msgstr ""
 
-#: headerstyle.cpp:723
+#: headerstyle.cpp:843
 msgid "Spam Status:"
 msgstr "Spamstato:"
 
@@ -3541,15 +3900,15 @@ msgstr ""
 "<br>ĝ"
 "<br>o</qt>"
 
-#: identitydialog.cpp:90
+#: identitydialog.cpp:93
 msgid "Edit Identity"
 msgstr "Redakti identecon"
 
-#: identitydialog.cpp:118
+#: identitydialog.cpp:121
 msgid "&Your name:"
 msgstr "&Nomo:"
 
-#: identitydialog.cpp:120
+#: identitydialog.cpp:123
 msgid ""
 "<qt>"
 "<h3>Your name</h3>"
@@ -3560,16 +3919,16 @@ msgid ""
 msgstr ""
 "<qt> "
 "<h3>Via nomo</h3> "
-"<p> Tiu enigejo montras vian nomon per tia maniero, per tdeio vi volas montri ĝin "
-"en la kaplinio de la sendota letero.</p> "
+"<p> Tiu enigejo montras vian nomon per tia maniero, per tdeio vi volas montri "
+"ĝin en la kaplinio de la sendota letero.</p> "
 "<p>Se vi ne uzas tion, via nomo ne estos montrata, sed nur la retpoŝtadreso.</p>"
 "</qt>"
 
-#: identitydialog.cpp:132
+#: identitydialog.cpp:135
 msgid "Organi&zation:"
 msgstr "&Organizaĵo:"
 
-#: identitydialog.cpp:134
+#: identitydialog.cpp:137
 msgid ""
 "<qt>"
 "<h3>Organization</h3>"
@@ -3583,15 +3942,19 @@ msgstr ""
 "volas montri ĝin en la kaplinio de la sendota letero.</p> "
 "<p>Estas orde (kaj normale) ne uzi ĝin.</p></qt>"
 
-#: identitydialog.cpp:147
+#: identitydialog.cpp:149
 msgid "&Email address:"
 msgstr "&Retpoŝta adreso:"
 
-#: 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 ""
@@ -3601,25 +3964,49 @@ msgstr ""
 "<p>Ne aŭ malkorete uzi ĝin signifas, ke la homoj havos problemojn resendi al "
 "vi.</p></qt>"
 
-#: identitydialog.cpp:161
+#: identitydialog.cpp:165
+#, fuzzy
+msgid "Email a&liases:"
+msgstr "&Retpoŝta adreso:"
+
+#: identitydialog.cpp:167
+msgid ""
+"<qt>"
+"<h3>Email aliases</h3>"
+"<p>This field contains alias addresses that should also be considered as "
+"belonging to this identity (as opposed to representing a different "
+"identity).</p>"
+"<p>Example:</p>"
+"<table>"
+"<tr>"
+"<th>Primary address:</th>"
+"<td>first.last@example.org</td></tr>"
+"<tr>"
+"<th>Aliases:</th>"
+"<td>first@example.org"
+"<br>last@example.org</td></tr></table>"
+"<p>Type one alias address per line.</p></qt>"
+msgstr ""
+
+#: identitydialog.cpp:185
 msgid "Cryptograph&y"
 msgstr "Ĉ&ifreco"
 
-#: identitydialog.cpp:168 identitydialog.cpp:192 identitydialog.cpp:217
-#: identitydialog.cpp:243
+#: identitydialog.cpp:192 identitydialog.cpp:216 identitydialog.cpp:241
+#: identitydialog.cpp:267
 msgid "Chang&e..."
 msgstr "A&gordi..."
 
-#: identitydialog.cpp:169
+#: identitydialog.cpp:193
 msgid "Your OpenPGP Signature Key"
 msgstr "Via OpenPGP-ŝlosilo"
 
-#: identitydialog.cpp:170
+#: identitydialog.cpp:194
 msgid ""
 "Select the OpenPGP key which should be used to digitally sign your messages."
 msgstr "Elektu la OpenPGP-ŝlosilon uzotan por subskribi viajn mesaĝojn."
 
-#: identitydialog.cpp:174
+#: identitydialog.cpp:198
 msgid ""
 "<qt>"
 "<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
@@ -3635,15 +4022,15 @@ msgstr ""
 "OpenPGP. Normalaj leteraj funkcioj ne estas afekciataj.</p> "
 "<p>Vi trovos pli multa pri ŝlosiloj en <a>http://www.gnupg.org</a></p></qt>"
 
-#: identitydialog.cpp:181
+#: identitydialog.cpp:205
 msgid "OpenPGP signing key:"
 msgstr "OpenPGP-subskriba ŝlosilo:"
 
-#: identitydialog.cpp:193
+#: identitydialog.cpp:217
 msgid "Your OpenPGP Encryption Key"
 msgstr "Via OpenPGP-ĉifriga ŝlosilo"
 
-#: identitydialog.cpp:194
+#: identitydialog.cpp:218
 msgid ""
 "Select the OpenPGP key which should be used when encrypting to yourself and for "
 "the \"Attach My Public Key\" feature in the composer."
@@ -3651,7 +4038,7 @@ msgstr ""
 "Elektu la OpenPGP-ŝlosilon uzotan por ĉifri mesaĝojn, kiujn vi sendas al vi "
 "mem, kaj por la eco de kunsendo de la publika ŝlosilo en la redaktilo."
 
-#: identitydialog.cpp:199
+#: identitydialog.cpp:223
 msgid ""
 "<qt>"
 "<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
@@ -3670,15 +4057,15 @@ msgstr ""
 "mesaĝojn por vi per OpenPGP. Normalaj leteraj funkcioj ne estos afekciataj.</p> "
 "<p>Vi povos trovi pli multan pri ŝlosilo en <a>http://www.gnupg.org</a></qt>"
 
-#: identitydialog.cpp:206
+#: identitydialog.cpp:230
 msgid "OpenPGP encryption key:"
 msgstr "OpenPGP-ĉifriga ŝlosilo:"
 
-#: identitydialog.cpp:218
+#: identitydialog.cpp:242
 msgid "Your S/MIME Signature Certificate"
 msgstr "Via S/MIME-subskriba atestilo"
 
-#: identitydialog.cpp:219
+#: identitydialog.cpp:243
 msgid ""
 "Select the S/MIME certificate which should be used to digitally sign your "
 "messages."
@@ -3686,7 +4073,7 @@ msgstr ""
 "Elektu la S/MIME-atestilon uzotan por subskribi viajn mesaĝojn kaj por ĉifri "
 "mesaĝojn."
 
-#: identitydialog.cpp:223
+#: identitydialog.cpp:247
 msgid ""
 "<qt>"
 "<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
@@ -3700,15 +4087,15 @@ msgstr ""
 "<p> Vi povas lasi ĝin malblanka, sed KMail ne povos ĉifrigi kopiojn de senditaj "
 "mesaĝojn por vi per OpenPGP. Normalaj leteraj funkcioj ne estos afekciataj.</p> "
 
-#: identitydialog.cpp:228
+#: identitydialog.cpp:252
 msgid "S/MIME signing certificate:"
 msgstr "S/MIME-subskriba atestilo:"
 
-#: identitydialog.cpp:244
+#: identitydialog.cpp:268
 msgid "Your S/MIME Encryption Certificate"
 msgstr "Via S/MIME-ĉifra atestilo"
 
-#: identitydialog.cpp:245
+#: identitydialog.cpp:269
 msgid ""
 "Select the S/MIME certificate which should be used when encrypting to yourself "
 "and for the \"Attach My Certificate\" feature in the composer."
@@ -3716,7 +4103,7 @@ msgstr ""
 "Elektu la S/MIME-atestilon uzotan por ĉifri mesaĝojn, kiujn vi sendas al vi "
 "mem, kaj por la eco de kunsendo de la publika ŝlosilo en la redaktilo."
 
-#: identitydialog.cpp:250
+#: identitydialog.cpp:274
 msgid ""
 "<qt>"
 "<p>The S/MIME certificate you choose here will be used to encrypt messages to "
@@ -3732,23 +4119,23 @@ msgstr ""
 "mesaĝojn por vi per S/MIME. Normalaj leteraj funkcioj ne estos afekciataj.</p>"
 "</qt>"
 
-#: identitydialog.cpp:256
+#: identitydialog.cpp:280
 msgid "S/MIME encryption certificate:"
 msgstr "S/MIME-ĉifra atestilo:"
 
-#: identitydialog.cpp:277
+#: identitydialog.cpp:301
 msgid "Preferred crypto message format:"
 msgstr "Preferata ĉifromesaĝa formo:"
 
-#: identitydialog.cpp:290
+#: identitydialog.cpp:314
 msgid "&Advanced"
 msgstr "&Pliaj opcioj"
 
-#: identitydialog.cpp:300
+#: identitydialog.cpp:324
 msgid "&Reply-To address:"
 msgstr "&Respondadreso:"
 
-#: identitydialog.cpp:302
+#: identitydialog.cpp:326
 msgid ""
 "<qt>"
 "<h3>Reply-To addresses</h3>"
@@ -3767,11 +4154,11 @@ msgstr ""
 "adreson en <tt>De:</tt>, sed la sepondoj adresas la tutan grupon.</p> "
 "<p>Se ĝi diras nenion al vi, lasu ĝin malplena.</p> </qt>"
 
-#: identitydialog.cpp:319
+#: identitydialog.cpp:343
 msgid "&BCC addresses:"
 msgstr "&Nevideblaj adresoj:"
 
-#: identitydialog.cpp:321
+#: identitydialog.cpp:345
 msgid ""
 "<qt>"
 "<h3>BCC (Blind Carbon Copy) addresses</h3>"
@@ -3792,47 +4179,52 @@ msgstr ""
 "<p>Uzu komojn por krei liston de adresatoj.</p>"
 "<p>Se ĝi diras nenion al vi, lasu ĝin malplena.</p> </qt>"
 
-#: identitydialog.cpp:337
+#: identitydialog.cpp:361
 msgid "D&ictionary:"
 msgstr "&Vortaro:"
 
-#: identitydialog.cpp:346
+#: identitydialog.cpp:370
 msgid "Sent-mail &folder:"
 msgstr "Sendaĵa &leterujo:"
 
-#: identitydialog.cpp:355
+#: identitydialog.cpp:379
 msgid "&Drafts folder:"
 msgstr "&Malnetaĵoj:"
 
-#: identitydialog.cpp:364
+#: identitydialog.cpp:388
 msgid "&Templates folder:"
 msgstr "&Ŝablonujo:"
 
-#: identitydialog.cpp:369
+#: identitydialog.cpp:393
 msgid "Special &transport:"
 msgstr "Speciala &transporto:"
 
-#: identitydialog.cpp:386 kmfolderdia.cpp:717
+#: identitydialog.cpp:410 kmfolderdia.cpp:808
 msgid "&Use custom message templates"
 msgstr "&Uzi proprajn mesaĝoŝablonojn"
 
-#: identitydialog.cpp:392 kmfolderdia.cpp:725
+#: identitydialog.cpp:416 kmfolderdia.cpp:816
 msgid "&Copy global templates"
 msgstr "&Kopii tutprogramajn ŝablonojn"
 
-#: identitydialog.cpp:407
+#: identitydialog.cpp:431
 msgid "&Signature"
 msgstr "&Subskribo"
 
-#: identitydialog.cpp:411
+#: identitydialog.cpp:435
 msgid "&Picture"
 msgstr "&Bildo"
 
-#: identitydialog.cpp:486 identitydialog.cpp:498 kmcomposewin.cpp:4004
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
 msgid "Invalid Email Address"
 msgstr "Nelaŭregula retpoŝtadreso"
 
-#: identitydialog.cpp:518
+#: identitydialog.cpp:530
+#, fuzzy
+msgid "Invalid Email Alias \"%1\""
+msgstr "Nelaŭregula retpoŝtadreso"
+
+#: identitydialog.cpp:551
 msgid ""
 "One of the configured OpenPGP signing keys does not contain any user ID with "
 "the configured email address for this identity (%1).\n"
@@ -3844,7 +4236,7 @@ msgstr ""
 "Do ĝi povas kaŭzi avertmesaĝon ĉe la adresato, kiam tie estos provata la "
 "konfirmon de ĉi tiu subskribo."
 
-#: identitydialog.cpp:527
+#: identitydialog.cpp:560
 msgid ""
 "One of the configured OpenPGP encryption keys does not contain any user ID with "
 "the configured email address for this identity (%1)."
@@ -3852,7 +4244,7 @@ msgstr ""
 "Unu el la agorditaj OpenPGP-subskribaj ŝlosiloj ne havas iun uzantnomon, kiu "
 "konvenas al la retpoŝtadreson por tiu nomo (%1). "
 
-#: identitydialog.cpp:534
+#: identitydialog.cpp:567
 msgid ""
 "One of the configured S/MIME signing certificates does not contain the "
 "configured email address for this identity (%1).\n"
@@ -3864,7 +4256,7 @@ msgstr ""
 "Do ĝi povas kaŭzi avertmesaĝon ĉe la adresato, kiam tie estos provata la "
 "konfirmon de ĉi tiu subskribo."
 
-#: identitydialog.cpp:543
+#: identitydialog.cpp:576
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
 "configured email address for this identity (%1)."
@@ -3872,19 +4264,19 @@ msgstr ""
 "Unu el la agorditaj S/MIME-subskribaj testiloj ne havas iun uzantnomon, kiu "
 "konvenas al la retpoŝtadreson por tiu nomo (%1)."
 
-#: identitydialog.cpp:551
+#: identitydialog.cpp:584
 msgid "Email Address Not Found in Key/Certificates"
 msgstr "Retpoŝtadreso ne trovita en ŝlosiloj aŭ testiloj"
 
-#: identitydialog.cpp:562
+#: identitydialog.cpp:595
 msgid "The signature file is not valid"
 msgstr "La subskribodosiero de estas valida"
 
-#: identitydialog.cpp:582
+#: identitydialog.cpp:615
 msgid "Edit Identity \"%1\""
 msgstr "Redakti identecon \"%1\""
 
-#: identitydialog.cpp:606
+#: identitydialog.cpp:640
 msgid ""
 "The custom sent-mail folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default sent-mail folder will be used."
@@ -3892,7 +4284,7 @@ msgstr ""
 "La senditaj-mesaĝoj-leterujo de la identeco \"%1\" (jam) ne ekzistas. Pro tio "
 "la apriora leterujo por senditaj mesaĝoj estos uzata."
 
-#: identitydialog.cpp:617
+#: identitydialog.cpp:651
 msgid ""
 "The custom drafts folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default drafts folder will be used."
@@ -3900,7 +4292,7 @@ msgstr ""
 "La malnetaĵoj-leterujo de la identeco \"%1\" (jam) ne ekzistas. Pro tio la "
 "apriora leterujo por senditaj mesaĝoj estos uzata."
 
-#: identitydialog.cpp:628
+#: identitydialog.cpp:662
 msgid ""
 "The custom templates folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default templates folder will be used."
@@ -3923,112 +4315,112 @@ msgstr "Identeco"
 msgid "Email Address"
 msgstr "Retpoŝta adreso"
 
-#: imapaccountbase.cpp:291 popaccount.cpp:154
+#: imapaccountbase.cpp:293 popaccount.cpp:154
 msgid "You need to supply a username and a password to access this mailbox."
 msgstr "Vi devas doni salutnomon kaj pasvorton por aliri tiun poŝtkeston."
 
-#: imapaccountbase.cpp:296
+#: imapaccountbase.cpp:298
 msgid "Authorization Dialog"
 msgstr ""
 
-#: imapaccountbase.cpp:297 popaccount.cpp:155
+#: imapaccountbase.cpp:299 popaccount.cpp:155
 msgid "Account:"
 msgstr "Konto:"
 
-#: imapaccountbase.cpp:318
+#: imapaccountbase.cpp:320
 #, c-format
 msgid "Could not start process for %1."
 msgstr "Ne eblis lanĉi procezon por %1."
 
-#: imapaccountbase.cpp:399
+#: imapaccountbase.cpp:403
 msgid "Error while trying to subscribe to %1:"
 msgstr "Eraro dum subskribo de %1:"
 
-#: imapaccountbase.cpp:637
+#: imapaccountbase.cpp:645
 msgid "Retrieving Namespaces"
 msgstr "Prenante nomspacojn"
 
-#: imapaccountbase.cpp:728
+#: imapaccountbase.cpp:736
 msgid ""
 "KMail has detected a prefix entry in the configuration of the account \"%1\" "
 "which is obsolete with the support of IMAP namespaces."
 msgstr ""
 
-#: imapaccountbase.cpp:742 imapaccountbase.cpp:756
+#: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
 "The configuration was automatically migrated but you should check your account "
 "configuration."
 msgstr ""
 
-#: imapaccountbase.cpp:760
+#: imapaccountbase.cpp:768
 msgid ""
 "It was not possible to migrate your configuration automatically so please check "
 "your account configuration."
 msgstr ""
 
-#: imapaccountbase.cpp:874 imapaccountbase.cpp:875
+#: imapaccountbase.cpp:882 imapaccountbase.cpp:883
 msgid "<unknown>"
 msgstr "<nekonata>"
 
-#: imapaccountbase.cpp:876
+#: imapaccountbase.cpp:884
 msgid "Error while uploading message"
 msgstr "Eraro dum mesaĝa alŝuto"
 
-#: imapaccountbase.cpp:878
+#: imapaccountbase.cpp:886
 #, fuzzy
 msgid ""
 "Could not upload the message dated %1 from <i>%2</i> with subject <i>%3</i> "
 "to the server."
 msgstr "Ne eblas alŝuti la mesaĝon datitan %1 de %2 temitan %3 en la servilon."
 
-#: imapaccountbase.cpp:880
+#: imapaccountbase.cpp:888
 #, fuzzy
 msgid "The destination folder was: <b>%1</b>."
 msgstr "Celleterujo: %1"
 
-#: 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 "Neniu stato haviĝebla"
 
-#: 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
 msgid ""
 "The connection to the server %1 was unexpectedly closed or timed out. It will "
 "be re-established automatically if possible."
 msgstr ""
 
-#: imapaccountbase.cpp:957
+#: imapaccountbase.cpp:965
 msgid "The connection to account %1 was broken."
 msgstr ""
 
-#: imapaccountbase.cpp:960
+#: imapaccountbase.cpp:968
 msgid "The connection to account %1 timed out."
 msgstr ""
 
-#: imapaccountbase.cpp:1245
+#: imapaccountbase.cpp:1253
 msgid "Error while uploading status of messages to server: "
 msgstr "Eraro dum alŝuto de la mesaĝa stato en la servilon: "
 
-#: imapaccountbase.cpp:1290 listjob.cpp:118
+#: imapaccountbase.cpp:1298 listjob.cpp:118
 msgid "retrieving folders"
 msgstr "Reprenante leterujojn"
 
-#: imapjob.cpp:153 kmfolderimap.cpp:496
+#: imapjob.cpp:153 kmfolderimap.cpp:490
 msgid "Uploading message data"
 msgstr "Alŝutante mesaĝdatumojn"
 
@@ -4052,46 +4444,379 @@ msgstr "Mesaĝo kun temo: "
 msgid "Error while retrieving messages from the server."
 msgstr "Eraro dum preno de mesaĝoj de la servilo."
 
-#: imapjob.cpp:483
+#: imapjob.cpp:485
 msgid "Error while retrieving information on the structure of a message."
 msgstr "Eraro dum preno informoj pri la strukturo de mesaĝo."
 
-#: imapjob.cpp:541
+#: imapjob.cpp:543
 msgid "Uploading message data failed."
 msgstr "Fiaskis alŝuti mesaĝdatumojn"
 
-#: imapjob.cpp:546
+#: imapjob.cpp:548
 msgid "Uploading message data completed."
 msgstr "Finiĝis alŝuti mesaĝdatumojn"
 
-#: imapjob.cpp:650
+#: imapjob.cpp:652
 msgid "Error while copying messages."
 msgstr "Eraro dum kopiado de mesaĝoj."
 
-#: keyresolver.cpp:234
+#: importarchivedialog.cpp:36
+#, fuzzy
+msgid "Import Archive"
+msgstr "Listarĥivoj"
+
+#: importarchivedialog.cpp:87
+msgid "Please select an archive file that should be imported."
+msgstr ""
+
+#: importarchivedialog.cpp:88
+#, fuzzy
+msgid "No archive file selected"
+msgstr "Neniu leterujo elektita"
+
+#: importarchivedialog.cpp:93
+#, fuzzy
+msgid "Please select the folder where the archive should be imported to."
+msgstr "Bonvolu elekti leterujon en kiun eksvalidigi mesaĝojn."
+
+#: importarchivedialog.cpp:94
+#, fuzzy
+msgid "No target folder selected"
+msgstr "Neniu leterujo elektita"
+
+#: 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 nova sekretŝlosilo estas importita.\n"
+"%n novaj sekretŝlosiloj estas importitaj."
+
+#: importjob.cpp:83
+#, fuzzy
+msgid "Import finished."
+msgstr "vCard-importo fiaskis"
+
+#: importjob.cpp:98
+#, fuzzy
+msgid "Failed to import the archive into folder '%1'."
+msgstr "Ne eblis krei dosierujon"
+
+#: importjob.cpp:105
+#, fuzzy
+msgid "Importing archive failed."
+msgstr "Aktualigante kaŝmemoran dosieron"
+
+#: importjob.cpp:114 importjob.cpp:287
+#, fuzzy
+msgid "Unable to create subfolder for folder '%1'."
+msgstr "Ne eblis krei dosierujon"
+
+#: importjob.cpp:214
+#, fuzzy, c-format
+msgid "Importing folder %1"
+msgstr "Forigante leterujon"
+
+#: importjob.cpp:234
+#, fuzzy
+msgid "Failed to add a message to the folder '%1'."
+msgstr "Ne eblas aldoni mesaĝon al leterujo: "
+
+#: importjob.cpp:254
+#, fuzzy
+msgid "Failed to upload a message to the IMAP server."
+msgstr "&Lasi prenitajn poŝtaĵojn en la servilo"
+
+#: 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 "Listarĥivoj"
+
+#: 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 "Neuzeblaj ĉifraj ŝlosiloj"
 
-#: 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>Via OpenPGP-subskriba ŝlosilo</p><p align=center><b>%1</b> "
+"(ŝlosilnumero 0x%2)</p>"
+"<p>nevalidiĝos en malpli ol unu tago.</p>\n"
+"<p>Via OpenPGP-subskriba ŝlosilo</p><p align=center><b>%1</b> "
+"(ŝlosilnumero 0x%2)</p>"
+"<p>nevalidiĝos en malpli ol %n tago.</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>Via OpenPGP-ĉifra ŝlosilo</p><p align=center><b>%1</b> "
+"(ŝlosilnumero 0x%2)</p>"
+"<p>nevalidiĝos en malpli ol unu tago.</p>\n"
+"<p>Via OpenPGP-ĉifra ŝlosilo</p><p align=center><b>%1</b> "
+"(ŝlosilnumero 0x%2)</p>"
+"<p>nevalidiĝos en malpli ol %n tago.</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>Via OpenPGP-ŝlosilo</p><p align=center><b>%1</b> (ŝlosilnumero 0x%2)</p>"
+"<p>nevalidiĝos en malpli ol unu tago.</p>\n"
+"<p>Via OpenPGP-ŝlosilo</p><p align=center><b>%1</b> (ŝlosilnumero 0x%2)</p>"
+"<p>nevalidiĝos en malpli ol %n tago.</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>La radikatestilo</p><p align=center><b>%3</b></p>"
+"<p>por via S/MIME-subskriba atestilo</p><p align=center><b>%1</b> "
+"(ŝlosilnumero 0x%2)</p>"
+"<p>nevalidiĝos en malpli ol unu tago.</p>\n"
+"<p>La radikatestilo</p><p align=center><b>%3</b></p>"
+"<p>por via S/MIME-subskriba atestilo</p><p align=center><b>%1</b> "
+"(ŝlosilnumero 0x%2)</p>"
+"<p>nevalidiĝos en malpli ol %n tago.</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>La radikatestilo</p><p align=center><b>%3</b></p>"
+"<p>por via S/MIME-ĉifra atestilo</p><p align=center><b>%1</b> "
+"(ŝlosilnumero 0x%2)</p>"
+"<p>nevalidiĝos en malpli ol unu tago.</p>\n"
+"<p>La radikatestilo</p><p align=center><b>%3</b></p>"
+"<p>por via S/MIME-ĉifra atestilo</p><p align=center><b>%1</b> "
+"(ŝlosilnumero 0x%2)</p>"
+"<p>nevalidiĝos en malpli ol %n tago.</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>La radikatestilo</p><p align=center><b>%3</b></p>"
+"<p>por via S/MIME-atestilo</p><p align=center><b>%1</b> (ŝlosilnumero 0x%2)</p>"
+"<p>nevalidiĝos en malpli ol unu tago.</p>\n"
+"<p>La radikatestilo</p><p align=center><b>%3</b></p>"
+"<p>por via S/MIME-atestilo</p><p align=center><b>%1</b> (ŝlosilnumero 0x%2)</p>"
+"<p>nevalidiĝos en malpli ol %n tago.</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>La interatestilo</p><p align=center><b>%3</b></p>"
+"<p>por via S/MIME-subskriba atestilo</p><p align=center><b>%1</b> "
+"(ŝlosilnumero 0x%2)</p>"
+"<p>nevalidiĝos en malpli ol unu tago.</p>\n"
+"<p>La interatestilo</p><p align=center><b>%3</b></p>"
+"<p>por via S/MIME-subskriba atestilo</p><p align=center><b>%1</b> "
+"(ŝlosilnumero 0x%2)</p>"
+"<p>nevalidiĝos en malpli ol %n tago.</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>La interatestilo</p><p align=center><b>%3</b></p>"
+"<p>por via S/MIME-ĉifra atestilo</p><p align=center><b>%1</b> "
+"(ŝlosilnumero 0x%2)</p>"
+"<p>nevalidiĝos en malpli ol unu tago.</p>\n"
+"<p>La interatestilo</p><p align=center><b>%3</b></p>"
+"<p>por via S/MIME-ĉifra atestilo</p><p align=center><b>%1</b> "
+"(ŝlosilnumero 0x%2)</p>"
+"<p>nevalidiĝos en malpli ol %n tago.</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>La interatestilo</p><p align=center><b>%3</b></p>"
+"<p>por via S/MIME-atestilo</p><p align=center><b>%1</b> (ŝlosilnumero 0x%2)</p>"
+"<p>nevalidiĝos en malpli ol unu tago.</p>\n"
+"<p>La interatestilo</p><p align=center><b>%3</b></p>"
+"<p>por via S/MIME-atestilo</p><p align=center><b>%1</b> (ŝlosilnumero 0x%2)</p>"
+"<p>nevalidiĝos en malpli ol %n tago.</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>Via S/MIME-subskriba atestilo</p><p align=center><b>%1</b> "
+"(ŝlosilnumero 0x%2)</p>"
+"<p>nevalidiĝos en malpli ol unu tago.</p>\n"
+"<p>Via S/MIME-subskriba atestilo</p><p align=center><b>%1</b> "
+"(ŝlosilnumero 0x%2)</p>"
+"<p>nevalidiĝos en malpli ol %n tago.</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>Via S/MIME-ĉifra atestilo</p><p align=center><b>%1</b> "
+"(ŝlosilnumero 0x%2)</p>"
+"<p>nevalidiĝos en malpli ol unu tago.</p>\n"
+"<p>Via S/MIME-ĉifra atestilo</p><p align=center><b>%1</b> "
+"(ŝlosilnumero 0x%2)</p>"
+"<p>nevalidiĝos en malpli ol %n tago.</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>Via S/MIME-atestilo</p><p align=center><b>%1</b> (ŝlosilnumero 0x%2)</p>"
+"<p>nevalidiĝos en malpli ol unu tago.</p>\n"
+"<p>Via S/MIME-atestilo</p><p align=center><b>%1</b> (ŝlosilnumero 0x%2)</p>"
+"<p>nevalidiĝos en malpli ol %n tago.</p>"
+
+#: keyresolver.cpp:724
+#, fuzzy
+msgid "OpenPGP Key Expired"
+msgstr "OpenPGP-ŝlosilo baldaŭ nevalidiĝas"
+
+#: keyresolver.cpp:725
+#, fuzzy
+msgid "S/MIME Certificate Expired"
+msgstr "S/MIME-atestilo baldaŭ nevalidiĝas"
+
+#: keyresolver.cpp:750
 msgid ""
 "_n: "
 "<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
@@ -4106,7 +4831,7 @@ msgstr ""
 "(ŝlosilnumero 0x%2)</p>"
 "<p>nevalidiĝos en malpli ol %n tago.</p>"
 
-#: keyresolver.cpp:558
+#: keyresolver.cpp:755
 msgid ""
 "_n: "
 "<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
@@ -4121,7 +4846,7 @@ msgstr ""
 "(ŝlosilnumero 0x%2)</p>"
 "<p>nevalidiĝos en malpli ol %n tago.</p>"
 
-#: keyresolver.cpp:563
+#: keyresolver.cpp:760
 msgid ""
 "_n: "
 "<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
@@ -4134,7 +4859,7 @@ msgstr ""
 "<p>Via OpenPGP-ŝlosilo</p><p align=center><b>%1</b> (ŝlosilnumero 0x%2)</p>"
 "<p>nevalidiĝos en malpli ol %n tago.</p>"
 
-#: keyresolver.cpp:573
+#: keyresolver.cpp:770
 msgid ""
 "_n: "
 "<p>The root certificate</p><p align=center><b>%3</b></p>"
@@ -4155,7 +4880,7 @@ msgstr ""
 "(ŝlosilnumero 0x%2)</p>"
 "<p>nevalidiĝos en malpli ol %n tago.</p>"
 
-#: keyresolver.cpp:580
+#: keyresolver.cpp:777
 msgid ""
 "_n: "
 "<p>The root certificate</p><p align=center><b>%3</b></p>"
@@ -4176,7 +4901,7 @@ msgstr ""
 "(ŝlosilnumero 0x%2)</p>"
 "<p>nevalidiĝos en malpli ol %n tago.</p>"
 
-#: keyresolver.cpp:587
+#: keyresolver.cpp:784
 msgid ""
 "_n: "
 "<p>The root certificate</p><p align=center><b>%3</b></p>"
@@ -4193,7 +4918,7 @@ msgstr ""
 "<p>por via S/MIME-atestilo</p><p align=center><b>%1</b> (ŝlosilnumero 0x%2)</p>"
 "<p>nevalidiĝos en malpli ol %n tago.</p>"
 
-#: keyresolver.cpp:595
+#: keyresolver.cpp:792
 msgid ""
 "_n: "
 "<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
@@ -4214,7 +4939,7 @@ msgstr ""
 "(ŝlosilnumero 0x%2)</p>"
 "<p>nevalidiĝos en malpli ol %n tago.</p>"
 
-#: keyresolver.cpp:602
+#: keyresolver.cpp:799
 msgid ""
 "_n: "
 "<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
@@ -4235,7 +4960,7 @@ msgstr ""
 "(ŝlosilnumero 0x%2)</p>"
 "<p>nevalidiĝos en malpli ol %n tago.</p>"
 
-#: keyresolver.cpp:609
+#: keyresolver.cpp:806
 msgid ""
 "_n: "
 "<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
@@ -4252,7 +4977,7 @@ msgstr ""
 "<p>por via S/MIME-atestilo</p><p align=center><b>%1</b> (ŝlosilnumero 0x%2)</p>"
 "<p>nevalidiĝos en malpli ol %n tago.</p>"
 
-#: keyresolver.cpp:618
+#: keyresolver.cpp:815
 msgid ""
 "_n: "
 "<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
@@ -4269,7 +4994,7 @@ msgstr ""
 "(ŝlosilnumero 0x%2)</p>"
 "<p>nevalidiĝos en malpli ol %n tago.</p>"
 
-#: keyresolver.cpp:623
+#: keyresolver.cpp:820
 msgid ""
 "_n: "
 "<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
@@ -4286,7 +5011,7 @@ msgstr ""
 "(ŝlosilnumero 0x%2)</p>"
 "<p>nevalidiĝos en malpli ol %n tago.</p>"
 
-#: keyresolver.cpp:628
+#: keyresolver.cpp:825
 msgid ""
 "_n: "
 "<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
@@ -4301,15 +5026,15 @@ msgstr ""
 "<p>Via S/MIME-atestilo</p><p align=center><b>%1</b> (ŝlosilnumero 0x%2)</p>"
 "<p>nevalidiĝos en malpli ol %n tago.</p>"
 
-#: keyresolver.cpp:634
+#: keyresolver.cpp:832
 msgid "OpenPGP Key Expires Soon"
 msgstr "OpenPGP-ŝlosilo baldaŭ nevalidiĝas"
 
-#: keyresolver.cpp:635
+#: keyresolver.cpp:833
 msgid "S/MIME Certificate Expires Soon"
 msgstr "S/MIME-atestilo baldaŭ nevalidiĝas"
 
-#: keyresolver.cpp:668
+#: keyresolver.cpp:867
 msgid ""
 "One or more of your configured OpenPGP encryption keys or S/MIME certificates "
 "is not usable for encryption. Please reconfigure your encryption keys and "
@@ -4322,11 +5047,11 @@ msgstr ""
 "Se vi pluigas kaj la ŝlosiloj estos necesaj poste, vi estos postulata pri "
 "elekto de la ŝlosiloj."
 
-#: keyresolver.cpp:676 keyresolver.cpp:989 keyresolver.cpp:1016
+#: keyresolver.cpp:875 keyresolver.cpp:1204 keyresolver.cpp:1231
 msgid "Unusable Encryption Keys"
 msgstr "Neuzeblaj ĉifraj ŝlosiloj"
 
-#: keyresolver.cpp:712
+#: keyresolver.cpp:911
 msgid ""
 "One or more of your configured OpenPGP signing keys or S/MIME signing "
 "certificates is not usable for signing. Please reconfigure your signing keys "
@@ -4340,11 +5065,11 @@ msgstr ""
 "Se vi pluigas kaj la ŝlosiloj estos necesaj poste, vi estos postulata pri "
 "elekto de la ŝlosiloj."
 
-#: keyresolver.cpp:720 keyresolver.cpp:1043 keyresolver.cpp:1059
+#: keyresolver.cpp:919 keyresolver.cpp:1258 keyresolver.cpp:1274
 msgid "Unusable Signing Keys"
 msgstr "Neuzeblaj subskribaj ŝlosiloj"
 
-#: keyresolver.cpp:980
+#: keyresolver.cpp:1195
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
@@ -4359,7 +5084,7 @@ msgstr ""
 "Vi povas plufari kun neĉifrigo al vi, sed sciu, ke vi ne eblos legi viajn "
 "propajn mesaĝojn pro tio."
 
-#: keyresolver.cpp:1007
+#: keyresolver.cpp:1222
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
@@ -4374,7 +5099,7 @@ msgstr ""
 "Vi povas plufari kun neĉifrigo al vi, sed sciu, ke vi ne eblos legi viajn "
 "propajn mesaĝojn pro tio."
 
-#: keyresolver.cpp:1037
+#: keyresolver.cpp:1252
 msgid ""
 "Examination of recipient's signing preferences yielded that the message should "
 "be signed using OpenPGP, at least for some recipients;\n"
@@ -4385,11 +5110,11 @@ msgstr ""
 "per OpenPGP, minimume por kelkaj adresatoj.\n"
 "Sed vi ne agordis validajn fiditajn ŝlosilojn de OpenPGP por tiu identeco."
 
-#: keyresolver.cpp:1044
+#: keyresolver.cpp:1259
 msgid "Do Not OpenPGP-Sign"
 msgstr "Ne subskribi per OpenPGP"
 
-#: keyresolver.cpp:1053
+#: keyresolver.cpp:1268
 msgid ""
 "Examination of recipient's signing preferences yielded that the message should "
 "be signed using S/MIME, at least for some recipients;\n"
@@ -4400,11 +5125,11 @@ msgstr ""
 "per S/MIME, minimume por kelkaj adresatoj.\n"
 "Sed vi ne agordis validajn fiditajn ŝlosilojn de S/MIME por tiu identeco."
 
-#: keyresolver.cpp:1060
+#: keyresolver.cpp:1275
 msgid "Do Not S/MIME-Sign"
 msgstr "Ne subskribi per S/MIME"
 
-#: keyresolver.cpp:1116
+#: keyresolver.cpp:1331
 msgid ""
 "Examination of recipient's signing preferences showed no common type of "
 "signature matching your available signing keys.\n"
@@ -4414,11 +5139,11 @@ msgstr ""
 "subskribo kongrua al viaj subskriboŝlosiloj.\n"
 "Ĉu sendi la mesaĝon sen subskribi?"
 
-#: keyresolver.cpp:1120
+#: keyresolver.cpp:1335
 msgid "No signing possible"
 msgstr "Subskribado ne eblas"
 
-#: keyresolver.cpp:1275
+#: keyresolver.cpp:1490
 msgid ""
 "You did not select an encryption key for yourself (encrypt to self). You will "
 "not be able to decrypt your own message if you encrypt it."
@@ -4426,16 +5151,16 @@ msgstr ""
 "Vi ne elektis ĉifroŝlosilon por vi mem (ĉifri por si). Vi ne eblas malĉifri "
 "viajn proprajn mesaĝojn, se vi ĉifri ilin."
 
-#: keyresolver.cpp:1279 keyresolver.cpp:1303 keyresolver.cpp:1317
+#: keyresolver.cpp:1494 keyresolver.cpp:1518 keyresolver.cpp:1532
 msgid "Missing Key Warning"
 msgstr "Averto de manka ŝlosilo"
 
-#: keyresolver.cpp:1280 keyresolver.cpp:1318 messagecomposer.cpp:885
-#: messagecomposer.cpp:910 messagecomposer.cpp:957
+#: keyresolver.cpp:1495 keyresolver.cpp:1533 messagecomposer.cpp:883
+#: messagecomposer.cpp:908 messagecomposer.cpp:955
 msgid "&Encrypt"
 msgstr "Ĉi&frado"
 
-#: keyresolver.cpp:1296
+#: keyresolver.cpp:1511
 msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
@@ -4443,7 +5168,7 @@ msgstr ""
 "Vi ne elektis ĉifroŝlosilon por la mesaĝa adresato. Do la mesaĝo ne estos "
 "ĉifrigata."
 
-#: keyresolver.cpp:1299
+#: keyresolver.cpp:1514
 msgid ""
 "You did not select an encryption key for any of the recipients of this message; "
 "therefore, the message will not be encrypted."
@@ -4451,11 +5176,11 @@ msgstr ""
 "Vi ne elektis ĉifroŝlosilon por iu el la mesaĝaj adresatoj. Do la mesaĝo ne "
 "estos ĉifrigata."
 
-#: keyresolver.cpp:1304 messagecomposer.cpp:933
+#: keyresolver.cpp:1519 messagecomposer.cpp:931
 msgid "Send &Unencrypted"
 msgstr "Sendi neĉ&ifrite"
 
-#: keyresolver.cpp:1309
+#: keyresolver.cpp:1524
 msgid ""
 "You did not select an encryption key for one of the recipients: this person "
 "will not be able to decrypt the message if you encrypt it."
@@ -4463,7 +5188,7 @@ msgstr ""
 "Vi ne elektis ĉifroŝlosilon por unu el la mesaĝaj adresatoj: Tiu persono ne "
 "povos deĉifrigi la mesaĝon, se vi ĉifrigos ĝin."
 
-#: keyresolver.cpp:1312
+#: keyresolver.cpp:1527
 msgid ""
 "You did not select encryption keys for some of the recipients: these persons "
 "will not be able to decrypt the message if you encrypt it."
@@ -4471,55 +5196,60 @@ msgstr ""
 "Vi ne elektis ĉifroŝlosilon por kelkaj el la mesaĝaj adresatoj: Tiuj personoj "
 "ne povos deĉifrigi la mesaĝon, se vi ĉifrigos ĝin."
 
-#: keyresolver.cpp:1367
+#: keyresolver.cpp:1585
 msgid "Encryption Key Selection"
 msgstr "Elekto de ĉifroŝlosilo"
 
-#: 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 ""
 "Ekzistas problemo kun la ĉifroŝlosilo(j) por \"%1\".\n"
 "\n"
 "Reelektu la ŝlosilo(j)n, kiu(j)n vi volas uzi por tiun adresaton."
 
-#: 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 ""
 "Nenia valida kaj fifata ŝlosilo estas trovita por \"%1\".\n"
 "\n"
 "Elektu la ŝlosilo(j)n, kiu(j)n vi volas uzi por tiun adresaton."
 
-#: 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 ""
 "Pli ol unu ŝlosilo konformas al \"%1\".\n"
 "\n"
 "Elektu la ŝlosilo(j)n, kiu(j)n vi volas uzi por tiun adresaton."
 
-#: keyresolver.cpp:1567
+#: keyresolver.cpp:1800
 msgid "Name Selection"
 msgstr "Nomelekto"
 
-#: keyresolver.cpp:1567
+#: keyresolver.cpp:1800
 msgid "Which name shall the contact '%1' have in your addressbook?"
 msgstr "Kiun nomon haviĝos la kontakto '%1' en via adreslibro?"
 
-#: kmaccount.cpp:49 kmaccount.cpp:381 kmsender.cpp:538
+#: kmaccount.cpp:49 kmaccount.cpp:381 kmsender.cpp:539
 #, c-format
 msgid "Executing precommand %1"
 msgstr "Lanĉante antaŭkomandon %1"
@@ -4551,11 +5281,11 @@ msgstr ""
 msgid "Checking account: %1"
 msgstr "Kontrolanta konton: %1"
 
-#: kmacctimap.cpp:398 kmfolderimap.cpp:858
+#: kmacctimap.cpp:398 kmfolderimap.cpp:852
 msgid " completed"
 msgstr " finigita"
 
-#: kmacctimap.cpp:607 kmheaders.cpp:1275
+#: kmacctimap.cpp:607 kmheaders.cpp:1313
 msgid "Unable to process messages: "
 msgstr "Ne eblis trakti mesaĝojn: "
 
@@ -4586,11 +5316,11 @@ msgstr "Transsendo malsukcesis: Ne eblis ŝlosi %1."
 msgid "Moving message %3 of %2 from %1."
 msgstr "Prenante mesaĝon %3 de %2 el %1."
 
-#: kmacctlocal.cpp:244
+#: kmacctlocal.cpp:245
 msgid "<qt>Cannot remove mail from mailbox <b>%1</b>:<br>%2</qt>"
 msgstr "<qt>Ne eblas forigi mesaĝojn de poŝtujo <b>%1</b>:<br>%2</qt>"
 
-#: kmacctlocal.cpp:254
+#: kmacctlocal.cpp:255
 msgid ""
 "_n: Fetched 1 message from mailbox %1.\n"
 "Fetched %n messages from mailbox %1."
@@ -4634,45 +5364,45 @@ msgstr "&Nekonekta IMAPo"
 msgid "&Maildir mailbox"
 msgstr "&Maildir-poŝtkesto"
 
-#: kmailicalifaceimpl.cpp:90 kmfolderdia.cpp:448 newfolderdialog.cpp:125
+#: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "Poŝto"
 
-#: kmailicalifaceimpl.cpp:91 kmfolderdia.cpp:449 newfolderdialog.cpp:126
+#: kmailicalifaceimpl.cpp:94 kmfolderdia.cpp:507 newfolderdialog.cpp:131
 msgid "Calendar"
 msgstr "Kalendaro"
 
-#: kmailicalifaceimpl.cpp:92 kmfolderdia.cpp:450 newfolderdialog.cpp:127
+#: kmailicalifaceimpl.cpp:95 kmfolderdia.cpp:508 newfolderdialog.cpp:132
 msgid "Contacts"
 msgstr "Kontaktoj"
 
-#: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:451 newfolderdialog.cpp:128
+#: kmailicalifaceimpl.cpp:96 kmfolderdia.cpp:509 newfolderdialog.cpp:133
 msgid "Notes"
 msgstr "Notoj"
 
-#: kmailicalifaceimpl.cpp:94 kmfolderdia.cpp:452 newfolderdialog.cpp:129
+#: kmailicalifaceimpl.cpp:97 kmfolderdia.cpp:510 newfolderdialog.cpp:134
 msgid "Tasks"
 msgstr "Taskoj"
 
-#: kmailicalifaceimpl.cpp:95 kmfolderdia.cpp:453 newfolderdialog.cpp:130
+#: kmailicalifaceimpl.cpp:98 kmfolderdia.cpp:511 newfolderdialog.cpp:135
 msgid "Journal"
 msgstr "Ĵurnalo"
 
-#: kmailicalifaceimpl.cpp:667
+#: kmailicalifaceimpl.cpp:684
 msgid "%1's %2"
 msgstr ""
 
-#: kmailicalifaceimpl.cpp:681
+#: kmailicalifaceimpl.cpp:700
 #, fuzzy
 msgid "My %1 (%2)"
 msgstr "Fiaskis: %1 (%2)"
 
-#: kmailicalifaceimpl.cpp:685
+#: kmailicalifaceimpl.cpp:704 kmailicalifaceimpl.cpp:708
 #, c-format
 msgid "My %1"
 msgstr ""
 
-#: kmailicalifaceimpl.cpp:1726
+#: kmailicalifaceimpl.cpp:1777
 msgid ""
 "KMail will now create the required groupware folders as subfolders of %1; if "
 "you do not want this, cancel and the IMAP resource will be disabled"
@@ -4680,15 +5410,15 @@ msgstr ""
 "KMail tuj kreos la necesajn grupprogramujojn kiel subujoj de %1; se vi ne volas "
 "tion, premu \"Ne\" kaj la IMAP-risurco estos malŝaltata"
 
-#: kmailicalifaceimpl.cpp:1736
+#: kmailicalifaceimpl.cpp:1787
 msgid "%1: no folder found. It will be created."
 msgstr ""
 
-#: kmailicalifaceimpl.cpp:1738
+#: kmailicalifaceimpl.cpp:1789
 msgid "%1: found folder %2. It will be set as the main groupware folder."
 msgstr ""
 
-#: kmailicalifaceimpl.cpp:1744
+#: kmailicalifaceimpl.cpp:1795
 msgid ""
 "<qt>KMail found the following groupware folders in %1 and needs to perform the "
 "following operations: %2"
@@ -4698,24 +5428,33 @@ msgstr ""
 "sekvajn operacojn: %2"
 "<br>Se vi ne volas tion, premu \"Ne\" kaj la IMAP-risurco estos malŝaltata"
 
-#: kmailicalifaceimpl.cpp:1751
+#: kmailicalifaceimpl.cpp:1802
 msgid "Standard Groupware Folders"
 msgstr "Normaj grupoprogramaraj leterujoj"
 
-#: kmailicalifaceimpl.cpp:1953
+#: kmailicalifaceimpl.cpp:1992
+#, fuzzy
+msgid "Default folder"
+msgstr "Forigi leterujon"
+
+#: kmailicalifaceimpl.cpp:1993
+msgid "There are multiple %1 default folders, please choose one:"
+msgstr ""
+
+#: kmailicalifaceimpl.cpp:2019
 msgid "You do not have read/write permission to your %1 folder."
 msgstr "Vi ne havas legan aŭ skriban permeson por via dosiero %1."
 
-#: kmailicalifaceimpl.cpp:2007
+#: kmailicalifaceimpl.cpp:2073
 #, fuzzy
 msgid "You do not have read/write permission to your folder."
 msgstr "Vi ne havas legan aŭ skriban permeson por via dosiero %1."
 
-#: kmcommands.cpp:300
+#: kmcommands.cpp:304
 msgid "Please wait"
 msgstr "Bonvolu atendi"
 
-#: kmcommands.cpp:302 kmcommands.cpp:403
+#: kmcommands.cpp:306 kmcommands.cpp:407
 #, c-format
 msgid ""
 "_n: Please wait while the message is transferred\n"
@@ -4724,37 +5463,43 @@ msgstr ""
 "Bonvolu atendi dum la mesaĝtranssendo\n"
 "Bonvolu atendi dum la transsendo de %n mesaĝoj"
 
-#: kmcommands.cpp:594
+#: kmcommands.cpp:598
 msgid "Address copied to clipboard."
 msgstr "Adreso kopiita al interdeponejo"
 
-#: kmcommands.cpp:601
+#: kmcommands.cpp:605
 msgid "URL copied to clipboard."
 msgstr "URL kopiita al interdeponejo"
 
-#: kmcommands.cpp:638
+#: kmcommands.cpp:642
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr ""
 "<qt>La dosiero <b>%1</b> ekzistas. "
 "<br>Ĉu vi volas anstataŭigi ĝin?</qt>"
 
-#: kmcommands.cpp:639 kmcommands.cpp:939 kmkernel.cpp:1940
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2050
 msgid "Save to File"
 msgstr "Sekurigi al dosiero"
 
-#: kmcommands.cpp:639 kmcommands.cpp:939 kmkernel.cpp:1940
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2050
 msgid "&Replace"
 msgstr "&Anstataŭigi"
 
-#: kmcommands.cpp:739
+#: kmcommands.cpp:743
 msgid "Message as Plain Text"
 msgstr "Mesaĝo kiel plena teksto"
 
-#: 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
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -4762,19 +5507,19 @@ msgstr ""
 "La dosiero %1 ekzistas.\n"
 "Ĉu vi volas anstataŭigi ĝin?"
 
-#: kmcommands.cpp:982
+#: kmcommands.cpp:1009
 msgid "Open Message"
 msgstr "Malfermi mesaĝon"
 
-#: kmcommands.cpp:1020 kmcommands.cpp:1048
+#: kmcommands.cpp:1047 kmcommands.cpp:1075
 msgid "The file does not contain a message."
 msgstr "La dosiero ne enhavas mesaĝon."
 
-#: kmcommands.cpp:1066
+#: kmcommands.cpp:1093
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "La dosiero enhavas kelkajn mesaĝojn. Nur la unua estas montrata."
 
-#: kmcommands.cpp:1363
+#: kmcommands.cpp:1404
 msgid ""
 "\n"
 "This is a MIME digest forward. The content of the message is contained in the "
@@ -4788,83 +5533,83 @@ msgstr ""
 "\n"
 "\n"
 
-#: kmcommands.cpp:1697 kmheaders.cpp:1407
+#: kmcommands.cpp:1750 kmheaders.cpp:1445
 msgid "Filtering messages"
 msgstr "Filtrante mesaĝojn"
 
-#: kmcommands.cpp:1705 kmheaders.cpp:1415
+#: kmcommands.cpp:1758 kmheaders.cpp:1453
 msgid "Filtering message %1 of %2"
 msgstr "Filtrante mesaĝon %1 el %2"
 
-#: kmcommands.cpp:1715
+#: kmcommands.cpp:1768
 msgid "Not enough free disk space?"
 msgstr "Ne sufiĉe da spaco sur disko?"
 
-#: kmcommands.cpp:1881 kmfoldertree.cpp:1891
+#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr "Ŝovi al tiu leterujo"
 
-#: kmcommands.cpp:1883 kmfoldertree.cpp:1893
+#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr "Kopii al tiu leterujo"
 
-#: 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
 msgid "Moving messages"
 msgstr "Movante mesaĝojn"
 
-#: kmcommands.cpp:2133
+#: kmcommands.cpp:2186
 msgid "Deleting messages"
 msgstr "Forigante mesaĝojn"
 
-#: kmcommands.cpp:2406
+#: kmcommands.cpp:2471
 msgid "Opening URL..."
 msgstr "Malfermante URLon..."
 
-#: kmcommands.cpp:2413
+#: kmcommands.cpp:2478
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt>Ĉu vi vere volas lanĉi <b>%1</b>?</qt>"
 
-#: kmcommands.cpp:2414
+#: kmcommands.cpp:2479
 msgid "Execute"
 msgstr "Lanĉi"
 
-#: kmcommands.cpp:2495
+#: kmcommands.cpp:2561
 msgid "Found no attachments to save."
 msgstr "Neniuj kunsendaĵoj trovitaj por konservi."
 
-#: kmcommands.cpp:2508
+#: kmcommands.cpp:2574
 msgid "Save Attachments To"
 msgstr "Konservi kunsendaĵojn al"
 
-#: kmcommands.cpp:2528
+#: kmcommands.cpp:2594
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr "kunsendaĵo.1"
 
-#: kmcommands.cpp:2556
+#: kmcommands.cpp:2622
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr "kunsendaĵo.%1"
 
-#: kmcommands.cpp:2595
+#: kmcommands.cpp:2661
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr "La dosiero %1 jam ekzistas. Ĉu vi volas anstataŭigi ĝin?"
 
-#: kmcommands.cpp:2597
+#: kmcommands.cpp:2663
 msgid "File Already Exists"
 msgstr "La dosiero jam ekzistas"
 
-#: kmcommands.cpp:2597 util.h:211
+#: kmcommands.cpp:2663 util.h:211
 msgid "&Overwrite"
 msgstr "&Anstataŭigi"
 
-#: kmcommands.cpp:2619
+#: kmcommands.cpp:2685
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
@@ -4872,19 +5617,19 @@ msgstr ""
 "Tiu parto %1 de la mesaĝo estas ĉifrita. Ĉu vi volas lasi ĝin ĉifrita ĉe "
 "konservo?"
 
-#: kmcommands.cpp:2621 kmcommands.cpp:2630
+#: kmcommands.cpp:2687 kmcommands.cpp:2696
 msgid "KMail Question"
 msgstr "KMail-demando"
 
-#: kmcommands.cpp:2621
+#: kmcommands.cpp:2687
 msgid "Keep Encryption"
 msgstr "Konservi ĉifradon"
 
-#: kmcommands.cpp:2621 kmcommands.cpp:2630
+#: kmcommands.cpp:2687 kmcommands.cpp:2696
 msgid "Do Not Keep"
 msgstr "Ne konservi"
 
-#: kmcommands.cpp:2628
+#: kmcommands.cpp:2694
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
@@ -4892,11 +5637,11 @@ msgstr ""
 "Tiu parto %1 de la mesaĝo estas subskribita. Ĉu vi volas lasi ĝin subskribita "
 "ĉe konservo?"
 
-#: kmcommands.cpp:2630
+#: kmcommands.cpp:2696
 msgid "Keep Signature"
 msgstr "Konservi subskribon"
 
-#: kmcommands.cpp:2703
+#: kmcommands.cpp:2769
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
@@ -4905,12 +5650,12 @@ msgstr ""
 "Ne eblis skribi la dosieron %1:\n"
 "%2"
 
-#: kmcommands.cpp:2728
+#: kmcommands.cpp:2794
 #, c-format
 msgid "Could not write the file %1."
 msgstr "Ne eblis skribi la dosieron %1."
 
-#: kmcommands.cpp:2952
+#: kmcommands.cpp:3018
 msgid ""
 "There is no Address Book entry for this email address. Add them to the Address "
 "Book and then add instant messaging addresses using your preferred messaging "
@@ -4919,7 +5664,7 @@ msgstr ""
 "Por tiu retletera adreso ne ekzistas ero. Aldonu ĝin el la libron kaj tiam "
 "aldonu tujmesaĝajn adresojn per via preferata programo."
 
-#: kmcommands.cpp:2955
+#: kmcommands.cpp:3021
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
@@ -4929,114 +5674,181 @@ msgstr ""
 " %1\n"
 "Ne eblas determini, al kiu vi babilas."
 
-#: kmcommands.cpp:3179 kmcomposewin.cpp:5128 objecttreeparser.cpp:1632
+#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
 msgid ""
 "Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
 "this bug."
 msgstr ""
 
-#: kmcommands.cpp:3181 kmcommands.cpp:3186 kmcommands.cpp:3195
-#: kmcommands.cpp:3204 kmcommands.cpp:3222 kmcommands.cpp:3233
-#: kmcommands.cpp:3273 kmcomposewin.cpp:5130 kmcomposewin.cpp:5135
-#: kmcomposewin.cpp:5144 messagecomposer.cpp:558 messagecomposer.cpp:566
-#: messagecomposer.cpp:580 objecttreeparser.cpp:1638
+#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
+#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
+#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
+#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr ""
 
-#: kmcommands.cpp:3192 kmcomposewin.cpp:5141 objecttreeparser.cpp:1644
+#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
 msgid ""
 "Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
 "did not return a string list. Please report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3201 kmcomposewin.cpp:5150 objecttreeparser.cpp:1652
+#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
 msgid ""
 "No keys have been found. Please check that a valid key path has been set in the "
 "Chiasmus configuration."
 msgstr ""
 
-#: kmcommands.cpp:3208 objecttreeparser.cpp:1659
+#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
 msgid "Chiasmus Decryption Key Selection"
 msgstr "Elekto de \"Chiasmus\"-malĉifroŝlosilo"
 
-#: kmcommands.cpp:3220 objecttreeparser.cpp:1671
+#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
 msgid ""
 "Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
 "bug."
 msgstr ""
 
-#: kmcommands.cpp:3231 objecttreeparser.cpp:1679
+#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3239 kmcommands.cpp:3265 objecttreeparser.cpp:1685
+#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr ""
 
-#: kmcommands.cpp:3270 objecttreeparser.cpp:1691
+#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
 msgid ""
 "Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
 "not return a byte array. Please report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3425
-#, fuzzy
-msgid "This attachment has been deleted."
-msgstr "Montras la aldonaĵon kiel proponite de la sendinto."
-
-#: 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 "Poŝto"
 
-#: kmcomposewin.cpp:233
+#: kmcomposewin.cpp:207
+#, fuzzy
+msgid "Select an identity for this message"
+msgstr "Aktivigi HTML-rigardon por tiu ĉi mesaĝo."
+
+#: kmcomposewin.cpp:211
+msgid "Select the dictionary to use when spell-checking this message"
+msgstr ""
+
+#: kmcomposewin.cpp:216
+msgid "Select the sent-mail folder where a copy of this message will be saved"
+msgstr ""
+
+#: kmcomposewin.cpp:220
+msgid "Select the outgoing account to use for sending this message"
+msgstr ""
+
+#: kmcomposewin.cpp:224
+msgid "Set the \"From:\" email address for this message"
+msgstr ""
+
+#: kmcomposewin.cpp:228
+msgid "Set the \"Reply-To:\" email address for this message"
+msgstr ""
+
+#: kmcomposewin.cpp:248
 msgid "Select email address(es)"
 msgstr "Elekti retpoŝta(j)n adreso(j)n"
 
-#: kmcomposewin.cpp:286
+#: kmcomposewin.cpp:295
+#, fuzzy
+msgid "Set a subject for this message"
+msgstr "Difini temon de la mesaĝo"
+
+#: kmcomposewin.cpp:297
+msgid "&Identity:"
+msgstr "&Identeco:"
+
+#: kmcomposewin.cpp:298
+msgid "&Dictionary:"
+msgstr "&Vortaro:"
+
+#: kmcomposewin.cpp:299
+msgid "&Sent-Mail folder:"
+msgstr "Leterujo de &senditaj mesaĝoj:"
+
+#: kmcomposewin.cpp:300
+msgid "&Mail transport:"
+msgstr "Poŝt&transporto:"
+
+#: kmcomposewin.cpp:301
+msgid ""
+"_: sender address field\n"
+"&From:"
+msgstr ""
+
+#: kmcomposewin.cpp:302
+msgid "&Reply to:"
+msgstr "&Respondo al:"
+
+#: kmcomposewin.cpp:303
+msgid "S&ubject:"
+msgstr "&Temo:"
+
+#: kmcomposewin.cpp:305
 msgid "Sticky"
 msgstr "Fiksite"
 
-#: kmcomposewin.cpp:367 kmfoldertree.cpp:1681 kmheaders.cpp:138
-#: kmheaders.cpp:183 kmmainwidget.cpp:424 kmmainwidget.cpp:431
-#: kmmainwidget.cpp:438 kmmimeparttree.cpp:67 kmpopfiltercnfrmdlg.cpp:43
+#: kmcomposewin.cpp:308
+msgid "Use the selected value as your identity for future messages"
+msgstr ""
+
+#: kmcomposewin.cpp:311
+msgid "Use the selected value as your sent-mail folder for future messages"
+msgstr ""
+
+#: kmcomposewin.cpp:314
+msgid "Use the selected value as your outgoing account for future messages"
+msgstr ""
+
+#: kmcomposewin.cpp:317
+msgid "Use the selected value as your dictionary for future messages"
+msgstr ""
+
+#: kmcomposewin.cpp:398 kmfoldertree.cpp:1719 kmheaders.cpp:141
+#: kmheaders.cpp:187 kmmainwidget.cpp:416 kmmainwidget.cpp:423
+#: kmmainwidget.cpp:430 kmmimeparttree.cpp:67 kmpopfiltercnfrmdlg.cpp:43
 msgid "Size"
 msgstr "Grandeco"
 
-#: kmcomposewin.cpp:368 kmmimeparttree.cpp:66
+#: kmcomposewin.cpp:399 kmmimeparttree.cpp:66
 msgid "Encoding"
 msgstr "Kodprezento"
 
-#: kmcomposewin.cpp:375 kmcomposewin.cpp:3247
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
 msgid "Compress"
 msgstr "Kunpremi"
 
-#: kmcomposewin.cpp:377
+#: kmcomposewin.cpp:408
 msgid "Encrypt"
 msgstr "Ĉifradi"
 
-#: kmcomposewin.cpp:379
+#: kmcomposewin.cpp:410
 msgid "Sign"
 msgstr "Subskribi"
 
-#: kmcomposewin.cpp:590 kmcomposewin.cpp:3616
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
 msgid "Name of the attachment:"
 msgstr "Nomo de la kunsendaĵo:"
 
-#: kmcomposewin.cpp:828
+#: kmcomposewin.cpp:868
 msgid ""
 "Autosaving the message as %1 failed.\n"
 "Reason: %2"
@@ -5044,62 +5856,26 @@ msgstr ""
 "Aŭtokonservado de la mesaĝo %1 fiaskis.\n"
 "Kialo: %2"
 
-#: kmcomposewin.cpp:832
+#: kmcomposewin.cpp:872
 msgid "Autosaving Failed"
 msgstr "Aŭtokonservado fiaskis."
 
-#: kmcomposewin.cpp:970
-msgid "&Identity:"
-msgstr "&Identeco:"
-
-#: kmcomposewin.cpp:974
-msgid "&Dictionary:"
-msgstr "&Vortaro:"
-
-#: kmcomposewin.cpp:978
-msgid "&Sent-Mail folder:"
-msgstr "Leterujo de &senditaj mesaĝoj:"
-
-#: kmcomposewin.cpp:982
-msgid "&Mail transport:"
-msgstr "Poŝt&transporto:"
-
-#: kmcomposewin.cpp:986
-msgid ""
-"_: sender address field\n"
-"&From:"
-msgstr ""
-
-#: kmcomposewin.cpp:992
-msgid "&Reply to:"
-msgstr "&Respondo al:"
-
-#: kmcomposewin.cpp:1000
-msgid ""
-"_: recipient address field\n"
-"&To:"
-msgstr ""
-
-#: kmcomposewin.cpp:1002
+#: kmcomposewin.cpp:1042
 msgid "Primary Recipients"
 msgstr "Ricevantoj"
 
-#: kmcomposewin.cpp:1003
+#: kmcomposewin.cpp:1043
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email.</qt>"
 msgstr ""
 "<qt>La retleteraj adresoj, kiujn vi skribas en tiun enigejon, haviĝos kopion de "
 "la letero.</qt>"
 
-#: kmcomposewin.cpp:1010
-msgid "&Copy to (CC):"
-msgstr "&Kopii al:"
-
-#: kmcomposewin.cpp:1012
+#: kmcomposewin.cpp:1052
 msgid "Additional Recipients"
 msgstr "Pluaj ricevantoj"
 
-#: kmcomposewin.cpp:1013
+#: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
 "Technically it is the same thing as putting all the addresses in the <b>To:</b> "
@@ -5111,15 +5887,11 @@ msgstr ""
 ", sed la adresato kiel ricevanto de kopio povas rimarki, ke li nur estas "
 "leganto kaj ne la ĉefa ricevanto.</qt>"
 
-#: kmcomposewin.cpp:1025
-msgid "&Blind copy to (BCC):"
-msgstr "&Kopii al:"
-
-#: kmcomposewin.cpp:1027
+#: kmcomposewin.cpp:1067
 msgid "Hidden Recipients"
 msgstr "Nevideblaj ricevantoj"
 
-#: kmcomposewin.cpp:1028
+#: kmcomposewin.cpp:1068
 msgid ""
 "<qt>Essentially the same thing as the <b>Copy To:</b> "
 "field but differs in that all other recipients do not see who receives a blind "
@@ -5128,332 +5900,347 @@ msgstr ""
 "<qt>Fakte ĝi estas la sama kiel <b>Kopio al:</b>, sed la aliaj ricevantoj ne "
 "povas vidi, kiuj haviĝis kopion.</qt>"
 
-#: kmcomposewin.cpp:1060
-msgid "S&ubject:"
-msgstr "&Temo:"
-
-#: kmcomposewin.cpp:1198 kmcomposewin.cpp:1220
+#: kmcomposewin.cpp:1236 kmcomposewin.cpp:1258
 msgid "&Send Mail"
 msgstr "&Sendi poŝton"
 
-#: kmcomposewin.cpp:1202 kmcomposewin.cpp:1224
+#: kmcomposewin.cpp:1240 kmcomposewin.cpp:1262
 msgid "&Send Mail Via"
 msgstr "&Sendi poŝton per"
 
-#: 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 "Sendi p&oste"
 
-#: kmcomposewin.cpp:1207 kmcomposewin.cpp:1217
+#: kmcomposewin.cpp:1245 kmcomposewin.cpp:1255
 msgid "Send &Later Via"
 msgstr "Sendi p&oste per"
 
-#: kmcomposewin.cpp:1255
+#: kmcomposewin.cpp:1293
 msgid "Save as &Draft"
 msgstr "&Konservi kiel malnetaĵo"
 
-#: kmcomposewin.cpp:1258
+#: kmcomposewin.cpp:1296
 msgid "Save as &Template"
 msgstr "Konservi kiel &ŝablono"
 
-#: kmcomposewin.cpp:1261
+#: kmcomposewin.cpp:1299
 msgid "&Insert File..."
 msgstr "Enmet&i dosieron..."
 
-#: kmcomposewin.cpp:1264
+#: kmcomposewin.cpp:1302
 msgid "&Insert File Recent"
 msgstr "Enmet&i dosieron lastatempan"
 
-#: kmcomposewin.cpp:1271
+#: kmcomposewin.cpp:1309
 msgid "&Address Book"
 msgstr "&Adresaro"
 
-#: kmcomposewin.cpp:1274
+#: kmcomposewin.cpp:1312
 msgid "&New Composer"
 msgstr "Nova &redaktilo"
 
-#: kmcomposewin.cpp:1278
+#: kmcomposewin.cpp:1316
 msgid "New Main &Window"
 msgstr "&Nova fenestro"
 
-#: kmcomposewin.cpp:1283
+#: kmcomposewin.cpp:1321
 msgid "Select &Recipients..."
 msgstr "Elekti &ricevantojn..."
 
-#: kmcomposewin.cpp:1285
+#: kmcomposewin.cpp:1323
 msgid "Save &Distribution List..."
 msgstr "Konservi &dissendoliston..."
 
-#: kmcomposewin.cpp:1307
+#: kmcomposewin.cpp:1345
 msgid "Pa&ste as Quotation"
 msgstr "En&meti kiel citaĵo"
 
-#: kmcomposewin.cpp:1310
+#: kmcomposewin.cpp:1348
 msgid "Paste as Attac&hment"
 msgstr "Alglui kiel &kunsendaĵo"
 
-#: kmcomposewin.cpp:1313
+#: kmcomposewin.cpp:1351
 msgid "Add &Quote Characters"
 msgstr "Aldoni &citsignojn"
 
-#: kmcomposewin.cpp:1316
+#: kmcomposewin.cpp:1356
 msgid "Re&move Quote Characters"
 msgstr "&Forigi citsignojn..."
 
-#: kmcomposewin.cpp:1320
+#: kmcomposewin.cpp:1362
 msgid "Cl&ean Spaces"
 msgstr "&Forigi troajn spacsignojn"
 
-#. i18n: file kmail.kcfg line 341
-#: kmcomposewin.cpp:1323 kmreaderwin.cpp:683 rc.cpp:779
+#. i18n: file kmail.kcfg line 358
+#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "Uzi e&gallarĝan tiparon"
 
-#: kmcomposewin.cpp:1328
+#: kmcomposewin.cpp:1370
 msgid "&Urgent"
 msgstr "&Urĝe"
 
-#: kmcomposewin.cpp:1331
+#: kmcomposewin.cpp:1373
 msgid "&Request Disposition Notification"
 msgstr "&Postuli pozician noton"
 
-#: kmcomposewin.cpp:1336
+#: kmcomposewin.cpp:1378
 msgid "Se&t Encoding"
 msgstr "Me&ti signokodadon"
 
-#: kmcomposewin.cpp:1339
+#: kmcomposewin.cpp:1381
 msgid "&Wordwrap"
 msgstr "&Linirompo"
 
-#: kmcomposewin.cpp:1344
+#: kmcomposewin.cpp:1386
 msgid "&Snippets"
 msgstr ""
 
-#: kmcomposewin.cpp:1350
+#: kmcomposewin.cpp:1392
 msgid "&Automatic Spellchecking"
 msgstr "&Aŭtomate skribkontroli"
 
-#: kmcomposewin.cpp:1360
+#: kmcomposewin.cpp:1402
 msgid "Auto-Detect"
 msgstr "Aŭtomate eltrovi"
 
-#: kmcomposewin.cpp:1365
+#: kmcomposewin.cpp:1407
 msgid "Formatting (HTML)"
 msgstr "Formatante HTMLon"
 
-#: kmcomposewin.cpp:1369
+#: kmcomposewin.cpp:1411
 msgid "&All Fields"
 msgstr "Ĉ&iuj eroj"
 
-#: kmcomposewin.cpp:1372
+#: kmcomposewin.cpp:1414
 msgid "&Identity"
 msgstr "&Identeco"
 
-#: kmcomposewin.cpp:1375
+#: kmcomposewin.cpp:1417
 msgid "&Dictionary"
 msgstr "&Vortaro"
 
-#: kmcomposewin.cpp:1378
+#: kmcomposewin.cpp:1420
 msgid "&Sent-Mail Folder"
 msgstr "Leterujo de &senditaj mesaĝoj"
 
-#: kmcomposewin.cpp:1381
+#: kmcomposewin.cpp:1423
 msgid "&Mail Transport"
 msgstr "&Poŝtotransporto"
 
-#: kmcomposewin.cpp:1384
+#: kmcomposewin.cpp:1426
 msgid "&From"
 msgstr "&De"
 
-#: kmcomposewin.cpp:1387
+#: kmcomposewin.cpp:1429
 msgid "&Reply To"
 msgstr "&Respondo al"
 
-#: kmcomposewin.cpp:1391
+#: kmcomposewin.cpp:1433
 msgid "&To"
 msgstr "&Al"
 
-#: kmcomposewin.cpp:1394
+#: kmcomposewin.cpp:1436
 msgid "&CC"
 msgstr "&Kopio"
 
-#: kmcomposewin.cpp:1397
+#: kmcomposewin.cpp:1439
 msgid "&BCC"
 msgstr "&Nevidebla kopio"
 
-#: kmcomposewin.cpp:1401
+#: kmcomposewin.cpp:1443
 msgid "S&ubject"
 msgstr "&Temo"
 
-#: kmcomposewin.cpp:1406
+#: kmcomposewin.cpp:1448
 msgid "Append S&ignature"
 msgstr "&Alpendigi subskribon"
 
-#: kmcomposewin.cpp:1409
+#: kmcomposewin.cpp:1451
 #, fuzzy
 msgid "Prepend S&ignature"
 msgstr "&Alpendigi subskribon"
 
-#: kmcomposewin.cpp:1413
+#: kmcomposewin.cpp:1455
 #, fuzzy
 msgid "Insert Signature At C&ursor Position"
 msgstr "Meti kursilpozicion"
 
-#: kmcomposewin.cpp:1417
+#: kmcomposewin.cpp:1459
 msgid "Attach &Public Key..."
 msgstr "Aldoni &publikan ŝlosilon..."
 
-#: kmcomposewin.cpp:1420
+#: kmcomposewin.cpp:1462
 msgid "Attach &My Public Key"
 msgstr "Aldoni mian &publikan ŝlosilon"
 
-#: kmcomposewin.cpp:1423 kmcomposewin.cpp:2272
+#: kmcomposewin.cpp:1465 kmcomposewin.cpp:2337
 msgid "&Attach File..."
 msgstr "&Kunsendi dosieron..."
 
-#: kmcomposewin.cpp:1426
+#: kmcomposewin.cpp:1468
 msgid "&Remove Attachment"
 msgstr "&Forigi kunsendaĵon"
 
-#: kmcomposewin.cpp:1429
+#: kmcomposewin.cpp:1471
 msgid "&Save Attachment As..."
 msgstr "&Konservi kunsendaĵon kiel..."
 
-#: kmcomposewin.cpp:1432
+#: kmcomposewin.cpp:1474
 msgid "Attachment Pr&operties"
 msgstr "&Ecoj de kunsendaĵo"
 
-#: kmcomposewin.cpp:1442
+#: kmcomposewin.cpp:1484
 msgid "&Spellchecker..."
 msgstr "&Literumilo..."
 
-#: kmcomposewin.cpp:1446 kmcomposewin.cpp:1449
+#: kmcomposewin.cpp:1488 kmcomposewin.cpp:1491
 msgid "Encrypt Message with Chiasmus..."
 msgstr "Ĉifri mesaĝon per \"Chiasmus\"..."
 
-#: kmcomposewin.cpp:1457
+#: kmcomposewin.cpp:1499
 msgid "&Encrypt Message"
 msgstr "Ĉ&ifri mesaĝon"
 
-#: kmcomposewin.cpp:1460
+#: kmcomposewin.cpp:1502
 msgid "&Sign Message"
 msgstr "&Subskribi mesaĝon"
 
-#: kmcomposewin.cpp:1507
+#: kmcomposewin.cpp:1549
 msgid "&Cryptographic Message Format"
 msgstr "%Ĉifromesaĝa formo"
 
-#: 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 "Normo"
 
-#: kmcomposewin.cpp:1516 kmcomposewin.cpp:4972
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
 msgid "Bulleted List (Disc)"
 msgstr "Neorda listo (plencirkla)"
 
-#: kmcomposewin.cpp:1517 kmcomposewin.cpp:4974
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
 msgid "Bulleted List (Circle)"
 msgstr "Neorda listo (cirkla)"
 
-#: kmcomposewin.cpp:1518 kmcomposewin.cpp:4976
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
 msgid "Bulleted List (Square)"
 msgstr "Neorda listo (kvadrata)"
 
-#: kmcomposewin.cpp:1519 kmcomposewin.cpp:4978
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
 msgid "Ordered List (Decimal)"
 msgstr "Orda listo (nombre)"
 
-#: kmcomposewin.cpp:1520 kmcomposewin.cpp:4980
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
 msgid "Ordered List (Alpha lower)"
 msgstr "Orda listo (minuskle)"
 
-#: kmcomposewin.cpp:1521 kmcomposewin.cpp:4982
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
 msgid "Ordered List (Alpha upper)"
 msgstr "Orda listo (majuskle)"
 
-#: kmcomposewin.cpp:1523
+#: kmcomposewin.cpp:1566
 msgid "Select Style"
 msgstr "Elekti stilon"
 
-#: kmcomposewin.cpp:1537
+#: kmcomposewin.cpp:1569
+#, fuzzy
+msgid "Select a list style"
+msgstr "Elekti stilon"
+
+#: kmcomposewin.cpp:1574
+#, fuzzy
+msgid "Select a font"
+msgstr "Elekti kompletan tekston"
+
+#: kmcomposewin.cpp:1579
+#, fuzzy
+msgid "Select a font size"
+msgstr "Elekti sondosieron"
+
+#: kmcomposewin.cpp:1583
 msgid "Align Left"
 msgstr "Aranĝi maldekstre"
 
-#: kmcomposewin.cpp:1541
+#: kmcomposewin.cpp:1587
 msgid "Align Right"
 msgstr "Aranĝi dekstre"
 
-#: kmcomposewin.cpp:1544
+#: kmcomposewin.cpp:1590
 msgid "Align Center"
 msgstr "Aranĝi meze"
 
-#: kmcomposewin.cpp:1547
+#: kmcomposewin.cpp:1593
 msgid "&Bold"
 msgstr "&Dika"
 
-#: kmcomposewin.cpp:1550
+#: kmcomposewin.cpp:1596
 msgid "&Italic"
 msgstr "&Oblikva"
 
-#: kmcomposewin.cpp:1553
+#: kmcomposewin.cpp:1599
 msgid "&Underline"
 msgstr "&Sublinia"
 
-#: kmcomposewin.cpp:1556
+#: kmcomposewin.cpp:1602
 msgid "Reset Font Settings"
 msgstr "Remeti tipar-agordon"
 
-#: kmcomposewin.cpp:1559
+#: kmcomposewin.cpp:1605
 msgid "Text Color..."
 msgstr "Tekstkoloro..."
 
-#: kmcomposewin.cpp:1573
+#: kmcomposewin.cpp:1619
 msgid "Configure KMail..."
 msgstr "A&gordi KMail..."
 
-#: kmcomposewin.cpp:1582
+#: kmcomposewin.cpp:1628
 msgid " Spellcheck: %1 "
 msgstr "Literumilo: %1 "
 
-#: kmcomposewin.cpp:1583 kmcomposewin.cpp:1597
+#: kmcomposewin.cpp:1629 kmcomposewin.cpp:1643
 msgid " Column: %1 "
 msgstr " Kolumno: %1 "
 
-#: kmcomposewin.cpp:1584 kmcomposewin.cpp:1595
+#: kmcomposewin.cpp:1630 kmcomposewin.cpp:1641
 msgid " Line: %1 "
 msgstr " Linio: %1 "
 
-#: kmcomposewin.cpp:2188
+#: kmcomposewin.cpp:2252
 msgid "Re&save as Template"
 msgstr "Rekon&servi kiel ŝablono"
 
-#: kmcomposewin.cpp:2189
+#: kmcomposewin.cpp:2253
 msgid "&Save as Draft"
 msgstr "&Konservi kiel malnetaĵo"
 
-#: kmcomposewin.cpp:2191
+#: kmcomposewin.cpp:2255
 msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
 "time."
 msgstr ""
 
-#: kmcomposewin.cpp:2193
+#: kmcomposewin.cpp:2257
 msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
 "later time."
 msgstr ""
 
-#: kmcomposewin.cpp:2197
+#: kmcomposewin.cpp:2261
 msgid "Do you want to save the message for later or discard it?"
 msgstr "Ĉu vi volas konservi la mesaĝon aŭ forĵeti ĝin?"
 
-#: kmcomposewin.cpp:2198
+#: kmcomposewin.cpp:2262
 msgid "Close Composer"
 msgstr "Fermi la redaktilon"
 
-#: kmcomposewin.cpp:2268
+#: kmcomposewin.cpp:2333
 msgid ""
 "The message you have composed seems to refer to an attached file but you have "
 "not attached anything.\n"
@@ -5463,15 +6250,15 @@ msgstr ""
 "neniun kunsendaĵon.\n"
 "Ĉu vi volas alpendigi dosieron al via mesaĝo?"
 
-#: kmcomposewin.cpp:2271
+#: kmcomposewin.cpp:2336
 msgid "File Attachment Reminder"
 msgstr "Admono de kunsendaĵoj"
 
-#: kmcomposewin.cpp:2273
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
 msgid "&Send as Is"
 msgstr "&Sendi tiel"
 
-#: kmcomposewin.cpp:2350
+#: kmcomposewin.cpp:2415
 msgid ""
 "<qt>"
 "<p>KMail could not recognize the location of the attachment (%1);</p>"
@@ -5481,27 +6268,27 @@ msgstr ""
 "<p>KMail ne povis ekkoni la lokon de la kunsendaĵo (%1).</p> "
 "<p>Vi devas indiki la tutan vojon, se vi deziras kunsendi la dosieron.</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 "Kunsendi dosieron"
 
 #. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2698 rc.cpp:57
+#: kmcomposewin.cpp:2778 rc.cpp:57
 #, no-c-format
 msgid "&Attach"
 msgstr "&Kunsendi"
 
-#: kmcomposewin.cpp:2878
+#: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "Enmeti dosieron"
 
-#: kmcomposewin.cpp:3048
+#: kmcomposewin.cpp:3129
 msgid ""
 "<qt>"
 "<p>An error occurred while trying to export the key from the backend:</p>"
@@ -5511,57 +6298,57 @@ msgstr ""
 "<p>Eraro okazis, dum vi provis eksporti la ŝlosilon el la postejo:</p> "
 "<p><b>%1</b></p></qt>"
 
-#: kmcomposewin.cpp:3052
+#: kmcomposewin.cpp:3133
 msgid "Key Export Failed"
 msgstr "Ŝlosileksporto fiaskis"
 
-#: kmcomposewin.cpp:3079
+#: kmcomposewin.cpp:3160
 msgid "Exporting key..."
 msgstr "Eksportante ŝlosilon..."
 
-#: kmcomposewin.cpp:3090
+#: kmcomposewin.cpp:3171
 #, c-format
 msgid "OpenPGP key 0x%1"
 msgstr "PGP ŝlosilo 0x%1"
 
-#: kmcomposewin.cpp:3105
+#: kmcomposewin.cpp:3186
 msgid "Attach Public OpenPGP Key"
 msgstr "Aldoni mian publikan PGP-ŝlosilon"
 
-#: kmcomposewin.cpp:3106
+#: kmcomposewin.cpp:3187
 msgid "Select the public key which should be attached."
 msgstr "Elekti la publikan ŝlosilon kunsendendan."
 
-#: kmcomposewin.cpp:3128 kmmimeparttree.cpp:137 kmreaderwin.cpp:1967
+#: kmcomposewin.cpp:3209 kmmimeparttree.cpp:135 kmreaderwin.cpp:2032
 msgid ""
 "_: to open\n"
 "Open"
 msgstr "Malfermi"
 
-#: kmcomposewin.cpp:3130 kmmimeparttree.cpp:138 kmreaderwin.cpp:1968
+#: kmcomposewin.cpp:3211 kmmimeparttree.cpp:136 kmreaderwin.cpp:2033
 msgid "Open With..."
 msgstr "Malfermi per..."
 
-#: kmcomposewin.cpp:3132
+#: kmcomposewin.cpp:3213
 msgid ""
 "_: to view\n"
 "View"
 msgstr "Vidigi"
 
-#: kmcomposewin.cpp:3135
+#: kmcomposewin.cpp:3216
 #, fuzzy
 msgid "Edit With..."
 msgstr "Redakti skripton..."
 
-#: kmcomposewin.cpp:3143
+#: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "Kunsendi..."
 
-#: kmcomposewin.cpp:3232 kmcomposewin.cpp:3240
+#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
 msgid "KMail could not compress the file."
 msgstr "Ne eblis kunpremi la dosieron."
 
-#: kmcomposewin.cpp:3246
+#: kmcomposewin.cpp:3326
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
@@ -5569,43 +6356,43 @@ msgstr ""
 "La kunpremita dosiero estas pli granda ol la originalo. Ĉu vi volas uzi la "
 "originalon?"
 
-#: kmcomposewin.cpp:3247
+#: kmcomposewin.cpp:3327
 msgid "Keep"
 msgstr "Konservi"
 
-#: kmcomposewin.cpp:3313 kmcomposewin.cpp:3321
+#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
 msgid "KMail could not uncompress the file."
 msgstr "Ne eblis malkunpremi la dosieron."
 
-#: kmcomposewin.cpp:3519
+#: kmcomposewin.cpp:3601
 msgid "Save Attachment As"
 msgstr "Konservi kunsendaĵon kiel"
 
-#: kmcomposewin.cpp:3769 kmedit.cpp:178
+#: kmcomposewin.cpp:3856 kmedit.cpp:178
 msgid "Add as Text"
 msgstr ""
 
-#: kmcomposewin.cpp:3770 kmedit.cpp:179
+#: kmcomposewin.cpp:3857 kmedit.cpp:179
 msgid "Add as Attachment"
 msgstr "Aldoni kiel alpendaĵo"
 
-#: 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 "Alglui kiel &kunsendaĵo"
 
-#: 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 "sennoma"
 
-#: kmcomposewin.cpp:3873
+#: kmcomposewin.cpp:3961
 msgid ""
 "<qt>"
 "<p>You have requested that messages be encrypted to yourself, but the currently "
@@ -5618,11 +6405,11 @@ msgstr ""
 "ne difinas iajn ĉifroŝlosilojn por tiu uzo.</p> "
 "<p>Elektu la uzota(j)n ŝlosilo(j)n per la identeca agorda.</p></qt>"
 
-#: kmcomposewin.cpp:3880
+#: kmcomposewin.cpp:3968
 msgid "Undefined Encryption Key"
 msgstr "Nedifinita ĉifro-ŝlosilo"
 
-#: kmcomposewin.cpp:3924
+#: kmcomposewin.cpp:4015
 msgid ""
 "<qt>"
 "<p>In order to be able to sign this message you first have to define the "
@@ -5634,21 +6421,21 @@ msgstr ""
 "subskriboŝlosilon.</p> "
 "<p>Elektu la uzotan ŝlosilon en la identeca agordo.</p></qt>"
 
-#: kmcomposewin.cpp:3931
+#: kmcomposewin.cpp:4022
 msgid "Undefined Signing Key"
 msgstr "Nedifinita subskriboŝlosilo"
 
-#: kmcomposewin.cpp:4016
+#: kmcomposewin.cpp:4129
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
 msgstr ""
 
-#: kmcomposewin.cpp:4018 kmkernel.cpp:1243
+#: kmcomposewin.cpp:4131 kmkernel.cpp:1285
 msgid "Online/Offline"
 msgstr ""
 
-#: kmcomposewin.cpp:4033
+#: kmcomposewin.cpp:4146
 msgid ""
 "You must enter your email address in the From: field. You should also set your "
 "email address for all identities, so that you do not have to enter it for each "
@@ -5658,62 +6445,62 @@ msgstr ""
 "agordas vian adreson por ĉiuj identecoj, por ke vi ne enigu ĝin por ĉiu nura "
 "mesaĝo."
 
-#: kmcomposewin.cpp:4044
+#: kmcomposewin.cpp:4157
 msgid ""
 "You must specify at least one receiver,either in the To: field or as CC or as "
 "BCC."
 msgstr "Vi devas indiki almenaŭ unu ricevonton en Al aŭ Kopio aŭ Krome-al."
 
-#: kmcomposewin.cpp:4052
+#: kmcomposewin.cpp:4165
 #, fuzzy
 msgid "To field is missing.Send message anyway?"
 msgstr "\"Al:\"-kampo estas malplena. Ĉu tamen sendi la mesaĝon?"
 
-#: kmcomposewin.cpp:4054
+#: kmcomposewin.cpp:4167
 msgid "No To: specified"
 msgstr "\"Al:\" ne donita"
 
-#: kmcomposewin.cpp:4079
+#: kmcomposewin.cpp:4192
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Vi ne donis temon. Ĉu tamen sendi la mesaĝon?"
 
-#: kmcomposewin.cpp:4081
+#: kmcomposewin.cpp:4194
 msgid "No Subject Specified"
 msgstr "Temo ne donita"
 
-#: kmcomposewin.cpp:4082
+#: kmcomposewin.cpp:4195
 msgid "S&end as Is"
 msgstr "S&endi tiel"
 
-#: kmcomposewin.cpp:4083
+#: kmcomposewin.cpp:4196
 msgid "&Specify the Subject"
 msgstr "Doni la &temon"
 
-#: kmcomposewin.cpp:4121
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not sign/encrypt"
 msgstr "&Konservi markaĵon, ne subskribi/ĉifri"
 
-#: kmcomposewin.cpp:4122
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not encrypt"
 msgstr "&Konservi markaĵon, ne ĉifri"
 
-#: kmcomposewin.cpp:4123
+#: kmcomposewin.cpp:4236
 msgid "&Keep markup, do not sign"
 msgstr "&Konservi markaĵon, ne subskribi"
 
-#: kmcomposewin.cpp:4125
+#: kmcomposewin.cpp:4238
 msgid "Sign/Encrypt (delete markup)"
 msgstr "Subskribi/ĉifri mesaĝon (forigi markaĵon)"
 
-#: kmcomposewin.cpp:4126
+#: kmcomposewin.cpp:4239
 msgid "Encrypt (delete markup)"
 msgstr "Ĉifru (forigi markaĵon)"
 
-#: kmcomposewin.cpp:4127
+#: kmcomposewin.cpp:4240
 msgid "Sign (delete markup)"
 msgstr "Subskribi (forigi markaĵon)"
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4242
 msgid ""
 "<qt>"
 "<p>Inline signing/encrypting of HTML messages is not possible;</p>"
@@ -5723,11 +6510,11 @@ msgstr ""
 "<p>Enteksta subskribo/ĉifro de HTMLaj mesaĝoj ne eblas.</p> "
 "<p>Ĉu vi volas foirigi vian markaĵon?</p></qt>"
 
-#: kmcomposewin.cpp:4131
+#: kmcomposewin.cpp:4244
 msgid "Sign/Encrypt Message?"
 msgstr "Subskribi/ĉifri mesaĝon?"
 
-#: kmcomposewin.cpp:4180
+#: kmcomposewin.cpp:4293
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
 "(anymore); therefore, the default drafts or templates folder will be used."
@@ -5735,100 +6522,131 @@ msgstr ""
 "La propra malnetaĵ- aŭ ŝablon-leterujo de la identeco \"%1\" (jam) ne ekzistas. "
 "Pro tio la apriora malnetaĵ/ŝablonujo estos uzata."
 
-#: kmcomposewin.cpp:4326
+#: kmcomposewin.cpp:4393 kmsender.cpp:114
+msgid "Please create an account for sending and try again."
+msgstr "Kreu konton pro sendo kaj reprovu."
+
+#: kmcomposewin.cpp:4456
 msgid "About to send email..."
 msgstr "Sendonta retpoŝton..."
 
-#: kmcomposewin.cpp:4327
+#: kmcomposewin.cpp:4457
 msgid "Send Confirmation"
 msgstr "Sendi konfirmon"
 
-#: kmcomposewin.cpp:4328 redirectdialog.cpp:82
+#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "&Sendi tuj"
 
-#: 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 "Neniuj ricevantoj"
+
+#: kmcomposewin.cpp:4482
+#, fuzzy
+msgid "&Edit Recipients"
+msgstr "Pluaj ricevantoj"
+
+#: kmcomposewin.cpp:4728
 msgid "Spellcheck: on"
 msgstr "Literumilo: ŝaltita"
 
-#: kmcomposewin.cpp:4551
+#: kmcomposewin.cpp:4730
 msgid "Spellcheck: off"
 msgstr "Literumilo: malŝaltita"
 
-#: kmcomposewin.cpp:4608
+#: kmcomposewin.cpp:4787
 msgid " Spell check canceled."
 msgstr " Literumado ĉesigita."
 
-#: kmcomposewin.cpp:4611
+#: kmcomposewin.cpp:4790
 msgid " Spell check stopped."
 msgstr " Literumado finita."
 
-#: kmcomposewin.cpp:4614
+#: kmcomposewin.cpp:4793
 msgid " Spell check complete."
 msgstr " Literumado preta."
 
-#: kmcomposewin.cpp:4798 kmcomposewin.cpp:4806
+#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
 msgid "Spellchecker"
 msgstr "Literumilo"
 
-#: kmcomposewin.cpp:5115
+#: kmcomposewin.cpp:5304
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
 "You can do this in the Crypto Backends tab of the configure dialog's Security "
 "page."
 msgstr ""
 
-#: kmcomposewin.cpp:5119
+#: kmcomposewin.cpp:5308
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
 msgstr ""
 
-#: kmcomposewin.cpp:5122
+#: kmcomposewin.cpp:5311
 msgid "No Chiasmus Backend Configured"
 msgstr ""
 
-#: kmcomposewin.cpp:5153
+#: kmcomposewin.cpp:5342
 msgid "No Chiasmus Keys Found"
 msgstr "Trovis neniun \"Chiasmus\"-ŝlosilon"
 
-#: kmcomposewin.cpp:5157
+#: kmcomposewin.cpp:5346
 msgid "Chiasmus Encryption Key Selection"
 msgstr "Elekto de \"Chiasmus\"-ĉifroŝlosilo"
 
-#: kmcomposewin.cpp:5189
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will be signed"
 msgstr "Mesaĝo subskribita de %1."
 
-#: kmcomposewin.cpp:5189
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will not be signed"
 msgstr "Mesaĝo subskribita de %1."
 
-#: kmcomposewin.cpp:5190
+#: kmcomposewin.cpp:5379
 #, fuzzy
 msgid "Message will be encrypted"
 msgstr "PGP-mesaĝo - ĉifrita"
 
-#: kmcomposewin.cpp:5190
+#: kmcomposewin.cpp:5379
 #, fuzzy
 msgid "Message will not be encrypted"
 msgstr "Mesaĝo kun temo: "
 
-#: kmedit.cpp:391
+#: kmedit.cpp:458
 msgid "Unable to start external editor."
 msgstr "Ne eblas lanĉi eksteran redaktilon."
 
-#: kmedit.cpp:442
-msgid "Suggestions"
+#: kmedit.cpp:522
+#, fuzzy
+msgid "No Suggestions"
 msgstr "Proponoj"
 
-#: kmedit.cpp:494
+#: kmedit.cpp:529
+#, fuzzy
+msgid "Add to Dictionary"
+msgstr "&Vortaro"
+
+#: kmedit.cpp:530
+#, fuzzy
+msgid "Ignore All"
+msgstr "&Ignori"
+
+#: kmedit.cpp:587
 msgid "Automatic spellchecking is not possible on text with markup."
 msgstr "Aŭtomata vortkorektigo ne eblaspri teksto kun markaĵo."
 
-#: kmedit.cpp:538
+#: kmedit.cpp:631
 msgid ""
 "The external editor is still running.\n"
 "Abort the external editor or leave it open?"
@@ -5836,19 +6654,19 @@ msgstr ""
 "La eksterna redaktilo ankoraŭ rulas.\n"
 "Ĉu vi volas finigi aŭ lasi ĝin?"
 
-#: kmedit.cpp:541
+#: kmedit.cpp:634
 msgid "Abort Editor"
 msgstr "Finigi redaktilon"
 
-#: kmedit.cpp:541
+#: kmedit.cpp:634
 msgid "Leave Editor Open"
 msgstr "Lasi redaktilon alirebla"
 
-#: kmedit.cpp:565
+#: kmedit.cpp:661
 msgid "Spellcheck - KMail"
 msgstr "Literumilo - KMail"
 
-#: kmedit.cpp:734
+#: kmedit.cpp:884
 msgid ""
 "ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
 "properly configured and in your PATH."
@@ -5856,15 +6674,20 @@ msgstr ""
 "Eraro dum lanĉo de ISpell/ASpell. Certigu, ke vi ĝuste agordis ISpell aŭ ASpell "
 "kaj ke ĝi troviĝas per la variablo PATH."
 
-#: kmedit.cpp:743
+#: kmedit.cpp:893
 msgid "ISpell/Aspell seems to have crashed."
 msgstr "Ŝajne ISpell/ASpell mortis."
 
-#: kmedit.cpp:752
+#: kmedit.cpp:902
 msgid "No misspellings encountered."
 msgstr "Neniu malkorekta vorto trovita."
 
-#: kmfawidgets.cpp:102
+#: kmfawidgets.cpp:39
+#, fuzzy
+msgid "Open Address Book"
+msgstr "Malfermi en adresaro"
+
+#: kmfawidgets.cpp:107
 msgid "Select Sound File"
 msgstr "Elekti sondosieron"
 
@@ -5890,191 +6713,223 @@ msgstr ""
 "<br>en filtroregulo <b>%2</b> "
 "<br>Ignoras ĝin.</qt>"
 
-#: kmfilteraction.cpp:598
+#: kmfilteraction.cpp:601
 msgid "Confirm Delivery"
 msgstr "Konfirmi ricevon"
 
-#: kmfilteraction.cpp:634
+#: kmfilteraction.cpp:637
 msgid "Set Transport To"
 msgstr "Meti transportomanieron al"
 
-#: kmfilteraction.cpp:665
+#: kmfilteraction.cpp:668
 msgid "Set Reply-To To"
 msgstr "Meti respondadreson al"
 
-#: kmfilteraction.cpp:701
+#: kmfilteraction.cpp:704
 msgid "Set Identity To"
 msgstr "Meti identecon al"
 
-#: kmfilteraction.cpp:784
+#: kmfilteraction.cpp:787
 msgid "Mark As"
 msgstr "Marki kiel"
 
-#: kmfilteraction.cpp:789
+#: kmfilteraction.cpp:792
 msgid ""
 "_: msg status\n"
 "Important"
 msgstr "Grava"
 
-#: kmfilteraction.cpp:790
+#: kmfilteraction.cpp:793
 msgid ""
 "_: msg status\n"
 "Read"
 msgstr "Legita"
 
-#: kmfilteraction.cpp:791
+#: kmfilteraction.cpp:794
 msgid ""
 "_: msg status\n"
 "Unread"
 msgstr "Nelegita"
 
-#: kmfilteraction.cpp:792
+#: kmfilteraction.cpp:795
 msgid ""
 "_: msg status\n"
 "Replied"
 msgstr "Respondita"
 
-#: kmfilteraction.cpp:793
+#: kmfilteraction.cpp:796
 msgid ""
 "_: msg status\n"
 "Forwarded"
 msgstr "Plusendita"
 
-#: kmfilteraction.cpp:794
+#: kmfilteraction.cpp:797
 msgid ""
 "_: msg status\n"
 "Old"
 msgstr "Malnova"
 
-#: kmfilteraction.cpp:795
+#: kmfilteraction.cpp:798
 msgid ""
 "_: msg status\n"
 "New"
 msgstr "Nova"
 
-#: kmfilteraction.cpp:796
+#: kmfilteraction.cpp:799
 msgid ""
 "_: msg status\n"
 "Watched"
 msgstr "Legita"
 
-#: kmfilteraction.cpp:797
+#: kmfilteraction.cpp:800
 msgid ""
 "_: msg status\n"
 "Ignored"
 msgstr "Ignorita"
 
-#: kmfilteraction.cpp:798
+#: kmfilteraction.cpp:801
 msgid ""
 "_: msg status\n"
 "Spam"
 msgstr "Fimesaĝa"
 
-#: kmfilteraction.cpp:799
+#: kmfilteraction.cpp:802
 msgid ""
 "_: msg status\n"
 "Ham"
 msgstr "Fimesaĝa"
 
-#: kmfilteraction.cpp:883
+#: kmfilteraction.cpp:886
 msgid "Send Fake MDN"
 msgstr "Sendi malveran ricevkonfirmon"
 
-#: kmfilteraction.cpp:888
+#: kmfilteraction.cpp:891
 msgid ""
 "_: MDN type\n"
 "Ignore"
 msgstr "Ignori"
 
-#: kmfilteraction.cpp:889
+#: kmfilteraction.cpp:892
 msgid ""
 "_: MDN type\n"
 "Displayed"
 msgstr "Vidigita"
 
-#: kmfilteraction.cpp:890
+#: kmfilteraction.cpp:893
 msgid ""
 "_: MDN type\n"
 "Deleted"
 msgstr "Forigita"
 
-#: kmfilteraction.cpp:891
+#: kmfilteraction.cpp:894
 msgid ""
 "_: MDN type\n"
 "Dispatched"
 msgstr "Sendita"
 
-#: kmfilteraction.cpp:892
+#: kmfilteraction.cpp:895
 msgid ""
 "_: MDN type\n"
 "Processed"
 msgstr "Laborita"
 
-#: kmfilteraction.cpp:893
+#: kmfilteraction.cpp:896
 msgid ""
 "_: MDN type\n"
 "Denied"
 msgstr "Rifuzita"
 
-#: kmfilteraction.cpp:894
+#: kmfilteraction.cpp:897
 msgid ""
 "_: MDN type\n"
 "Failed"
 msgstr "Fiaskis"
 
-#: kmfilteraction.cpp:963
+#: kmfilteraction.cpp:966
 msgid "Remove Header"
 msgstr "Forigi kapon"
 
-#: kmfilteraction.cpp:1036
+#: kmfilteraction.cpp:1039
 msgid "Add Header"
 msgstr "Aldoni kapon"
 
-#: kmfilteraction.cpp:1063
+#: kmfilteraction.cpp:1066
 msgid "With value:"
 msgstr "Kun valoro:"
 
-#: kmfilteraction.cpp:1177
+#: kmfilteraction.cpp:1180
 msgid "Rewrite Header"
 msgstr "Reskribi kapon"
 
-#: kmfilteraction.cpp:1213
+#: kmfilteraction.cpp:1216
 msgid "Replace:"
 msgstr "&Anstataŭigi:"
 
-#: kmfilteraction.cpp:1220
+#: kmfilteraction.cpp:1223
 msgid "With:"
 msgstr "Kun:"
 
-#: kmfilteraction.cpp:1340
+#: kmfilteraction.cpp:1343
 msgid "Move Into Folder"
 msgstr "Ŝovi al leterujo"
 
-#: kmfilteraction.cpp:1390
+#: kmfilteraction.cpp:1393
 msgid "Copy Into Folder"
 msgstr "Kopii al leterujo"
 
-#: kmfilteraction.cpp:1452
+#: kmfilteraction.cpp:1467
 msgid "Forward To"
 msgstr "Plusendi al"
 
-#: 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 "&Propraj Shablonoj"
+
+#: kmfilteraction.cpp:1525
+#, fuzzy
+msgid "The template used when forwarding"
+msgstr "Mesaĝoŝablono por plusendado"
+
+#: 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 "Plusendi per propra ŝablono"
+
+#: kmfilteraction.cpp:1622
+#, fuzzy
+msgid "Forward to %1 with template %2"
+msgstr "Plusendi per propra ŝablono"
+
+#: kmfilteraction.cpp:1643
 msgid "Redirect To"
 msgstr "Alidirekti al"
 
-#: kmfilteraction.cpp:1605
+#: kmfilteraction.cpp:1683
 msgid "Execute Command"
 msgstr "Lanĉŭ komandon"
 
-#: kmfilteraction.cpp:1702
+#: kmfilteraction.cpp:1780
 msgid "Pipe Through"
 msgstr "Dukti tra"
 
-#: kmfilteraction.cpp:1809
+#: kmfilteraction.cpp:1887
 msgid "Play Sound"
 msgstr "Ludi sonon"
 
-#: kmfilterdlg.cpp:51
+#: kmfilterdlg.cpp:55
 msgid ""
 "<qt>"
 "<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
@@ -6087,7 +6942,7 @@ msgstr ""
 "<p>Alklaku iun filtrilon por redakti ĝin uzante la dekstraflankajn "
 "elementojn.</p></qt>"
 
-#: kmfilterdlg.cpp:57
+#: kmfilterdlg.cpp:61
 msgid ""
 "<qt>"
 "<p>Click this button to create a new filter.</p>"
@@ -6103,7 +6958,7 @@ msgstr ""
 "<p>Se vi akcidente premis la butonon, vi povas premi la butonon <em>Forigu</em> "
 "por malfari.</p></qt>"
 
-#: kmfilterdlg.cpp:64
+#: kmfilterdlg.cpp:68
 msgid ""
 "<qt>"
 "<p>Click this button to copy a filter.</p>"
@@ -6115,7 +6970,7 @@ msgstr ""
 "<p>Se vi akcidente premis la butonon, vi povas premi la butonon <em>Forigu</em> "
 "por malfari.</p></qt>"
 
-#: kmfilterdlg.cpp:68
+#: kmfilterdlg.cpp:72
 msgid ""
 "<qt>"
 "<p>Click this button to <em>delete</em> the currently-selected filter from the "
@@ -6129,7 +6984,7 @@ msgstr ""
 "<p>Ne eblas rekrei la filtrilon post forigo. Sed vi povus forlasi la dialogon "
 "per la butonon <em>Rezignu</em> por rezigni pri ĉiuj faritaj ŝanĝoj.</p></qt>"
 
-#: kmfilterdlg.cpp:75
+#: kmfilterdlg.cpp:79
 #, fuzzy
 msgid ""
 "<qt>"
@@ -6146,7 +7001,7 @@ msgstr ""
 "<p>Se vi akcidente premis la butonon, vi povas malfari tion premante la butonon "
 "<em>Supren</em></p></qt>"
 
-#: kmfilterdlg.cpp:81
+#: kmfilterdlg.cpp:85
 msgid ""
 "<qt>"
 "<p>Click this button to move the currently-selected filter <em>up</em> "
@@ -6164,7 +7019,7 @@ msgstr ""
 "<p>Se vi akcidente premis la butonon, vi povas malfari tion premante la butonon "
 "<em>Malsupren</em></p></qt>"
 
-#: kmfilterdlg.cpp:89
+#: kmfilterdlg.cpp:93
 msgid ""
 "<qt>"
 "<p>Click this button to move the currently-selected filter <em>down</em> "
@@ -6182,7 +7037,7 @@ msgstr ""
 "<p>Se vi akcidente premis la butonon, vi povas malfari tion premante la butonon "
 "<em>Supren</em></p></qt>"
 
-#: kmfilterdlg.cpp:97
+#: kmfilterdlg.cpp:101
 #, fuzzy
 msgid ""
 "<qt>"
@@ -6199,7 +7054,7 @@ msgstr ""
 "<p>Se vi akcidente premis la butonon, vi povas malfari tion premante la butonon "
 "<em>Supren</em></p></qt>"
 
-#: kmfilterdlg.cpp:103
+#: kmfilterdlg.cpp:107
 #, fuzzy
 msgid ""
 "<qt>"
@@ -6216,7 +7071,7 @@ msgstr ""
 "tiun butonon kaj elektu <em>Forigu</em> kaj poste <em>Konfirmu</em> "
 "en la aperonta dialogo.</p></qt>"
 
-#: kmfilterdlg.cpp:110
+#: kmfilterdlg.cpp:114
 msgid ""
 "<qt>"
 "<p>Check this button to force the confirmation dialog to be displayed.</p>"
@@ -6233,120 +7088,125 @@ msgstr ""
 "granda mesaĝo alvenis en la servilo, aŭ se vi volis ŝanĝi la regularon por "
 "marki la mesaĝojn alie.</p></qt>"
 
-#: kmfilterdlg.cpp:129
+#: kmfilterdlg.cpp:133
 msgid "POP3 Filter Rules"
 msgstr "POP3 Filtroreguloj"
 
-#: kmfilterdlg.cpp:129
+#: kmfilterdlg.cpp:133
 msgid "Filter Rules"
 msgstr "Filtroreguloj"
 
-#: kmfilterdlg.cpp:151
+#: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "Uzeblaj filtriloj"
 
-#: kmfilterdlg.cpp:164
+#: kmfilterdlg.cpp:168
 msgid "A&dvanced"
 msgstr "Pli&aj opcioj"
 
-#: kmfilterdlg.cpp:171
+#: kmfilterdlg.cpp:175
 msgid "Filter Criteria"
 msgstr "Filtrokriterio"
 
-#: kmfilterdlg.cpp:175
+#: kmfilterdlg.cpp:179
 msgid "Filter Action"
 msgstr "Filtroago"
 
-#: kmfilterdlg.cpp:178
+#: kmfilterdlg.cpp:182
 msgid "Global Options"
 msgstr "Ĝeneralaj opcioj"
 
-#: kmfilterdlg.cpp:179
+#: kmfilterdlg.cpp:183
 msgid "Always &show matched 'Download Later' messages in confirmation dialog"
 msgstr "Ĉiam &montri mesaĝojn markotaj por posta preno en konfirmdialogo"
 
-#: kmfilterdlg.cpp:184
+#: kmfilterdlg.cpp:188
 msgid "Filter Actions"
 msgstr "Filtroagoj"
 
-#: kmfilterdlg.cpp:189
+#: kmfilterdlg.cpp:193
 msgid "Advanced Options"
 msgstr "Pliaj opcioj"
 
-#: kmfilterdlg.cpp:197
+#: kmfilterdlg.cpp:201
 msgid "Apply this filter to incoming messages:"
 msgstr "Apliki tiun filtrilon al envenantaj mesaĝoj:"
 
-#: kmfilterdlg.cpp:201
+#: kmfilterdlg.cpp:205
 msgid "from all accounts"
 msgstr "de ĉiuj kontoj"
 
-#: kmfilterdlg.cpp:204
+#: kmfilterdlg.cpp:208
 msgid "from all but online IMAP accounts"
 msgstr ""
 
-#: kmfilterdlg.cpp:207
+#: kmfilterdlg.cpp:211
 msgid "from checked accounts only"
 msgstr ""
 
-#: kmfilterdlg.cpp:213
+#: kmfilterdlg.cpp:217
 msgid "Account Name"
 msgstr "Kontonomo"
 
-#: kmfilterdlg.cpp:220
+#: kmfilterdlg.cpp:224
 msgid "Apply this filter to &sent messages"
 msgstr "Apliki tiun filtrilon al &senditaj mesaĝoj"
 
-#: kmfilterdlg.cpp:223
+#: kmfilterdlg.cpp:227
 msgid "Apply this filter on manual &filtering"
 msgstr "Apliki tiun filtrilon ĉe mana &filtrado"
 
-#: kmfilterdlg.cpp:226
+#: kmfilterdlg.cpp:230
 msgid "If this filter &matches, stop processing here"
 msgstr "Se tiu filtrilo &konvenas, halti la traktadon tie ĉi"
 
-#: kmfilterdlg.cpp:230
+#: kmfilterdlg.cpp:234
 msgid "Add this filter to the Apply Filter menu"
 msgstr "Aldoni la filtrilon al la filtrila menuo"
 
-#: kmfilterdlg.cpp:232
+#: kmfilterdlg.cpp:236
 msgid "Shortcut:"
 msgstr ""
 
-#: kmfilterdlg.cpp:238
+#: kmfilterdlg.cpp:242
 msgid "Additionally add this filter to the toolbar"
 msgstr "Ankaŭ aldonu la filtrilon al la illistelo"
 
-#: kmfilterdlg.cpp:243
+#: kmfilterdlg.cpp:247
 msgid "Icon for this filter:"
 msgstr "Piktogramo por la filtrilo:"
 
-#: kmfilterdlg.cpp:608
+#: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "Supren"
 
-#: kmfilterdlg.cpp:609
+#: kmfilterdlg.cpp:613
 msgid "Down"
 msgstr "Malsupren"
 
-#: kmfilterdlg.cpp:628
+#: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "Alinomi..."
 
 #. 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 "Nova"
 
-#: kmfilterdlg.cpp:744
+#: kmfilterdlg.cpp:645
+#, fuzzy
+msgid "Select Source Folders"
+msgstr "Elekti fulmoklavon por leterujo"
+
+#: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
 "will only be applied when manually filtering and when filtering incoming online "
 "IMAP mail."
 msgstr ""
 
-#: kmfilterdlg.cpp:774
+#: kmfilterdlg.cpp:786
 msgid ""
 "The following filters have not been saved because they were invalid (e.g. "
 "containing no actions or no search rules)."
@@ -6354,11 +7214,11 @@ msgstr ""
 "La postaj filtrilioj ne estas konservitaj, ĉar ili estas malkorektaj (ekzemple "
 "ili ne havas agojn aŭ rulojn)."
 
-#: kmfilterdlg.cpp:935
+#: kmfilterdlg.cpp:947
 msgid "Rename Filter"
 msgstr "Alinomi filtrilon"
 
-#: kmfilterdlg.cpp:936
+#: kmfilterdlg.cpp:948
 msgid ""
 "Rename filter \"%1\" to:\n"
 "(leave the field empty for automatic naming)"
@@ -6366,19 +7226,24 @@ msgstr ""
 "Alinomi filtrilon \"%1\" al:\n"
 "(lasu la enigejon malplena pro aŭtomata alinomado)"
 
-#: kmfilterdlg.cpp:1113
+#: kmfilterdlg.cpp:973
+#, fuzzy
+msgid "Select Folders to Filter"
+msgstr "Elekti leterujon per fokuso"
+
+#: kmfilterdlg.cpp:1136
 msgid "Please select an action."
 msgstr "Bonvolu elekti agon."
 
-#: kmfilterdlg.cpp:1280
+#: kmfilterdlg.cpp:1303
 msgid "&Download mail"
 msgstr "&Ricevi poŝton"
 
-#: kmfilterdlg.cpp:1281
+#: kmfilterdlg.cpp:1304
 msgid "Download mail la&ter"
 msgstr "Ricevi poŝton &poste"
 
-#: kmfilterdlg.cpp:1282
+#: kmfilterdlg.cpp:1305
 msgid "D&elete mail from server"
 msgstr "&Forigi poŝtaĵojn de la servilo"
 
@@ -6386,10 +7251,28 @@ msgstr "&Forigi poŝtaĵojn de la servilo"
 msgid "<qt>Error while creating file <b>%1</b>:<br>%2</qt>"
 msgstr "<qt>Eraro dum kreo de dosiero <b>%1</b>:<br>%2</qt>"
 
-#: kmfolder.cpp:272
+#: kmfolder.cpp:276
 msgid "Failed to create folder"
 msgstr "Ne eblis krei dosierujon"
 
+#: kmfolder.cpp:907
+msgid ""
+"Folder names cannot contain the / (slash) character; please choose another "
+"folder name."
+msgstr ""
+
+#: kmfolder.cpp:913
+msgid ""
+"Folder names cannot start with a . (dot) character; please choose another "
+"folder name."
+msgstr ""
+
+#: kmfolder.cpp:932
+msgid ""
+"Your IMAP server does not allow the character '%1'; please choose another "
+"folder name."
+msgstr ""
+
 #: kmfoldercachedimap.cpp:107
 msgid "Troubleshooting IMAP Cache"
 msgstr "Korektigi IMAPan kaŝmemoron"
@@ -6443,24 +7326,24 @@ msgstr "Ĉiujn leterujojn de tiu konto"
 msgid "Refresh &Cache"
 msgstr "Refreŝigi &kaŝmemoron"
 
-#: 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
 msgid "You must synchronize with the server before renaming IMAP folders."
 msgstr ""
 "Vi devas samigi kun la servilo antaŭ vi alinomas la IMAPajn leterujojn."
 
-#: kmfoldercachedimap.cpp:679
+#: kmfoldercachedimap.cpp:735
 msgid ""
 "No account setup for this folder.\n"
 "Please try running a sync before this."
@@ -6468,7 +7351,7 @@ msgstr ""
 "Ne konta agordo por la leterujo.\n"
 "Provu samigadon antaŭe."
 
-#: kmfoldercachedimap.cpp:683
+#: kmfoldercachedimap.cpp:739
 msgid ""
 "Are you sure you want to refresh the IMAP cache of the folder %1 and all its "
 "subfolders?\n"
@@ -6478,19 +7361,19 @@ msgstr ""
 "ĝiajn subleterujojn?\n"
 "Tio forigos ĉiujn ŝanĝojn, kiujn vi faris loke al viaj leterujoj."
 
-#: kmfoldercachedimap.cpp:687 kmmainwidget.cpp:1352
+#: kmfoldercachedimap.cpp:743 kmmainwidget.cpp:1316
 msgid "Refresh IMAP Cache"
 msgstr "Refreŝigi IMAPan kaŝmemoron"
 
-#: kmfoldercachedimap.cpp:688 kmmainwidget.cpp:1352
+#: kmfoldercachedimap.cpp:744 kmmainwidget.cpp:1316
 msgid "&Refresh"
 msgstr "&Refreŝigi"
 
-#: kmfoldercachedimap.cpp:711
+#: kmfoldercachedimap.cpp:767
 msgid "The index of this folder has been recreated."
 msgstr "La leterujo estas reindeksita."
 
-#: kmfoldercachedimap.cpp:721
+#: kmfoldercachedimap.cpp:777
 msgid ""
 "Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
 "to initial sync state and sync anyway?"
@@ -6498,127 +7381,128 @@ msgstr ""
 "Leterujo %1 ne estas en komenca samigecostato (stato estas %2). Ĉu vi volas "
 "ŝangi al la komenca stato kaj denove samigi?"
 
-#: kmfoldercachedimap.cpp:721
+#: kmfoldercachedimap.cpp:777
 msgid "Reset && Sync"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:741
+#: kmfoldercachedimap.cpp:798
 msgid "Synchronization skipped"
 msgstr "Samigado forigita"
 
-#: kmfoldercachedimap.cpp:831
+#: kmfoldercachedimap.cpp:890
 msgid "Synchronizing"
 msgstr "Samigante"
 
-#: kmfoldercachedimap.cpp:850
+#: kmfoldercachedimap.cpp:909
 #, c-format
 msgid "Connecting to %1"
 msgstr "Konektante al %1"
 
-#: kmfoldercachedimap.cpp:872
+#: kmfoldercachedimap.cpp:934
 msgid "Checking permissions"
 msgstr "Kontrolante permesojn"
 
-#: kmfoldercachedimap.cpp:886
+#: kmfoldercachedimap.cpp:956
 msgid "Renaming folder"
 msgstr "Alinomante leterujon"
 
-#: kmfoldercachedimap.cpp:948
+#: kmfoldercachedimap.cpp:1021
 msgid "Retrieving folderlist"
 msgstr "Retrovante leterujan liston"
 
-#: kmfoldercachedimap.cpp:952
+#: kmfoldercachedimap.cpp:1026
 msgid "Error while retrieving the folderlist"
 msgstr "Eraro dum retrovo de la leteruja listo"
 
-#: kmfoldercachedimap.cpp:959
+#: kmfoldercachedimap.cpp:1035
 msgid "Retrieving subfolders"
 msgstr "Retrovante subleterujojn"
 
-#: kmfoldercachedimap.cpp:966
+#: kmfoldercachedimap.cpp:1043
 msgid "Deleting folders from server"
 msgstr "Forigante leterujojn de la servilo"
 
-#: kmfoldercachedimap.cpp:981
+#: kmfoldercachedimap.cpp:1058
 msgid "Retrieving message list"
 msgstr "Serĉante mesaĝan liston"
 
-#: kmfoldercachedimap.cpp:994
+#: kmfoldercachedimap.cpp:1071
 msgid "No messages to delete..."
 msgstr "Neniuj forigotaj mesaĝoj..."
 
-#: kmfoldercachedimap.cpp:1005
+#: kmfoldercachedimap.cpp:1082
 msgid "Expunging deleted messages"
 msgstr "Detruante forigitajn mesaĝojn"
 
-#: kmfoldercachedimap.cpp:1019
-msgid "Retrieving new messages"
-msgstr "Serĉante novajn mesaĝojn"
+#: kmfoldercachedimap.cpp:1096
+#, fuzzy, c-format
+msgid ""
+"_n: Retrieving one new message\n"
+"Retrieving %n new messages"
+msgstr ""
+"1 nova mesaĝo en %1\n"
+"%n novaj mesaĝoj en %1"
 
-#: kmfoldercachedimap.cpp:1031
+#: kmfoldercachedimap.cpp:1108
 msgid "No new messages from server"
 msgstr "Neniuj novaj mesaĝoj de la servilo"
 
-#: kmfoldercachedimap.cpp:1064
+#: kmfoldercachedimap.cpp:1141
 msgid "Checking annotation support"
 msgstr "Kontrolante subtenon por notoj"
 
-#: kmfoldercachedimap.cpp:1111
+#: kmfoldercachedimap.cpp:1191
 msgid "Retrieving annotations"
 msgstr "Ekprenante notojn"
 
-#: kmfoldercachedimap.cpp:1133
+#: kmfoldercachedimap.cpp:1213
 msgid "Setting annotations"
 msgstr "Agordante notojn"
 
-#: kmfoldercachedimap.cpp:1174
+#: kmfoldercachedimap.cpp:1260
 msgid "Setting permissions"
 msgstr "Agordante permesojn"
 
-#: kmfoldercachedimap.cpp:1193
+#: kmfoldercachedimap.cpp:1279
 msgid "Retrieving permissions"
 msgstr "Ekprenante permesojn"
 
-#: kmfoldercachedimap.cpp:1203
+#: kmfoldercachedimap.cpp:1306
 msgid "Getting quota information"
 msgstr "Ekprenante kvot-informojn"
 
-#: kmfoldercachedimap.cpp:1218
-msgid "Updating cache file"
-msgstr "Aktualigante kaŝmemoran dosieron"
-
-#: kmfoldercachedimap.cpp:1244
+#: kmfoldercachedimap.cpp:1321
 msgid "Synchronization done"
 msgstr "Samigita"
 
-#: kmfoldercachedimap.cpp:1326
+#: kmfoldercachedimap.cpp:1464
 msgid "Uploading messages to server"
 msgstr "Alŝutante mesaĝojn al servilo"
 
-#: 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
 msgid "No messages to upload to server"
 msgstr "Neniuj alŝutotaj mesaĝoj"
 
-#: kmfoldercachedimap.cpp:1366 kmfoldercachedimap.cpp:1410
+#: kmfoldercachedimap.cpp:1504 kmfoldercachedimap.cpp:1553
 msgid "Uploading status of messages to server"
 msgstr "Alŝutstato de mesaĝoj"
 
-#: kmfoldercachedimap.cpp:1490
+#: kmfoldercachedimap.cpp:1647
 msgid "Creating subfolders on server"
 msgstr "Kreante leterujon en servilo"
 
-#: kmfoldercachedimap.cpp:1546
+#: kmfoldercachedimap.cpp:1707
 msgid ""
 "<qt>"
 "<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
@@ -6630,24 +7514,24 @@ msgstr ""
 "ilin loke?</p></qt>"
 "<br>UID-oj: %2</p></qt>"
 
-#: kmfoldercachedimap.cpp:1558
+#: kmfoldercachedimap.cpp:1719
 msgid "Deleting removed messages from server"
 msgstr "Forigi poŝtaĵojn de la servilo"
 
-#: kmfoldercachedimap.cpp:1592
+#: kmfoldercachedimap.cpp:1758
 msgid "Checking folder validity"
 msgstr "Kontrolante leterujan validecon"
 
-#: kmfoldercachedimap.cpp:1806
+#: kmfoldercachedimap.cpp:1972
 msgid "Folder listing failed in interesting ways."
 msgstr ""
 
-#: kmfoldercachedimap.cpp:1888
+#: kmfoldercachedimap.cpp:2058
 #, c-format
 msgid "Retrieving folders for namespace %1"
 msgstr "Ekprenante leterujojn por nomspaco %1"
 
-#: kmfoldercachedimap.cpp:2130
+#: kmfoldercachedimap.cpp:2300
 msgid ""
 "<qt>"
 "<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
@@ -6657,11 +7541,11 @@ msgstr ""
 "<p>Ŝajnas, ke la leterujo <b>%1</b> estas forigita. Ĉu vi volas forigi ĝin de "
 "la servilo?</p></qt>"
 
-#: kmfoldercachedimap.cpp:2411
+#: kmfoldercachedimap.cpp:2597
 msgid "Aborted"
 msgstr "Interrompita"
 
-#: kmfoldercachedimap.cpp:2592
+#: kmfoldercachedimap.cpp:2812
 msgid ""
 "The IMAP server %1 does not have support for IMAP annotations. The XML storage "
 "cannot be used on this server; please re-configure KMail differently."
@@ -6669,7 +7553,7 @@ msgstr ""
 "La IMAPa servilo %1 ne subtenas IMAPan notojn. La XML-memoro ne estas uzebla "
 "kun tiu servilo. Bonvole reagordu KMail-on alimaniere."
 
-#: kmfoldercachedimap.cpp:2620
+#: kmfoldercachedimap.cpp:2840
 msgid ""
 "The IMAP server %1 doesn't have support for imap annotations. The XML storage "
 "cannot be used on this server, please re-configure KMail differently"
@@ -6677,15 +7561,15 @@ msgstr ""
 "La IMAPa servilo %1 ne subtenas IMAPan notojn. La XML-memoro ne estas uzebla "
 "kun tiu servilo. Bonvole reagordu KMail-on alimaniere."
 
-#: kmfoldercachedimap.cpp:2729
+#: kmfoldercachedimap.cpp:2951
 msgid "Error while setting annotation: "
 msgstr "Eraro dum nota agordo: "
 
-#: kmfoldercachedimap.cpp:2857 kmfoldercachedimap.cpp:2860
+#: kmfoldercachedimap.cpp:3079 kmfoldercachedimap.cpp:3082
 msgid "lost+found"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:2895
+#: kmfoldercachedimap.cpp:3117
 msgid ""
 "<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
 "the server yet, but the folder has been deleted on the server or you do not "
@@ -6694,11 +7578,11 @@ msgid ""
 "to avoid data loss.</p>"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:2901
+#: kmfoldercachedimap.cpp:3123
 msgid "Insufficient access rights"
 msgstr "Nesufiĉaj alirpermesoj"
 
-#: kmfoldercachedimap.cpp:2907
+#: kmfoldercachedimap.cpp:3129
 msgid ""
 "<p>There are new messages in this folder (%1), which have not been uploaded to "
 "the server yet, but the folder has been deleted on the server or you do not "
@@ -6708,55 +7592,62 @@ msgid ""
 "<p>Do you want to move these messages to another folder now?</p>"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:2914 kmkernel.cpp:1801
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1903
 msgid "Do Not Move"
 msgstr "Ne ŝovi"
 
-#: kmfoldercachedimap.cpp:2916
+#: kmfoldercachedimap.cpp:3138
 msgid "Move Messages to Folder"
 msgstr "Ŝovi mesaĝojn al leterujo"
 
-#: kmfolderdia.cpp:83
+#: kmfolderdia.cpp:84
 msgid "Permissions (ACL)"
 msgstr "Rajtoj (AKL)"
 
 #. 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 "Ĝenerale"
 
-#: kmfolderdia.cpp:124
+#: kmfolderdia.cpp:125
 msgid "Templates"
 msgstr ""
 
-#: kmfolderdia.cpp:133
+#: kmfolderdia.cpp:134
 msgid "Access Control"
 msgstr "Alirkontrolo"
 
-#: kmfolderdia.cpp:140
+#: kmfolderdia.cpp:141
 msgid "Quota"
 msgstr "Kvoto"
 
+#: kmfolderdia.cpp:327
+msgid ""
+"Not enough permissions to rename this folder.\n"
+"The parent folder doesn't have write support.\n"
+"A sync is needed after changing the permissions."
+msgstr ""
+
 #. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:299 rc.cpp:239
+#: kmfolderdia.cpp:356 rc.cpp:245
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "Uzi proprajn p&iktogramojn"
 
-#: kmfolderdia.cpp:304
+#: kmfolderdia.cpp:361
 msgid "&Normal:"
 msgstr "&Normala:"
 
-#: kmfolderdia.cpp:319
+#: kmfolderdia.cpp:376
 msgid "&Unread:"
 msgstr "&Nelegita:"
 
-#: kmfolderdia.cpp:356
+#: kmfolderdia.cpp:413
 msgid "Act on new/unread mail in this folder"
 msgstr "Agi pri nova/nelegita poŝto en tiu leterujo"
 
-#: kmfolderdia.cpp:358
+#: kmfolderdia.cpp:415
 msgid ""
 "<qt>"
 "<p>If this option is enabled then you will be notified about new/unread mail in "
@@ -6768,15 +7659,15 @@ msgid ""
 "new/unread mail in your trash and spam folder.</p></qt>"
 msgstr ""
 
-#: kmfolderdia.cpp:374
+#: kmfolderdia.cpp:431
 msgid "Include this folder in mail checks"
 msgstr "Inkluzivigi tiun leterujon en la kontrolo"
 
-#: kmfolderdia.cpp:385
+#: kmfolderdia.cpp:442
 msgid "Keep replies in this folder"
 msgstr "Konservi respondojn en ĉi leterujo"
 
-#: kmfolderdia.cpp:387
+#: kmfolderdia.cpp:444
 msgid ""
 "Check this option if you want replies you write to mails in this folder to be "
 "put in this same folder after sending, instead of in the configured sent-mail "
@@ -6785,34 +7676,34 @@ msgstr ""
 "Marku la opcion, se vi volas ĉi tie la respondojn, kiuj vi faris de leterojn en "
 "tiu leterujo, anstataŭ en la sendita-leterujo."
 
-#: kmfolderdia.cpp:402
+#: kmfolderdia.cpp:459
 msgid "Show Sender/Receiver Column in List of Messages"
 msgstr ""
 
-#: kmfolderdia.cpp:404
+#: kmfolderdia.cpp:461
 msgid "Sho&w column:"
 msgstr "Mon&tri kolumnon:"
 
 #. 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 "Sendinto"
 
 #. 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 "Ricevonto"
 
-#: kmfolderdia.cpp:423
+#: kmfolderdia.cpp:480
 msgid "&Sender identity:"
 msgstr "&Sendantula identeco:"
 
-#: kmfolderdia.cpp:429
+#: kmfolderdia.cpp:486
 msgid ""
 "Select the sender identity to be used when writing new mail or replying to mail "
 "in this folder. This means that if you are in one of your work folders, you can "
@@ -6821,15 +7712,15 @@ msgid ""
 "configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
 
-#: kmfolderdia.cpp:442
+#: kmfolderdia.cpp:500
 msgid "&Folder contents:"
 msgstr "&Leteruja enhavo:"
 
-#: kmfolderdia.cpp:475
+#: kmfolderdia.cpp:533
 msgid "Generate free/&busy and activate alarms for:"
 msgstr ""
 
-#: kmfolderdia.cpp:482
+#: kmfolderdia.cpp:540
 msgid ""
 "This setting defines which users sharing this folder should get \"busy\" "
 "periods in their freebusy lists and should see the alarms for the events or "
@@ -6845,28 +7736,39 @@ msgid ""
 "is not known who will go to those events."
 msgstr ""
 
-#: kmfolderdia.cpp:497
+#: kmfolderdia.cpp:555
 msgid "Nobody"
 msgstr "Neniu"
 
-#: kmfolderdia.cpp:498
+#: kmfolderdia.cpp:556
 msgid "Admins of This Folder"
 msgstr "Admin-uloj de ĉi leterujo"
 
-#: kmfolderdia.cpp:499
+#: kmfolderdia.cpp:557
 msgid "All Readers of This Folder"
 msgstr "Ĉiuj legantoj de ĉi leterujo"
 
-#: kmfolderdia.cpp:502
+#: kmfolderdia.cpp:560
 msgid ""
 "This setting allows you to disable alarms for folders shared by others. "
 msgstr ""
 
-#: kmfolderdia.cpp:506
-msgid "Block free/&busy and alarms locally"
+#: kmfolderdia.cpp:562
+msgid "Block alarms locally"
+msgstr ""
+
+#: kmfolderdia.cpp:576
+msgid "Share unread state with all users"
 msgstr ""
 
-#: kmfolderdia.cpp:585
+#: kmfolderdia.cpp:579
+msgid ""
+"If enabled, the unread state of messages in this folder will be the same for "
+"all users having access to this folders. If disabled (the default), every user "
+"with access to this folder has her own unread state."
+msgstr ""
+
+#: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
 "general configuration option to hide groupware folders is set. That means that "
@@ -6875,70 +7777,70 @@ msgid ""
 "groupware folders to be able to see it."
 msgstr ""
 
-#: kmfolderdir.cpp:184
+#: kmfolderdir.cpp:209
 msgid "<qt>Cannot enter folder <b>%1</b>.</qt>"
 msgstr "<qt>Ne eblis malfermi la leterujon <b>%1</b>.</qt>"
 
-#: kmfolderdir.cpp:192
+#: kmfolderdir.cpp:217
 msgid "<qt>Folder <b>%1</b> is unreadable.</qt>"
 msgstr "<qt>Dosierujo <b>%1</b> estas nelegebla.</qt>"
 
-#: kmfolderimap.cpp:251
+#: kmfolderimap.cpp:247
 msgid "Removing folder"
 msgstr "Forigante leterujon"
 
-#: kmfolderimap.cpp:252 searchjob.cpp:270
+#: kmfolderimap.cpp:248 searchjob.cpp:270
 #, c-format
 msgid "URL: %1"
 msgstr "URL: %1"
 
-#: kmfolderimap.cpp:267
+#: kmfolderimap.cpp:263
 msgid "Error while removing a folder."
 msgstr "Eraro dum legado de dosiero."
 
-#: kmfolderimap.cpp:497
+#: kmfolderimap.cpp:491
 #, c-format
 msgid "Destination folder: %1"
 msgstr "Celleterujo: %1"
 
-#: kmfolderimap.cpp:1068
+#: kmfolderimap.cpp:1069
 msgid "checking"
 msgstr "kontrolante"
 
-#: kmfolderimap.cpp:1118
+#: kmfolderimap.cpp:1119
 msgid "Error while querying the server status."
 msgstr "Eraro dum demandante la servilstaton."
 
-#: kmfolderimap.cpp:1233
+#: kmfolderimap.cpp:1234
 msgid "Retrieving message status"
 msgstr "Demandante la mesaĝan staton"
 
-#: kmfolderimap.cpp:1248 kmfolderimap.cpp:1343
+#: kmfolderimap.cpp:1249 kmfolderimap.cpp:1344
 msgid "Retrieving messages"
 msgstr "Prenante mesaĝojn"
 
-#: kmfolderimap.cpp:1273
+#: kmfolderimap.cpp:1274
 #, c-format
 msgid "Error while listing the contents of the folder %1."
 msgstr "Eraro dum listkreo de la leteruja (%1) enhavo."
 
-#: kmfolderimap.cpp:1694
+#: kmfolderimap.cpp:1695
 msgid "Error while retrieving messages."
 msgstr "Eraro dum preno de mesaĝoj."
 
-#: kmfolderimap.cpp:1763
+#: kmfolderimap.cpp:1764
 msgid "Error while creating a folder."
 msgstr "Eraro dum kreo de leterujo."
 
-#: kmfolderimap.cpp:2130
+#: kmfolderimap.cpp:2131
 msgid "updating message counts"
 msgstr "aktualigante mesaĝan nombron"
 
-#: kmfolderimap.cpp:2154
+#: kmfolderimap.cpp:2155
 msgid "Error while getting folder information."
 msgstr "Eraro dum demando de leteruja informo."
 
-#: kmfolderindex.cpp:334
+#: kmfolderindex.cpp:369
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
@@ -6948,19 +7850,19 @@ msgstr ""
 "La indekso povus esti rekreata de via leterujo, sed kelkaj informoj, kiel la "
 "leterostato perdiĝos. Ĉu vi deziras rekreon de la indeksdosiero?"
 
-#: kmfolderindex.cpp:337
+#: kmfolderindex.cpp:372
 msgid "Downgrade"
 msgstr "Malpromocii"
 
-#: kmfolderindex.cpp:337
+#: kmfolderindex.cpp:372
 msgid "Do Not Downgrade"
 msgstr "Me malpromocii"
 
-#: 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 ""
 "La leterindekso de '%1' estas el nekonata versio de Retpoŝtilo (%2).\n"
 "La indekso povus esti rekreata de via leterujo, sed kelkaj informoj, kiel la "
@@ -6982,23 +7884,23 @@ msgstr ""
 msgid "Folder `%1' changed; recreating index."
 msgstr "Leterujo '%1' ŝanĝita. Rekreante indekson."
 
-#: kmfoldermaildir.cpp:252
+#: kmfoldermaildir.cpp:253
 msgid "Could not sync maildir folder."
 msgstr "Ne eblis samigi poŝtdosierujon."
 
-#: kmfoldermaildir.cpp:417
+#: kmfoldermaildir.cpp:418
 msgid "Message could not be added to the folder, possibly disk space is low."
 msgstr ""
 
-#: kmfoldermaildir.cpp:510
+#: kmfoldermaildir.cpp:514
 msgid "KMFolderMaildir::addMsg: abnormally terminating to prevent data loss."
 msgstr "KMFolderMaildir::addMsg: nenormala finiĝo pro evito de datumperdo"
 
-#: kmfoldermaildir.cpp:884 kmfoldermbox.cpp:794
+#: kmfoldermaildir.cpp:888 kmfoldermbox.cpp:799
 msgid "Writing index file"
 msgstr "Skribante indeksdosieron"
 
-#: kmfoldermaildir.cpp:892 kmfoldermbox.cpp:803
+#: kmfoldermaildir.cpp:896 kmfoldermbox.cpp:808
 msgid ""
 "Your outbox contains messages which were most-likely not created by KMail;\n"
 "please remove them from there if you do not want KMail to send them."
@@ -7006,7 +7908,7 @@ msgstr ""
 "Via leterujo \"sendotaj\" entenas mesagojn, ŝajne ne kreitajn de Retpoŝtilo.\n"
 "Bonvolu forigi ilin de tie, por eviti, ke Retpoŝtilo sendos ilin."
 
-#: kmfoldermbox.cpp:111
+#: kmfoldermbox.cpp:112
 msgid ""
 "Cannot open file \"%1\":\n"
 "%2"
@@ -7014,7 +7916,7 @@ msgstr ""
 "Ne eblis malfermi la dosieron \"%1\":\n"
 "%2"
 
-#: kmfoldermbox.cpp:128
+#: kmfoldermbox.cpp:129
 msgid ""
 "<qt>"
 "<p>The index of folder '%2' seems to be out of date. To prevent message "
@@ -7031,23 +7933,23 @@ msgstr ""
 "<p>Legu la apartenan tekston en la<a href=\"%1\">ĉapitro de oftaj demandoj de "
 "Poŝtila priskribo</a> pri informoj pro evito de problema reapero.</p></qt>"
 
-#: kmfoldermbox.cpp:152 kmfoldermbox.cpp:158
+#: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
 msgid "Index Out of Date"
 msgstr "Neaktuala indekso"
 
-#: kmfoldermbox.cpp:165
+#: kmfoldermbox.cpp:166
 msgid "Folder `%1' changed. Recreating index."
 msgstr "Leterujo '%1' ŝanĝita. Rekreante indekson."
 
-#: kmfoldermbox.cpp:298
+#: kmfoldermbox.cpp:300
 msgid "Could not sync index file <b>%1</b>: %2"
 msgstr "Ne eblas samigi indeksan dosieron <b>%1</b>: %2"
 
-#: kmfoldermbox.cpp:298
+#: kmfoldermbox.cpp:300
 msgid "Internal error. Please copy down the details and report a bug."
 msgstr "Eraro interna. Kopiu la detalojn kaj raportu la lamperfektaĵon."
 
-#: kmfoldermbox.cpp:597
+#: kmfoldermbox.cpp:602
 #, c-format
 msgid ""
 "_n: Creating index file: one message done\n"
@@ -7056,15 +7958,15 @@ msgstr ""
 "Kreante indeksdosieron: unu mesaĝo traktita\n"
 "Kreante indeksdosieron: %n mesaĝoj traktitaj"
 
-#: kmfoldermbox.cpp:1038
+#: kmfoldermbox.cpp:1043
 msgid "Could not add message to folder: "
 msgstr "Ne eblas aldoni mesaĝon al leterujo: "
 
-#: kmfoldermbox.cpp:1119
+#: kmfoldermbox.cpp:1127
 msgid "Could not add message to folder:"
 msgstr "Ne eblas aldoni mesaĝon al leterujo:"
 
-#: kmfoldermbox.cpp:1121
+#: kmfoldermbox.cpp:1129
 msgid "Could not add message to folder (No space left on device?)"
 msgstr "Ne eblas aldoni mesaĝon al leterujo: (Eble mankas spaco sur disko?)"
 
@@ -7072,11 +7974,11 @@ msgstr "Ne eblas aldoni mesaĝon al leterujo: (Eble mankas spaco sur disko?)"
 msgid "Are you sure you want to expire old messages?"
 msgstr "Ĉu vi vere volas forigi malnovajn mesaĝojn?"
 
-#: kmfoldermgr.cpp:69 kmmainwidget.cpp:1366
+#: kmfoldermgr.cpp:69 kmmainwidget.cpp:1330
 msgid "Expire Old Messages?"
 msgstr "Forigi malnovajn mesaĝojn?"
 
-#: kmfoldermgr.cpp:69 kmmainwidget.cpp:1366
+#: kmfoldermgr.cpp:69 kmmainwidget.cpp:1330
 msgid "Expire"
 msgstr "Forigi"
 
@@ -7088,7 +7990,7 @@ msgstr ""
 "'%1' ŝajnas ne esti dosierujo.\n"
 "Forigu la dosieron."
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1325
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1368
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
@@ -7096,7 +7998,7 @@ msgstr ""
 "La permesoj ujaj (%1) estas malkorektaj.\n"
 "Certigu, ke vi povas legi kaj skribi la ujan enhavon."
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1317
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1360
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -7115,7 +8017,7 @@ msgstr ""
 msgid "Could Not Create Folder"
 msgstr "Ne eblis krei dosierujon"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1611
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1676
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -7123,112 +8025,112 @@ msgstr ""
 "Ne eblas krei la dosieron '%1' en %2.\n"
 "KMail ne povas lanĉiĝi sen ĝi."
 
-#: 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 "Nova &subleterujo..."
 
-#: kmfolderseldlg.cpp:446 kmfolderseldlg.cpp:466
+#: kmfolderseldlg.cpp:26 kmfolderseldlg.cpp:48
 msgid "Create a new subfolder under the currently selected folder"
 msgstr "Krei novan subleterujon sub la aktuale elektita leterujo"
 
-#: kmfoldertree.cpp:386 kmheaders.cpp:128
+#: kmfolderseldlg.cpp:36 kmfolderseldlg.cpp:55
+msgid "You can start typing to filter the list of folders"
+msgstr ""
+
+#: kmfoldertree.cpp:407 kmheaders.cpp:130
 msgid "View Columns"
 msgstr "Vidigi kolumnojn"
 
-#: kmfoldertree.cpp:388
+#: kmfoldertree.cpp:409
 msgid "Unread Column"
 msgstr "Nelegita kolumno"
 
-#: kmfoldertree.cpp:389
+#: kmfoldertree.cpp:410
 msgid "Total Column"
 msgstr "Sumkolumno"
 
-#: kmfoldertree.cpp:390
+#: kmfoldertree.cpp:411
 #, fuzzy
 msgid "Size Column"
 msgstr "Vidigi kolumnojn"
 
-#: kmfoldertree.cpp:567 kmfoldertree.cpp:1059
+#: kmfoldertree.cpp:591 kmfoldertree.cpp:1094
 msgid "Searches"
 msgstr "Serĉoj"
 
-#: kmfoldertree.cpp:884
+#: kmfoldertree.cpp:920
 msgid "<qt>Go to the next unread message in folder <b>%1</b>?</qt>"
 msgstr "<qt>Ĉu iri al la sekva nelegita mesaĝo en la leterujo <b>%1</b>?</qt>"
 
-#: kmfoldertree.cpp:886
+#: kmfoldertree.cpp:922
 msgid "Go to Next Unread Message"
 msgstr "Iri al la sekva nelegita mesaĝo"
 
-#: kmfoldertree.cpp:887
+#: kmfoldertree.cpp:923
 msgid "Go To"
 msgstr "Iri al"
 
-#: kmfoldertree.cpp:887
+#: kmfoldertree.cpp:923
 msgid "Do Not Go To"
 msgstr "Ne iri al"
 
-#: kmfoldertree.cpp:1057 kmmainwidget.cpp:2757
+#: kmfoldertree.cpp:1092 kmmainwidget.cpp:2780
 msgid "&New Folder..."
 msgstr "&Nova leterujo..."
 
-#: kmfoldertree.cpp:1068 kmmainwidget.cpp:2645
+#: kmfoldertree.cpp:1103 kmmainwidget.cpp:2668
 msgid "Check &Mail"
 msgstr "Rigardi je &nova poŝto"
 
-#: kmfoldertree.cpp:1084
+#: kmfoldertree.cpp:1119
 msgid "&Copy Folder To"
 msgstr "&Kopii leterujon al"
 
-#: kmfoldertree.cpp:1090
+#: kmfoldertree.cpp:1125
 msgid "&Move Folder To"
 msgstr "&Movi leterujon al"
 
-#: kmfoldertree.cpp:1104
+#: kmfoldertree.cpp:1141
 #, fuzzy
 msgid "Add to Favorite Folders"
 msgstr "Normaj grupoprogramaraj leterujoj"
 
-#: kmfoldertree.cpp:1123
-msgid "Subscription..."
+#: kmfoldertree.cpp:1160
+#, fuzzy
+msgid "Serverside Subscription..."
 msgstr "Subskribaĵo..."
 
-#: kmfoldertree.cpp:1126
+#: kmfoldertree.cpp:1163
 msgid "Local Subscription..."
 msgstr "Loka Subskribaĵo..."
 
-#: kmfoldertree.cpp:1133
+#: kmfoldertree.cpp:1170
 msgid "Refresh Folder List"
 msgstr "Refreŝigi leterujan liston"
 
-#: kmfoldertree.cpp:1140 kmmainwidget.cpp:3737
+#: kmfoldertree.cpp:1177 kmmainwidget.cpp:3771
 msgid "&Troubleshoot IMAP Cache..."
 msgstr "&Korektigi kaŝmemoron..."
 
-#: kmfoldertree.cpp:1242
+#: kmfoldertree.cpp:1280
 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 ""
 
-#: 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 "Nelegita"
 
-#: 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 "Sume"
 
-#: kmfoldertree.cpp:1951
+#: kmfoldertree.cpp:1989
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> here because a folder with the same "
 "name already exists.</qt>"
@@ -7236,7 +8138,7 @@ msgstr ""
 "<qt>Ne eblas krei aŭ kopii leterujon <b>%1</b> tien ĉi ĉar leterujo de sama "
 "nomo jam ekzistas.</qt>"
 
-#: kmfoldertree.cpp:1961
+#: kmfoldertree.cpp:2000
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> because it is not completely copied "
 "itself.</qt>"
@@ -7244,67 +8146,72 @@ msgstr ""
 "<qt>Ne eblas ŝovi aŭ kopii leterujon <b>%1</b> ĉar ĝi mem ne estas komplete "
 "kopiita.</qt>"
 
-#: kmfoldertree.cpp:1970
+#: kmfoldertree.cpp:2010
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> into a subfolder below itself.</qt>"
 msgstr ""
 "<qt>Ne eblas ŝovi aŭ kopii leterujon <b>%1</b> en subleterujon malsupre de si "
 "mem.</qt>"
 
-#: kmfoldertree.cpp:2012
+#: kmfoldertree.cpp:2055
 msgid "Moving the selected folders is not possible"
 msgstr "Ŝovado de la elektitaj leterujoj ne eblas"
 
-#: kmheaders.cpp:130
+#: kmheaders.cpp:132
 msgid "Status"
 msgstr "Stato"
 
-#: kmheaders.cpp:131 kmsearchpattern.h:218
+#: kmheaders.cpp:133 kmsearchpattern.h:218
 msgid "Important"
 msgstr "Grava"
 
-#: kmheaders.cpp:132
+#: kmheaders.cpp:134
 msgid "Action Item"
 msgstr ""
 
-#: kmheaders.cpp:133
+#: kmheaders.cpp:135
 msgid "Attachment"
 msgstr "Kunsendaĵo"
 
-#: kmheaders.cpp:134
+#: kmheaders.cpp:136 kmsearchpattern.h:233
+#, fuzzy
+msgid "Invitation"
+msgstr "Dokumentaro"
+
+#: kmheaders.cpp:137
 msgid "Spam/Ham"
 msgstr "Fimesaĝo"
 
-#: kmheaders.cpp:135
+#: kmheaders.cpp:138
 msgid "Watched/Ignored"
 msgstr "Observita/ignorita"
 
-#: kmheaders.cpp:136
+#: kmheaders.cpp:139
 msgid "Signature"
 msgstr "Subskribo"
 
-#: 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 "Temo"
 
-#: 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 "Dato"
 
-#: kmheaders.cpp:772 kmheaders.cpp:2601
+#: kmheaders.cpp:801 kmheaders.cpp:2643
 #, fuzzy
 msgid "Order of Arrival"
 msgstr "Dato (laŭ alventempo)"
 
-#: kmheaders.cpp:777 kmheaders.cpp:2606
+#: kmheaders.cpp:806 kmheaders.cpp:2648
 msgid " (Status)"
 msgstr " (stato)"
 
-#: kmheaders.cpp:1360
+#: kmheaders.cpp:1398
 #, c-format
 msgid ""
 "_n: 1 unsent\n"
@@ -7313,11 +8220,11 @@ msgstr ""
 "1 nesendita\n"
 "%n nesenditaj"
 
-#: kmheaders.cpp:1360
+#: kmheaders.cpp:1398
 msgid "0 unsent"
 msgstr "0 nesendita"
 
-#: kmheaders.cpp:1362
+#: kmheaders.cpp:1400
 #, c-format
 msgid ""
 "_n: 1 unread\n"
@@ -7326,11 +8233,11 @@ msgstr ""
 "1 nelegita\n"
 "%n nelegitaj"
 
-#: kmheaders.cpp:1362
+#: kmheaders.cpp:1400
 msgid "0 unread"
 msgstr "0 nelegitaj"
 
-#: kmheaders.cpp:1364
+#: kmheaders.cpp:1402
 msgid ""
 "_n: 1 message, %1.\n"
 "%n messages, %1."
@@ -7338,17 +8245,17 @@ msgstr ""
 "1 mesaĝo, %1.\n"
 "%n mesaĝoj, %1."
 
-#: kmheaders.cpp:1365
+#: kmheaders.cpp:1403
 msgid "0 messages"
 msgstr "0 mesaĝoj"
 
-#: kmheaders.cpp:1367
+#: kmheaders.cpp:1405
 msgid ""
 "_: %1 = n messages, m unread.\n"
 "%1 Folder is read-only."
 msgstr "%1 Leterujo estas nur-lega."
 
-#: kmheaders.cpp:1560
+#: kmheaders.cpp:1598
 #, c-format
 msgid ""
 "_n: <qt>Do you really want to delete the selected message?"
@@ -7361,49 +8268,49 @@ msgstr ""
 "<qt>Ĉu vi vere volas forigi la %n elektajn mesaĝojn? "
 "<br>Forigite ili ne estas rekreblaj.</qt>"
 
-#: kmheaders.cpp:1562
+#: kmheaders.cpp:1600
 msgid "Delete Messages"
 msgstr "Forigi mesaĝojn"
 
-#: kmheaders.cpp:1562
+#: kmheaders.cpp:1600
 msgid "Delete Message"
 msgstr "Forigi mesaĝon"
 
-#: kmheaders.cpp:1586
+#: kmheaders.cpp:1624
 msgid "Messages deleted successfully."
 msgstr "Mesaĝoj sukcese forigitaj"
 
-#: kmheaders.cpp:1586
+#: kmheaders.cpp:1624
 msgid "Messages moved successfully"
 msgstr "Mesaĝoj sukcese movitaj"
 
-#: kmheaders.cpp:1609
+#: kmheaders.cpp:1647
 msgid "Deleting messages failed."
 msgstr "Forigo de mesaĝoj fiaskis."
 
-#: kmheaders.cpp:1609
+#: kmheaders.cpp:1647
 msgid "Moving messages failed."
 msgstr "Movo de mesaĝoj fiaskis."
 
-#: kmheaders.cpp:1612
+#: kmheaders.cpp:1650
 msgid "Deleting messages canceled."
 msgstr "Forigo de mesaĝoj interrompita."
 
-#: kmheaders.cpp:1612
+#: kmheaders.cpp:1650
 msgid "Moving messages canceled."
 msgstr "Movo de mesaĝoj interrompita."
 
-#: 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 "&Kopii al"
 
-#: 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 "&Movi al"
 
-#: kmheaders.cpp:2774 kmheaders.cpp:2814
+#: kmheaders.cpp:2818 kmheaders.cpp:2858
 msgid ""
 "Failure modifying %1\n"
 "(No space left on device?)"
@@ -7411,84 +8318,96 @@ msgstr ""
 "Eraro dum ŝanĝo de %1\n"
 "(Eble mankas spaco sur disko?)"
 
-#: kmkernel.cpp:684
+#: kmkernel.cpp:712
 msgid "Certificate Signature Request"
 msgstr "Peto pri subskribo de atestilo"
 
-#: kmkernel.cpp:687
+#: kmkernel.cpp:715
 msgid "Please create a certificate from attachment and return to sender."
 msgstr "Bonvolu krei atestilon de la kunsendaĵo kaj resendi al la sendinto."
 
-#: kmkernel.cpp:1210
+#: kmkernel.cpp:1246
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 
-#: kmkernel.cpp:1220
+#: kmkernel.cpp:1256
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr ""
 
-#: kmkernel.cpp:1241
+#: kmkernel.cpp:1283
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr ""
 
-#: kmkernel.cpp:1244 kmmainwidget.cpp:1899
+#: kmkernel.cpp:1286 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr "Labori konektite"
 
-#: kmkernel.cpp:1245 kmmainwidget.cpp:1897
+#: kmkernel.cpp:1287 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr "Labori malkonektite"
 
-#: kmkernel.cpp:1379
+#: kmkernel.cpp:1429
 msgid "You do not have read/write permission to your inbox folder."
 msgstr "Vi ne havas legan aŭ skriban permeson por la ricevitujo."
 
-#: kmkernel.cpp:1387
+#: kmkernel.cpp:1437
 msgid "outbox"
 msgstr "sendotaj"
 
-#: kmkernel.cpp:1389
+#: kmkernel.cpp:1439
 msgid "You do not have read/write permission to your outbox folder."
 msgstr "Vi ne havas legan aŭ skriban permeson por la sendotujo."
 
-#: kmkernel.cpp:1406
+#: kmkernel.cpp:1456
 msgid "sent-mail"
 msgstr "senditaj"
 
-#: kmkernel.cpp:1408
+#: kmkernel.cpp:1458
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr "Vi ne havas legan aŭ skriban permeson por la senditujo."
 
-#: kmkernel.cpp:1415
+#: kmkernel.cpp:1465
 msgid "trash"
 msgstr "rubo"
 
-#: kmkernel.cpp:1417
+#: kmkernel.cpp:1467
 msgid "You do not have read/write permission to your trash folder."
 msgstr "Vi ne havas legan aŭ skriban permeson por la rubujo."
 
-#: kmkernel.cpp:1424
+#: kmkernel.cpp:1474
 msgid "drafts"
 msgstr "malnetaĵoj"
 
-#: kmkernel.cpp:1426
+#: kmkernel.cpp:1476
 msgid "You do not have read/write permission to your drafts folder."
 msgstr "Vi ne havas legan aŭ skriban permeson por la netujo."
 
-#: kmkernel.cpp:1435
+#: kmkernel.cpp:1485
 msgid "templates"
 msgstr "ŝablonoj"
 
-#: kmkernel.cpp:1437
+#: kmkernel.cpp:1487
 msgid "You do not have read/write permission to your templates folder."
 msgstr "Vi ne havas legan/skriban permeson por via ŝablonujo."
 
-#: kmkernel.cpp:1480 searchwindow.cpp:255 searchwindow.cpp:490
-#: searchwindow.cpp:633
+#: kmkernel.cpp:1531 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "Lasta serĉo"
 
-#: kmkernel.cpp:1777
+#: kmkernel.cpp:1716
+msgid ""
+"There is a problem with the mail index of the following folders, the indices "
+"will now be regenerated.\n"
+"This can happen because the index files are out of date, missing or corrupted.\n"
+"Contact your administrator if this happens frequently.\n"
+"Some information, like status flags, might get lost."
+msgstr ""
+
+#: kmkernel.cpp:1721
+msgid "Problem with mail indices"
+msgstr ""
+
+#: kmkernel.cpp:1879
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
 "<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
@@ -7498,7 +8417,7 @@ msgid ""
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 
-#: kmkernel.cpp:1789
+#: kmkernel.cpp:1891
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
 "<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
@@ -7507,15 +8426,15 @@ msgid ""
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 
-#: kmkernel.cpp:1798
+#: kmkernel.cpp:1900
 msgid "Migrate Mail Files?"
 msgstr ""
 
-#: kmkernel.cpp:2023
+#: kmkernel.cpp:2135
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr "Al KMail okazis grava eraro kaj ĝi do tuj finos"
 
-#: kmkernel.cpp:2025
+#: kmkernel.cpp:2137
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -7526,75 +8445,75 @@ msgstr ""
 "La eraro estis:\n"
 "%1"
 
-#: kmkernel.cpp:2158 kmmainwidget.cpp:1176
+#: kmkernel.cpp:2270 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "Malplenigi rubujon"
 
-#: kmkernel.cpp:2159
+#: kmkernel.cpp:2271
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Ĉu vi vere volas malplenigi la rubujon de ĉiuj kontoj?"
 
-#: kmlineeditspell.cpp:105
+#: kmlineeditspell.cpp:134
 msgid "vCard Import Failed"
 msgstr "vCard-importo fiaskis"
 
-#: kmlineeditspell.cpp:116
+#: kmlineeditspell.cpp:135
 msgid "<qt>Unable to access <b>%1</b>.</qt>"
 msgstr "<qt>Ne eblas aliri <b>%1</b>.</qt>"
 
-#: kmlineeditspell.cpp:168 recipientspicker.cpp:578
+#: kmlineeditspell.cpp:194 recipientspicker.cpp:578
 msgid "Recent Addresses"
 msgstr "Lasttempe uzita adreso"
 
-#: kmmainwidget.cpp:611
+#: kmmainwidget.cpp:601
 msgid "S&earch:"
 msgstr "&Serĉi:"
 
-#: kmmainwidget.cpp:674 kmmainwidget.cpp:1709
+#: kmmainwidget.cpp:664 kmmainwidget.cpp:1686
 msgid "Move Message to Folder"
 msgstr "Ŝovi mesaĝon al leterujo"
 
-#: kmmainwidget.cpp:679 kmmainwidget.cpp:1818
+#: kmmainwidget.cpp:669 kmmainwidget.cpp:1795
 msgid "Copy Message to Folder"
 msgstr "Kopii mesaĝon al leterujo"
 
-#: kmmainwidget.cpp:684 kmmainwidget.cpp:1697
+#: kmmainwidget.cpp:674 kmmainwidget.cpp:1674
 msgid "Jump to Folder"
 msgstr "Salti al leterujo"
 
-#: kmmainwidget.cpp:743
+#: kmmainwidget.cpp:717
 msgid "Remove Duplicate Messages"
 msgstr "Forigi kopiajn mesaĝojn"
 
-#: kmmainwidget.cpp:748
+#: kmmainwidget.cpp:722
 msgid "Abort Current Operation"
 msgstr "Interrompi nunan trakton"
 
-#: kmmainwidget.cpp:753
+#: kmmainwidget.cpp:727
 msgid "Focus on Next Folder"
 msgstr "Fokusi al sekva leterujo"
 
-#: kmmainwidget.cpp:758
+#: kmmainwidget.cpp:732
 msgid "Focus on Previous Folder"
 msgstr "Fokusi al antaŭa leterujo"
 
-#: kmmainwidget.cpp:763
+#: kmmainwidget.cpp:737
 msgid "Select Folder with Focus"
 msgstr "Elekti leterujon per fokuso"
 
-#: kmmainwidget.cpp:768
+#: kmmainwidget.cpp:742
 msgid "Focus on Next Message"
 msgstr "Fokusi al sekva mesaĝo"
 
-#: kmmainwidget.cpp:773
+#: kmmainwidget.cpp:747
 msgid "Focus on Previous Message"
 msgstr "Fokusi al antaŭa mesaĝo"
 
-#: kmmainwidget.cpp:778
+#: kmmainwidget.cpp:752
 msgid "Select Message with Focus"
 msgstr "Elekti mesaĝon per fokuso"
 
-#: kmmainwidget.cpp:977
+#: kmmainwidget.cpp:951
 msgid ""
 "_n: 1 new message in %1\n"
 "%n new messages in %1"
@@ -7602,47 +8521,47 @@ msgstr ""
 "1 nova mesaĝo en %1\n"
 "%n novaj mesaĝoj en %1"
 
-#: kmmainwidget.cpp:993
+#: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
 "<b>New mail arrived</b>"
 "<br>%1"
 msgstr "<b>Nova poŝto</b><br>%1"
 
-#: kmmainwidget.cpp:997
+#: kmmainwidget.cpp:971
 msgid "New mail arrived"
 msgstr "Nova poŝto"
 
-#: kmmainwidget.cpp:1128
+#: kmmainwidget.cpp:1100
 #, c-format
 msgid "Properties of Folder %1"
 msgstr "Ecoj de leterujo %1"
 
-#: kmmainwidget.cpp:1149
+#: kmmainwidget.cpp:1124
 msgid "This folder does not have any expiry options set"
 msgstr "Tiu leterujo ne havas iujn opciojn pri malvalidiĝo"
 
-#: kmmainwidget.cpp:1157
+#: kmmainwidget.cpp:1132
 msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 msgstr "<qt>Ĉu vi vere volas malvalidigi la leterujon <b>%1</b>?</qt>"
 
-#: kmmainwidget.cpp:1158
+#: kmmainwidget.cpp:1133
 msgid "Expire Folder"
 msgstr "Malplenigi leterujon"
 
-#: kmmainwidget.cpp:1159
+#: kmmainwidget.cpp:1134
 msgid "&Expire"
 msgstr "&Forigi"
 
-#: kmmainwidget.cpp:1176
+#: kmmainwidget.cpp:1151
 msgid "Move to Trash"
 msgstr "&Movi al rubujo"
 
-#: kmmainwidget.cpp:1178
+#: kmmainwidget.cpp:1153
 msgid "Are you sure you want to empty the trash folder?"
 msgstr "Ĉu vi vere volas malplenigi la rubujon?"
 
-#: kmmainwidget.cpp:1179
+#: kmmainwidget.cpp:1154
 msgid ""
 "<qt>Are you sure you want to move all messages from folder <b>%1</b> "
 "to the trash?</qt>"
@@ -7650,15 +8569,27 @@ msgstr ""
 "<qt>Ĉu vi vere volas ŝovi ĉiujn mesaĝojn de leterujo <b>%1</b> "
 "al la rubujo?</qt>"
 
-#: kmmainwidget.cpp:1198
+#: kmmainwidget.cpp:1173
 msgid "Moved all messages to the trash"
 msgstr "Ĉiuj mesaĝoj metitaj en la rubujon"
 
-#: 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 "Ne eblis krei dosierujon"
+
+#: kmmainwidget.cpp:1209
 msgid "Delete Search"
 msgstr "Forviŝi serĉon"
 
-#: kmmainwidget.cpp:1221
+#: kmmainwidget.cpp:1210
 msgid ""
 "<qt>Are you sure you want to delete the search <b>%1</b>?"
 "<br>Any messages it shows will still be available in their original folder.</qt>"
@@ -7667,15 +8598,15 @@ msgstr ""
 "<br>Mesaĝoj kiujn ĝi elmontras plue estos disponeblaj en ilia origina "
 "leterujo.</qt>"
 
-#: kmmainwidget.cpp:1225
+#: kmmainwidget.cpp:1214
 msgid "Delete Folder"
 msgstr "Forigi leterujon"
 
-#: kmmainwidget.cpp:1228
+#: kmmainwidget.cpp:1217
 msgid "<qt>Are you sure you want to delete the empty folder <b>%1</b>?</qt>"
 msgstr "<qt>Ĉu vi vere volas forigi la malplenan leterujon <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> "
@@ -7688,7 +8619,7 @@ msgstr ""
 "kaj ĉiujn subleterujojn? La subleterujoj povus ne esti malplenaj kaj iliaj "
 "enhavo ankaŭ estas forigotaj.</qt>"
 
-#: kmmainwidget.cpp:1242
+#: kmmainwidget.cpp:1231
 #, fuzzy
 msgid ""
 "<qt>Are you sure you want to delete the folder <b>%1</b>"
@@ -7699,7 +8630,7 @@ msgstr ""
 "<qt>Ĉu vi estas certa, ke vi volas forigi la leterujon <b>%1</b> "
 "kaj gian enhavon?</qt>"
 
-#: kmmainwidget.cpp:1249
+#: kmmainwidget.cpp:1238
 #, fuzzy
 msgid ""
 "<qt>Are you sure you want to delete the folder <b>%1</b> "
@@ -7710,14 +8641,7 @@ msgstr ""
 "<qt>Ĉu vi estas certa, ke vi volas forigi la leterujon <b>%1</b> "
 "kaj ĉiujn subleterujojn, perdonte ĉiujn enhavojn?</qt>"
 
-#: kmmainwidget.cpp:1268
-msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
-"reset to the main Inbox folder.</qt>"
-msgstr ""
-
-#: kmmainwidget.cpp:1349
+#: kmmainwidget.cpp:1313
 msgid ""
 "Are you sure you want to refresh the IMAP cache?\n"
 "This will remove all changes that you have done locally to your IMAP folders."
@@ -7725,11 +8649,11 @@ msgstr ""
 "Ĉu vi estas certa, ke vi volas refreŝigi la IMAPan kaŝmemoron?\n"
 "Tio forigos ĉiujn ŝanĝojn, kiujn vi faris lokale."
 
-#: kmmainwidget.cpp:1365
+#: kmmainwidget.cpp:1329
 msgid "Are you sure you want to expire all old messages?"
 msgstr "Ĉu vi vere volas forigi ĉiujn malnovajn mesaĝojn?"
 
-#: kmmainwidget.cpp:1389
+#: kmmainwidget.cpp:1353
 msgid ""
 "Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
 "the likelihood that your system will be compromised by other present and "
@@ -7738,15 +8662,15 @@ msgstr ""
 "Uzo de HTML en retpoŝto faras vin pli vundebla de varbmesaĝoj kaj povus altigi "
 "la verŝajnecon, ke via sistemo estos damaĝata de malica kodo."
 
-#: kmmainwidget.cpp:1392 kmmainwidget.cpp:1416 kmsender.cpp:503
+#: kmmainwidget.cpp:1356 kmmainwidget.cpp:1380 kmsender.cpp:504
 msgid "Security Warning"
 msgstr "Sekurecaverto"
 
-#: kmmainwidget.cpp:1393
+#: kmmainwidget.cpp:1357
 msgid "Use HTML"
 msgstr "Uzi HTMLon"
 
-#: kmmainwidget.cpp:1413
+#: kmmainwidget.cpp:1377
 #, fuzzy
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
@@ -7757,19 +8681,19 @@ msgstr ""
 "varbmesaĝoj kaj povus altigi la verŝajnecon, ke via sistemo estos damaĝata de "
 "aliaj nunaj aŭ estontaj malicaj koderoj."
 
-#: kmmainwidget.cpp:1417
+#: kmmainwidget.cpp:1381
 msgid "Load External References"
 msgstr "Ŝargi eksterajn referencojn"
 
-#: kmmainwidget.cpp:1658
+#: kmmainwidget.cpp:1634
 msgid "Filter on Mailing-List..."
 msgstr "Filtri per dissendolisto..."
 
-#: kmmainwidget.cpp:1663
+#: kmmainwidget.cpp:1639
 msgid "Filter on Mailing-List %1..."
 msgstr "Filtrilo pri dissendolisto %1..."
 
-#: kmmainwidget.cpp:1761
+#: kmmainwidget.cpp:1738
 msgid ""
 "KMail's Out of Office Reply functionality relies on server-side filtering. You "
 "have not yet configured an IMAP server for this.\n"
@@ -7779,497 +8703,505 @@ msgstr ""
 "agordis IMAPan servilon por tio.\n"
 "Vi povas fari tion en la \"Filtrilo\"-tabo de la IMAP-konta agordo."
 
-#: kmmainwidget.cpp:1766
+#: kmmainwidget.cpp:1743
 msgid "No Server-Side Filtering Configured"
 msgstr "Neniu servila filtro agordita"
 
-#: kmmainwidget.cpp:1793
-msgid "Could not start certificate manager; please check your installation."
+#: kmmainwidget.cpp:1770
+#, fuzzy
+msgid ""
+"Could not start certificate manager 'kleopatra'; please check your "
+"installation."
 msgstr "Ne eblis starti atestilo-manaĝeron. Bonvolu kontroli vian instaladon."
 
-#: kmmainwidget.cpp:1810
+#: kmmainwidget.cpp:1787
 msgid ""
 "Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
 msgstr ""
 "Ne eblis lanĉi GnuPGan protokolvidigilon (kwatchgnupg). Bonvolu kontroli vian "
 "instaladon."
 
-#: kmmainwidget.cpp:2485
+#: kmmainwidget.cpp:2508
 msgid "Forward With Custom Template"
 msgstr "Plusendi per propra ŝablono"
 
-#: kmmainwidget.cpp:2494
+#: kmmainwidget.cpp:2517
 msgid "Reply With Custom Template"
 msgstr "Respondi per propra ŝablono"
 
-#: kmmainwidget.cpp:2502
+#: kmmainwidget.cpp:2525
 msgid "Reply to All With Custom Template"
 msgstr "Respondi al ĉiuj per propra ŝablono"
 
-#: kmmainwidget.cpp:2597 kmmainwidget.cpp:2602 kmmainwidget.cpp:2607
+#: kmmainwidget.cpp:2620 kmmainwidget.cpp:2625 kmmainwidget.cpp:2630
 msgid "(no custom templates)"
 msgstr "(neniuj propraj ŝablonoj)"
 
-#: kmmainwidget.cpp:2622 kmmimeparttree.cpp:141
+#: kmmainwidget.cpp:2645 kmmimeparttree.cpp:139
 msgid "Save &As..."
 msgstr "&Konservi kiel..."
 
-#: kmmainwidget.cpp:2629
+#: kmmainwidget.cpp:2652
 msgid "&Compact All Folders"
 msgstr "Kunpremi ĉiujn &leterujojn"
 
-#: kmmainwidget.cpp:2633
+#: kmmainwidget.cpp:2656
 msgid "&Expire All Folders"
 msgstr "&Forigi malnovon el ĉiuj leterujoj"
 
-#: kmmainwidget.cpp:2637
+#: kmmainwidget.cpp:2660
 msgid "&Refresh Local IMAP Cache"
 msgstr "&Refreŝigi lokalan IMAP-Kaŝmemoron"
 
-#: kmmainwidget.cpp:2641
+#: kmmainwidget.cpp:2664
 msgid "Empty All &Trash Folders"
 msgstr "Malplenigi ĉiujn rubujojn"
 
-#: kmmainwidget.cpp:2649
+#: kmmainwidget.cpp:2672
 #, fuzzy
 msgid "Check Mail in Favorite Folders"
 msgstr "&Rigardi je nova poŝto en la leterujo"
 
-#: kmmainwidget.cpp:2656
+#: kmmainwidget.cpp:2679
 msgid "Check Mail &In"
 msgstr "&Rigardi je nova poŝto en"
 
-#: kmmainwidget.cpp:2666
+#: kmmainwidget.cpp:2689
 msgid "&Send Queued Messages"
 msgstr "Sendi &atendantajn mesaĝojn"
 
-#: kmmainwidget.cpp:2669
+#: kmmainwidget.cpp:2692
 msgid "Online Status (unknown)"
 msgstr "Konektostato (nekonata)"
 
-#: kmmainwidget.cpp:2673
+#: kmmainwidget.cpp:2696
 msgid "Send Queued Messages Via"
 msgstr "Sendi &atendantajn mesaĝojn per"
 
-#: kmmainwidget.cpp:2684
+#: kmmainwidget.cpp:2707
 msgid "&Address Book..."
 msgstr "&Adresaro..."
 
-#: kmmainwidget.cpp:2689
+#: kmmainwidget.cpp:2712
 msgid "Certificate Manager..."
 msgstr "Atestilo administrado..."
 
-#: kmmainwidget.cpp:2694
+#: kmmainwidget.cpp:2717
 msgid "GnuPG Log Viewer..."
 msgstr "GnuPGa protokolvidigilo..."
 
-#: kmmainwidget.cpp:2699
+#: kmmainwidget.cpp:2722
 msgid "&Import Messages..."
 msgstr "&Importi mesaĝojn..."
 
-#: kmmainwidget.cpp:2704
+#: kmmainwidget.cpp:2727
 msgid "&Debug Sieve..."
 msgstr "&Sencimigi kribrilon..."
 
-#: kmmainwidget.cpp:2710
+#: kmmainwidget.cpp:2733
 msgid "Edit \"Out of Office\" Replies..."
 msgstr "Redakti respondojn pri \"ne en oficejo\"..."
 
-#: kmmainwidget.cpp:2716
+#: kmmainwidget.cpp:2739
 msgid "Filter &Log Viewer..."
 msgstr "Filtri &protokolvidigilo..."
 
-#: kmmainwidget.cpp:2719
+#: kmmainwidget.cpp:2742
 msgid "&Anti-Spam Wizard..."
 msgstr "Kontraŭdisafiŝada helpilo..."
 
-#: kmmainwidget.cpp:2721
+#: kmmainwidget.cpp:2744
 msgid "&Anti-Virus Wizard..."
 msgstr "Kontraŭvirusa helpilo..."
 
-#: kmmainwidget.cpp:2725 kmreadermainwin.cpp:316
+#: kmmainwidget.cpp:2748 kmreadermainwin.cpp:367
 msgid "&Move to Trash"
 msgstr "&Ŝovi al rubujo"
 
-#: kmmainwidget.cpp:2726 kmreadermainwin.cpp:317
+#: kmmainwidget.cpp:2749 kmreadermainwin.cpp:368
 msgid "Move message to trashcan"
 msgstr "Ŝovi mesaĝon al rubujo"
 
-#: kmmainwidget.cpp:2738
+#: kmmainwidget.cpp:2761
 msgid "M&ove Thread to Trash"
 msgstr "Ŝ&ovi fadenon al rubujo"
 
-#: kmmainwidget.cpp:2739
+#: kmmainwidget.cpp:2762
 msgid "Move thread to trashcan"
 msgstr "Ŝovi fadenon al rubujo"
 
-#: kmmainwidget.cpp:2743
+#: kmmainwidget.cpp:2766
 msgid "Delete T&hread"
 msgstr "Forigi fa&denon"
 
-#: kmmainwidget.cpp:2747
+#: kmmainwidget.cpp:2770
 msgid "&Find Messages..."
 msgstr "&Trovi mesaĝojn..."
 
-#: kmmainwidget.cpp:2750
+#: kmmainwidget.cpp:2773
 msgid "&Find in Message..."
 msgstr "&Trovi en mesaĝo..."
 
-#: kmmainwidget.cpp:2753
+#: kmmainwidget.cpp:2776
 msgid "Select &All Messages"
 msgstr "&Elekti ĉiujn mesaĝojn"
 
-#: kmmainwidget.cpp:2760
+#: kmmainwidget.cpp:2783
 msgid "&Properties"
 msgstr "&Ecoj..."
 
-#: kmmainwidget.cpp:2763
+#: kmmainwidget.cpp:2786
 msgid "&Mailing List Management..."
 msgstr "Dissendolista ad&ministrado..."
 
-#: kmmainwidget.cpp:2772
+#: kmmainwidget.cpp:2795
 msgid "Mark All Messages as &Read"
 msgstr "Ma&rki ĉiujn mesaĝojn kiel legitaj"
 
-#: kmmainwidget.cpp:2775
+#: kmmainwidget.cpp:2798
 msgid "&Expiration Settings"
 msgstr "&Agordo pri malnovigo"
 
-#: kmmainwidget.cpp:2778
+#: kmmainwidget.cpp:2801
 msgid "&Compact Folder"
 msgstr "&Kunpremi leterujon"
 
-#: kmmainwidget.cpp:2781
+#: kmmainwidget.cpp:2804
 msgid "Check Mail &in This Folder"
 msgstr "&Rigardi je nova poŝto en la leterujo"
 
-#: kmmainwidget.cpp:2793
+#: kmmainwidget.cpp:2816
+#, fuzzy
+msgid "&Archive Folder..."
+msgstr "&Nova leterujo..."
+
+#: kmmainwidget.cpp:2820
 msgid "Prefer &HTML to Plain Text"
 msgstr "&Preferi HTMLon al plena teksto"
 
-#: kmmainwidget.cpp:2796
+#: kmmainwidget.cpp:2823
 msgid "Load E&xternal References"
 msgstr ""
 
-#: kmmainwidget.cpp:2799
+#: kmmainwidget.cpp:2826
 msgid "&Thread Messages"
 msgstr "&Fadenigi mesaĝojn"
 
-#: kmmainwidget.cpp:2802
+#: kmmainwidget.cpp:2829
 msgid "Thread Messages also by &Subject"
 msgstr "Fadenigi mesaĝojn per temo"
 
-#: kmmainwidget.cpp:2805
+#: kmmainwidget.cpp:2832
 msgid "Copy Folder"
 msgstr "Kopii leterujon"
 
-#: kmmainwidget.cpp:2807
+#: kmmainwidget.cpp:2834
 msgid "Cut Folder"
 msgstr "Tondi leterujon"
 
-#: kmmainwidget.cpp:2809
+#: kmmainwidget.cpp:2836
 msgid "Paste Folder"
 msgstr "Alglui leterujon"
 
-#: kmmainwidget.cpp:2812
+#: kmmainwidget.cpp:2839
 msgid "Copy Messages"
 msgstr "Kopii mesaĝojn"
 
-#: kmmainwidget.cpp:2814
+#: kmmainwidget.cpp:2841
 msgid "Cut Messages"
 msgstr "Tondi mesaĝojn"
 
-#: kmmainwidget.cpp:2816
+#: kmmainwidget.cpp:2843
 msgid "Paste Messages"
 msgstr "Alglui mesaĝojn"
 
-#: kmmainwidget.cpp:2820
+#: kmmainwidget.cpp:2847
 msgid "&New Message..."
 msgstr "&Nova mesaĝo..."
 
-#: kmmainwidget.cpp:2823 kmmainwidget.cpp:2915
+#: kmmainwidget.cpp:2850 kmmainwidget.cpp:2927
 msgid "New Message From &Template"
 msgstr "Nova mesaĝo ekde ŝa&blono"
 
-#: kmmainwidget.cpp:2831
+#: kmmainwidget.cpp:2858
 msgid "New Message t&o Mailing-List..."
 msgstr "N&ova mesaĝo al dissendolisto..."
 
-#: kmmainwidget.cpp:2836 kmreadermainwin.cpp:327 searchwindow.cpp:320
+#: kmmainwidget.cpp:2863 kmreadermainwin.cpp:378 searchwindow.cpp:321
 msgid ""
 "_: Message->\n"
 "&Forward"
 msgstr "&Plusendi"
 
-#: kmmainwidget.cpp:2840 kmreadermainwin.cpp:330 searchwindow.cpp:329
+#: kmmainwidget.cpp:2867 kmreadermainwin.cpp:381 searchwindow.cpp:330
 msgid "&Inline..."
 msgstr "E&ntekstigi..."
 
-#: kmmainwidget.cpp:2846 kmreadermainwin.cpp:336 searchwindow.cpp:325
+#: kmmainwidget.cpp:2873 kmreadermainwin.cpp:387 searchwindow.cpp:326
 msgid ""
 "_: Message->Forward->\n"
 "As &Attachment..."
 msgstr "Kiel alpendaĵo..."
 
-#: kmmainwidget.cpp:2852 kmreadermainwin.cpp:342 searchwindow.cpp:341
+#: kmmainwidget.cpp:2879 kmreadermainwin.cpp:393 searchwindow.cpp:342
 msgid ""
 "_: Message->Forward->\n"
 "As Di&gest..."
 msgstr "Kiel &resumo..."
 
-#: kmmainwidget.cpp:2858 kmreadermainwin.cpp:348 searchwindow.cpp:346
+#: kmmainwidget.cpp:2885 kmreadermainwin.cpp:399 searchwindow.cpp:347
 msgid ""
 "_: Message->Forward->\n"
 "&Redirect..."
 msgstr "&Alidirekti..."
 
-#: kmmainwidget.cpp:2885
+#: kmmainwidget.cpp:2897
 msgid "Send A&gain..."
 msgstr "&Resendi..."
 
-#: kmmainwidget.cpp:2890
+#: kmmainwidget.cpp:2902
 msgid "&Create Filter"
 msgstr "&Krei filtrilon"
 
-#: kmmainwidget.cpp:2893
+#: kmmainwidget.cpp:2905
 msgid "Filter on &Subject..."
 msgstr "Filtri per &temo..."
 
-#: kmmainwidget.cpp:2898
+#: kmmainwidget.cpp:2910
 msgid "Filter on &From..."
 msgstr "Filtri per &sendinto..."
 
-#: kmmainwidget.cpp:2903
+#: kmmainwidget.cpp:2915
 msgid "Filter on &To..."
 msgstr "Filtri per &ricevanto..."
 
-#: kmmainwidget.cpp:2908
+#: kmmainwidget.cpp:2920
 msgid "Filter on Mailing-&List..."
 msgstr "Filtri per &dissendolisto..."
 
-#: kmmainwidget.cpp:2921
+#: kmmainwidget.cpp:2933
 msgid "Mark &Thread"
 msgstr "Marki &fadenon"
 
-#: kmmainwidget.cpp:2924
+#: kmmainwidget.cpp:2936
 msgid "Mark Thread as &Read"
 msgstr "Marki la fadenon kiel legita"
 
-#: kmmainwidget.cpp:2925
+#: kmmainwidget.cpp:2937
 msgid "Mark all messages in the selected thread as read"
 msgstr "&Marki ĉiujn mesaĝojn en la fadenon kiel legitaj"
 
-#: kmmainwidget.cpp:2930
+#: kmmainwidget.cpp:2942
 msgid "Mark Thread as &New"
 msgstr "Marki la fadenon kiel &nova"
 
-#: kmmainwidget.cpp:2931
+#: kmmainwidget.cpp:2943
 msgid "Mark all messages in the selected thread as new"
 msgstr "&Marki ĉiujn mesaĝojn en la fadenon kiel nova"
 
-#: kmmainwidget.cpp:2936
+#: kmmainwidget.cpp:2948
 msgid "Mark Thread as &Unread"
 msgstr "Marki la fadenon kiel nelegita"
 
-#: kmmainwidget.cpp:2937
+#: kmmainwidget.cpp:2949
 msgid "Mark all messages in the selected thread as unread"
 msgstr "Marki ĉiujn mesaĝojn en la fadenon kiel nelegitaj"
 
-#: kmmainwidget.cpp:2945
+#: kmmainwidget.cpp:2957
 msgid "Mark Thread as &Important"
 msgstr "Marki la fadenon kiel grava"
 
-#: kmmainwidget.cpp:2948
+#: kmmainwidget.cpp:2960
 msgid "Remove &Important Thread Mark"
 msgstr "Mark la fadenon kiel negrava"
 
-#: kmmainwidget.cpp:2951
+#: kmmainwidget.cpp:2963
 #, fuzzy
 msgid "Mark Thread as &Action Item"
 msgstr "Marki la fadenon kiel &nova"
 
-#: kmmainwidget.cpp:2954
+#: kmmainwidget.cpp:2966
 #, fuzzy
 msgid "Remove &Action Item Thread Mark"
 msgstr "Mark la fadenon kiel negrava"
 
-#: kmmainwidget.cpp:2958
+#: kmmainwidget.cpp:2970
 msgid "&Watch Thread"
 msgstr "Observi &fadenon"
 
-#: kmmainwidget.cpp:2962
+#: kmmainwidget.cpp:2974
 msgid "&Ignore Thread"
 msgstr "Ignori &fadenon"
 
-#: kmmainwidget.cpp:2970
+#: kmmainwidget.cpp:2982
 msgid "Save A&ttachments..."
 msgstr "&Konservi kunsendaĵon..."
 
-#: kmmainwidget.cpp:2980
+#: kmmainwidget.cpp:2992
 msgid "Appl&y All Filters"
 msgstr "Apliki ĉ&iujn filtrilojn"
 
-#. i18n: file kmail_part.rc line 141
-#: kmmainwidget.cpp:2985 rc.cpp:30 rc.cpp:96
+#. i18n: file kmail_part.rc line 142
+#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
 #, no-c-format
 msgid "A&pply Filter"
 msgstr "A&pliki filtrilon"
 
-#: kmmainwidget.cpp:2992
+#: kmmainwidget.cpp:3004
 msgid ""
 "_: View->\n"
 "&Unread Count"
 msgstr "&Nombro de nelegitaj"
 
-#: kmmainwidget.cpp:2994
+#: kmmainwidget.cpp:3006
 msgid "Choose how to display the count of unread messages"
 msgstr "Elekti la vidigmanieron de la nombro de la nelegitaj mesaĝoj"
 
-#: kmmainwidget.cpp:2996
+#: kmmainwidget.cpp:3008
 msgid ""
 "_: View->Unread Count\n"
 "View in &Separate Column"
 msgstr "&Vidigi en aparta kolumno"
 
-#: kmmainwidget.cpp:3002
+#: kmmainwidget.cpp:3014
 msgid ""
 "_: View->Unread Count\n"
 "View After &Folder Name"
 msgstr "Vidigi post &leteruja nomo"
 
-#: kmmainwidget.cpp:3009
+#: kmmainwidget.cpp:3021
 msgid ""
 "_: View->\n"
 "&Total Column"
 msgstr "&Sumkolumno"
 
-#: kmmainwidget.cpp:3012
+#: kmmainwidget.cpp:3024
 msgid ""
 "Toggle display of column showing the total number of messages in folders."
 msgstr ""
 "Ŝaltas la montradon de kolumno por nombro de ĉiuj mesaĝoj en la leterujoj."
 
-#: kmmainwidget.cpp:3014
+#: kmmainwidget.cpp:3026
 #, fuzzy
 msgid ""
 "_: View->\n"
 "&Size Column"
 msgstr "&Sumkolumno"
 
-#: kmmainwidget.cpp:3017
+#: kmmainwidget.cpp:3029
 #, fuzzy
 msgid "Toggle display of column showing the total size of messages in folders."
 msgstr ""
 "Ŝaltas la montradon de kolumno por nombro de ĉiuj mesaĝoj en la leterujoj."
 
-#: kmmainwidget.cpp:3020
+#: kmmainwidget.cpp:3032
 msgid ""
 "_: View->\n"
 "&Expand Thread"
 msgstr "&Malfaldi fadenon"
 
-#: kmmainwidget.cpp:3021
+#: kmmainwidget.cpp:3033
 msgid "Expand the current thread"
 msgstr "Malfaldi nunan fadenon"
 
-#: kmmainwidget.cpp:3026
+#: kmmainwidget.cpp:3038
 msgid ""
 "_: View->\n"
 "&Collapse Thread"
 msgstr "&Faldi fadenon"
 
-#: kmmainwidget.cpp:3027
+#: kmmainwidget.cpp:3039
 msgid "Collapse the current thread"
 msgstr "Faldi nunan fadenon"
 
-#: kmmainwidget.cpp:3032
+#: kmmainwidget.cpp:3044
 msgid ""
 "_: View->\n"
 "Ex&pand All Threads"
 msgstr "Malfal&di ĉiujn fadenojn"
 
-#: kmmainwidget.cpp:3033
+#: kmmainwidget.cpp:3045
 msgid "Expand all threads in the current folder"
 msgstr "Malfaldi ĉiujn fadenojn en la nuna leterujo"
 
-#: kmmainwidget.cpp:3038
+#: kmmainwidget.cpp:3050
 msgid ""
 "_: View->\n"
 "C&ollapse All Threads"
 msgstr "Fald&i ĉiujn fadenojn"
 
-#: kmmainwidget.cpp:3039
+#: kmmainwidget.cpp:3051
 msgid "Collapse all threads in the current folder"
 msgstr "Faldi ĉiujn fadenojn en la nuna leterujo"
 
-#: kmmainwidget.cpp:3044 kmreadermainwin.cpp:322
+#: kmmainwidget.cpp:3056 kmreadermainwin.cpp:373
 msgid "&View Source"
 msgstr "&Rigardi fontokodon"
 
-#: kmmainwidget.cpp:3048
+#: kmmainwidget.cpp:3060
 msgid "&Display Message"
 msgstr "&Montri mesaĝon"
 
-#: kmmainwidget.cpp:3054
+#: kmmainwidget.cpp:3066
 msgid "&Next Message"
 msgstr "&Sekva mesaĝo"
 
-#: kmmainwidget.cpp:3055
+#: kmmainwidget.cpp:3067
 msgid "Go to the next message"
 msgstr "Iri al la sekva mesaĝo"
 
-#: kmmainwidget.cpp:3059
+#: kmmainwidget.cpp:3071
 msgid "Next &Unread Message"
 msgstr "Se&kva nelegita mesaĝo"
 
-#: kmmainwidget.cpp:3061
+#: kmmainwidget.cpp:3073
 msgid "Go to the next unread message"
 msgstr "Iri al la sekva nelegita mesaĝo"
 
 #. i18n("Go to the next important message") ),
-#: kmmainwidget.cpp:3072
+#: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "An&taŭa mesaĝo"
 
-#: kmmainwidget.cpp:3073
+#: kmmainwidget.cpp:3085
 msgid "Go to the previous message"
 msgstr "Iri al la antaŭa mesaĝo"
 
-#: kmmainwidget.cpp:3077
+#: kmmainwidget.cpp:3089
 msgid "Previous Unread &Message"
 msgstr "An&taŭa nelegita mesaĝo"
 
-#: kmmainwidget.cpp:3079
+#: kmmainwidget.cpp:3091
 msgid "Go to the previous unread message"
 msgstr "Iri al la antaŭa nelegita mesaĝo"
 
-#: kmmainwidget.cpp:3091
+#: kmmainwidget.cpp:3103
 msgid "Next Unread &Folder"
 msgstr "Sekva nelegita &leterujo"
 
-#: kmmainwidget.cpp:3092
+#: kmmainwidget.cpp:3104
 msgid "Go to the next folder with unread messages"
 msgstr "Sekva leterujo kun nelegitaj mesaĝoj"
 
-#: kmmainwidget.cpp:3100
+#: kmmainwidget.cpp:3112
 msgid "Previous Unread F&older"
 msgstr "Antaŭa nelegita leteruj&o"
 
-#: kmmainwidget.cpp:3101
+#: kmmainwidget.cpp:3113
 msgid "Go to the previous folder with unread messages"
 msgstr "Antaŭa leterujo kun nelegitaj mesaĝoj"
 
-#: kmmainwidget.cpp:3108
+#: kmmainwidget.cpp:3120
 msgid ""
 "_: Go->\n"
 "Next Unread &Text"
 msgstr "Sekva nelegita &teksto"
 
-#: kmmainwidget.cpp:3109
+#: kmmainwidget.cpp:3121
 msgid "Go to the next unread text"
 msgstr "Iri al la sekva nelegita teksto"
 
-#: kmmainwidget.cpp:3110
+#: kmmainwidget.cpp:3122
 msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
 "message."
@@ -8277,51 +9209,55 @@ msgstr ""
 "Ŝovu la mesaĝon malsupren. Se je fino de la mesaĝo, iru al la sekva nelegita "
 "mesaĝo."
 
-#: kmmainwidget.cpp:3117
+#: kmmainwidget.cpp:3129
+msgid "Show Quick Search"
+msgstr "Montri rapidserĉon"
+
+#: kmmainwidget.cpp:3136
 msgid "Configure &Filters..."
 msgstr "Agordi &filtrilojn..."
 
-#: kmmainwidget.cpp:3119
+#: kmmainwidget.cpp:3138
 msgid "Configure &POP Filters..."
 msgstr "Agordi &POP-filtrilojn..."
 
-#: kmmainwidget.cpp:3121
+#: kmmainwidget.cpp:3140
 msgid "Manage &Sieve Scripts..."
 msgstr "Administri kribril&skriptojn..."
 
-#: kmmainwidget.cpp:3124
+#: kmmainwidget.cpp:3143
 msgid "KMail &Introduction"
 msgstr "KMail &Enkonduko"
 
-#: kmmainwidget.cpp:3125
+#: kmmainwidget.cpp:3144
 msgid "Display KMail's Welcome Page"
 msgstr "Montri enkondukan paĝon de KMail"
 
-#: kmmainwidget.cpp:3131
+#: kmmainwidget.cpp:3150
 msgid "Configure &Notifications..."
 msgstr "Agordi &notojn..."
 
-#: kmmainwidget.cpp:3136
+#: kmmainwidget.cpp:3155
 msgid "&Configure KMail..."
 msgstr "A&gordi Poŝtilon..."
 
-#: kmmainwidget.cpp:3431
+#: kmmainwidget.cpp:3454
 msgid "E&mpty Trash"
 msgstr "&Malplenigi rubujon"
 
-#: kmmainwidget.cpp:3431
+#: kmmainwidget.cpp:3455
 msgid "&Move All Messages to Trash"
 msgstr "Ŝovi ĉiujn mesaĝojn al la rubujo"
 
-#: kmmainwidget.cpp:3434
+#: kmmainwidget.cpp:3464
 msgid "&Delete Search"
 msgstr "&Forigi serĉon"
 
-#: kmmainwidget.cpp:3434
+#: kmmainwidget.cpp:3465
 msgid "&Delete Folder"
 msgstr "&Forigi leterujon"
 
-#: kmmainwidget.cpp:3615
+#: kmmainwidget.cpp:3649
 #, c-format
 msgid ""
 "_n: Removed %n duplicate message.\n"
@@ -8330,24 +9266,24 @@ msgstr ""
 "Forigite %n kopimesaĝo.\n"
 "Forigite %n kopimesaĝoj."
 
-#: kmmainwidget.cpp:3617
+#: kmmainwidget.cpp:3651
 msgid "No duplicate messages found."
 msgstr "Neniu kopimesaĝo trovita."
 
-#: kmmainwidget.cpp:3687
+#: kmmainwidget.cpp:3721
 #, c-format
 msgid "Filter %1"
 msgstr "Filtrilo %1"
 
-#: kmmainwidget.cpp:3821
+#: kmmainwidget.cpp:3855
 msgid "Subscription"
 msgstr "Abono"
 
-#: kmmainwidget.cpp:3838
+#: kmmainwidget.cpp:3872
 msgid "Local Subscription"
 msgstr "Loka abono"
 
-#: kmmainwidget.cpp:3971
+#: kmmainwidget.cpp:4007
 #, fuzzy
 msgid "Out of office reply active"
 msgstr "Redakti respondojn pri \"ne en oficejo\"..."
@@ -8360,7 +9296,7 @@ msgstr "&Nova fenestro"
 msgid " Initializing..."
 msgstr " Preparante..."
 
-#: kmmessage.cpp:1316
+#: kmmessage.cpp:1336
 #, fuzzy
 msgid ""
 "This message contains a request to return a notification about your reception "
@@ -8372,7 +9308,7 @@ msgstr ""
 "Vi aŭ ignoras la postulon aŭ lasas sendi rifuzan aŭ normalan respondon de "
 "KMail."
 
-#: kmmessage.cpp:1321
+#: kmmessage.cpp:1341
 #, fuzzy
 msgid ""
 "This message contains a request to send a notification about your reception of "
@@ -8387,7 +9323,7 @@ msgstr ""
 "Vi aŭ ignoras la postulon aŭ lasas sendi rifuzan aŭ normalan respondon de "
 "KMail."
 
-#: kmmessage.cpp:1328
+#: kmmessage.cpp:1348
 #, fuzzy
 msgid ""
 "This message contains a request to send a notification about your reception of "
@@ -8401,7 +9337,7 @@ msgstr ""
 "Vi aŭ ignoras la postulon aŭ lasas sendi rifuzan aŭ normalan respondon de "
 "KMail."
 
-#: kmmessage.cpp:1335
+#: kmmessage.cpp:1355
 #, fuzzy
 msgid ""
 "This message contains a request to send a notification about your reception of "
@@ -8415,7 +9351,7 @@ msgstr ""
 "Vi aŭ ignoras la postulon aŭ lasas sendi rifuzan aŭ normalan respondon de "
 "KMail."
 
-#: kmmessage.cpp:1341
+#: kmmessage.cpp:1361
 #, fuzzy
 msgid ""
 "This message contains a request to send a notification about your reception of "
@@ -8430,19 +9366,19 @@ msgstr ""
 "Vi aŭ ignoras la postulon aŭ lasas sendi rifuzan aŭ normalan respondon de "
 "KMail."
 
-#: kmmessage.cpp:1359 kmmessage.cpp:1366
+#: kmmessage.cpp:1379 kmmessage.cpp:1386
 msgid "Message Disposition Notification Request"
 msgstr "Mesaĝa agnota postulo"
 
-#: kmmessage.cpp:1361
+#: kmmessage.cpp:1381
 msgid "Send \"&denied\""
 msgstr "Sendi \"rifu&zita\""
 
-#: kmmessage.cpp:1361 kmmessage.cpp:1368
+#: kmmessage.cpp:1381 kmmessage.cpp:1388
 msgid "&Send"
 msgstr "&Sendi"
 
-#: kmmessage.cpp:1436
+#: kmmessage.cpp:1458
 msgid ""
 "Header \"Disposition-Notification-Options\" contained required, but unknown "
 "parameter"
@@ -8450,36 +9386,45 @@ msgstr ""
 "Kaplinio \"Disposition-Notification-Options\" enhavas postulata, sed nekonata "
 "parametro."
 
-#: kmmessage.cpp:1628
+#: kmmessage.cpp:1650
 msgid "Receipt: "
 msgstr "Ricevonto: "
 
-#: kmmessage.cpp:3128 urlhandlermanager.cpp:551
+#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "Kunsendaĵo: %1"
 
-#: kmmimeparttree.cpp:139 kmreaderwin.cpp:1969
+#: kmmessage.cpp:3199
+#, fuzzy
+msgid "This attachment has been deleted."
+msgstr "Montras la aldonaĵon kiel proponite de la sendinto."
+
+#: kmmessage.cpp:3201
+msgid "The attachment '%1' has been deleted."
+msgstr ""
+
+#: kmmimeparttree.cpp:137 kmreaderwin.cpp:2034
 msgid ""
 "_: to view something\n"
 "View"
 msgstr "Rigardi"
 
-#: kmmimeparttree.cpp:147
+#: kmmimeparttree.cpp:145
 msgid "Save All Attachments..."
 msgstr "&Konservi kunsendaĵon..."
 
-#: kmmimeparttree.cpp:154 kmreaderwin.cpp:1975 kmreaderwin.cpp:2626
+#: kmmimeparttree.cpp:152 kmreaderwin.cpp:2041 kmreaderwin.cpp:2805
 #, fuzzy
 msgid "Delete Attachment"
 msgstr "&Forigi kunsendaĵon"
 
-#: kmmimeparttree.cpp:157 kmreaderwin.cpp:1973 kmreaderwin.cpp:2638
+#: kmmimeparttree.cpp:155 kmreaderwin.cpp:2039 kmreaderwin.cpp:2861
 #, fuzzy
 msgid "Edit Attachment"
 msgstr "Kunsendaĵo"
 
-#: kmmimeparttree.cpp:370
+#: kmmimeparttree.cpp:368
 msgid "Unspecified Binary Data"
 msgstr "neekzaktigita duuma datumoj"
 
@@ -8583,8 +9528,8 @@ msgstr ""
 "<p>Normale vi ne bezonos ŝanĝi tion, ĉar %1 uzas taŭgan kodon depende de la "
 "MIME-tipo de la dosiero. Sed foje vi povas redukti la grandecon de la mesaĝo, "
 "ekz. se postskripta dosiero konsistas precipe el askiaj signoj. Vi povus elekti "
-"\"quoted-printable\" anstataŭ la apriora \"base64\", tdeio ŝparas eble 25% da da "
-"mesaĝgrandeco.</p></qt>"
+"\"quoted-printable\" anstataŭ la apriora \"base64\", tdeio ŝparas eble 25% da "
+"da mesaĝgrandeco.</p></qt>"
 
 #: kmmsgpartdlg.cpp:156
 msgid "Suggest &automatic display"
@@ -8689,226 +9634,239 @@ msgstr "sen temo"
 msgid "unknown"
 msgstr "nekonata"
 
-#: kmreadermainwin.cpp:477 searchwindow.cpp:352
+#: kmreadermainwin.cpp:515 searchwindow.cpp:353
 msgid "Save Attachments..."
 msgstr "&Konservi kunsendaĵon..."
 
-#: kmreaderwin.cpp:562
+#: kmreaderwin.cpp:489
 msgid ""
 "_: View->\n"
 "&Headers"
 msgstr "&Kaplinioj"
 
-#: kmreaderwin.cpp:563
+#: kmreaderwin.cpp:490
 msgid "Choose display style of message headers"
 msgstr "Elekti aplikon de mesaĝkapoj"
 
-#: kmreaderwin.cpp:568
+#: kmreaderwin.cpp:495
 #, fuzzy
 msgid ""
 "_: View->headers->\n"
 "&Enterprise Headers"
 msgstr "&Koncize"
 
-#: kmreaderwin.cpp:571
+#: kmreaderwin.cpp:498
 #, fuzzy
 msgid "Show the list of headers in Enterprise style"
 msgstr "Montras la liston de kaplinioj en fantazia formo"
 
-#: kmreaderwin.cpp:575
+#: kmreaderwin.cpp:502
 msgid ""
 "_: View->headers->\n"
 "&Fancy Headers"
 msgstr "&Fantazie"
 
-#: kmreaderwin.cpp:578
+#: kmreaderwin.cpp:505
 msgid "Show the list of headers in a fancy format"
 msgstr "Montras la liston de kaplinioj en fantazia formo"
 
-#: kmreaderwin.cpp:582
+#: kmreaderwin.cpp:509
 msgid ""
 "_: View->headers->\n"
 "&Brief Headers"
 msgstr "&Koncize"
 
-#: kmreaderwin.cpp:585
+#: kmreaderwin.cpp:512
 msgid "Show brief list of message headers"
 msgstr "Montras la liston de kaplinioj en konciza formo"
 
-#: kmreaderwin.cpp:589
+#: kmreaderwin.cpp:516
 msgid ""
 "_: View->headers->\n"
 "&Standard Headers"
 msgstr "&Normale"
 
-#: kmreaderwin.cpp:592
+#: kmreaderwin.cpp:519
 msgid "Show standard list of message headers"
 msgstr "Montras la liston de kaplinioj en normala formo"
 
-#: kmreaderwin.cpp:596
+#: kmreaderwin.cpp:523
 msgid ""
 "_: View->headers->\n"
 "&Long Headers"
 msgstr "&Amplekse"
 
-#: kmreaderwin.cpp:599
+#: kmreaderwin.cpp:526
 msgid "Show long list of message headers"
 msgstr "Montras la liston de kaplinioj en ampleksa formo"
 
-#: kmreaderwin.cpp:603
+#: kmreaderwin.cpp:530
 msgid ""
 "_: View->headers->\n"
 "&All Headers"
 msgstr "Ĉiu&j"
 
-#: kmreaderwin.cpp:606
+#: kmreaderwin.cpp:533
 msgid "Show all message headers"
 msgstr "Montras ĉiujn kapliniojn"
 
-#: kmreaderwin.cpp:612
+#: kmreaderwin.cpp:539
 msgid ""
 "_: View->\n"
 "&Attachments"
 msgstr "&Aldonaĵoj"
 
-#: kmreaderwin.cpp:613
+#: kmreaderwin.cpp:540
 msgid "Choose display style of attachments"
 msgstr "Agordi aplikon de aldonaĵoj"
 
-#: kmreaderwin.cpp:617
+#: kmreaderwin.cpp:544
 msgid ""
 "_: View->attachments->\n"
 "&As Icons"
 msgstr "kiel &piktogramoj"
 
-#: kmreaderwin.cpp:620
+#: kmreaderwin.cpp:547
 msgid "Show all attachments as icons. Click to see them."
 msgstr "Montras ĉiujn aldonaĵojn kiel piktogramoj. Klaku sur ilin por rigardi."
 
-#: kmreaderwin.cpp:624
+#: kmreaderwin.cpp:551
 msgid ""
 "_: View->attachments->\n"
 "&Smart"
 msgstr "&Inteligente"
 
-#: kmreaderwin.cpp:627
+#: kmreaderwin.cpp:554
 msgid "Show attachments as suggested by sender."
 msgstr "Montras la aldonaĵon kiel proponite de la sendinto."
 
-#: kmreaderwin.cpp:631
+#: kmreaderwin.cpp:558
 msgid ""
 "_: View->attachments->\n"
 "&Inline"
 msgstr "&Entekste"
 
-#: kmreaderwin.cpp:634
+#: kmreaderwin.cpp:561
 msgid "Show all attachments inline (if possible)"
 msgstr "Montras ĉiujn aldonaĵojn entekste (se eblas)"
 
-#: kmreaderwin.cpp:638
+#: kmreaderwin.cpp:565
 msgid ""
 "_: View->attachments->\n"
 "&Hide"
 msgstr "&Kaŝi"
 
-#: kmreaderwin.cpp:641
+#: kmreaderwin.cpp:568
 msgid "Do not show attachments in the message viewer"
 msgstr "Ne vidigi kunsendaĵojn en la mesaĝa vidigilo"
 
-#: kmreaderwin.cpp:646
+#: kmreaderwin.cpp:572
+#, fuzzy
+msgid ""
+"_: View->attachments->\n"
+"In Header &Only"
+msgstr "&Kaŝi"
+
+#: kmreaderwin.cpp:575
+#, fuzzy
+msgid "Show Attachments only in the header of the mail"
+msgstr "Montras ĉiujn aldonaĵojn kiel piktogramoj. Klaku sur ilin por rigardi."
+
+#: kmreaderwin.cpp:580
 msgid "&Set Encoding"
 msgstr "Uzi &signokodon"
 
-#: kmreaderwin.cpp:654
+#: kmreaderwin.cpp:588
 msgid "New Message To..."
 msgstr "&Nova mesaĝo al..."
 
-#: kmreaderwin.cpp:657
+#: kmreaderwin.cpp:591
 msgid "Reply To..."
 msgstr "Respondi al..."
 
-#: kmreaderwin.cpp:660
+#: kmreaderwin.cpp:594
 msgid "Forward To..."
 msgstr "Plusendi al..."
 
-#: kmreaderwin.cpp:663
+#: kmreaderwin.cpp:597
 msgid "Add to Address Book"
 msgstr "Aldoni al adresaro"
 
-#: kmreaderwin.cpp:666
+#: kmreaderwin.cpp:600
 msgid "Open in Address Book"
 msgstr "Malfermi en adresaro"
 
-#: kmreaderwin.cpp:670
+#: kmreaderwin.cpp:604
 msgid "Select All Text"
 msgstr "Elekti kompletan tekston"
 
-#: kmreaderwin.cpp:672
+#: kmreaderwin.cpp:606 kmreaderwin.cpp:1994
 msgid "Copy Link Address"
 msgstr "Kopii ligan adreson"
 
-#: kmreaderwin.cpp:674
+#: kmreaderwin.cpp:608
 msgid "Open URL"
 msgstr "Malfermi URLon"
 
-#: kmreaderwin.cpp:676
+#: kmreaderwin.cpp:610
 msgid "Bookmark This Link"
 msgstr "Konservi la ligon kiel legosigno"
 
-#: kmreaderwin.cpp:680
+#: kmreaderwin.cpp:614
 msgid "Save Link As..."
 msgstr "Konservi la ligon kiel..."
 
-#: kmreaderwin.cpp:687
+#: kmreaderwin.cpp:621
 msgid "Chat &With..."
 msgstr "Klaĉi per..."
 
-#: kmreaderwin.cpp:1294
+#: kmreaderwin.cpp:1258
 msgid "Full namespace support for IMAP"
 msgstr ""
 
-#: kmreaderwin.cpp:1295
+#: kmreaderwin.cpp:1259
 msgid "Offline mode"
 msgstr ""
 
-#: kmreaderwin.cpp:1296
+#: kmreaderwin.cpp:1260
 msgid "Sieve script management and editing"
 msgstr ""
 
-#: kmreaderwin.cpp:1297
+#: kmreaderwin.cpp:1261
 msgid "Account specific filtering"
 msgstr ""
 
-#: kmreaderwin.cpp:1298
+#: kmreaderwin.cpp:1262
 msgid "Filtering of incoming mail for online IMAP accounts"
 msgstr ""
 
-#: kmreaderwin.cpp:1299
+#: kmreaderwin.cpp:1263
 msgid "Online IMAP folders can be used when filtering into folders"
 msgstr ""
 
-#: kmreaderwin.cpp:1300
+#: kmreaderwin.cpp:1264
 msgid "Automatically delete older mails on POP servers"
 msgstr "Aŭtomate forigi pli malnovan poŝton ĉe POP-serviloj"
 
-#: kmreaderwin.cpp:1338
-msgid "The email client for the K Desktop Environment."
+#: kmreaderwin.cpp:1302
+#, fuzzy
+msgid "The email client for the Trinity Desktop Environment."
 msgstr "La poŝtilo por la K-labortabla medio (TDE)."
 
-#: kmreaderwin.cpp:1346
+#: kmreaderwin.cpp:1310
 msgid ""
 "<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
 "<p>Please wait . . .</p>&nbsp;"
 msgstr ""
 
-#: kmreaderwin.cpp:1354
+#: kmreaderwin.cpp:1318
 msgid ""
 "<h2 style='margin-top: 0px;'>Offline</h2>"
 "<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
 "to go online . . .</p>&nbsp;"
 msgstr ""
 
-#: kmreaderwin.cpp:1371
+#: kmreaderwin.cpp:1335
 msgid ""
 "_: %1: KMail version; %2: help:// URL; %3: homepage URL; %4: prior KMail "
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
@@ -8951,13 +9909,13 @@ msgstr ""
 "<p>Dankon,</p>\n"
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; La KMail-Teamo</p>"
 
-#: kmreaderwin.cpp:1394 kmreaderwin.cpp:1416
+#: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
 msgid ""
 "<li>%1</li>\n"
 msgstr ""
 "<li>%1</li>\n"
 
-#: kmreaderwin.cpp:1399
+#: kmreaderwin.cpp:1363
 msgid ""
 "<p>Please take a moment to fill in the KMail configuration panel at "
 "Settings-&gt;Configure KMail.\n"
@@ -8969,30 +9927,39 @@ msgstr ""
 "Vi devas krei almenaŭ aprioran identecon kaj enirtan kaj eliran retpoŝtan "
 "konton.</p>\n"
 
-#: kmreaderwin.cpp:1411
+#: kmreaderwin.cpp:1375
 msgid ""
 "<p><span style='font-size:125%; font-weight:bold;'>Important changes</span> "
 "(compared to KMail %1):</p>\n"
 msgstr ""
 
-#: kmreaderwin.cpp:1555
+#: kmreaderwin.cpp:1518
 msgid "( body part )"
 msgstr "( korpa parto )"
 
-#: kmreaderwin.cpp:1854
+#: kmreaderwin.cpp:1890
 msgid "Could not send MDN."
 msgstr "Ne eblas sendi ricevkonfirmon."
 
-#: kmreaderwin.cpp:1978
+#: kmreaderwin.cpp:1992
+#, fuzzy
+msgid "Copy Email Address"
+msgstr "Retpoŝta adreso"
+
+#: 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
 #, c-format
 msgid "View Attachment: %1"
 msgstr "Montri kunsendaĵoj: %1"
 
-#: kmreaderwin.cpp:2181
+#: kmreaderwin.cpp:2257
 #, c-format
 msgid ""
 "_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
@@ -9002,15 +9969,15 @@ msgstr ""
 "[KMail: Kunsendaĵo enhavas duumajn datumojn. Provas montri la unuajn %n "
 "signojn.]"
 
-#: kmreaderwin.cpp:2277
+#: kmreaderwin.cpp:2353
 msgid "&Open with '%1'"
 msgstr "&Malfermi per '%1'"
 
-#: kmreaderwin.cpp:2279
+#: kmreaderwin.cpp:2355
 msgid "&Open With..."
 msgstr "M&alfermi per..."
 
-#: kmreaderwin.cpp:2281
+#: kmreaderwin.cpp:2357
 msgid ""
 "Open attachment '%1'?\n"
 "Note that opening an attachment may compromise your system's security."
@@ -9018,36 +9985,36 @@ msgstr ""
 "Malfermi kunsendaĵon '%1'?\n"
 "Atentu ke malfermado de kunsendaĵo povas esti riska por via sistemo!"
 
-#: kmreaderwin.cpp:2286
+#: kmreaderwin.cpp:2362
 msgid "Open Attachment?"
 msgstr "Ĉu malfermi kunsendaĵon?"
 
-#: 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 "Kunsendaĵo"
 
-#: kmsearchpattern.cpp:898
+#: kmsearchpattern.cpp:913
 msgid ""
 "_: name used for a virgin filter\n"
 "unknown"
 msgstr "nedifinita"
 
-#: kmsearchpattern.cpp:904
+#: kmsearchpattern.cpp:919
 msgid "(match any of the following)"
 msgstr "(Konvenas al &iu el la sekvaj)"
 
-#: kmsearchpattern.cpp:906
+#: kmsearchpattern.cpp:921
 msgid "(match all of the following)"
 msgstr "(Konvenas &al ĉiuj el la sekvaj)"
 
@@ -9086,27 +10053,46 @@ msgstr "<aĝo en tagoj>"
 msgid "Message Status"
 msgstr "Mesaĝolisto"
 
-#: kmsearchpatternedit.cpp:391
+#: kmsearchpatternedit.cpp:42
+#, fuzzy
+msgid "From"
+msgstr "&De"
+
+#: kmsearchpatternedit.cpp:43 recipientseditor.cpp:100
+msgid "To"
+msgstr "Al"
+
+#: kmsearchpatternedit.cpp:44 recipientseditor.cpp:102
+msgid "CC"
+msgstr ""
+
+#: kmsearchpatternedit.cpp:45
+#, fuzzy
+msgid "Reply To"
+msgstr "&Respondo al"
+
+#: kmsearchpatternedit.cpp:46
+#, fuzzy
+msgid "Organization"
+msgstr "Organizaĵo:"
+
+#: kmsearchpatternedit.cpp:397
 msgid "Search Criteria"
 msgstr "Serĉokriterio"
 
-#: kmsearchpatternedit.cpp:408
+#: kmsearchpatternedit.cpp:414
 msgid "Match a&ll of the following"
 msgstr "Konvenas &al ĉiuj el la sekvaj"
 
-#: kmsearchpatternedit.cpp:409
+#: kmsearchpatternedit.cpp:415
 msgid "Match an&y of the following"
 msgstr "Konvenas al &iu el la sekvaj"
 
-#: kmsender.cpp:114
-msgid "Please create an account for sending and try again."
-msgstr "Kreu konton pro sendo kaj reprovu."
-
 #: kmsender.cpp:171
 msgid "Cannot add message to outbox folder"
 msgstr "Ne eblas aldoni mesaĝon al leterujo \"sendota\""
 
-#: kmsender.cpp:373
+#: kmsender.cpp:374
 msgid ""
 "Critical error: Unable to process sent mail (out of space?)Moving failing "
 "message to \"sent-mail\" folder."
@@ -9114,7 +10100,7 @@ msgstr ""
 "Grava eraro: Ne eblis trakti mesaĝojn (nesufiĉe da spaco?) Movas la "
 "malsukcesintan mesaĝon al la leterujo \"senditaj\"."
 
-#: kmsender.cpp:385
+#: kmsender.cpp:386
 msgid ""
 "Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
 "failed.\n"
@@ -9125,7 +10111,7 @@ msgstr ""
 "Ebla kaŭzo estas diskospaca manko aŭ srkibpermeso. Provu solvi la problemon kaj "
 "mane ŝovu la mesaĝon."
 
-#: kmsender.cpp:431
+#: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
 "Please set the email address of identity '%1' in the Identities section of the "
@@ -9135,7 +10121,7 @@ msgstr ""
 "Agordu la la retpoŝtan adreson de la identeco '%1' en la identeca parto de "
 "agordodialogo kaj reprovu."
 
-#: kmsender.cpp:453
+#: kmsender.cpp:454
 #, c-format
 msgid ""
 "_n: %n queued message successfully sent.\n"
@@ -9144,43 +10130,43 @@ msgstr ""
 "%n vicigita mesaĝo sukcese sendita.\n"
 "%n vicigitaj mesaĝoj sukcese senditaj."
 
-#: kmsender.cpp:456
+#: kmsender.cpp:457
 msgid "%1 of %2 queued messages successfully sent."
 msgstr "%1 de %2 vicitaj mesaĝoj sukcese senditaj."
 
-#: kmsender.cpp:471
+#: kmsender.cpp:472
 msgid "Sending messages"
 msgstr "Sendante mesaĝojn"
 
-#: kmsender.cpp:472
+#: kmsender.cpp:473
 msgid "Initiating sender process..."
 msgstr "Initante sendprocedon..."
 
-#: kmsender.cpp:502
+#: kmsender.cpp:503
 msgid ""
 "You have chosen to send all queued email using an unencrypted transport, do you "
 "want to continue? "
 msgstr ""
 
-#: kmsender.cpp:504
+#: kmsender.cpp:505
 msgid "Send Unencrypted"
 msgstr "Sendi neĉifrite"
 
-#: kmsender.cpp:556
+#: kmsender.cpp:557
 msgid "Unrecognized transport protocol. Unable to send message."
 msgstr "Nerekonata transportprotokolo. Ne eblis sendi la mesaĝon."
 
-#: kmsender.cpp:597
+#: kmsender.cpp:598
 msgid ""
 "_: %3: subject of message\n"
 "Sending message %1 of %2: %3"
 msgstr "Sendante mesaĝon %1 el %2: %3"
 
-#: kmsender.cpp:616
+#: kmsender.cpp:617
 msgid "Failed to send (some) queued messages."
 msgstr "Ne eblis sendi kelkajn atendantajn mesaĝojn."
 
-#: kmsender.cpp:693
+#: kmsender.cpp:694
 msgid ""
 "Sending aborted:\n"
 "%1\n"
@@ -9196,11 +10182,11 @@ msgstr ""
 "La sekva transportprotokolo estis uzata:\n"
 "  %2"
 
-#: kmsender.cpp:701 kmsender.cpp:746
+#: kmsender.cpp:702 kmsender.cpp:747
 msgid "Sending aborted."
 msgstr "Sendado interrompita."
 
-#: kmsender.cpp:719
+#: kmsender.cpp:720
 msgid ""
 "<p>Sending failed:</p>"
 "<p>%1</p>"
@@ -9217,19 +10203,19 @@ msgstr ""
 "<p>La sekva transportprotokolo estis uzata:</p>  %2 "
 "<p>Ĉu vi volas pluigi la sendadon de la restaj mesaĝoj?</p>"
 
-#: kmsender.cpp:729
+#: kmsender.cpp:730
 msgid "Continue Sending"
 msgstr "Pluigi sendadon"
 
-#: kmsender.cpp:729
+#: kmsender.cpp:730
 msgid "&Continue Sending"
 msgstr "&Pluigi sendadon"
 
-#: kmsender.cpp:730
+#: kmsender.cpp:731
 msgid "&Abort Sending"
 msgstr "&Interrompi sendadon"
 
-#: kmsender.cpp:732
+#: kmsender.cpp:733
 msgid ""
 "Sending failed:\n"
 "%1\n"
@@ -9245,11 +10231,11 @@ msgstr ""
 "La sekva transportprotokolo estis uzata:\n"
 " %2"
 
-#: kmsender.cpp:930
+#: kmsender.cpp:931
 msgid "Please specify a mailer program in the settings."
 msgstr "Bonvolu indiki send-programon en la agordaĵo."
 
-#: kmsender.cpp:931
+#: kmsender.cpp:932
 msgid ""
 "Sending failed:\n"
 "%1\n"
@@ -9265,21 +10251,21 @@ msgstr ""
 "La sekva transportprotokolo estis uzata:\n"
 "  %2"
 
-#: kmsender.cpp:979
+#: kmsender.cpp:980
 #, c-format
 msgid "Failed to execute mailer program %1"
 msgstr "Malsukcesis lanĉi la send-programon %1"
 
-#: kmsender.cpp:1029
+#: kmsender.cpp:1030
 msgid "Sendmail exited abnormally."
 msgstr "La programo \"sendmail\" nenormale finis."
 
-#: kmsender.cpp:1099
+#: kmsender.cpp:1100
 msgid "You need to supply a username and a password to use this SMTP server."
 msgstr ""
 "Vi devas doni salutnomon kaj pasvorton por aliri tiun SMTP-poŝtservilon."
 
-#: kmstartup.cpp:197
+#: kmstartup.cpp:198
 msgid ""
 "%1 already seems to be running on another display on this machine. Running %2 "
 "more than once can cause the loss of mail. You should not start %1 unless you "
@@ -9289,7 +10275,7 @@ msgstr ""
 "unu foje povas kaŭzi poŝtperdon. Vi ne lanĉu %1, se vi ne estas certa, ke ĝi ne "
 "jam rulas."
 
-#: kmstartup.cpp:207
+#: kmstartup.cpp:208
 msgid ""
 "%1 seems to be running on another display on this machine. Running %1 and %2 at "
 "the same time can cause the loss of mail. You should not start %2 unless you "
@@ -9298,7 +10284,7 @@ msgstr ""
 "%1 ŝajnas jam ruli en alia vidigejo en tiu maŝino. Ruli %1 kaj %2 samtempepovas "
 "kaŭzi poŝtperdon. Vi ne lanĉu %2, se vi ne estas certa, ke %1 ne jam rulas."
 
-#: kmstartup.cpp:215
+#: kmstartup.cpp:216
 msgid ""
 "%1 already seems to be running on %2. Running %1 more than once can cause the "
 "loss of mail. You should not start %1 on this computer unless you are sure that "
@@ -9308,7 +10294,7 @@ msgstr ""
 "perdon. Vi ne lanĉu %1 en tiu komputilo, se vi ne estas certa, ke ĝi ne jam "
 "rulas en %2."
 
-#: kmstartup.cpp:221
+#: kmstartup.cpp:222
 msgid ""
 "%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
 "loss of mail. You should not start %2 on this computer unless you are sure that "
@@ -9317,24 +10303,24 @@ msgstr ""
 "%1 ŝajnas ruli en %3. Ruli %1 kaj %2 samtempe povas kaŭzi poŝtperdon. Vi ne "
 "lanĉu %2 en tiu komputilo, se vi ne estas certa, ke %1 ne rulas en %3."
 
-#: kmstartup.cpp:231
+#: kmstartup.cpp:232
 #, c-format
 msgid "Start %1"
 msgstr "Lanĉi %1"
 
-#: kmstartup.cpp:232
+#: kmstartup.cpp:233
 msgid "Exit"
 msgstr "Eliri"
 
-#: kmsystemtray.cpp:337
+#: kmsystemtray.cpp:357
 msgid "New Messages In"
 msgstr "Novaj mesaĝoj en"
 
-#: kmsystemtray.cpp:547
+#: kmsystemtray.cpp:567
 msgid "There are no unread messages"
 msgstr "Estas neniuj nelegitaj mesaĝoj"
 
-#: kmsystemtray.cpp:549
+#: kmsystemtray.cpp:569
 #, c-format
 msgid ""
 "_n: There is 1 unread message.\n"
@@ -9603,51 +10589,56 @@ msgstr "Administri kribriloskriptojn"
 msgid "Available Scripts"
 msgstr "Disponeblaj skriptoj"
 
-#: managesievescriptsdialog.cpp:116
+#: managesievescriptsdialog.cpp:121
 msgid "No Sieve URL configured"
 msgstr "Neniu kribrila URL-o agordita"
 
-#: managesievescriptsdialog.cpp:135
+#: managesievescriptsdialog.cpp:140
 msgid "Failed to fetch the list of scripts"
 msgstr ""
 
-#: managesievescriptsdialog.cpp:160
+#: managesievescriptsdialog.cpp:165
 msgid "Delete Script"
 msgstr "Forigi skripton"
 
-#: managesievescriptsdialog.cpp:161
+#: managesievescriptsdialog.cpp:166
 msgid "Edit Script..."
 msgstr "Redakti skripton..."
 
-#: managesievescriptsdialog.cpp:164
+#: managesievescriptsdialog.cpp:167
+#, fuzzy
+msgid "Deactivate Script"
+msgstr "Forigi skripton"
+
+#: managesievescriptsdialog.cpp:170
 msgid "New Script..."
 msgstr "Nova skripto..."
 
-#: managesievescriptsdialog.cpp:233
+#: managesievescriptsdialog.cpp:256
 msgid "Really delete script \"%1\" from the server?"
 msgstr ""
 
-#: managesievescriptsdialog.cpp:234
+#: managesievescriptsdialog.cpp:257
 msgid "Delete Sieve Script Confirmation"
 msgstr "Konfirmo pri forigo de kribrila skripto"
 
-#: managesievescriptsdialog.cpp:278
+#: managesievescriptsdialog.cpp:300
 msgid "New Sieve Script"
 msgstr "Nova kribroskripto"
 
-#: managesievescriptsdialog.cpp:279
+#: managesievescriptsdialog.cpp:301
 msgid "Please enter a name for the new Sieve script:"
 msgstr "Bonvolu enigi nomon por la nova kribroskripto:"
 
-#: managesievescriptsdialog.cpp:293
+#: managesievescriptsdialog.cpp:315
 msgid "Edit Sieve Script"
 msgstr "Redakti kribroskripton"
 
-#: managesievescriptsdialog.cpp:337
+#: managesievescriptsdialog.cpp:367
 msgid "The Sieve script was successfully uploaded."
 msgstr ""
 
-#: managesievescriptsdialog.cpp:338
+#: managesievescriptsdialog.cpp:368
 msgid "Sieve Script Upload"
 msgstr ""
 
@@ -9657,7 +10648,7 @@ msgid ""
 "&Reply"
 msgstr "&Respondi"
 
-#: messageactions.cpp:48 searchwindow.cpp:311
+#: messageactions.cpp:48 searchwindow.cpp:312
 msgid "&Reply..."
 msgstr "R&espondi..."
 
@@ -9665,11 +10656,11 @@ msgstr "R&espondi..."
 msgid "Reply to A&uthor..."
 msgstr "Respondi al aŭtoro..."
 
-#: messageactions.cpp:58 searchwindow.cpp:313
+#: messageactions.cpp:58 searchwindow.cpp:314
 msgid "Reply to &All..."
 msgstr "Respondi &al ĉiuj..."
 
-#: messageactions.cpp:63 searchwindow.cpp:316
+#: messageactions.cpp:63 searchwindow.cpp:317
 msgid "Reply to Mailing-&List..."
 msgstr "Resondi al &dissendolisto..."
 
@@ -9731,7 +10722,7 @@ msgstr "Marki la mesaĝon kiel negrava"
 msgid "&Edit Message"
 msgstr "&Redakti mesaĝon"
 
-#: messagecomposer.cpp:222
+#: messagecomposer.cpp:223
 msgid ""
 "<qt>"
 "<p>Structuring information returned by the Crypto plug-in could not be "
@@ -9743,7 +10734,7 @@ msgstr ""
 "kromaĵo povus esti damaĝa.</p> "
 "<p>Kontaktu vian sisteman administriston.</p> </qt>"
 
-#: messagecomposer.cpp:226
+#: messagecomposer.cpp:227
 msgid ""
 "<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
 "successfully.</p>"
@@ -9762,7 +10753,7 @@ msgstr ""
 "<li> "
 "<li><em>aŭ</em>elektu la malnova OpenPGP-agordo en la sama dialogo.</li> </ul>"
 
-#: messagecomposer.cpp:444
+#: messagecomposer.cpp:445
 msgid ""
 "No suitable encoding could be found for your message.\n"
 "Please set an encoding using the 'Options' menu."
@@ -9770,29 +10761,29 @@ msgstr ""
 "Ne troviĝis taŭga signokodo por via mesaĝo.\n"
 "Bonvolu mane elekti kodon en la menuo 'Opcioj'."
 
-#: messagecomposer.cpp:556
+#: messagecomposer.cpp:557
 msgid ""
 "Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
 "bug."
 msgstr ""
 
-#: messagecomposer.cpp:564
+#: messagecomposer.cpp:565
 msgid ""
 "The \"x-encrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
 
-#: messagecomposer.cpp:572
+#: messagecomposer.cpp:573
 msgid "Chiasmus Encryption Error"
 msgstr ""
 
-#: messagecomposer.cpp:577
+#: messagecomposer.cpp:578
 msgid ""
 "Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
 "not return a byte array. Please report this bug."
 msgstr ""
 
-#: messagecomposer.cpp:638
+#: messagecomposer.cpp:636
 msgid ""
 "The inline OpenPGP crypto message format does not support encryption or signing "
 "of attachments.\n"
@@ -9802,19 +10793,19 @@ msgstr ""
 "kunsendaĵoj.\n"
 "Ĉu vi vere volas ĉesotan kadran OpenPGPon?"
 
-#: messagecomposer.cpp:642
+#: messagecomposer.cpp:640
 msgid "Insecure Message Format"
 msgstr "Nesukura mesaĝformo"
 
-#: messagecomposer.cpp:643
+#: messagecomposer.cpp:641
 msgid "Use Inline OpenPGP"
 msgstr ""
 
-#: messagecomposer.cpp:644
+#: messagecomposer.cpp:642
 msgid "Use OpenPGP/MIME"
 msgstr "Uzi OpenPGP/MIME"
 
-#: messagecomposer.cpp:760
+#: messagecomposer.cpp:758
 msgid ""
 "Examination of the recipient's signing preferences yielded that you be asked "
 "whether or not to sign this message.\n"
@@ -9824,21 +10815,21 @@ msgstr ""
 "prisubskribo de la mesaĝo.\n"
 "Ĉu subskribi tiun mesaĝon?"
 
-#: messagecomposer.cpp:765 messagecomposer.cpp:788
+#: messagecomposer.cpp:763 messagecomposer.cpp:786
 msgid "Sign Message?"
 msgstr "Subskribi mesaĝon?"
 
-#: messagecomposer.cpp:766 messagecomposer.cpp:789
+#: messagecomposer.cpp:764 messagecomposer.cpp:787
 msgid ""
 "_: to sign\n"
 "&Sign"
 msgstr "&Subskribi"
 
-#: messagecomposer.cpp:767 messagecomposer.cpp:790
+#: messagecomposer.cpp:765 messagecomposer.cpp:788
 msgid "Do &Not Sign"
 msgstr "&Ne subskribi"
 
-#: messagecomposer.cpp:784
+#: messagecomposer.cpp:782
 msgid ""
 "There are conflicting signing preferences for these recipients.\n"
 "Sign this message?"
@@ -9846,7 +10837,7 @@ msgstr ""
 "Estas interkonfliktigaj preferoj de subskribo por tiuj adresatoj.\n"
 "Ĉu subskribu tiun mesaĝon?"
 
-#: messagecomposer.cpp:806
+#: messagecomposer.cpp:804
 msgid ""
 "You have requested to sign this message, but no valid signing keys have been "
 "configured for this identity."
@@ -9854,15 +10845,15 @@ msgstr ""
 "Vi postulis subskribon de la mesaĝo, sed neniu valida ĉifroŝlosilo estas "
 "agordita por tiu identeco."
 
-#: messagecomposer.cpp:810
+#: messagecomposer.cpp:808
 msgid "Send Unsigned?"
 msgstr "Ĉu sendi nesubskribita?"
 
-#: messagecomposer.cpp:811
+#: messagecomposer.cpp:809
 msgid "Send &Unsigned"
 msgstr "Sendi nesubskribita"
 
-#: messagecomposer.cpp:826
+#: messagecomposer.cpp:824
 msgid ""
 "Some parts of this message will not be signed.\n"
 "Sending only partially signed messages might violate site policy.\n"
@@ -9872,7 +10863,7 @@ msgstr ""
 "Sendo de parte subskribata mesaĝo povas ofendi servilan direktivon.\n"
 "Ĉu anstataŭe subskribi ĉiujn partojn?"
 
-#: messagecomposer.cpp:829
+#: messagecomposer.cpp:827
 msgid ""
 "This message will not be signed.\n"
 "Sending unsigned message might violate site policy.\n"
@@ -9882,23 +10873,23 @@ msgstr ""
 "Sendo de nesubskribata mesaĝo povas ofendi servilan direktivon.\n"
 "Ĉu anstataŭe subskribi la mesaĝon?"
 
-#: messagecomposer.cpp:833
+#: messagecomposer.cpp:831
 msgid "&Sign All Parts"
 msgstr "&Subskribi ĉiujn partojn"
 
-#: messagecomposer.cpp:833
+#: messagecomposer.cpp:831
 msgid "&Sign"
 msgstr "&Subskribi"
 
-#: messagecomposer.cpp:835
+#: messagecomposer.cpp:833
 msgid "Unsigned-Message Warning"
 msgstr "Subskribo averto"
 
-#: messagecomposer.cpp:837
+#: messagecomposer.cpp:835
 msgid "Send &As Is"
 msgstr "Sendi &tiel"
 
-#: messagecomposer.cpp:875
+#: messagecomposer.cpp:873
 msgid ""
 "Valid trusted encryption keys were found for all recipients.\n"
 "Encrypt this message?"
@@ -9906,7 +10897,7 @@ msgstr ""
 "Validaj fidataj ĉifroŝlosiloj estas trovitaj por ĉiuj adresatoj.\n"
 "Ĉu ĉifri la mesaĝojn?"
 
-#: messagecomposer.cpp:877
+#: messagecomposer.cpp:875
 msgid ""
 "Examination of the recipient's encryption preferences yielded that you be asked "
 "whether or not to encrypt this message.\n"
@@ -9916,23 +10907,23 @@ msgstr ""
 "ĉifro de la mesaĝo.\n"
 "Ĉu ĉifri la mesaĝon?"
 
-#: messagecomposer.cpp:882 messagecomposer.cpp:909
+#: messagecomposer.cpp:880 messagecomposer.cpp:907
 msgid "Encrypt Message?"
 msgstr "Ĉifri mesaĝon?"
 
-#: messagecomposer.cpp:884
+#: messagecomposer.cpp:882
 msgid "Sign && &Encrypt"
 msgstr "Subskribi kaj ĉi&fri"
 
-#: messagecomposer.cpp:887 messagecomposer.cpp:962
+#: messagecomposer.cpp:885 messagecomposer.cpp:960
 msgid "&Sign Only"
 msgstr "Nur &subskribo"
 
-#: messagecomposer.cpp:888 messagecomposer.cpp:963
+#: messagecomposer.cpp:886 messagecomposer.cpp:961
 msgid "&Send As-Is"
 msgstr "Sendi &tiel"
 
-#: messagecomposer.cpp:905
+#: messagecomposer.cpp:903
 msgid ""
 "There are conflicting encryption preferences for these recipients.\n"
 "Encrypt this message?"
@@ -9940,11 +10931,11 @@ msgstr ""
 "Estas interkonfliktigaj preferoj de ĉifro por tiuj adresatoj.\n"
 "Ĉu ĉifri tiun mesaĝon?"
 
-#: messagecomposer.cpp:911
+#: messagecomposer.cpp:909
 msgid "Do &Not Encrypt"
 msgstr "&Ne ĉifri"
 
-#: messagecomposer.cpp:927
+#: messagecomposer.cpp:925
 msgid ""
 "You have requested to encrypt this message, and to encrypt a copy to yourself, "
 "but no valid trusted encryption keys have been configured for this identity."
@@ -9952,11 +10943,11 @@ msgstr ""
 "Vi postulis ĉifri la mesaĝon kaj ĉifri kopion por vi mem, sed neniu valida "
 "fidata ŝlosilo ekzistas por la identeco."
 
-#: messagecomposer.cpp:932
+#: messagecomposer.cpp:930
 msgid "Send Unencrypted?"
 msgstr "Sendi neĉifre?"
 
-#: messagecomposer.cpp:948
+#: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
 "Sending only partially encrypted messages might violate site policy and/or leak "
@@ -9968,7 +10959,7 @@ msgstr ""
 "sekretajn informojn.\n"
 "Ĉu anstataŭe ĉifri ĉiujn partojn?"
 
-#: messagecomposer.cpp:952
+#: messagecomposer.cpp:950
 msgid ""
 "This message will not be encrypted.\n"
 "Sending unencrypted messages might violate site policy and/or leak sensitive "
@@ -9980,15 +10971,15 @@ msgstr ""
 "sekretajn informojn.\n"
 "Ĉu anstataŭe ĉifri la mesaĝon?"
 
-#: messagecomposer.cpp:957
+#: messagecomposer.cpp:955
 msgid "&Encrypt All Parts"
 msgstr "Ĉifri ĉiu&jn mesaĝopartojn"
 
-#: messagecomposer.cpp:959
+#: messagecomposer.cpp:957
 msgid "Unencrypted Message Warning"
 msgstr "Ĉifroaverto"
 
-#: messagecomposer.cpp:2040
+#: messagecomposer.cpp:2038
 msgid ""
 "<qt>"
 "<p>Error: The backend did not return any encoded data.</p>"
@@ -10000,7 +10991,7 @@ msgstr ""
 "<p>Raportu la malkoretaĵon: "
 "<br>%2</p></qt>"
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2111
 msgid ""
 "<qt>Not all characters fit into the chosen encoding."
 "<br>"
@@ -10010,19 +11001,28 @@ msgstr ""
 "<br>"
 "<br>Ĉu tamen sendi la mesaĝon?</qt>"
 
-#: messagecomposer.cpp:2115
+#: messagecomposer.cpp:2113
 msgid "Some Characters Will Be Lost"
 msgstr "Kelkaj signoj perdiĝos"
 
-#: messagecomposer.cpp:2116
+#: messagecomposer.cpp:2114
 msgid "Lose Characters"
 msgstr "Perdi signojn"
 
-#: messagecomposer.cpp:2116
+#: messagecomposer.cpp:2114
 msgid "Change Encoding"
 msgstr "Ŝanĝi &signokodon"
 
-#: 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 ""
+"Ne eblas subskribi la mesaĝon, ĉar la elektita subskribejo ŝajnas ne subteni "
+"subskribon. Tio ĉi neniam okazu, tial raportu la malkorektaĵon."
+
+#: messagecomposer.cpp:2168
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
@@ -10030,17 +11030,17 @@ msgstr ""
 "Ne eblas subskribi la mesaĝon, ĉar la elektita subskribejo ŝajnas ne subteni "
 "subskribon. Tio ĉi neniam okazu, tial raportu la malkorektaĵon."
 
-#: 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
 msgid ""
 "This message could not be encrypted, since the chosen backend does not seem to "
 "support encryption; this should actually never happen, please report this bug."
@@ -10048,11 +11048,11 @@ msgstr ""
 "Ne eblas ĉifri la mesaĝon, ĉar la elektita ĉifrejo ŝajnas ne subteni ĉifron. "
 "Tio ĉi neniam okazu, tial raportu la malkorektaĵon."
 
-#: 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
 msgid ""
 "This message could not be signed and encrypted, since the chosen backend does "
 "not seem to support combined signing and encryption; this should actually never "
@@ -10062,24 +11062,24 @@ msgstr ""
 "subteni ambaŭfarajn subskribon kaj ĉifron. Tio ĉi neniam okazu, tial raportu la "
 "malkorektaĵon."
 
-#: newfolderdialog.cpp:58
+#: newfolderdialog.cpp:59
 msgid "New Folder"
 msgstr "Nova leterujo"
 
-#: newfolderdialog.cpp:65
+#: newfolderdialog.cpp:69
 #, c-format
 msgid "New Subfolder of %1"
 msgstr "Nova subleterujo de %1"
 
-#: newfolderdialog.cpp:81
+#: newfolderdialog.cpp:85
 msgid "Enter a name for the new folder."
 msgstr ""
 
-#: newfolderdialog.cpp:92
+#: newfolderdialog.cpp:96
 msgid "Mailbox &format:"
 msgstr "Poŝtkesta &formato:"
 
-#: newfolderdialog.cpp:97
+#: newfolderdialog.cpp:101
 msgid ""
 "Select whether you want to store the messages in this folder as one file per  "
 "message (maildir) or as one big file (mbox). KMail uses maildir by default and "
@@ -10087,99 +11087,81 @@ msgid ""
 "this option as-is."
 msgstr ""
 
-#: newfolderdialog.cpp:119
+#: newfolderdialog.cpp:124
 msgid "Folder &contains:"
 msgstr "Leterujo &enhavas:"
 
-#: newfolderdialog.cpp:124
+#: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
 "storage of groupware items such as tasks or notes. The default is mail. If you "
 "are unsure, leave this option as-is."
 msgstr ""
 
-#: newfolderdialog.cpp:160
+#: newfolderdialog.cpp:165
 msgid "Namespace for &folder:"
 msgstr ""
 
-#: newfolderdialog.cpp:165
+#: newfolderdialog.cpp:170
 msgid "Select the personal namespace the folder should be created in."
 msgstr "Elektu la personan nomspacon en kiu la leterujo estu kreota."
 
-#: newfolderdialog.cpp:188
+#: newfolderdialog.cpp:193
 msgid "Please specify a name for the new folder."
 msgstr "Bonvolu indiki nomon por la nova leterujo."
 
-#: newfolderdialog.cpp:189
+#: newfolderdialog.cpp:194
 msgid "No Name Specified"
 msgstr "Nomo ne donita"
 
-#: newfolderdialog.cpp:198
-msgid ""
-"Folder names cannot contain the / (slash) character; please choose another "
-"folder name."
-msgstr ""
-
-#: newfolderdialog.cpp:204
-msgid ""
-"Folder names cannot start with a . (dot) character; please choose another "
-"folder name."
-msgstr ""
-
-#: newfolderdialog.cpp:223
-msgid ""
-"Your IMAP server does not allow the character '%1'; please choose another "
-"folder name."
-msgstr ""
-
-#: newfolderdialog.cpp:240
+#: newfolderdialog.cpp:216
 msgid "<qt>Failed to create folder <b>%1</b>, folder already exists.</qt>"
 msgstr "<qt>Ne eblas krei leterujon <b>%1</b>, ĝi jam ekzistas.</qt>"
 
-#: newfolderdialog.cpp:246
+#: newfolderdialog.cpp:222
 msgid "<qt>Failed to create folder <b>%1</b>.</qt> "
 msgstr "<qt>Ne eblis kreii la leterujon <b>%1</b>.</qt>"
 
-#: objecttreeparser.cpp:450
+#: objecttreeparser.cpp:490
 msgid "Wrong Crypto Plug-In."
 msgstr "Malkorekta ĉifro&kromaĵo."
 
-#: objecttreeparser.cpp:490 objecttreeparser.cpp:1909
+#: objecttreeparser.cpp:594 objecttreeparser.cpp:2130
 msgid "Different results for signatures"
 msgstr "Diversaj rezultoj por subskriboj"
 
-#: objecttreeparser.cpp:573
+#: objecttreeparser.cpp:667
 msgid "The crypto engine returned no cleartext data."
 msgstr "La ĉifrilo ne redonis legeblan tekston."
 
-#: objecttreeparser.cpp:576 objecttreeparser.cpp:2350
-#: objecttreeparser.cpp:2393
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
+#: objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr "Stato: "
 
-#: objecttreeparser.cpp:583
+#: objecttreeparser.cpp:677
 msgid "(unknown)"
 msgstr "(nekonata)"
 
-#: objecttreeparser.cpp:594 objecttreeparser.cpp:748
+#: objecttreeparser.cpp:688 objecttreeparser.cpp:903
 msgid "Crypto plug-in \"%1\" is not initialized."
 msgstr "Ĉifrokromaĵo \"%1\" ne estas pravalorizita."
 
-#: objecttreeparser.cpp:598
+#: objecttreeparser.cpp:692
 msgid "Crypto plug-in \"%1\" cannot verify signatures."
 msgstr "Ĉifrokromaĵo \"%1\" ne povas kontroli subskribojn."
 
-#: objecttreeparser.cpp:603 objecttreeparser.cpp:756
+#: objecttreeparser.cpp:697 objecttreeparser.cpp:911
 msgid "No appropriate crypto plug-in was found."
 msgstr "Neniu taŭga kromaĵo estas trovita."
 
-#: objecttreeparser.cpp:606
+#: objecttreeparser.cpp:700
 msgid ""
 "_: %1 is either 'OpenPGP' or 'S/MIME'\n"
 "No %1 plug-in was found."
 msgstr "Kromaĵo por %1 ne estas trovita."
 
-#: objecttreeparser.cpp:610
+#: objecttreeparser.cpp:704
 #, c-format
 msgid ""
 "The message is signed, but the validity of the signature cannot be verified.<br "
@@ -10188,34 +11170,39 @@ msgstr ""
 "La mesaĝo estas subskribita, sed la valideco de la subskribo ne estis "
 "kontrolebla. <br />Kaŭzo: %1"
 
-#: objecttreeparser.cpp:667
+#: objecttreeparser.cpp:737
+#, fuzzy
+msgid "Encrypted data not shown"
+msgstr "Ĉifritaj datumoj ne vidigitaj."
+
+#: objecttreeparser.cpp:755
 #, fuzzy
 msgid "This message is encrypted."
 msgstr "Konservi senditajn mesaĝojn ĉ&ifrite"
 
-#: objecttreeparser.cpp:672
+#: objecttreeparser.cpp:760
 #, fuzzy
 msgid "Decrypt Message"
 msgstr "Ĉ&ifri mesaĝon"
 
-#: objecttreeparser.cpp:731 objecttreeparser.cpp:744 objecttreeparser.cpp:773
+#: objecttreeparser.cpp:886 objecttreeparser.cpp:899 objecttreeparser.cpp:928
 msgid "Encrypted data not shown."
 msgstr "Ĉifritaj datumoj ne vidigitaj."
 
-#: objecttreeparser.cpp:734
+#: objecttreeparser.cpp:889
 msgid "Crypto plug-in \"%1\" could not decrypt the data."
 msgstr "Ĉifrokromaĵo %1 ne povis deĉifri la datumojn."
 
-#: objecttreeparser.cpp:737
+#: objecttreeparser.cpp:892
 #, c-format
 msgid "Error: %1"
 msgstr "Eraro: %1"
 
-#: objecttreeparser.cpp:752
+#: objecttreeparser.cpp:907
 msgid "Crypto plug-in \"%1\" cannot decrypt messages."
 msgstr "Ĉifrokromaĵo \"%1\" ne povas deĉifri mesaĝojn."
 
-#: objecttreeparser.cpp:844
+#: objecttreeparser.cpp:1000
 #, fuzzy
 msgid ""
 "<b>Note:</b> This HTML message may contain external references to images etc. "
@@ -10228,7 +11215,7 @@ msgstr ""
 "formatitan HTML-rigardon per premo de la <a href=\"kmail.showHTML\">HTML</a>"
 "-butono."
 
-#: objecttreeparser.cpp:854
+#: objecttreeparser.cpp:1010
 msgid ""
 "<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
 "code is shown. If you trust the sender of this message then you can activate "
@@ -10240,20 +11227,31 @@ msgstr ""
 "formatitan HTML-rigardon per premo de la <a href=\"kmail.showHTML\">HTML</a>"
 "-butono."
 
-#: 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 "Plusendi mesaĝon"
+
+#: objecttreeparser.cpp:1658
 #, c-format
 msgid "Sorry, certificate could not be imported.<br>Reason: %1"
 msgstr "Pardonu, ne eblas importi la atestilon.<br>Kaŭzo: %1"
 
-#: objecttreeparser.cpp:1461
+#: objecttreeparser.cpp:1668
 msgid "Sorry, no certificates were found in this message."
 msgstr "Pardonu, ne eblas trovi iun atestilon en la mesaĝo."
 
-#: objecttreeparser.cpp:1464
+#: objecttreeparser.cpp:1671
 msgid "Certificate import status:"
 msgstr "Atestila importstato:"
 
-#: objecttreeparser.cpp:1467
+#: objecttreeparser.cpp:1674
 #, c-format
 msgid ""
 "_n: 1 new certificate was imported.\n"
@@ -10262,7 +11260,7 @@ msgstr ""
 "1 nova atestilo estas importita.\n"
 "%n novaj atestiloj estas importitaj."
 
-#: objecttreeparser.cpp:1470
+#: objecttreeparser.cpp:1677
 #, c-format
 msgid ""
 "_n: 1 certificate was unchanged.\n"
@@ -10271,7 +11269,7 @@ msgstr ""
 "1 atestilo estas neŝanĝita.\n"
 "%n atestiloj estas neŝanĝitaj."
 
-#: objecttreeparser.cpp:1473
+#: objecttreeparser.cpp:1680
 #, c-format
 msgid ""
 "_n: 1 new secret key was imported.\n"
@@ -10280,7 +11278,7 @@ msgstr ""
 "1 nova sekretŝlosilo estas importita.\n"
 "%n novaj sekretŝlosiloj estas importitaj."
 
-#: objecttreeparser.cpp:1476
+#: objecttreeparser.cpp:1683
 #, c-format
 msgid ""
 "_n: 1 secret key was unchanged.\n"
@@ -10289,183 +11287,200 @@ msgstr ""
 "1 sekretŝlosilo estas neŝanĝita.\n"
 "%n sekretŝlosiloj estas neŝanĝitaj."
 
-#: objecttreeparser.cpp:1485
+#: objecttreeparser.cpp:1692
 msgid "Sorry, no details on certificate import available."
 msgstr "Pardonu, detaloj pri atestila importo ne estas haveblaj."
 
-#: objecttreeparser.cpp:1488
+#: objecttreeparser.cpp:1695
 msgid "Certificate import details:"
 msgstr "Atestilo importdetaloj:"
 
-#: objecttreeparser.cpp:1491
+#: objecttreeparser.cpp:1698
 msgid "Failed: %1 (%2)"
 msgstr "Fiaskis: %1 (%2)"
 
-#: objecttreeparser.cpp:1496
+#: objecttreeparser.cpp:1703
 msgid "New or changed: %1 (secret key available)"
 msgstr "Nova aŭ ŝanĝita: %1 (sekretŝlosilo estas havebla)"
 
-#: objecttreeparser.cpp:1498
+#: objecttreeparser.cpp:1706
 #, c-format
 msgid "New or changed: %1"
 msgstr "Nova aŭ ŝanĝita: %1"
 
-#: objecttreeparser.cpp:1891
+#: objecttreeparser.cpp:2112
 msgid "Error: Signature not verified"
 msgstr "Eraro: subskribo ne kontrolata"
 
-#: objecttreeparser.cpp:1894
+#: objecttreeparser.cpp:2115
 msgid "Good signature"
 msgstr "Korekta subskribo"
 
-#: objecttreeparser.cpp:1897
+#: objecttreeparser.cpp:2118
 msgid "<b>Bad</b> signature"
 msgstr "<b>Ne</b>korekta subskribo"
 
-#: objecttreeparser.cpp:1900
+#: objecttreeparser.cpp:2121
 msgid "No public key to verify the signature"
 msgstr "Neniu publikŝlosilo por kontroli la subskribon"
 
-#: objecttreeparser.cpp:1903
+#: objecttreeparser.cpp:2124
 msgid "No signature found"
 msgstr "Subskribo ne trovita."
 
-#: objecttreeparser.cpp:1906
+#: objecttreeparser.cpp:2127
 msgid "Error verifying the signature"
 msgstr "Eraro dum kontrolo de subskribo"
 
-#: objecttreeparser.cpp:1929
+#: objecttreeparser.cpp:2150
 msgid "No status information available."
 msgstr "Neniu stato haviĝebla"
 
-#: objecttreeparser.cpp:1936 objecttreeparser.cpp:2020
+#: objecttreeparser.cpp:2157 objecttreeparser.cpp:2241
 msgid "Good signature."
 msgstr "Korekta subskribo."
 
-#: objecttreeparser.cpp:1957
+#: objecttreeparser.cpp:2178
 msgid "One key has expired."
 msgstr "Ŝlosilo malvalidiĝis."
 
-#: objecttreeparser.cpp:1961
+#: objecttreeparser.cpp:2182
 msgid "The signature has expired."
 msgstr "La subskribo malvalidiĝis."
 
-#: objecttreeparser.cpp:1966
+#: objecttreeparser.cpp:2187
 msgid "Unable to verify: key missing."
 msgstr "Ne eblas kontroli: Ŝlosilo mankas."
 
-#: objecttreeparser.cpp:1973
+#: objecttreeparser.cpp:2194
 msgid "CRL not available."
 msgstr "ANVLo ne uzebla."
 
-#: objecttreeparser.cpp:1977
+#: objecttreeparser.cpp:2198
 msgid "Available CRL is too old."
 msgstr "Uzebla ANVLo estas tro malnova."
 
-#: objecttreeparser.cpp:1981
+#: objecttreeparser.cpp:2202
 msgid "A policy was not met."
 msgstr "Ĝi ne akordas kun iu direktivo."
 
-#: objecttreeparser.cpp:1985
+#: objecttreeparser.cpp:2206
 msgid "A system error occurred."
 msgstr "Sistemeraro okazis."
 
-#: objecttreeparser.cpp:1996
+#: objecttreeparser.cpp:2217
 msgid "One key has been revoked."
 msgstr "Ŝlosilo estas reprenita."
 
-#: objecttreeparser.cpp:2022
+#: objecttreeparser.cpp:2243
 msgid "<b>Bad</b> signature."
 msgstr "<b>Ne</b>korekta subskribo."
 
-#: objecttreeparser.cpp:2049
+#: objecttreeparser.cpp:2270
 #, fuzzy
 msgid "Invalid signature."
 msgstr "&Enŝalti subskribon"
 
-#: objecttreeparser.cpp:2051
+#: objecttreeparser.cpp:2272
 #, fuzzy
 msgid "Not enough information to check signature validity."
 msgstr "La informoj ne sufiĉas por kontroli la subskribon. %1"
 
-#: objecttreeparser.cpp:2060
+#: objecttreeparser.cpp:2281
 #, fuzzy
 msgid "Signature is valid."
 msgstr "Subskriboj"
 
-#: 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 "[Detaloj]"
 
-#: objecttreeparser.cpp:2082
+#: objecttreeparser.cpp:2308
 #, fuzzy
 msgid "No Audit Log available"
 msgstr "Ne haviĝebla"
 
-#: objecttreeparser.cpp:2089
+#: objecttreeparser.cpp:2310
+#, fuzzy, c-format
+msgid "Error Retrieving Audit Log: %1"
+msgstr ""
+"Eraro dum prenado de kvot-informoj de la servilo\n"
+"%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 "[Detaloj]"
 
-#: objecttreeparser.cpp:2124 objecttreeparser.cpp:2126
+#: objecttreeparser.cpp:2357 objecttreeparser.cpp:2359
 msgid "Encapsulated message"
 msgstr "Enujigita mesaĝo"
 
-#: objecttreeparser.cpp:2135
+#: objecttreeparser.cpp:2368
+#, fuzzy
+msgid "Please wait while the message is being decrypted..."
+msgstr "Konservi senditajn mesaĝojn ĉ&ifrite"
+
+#: objecttreeparser.cpp:2370
 msgid "Encrypted message"
 msgstr "Ĉifrita mesaĝo"
 
-#: objecttreeparser.cpp:2137
+#: objecttreeparser.cpp:2372
 msgid "Encrypted message (decryption not possible)"
 msgstr "Enujigita mesaĝo (deĉifro ne eblas)"
 
-#: objecttreeparser.cpp:2139
+#: objecttreeparser.cpp:2374
 #, c-format
 msgid "Reason: %1"
 msgstr "kaŭzo: %1"
 
-#: objecttreeparser.cpp:2194
+#: objecttreeparser.cpp:2384
+#, fuzzy
+msgid "Please wait while the signature is being verified..."
+msgstr "La valideco de la subskribo ne estis kontrolebla."
+
+#: objecttreeparser.cpp:2438
 msgid "[Details]"
 msgstr "[Detaloj]"
 
-#: objecttreeparser.cpp:2233 objecttreeparser.cpp:2235
+#: objecttreeparser.cpp:2477 objecttreeparser.cpp:2479
 #, fuzzy
 msgid "certificate"
 msgstr "Atestiloj"
 
-#: objecttreeparser.cpp:2242 objecttreeparser.cpp:2267
+#: objecttreeparser.cpp:2486 objecttreeparser.cpp:2511
 msgid "Warning:"
 msgstr "Averto:"
 
-#: objecttreeparser.cpp:2244
+#: objecttreeparser.cpp:2488
 msgid "Sender's mail address is not stored in the %1 used for signing."
 msgstr ""
 "Retpoŝta adreso de la sendinto ne estas konservita en %1 por subskribi."
 
-#: objecttreeparser.cpp:2247
+#: objecttreeparser.cpp:2491
 msgid "sender: "
 msgstr "sendinto: "
 
-#: objecttreeparser.cpp:2250
+#: objecttreeparser.cpp:2494
 msgid "stored: "
 msgstr "konservita: "
 
-#: objecttreeparser.cpp:2269
+#: objecttreeparser.cpp:2513
 msgid ""
 "No mail address is stored in the %1 used for signing, so we cannot compare it "
 "to the sender's address %2."
@@ -10473,98 +11488,98 @@ msgstr ""
 "Neniu retpoŝtadreso estas konservita en  la %1 por subskribi. Tial ni ne povos "
 "kompari ĝin kun la sendintula adreso %2."
 
-#: objecttreeparser.cpp:2292
+#: objecttreeparser.cpp:2536
 #, c-format
 msgid "Not enough information to check signature. %1"
 msgstr "La informoj ne sufiĉas por kontroli la subskribon. %1"
 
-#: objecttreeparser.cpp:2309 objecttreeparser.cpp:2387
+#: objecttreeparser.cpp:2553 objecttreeparser.cpp:2631
 msgid "Message was signed with unknown key."
 msgstr "Mesaĝo estis subskribita kun nekonata ŝlosilo."
 
-#: objecttreeparser.cpp:2311 objecttreeparser.cpp:2425
-#: objecttreeparser.cpp:2469
+#: objecttreeparser.cpp:2555 objecttreeparser.cpp:2669
+#: objecttreeparser.cpp:2713
 #, c-format
 msgid "Message was signed by %1."
 msgstr "Mesaĝo subskribita de %1."
 
-#: objecttreeparser.cpp:2318 objecttreeparser.cpp:2327
-#: objecttreeparser.cpp:2338
+#: objecttreeparser.cpp:2562 objecttreeparser.cpp:2571
+#: objecttreeparser.cpp:2582
 #, c-format
 msgid "Message was signed with key %1."
 msgstr "Mesaĝo estis subskribita kun ŝlosilo %1."
 
-#: objecttreeparser.cpp:2321
+#: objecttreeparser.cpp:2565
 msgid "Message was signed on %1 with key %2."
 msgstr "Mesaĝo estis subskribita en %1 kun ŝlosilo %2."
 
-#: objecttreeparser.cpp:2330
+#: objecttreeparser.cpp:2574
 msgid "Message was signed by %3 on %1 with key %2"
 msgstr "Mesaĝo estis subskribita de %3 en %1 kun ŝlosilo %2."
 
-#: objecttreeparser.cpp:2341
+#: objecttreeparser.cpp:2585
 msgid "Message was signed by %2 with key %1."
 msgstr "Mesaĝo estis subskribita de %2 kun ŝlosilo %1."
 
-#: objecttreeparser.cpp:2379
+#: objecttreeparser.cpp:2623
 msgid "Message was signed on %1 with unknown key %2."
 msgstr "Mesaĝo estis subskribita en %1 kun nekonata ŝlosilo %2."
 
-#: objecttreeparser.cpp:2383
+#: objecttreeparser.cpp:2627
 #, fuzzy, c-format
 msgid "Message was signed with unknown key %1."
 msgstr "Mesaĝo estis subskribita kun nekonata ŝlosilo %2."
 
-#: objecttreeparser.cpp:2389
+#: objecttreeparser.cpp:2633
 msgid "The validity of the signature cannot be verified."
 msgstr "La valideco de la subskribo ne estis kontrolebla."
 
-#: objecttreeparser.cpp:2421 objecttreeparser.cpp:2465
+#: objecttreeparser.cpp:2665 objecttreeparser.cpp:2709
 msgid "Message was signed by %2 (Key ID: %1)."
 msgstr "Mesaĝo estis subskribita de %2 (Ŝlosilo: %1)."
 
-#: objecttreeparser.cpp:2431
+#: objecttreeparser.cpp:2675
 msgid "The signature is valid, but the key's validity is unknown."
 msgstr ""
 "La subskribo estas valida, sed la valideco de la ŝlosilo ne estas konata."
 
-#: objecttreeparser.cpp:2435
+#: objecttreeparser.cpp:2679
 msgid "The signature is valid and the key is marginally trusted."
 msgstr "La subskribo estas valida, sed la ŝlosilo estas nur iom fidata."
 
-#: objecttreeparser.cpp:2439
+#: objecttreeparser.cpp:2683
 msgid "The signature is valid and the key is fully trusted."
 msgstr "La subskribo estas valida kaj la ŝlosilo estas tute fidinda."
 
-#: objecttreeparser.cpp:2443
+#: objecttreeparser.cpp:2687
 msgid "The signature is valid and the key is ultimately trusted."
 msgstr "La subskribo estas valida kaj la ŝlosilo estas ĉiukaze fidinda."
 
-#: objecttreeparser.cpp:2447
+#: objecttreeparser.cpp:2691
 msgid "The signature is valid, but the key is untrusted."
 msgstr "La subskribo estas valida, sed la ŝlosilo estas ne fidinda."
 
-#: objecttreeparser.cpp:2471
+#: objecttreeparser.cpp:2715
 msgid "Warning: The signature is bad."
 msgstr "Averto: Malbona subskribo."
 
-#: objecttreeparser.cpp:2495
+#: objecttreeparser.cpp:2739
 msgid "End of signed message"
 msgstr "Fino de la PGP-mesaĝo"
 
-#: objecttreeparser.cpp:2501
+#: objecttreeparser.cpp:2745
 msgid "End of encrypted message"
 msgstr "Fino de la ĉifrita mesaĝo"
 
-#: objecttreeparser.cpp:2508
+#: objecttreeparser.cpp:2752
 msgid "End of encapsulated message"
 msgstr "Fino de la enujigita mesaĝo"
 
-#: partNode.cpp:481
+#: partNode.cpp:505
 msgid "internal part"
 msgstr "ena parto"
 
-#: partNode.cpp:483
+#: partNode.cpp:507
 msgid "body part"
 msgstr "korpa parto"
 
@@ -10654,19 +11669,19 @@ msgstr "&Iri"
 msgid "F&older"
 msgstr "&Leterujo"
 
-#. 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 "&Mesaĝo"
 
-#. i18n: file kmail_part.rc line 121
+#. i18n: file kmail_part.rc line 122
 #: rc.cpp:24 rc.cpp:90 rc.cpp:123
 #, no-c-format
 msgid "Reply Special"
 msgstr ""
 
-#. 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"
@@ -10824,158 +11839,170 @@ msgstr ""
 msgid "Never sign/encrypt when sa&ving as draft"
 msgstr "Neniam subskribi aŭ ĉifri malnetaĵon"
 
-#. 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 "Al: "
+
+#. i18n: file customtemplates_base.ui line 177
+#: rc.cpp:200 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "Kopio: "
+
+#. i18n: file customtemplates_base.ui line 234
+#: rc.cpp:203
 #, no-c-format
 msgid "Universal"
 msgstr "Universale"
 
-#. i18n: file customtemplates_base.ui line 185
-#: rc.cpp:197
+#. i18n: file customtemplates_base.ui line 239
+#: rc.cpp:206
 #, no-c-format
 msgid "Reply"
 msgstr "Respondi"
 
-#. i18n: file customtemplates_base.ui line 190
-#: rc.cpp:200
+#. i18n: file customtemplates_base.ui line 244
+#: rc.cpp:209
 #, no-c-format
 msgid "Reply to All"
 msgstr "Respondi al ĉiuj"
 
-#. i18n: file customtemplates_base.ui line 195
-#: rc.cpp:203
+#. i18n: file customtemplates_base.ui line 249
+#: rc.cpp:212
 #, no-c-format
 msgid "Forward"
 msgstr "Plusendi"
 
-#. i18n: file customtemplates_base.ui line 207
-#: rc.cpp:206
+#. i18n: file customtemplates_base.ui line 261
+#: rc.cpp:215
 #, no-c-format
 msgid "Shortc&ut:"
 msgstr "F&ulmoklavo:"
 
-#. i18n: file customtemplates_base.ui line 229
-#: rc.cpp:209
+#. i18n: file customtemplates_base.ui line 283
+#: rc.cpp:218
 #, no-c-format
 msgid "&Template type:"
 msgstr "Ŝablon&tipo:"
 
-#. 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 "Leterujecoj"
 
 #. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:227
+#: rc.cpp:233
 #, no-c-format
 msgid "Folder holds a &mailing list"
 msgstr "&Leterujo entenas dissendoliston"
 
 #. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:230
+#: rc.cpp:236
 #, no-c-format
 msgid "List &address:"
 msgstr "List&adreso:"
 
 #. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:233
+#: rc.cpp:239
 #, no-c-format
 msgid "N&ormal:"
 msgstr "N&ormala:"
 
 #. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:236
+#: rc.cpp:242
 #, no-c-format
 msgid "Unr&ead:"
 msgstr "N&elegita:"
 
 #. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:242
+#: rc.cpp:248
 #, no-c-format
 msgid "Message Expiring"
 msgstr "Malnoviĝo de mesaĝo"
 
 #. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:245
+#: rc.cpp:251
 #, no-c-format
 msgid "E&xpire after:"
 msgstr "Malnovigi post:"
 
 #. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:248
+#: rc.cpp:254
 #, no-c-format
 msgid "Expire &read messages"
 msgstr "Malnovigi &legitajn mesaĝojn"
 
 #. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:251
+#: rc.cpp:257
 #, no-c-format
 msgid "Expire a&fter:"
 msgstr "Malnovigi &post:"
 
 #. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:254
+#: rc.cpp:260
 #, no-c-format
 msgid "Expire &unread messages"
 msgstr "Malnovigi &nelegitajn mesaĝojn"
 
 #. 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 "Tago(j)"
 
 #. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:260 rc.cpp:269
+#: rc.cpp:266 rc.cpp:275
 #, no-c-format
 msgid "Week(s)"
 msgstr "Semajno(j)"
 
 #. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:263 rc.cpp:272
+#: rc.cpp:269 rc.cpp:278
 #, no-c-format
 msgid "Month(s)"
 msgstr "Monato(j)"
 
 #. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:275
+#: rc.cpp:281
 #, no-c-format
 msgid "Advanced"
 msgstr "Pliaj opcioj"
 
 #. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:278
+#: rc.cpp:284
 #, no-c-format
 msgid "Sender identit&y:"
 msgstr "Sendantula &identeco"
 
 #. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:281
+#: rc.cpp:287
 #, no-c-format
 msgid "&Storage format:"
 msgstr "Kon&servoformo:"
 
 #. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:284
+#: rc.cpp:290
 #, no-c-format
 msgid "&List displays:"
 msgstr "&Listo vidigas:"
 
 #. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:293
+#: rc.cpp:299
 #, no-c-format
 msgid "Validate certificates using CRLs"
 msgstr "Validigi atestilojn per ANVLoj"
 
 #. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:296
+#: rc.cpp:302
 #, no-c-format
 msgid ""
 "If this option is selected, S/MIME certificates are validated using Certificate "
@@ -10984,13 +12011,13 @@ msgstr ""
 "Se la opcio estas elektita, S/MIME-atestiloj estas validigataj per ANVLoj."
 
 #. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:299
+#: rc.cpp:305
 #, no-c-format
 msgid "Validate certificates online (OCSP)"
 msgstr "Kontroli rete atestilojn"
 
 #. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:302
+#: rc.cpp:308
 #, no-c-format
 msgid ""
 "If this option is selected, S/MIME certificates are validated online using the "
@@ -11001,19 +12028,19 @@ msgstr ""
 "Atestila StatProtokolo (RASP). Enigu malsupre la URLon de la RASPa respondilo."
 
 #. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:305
+#: rc.cpp:311
 #, no-c-format
 msgid "Online Certificate Validation"
 msgstr "Reta atestilkontrolo"
 
 #. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:308
+#: rc.cpp:314
 #, no-c-format
 msgid "OCSP responder URL:"
 msgstr "RASPa respondila URLo:"
 
 #. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:311
+#: rc.cpp:317
 #, no-c-format
 msgid ""
 "Enter here the address of the server for online validation of certificates "
@@ -11023,25 +12050,25 @@ msgstr ""
 "URLo normale komencas kun http://."
 
 #. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:314
+#: rc.cpp:320
 #, no-c-format
 msgid "OCSP responder signature:"
 msgstr "RASPa resondilsubskribo:"
 
 #. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:317
+#: rc.cpp:323
 #, fuzzy, no-c-format
 msgid "Ignore service URL of certificates"
 msgstr "Por radikaj atestiloj:"
 
 #. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:320
+#: rc.cpp:326
 #, no-c-format
 msgid "Do not check certificate policies"
 msgstr "Ne kontroli atestilajn direktivojn"
 
 #. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:323
+#: rc.cpp:329
 #, no-c-format
 msgid ""
 "By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
@@ -11052,13 +12079,13 @@ msgstr ""
 "kontrolataj-"
 
 #. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:326
+#: rc.cpp:332
 #, no-c-format
 msgid "Never consult a CRL"
 msgstr "Neniam konsideri ANVLon"
 
 #. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:329
+#: rc.cpp:335
 #, no-c-format
 msgid ""
 "If this option is checked, Certificate Revocation Lists are never used to "
@@ -11068,13 +12095,13 @@ msgstr ""
 "kontroli S/MIME-atestilojn."
 
 #. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:332
+#: rc.cpp:338
 #, no-c-format
 msgid "Fetch missing issuer certificates"
 msgstr "Preni mankajn donatulajn atestilojn"
 
 #. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:335
+#: rc.cpp:341
 #, no-c-format
 msgid ""
 "If this option is checked, missing issuer certificates are fetched when "
@@ -11084,37 +12111,37 @@ msgstr ""
 "necesas (Tio funkcias kun ambaŭ kontrolmanieroj, ANVLo kaj RASPo.)"
 
 #. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:338
+#: rc.cpp:344
 #, no-c-format
 msgid "HTTP Requests"
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:341
+#: rc.cpp:347
 #, no-c-format
 msgid "Do not perform any HTTP requests"
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:344
+#: rc.cpp:350
 #, no-c-format
 msgid "Entirely disables the use of HTTP for S/MIME."
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:350
+#: rc.cpp:356
 #, no-c-format
 msgid "Use this proxy for HTTP requests: "
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:353
+#: rc.cpp:359
 #, no-c-format
 msgid "Use system HTTP proxy:"
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:356
+#: rc.cpp:362
 #, no-c-format
 msgid ""
 "If this option is selected, the value of the HTTP proxy shown on the right "
@@ -11123,7 +12150,7 @@ msgid ""
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:359
+#: rc.cpp:365
 #, no-c-format
 msgid ""
 "Enter here the location of your HTTP Proxy, which will be used for all HTTP "
@@ -11132,13 +12159,13 @@ msgid ""
 msgstr ""
 
 #. 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 "Por radikaj atestiloj:"
 
 #. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:365
+#: rc.cpp:371
 #, no-c-format
 msgid ""
 "When looking for the location of a CRL, the to-be-tested certificate usually "
@@ -11149,31 +12176,31 @@ msgid ""
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:368
+#: rc.cpp:374
 #, no-c-format
 msgid "LDAP Requests"
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:371
+#: rc.cpp:377
 #, no-c-format
 msgid "Do not perform any LDAP requests"
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:374
+#: rc.cpp:380
 #, no-c-format
 msgid "Entirely disables the use of LDAP for S/MIME."
 msgstr ""
 
 #. 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 "Por radikaj atestiloj:"
 
 #. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:380
+#: rc.cpp:386
 #, no-c-format
 msgid ""
 "When looking for the location of a CRL, the to-be-tested certificate usually "
@@ -11184,13 +12211,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:383
+#: rc.cpp:389
 #, no-c-format
 msgid "Primary host for LDAP requests:"
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:386
+#: rc.cpp:392
 #, no-c-format
 msgid ""
 "Entering a LDAP server here will make all LDAP requests go to that server "
@@ -11203,86 +12230,86 @@ msgid ""
 msgstr ""
 
 #. 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 "&Aldoni..."
 
 #. 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 "&Grupa programaro"
 
 #. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:408
+#: rc.cpp:414
 #, fuzzy, no-c-format
 msgid "Snippet Settings"
 msgstr "Remeti tipar-agordon"
 
 #. 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 "
@@ -11290,49 +12317,49 @@ msgid ""
 msgstr ""
 
 #. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:438
+#: rc.cpp:444
 #, fuzzy, no-c-format
 msgid "Delimiter:"
 msgstr "nelima"
 
 #. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:441
+#: rc.cpp:447
 #, no-c-format
 msgid "TemplatesConfiguration"
 msgstr "ŜablonAgordo"
 
 #. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:447
+#: rc.cpp:453
 #, no-c-format
 msgid "Reply to Sender"
 msgstr "Respondi al sendinto"
 
 #. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:450
+#: rc.cpp:456
 #, no-c-format
 msgid "Reply to All / Reply to List"
 msgstr "Respondi al ĉiuj / respondi al listo"
 
 #. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:453
+#: rc.cpp:459
 #, no-c-format
 msgid "Forward Message"
 msgstr "Plusendi mesaĝon"
 
 #. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:462
+#: rc.cpp:468
 #, no-c-format
 msgid "Warn when trying to send &unsigned messages"
 msgstr "Avert&i pro sendoprovo de neĉifritaj mesaĝoj"
 
 #. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:465
+#: rc.cpp:471
 #, no-c-format
 msgid "Check to be warned when sending unsigned messages."
 msgstr "Marko pro averto pri sendo de neĉifritaj mesaĝoj."
 
 #. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:468
+#: rc.cpp:474
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -11352,19 +12379,19 @@ msgstr ""
 "</qt>"
 
 #. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:476
+#: rc.cpp:482
 #, no-c-format
 msgid "&Warn when trying to send unencrypted messages"
 msgstr "&Averti kiam sendi ne-ĉifritajn mesaĝojn"
 
 #. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:479
+#: rc.cpp:485
 #, no-c-format
 msgid "Check to be warned when sending unencrypted messages."
 msgstr "Marku pro averto pri sendo de neĉifraj mesaĝoj."
 
 #. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:482
+#: rc.cpp:488
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -11384,19 +12411,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 "Averti, kiam la adresatula retadreso ne estas en la atestilo"
 
 #. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:493
+#: rc.cpp:499
 #, no-c-format
 msgid "Check to be warned if the address is not in the certificate"
 msgstr "Marku pro averto, se la adreso ne estas en la atestilo"
 
 #. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:496
+#: rc.cpp:502
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -11416,7 +12443,7 @@ msgstr ""
 "</qt>"
 
 #. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:504
+#: rc.cpp:510
 #, no-c-format
 msgid "Warn if certificates/keys expire soon (configure thresholds below)"
 msgstr ""
@@ -11424,32 +12451,32 @@ msgstr ""
 "limon)"
 
 #. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:507
+#: rc.cpp:513
 #, no-c-format
 msgid "For signing"
 msgstr "Por subskribi"
 
 #. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:510
+#: rc.cpp:516
 #, no-c-format
 msgid "For encryption"
 msgstr "Por ĉifri"
 
 #. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:513 rc.cpp:527 rc.cpp:541 rc.cpp:555 rc.cpp:569 rc.cpp:583
+#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
 #: rulewidgethandlermanager.cpp:1437
 #, no-c-format
 msgid " days"
 msgstr " tago(j)"
 
 #. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:516 rc.cpp:530 rc.cpp:544 rc.cpp:558 rc.cpp:572 rc.cpp:586
+#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
 #, no-c-format
 msgid "Select the number of days here"
 msgstr "Elektu ĉi tie la tagnombron"
 
 #. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:519
+#: rc.cpp:525
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -11469,7 +12496,7 @@ msgstr ""
 "</qt>"
 
 #. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:533
+#: rc.cpp:539
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -11489,7 +12516,7 @@ msgstr ""
 "</qt>"
 
 #. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:547
+#: rc.cpp:553
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -11509,7 +12536,7 @@ msgstr ""
 "</qt>"
 
 #. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:561
+#: rc.cpp:567
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -11529,7 +12556,7 @@ msgstr ""
 "</qt>"
 
 #. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:575 rc.cpp:589
+#: rc.cpp:581 rc.cpp:595
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -11549,55 +12576,55 @@ msgstr ""
 "</qt>"
 
 #. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:597
+#: rc.cpp:603
 #, no-c-format
 msgid "For root certificates:"
 msgstr "Por radikaj atestiloj:"
 
 #. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:600
+#: rc.cpp:606
 #, no-c-format
 msgid "For intermediate CA certificates:"
 msgstr "Por interaj atestilaj atestiloj:"
 
 #. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:603
+#: rc.cpp:609
 #, no-c-format
 msgid "For end-user certificates/keys:"
 msgstr "Por uzantulaj atestiloj aŭ ŝlosiloj:"
 
 #. 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 "Reebligi ĉiujn \"Ne demandu refoje\" avertojn"
 
 #. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:609
+#: rc.cpp:615
 #, no-c-format
 msgid "Template content"
 msgstr "Ŝablonenhavo"
 
 #. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:612
+#: rc.cpp:618
 #, no-c-format
 msgid "Template shortcut"
 msgstr "Ŝablon-fulmoklavo"
 
 #. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:615
+#: rc.cpp:621
 #, no-c-format
 msgid "Template type"
 msgstr "Ŝablontipo"
 
-#. i18n: file kmail.kcfg line 59
-#: rc.cpp:618
+#. i18n: file kmail.kcfg line 61
+#: rc.cpp:624
 #, no-c-format
 msgid "Send queued mail on mail check"
 msgstr "Sendi atendantajn leterojn al la leterkontrolo"
 
-#. i18n: file kmail.kcfg line 60
-#: rc.cpp:621
+#. i18n: file kmail.kcfg line 62
+#: rc.cpp:627
 #, no-c-format
 msgid ""
 "<qt>"
@@ -11610,16 +12637,16 @@ msgstr ""
 "ĉiujn leterkontrolojn, aŭ ĉu vi ne volas, ke la mesaĝoj aŭtomate estas "
 "sendataj. </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
 #, no-c-format
 msgid ""
 "If there are new messages in a folder, which have not been uploaded to the "
@@ -11628,14 +12655,14 @@ msgid ""
 "folder."
 msgstr ""
 
-#. 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 "
@@ -11644,42 +12671,42 @@ msgid ""
 "set here."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 91
-#: rc.cpp:637
+#. i18n: file kmail.kcfg line 93
+#: rc.cpp:643
 #, no-c-format
 msgid "The most recently selected folder in the folder selection dialog."
 msgstr "La laste elektita dosierujo en la dosieruja elektdialogo."
 
-#. 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
 #, no-c-format
 msgid "Policy for showing the system tray icon"
 msgstr "Direktivo por vidigi la sistemlistelan piktogramon"
 
-#. 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
 #, no-c-format
 msgid "Verbose new mail notification"
 msgstr "Babilemigi la novpoŝtan noton"
 
-#. i18n: file kmail.kcfg line 120
-#: rc.cpp:655
+#. i18n: file kmail.kcfg line 122
+#: rc.cpp:661
 #, no-c-format
 msgid ""
 "If this option is enabled then for each folder the number of newly arrived "
@@ -11690,40 +12717,40 @@ msgstr ""
 "estas montrata per la novpoŝta noto. Alikaze vi nur ricevos simplan \"Nova "
 "poŝto\" mesaĝon."
 
-#. i18n: file kmail.kcfg line 124
-#: rc.cpp:658
+#. i18n: file kmail.kcfg line 126
+#: rc.cpp:664
 #, no-c-format
 msgid "Specify e&ditor:"
 msgstr "&Donu redaktilon:"
 
-#. i18n: file kmail.kcfg line 128
-#: rc.cpp:661
+#. i18n: file kmail.kcfg line 130
+#: rc.cpp:667
 #, no-c-format
 msgid "Use e&xternal editor instead of composer"
 msgstr "&Uzi alian redaktilon"
 
-#. 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
 #, no-c-format
 msgid "Enable groupware functionality"
 msgstr "Ebligi grupprogramajn funkciojn"
 
-#. i18n: file kmail.kcfg line 170
-#: rc.cpp:670
+#. i18n: file kmail.kcfg line 172
+#: rc.cpp:676
 #, no-c-format
 msgid "Mangle From:/To: headers in replies to replies"
 msgstr "Sanĝi De/Al-kaplinioj je respondoj de invitoj"
 
-#. i18n: file kmail.kcfg line 171
-#: rc.cpp:673
+#. i18n: file kmail.kcfg line 173
+#: rc.cpp:679
 #, no-c-format
 msgid ""
 "Microsoft Outlook has a number of shortcomings in its implementation of the "
@@ -11734,14 +12761,14 @@ msgstr ""
 "la opcio provizore laboras pri unu de ili. Se vi havas problemojn kun uzantoj "
 "de MS-Outlook, provu uzi la opcion."
 
-#. i18n: file kmail.kcfg line 176
-#: rc.cpp:676
+#. i18n: file kmail.kcfg line 178
+#: rc.cpp:682
 #, no-c-format
 msgid "Send groupware invitations in the mail body"
 msgstr "Sendi grupprogramarajn invitojn en la leterteksto"
 
-#. i18n: file kmail.kcfg line 177
-#: rc.cpp:679
+#. i18n: file kmail.kcfg line 179
+#: rc.cpp:685
 #, no-c-format
 msgid ""
 "Microsoft Outlook has a number of shortcomings  in its implementation of the "
@@ -11753,14 +12780,32 @@ msgstr ""
 "la opcio provizore laboras pri unu de ili. Se vi havas problemojn kun uzantoj "
 "de MS-Outlook, provu uzi la opcion."
 
-#. 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 "Aŭtomata invitosendo"
 
-#. 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 "
@@ -11776,22 +12821,38 @@ msgstr ""
 "\"\n"
 "          \"iKaldendran sintakson kaj vi ne ŝanĝu ĝin mane."
 
-#. 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
 #, no-c-format
 msgid ""
 "<p>Enabling this makes it possible to store the entries from the Kontact "
@@ -11803,8 +12864,8 @@ msgstr ""
 "<p>Se vi volas marki la opcion, vi ankaŭ devas agordi la aplikaĵon por uzi la "
 "IMAPajn risurcojn. Tio estas farata per la TDEa Stircentro.</p>"
 
-#. i18n: file kmail.kcfg line 220
-#: rc.cpp:703
+#. i18n: file kmail.kcfg line 238
+#: rc.cpp:721
 #, no-c-format
 msgid ""
 "<p>Usually you will not have any reason to see the folders that hold the IMAP "
@@ -11813,8 +12874,8 @@ msgstr ""
 "<p>Normale vi havas nenian kaŭzon vidi la ujojn, kiuj havas la IMAPajn "
 "risurcojn. Sed se vi necesas ĝin, vi povas agordi ĝin ĉi tie.</p> "
 
-#. i18n: file kmail.kcfg line 229
-#: rc.cpp:706
+#. i18n: file kmail.kcfg line 247
+#: rc.cpp:724
 #, no-c-format
 msgid ""
 "<p>If the account used for storing groupware information \"\n"
@@ -11825,8 +12886,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
 #, no-c-format
 msgid ""
 "<p>Choose the storage format of the groupware folders. "
@@ -11846,8 +12907,8 @@ msgstr ""
 "en MS-Outlook. La formo pli bone kongruas la MS-Outlook, kiam vi uzas Kolaban "
 "servilon aŭ kongruan.</li></ul></p>"
 
-#. i18n: file kmail.kcfg line 242
-#: rc.cpp:715
+#. i18n: file kmail.kcfg line 260
+#: rc.cpp:733
 #, no-c-format
 msgid ""
 "<p>This chooses the parent of the IMAP resource folders.</p>"
@@ -11856,15 +12917,15 @@ msgstr ""
 "<p>Tio elektas la superujon de la IMAPaj risurcujoj.</p> "
 "<p>Norme la Kolaba servilo agordas la IMAPan ricevataĵujon por tio.</p>"
 
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:718
+#. i18n: file kmail.kcfg line 265
+#: rc.cpp:736
 #, no-c-format
 msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
 msgstr ""
 "<p>Tio estas la identigilo de la konto, kiu havas la IMAPajn risurcujojn.</p>"
 
-#. i18n: file kmail.kcfg line 252
-#: rc.cpp:721
+#. i18n: file kmail.kcfg line 270
+#: rc.cpp:739
 #, no-c-format
 msgid ""
 "<p>If you want to set the folder names of the IMAP storage to your local "
@@ -11880,27 +12941,21 @@ msgstr ""
 "malbona ideo, ĉar tio melebligas lingvan ŝanĝon.</p> "
 "<p>Sekve nur ŝanĝu la nomojn, se vi devas.</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
 #, no-c-format
 msgid ""
 "This value is used to decide whether the KMail Introduction should be "
@@ -11908,14 +12963,14 @@ msgid ""
 msgstr ""
 "La valoro estas uzata por decidi, ĉu la Poŝtila enkonduko estos vidigita."
 
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:736
+#. i18n: file kmail.kcfg line 299
+#: rc.cpp:751
 #, no-c-format
 msgid "Maximal number of connections per host"
 msgstr "Miaksimua nombro de konektoj po servilo"
 
-#. i18n: file kmail.kcfg line 284
-#: rc.cpp:739
+#. i18n: file kmail.kcfg line 300
+#: rc.cpp:754
 #, no-c-format
 msgid ""
 "This can be used to restrict the number of connections per host while checking "
@@ -11924,62 +12979,56 @@ msgstr ""
 "Oni povas uzi tion por limigi la konektan nombron po servilo dum rigardo je "
 "nova retpoŝto. Norme la limo ne ekzistas (0)."
 
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:742
+#. i18n: file kmail.kcfg line 308
+#: rc.cpp:757
 #, no-c-format
 msgid "Show quick search line edit"
 msgstr "Montri rapidserĉan liniredaktilon"
 
-#. 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 "
 "which can be used to quickly search the information shown in the message list."
 msgstr ""
-"La opcio ebligas aŭ neebligas la serĉan liniredaktilon super la mesaĝlisto, tdeio "
-"estas uzeblas por rapide serĉi la informojn montrataj en la lesaĝlisto."
-
-#. i18n: file kmail.kcfg line 297
-#: rc.cpp:748
-#, fuzzy, no-c-format
-msgid "Show folder quick search line edit"
-msgstr "Montri rapidserĉan liniredaktilon"
+"La opcio ebligas aŭ neebligas la serĉan liniredaktilon super la mesaĝlisto, "
+"tdeio estas uzeblas por rapide serĉi la informojn montrataj en la lesaĝlisto."
 
-#. 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 "&Lasi la originan signaron ĉe respondoj kaj plusendoj (se eblas)"
 
-#. 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 "&Aŭtomate aldoni subskribon"
 
-#. 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 "
@@ -11987,8 +13036,8 @@ msgid ""
 "        "
 msgstr "Teni la identecon, por ke ĝi estos uzata en redaktilaj fenestroj."
 
-#. i18n: file kmail.kcfg line 329
-#: rc.cpp:770
+#. i18n: file kmail.kcfg line 341
+#: rc.cpp:782
 #, no-c-format
 msgid ""
 "Remember this folder for sent items, so that it will be used in future composer "
@@ -11997,8 +13046,8 @@ msgstr ""
 "Tenu la mesaĝujon por sendi mesaĝojn, por ke ĝi estos uzata en redaktilaj "
 "fenestroj."
 
-#. i18n: file kmail.kcfg line 333
-#: rc.cpp:773
+#. i18n: file kmail.kcfg line 345
+#: rc.cpp:785
 #, no-c-format
 msgid ""
 "Remember this mail transport, so that it will be used in future composer "
@@ -12006,14 +13055,37 @@ msgid ""
 msgstr ""
 "Tenu la poŝtottransporton, por ke ĝi estos uzata en redaktilaj fenestroj."
 
-#. 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 "Teni la identecon, por ke ĝi estos uzata en redaktilaj fenestroj."
+
+#. i18n: file kmail.kcfg line 354
+#: rc.cpp:792
 #, no-c-format
 msgid "Word &wrap at column:"
 msgstr "&Linirompo ĉe kolumno:"
 
-#. 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 "Averti, se la radika atestilo nevalidiĝos post  pli malmulte ol"
+
+#. 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 "
@@ -12022,14 +13094,14 @@ msgstr ""
 "Marku tiun opcion por certigi, ke MS-Outlook povas kompreni kunsendaĵnomoj kun "
 "neanglaj literoj"
 
-#. i18n: file kmail.kcfg line 386
-#: rc.cpp:791
+#. i18n: file kmail.kcfg line 416
+#: rc.cpp:816
 #, no-c-format
 msgid "Automatically request &message disposition notifications"
 msgstr "Aŭto&mate postuli ricevkonfirmojn"
 
-#. i18n: file kmail.kcfg line 387
-#: rc.cpp:794
+#. i18n: file kmail.kcfg line 417
+#: rc.cpp:819
 #, fuzzy, no-c-format
 msgid ""
 "<qt>"
@@ -12046,28 +13118,28 @@ msgstr ""
 "neebligi la postulemon por ĉiu sola mesaĝo en la redaktilo, menuero <em>"
 "Opcioj</em>-&gt;<em>Postulu ricevkonfirmojn</em>.</p></qt>"
 
-#. i18n: file kmail.kcfg line 391
-#: rc.cpp:797
+#. i18n: file kmail.kcfg line 421
+#: rc.cpp:822
 #, no-c-format
 msgid "Use recent addresses for autocompletion"
 msgstr "Uzi lastatempajn adresojn por aŭtokompletigo"
 
-#. i18n: file kmail.kcfg line 392
-#: rc.cpp:800
+#. i18n: file kmail.kcfg line 422
+#: rc.cpp:825
 #, no-c-format
 msgid ""
 "Disable this option if you do not want recently used addresses to appear in the "
 "autocompletion list in the composer's address fields."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 413
-#: rc.cpp:803
+#. i18n: file kmail.kcfg line 443
+#: rc.cpp:828
 #, no-c-format
 msgid "Autosave interval:"
 msgstr "Aŭtomate konservi ĉiun:"
 
-#. i18n: file kmail.kcfg line 414
-#: rc.cpp:806
+#. i18n: file kmail.kcfg line 444
+#: rc.cpp:831
 #, no-c-format
 msgid ""
 "A backup copy of the text in the composer window can be created regularly. The "
@@ -12077,93 +13149,111 @@ msgstr ""
 "Kopio de la teksto, kiu estas en la skribifenestro, regule estas kredebla. La "
 "uzata intervalo estas agordebla ĉi tie. Vi povas neebligi ĝin per nulo."
 
-#. 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
 #, no-c-format
 msgid "Replace recognized prefi&x with \"Re:\""
 msgstr "Anstataŭigi &rekonitan prefikson per \"Re:\""
 
-#. i18n: file kmail.kcfg line 432
-#: rc.cpp:815
+#. i18n: file kmail.kcfg line 462
+#: rc.cpp:840
 #, no-c-format
 msgid "Replace recognized prefix with \"&Fwd:\""
 msgstr "&Anstataŭigi rekonitan prefikson per \"Fwd:\""
 
-#. i18n: file kmail.kcfg line 436
-#: rc.cpp:818
+#. i18n: file kmail.kcfg line 466
+#: rc.cpp:843
 #, no-c-format
 msgid "Use smart &quoting"
 msgstr "&Uzi inteligentan citadon"
 
-#. 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 "La subskribo malvalidiĝis."
+
+#. 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 "Filtroago"
 
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:824
+#. i18n: file kmail.kcfg line 481
+#: rc.cpp:855
 #, no-c-format
 msgid ""
 "Sets the type of the dialog for selecting recipients for To,\n"
 "        CC and BCC."
 msgstr ""
 
-#. 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 "Filtroago"
 
-#. i18n: file kmail.kcfg line 453
-#: rc.cpp:831
+#. i18n: file kmail.kcfg line 491
+#: rc.cpp:862
 #, no-c-format
 msgid ""
 "Sets the type of the recipients editor for editing To,\n"
 "        CC and BCC."
 msgstr ""
 
-#. 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 "Filtroago"
 
-#. 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 "&Lasi la originan signaron ĉe respondoj kaj plusendoj (se eblas)"
+
+#. i18n: file kmail.kcfg line 572
+#: rc.cpp:884
 #, no-c-format
 msgid ""
 "Some emails, especially those generated automatically, do not specify the "
@@ -12173,88 +13263,102 @@ msgid ""
 "As a default the encoding configured for the whole system is used."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 536
-#: rc.cpp:853
+#. i18n: file kmail.kcfg line 578
+#: rc.cpp:887
 #, no-c-format
 msgid ""
 "Changing this from its default 'Auto' will force the use of the specified "
 "encoding for all emails, regardless of what they specify themselves."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 542
-#: rc.cpp:859
+#. i18n: file kmail.kcfg line 584
+#: rc.cpp:893
 #, no-c-format
 msgid ""
 "Enable this if you want smileys like :-) appearing in the message text to be "
 "replaced by emoticons (small pictures)."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 547
-#: rc.cpp:865
+#. i18n: file kmail.kcfg line 589
+#: rc.cpp:899
 #, no-c-format
 msgid ""
 "Enable this option to show different levels of quoted text. Disable to hide the "
 "levels of quoted text."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 550
-#: rc.cpp:868
+#. i18n: file kmail.kcfg line 592
+#: rc.cpp:902
 #, no-c-format
 msgid "Automatic collapse level:"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 558
-#: rc.cpp:871
+#. i18n: file kmail.kcfg line 600
+#: rc.cpp:905
 #, no-c-format
 msgid "Reduce font size for quoted text"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 559
-#: rc.cpp:874
+#. i18n: file kmail.kcfg line 601
+#: rc.cpp:908
 #, no-c-format
 msgid "Enable this option to show quoted text with a smaller font."
 msgstr ""
 
-#. 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 "Konservi senditajn mesaĝojn ĉ&ifrite"
+
+#. 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 "Montras ĉiujn kapliniojn"
 
-#. 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 "Ricevkonfirmoj"
 
-#. 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 "
@@ -12262,90 +13366,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 "Mesaĝolisto - Dato"
 
-#. 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 "Mesaĝoŝablono por plusendado"
 
-#. i18n: file kmail.kcfg line 631
-#: rc.cpp:916
+#. i18n: file kmail.kcfg line 679
+#: rc.cpp:956
 #, no-c-format
 msgid "Quote characters"
 msgstr "Citsignoj"
 
-#. 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 "Al"
-
-#: recipientseditor.cpp:102
-msgid "CC"
-msgstr ""
-
 #: recipientseditor.cpp:104
 msgid "BCC"
 msgstr ""
@@ -12358,43 +13454,43 @@ msgstr "<Nedifinita RicevantoTipo>"
 msgid "Select type of recipient"
 msgstr "Elekti tipon de ricevanto"
 
-#: recipientseditor.cpp:181
+#: recipientseditor.cpp:163
+msgid "Set the list of email addresses to receive this message"
+msgstr ""
+
+#: recipientseditor.cpp:183
 msgid "Remove recipient line"
 msgstr "Forigi ricevantolinion"
 
-#: recipientseditor.cpp:737
+#: recipientseditor.cpp:739
 msgid "<b>To:</b><br/>"
 msgstr ""
 
-#: recipientseditor.cpp:738
+#: recipientseditor.cpp:740
 msgid "<b>CC:</b><br/>"
 msgstr ""
 
-#: recipientseditor.cpp:739
+#: recipientseditor.cpp:741
 msgid "<b>BCC:</b><br/>"
 msgstr ""
 
-#: recipientseditor.cpp:766
+#: recipientseditor.cpp:768
 msgid "Save List..."
 msgstr "Konservi liston..."
 
-#: recipientseditor.cpp:772
+#: recipientseditor.cpp:774
 msgid "Save recipients as distribution list"
 msgstr "Konservi ricevantojn kiel dissendolisto"
 
-#: recipientseditor.cpp:774
-msgid "Se&lect..."
-msgstr "E&lekti..."
-
-#: recipientseditor.cpp:777
+#: recipientseditor.cpp:779
 msgid "Select recipients from address book"
 msgstr "Elekti ricevantojn el adreslibro"
 
-#: recipientseditor.cpp:810
+#: recipientseditor.cpp:812
 msgid "No recipients"
 msgstr "Neniuj ricevantoj"
 
-#: recipientseditor.cpp:811
+#: recipientseditor.cpp:813
 #, c-format
 msgid ""
 "_n: 1 recipient\n"
@@ -12403,7 +13499,7 @@ msgstr ""
 "1 ricevanto\n"
 "%n ricevantoj"
 
-#: recipientseditor.cpp:914
+#: recipientseditor.cpp:917
 msgid "Truncating recipients list to %1 of %2 entries."
 msgstr ""
 
@@ -12495,11 +13591,11 @@ msgstr ""
 "La butono malfermas apartan dialogon, kie vi povas elekti adresatojn el ĉiuj "
 "uzeblaj adresoj."
 
-#: redirectdialog.cpp:107
+#: redirectdialog.cpp:116
 msgid "You cannot redirect the message without an address."
 msgstr "Vi ne povas alidirekti la mesaĝon sen adreso."
 
-#: redirectdialog.cpp:108
+#: redirectdialog.cpp:117
 msgid "Empty Redirection Address"
 msgstr "Malplenigi la alidirektan adreson"
 
@@ -12633,37 +13729,37 @@ msgstr "Serĉi &nur en:"
 msgid "I&nclude sub-folders"
 msgstr "I&nkluzivigi sub-leterujojn"
 
-#: searchwindow.cpp:226
+#: searchwindow.cpp:225
 msgid "Sender/Receiver"
 msgstr "Sendinto/Ricevonto"
 
-#: searchwindow.cpp:249
+#: searchwindow.cpp:250
 msgid "Search folder &name:"
 msgstr "Serĉi leterujnomon:"
 
-#: searchwindow.cpp:259
+#: searchwindow.cpp:260
 #, fuzzy
 msgid "Op&en Search Folder"
 msgstr "Forviŝi serĉon"
 
-#: searchwindow.cpp:268
+#: searchwindow.cpp:269
 #, fuzzy
 msgid "Open &Message"
 msgstr "Malfermi mesaĝon"
 
-#: searchwindow.cpp:274
+#: searchwindow.cpp:275
 msgid "AMiddleLengthText..."
 msgstr "Mezlonga teksto..."
 
-#: searchwindow.cpp:275
+#: searchwindow.cpp:276
 msgid "Ready."
 msgstr "Preta."
 
-#: searchwindow.cpp:356
+#: searchwindow.cpp:357
 msgid "Clear Selection"
 msgstr "Forigi la elekton"
 
-#: searchwindow.cpp:415
+#: searchwindow.cpp:416
 #, c-format
 msgid ""
 "_n: %n message searched\n"
@@ -12672,11 +13768,11 @@ msgstr ""
 "%n mesaĝo priserĉita\n"
 "%n mesaĝoj priserĉitaj"
 
-#: searchwindow.cpp:418
+#: searchwindow.cpp:419
 msgid "Done."
 msgstr "Farita."
 
-#: searchwindow.cpp:419
+#: searchwindow.cpp:420
 msgid ""
 "_n: %n match in %1\n"
 "%n matches in %1"
@@ -12684,11 +13780,11 @@ msgstr ""
 "%n trovo en %1\n"
 "%n trovoj en %1"
 
-#: searchwindow.cpp:422
+#: searchwindow.cpp:423
 msgid "Search canceled."
 msgstr "Serĉo haltigita."
 
-#: searchwindow.cpp:423
+#: searchwindow.cpp:424
 msgid ""
 "_n: %n match so far in %1\n"
 "%n matches so far in %1"
@@ -12696,7 +13792,7 @@ msgstr ""
 "%n trovo ĝis nun en %1\n"
 "%n trovoj ĝis nun en %1"
 
-#: searchwindow.cpp:427
+#: searchwindow.cpp:428
 #, c-format
 msgid ""
 "_n: %n message\n"
@@ -12705,7 +13801,7 @@ msgstr ""
 "%n mesaĝo\n"
 "%n mesaĝoj"
 
-#: searchwindow.cpp:428
+#: searchwindow.cpp:429
 #, c-format
 msgid ""
 "_n: %n match\n"
@@ -12714,7 +13810,7 @@ msgstr ""
 "%n trovo\n"
 "%n trovoj"
 
-#: searchwindow.cpp:429
+#: searchwindow.cpp:430
 msgid "Searching in %1. %2 searched so far"
 msgstr "Serĉante en %1. %2 priserĉataj ĝis nun"
 
@@ -12744,17 +13840,17 @@ msgid ""
 "\n"
 msgstr ""
 
-#: sievedebugdialog.cpp:230
+#: sievedebugdialog.cpp:256
 msgid ""
 "Collecting data for account '%1'...\n"
 msgstr ""
 
-#: sievedebugdialog.cpp:231
+#: sievedebugdialog.cpp:257
 msgid ""
 "------------------------------------------------------------\n"
 msgstr ""
 
-#: sievedebugdialog.cpp:239
+#: sievedebugdialog.cpp:265
 msgid ""
 "(Account does not support Sieve)\n"
 "\n"
@@ -12762,25 +13858,25 @@ msgstr ""
 "(Konto ne subtenas Sieve-on)\n"
 "\n"
 
-#: sievedebugdialog.cpp:266
+#: sievedebugdialog.cpp:278
 #, fuzzy
 msgid ""
 "(Account is not an IMAP account)\n"
 "\n"
 msgstr "Kontotipo: IMAP-konto"
 
-#: sievedebugdialog.cpp:286
+#: sievedebugdialog.cpp:298
 msgid ""
 "Contents of script '%1':\n"
 msgstr ""
 
-#: sievedebugdialog.cpp:321
+#: sievedebugdialog.cpp:320
 msgid ""
 "(This script is empty.)\n"
 "\n"
 msgstr ""
 
-#: sievedebugdialog.cpp:326
+#: sievedebugdialog.cpp:325
 msgid ""
 "------------------------------------------------------------\n"
 "%1\n"
@@ -12788,35 +13884,35 @@ msgid ""
 "\n"
 msgstr ""
 
-#: sievedebugdialog.cpp:342
+#: sievedebugdialog.cpp:341
 msgid ""
 "Sieve capabilities:\n"
 msgstr ""
 
-#: sievedebugdialog.cpp:346
+#: sievedebugdialog.cpp:345
 #, fuzzy
 msgid "(No special capabilities available)"
 msgstr "Ne havebla"
 
-#: sievedebugdialog.cpp:355
+#: sievedebugdialog.cpp:354
 #, fuzzy
 msgid ""
 "Available Sieve scripts:\n"
 msgstr "Uzeblaj filtriloj"
 
-#: sievedebugdialog.cpp:359
+#: sievedebugdialog.cpp:358
 msgid ""
 "(No Sieve scripts available on this server)\n"
 "\n"
 msgstr ""
 
-#: sievedebugdialog.cpp:367
+#: sievedebugdialog.cpp:366
 msgid ""
 "Active script: %1\n"
 "\n"
 msgstr ""
 
-#: sievedebugdialog.cpp:394 vacation.cpp:714
+#: sievedebugdialog.cpp:393 vacation.cpp:721
 msgid ""
 "Sieve script installed successfully on the server.\n"
 "Out of Office reply is now active."
@@ -12824,7 +13920,7 @@ msgstr ""
 "La Sieva skriptinstalo sukcesis en la servilo.\n"
 "La eksteroficeja respondado nun estas aktiva."
 
-#: sievedebugdialog.cpp:396 vacation.cpp:716
+#: sievedebugdialog.cpp:395 vacation.cpp:723
 msgid ""
 "Sieve script installed successfully on the server.\n"
 "Out of Office reply has been deactivated."
@@ -12915,19 +14011,23 @@ msgstr "Donu &komandon:"
 msgid "New entry:"
 msgstr "Nova ero:"
 
-#: simplestringlisteditor.cpp:205
+#: simplestringlisteditor.cpp:214
 msgid "New Value"
 msgstr "Nova valoro"
 
-#: simplestringlisteditor.cpp:225
+#: simplestringlisteditor.cpp:235
 msgid "Change Value"
 msgstr "Ŝanĝi la valoron"
 
-#: snippetdlg.cpp:71
+#: snippetdlg.cpp:78
 #, fuzzy
 msgid "Sh&ortcut:"
 msgstr "F&ulmoklavo:"
 
+#: snippetitem.cpp:133 snippetwidget.cpp:171
+msgid "GROUP"
+msgstr ""
+
 #: snippetwidget.cpp:148
 #, c-format
 msgid "Snippet %1"
@@ -13012,8 +14112,8 @@ msgstr "Uzi kiel &apriora"
 
 #: subscriptiondialog.cpp:376
 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 ""
 
 #: subscriptiondialog.cpp:378
@@ -13028,28 +14128,33 @@ msgstr "Ŝalti"
 msgid "Do Not Enable"
 msgstr "Ne ŝalti"
 
-#: templateparser.cpp:238 templateparser.cpp:271
+#: templateparser.cpp:263 templateparser.cpp:296
 msgid "Cannot insert content from file %1: %2"
 msgstr "Ne eblis enmeti la enhavon de dosiero %1: %2"
 
-#: templateparser.cpp:1009 templateparser.cpp:1013
+#: templateparser.cpp:970
+#, fuzzy, c-format
+msgid "Attachment %1"
+msgstr "Kunsendaĵo: %1"
+
+#: templateparser.cpp:1150 templateparser.cpp:1154
 msgid "Pipe command exit with status %1: %2"
 msgstr "La duktokomando finiĝis kun la kodo %1: %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
 msgid "Pipe command did not finish within %1 seconds: %2"
 msgstr "La duktokomando ne finiĝis dum %1 sekundoj: %2"
 
-#: templateparser.cpp:1052 templateparser.cpp:1055
+#: templateparser.cpp:1193 templateparser.cpp:1196
 #, c-format
 msgid "Cannot write to process stdin: %1"
 msgstr "Ne eblis skribi al \"stdin\" de procezo: %1"
 
-#: templateparser.cpp:1063
+#: templateparser.cpp:1204
 #, c-format
 msgid "Cannot start pipe command from template: %1"
 msgstr ""
@@ -13103,9 +14208,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"
@@ -13114,35 +14219,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"
@@ -13168,155 +14277,160 @@ msgstr "Citita mesaĝo"
 msgid "Message Text as Is"
 msgstr "Mesaĝteksto kiel estas"
 
-#: templatesinsertcommand.cpp:62 templatesinsertcommand.cpp:163
+#: templatesinsertcommand.cpp:62 templatesinsertcommand.cpp:166
 msgid "Message Id"
 msgstr ""
 
-#: 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 "Tago de la semajno"
 
-#: templatesinsertcommand.cpp:82 templatesinsertcommand.cpp:183
+#: templatesinsertcommand.cpp:82 templatesinsertcommand.cpp:186
 msgid "Time"
 msgstr "Tempo"
 
-#: 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
 msgid "To Field Address"
 msgstr "Adreso en \"Al\""
 
-#: templatesinsertcommand.cpp:98 templatesinsertcommand.cpp:199
+#: templatesinsertcommand.cpp:98 templatesinsertcommand.cpp:202
 msgid "To Field Name"
 msgstr "Nomo en \"Al\""
 
-#: templatesinsertcommand.cpp:102 templatesinsertcommand.cpp:203
+#: templatesinsertcommand.cpp:102 templatesinsertcommand.cpp:206
 msgid "To Field First Name"
 msgstr "Antaŭnomo en \"Al\""
 
-#: templatesinsertcommand.cpp:106 templatesinsertcommand.cpp:207
+#: templatesinsertcommand.cpp:106 templatesinsertcommand.cpp:210
 msgid "To Field Last Name"
 msgstr "Familinomo en \"Al\""
 
-#: templatesinsertcommand.cpp:110 templatesinsertcommand.cpp:211
+#: templatesinsertcommand.cpp:110 templatesinsertcommand.cpp:214
 msgid "CC Field Address"
 msgstr "Adreso en \"CC\""
 
-#: templatesinsertcommand.cpp:114 templatesinsertcommand.cpp:215
+#: templatesinsertcommand.cpp:114 templatesinsertcommand.cpp:218
 msgid "CC Field Name"
 msgstr "Nomo en \"CC\""
 
-#: templatesinsertcommand.cpp:118 templatesinsertcommand.cpp:219
+#: templatesinsertcommand.cpp:118 templatesinsertcommand.cpp:222
 msgid "CC Field First Name"
 msgstr "Antaŭnomo en \"CC\""
 
-#: templatesinsertcommand.cpp:122 templatesinsertcommand.cpp:223
+#: templatesinsertcommand.cpp:122 templatesinsertcommand.cpp:226
 msgid "CC Field Last Name"
 msgstr "Familinomo en \"CC\""
 
-#: templatesinsertcommand.cpp:126 templatesinsertcommand.cpp:227
+#: templatesinsertcommand.cpp:126 templatesinsertcommand.cpp:230
 msgid "From Field Address"
 msgstr "Adreso en \"De\""
 
-#: templatesinsertcommand.cpp:130 templatesinsertcommand.cpp:231
+#: templatesinsertcommand.cpp:130 templatesinsertcommand.cpp:234
 msgid "From Field Name"
 msgstr "Nomo en \"De\""
 
-#: templatesinsertcommand.cpp:134 templatesinsertcommand.cpp:235
+#: templatesinsertcommand.cpp:134 templatesinsertcommand.cpp:238
 msgid "From Field First Name"
 msgstr "Antaŭnomo en \"De\""
 
-#: templatesinsertcommand.cpp:138 templatesinsertcommand.cpp:239
+#: templatesinsertcommand.cpp:138 templatesinsertcommand.cpp:242
 msgid "From Field Last Name"
 msgstr "Familinomo en \"De\""
 
-#: templatesinsertcommand.cpp:146
+#: templatesinsertcommand.cpp:142
+#, fuzzy
+msgid "Addresses of all original recipients"
+msgstr "Pluaj ricevantoj"
+
+#: templatesinsertcommand.cpp:149
 msgid "Quoted Headers"
 msgstr "Cititaj ĉapoj"
 
-#: templatesinsertcommand.cpp:150
+#: templatesinsertcommand.cpp:153
 msgid "Headers as Is"
 msgstr "Ĉapoj kiel estas"
 
-#: templatesinsertcommand.cpp:154 templatesinsertcommand.cpp:247
+#: templatesinsertcommand.cpp:157 templatesinsertcommand.cpp:250
 msgid "Header Content"
 msgstr "Ĉapenhavo"
 
-#: templatesinsertcommand.cpp:160
+#: templatesinsertcommand.cpp:163
 msgid "Current Message"
 msgstr "Aktuala mesaĝo"
 
-#: templatesinsertcommand.cpp:253
+#: templatesinsertcommand.cpp:256
 msgid "Process With External Programs"
 msgstr ""
 
-#: templatesinsertcommand.cpp:256
+#: templatesinsertcommand.cpp:259
 msgid "Insert Result of Command"
 msgstr "Enmeti rezulton de komando"
 
-#: 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 "Meti kursilpozicion"
 
-#: templatesinsertcommand.cpp:289
+#: templatesinsertcommand.cpp:292
 msgid "Insert File Content"
 msgstr "Enmeti dosierenhavon"
 
-#: templatesinsertcommand.cpp:293
+#: templatesinsertcommand.cpp:296
 msgid "DNL"
 msgstr ""
 
-#: templatesinsertcommand.cpp:297
+#: templatesinsertcommand.cpp:300
 msgid "Template Comment"
 msgstr "Ŝablonkomento"
 
-#: templatesinsertcommand.cpp:301
+#: templatesinsertcommand.cpp:304
 msgid "No Operation"
 msgstr "Neniu operacio"
 
-#: templatesinsertcommand.cpp:305
+#: templatesinsertcommand.cpp:308
 msgid "Clear Generated Message"
 msgstr "Viŝi generitan mesaĝon"
 
-#: templatesinsertcommand.cpp:309
+#: templatesinsertcommand.cpp:312
 msgid "Turn Debug On"
 msgstr ""
 
-#: templatesinsertcommand.cpp:313
+#: templatesinsertcommand.cpp:316
 msgid "Turn Debug Off"
 msgstr ""
 
@@ -13428,62 +14542,72 @@ msgstr ""
 msgid "There is nothing to undo."
 msgstr "Estas nenio malfarebla."
 
-#: urlhandlermanager.cpp:422
+#: urlhandlermanager.cpp:482
 msgid "Turn on HTML rendering for this message."
 msgstr "Aktivigi HTML-rigardon por tiu ĉi mesaĝo."
 
-#: urlhandlermanager.cpp:424
+#: urlhandlermanager.cpp:484
 #, fuzzy
 msgid "Load external references from the Internet for this message."
 msgstr "Permesu &legi aleksterajn refrencojn el la reto"
 
-#: urlhandlermanager.cpp:426
+#: urlhandlermanager.cpp:486
 #, fuzzy
 msgid "Work online."
 msgstr "Labori konektite"
 
-#: urlhandlermanager.cpp:428
+#: urlhandlermanager.cpp:488
 #, fuzzy
 msgid "Decrypt message."
 msgstr "Ĉifrita mesaĝo"
 
-#: urlhandlermanager.cpp:430
+#: urlhandlermanager.cpp:490
 #, fuzzy
 msgid "Show signature details."
 msgstr "Subskribo ne trovita."
 
-#: urlhandlermanager.cpp:432
+#: urlhandlermanager.cpp:492
 #, fuzzy
 msgid "Hide signature details."
 msgstr "Korekta subskribo."
 
-#: urlhandlermanager.cpp:464
+#: urlhandlermanager.cpp:494
+#, fuzzy
+msgid "Hide attachment list"
+msgstr "Konservi kunsendaĵon kiel"
+
+#: urlhandlermanager.cpp:496
+#, fuzzy
+msgid "Show attachment list"
+msgstr "Montri kunsendaĵan piktogramon"
+
+#: urlhandlermanager.cpp:528
 msgid "Expand all quoted text."
 msgstr ""
 
-#: urlhandlermanager.cpp:466
+#: urlhandlermanager.cpp:531
 msgid "Collapse quoted text."
 msgstr ""
 
-#: urlhandlermanager.cpp:487
+#: urlhandlermanager.cpp:554
 msgid "Could not start certificate manager. Please check your installation."
 msgstr ""
 "Ne eblis lanĉi la atestiladministrilon. Bonvolu kontroli vian instaladon!"
 
-#: urlhandlermanager.cpp:497
+#: urlhandlermanager.cpp:564
 #, c-format
 msgid "Show certificate 0x%1"
 msgstr "Vidigi atestilon 0x%1"
 
-#: urlhandlermanager.cpp:552
+#: urlhandlermanager.cpp:693
 msgid "Attachment #%1 (unnamed)"
 msgstr "Kunsendaĵo n-ro %1 (nenoma)"
 
-#: urlhandlermanager.cpp:581
+#: urlhandlermanager.cpp:724
 msgid "Show GnuPG Audit Log for this operation"
 msgstr ""
 
-#: vacation.cpp:562
+#: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
 "\n"
@@ -13507,7 +14631,7 @@ msgstr ""
 "Kun bonaj salutoj,\n"
 "-- <enigu vian nomon kaj retleteran adreson>\n"
 
-#: vacation.cpp:606
+#: vacation.cpp:612
 msgid ""
 "Your server did not list \"vacation\" in its list of supported Sieve "
 "extensions;\n"
@@ -13519,11 +14643,11 @@ msgstr ""
 "Sen ĝi, KMail ne povas agordi eksteroficejajn respondojn por vi.\n"
 "Kontaktu vian sistemadministriston."
 
-#: vacation.cpp:616
+#: vacation.cpp:622
 msgid "Configure \"Out of Office\" Replies"
 msgstr "Agordi eksteroficejajn respondojn"
 
-#: vacation.cpp:626
+#: vacation.cpp:632
 msgid ""
 "Someone (probably you) changed the vacation script on the server.\n"
 "KMail is no longer able to determine the parameters for the autoreplies.\n"
@@ -13533,17 +14657,17 @@ msgstr ""
 "KMail ne plu eblas fiksi la valorojn por la aŭtomataj respondoj.\n"
 "Normaj valoroj estos uzataj."
 
-#: 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 "&Ignori"
@@ -13556,40 +14680,40 @@ msgstr "Agordi la eksteroficejajn notojn sendotajn:"
 msgid "&Activate vacation notifications"
 msgstr "&Aktivigi eksteroficejajn notojn"
 
-#: vacationdialog.cpp:76
+#: vacationdialog.cpp:78
 msgid "&Resend notification only after:"
 msgstr "&Resendi notojn nur post:"
 
-#: vacationdialog.cpp:82
+#: vacationdialog.cpp:84
 msgid "&Send responses for these addresses:"
 msgstr "&Sendi respondojn por tiuj adresoj:"
 
-#: vacationdialog.cpp:87
+#: vacationdialog.cpp:89
 #, fuzzy
 msgid "Do not send vacation replies to spam messages"
 msgstr "Ne sendi ricevkonfirmon post ricevo de ĉifrita mesaĝo"
 
-#: vacationdialog.cpp:93
+#: vacationdialog.cpp:95
 msgid "Only react to mail coming from domain"
 msgstr ""
 
-#: vcardviewer.cpp:41
+#: vcardviewer.cpp:45
 msgid "VCard Viewer"
 msgstr "Vizitkarta montrilo"
 
-#: vcardviewer.cpp:42
+#: vcardviewer.cpp:46
 msgid "&Import"
 msgstr "&Importi"
 
-#: vcardviewer.cpp:42
+#: vcardviewer.cpp:46
 msgid "&Next Card"
 msgstr "Se&kva karto"
 
-#: vcardviewer.cpp:42
+#: vcardviewer.cpp:46
 msgid "&Previous Card"
 msgstr "An&taŭa karto"
 
-#: vcardviewer.cpp:62
+#: vcardviewer.cpp:70
 msgid "Failed to parse vCard."
 msgstr "Fiaskis legi la vkarton."
 
@@ -13778,7 +14902,7 @@ msgstr "Fimesaĝa"
 msgid "To Do"
 msgstr "Faronta"
 
-#: kmsearchpattern.h:233
+#: kmsearchpattern.h:234
 msgid "Has Attachment"
 msgstr "Kun kunsendaĵo"
 
@@ -13786,6 +14910,11 @@ msgstr "Kun kunsendaĵo"
 msgid "%1 of %2 %3 used"
 msgstr "%1 de %2 %3 uzata"
 
+#: 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?"
@@ -13795,6 +14924,26 @@ msgstr "Dosiero nomita \"%1\" jam ekzistas. Ĉu vi volas anstataŭigi ĝin?"
 msgid "Overwrite File?"
 msgstr "Ĉu anstataŭigi dosieron?"
 
+#, fuzzy
+#~ msgid "Show folder quick search field"
+#~ msgstr "Montri rapidserĉan liniredaktilon"
+
+#~ msgid "Standard (Ical / Vcard)"
+#~ msgstr "Norma (Ical / Vcard)"
+
+#~ msgid "&Copy to (CC):"
+#~ msgstr "&Kopii al:"
+
+#~ msgid "&Blind copy to (BCC):"
+#~ msgstr "&Kopii al:"
+
+#~ msgid "Retrieving new messages"
+#~ msgstr "Serĉante novajn mesaĝojn"
+
+#, fuzzy
+#~ msgid "Show folder quick search line edit"
+#~ msgstr "Montri rapidserĉan liniredaktilon"
+
 #~ msgid "Op&en"
 #~ msgstr "&Malfermi"
 
@@ -14289,9 +15438,6 @@ msgstr "Ĉu anstataŭigi dosieron?"
 #~ msgid "Always"
 #~ msgstr "Ĉiam"
 
-#~ msgid "After"
-#~ msgstr "Post"
-
 #, fuzzy
 #~ msgid "Warn if CA certificate e&xpires in less than:"
 #~ msgstr "Averti, se la atestileja atestilo nevalidiĝos post  pli malmulte ol"
@@ -14315,10 +15461,6 @@ msgstr "Ĉu anstataŭigi dosieron?"
 #~ msgid "Warn if s&ignature certificate expires in less than:"
 #~ msgstr "Averti, se la subskriba atestilo nevalidiĝos post  pli malmulte ol"
 
-#, fuzzy
-#~ msgid "Warn if root certificate expires in &less than:"
-#~ msgstr "Averti, se la radika atestilo nevalidiĝos post  pli malmulte ol"
-
 #~ msgid "Warn if signer's email address is &not in certificate"
 #~ msgstr "Averti, se la subskribantula retadreso ne estas en la atestilo"