Automated l10n update (.po files)

1 files changed, 3270 insertions, 2265 deletions

diff --git a/tde-i18n-hr/messages/tdepim/kmail.po b/tde-i18n-hr/messages/tdepim/kmail.po
index ab0bab841b6..8d025001585 100644
--- a/tde-i18n-hr/messages/tdepim/kmail.po
+++ b/tde-i18n-hr/messages/tdepim/kmail.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail 0\n"
-"POT-Creation-Date: 2008-08-19 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2004-04-20 13:25+CEST\n"
 "Last-Translator: auto\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
+"Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -105,7 +106,7 @@ msgstr "vremenski pečat za „Prenos je završen“ statusne poruke"
 msgid "multiple encryption keys per address"
 msgstr "višestruki ključevi za kriptiranje po adresi"
 
-#: 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"
@@ -154,7 +155,7 @@ msgstr "Način zaključavanja"
 
 #: accountdialog.cpp:368
 #, fuzzy
-msgid "Procmail loc&kfile:"
+msgid "Procmail loc&tdefile:"
 msgstr "Procmailov datoteka za&ključavanja"
 
 #: accountdialog.cpp:380
@@ -212,7 +213,7 @@ msgid "Check inter&val:"
 msgstr "Pe&riod provjere:"
 
 #: 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"
 
@@ -250,8 +251,8 @@ msgstr "Uključi u provjeru:"
 msgid "Account Type: POP Account"
 msgstr "Vrsta naloga: POP nalog"
 
-#: 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 "&Općenito"
 
@@ -359,7 +360,7 @@ msgstr "&Dodaci"
 msgid "Check &What the Server Supports"
 msgstr "&Provjeri što poslužitelj podržava"
 
-#: accountdialog.cpp:782 accountdialog.cpp:1097 kmheaders.cpp:137
+#: accountdialog.cpp:782 accountdialog.cpp:1097 kmheaders.cpp:140
 #: kmtransport.cpp:502
 msgid "Encryption"
 msgstr "Ši&firiraj"
@@ -492,7 +493,8 @@ msgid "Sho&w hidden folders"
 msgstr "Pokaži &skrivene mape"
 
 #: accountdialog.cpp:987
-msgid "Show only s&ubscribed folders"
+#, fuzzy
+msgid "Show only serverside s&ubscribed folders"
 msgstr "&Pokaži samo pretplaćene mape"
 
 #: accountdialog.cpp:992
@@ -547,9 +549,9 @@ msgstr "&Filtriranje"
 msgid "<none>"
 msgstr "<nijedno>"
 
-#: 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 "Dolazna pošta"
 
@@ -615,7 +617,7 @@ msgid ""
 "the possibility to turn filtering messages on the server on."
 msgstr ""
 
-#: accountdialog.cpp:1734 vacationdialog.cpp:163
+#: accountdialog.cpp:1734 vacationdialog.cpp:76 vacationdialog.cpp:165
 msgid ""
 "_n:  day\n"
 " days"
@@ -660,39 +662,39 @@ msgstr "I&sprazni"
 msgid "Edit Namespace '%1'"
 msgstr "zamijeni"
 
-#: accountmanager.cpp:101
+#: accountmanager.cpp:103
 #, c-format
 msgid "Account %1"
 msgstr "Račun %1"
 
-#: accountmanager.cpp:181
+#: accountmanager.cpp:183
 msgid ""
 "Account %1 has no mailbox defined:\n"
 "mail checking aborted;\n"
 "check your account settings."
 msgstr ""
 
-#: accountmanager.cpp:196
+#: accountmanager.cpp:226
 msgid "Checking account %1 for new mail"
 msgstr "Provjeravam da li ima nove pošte za korisnički račun %1"
 
-#: accountmanager.cpp:214 accountmanager.cpp:217 accountwizard.cpp:441
+#: accountmanager.cpp:244 accountmanager.cpp:247 accountwizard.cpp:441
 #: accountwizard.cpp:477
 #, fuzzy
 msgid "Local Account"
 msgstr "Računi"
 
-#: accountmanager.cpp:220
+#: accountmanager.cpp:250
 #, fuzzy
 msgid "POP Account"
 msgstr "Računi"
 
-#: accountmanager.cpp:223 accountmanager.cpp:225
+#: accountmanager.cpp:253 accountmanager.cpp:255
 #, fuzzy
 msgid "IMAP Account"
 msgstr "Dodaj korisnički račun"
 
-#: accountmanager.cpp:308
+#: accountmanager.cpp:343
 #, fuzzy
 msgid ""
 "You need to add an account in the network section of the settings in order to "
@@ -816,13 +818,13 @@ msgstr ""
 msgid "Server Information"
 msgstr "Potvrde o prijemu"
 
-#. 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
 #, fuzzy, no-c-format
 msgid "None"
 msgstr "&Nijedan"
 
-#: accountwizard.cpp:384 configuredialog.cpp:792
+#: accountwizard.cpp:384 configuredialog.cpp:794
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -830,13 +832,13 @@ msgstr "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 ""
 
-#: 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>Filter pravila su podržana.</b>"
 
@@ -845,116 +847,116 @@ msgstr "<b>Filter pravila su podržana.</b>"
 msgid "<b>Applying filter action:</b> %1"
 msgstr "Primijeni filter akciju:"
 
-#: antispamwizard.cpp:101
+#: antispamwizard.cpp:100
 msgid "Anti-Spam Wizard"
 msgstr ""
 
-#: antispamwizard.cpp:102
+#: antispamwizard.cpp:101
 #, fuzzy
 msgid "Anti-Virus Wizard"
 msgstr "GnuPG podrška"
 
-#: antispamwizard.cpp:106
+#: antispamwizard.cpp:105
 #, fuzzy
 msgid "Welcome to the KMail Anti-Spam Wizard"
 msgstr "Dobro došli KMail-ovom čarobnjaku koji se bori protiv neželjene pošte."
 
-#: antispamwizard.cpp:107
+#: antispamwizard.cpp:106
 #, fuzzy
 msgid "Welcome to the KMail Anti-Virus Wizard"
 msgstr "Dobro došli KMail-ovom čarobnjaku koji se bori protiv neželjene pošte."
 
-#: 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 ""
 
-#: antispamwizard.cpp:284 antispamwizard.cpp:286 antispamwizard.cpp:572
+#: antispamwizard.cpp:283 antispamwizard.cpp:285 antispamwizard.cpp:577
 msgid "Spam handling"
 msgstr ""
 
-#: antispamwizard.cpp:325 antispamwizard.cpp:327 antispamwizard.cpp:585
+#: antispamwizard.cpp:324 antispamwizard.cpp:326 antispamwizard.cpp:590
 msgid "Semi spam (unsure) handling"
 msgstr ""
 
-#: antispamwizard.cpp:387 antispamwizard.cpp:389 antispamwizard.cpp:593
+#: antispamwizard.cpp:386 antispamwizard.cpp:388 antispamwizard.cpp:598
 msgid "Classify as spam"
 msgstr ""
 
-#: antispamwizard.cpp:419 antispamwizard.cpp:421 antispamwizard.cpp:595
+#: antispamwizard.cpp:418 antispamwizard.cpp:420 antispamwizard.cpp:600
 msgid "Classify as NOT spam"
 msgstr ""
 
-#: antispamwizard.cpp:493
+#: antispamwizard.cpp:498
 msgid "Scanning for %1..."
 msgstr ""
 
-#: antispamwizard.cpp:524
+#: antispamwizard.cpp:529
 msgid "Scanning for anti-spam tools finished."
 msgstr ""
 
-#: antispamwizard.cpp:525
+#: antispamwizard.cpp:530
 msgid "Scanning for anti-virus tools finished."
 msgstr ""
 
-#: 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 ""
 
-#: antispamwizard.cpp:555
+#: antispamwizard.cpp:560
 #, fuzzy
 msgid "<p>Messages classified as spam are marked as read."
 msgstr "Označi sve poruke u odabranoj niti kao pročitane"
 
-#: antispamwizard.cpp:557
+#: antispamwizard.cpp:562
 #, fuzzy
 msgid "<p>Messages classified as spam are not marked as read."
 msgstr "Označi sve poruke u odabranoj niti kao pročitane"
 
-#: 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 "
@@ -975,39 +977,39 @@ msgstr ""
 "kreirati filter pravila kako bi raspoznao i odvojio neželjenu poštu. Čarobnjak "
 "neće razmatrati već definirana pravila već će dodati nova.</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
 #, fuzzy
 msgid "&Mark detected spam messages as read"
 msgstr "Označi odabrane poruke kao pročitane"
 
-#: antispamwizard.cpp:943
+#: antispamwizard.cpp:947
 #, fuzzy
 msgid "Mark messages which have been classified as spam as read."
 msgstr "Označi sve poruke u odabranoj niti kao pročitane"
 
-#: antispamwizard.cpp:946
+#: antispamwizard.cpp:950
 #, fuzzy
 msgid "Move &known spam to:"
 msgstr "Premjesti poruku u smeće"
 
-#: 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
 #, fuzzy
 msgid "Move &probable spam to:"
 msgstr "Premjesti poruku u smeće"
 
-#: antispamwizard.cpp:964
+#: antispamwizard.cpp:968
 msgid ""
 "The default folder is the inbox folder, but you may change that in the folder "
 "view below."
@@ -1015,11 +1017,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 ""
 
-#: antispamwizard.cpp:1066
+#: antispamwizard.cpp:1070
 #, fuzzy
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
@@ -1032,30 +1034,191 @@ msgstr ""
 "sljedeći filteri mogu na njih reagirati i, npr., maknuti neželjenu poruku u "
 "posebnu mapu."
 
-#: antispamwizard.cpp:1072
+#: antispamwizard.cpp:1076
 #, fuzzy
 msgid "Move detected viral messages to the selected folder"
 msgstr "Premjesti pronađene neželjene poruke u odabranu mapu"
 
-#: 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 "
 "folder, but you may change that in the folder view."
 msgstr ""
 
-#: antispamwizard.cpp:1080
+#: antispamwizard.cpp:1084
 #, fuzzy
 msgid "Additionally, mark detected viral messages as read"
 msgstr "Označi odabrane poruke kao pročitane"
 
-#: 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."
 msgstr ""
 
-#: 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 "Načini direktorij"
+
+#: archivefolderdialog.cpp:70 importarchivedialog.cpp:54
+#, fuzzy
+msgid "&Folder:"
+msgstr "&Direktoriji"
+
+#: archivefolderdialog.cpp:80
+#, fuzzy
+msgid "F&ormat:"
+msgstr "&Obično:"
+
+#: 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 "Priloži datoteku"
+
+#: archivefolderdialog.cpp:111
+#, fuzzy
+msgid "&Delete folders after completion"
+msgstr "Brišem mape s poslužitelja"
+
+#: archivefolderdialog.cpp:161
+#, fuzzy
+msgid "Please select the folder that should be archived."
+msgstr "Označite koje alate želite koristiti od strane KMail-a."
+
+#: archivefolderdialog.cpp:162
+#, fuzzy
+msgid "No folder selected"
+msgstr "&Duži popis mapa"
+
+#: 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 "Neuspjelo stvaranje direktorija"
+
+#: backupjob.cpp:153
+#, fuzzy
+msgid "Archiving failed."
+msgstr "Prenos nije uspio."
+
+#: 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 ""
+"obrađena je %n poruka\n"
+"obrađene su %n poruke\n"
+"obrađeno je %n poruka"
+
+#: 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 "Nisam mogao dodati poruku u mapu: "
+
+#: backupjob.cpp:251
+#, fuzzy
+msgid "Internal error while trying to retrieve a message from folder '%1'."
+msgstr ""
+"Greška prilikom pisanja datoteke:\n"
+"%1"
+
+#: backupjob.cpp:321
+#, fuzzy
+msgid "Failed to write a message into the archive folder '%1'."
+msgstr "Premjesti pronađene neželjene poruke u odabranu mapu"
+
+#: backupjob.cpp:360
+#, fuzzy
+msgid "Downloading a message in folder '%1' failed."
+msgstr "Premještanje poruka nije uspjelo."
+
+#: backupjob.cpp:362
+#, fuzzy
+msgid "Downloading a message in the current folder failed."
+msgstr "Sažima sve niti u trenutnoj mapi"
+
+#: backupjob.cpp:391
+#, fuzzy, c-format
+msgid "Archiving folder %1"
+msgstr "Dobavljam popis mapi"
+
+#: backupjob.cpp:393 importjob.cpp:210
+#, fuzzy
+msgid "Unable to open folder '%1'."
+msgstr "&Kratka lista mapi"
+
+#: 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 mogu otvoriti datoteku za pisanje:\n"
+"%1"
+
+#: backupjob.cpp:489
+#, fuzzy
+msgid "Archiving"
+msgstr "&Primanje"
+
+#: cachedimapjob.cpp:220 cachedimapjob.cpp:271 cachedimapjob.cpp:886
 #, fuzzy
 msgid "Error while deleting messages on the server: "
 msgstr "Greška prilikom slanja poruke"
@@ -1065,57 +1228,106 @@ msgstr "Greška prilikom slanja poruke"
 msgid "Error while retrieving message on the server: "
 msgstr "Greška prilikom slanja poruke"
 
-#: cachedimapjob.cpp:538
+#: cachedimapjob.cpp:541
 msgid "Error while uploading folder"
 msgstr "Greška prilikom slanja mape"
 
-#: cachedimapjob.cpp:539
+#: cachedimapjob.cpp:542
 #, fuzzy
 msgid "Could not make the folder <b>%1</b> on the server."
 msgstr "Nisam mogao napraviti mapu %1 na poslužitelju."
 
-#: 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 "
 "communication is here:"
 msgstr ""
 
-#: cachedimapjob.cpp:626
+#: cachedimapjob.cpp:629
 #, fuzzy
 msgid "Error while deleting folder %1 on the server: "
 msgstr "Nisam mogao napraviti mapu %1 na poslužitelju."
 
-#: cachedimapjob.cpp:679
+#: cachedimapjob.cpp:682
 #, fuzzy
 msgid "Error while reading folder %1 on the server: "
 msgstr ""
 "Greška prilikom čitanja datoteke:\n"
 "%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
 #, fuzzy, c-format
 msgid "Error while trying to rename folder %1"
 msgstr ""
 "Greška prilikom pisanja datoteke:\n"
 "%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 "postavi transport na"
+
+#: callback.cpp:97
+#, fuzzy, c-format
+msgid "Declined: %1"
+msgstr " Linija"
+
+#: callback.cpp:99
+#, c-format
+msgid "Tentative: %1"
+msgstr ""
+
+#: callback.cpp:101
+#, fuzzy, c-format
+msgid "Accepted: %1"
+msgstr "Prilog: %1"
+
+#: callback.cpp:103
+#, fuzzy, c-format
+msgid "Delegated: %1"
+msgstr "izbrisano"
+
+#: 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 ""
 "Da bi vas Outlook prepoznao kao primatelja, morate označiti koja je od "
 "sljedećih vaša email adresa:"
 
-#: 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:"
 msgstr ""
 
-#: callback.cpp:183
+#: callback.cpp:233
 #, fuzzy
 msgid "Select Address"
 msgstr "Odaberite adresu"
@@ -1142,185 +1354,185 @@ msgstr ""
 msgid "Error occurred while compacting \"%1\". Compaction aborted."
 msgstr ""
 
-#: configuredialog.cpp:155
+#: configuredialog.cpp:156
 msgid ""
 "<qt>"
 "<p>This setting has been fixed by your administrator.</p>"
 "<p>If you think this is an error, please contact him.</p></qt>"
 msgstr ""
 
-#: configuredialog.cpp:217
+#: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "&Učitaj Profil..."
 
-#: configuredialog.cpp:305 simplestringlisteditor.cpp:85
+#: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "&Dodaj..."
 
-#: 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 "Iz&mijeni..."
 
-#: configuredialog.cpp:307
+#: configuredialog.cpp:310
 msgid "&Rename"
 msgstr "&Promijeni ime"
 
-#: configuredialog.cpp:308 configuredialog.cpp:3115 configuredialog.cpp:3164
+#: configuredialog.cpp:311 configuredialog.cpp:3228 configuredialog.cpp:3277
 msgid "Remo&ve"
 msgstr "U&Kloni"
 
-#: configuredialog.cpp:309
+#: configuredialog.cpp:312
 msgid "Set as &Default"
 msgstr "Postavi kao uob&ičajeno"
 
-#: configuredialog.cpp:450
+#: configuredialog.cpp:453
 msgid "<qt>Do you really want to remove the identity named <b>%1</b>?</qt>"
 msgstr "<qt>Želite li zaista uklonite identitet s imenom <b>%1</b>?</qt>"
 
-#: configuredialog.cpp:452
+#: configuredialog.cpp:455
 #, fuzzy
 msgid "Remove Identity"
 msgstr "&Ukloni"
 
-#: configuredialog.cpp:493 configuredialog.cpp:3114
+#: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "Dodaj..."
 
-#: configuredialog.cpp:495 configuredialog.cpp:3116
+#: configuredialog.cpp:498 configuredialog.cpp:3229
 msgid "Modify..."
 msgstr "Izmijeni..."
 
-#: configuredialog.cpp:499
+#: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "Postavi kao uobičajeno"
 
-#: configuredialog.cpp:562
+#: configuredialog.cpp:565
 msgid "&Receiving"
 msgstr "&Primanje"
 
-#: configuredialog.cpp:570
+#: configuredialog.cpp:573
 msgid "&Sending"
 msgstr "&Slanje"
 
-#: configuredialog.cpp:595
+#: configuredialog.cpp:598
 msgid "Outgoing accounts (add at least one):"
 msgstr "Izlazeći korisnički računi (dodajte barem jedan):"
 
-#. 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 "Ime"
 
-#. 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 "Tip"
 
-#: 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 "Novi..."
 
-#: configuredialog.cpp:633 configuredialog.cpp:1104
+#: configuredialog.cpp:636 configuredialog.cpp:1110
 msgid "R&emove"
 msgstr "U&kloni"
 
-#: configuredialog.cpp:640
+#: configuredialog.cpp:643
 #, fuzzy
 msgid "Set Default"
 msgstr "Postavi kao uobičajeno"
 
-#: configuredialog.cpp:650
+#: configuredialog.cpp:653
 msgid "Common Options"
 msgstr "Opće opcije"
 
-#. 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 "&Potvrdi prije slanja"
 
-#: configuredialog.cpp:666
+#: configuredialog.cpp:669
 msgid "Never Automatically"
 msgstr ""
 
-#: configuredialog.cpp:667
+#: configuredialog.cpp:670
 #, fuzzy
 msgid "On Manual Mail Checks"
 msgstr "pri ručnom &filtriranju"
 
-#: configuredialog.cpp:668
+#: configuredialog.cpp:671
 #, fuzzy
 msgid "On All Mail Checks"
 msgstr "&Podesi interval za provjeru pošte"
 
-#: configuredialog.cpp:676
+#: configuredialog.cpp:679
 msgid "Send Now"
 msgstr "Pošalji odmah"
 
-#: configuredialog.cpp:677
+#: configuredialog.cpp:680
 msgid "Send Later"
 msgstr "Pošalji kasnije"
 
-#: configuredialog.cpp:687
+#: configuredialog.cpp:690
 msgid "Allow 8-bit"
 msgstr "Dozvoli 8-bitno"
 
-#: configuredialog.cpp:688
+#: configuredialog.cpp:691
 msgid "MIME Compliant (Quoted Printable)"
 msgstr "MIME Compliant (Quoted Printable)"
 
-#: configuredialog.cpp:701
+#: configuredialog.cpp:704
 #, fuzzy
 msgid "Send &messages in outbox folder:"
 msgstr "Pošalji poruke iz odlazeće &mape prilikom provere"
 
-#: configuredialog.cpp:709
+#: configuredialog.cpp:712
 msgid "Defa&ult send method:"
 msgstr "&Uobičajeni način slanja:"
 
-#: configuredialog.cpp:711
+#: configuredialog.cpp:714
 msgid "Message &property:"
 msgstr "Svojstvo &poruke:"
 
-#: configuredialog.cpp:713
+#: configuredialog.cpp:716
 msgid "Defaul&t domain:"
 msgstr "Podra&zumijevana domena:"
 
-#: configuredialog.cpp:717
+#: configuredialog.cpp:720
 msgid ""
 "<qt>"
 "<p>The default domain is used to complete email addresses that only consist of "
 "the user's name.</p></qt>"
 msgstr ""
 
-#: 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
 #, fuzzy
 msgid "smtp (Default)"
 msgstr "%1 (uobičajeno)"
 
-#: configuredialog.cpp:768 configuredialog.cpp:945 configuredialog.cpp:993
+#: configuredialog.cpp:771 configuredialog.cpp:952 configuredialog.cpp:999
 #, fuzzy
 msgid "sendmail (Default)"
 msgstr "%1 (uobičajeno)"
 
-#: configuredialog.cpp:799 kmtransport.cpp:248
+#: configuredialog.cpp:801 kmtransport.cpp:248
 msgid "Add Transport"
 msgstr "Dodaj transport"
 
-#: configuredialog.cpp:830
+#: configuredialog.cpp:832
 #, fuzzy
 msgid ""
 "_: %1: type of transport. Result used in Configure->Accounts->"
@@ -1329,427 +1541,419 @@ msgid ""
 "%1 (Default)"
 msgstr "%1 (uobičajen)"
 
-#: configuredialog.cpp:854
+#: configuredialog.cpp:856
 msgid "Modify Transport"
 msgstr "Promijeni transport"
 
-#: 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 "Dolazni korisnički računi (dodajte barem jedan):"
 
-#: 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 "Mapa"
 
-#: configuredialog.cpp:1112
+#: configuredialog.cpp:1118
 msgid "Chec&k mail on startup"
 msgstr "Provjeri poštu prilikom po&kretanja"
 
-#: configuredialog.cpp:1118
+#: configuredialog.cpp:1124
 msgid "New Mail Notification"
 msgstr "&Obavijest o novim porukama"
 
-#: configuredialog.cpp:1123
+#: configuredialog.cpp:1129
 msgid "&Beep"
 msgstr "&Beep"
 
-#: configuredialog.cpp:1131
+#: configuredialog.cpp:1137
 #, fuzzy
 msgid "Deta&iled new mail notification"
 msgstr "&Obavijest o novim porukama"
 
-#: configuredialog.cpp:1135
+#: configuredialog.cpp:1141
 #, fuzzy
 msgid "Show for each folder the number of newly arrived messages"
 msgstr "Idi na sljedeću mapu s nepročitanim porukama"
 
-#: configuredialog.cpp:1143
+#: configuredialog.cpp:1149
 msgid "Other Actio&ns"
 msgstr "Ostale &akcije"
 
-#: configuredialog.cpp:1221
+#: configuredialog.cpp:1227
 msgid "Unknown account type selected"
 msgstr "Odabrali ste nepoznatu vrstu računa"
 
-#: configuredialog.cpp:1230
+#: configuredialog.cpp:1236
 msgid "Unable to create account"
 msgstr "Ne mogu stvoriti račun"
 
-#: configuredialog.cpp:1236 kmacctseldlg.cpp:36
+#: configuredialog.cpp:1242 kmacctseldlg.cpp:36
 msgid "Add Account"
 msgstr "Dodaj korisnički račun"
 
-#: configuredialog.cpp:1288
+#: configuredialog.cpp:1294
 msgid "Unable to locate account"
 msgstr "Ne mogu locirati račun"
 
-#: configuredialog.cpp:1315
+#: configuredialog.cpp:1321
 msgid "Modify Account"
 msgstr "Promijeni korisnički račun"
 
-#: 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 mogu da naći korisnički račun <b>%1</b>.</qt>"
 
-#: configuredialog.cpp:1491
+#: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "&Boje"
 
-#: configuredialog.cpp:1497
+#: configuredialog.cpp:1503
 msgid "La&yout"
 msgstr "&Izgled"
 
-#: configuredialog.cpp:1503
+#: configuredialog.cpp:1509
 #, fuzzy
 msgid "M&essage List"
 msgstr "Popisa poruka"
 
-#: configuredialog.cpp:1509
+#: configuredialog.cpp:1515
 #, fuzzy
 msgid "Message W&indow"
 msgstr "Popisa poruka"
 
-#: configuredialog.cpp:1515
+#: configuredialog.cpp:1521
 #, fuzzy
 msgid "System &Tray"
 msgstr "Način radai sustavske kasete"
 
-#: configuredialog.cpp:1531
+#: configuredialog.cpp:1537
 msgid "Message Body"
 msgstr "Tijelo poruke"
 
-#: configuredialog.cpp:1532
+#: configuredialog.cpp:1538
 msgid "Message List"
 msgstr "Popisa poruka"
 
-#: configuredialog.cpp:1533
+#: configuredialog.cpp:1539
 #, fuzzy
 msgid "Message List - New Messages"
 msgstr "Lista poruka — polje za datum"
 
-#: configuredialog.cpp:1534
+#: configuredialog.cpp:1540
 #, fuzzy
 msgid "Message List - Unread Messages"
 msgstr "&Sljedeća nepročitana poruka"
 
-#: configuredialog.cpp:1535
+#: configuredialog.cpp:1541
 #, fuzzy
 msgid "Message List - Important Messages"
 msgstr "Važna poruka"
 
-#: configuredialog.cpp:1536
+#: configuredialog.cpp:1542
 #, fuzzy
 msgid "Message List - Todo Messages"
 msgstr "Lista poruka — polje za datum"
 
-#: configuredialog.cpp:1537
+#: configuredialog.cpp:1543
 msgid "Message List - Date Field"
 msgstr "Lista poruka — polje za datum"
 
-#: configuredialog.cpp:1538 configuredialog.cpp:1859
+#: configuredialog.cpp:1544 configuredialog.cpp:1868
 msgid "Folder List"
 msgstr "Popis direktorija"
 
-#: configuredialog.cpp:1539 configuredialog.cpp:1702
+#: configuredialog.cpp:1545 configuredialog.cpp:1708
 msgid "Quoted Text - First Level"
 msgstr "Citirani tekst — prvi nivo"
 
-#: configuredialog.cpp:1540 configuredialog.cpp:1703
+#: configuredialog.cpp:1546 configuredialog.cpp:1709
 msgid "Quoted Text - Second Level"
 msgstr "Citirani tekst — drugi nivo"
 
-#: configuredialog.cpp:1541 configuredialog.cpp:1704
+#: configuredialog.cpp:1547 configuredialog.cpp:1710
 msgid "Quoted Text - Third Level"
 msgstr "Citirani tekst — treći nivo"
 
-#: configuredialog.cpp:1542
+#: configuredialog.cpp:1548
 msgid "Fixed Width Font"
 msgstr "Pismo utvrđene širine"
 
-#: configuredialog.cpp:1543 kmcomposewin.cpp:356
+#: configuredialog.cpp:1549 kmcomposewin.cpp:386
 msgid "Composer"
 msgstr "Composer"
 
-#: configuredialog.cpp:1544
+#: configuredialog.cpp:1550
 msgid "Printing Output"
 msgstr "Ispisujem izlaz"
 
-#: configuredialog.cpp:1559
+#: configuredialog.cpp:1565
 msgid "&Use custom fonts"
 msgstr "&Koristi prilagođena pisma"
 
-#: configuredialog.cpp:1575
+#: configuredialog.cpp:1581
 msgid "Apply &to:"
 msgstr "&Primijeni na:"
 
-#: configuredialog.cpp:1699
+#: configuredialog.cpp:1705
 #, fuzzy
 msgid "Composer Background"
 msgstr "Pozadina editora"
 
-#: configuredialog.cpp:1700
+#: configuredialog.cpp:1706
 #, fuzzy
 msgid "Alternative Background Color"
 msgstr "Alternativna boja pozadine"
 
-#: configuredialog.cpp:1701
+#: configuredialog.cpp:1707
 #, fuzzy
 msgid "Normal Text"
 msgstr "Normalni tekst"
 
-#: configuredialog.cpp:1705
+#: configuredialog.cpp:1711
 msgid "Link"
 msgstr "Link"
 
-#: configuredialog.cpp:1706
+#: configuredialog.cpp:1712
 #, fuzzy
 msgid "Followed Link"
 msgstr "Praćena veza"
 
-#: configuredialog.cpp:1707
+#: configuredialog.cpp:1713
 #, fuzzy
 msgid "Misspelled Words"
 msgstr "Pogrešno napisane riječi"
 
 #. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1708 rc.cpp:444
+#: configuredialog.cpp:1714 rc.cpp:450
 #, fuzzy, no-c-format
 msgid "New Message"
 msgstr "Nova poruka"
 
-#: configuredialog.cpp:1709
+#: configuredialog.cpp:1715
 #, fuzzy
 msgid "Unread Message"
 msgstr "Nepročitana poruka"
 
-#: configuredialog.cpp:1710
+#: configuredialog.cpp:1716
 #, fuzzy
 msgid "Important Message"
 msgstr "Važna poruka"
 
-#: configuredialog.cpp:1711
+#: configuredialog.cpp:1717
 #, fuzzy
 msgid "Todo Message"
 msgstr "&Uredi poruku"
 
-#: configuredialog.cpp:1712
+#: configuredialog.cpp:1718
 #, fuzzy
 msgid "OpenPGP Message - Encrypted"
 msgstr "OpenPGP poruka — kriptirano"
 
-#: configuredialog.cpp:1713
+#: configuredialog.cpp:1719
 #, fuzzy
 msgid "OpenPGP Message - Valid Signature with Trusted Key"
 msgstr "OpenPGP poruka - valjan potpis s ključem kojem se vjeruje"
 
-#: configuredialog.cpp:1714
+#: configuredialog.cpp:1720
 #, fuzzy
 msgid "OpenPGP Message - Valid Signature with Untrusted Key"
 msgstr "OpenPGP poruka - valjan potpis s ključem kojem se ne vjeruje"
 
-#: configuredialog.cpp:1715
+#: configuredialog.cpp:1721
 #, fuzzy
 msgid "OpenPGP Message - Unchecked Signature"
 msgstr "OpenPGP poruka - neprovjeren potpis"
 
-#: configuredialog.cpp:1716
+#: configuredialog.cpp:1722
 #, fuzzy
 msgid "OpenPGP Message - Bad Signature"
 msgstr "OpenPGP poruka — neispravan potpis"
 
-#: configuredialog.cpp:1717
+#: configuredialog.cpp:1723
 #, fuzzy
 msgid "Border Around Warning Prepending HTML Messages"
 msgstr "Okvir oko poruka o HTML upozorenju."
 
-#: configuredialog.cpp:1718
+#: configuredialog.cpp:1724
 msgid "Folder Name and Size When Close to Quota"
 msgstr ""
 
-#: configuredialog.cpp:1719
+#: configuredialog.cpp:1725
 #, fuzzy
 msgid "HTML Status Bar Background - No HTML Message"
 msgstr "Boja pozadine HTML statusne trake — Nije HTML poruka"
 
-#: configuredialog.cpp:1720
+#: configuredialog.cpp:1726
 #, fuzzy
 msgid "HTML Status Bar Foreground - No HTML Message"
 msgstr "Boja ispisa HTML statusne linije — Nije HTML poruka"
 
-#: configuredialog.cpp:1721
+#: configuredialog.cpp:1727
 #, fuzzy
 msgid "HTML Status Bar Background - HTML Message"
 msgstr "Boja pozadine HTML statusne linije — HTML poruka"
 
-#: configuredialog.cpp:1722
+#: configuredialog.cpp:1728
 #, fuzzy
 msgid "HTML Status Bar Foreground - HTML Message"
 msgstr "Boja ispisa HTML statusne linije — HTML poruka"
 
-#: configuredialog.cpp:1734
+#: configuredialog.cpp:1740
 msgid "&Use custom colors"
 msgstr "&Koristi podešene boje"
 
-#: configuredialog.cpp:1749
+#: configuredialog.cpp:1755
 msgid "Recycle colors on deep &quoting"
 msgstr "Vrti boje u krug kod dubokog &citiranja"
 
-#: 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 "&Duži popis mapa"
 
-#: configuredialog.cpp:1856
+#: configuredialog.cpp:1865
 #, fuzzy
 msgid "Shor&t folder list"
 msgstr "&Kratka lista mapi"
 
-#: configuredialog.cpp:1865
+#: configuredialog.cpp:1874
 msgid "Abo&ve the message pane"
 msgstr "&Iznad panoa poruke"
 
-#: configuredialog.cpp:1866
+#: configuredialog.cpp:1875
 msgid "&Below the message pane"
 msgstr "Is&pod panoa poruke"
 
-#: configuredialog.cpp:1869
+#: configuredialog.cpp:1878
 msgid "Message Structure Viewer Placement"
 msgstr "Smještaj preglednika strukture poruka"
 
-#: configuredialog.cpp:1874
+#: configuredialog.cpp:1883
 #, fuzzy
 msgid "Show &never"
 msgstr "&Nikad ne prikazuj"
 
-#: configuredialog.cpp:1875
+#: configuredialog.cpp:1884
 #, fuzzy
 msgid "Show only for non-plaintext &messages"
 msgstr "Prikazuj sa&mo za poruke koje nisu običan tekst"
 
-#: configuredialog.cpp:1876
+#: configuredialog.cpp:1885
 #, fuzzy
 msgid "Show alway&s"
 msgstr "Prikazuj &uvijek"
 
-#: configuredialog.cpp:1879
+#: configuredialog.cpp:1888
 msgid "Message Structure Viewer"
 msgstr "Preglednik strukture poruka"
 
-#: configuredialog.cpp:1885
+#: configuredialog.cpp:1894
 msgid "&Do not show a message preview pane"
 msgstr ""
 
-#: configuredialog.cpp:1886
+#: configuredialog.cpp:1895
 #, fuzzy
 msgid "Show the message preview pane belo&w the message list"
 msgstr "Pokaži pano za pregled poruke &ispod liste poruka"
 
-#: configuredialog.cpp:1887
+#: configuredialog.cpp:1896
 #, fuzzy
 msgid "Show the message preview pane ne&xt to the message list"
 msgstr "Pokaži pano za pregled poruke &pored liste poruka"
 
-#: configuredialog.cpp:1890
+#: configuredialog.cpp:1899
 msgid "Message Preview Pane"
 msgstr "Ploča za pregled poruke"
 
-#: configuredialog.cpp:1908
+#: configuredialog.cpp:1917
 #, fuzzy
 msgid "Show favorite folder view"
 msgstr "&Kratka lista mapi"
 
-#: configuredialog.cpp:1912
-msgid "Show folder quick search field"
-msgstr ""
-
-#: configuredialog.cpp:1983
+#: configuredialog.cpp:1986
 msgid "Sta&ndard format (%1)"
 msgstr "Sta&ndardni format (%1)"
 
-#: configuredialog.cpp:1984
+#: configuredialog.cpp:1987
 msgid "Locali&zed format (%1)"
 msgstr "Lokali&zirani format (%1)"
 
-#: configuredialog.cpp:1985
+#: configuredialog.cpp:1988
 msgid "Fancy for&mat (%1)"
 msgstr "&Moderan format (%1)"
 
-#: configuredialog.cpp:1986
+#: configuredialog.cpp:1989
 #, fuzzy
 msgid "C&ustom format (Shift+F1 for help):"
 msgstr "O&dabrani format (Shift+F1 za pomoć)"
 
-#: configuredialog.cpp:2003
+#: configuredialog.cpp:2006
 msgid "General Options"
 msgstr "Opće Mogućnosti"
 
-#: configuredialog.cpp:2006
-msgid "Show Quick Search"
-msgstr ""
-
-#: configuredialog.cpp:2008
+#: configuredialog.cpp:2009
 #, fuzzy
 msgid "Display messa&ge sizes"
 msgstr "&Prikaži veličine poruka"
 
-#: configuredialog.cpp:2010
+#: configuredialog.cpp:2011
 #, fuzzy
 msgid "Show crypto &icons"
 msgstr "Pokaži šifro &sličice"
 
-#: configuredialog.cpp:2012
+#: configuredialog.cpp:2013
 #, fuzzy
 msgid "Show attachment icon"
 msgstr "Pogledaj prilog: "
 
-#: configuredialog.cpp:2015
+#: configuredialog.cpp:2016
 #, fuzzy
 msgid "&Threaded message list"
 msgstr "&Poveži poruke u lance"
 
-#: configuredialog.cpp:2033
+#: configuredialog.cpp:2032
 #, fuzzy
 msgid "Threaded Message List Options"
 msgstr "&Poveži poruke u lance"
 
-#: configuredialog.cpp:2037
+#: configuredialog.cpp:2036
 msgid "Always &keep threads open"
 msgstr "Uvjek &drži niti otvorene"
 
-#: configuredialog.cpp:2040
+#: configuredialog.cpp:2039
 #, fuzzy
 msgid "Threads default to o&pen"
 msgstr "Lanci su podrazum&evano otvoreni"
 
-#: configuredialog.cpp:2043
+#: configuredialog.cpp:2042
 #, fuzzy
 msgid "Threads default to closed"
 msgstr "Niti su standardno zatvore&ne"
 
-#: configuredialog.cpp:2046
+#: configuredialog.cpp:2045
 msgid ""
 "Open threads that contain ne&w, unread or important messages and open watched "
 "threads."
@@ -1757,11 +1961,11 @@ msgstr ""
 "Otvori niti koje sadrže nove, nepročitane ili važne &poruke i otvori niti koje "
 "se prate."
 
-#: configuredialog.cpp:2056
+#: configuredialog.cpp:2055
 msgid "Date Display"
 msgstr "Prikaz datuma"
 
-#: configuredialog.cpp:2073
+#: configuredialog.cpp:2072
 msgid ""
 "<qt>"
 "<p><strong>These expressions may be used for the date:</strong></p>"
@@ -1794,125 +1998,174 @@ msgid ""
 "<p><strong>All other input characters will be ignored.</strong></p></qt>"
 msgstr ""
 
-#: configuredialog.cpp:2187
+#: configuredialog.cpp:2185
 msgid ""
 "Changing the global threading setting will override all folder specific values."
 msgstr ""
 "Mijenjanje globalnih postavki threadanja  pregaziti će sve vrijednosti "
 "specifične za mape."
 
-#: configuredialog.cpp:2224
+#: configuredialog.cpp:2221
+msgid "Close message window after replying or forwarding"
+msgstr ""
+
+#: configuredialog.cpp:2225
 #, fuzzy
 msgid "Show HTML stat&us bar"
 msgstr "Pokaži HTML statusnu trak&u"
 
-#: configuredialog.cpp:2228
+#: configuredialog.cpp:2229
 #, fuzzy
 msgid "Show s&pam status in fancy headers"
 msgstr "Pokaži sva zaglavlja poruka"
 
-#. 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
 #, fuzzy
 msgid "Fallback ch&aracter encoding:"
 msgstr "Podesi &kodiranje.."
 
-#: configuredialog.cpp:2325 configuredialog.cpp:2382 kmreaderwin.cpp:650
+#: configuredialog.cpp:2338 configuredialog.cpp:2400 kmreaderwin.cpp:584
 msgid "Auto"
 msgstr "Automatski"
 
-#: configuredialog.cpp:2336
+#: configuredialog.cpp:2349
 #, fuzzy
 msgid "&Override character encoding:"
 msgstr "Podesi &kodiranje.."
 
-#. i18n: file kmail.kcfg line 103
-#: configuredialog.cpp:2462 rc.cpp:643
+#. i18n: file kmail.kcfg line 105
+#: configuredialog.cpp:2486 rc.cpp:649
 #, fuzzy, no-c-format
 msgid "Enable system tray icon"
 msgstr "obavijest u sustavskoj kaseti"
 
-#: configuredialog.cpp:2468
+#: configuredialog.cpp:2492
 #, fuzzy
 msgid "System Tray Mode"
 msgstr "Način radai sustavske kasete"
 
-#: configuredialog.cpp:2476
+#: configuredialog.cpp:2500
 #, fuzzy
 msgid "Always show KMail in system tray"
 msgstr "&Uvijek prikazuj sustemska traka"
 
-#: configuredialog.cpp:2479
+#: configuredialog.cpp:2503
 msgid "Only show KMail in system tray if there are unread messages"
 msgstr ""
 
-#: configuredialog.cpp:2539 identitydialog.cpp:384
+#: configuredialog.cpp:2563 identitydialog.cpp:408
 #, fuzzy
 msgid "&Templates"
 msgstr "&Zamijeni"
 
-#: configuredialog.cpp:2545
+#: configuredialog.cpp:2569
 #, fuzzy
 msgid "&Custom Templates"
 msgstr "&Zamijeni"
 
-#: configuredialog.cpp:2551
+#: configuredialog.cpp:2575
 msgid "&Subject"
 msgstr "&Tema"
 
-#: configuredialog.cpp:2558
+#: configuredialog.cpp:2582
 msgid "Cha&rset"
 msgstr "&Skup znakova"
 
-#: configuredialog.cpp:2564
+#: configuredialog.cpp:2588
 msgid "H&eaders"
 msgstr "&Zaglavlja"
 
-#: configuredialog.cpp:2570
+#: configuredialog.cpp:2594
 msgid ""
 "_: Config->Composer->Attachments\n"
 "A&ttachments"
 msgstr "Pri&vitci"
 
-#: 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 ""
 
-#: configuredialog.cpp:2661
+#: configuredialog.cpp:2741
+#, fuzzy
+msgid "Default Forwarding Type:"
+msgstr "Podra&zumijevana domena:"
+
+#: configuredialog.cpp:2744
+#, fuzzy
+msgid "Inline"
+msgstr "&Inline..."
+
+#: configuredialog.cpp:2745
+#, fuzzy
+msgid "As Attachment"
+msgstr "prilog"
+
+#: configuredialog.cpp:2753
 #, fuzzy
 msgid "Configure Completion Order"
 msgstr "Podesi račun"
 
-#: configuredialog.cpp:2669 kmlineeditspell.cpp:136
+#: configuredialog.cpp:2761 kmlineeditspell.cpp:159
 #, fuzzy
 msgid "Edit Recent Addresses..."
 msgstr "Uredi nedavne adrese..."
 
-#: configuredialog.cpp:2676 kmedit.cpp:540
+#: configuredialog.cpp:2768 kmedit.cpp:633
 msgid "External Editor"
 msgstr "Eksterni uređivač"
 
-#: configuredialog.cpp:2707
+#: configuredialog.cpp:2799
 #, fuzzy, c-format
 msgid "<b>%f</b> will be replaced with the filename to edit."
 msgstr "<b>%f</b> će biti zamijenjeno imenom datoteke za uređivanje."
 
-#: 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,"
@@ -1923,54 +2176,54 @@ msgid ""
 "<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
 msgstr ""
 
-#: configuredialog.cpp:2830
+#: configuredialog.cpp:2943
 msgid "Lang&uage:"
 msgstr "&Jezik:"
 
-#: 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 "&Ukloni"
 
-#: configuredialog.cpp:2853
+#: configuredialog.cpp:2966
 msgid "Reply to se&nder:"
 msgstr "&Odgovori pošiljaocu:"
 
-#: configuredialog.cpp:2861
+#: configuredialog.cpp:2974
 msgid "Repl&y to all:"
 msgstr "&Odgovori svima:"
 
-#: configuredialog.cpp:2869
+#: configuredialog.cpp:2982
 msgid "&Forward:"
 msgstr "&Naprijed:"
 
 #. 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 "Znak &citata:"
 
-#: configuredialog.cpp:2922 kmmessage.cpp:3960
+#: configuredialog.cpp:3035 kmmessage.cpp:4048
 msgid "On %D, you wrote:"
 msgstr "Dana %D napisali ste:"
 
-#: configuredialog.cpp:2923 kmmessage.cpp:3962
+#: configuredialog.cpp:3036 kmmessage.cpp:4050
 msgid "On %D, %F wrote:"
 msgstr "Dana %D, %F je napisao/la:"
 
-#: configuredialog.cpp:2924 kmmessage.cpp:3964
+#: configuredialog.cpp:3037 kmmessage.cpp:4052
 msgid "Forwarded Message"
 msgstr "Proslijeđena poruka"
 
-#: configuredialog.cpp:2925
+#: configuredialog.cpp:3038
 msgid ">%_"
 msgstr ">%_"
 
-#: configuredialog.cpp:3074
+#: configuredialog.cpp:3187
 msgid "Repl&y Subject Prefixes"
 msgstr "Pref&iks za odgovor na predmet"
 
-#: 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):"
@@ -1978,23 +2231,23 @@ msgstr ""
 "Prepoznaje bilo koju sekvencu sljedećih prefiksa\n"
 "(stavke su regularni izrazi neosjetljivi na mala i velika slova):"
 
-#: configuredialog.cpp:3088 configuredialog.cpp:3499
+#: configuredialog.cpp:3201 configuredialog.cpp:3612
 msgid "Mod&ify..."
 msgstr "&Izmijeni..."
 
-#: configuredialog.cpp:3089
+#: configuredialog.cpp:3202
 msgid "Enter new reply prefix:"
 msgstr "Unesite novi prefiks za odgovor:"
 
-#: configuredialog.cpp:3103
+#: configuredialog.cpp:3216
 msgid "For&ward Subject Prefixes"
 msgstr "Proslijeđivanje &prefiksa naslova"
 
-#: configuredialog.cpp:3117
+#: configuredialog.cpp:3230
 msgid "Enter new forward prefix:"
 msgstr "Unesite novi prefiks za prosijleđivanje:"
 
-#: configuredialog.cpp:3156
+#: configuredialog.cpp:3269
 #, fuzzy
 msgid ""
 "This list is checked for every outgoing message from the top to the bottom for "
@@ -2003,62 +2256,62 @@ msgstr ""
 "Ova lista se provjerava odozgo na dole za svaku odlaznu poruku, radi "
 "pronalaženja skupa znakova koji sadrži sve zahtjevane znake."
 
-#: configuredialog.cpp:3165
+#: configuredialog.cpp:3278
 msgid "Enter charset:"
 msgstr "Unesite znakovni skup:"
 
-#: configuredialog.cpp:3171
+#: configuredialog.cpp:3284
 #, fuzzy
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr ""
 "&Zadrži originalni kod lokalnih znakova kod odgovora ili proslijeđivanja (ako "
 "je moguće)."
 
-#: configuredialog.cpp:3205
+#: configuredialog.cpp:3318
 #, fuzzy
 msgid "This charset is not supported."
 msgstr "Ovaj skup znakova nije podržan."
 
-#: configuredialog.cpp:3256
+#: configuredialog.cpp:3369
 #, fuzzy
 msgid "&Use custom message-id suffix"
 msgstr "Koristi poseban s&ufiks za id. poruke"
 
-#: configuredialog.cpp:3269
+#: configuredialog.cpp:3382
 msgid "Custom message-&id suffix:"
 msgstr "Poseban suf&iks za id. poruke:"
 
-#: configuredialog.cpp:3283
+#: configuredialog.cpp:3396
 msgid "Define custom mime header fields:"
 msgstr "Definirajte posebna mime polja zaglavlja:"
 
-#: configuredialog.cpp:3291
+#: configuredialog.cpp:3404
 msgid "Value"
 msgstr "Vrijednost"
 
-#: configuredialog.cpp:3299
+#: configuredialog.cpp:3412
 msgid "Ne&w"
 msgstr "&Novi"
 
 #. 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 "&Ime:"
 
-#: configuredialog.cpp:3321
+#: configuredialog.cpp:3434
 msgid "&Value:"
 msgstr "&Vrijednost:"
 
-#. 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 ""
 
-#: configuredialog.cpp:3471
+#: configuredialog.cpp:3584
 #, fuzzy
 msgid ""
 "Turn this option on to make Outlook(tm) understand attachment names containing "
@@ -2067,31 +2320,31 @@ msgstr ""
 "Uključite ovu opciju ako želite da Outlook(tm) razume vaše odgovore na "
 "pozivnice"
 
-#: configuredialog.cpp:3482
+#: configuredialog.cpp:3595
 msgid "E&nable detection of missing attachments"
 msgstr "Uključi detekciju &nedostajućih priloga"
 
-#: configuredialog.cpp:3489
+#: configuredialog.cpp:3602
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr ""
 "Prepoznaj bilo koju od sljedećih ključnih riječi kao namjeru da se priloži "
 "datoteka:"
 
-#: configuredialog.cpp:3500
+#: configuredialog.cpp:3613
 msgid "Enter new key word:"
 msgstr "Unesite novu ključnu reč:"
 
-#: 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 "prilog"
 
-#: 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 "odan"
 
-#: 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 "
@@ -2102,29 +2355,29 @@ msgid ""
 "option."
 msgstr ""
 
-#: configuredialog.cpp:3569
+#: configuredialog.cpp:3682
 #, fuzzy
 msgid "&Reading"
 msgstr "&Slanje"
 
-#: configuredialog.cpp:3575
+#: configuredialog.cpp:3688
 #, fuzzy
 msgid "Composing"
 msgstr "Composer"
 
-#: configuredialog.cpp:3581
+#: configuredialog.cpp:3694
 msgid "Warnings"
 msgstr "Upozorenja"
 
-#: configuredialog.cpp:3587
+#: configuredialog.cpp:3700
 msgid "S/MIME &Validation"
 msgstr ""
 
-#: configuredialog.cpp:3593
+#: configuredialog.cpp:3706
 msgid "Crypto Backe&nds"
 msgstr "Pozadine za kriptiranje"
 
-#: configuredialog.cpp:3624
+#: configuredialog.cpp:3737
 msgid ""
 "<qt>"
 "<p>Messages sometimes come in both formats. This option controls whether you "
@@ -2142,7 +2395,7 @@ msgid ""
 "Folder</i> menu of KMail's main window.</p></qt>"
 msgstr ""
 
-#: configuredialog.cpp:3641
+#: configuredialog.cpp:3754
 msgid ""
 "<qt>"
 "<p>Some mail advertisements are in HTML and contain references to, for example, "
@@ -2157,7 +2410,7 @@ msgid ""
 "possible problem.</p></qt>"
 msgstr ""
 
-#: configuredialog.cpp:3654
+#: configuredialog.cpp:3767
 msgid ""
 "<qt>"
 "<h3>Message Disposition Notification Policy</h3>"
@@ -2184,20 +2437,20 @@ msgid ""
 "customer relationship management, it has been made available.</li></ul></qt>"
 msgstr ""
 
-#: configuredialog.cpp:3687
+#: configuredialog.cpp:3800
 #, fuzzy
 msgid "HTML Messages"
 msgstr "Zastarijevanje poruka"
 
-#: configuredialog.cpp:3690
+#: configuredialog.cpp:3803
 msgid "Prefer H&TML to plain text"
 msgstr "&Preferira HTML umjesto čistog teksta"
 
-#: configuredialog.cpp:3694
+#: configuredialog.cpp:3807
 msgid "Allow messages to load e&xternal references from the Internet"
 msgstr "Dozvoli porukama da učitaju &vanjske reference sa Interneta"
 
-#: 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 "
@@ -2205,63 +2458,63 @@ msgid ""
 "More about external references...</a>"
 msgstr ""
 
-#: configuredialog.cpp:3711
+#: configuredialog.cpp:3824
 #, fuzzy
 msgid "Encrypted Messages"
 msgstr "Šifriraj poruku"
 
-#: configuredialog.cpp:3713
+#: configuredialog.cpp:3826
 #, fuzzy
 msgid "Attempt decryption of encrypted messages when viewing"
 msgstr "Automatski kriptiraj poruke &kad god je to moguće"
 
-#: configuredialog.cpp:3718
+#: configuredialog.cpp:3831
 msgid "Message Disposition Notifications"
 msgstr "Obavijesti o raspoređivanju poruka"
 
-#: configuredialog.cpp:3730
+#: configuredialog.cpp:3843
 #, fuzzy
 msgid "Send policy:"
 msgstr "Politika slanja:"
 
-#: configuredialog.cpp:3732 kmmessage.cpp:1361 kmmessage.cpp:1368
+#: configuredialog.cpp:3845 kmmessage.cpp:1381 kmmessage.cpp:1388
 msgid "&Ignore"
 msgstr "Z&anemari"
 
-#: configuredialog.cpp:3735
+#: configuredialog.cpp:3848
 msgid "As&k"
 msgstr "&Pitaj"
 
-#: configuredialog.cpp:3738
+#: configuredialog.cpp:3851
 msgid "&Deny"
 msgstr "&Odbij"
 
-#: configuredialog.cpp:3741
+#: configuredialog.cpp:3854
 msgid "Al&ways send"
 msgstr "&Uvijek šalji"
 
-#: configuredialog.cpp:3759
+#: configuredialog.cpp:3872
 msgid "Quote original message:"
 msgstr "Citiraj originalnu poruku:"
 
-#: configuredialog.cpp:3761
+#: configuredialog.cpp:3874
 msgid "Nothin&g"
 msgstr "&Ništa"
 
-#: configuredialog.cpp:3764
+#: configuredialog.cpp:3877
 msgid "&Full message"
 msgstr "&Cijela poruka"
 
-#: configuredialog.cpp:3767
+#: configuredialog.cpp:3880
 msgid "Onl&y headers"
 msgstr "Samo &zaglavlja"
 
-#: configuredialog.cpp:3773
+#: configuredialog.cpp:3886
 #, fuzzy
 msgid "Do not send MDNs in response to encrypted messages"
 msgstr "&Upozori pri pokušaju slanja nekriptiranih poruka"
 
-#: configuredialog.cpp:3777
+#: configuredialog.cpp:3890
 msgid ""
 "<b>WARNING:</b> Unconditionally returning confirmations undermines your "
 "privacy. <a href=\"whatsthis:%1\">More...</a>"
@@ -2269,140 +2522,154 @@ msgstr ""
 "<b>UPOZORENjE:</b> Bezuvjetno slanje potvrda podriva vašu privatnost <a "
 "href=\"whatsthis:%1\">Više o ovome...</a>"
 
-#: configuredialog.cpp:3786
+#: configuredialog.cpp:3899
 #, fuzzy
 msgid "Certificate && Key Bundle Attachments"
 msgstr "Upravljanje Certifikatima"
 
-#: configuredialog.cpp:3789
+#: configuredialog.cpp:3902
 #, fuzzy
 msgid "Automatically import keys and certificates"
 msgstr "&Automatski dodaj potpis"
 
-#: configuredialog.cpp:3850
+#: configuredialog.cpp:3963
 msgid ""
 "Changing the global HTML setting will override all folder specific values."
 msgstr ""
 "Promjena globalne HTML postavke će pregaziti sve vrijednosti postavki "
 "specifične za mape."
 
-#: 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 "&Direktoriji"
 
-#: configuredialog.cpp:4428
+#: configuredialog.cpp:4541
 msgid "&Groupware"
 msgstr "&Groupware"
 
-#: configuredialog.cpp:4449
+#: configuredialog.cpp:4562
 msgid ""
 "_: Corresponds to Folder->Move All Messages to Trash\n"
 "Ask for co&nfirmation before moving all messages to trash"
 msgstr "Traži &potvrdu prije premještanja svih poruka u smeće"
 
-#: configuredialog.cpp:4456
+#: configuredialog.cpp:4569
 msgid "E&xclude important messages from expiry"
 msgstr "Isključi važne poruke od isteka"
 
-#: 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 ""
 
-#: configuredialog.cpp:4470
+#: configuredialog.cpp:4583
 msgid ""
 "_: continuation of \"When trying to find unread messages:\"\n"
 "Do not Loop"
 msgstr ""
 
-#: configuredialog.cpp:4472
+#: configuredialog.cpp:4585
 msgid ""
 "_: continuation of \"When trying to find unread messages:\"\n"
 "Loop in Current Folder"
 msgstr "Kruži u trenutnoj mapi"
 
-#: configuredialog.cpp:4474
+#: configuredialog.cpp:4587
 msgid ""
 "_: continuation of \"When trying to find unread messages:\"\n"
 "Loop in All Folders"
 msgstr "Kruži po svim mapama"
 
-#: 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 ""
 
-#: configuredialog.cpp:4490
+#: configuredialog.cpp:4603
 #, fuzzy
 msgid ""
 "_: continuation of \"When entering a folder:\"\n"
 "Jump to First New Message"
 msgstr "Kruži po svim mapama"
 
-#: configuredialog.cpp:4492
+#: configuredialog.cpp:4605
 #, fuzzy
 msgid ""
 "_: continuation of \"When entering a folder:\"\n"
 "Jump to First Unread or New Message"
 msgstr "Kruži po svim mapama"
 
-#: configuredialog.cpp:4494
+#: configuredialog.cpp:4607
 #, fuzzy
 msgid ""
 "_: continuation of \"When entering a folder:\"\n"
 "Jump to Last Selected Message"
 msgstr "Kruži po svim mapama"
 
-#: configuredialog.cpp:4501
+#: configuredialog.cpp:4609
+#, fuzzy
+msgid ""
+"_: continuation of \"When entering a folder:\"\n"
+"Jump to Newest Message"
+msgstr "Kruži po svim mapama"
+
+#: configuredialog.cpp:4611
+#, fuzzy
+msgid ""
+"_: continuation of \"When entering a folder:\"\n"
+"Jump to Oldest Message"
+msgstr "Kruži po svim mapama"
+
+#: configuredialog.cpp:4618
 msgid "Mar&k selected message as read after"
 msgstr "Označi odabrane poru&ke kao pročitane nakon"
 
-#: 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 "Pitaj za &akciju prilikom prevlačenja poruka u drugu mapu"
 
-#: configuredialog.cpp:4529
+#: configuredialog.cpp:4646
 #, fuzzy
 msgid ""
 "_: to be continued with \"flat files\" and \"directories\", resp.\n"
 "By default, &message folders on disk are:"
 msgstr "Uobičajeno, mape za poruke na disku su:"
 
-#: configuredialog.cpp:4532
+#: configuredialog.cpp:4649
 msgid ""
 "_: continuation of \"By default, &message folders on disk are\"\n"
 "Flat Files (\"mbox\" format)"
 msgstr "obične datoteke („mbox“ formata)"
 
-#: configuredialog.cpp:4534
+#: configuredialog.cpp:4651
 msgid ""
 "_: continuation of \"By default, &message folders on disk are\"\n"
 "Directories (\"maildir\" format)"
 msgstr "direktoriji („maildir“ formata)"
 
-#: configuredialog.cpp:4537
+#: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
 "<qt>"
@@ -2417,37 +2684,37 @@ msgid ""
 "</qt>"
 msgstr ""
 
-#: configuredialog.cpp:4562
+#: configuredialog.cpp:4679
 msgid "Open this folder on startup:"
 msgstr "Otvori ovu mapu prilikom pokretanja:"
 
-#: configuredialog.cpp:4570
+#: configuredialog.cpp:4687
 #, fuzzy
 msgid "Empty local &trash folder on program exit"
 msgstr "Ispražnjivanje &smeća"
 
-#: configuredialog.cpp:4578
+#: configuredialog.cpp:4695
 msgid "Enable full text &indexing"
 msgstr ""
 
-#: configuredialog.cpp:4588
+#: configuredialog.cpp:4705
 #, fuzzy
 msgid "Quota units: "
 msgstr "Znak &citata:"
 
-#: configuredialog.cpp:4590 quotajobs.h:86
+#: configuredialog.cpp:4707 quotajobs.h:86
 msgid "KB"
 msgstr ""
 
-#: configuredialog.cpp:4591 quotajobs.h:91
+#: configuredialog.cpp:4708 quotajobs.h:91
 msgid "MB"
 msgstr ""
 
-#: configuredialog.cpp:4592 quotajobs.h:96
+#: configuredialog.cpp:4709 quotajobs.h:96
 msgid "GB"
 msgstr ""
 
-#: configuredialog.cpp:4601
+#: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
 "<qt>"
@@ -2465,7 +2732,7 @@ msgid ""
 "depending on which option is selected.</p></qt>"
 msgstr ""
 
-#: configuredialog.cpp:4618
+#: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
 "<qt>"
@@ -2478,111 +2745,111 @@ msgid ""
 "KMail while this operation is running.</p></qt>"
 msgstr ""
 
-#: configuredialog.cpp:4694
+#: configuredialog.cpp:4811
 msgid "&IMAP Resource Folder Options"
 msgstr "&Odrednice mape IMAP resursa"
 
-#: configuredialog.cpp:4698
+#: configuredialog.cpp:4815
 msgid "&Enable IMAP resource functionality"
 msgstr "&Uključi funkcionalnost IMAP resursa"
 
-#: configuredialog.cpp:4699
+#: configuredialog.cpp:4816
 msgid "This enables the IMAP storage for the Kontact applications"
 msgstr ""
 
-#: configuredialog.cpp:4712
+#: configuredialog.cpp:4829
 #, fuzzy
 msgid "&Format used for the groupware folders:"
 msgstr "Isključi groupware funkcije"
 
-#: configuredialog.cpp:4714
+#: configuredialog.cpp:4831
 msgid ""
 "Choose the format to use to store the contents of the groupware folders."
 msgstr ""
 
-#: configuredialog.cpp:4723
-msgid "Standard (Ical / Vcard)"
+#: configuredialog.cpp:4840
+msgid "Deprecated Kolab1 (iCal/vCard)"
 msgstr ""
 
-#: configuredialog.cpp:4723
-msgid "Kolab (XML)"
+#: configuredialog.cpp:4840
+msgid "Kolab2 (XML)"
 msgstr ""
 
-#: configuredialog.cpp:4731
+#: configuredialog.cpp:4848
 msgid "&Language of the groupware folders:"
 msgstr ""
 
-#: configuredialog.cpp:4734
+#: configuredialog.cpp:4851
 msgid "Set the language of the folder names"
 msgstr ""
 
-#: configuredialog.cpp:4743
+#: configuredialog.cpp:4860
 msgid "English"
 msgstr "Engleski"
 
-#: configuredialog.cpp:4743
+#: configuredialog.cpp:4860
 msgid "German"
 msgstr "Njemački"
 
-#: configuredialog.cpp:4743
+#: configuredialog.cpp:4860
 msgid "French"
 msgstr "Francuski"
 
-#: configuredialog.cpp:4743
+#: configuredialog.cpp:4860
 msgid "Dutch"
 msgstr "Nizozemski"
 
-#: configuredialog.cpp:4752
+#: configuredialog.cpp:4869
 msgid "Set the parent of the resource folders"
 msgstr ""
 
-#: configuredialog.cpp:4781
+#: configuredialog.cpp:4898
 #, fuzzy
 msgid "&Hide groupware folders"
 msgstr "Isključi groupware funkcije"
 
-#: configuredialog.cpp:4785
+#: configuredialog.cpp:4902
 msgid ""
 "When this is checked, you will not see the IMAP resource folders in the folder "
 "tree."
 msgstr ""
 
-#: configuredialog.cpp:4792
+#: configuredialog.cpp:4909
 #, fuzzy
 msgid "&Only show groupware folders for this account"
 msgstr "Mape re&sursa su podmape:"
 
-#: 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."
 msgstr ""
 
-#: 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 ""
 
-#: configuredialog.cpp:4823
+#: configuredialog.cpp:4940
 msgid "&Enable groupware functionality"
 msgstr "&Uključi groupware funkcionalnost"
 
-#: configuredialog.cpp:4831
+#: configuredialog.cpp:4948
 #, fuzzy
 msgid "Mangle From:/To: headers in replies to invitations"
 msgstr ""
 "S&tari način rada: Odsjeci „Od:/Za:“ zaglavlja iz odgovora na pozivnice"
 
-#: configuredialog.cpp:4832
+#: configuredialog.cpp:4949
 #, fuzzy
 msgid ""
 "Turn this option on in order to make Outlook(tm) understand your answers to "
@@ -2591,11 +2858,11 @@ msgstr ""
 "Uključite ovu opciju ako želite da Outlook(tm) razume vaše odgovore na "
 "pozivnice"
 
-#: configuredialog.cpp:4837
+#: configuredialog.cpp:4954
 msgid "Send invitations in the mail body"
 msgstr ""
 
-#: configuredialog.cpp:4838
+#: configuredialog.cpp:4955
 #, fuzzy
 msgid ""
 "Turn this option on in order to make Outlook(tm) understand your answers to "
@@ -2604,33 +2871,42 @@ msgstr ""
 "Uključite ovu opciju ako želite da Outlook(tm) razume vaše odgovore na "
 "pozivnice"
 
-#: configuredialog.cpp:4846
+#: configuredialog.cpp:4963
 msgid "Exchange compatible invitation naming"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 183
-#: configuredialog.cpp:4847 rc.cpp:685
+#: configuredialog.cpp:4964
+msgid ""
+"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 190
+#: configuredialog.cpp:4970 rc.cpp:694
 #, no-c-format
+msgid "Outlook compatible invitation reply comments"
+msgstr ""
+
+#: configuredialog.cpp:4971
 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."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 188
-#: configuredialog.cpp:4853 rc.cpp:688
+#. i18n: file kmail.kcfg line 196
+#: configuredialog.cpp:4977 rc.cpp:700
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr ""
 
-#: 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"
 msgstr ""
 
-#: 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 "
@@ -2642,17 +2918,17 @@ msgid ""
 "be able to work with this.</qt>"
 msgstr ""
 
-#: configuredialog.cpp:4922
+#: configuredialog.cpp:5048
 #, fuzzy
 msgid "<Choose a Folder>"
 msgstr "Načini direktorij"
 
-#: configuredialog.cpp:5026
+#: configuredialog.cpp:5154
 #, fuzzy
 msgid "&Resource folders are subfolders of:"
 msgstr "Mape re&sursa su podmape:"
 
-#: configuredialog.cpp:5029
+#: configuredialog.cpp:5157
 #, fuzzy
 msgid "&Resource folders are in account:"
 msgstr "Mape re&sursa su podmape:"
@@ -2721,35 +2997,35 @@ msgid ""
 "Not available"
 msgstr "Nije dostupno"
 
-#: customtemplates.cpp:87
+#: customtemplates.cpp:100
 #, fuzzy
 msgid ""
 "_: Message->\n"
 "Universal"
 msgstr "&Odgovori"
 
-#: customtemplates.cpp:88 customtemplates.cpp:131
+#: customtemplates.cpp:101 customtemplates.cpp:180
 #, fuzzy
 msgid ""
 "_: Message->\n"
 "Reply"
 msgstr "&Odgovori"
 
-#: customtemplates.cpp:89 customtemplates.cpp:133
+#: customtemplates.cpp:102 customtemplates.cpp:182
 #, fuzzy
 msgid ""
 "_: Message->\n"
 "Reply to All"
 msgstr "&Odgovori"
 
-#: customtemplates.cpp:90 customtemplates.cpp:135
+#: customtemplates.cpp:103 customtemplates.cpp:184
 #, fuzzy
 msgid ""
 "_: Message->\n"
 "Forward"
 msgstr "&Proslijedi"
 
-#: customtemplates.cpp:93
+#: customtemplates.cpp:106
 msgid ""
 "<qt>"
 "<p>Here you can add, edit, and delete custom message templates to use when you "
@@ -2764,175 +3040,197 @@ 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 "Automatski kriptiraj poruke &kad god je to moguće"
+
+#: customtemplates.cpp:123
+msgid "Additional recipients who get a copy of the message when forwarding"
+msgstr ""
+
+#: customtemplates.cpp:124
+msgid ""
+"When using this template for forwarding, the default recipients are those you "
+"enter here. This is a comma-separated list of mail addresses."
+msgstr ""
+
+#: customtemplates.cpp:125
+msgid ""
+"When using this template for forwarding, the recipients you enter here will by "
+"default get a copy of this message. This is a comma-separated list of mail "
+"addresses."
+msgstr ""
+
+#: customtemplates.cpp:186
 #, fuzzy
 msgid ""
 "_: Message->\n"
 "Unknown"
 msgstr "&Proslijedi"
 
-#: 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
 #, fuzzy
 msgid "Save Distribution List"
 msgstr "Opis:"
 
-#: distributionlistdialog.cpp:97
+#: distributionlistdialog.cpp:98
 #, fuzzy
 msgid "Save List"
 msgstr "&Napravi filtar"
 
-#: distributionlistdialog.cpp:106
+#: distributionlistdialog.cpp:107
 #, fuzzy
 msgid "Name:"
 msgstr "&Ime:"
 
-#: distributionlistdialog.cpp:116 recipientspicker.cpp:390
+#: distributionlistdialog.cpp:117 recipientspicker.cpp:390
 #, fuzzy
 msgid "Email"
 msgstr "KMail"
 
-#: 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
 #, fuzzy
 msgid "New Distribution List"
 msgstr "Opis:"
 
-#: distributionlistdialog.cpp:186
+#: distributionlistdialog.cpp:185
 msgid "Please enter name:"
 msgstr ""
 
-#: 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 "Uredi identitet"
 
-#: 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 "prilog"
 
-#: encodingdetector.cpp:1250 encodingdetector.cpp:1352
+#: encodingdetector.cpp:1170 encodingdetector.cpp:1272
 msgid ""
 "_: @item Text character set\n"
 "Unicode"
 msgstr ""
 
-#: encodingdetector.cpp:1252 encodingdetector.cpp:1322
+#: encodingdetector.cpp:1172 encodingdetector.cpp:1242
 msgid ""
 "_: @item Text character set\n"
 "Cyrillic"
 msgstr ""
 
-#: encodingdetector.cpp:1254 encodingdetector.cpp:1337
+#: encodingdetector.cpp:1174 encodingdetector.cpp:1257
 msgid ""
 "_: @item Text character set\n"
 "Western European"
 msgstr ""
 
-#: encodingdetector.cpp:1256 encodingdetector.cpp:1319
+#: encodingdetector.cpp:1176 encodingdetector.cpp:1239
 msgid ""
 "_: @item Text character set\n"
 "Central European"
 msgstr ""
 
-#: encodingdetector.cpp:1258 encodingdetector.cpp:1325
+#: encodingdetector.cpp:1178 encodingdetector.cpp:1245
 msgid ""
 "_: @item Text character set\n"
 "Greek"
 msgstr ""
 
-#: encodingdetector.cpp:1260 encodingdetector.cpp:1328
+#: encodingdetector.cpp:1180 encodingdetector.cpp:1248
 msgid ""
 "_: @item Text character set\n"
 "Hebrew"
 msgstr ""
 
-#: encodingdetector.cpp:1262 encodingdetector.cpp:1334
+#: encodingdetector.cpp:1182 encodingdetector.cpp:1254
 msgid ""
 "_: @item Text character set\n"
 "Turkish"
 msgstr ""
 
-#: encodingdetector.cpp:1264 encodingdetector.cpp:1331
+#: encodingdetector.cpp:1184 encodingdetector.cpp:1251
 msgid ""
 "_: @item Text character set\n"
 "Japanese"
 msgstr ""
 
-#: encodingdetector.cpp:1266 encodingdetector.cpp:1316
+#: encodingdetector.cpp:1186 encodingdetector.cpp:1236
 msgid ""
 "_: @item Text character set\n"
 "Baltic"
 msgstr ""
 
-#: encodingdetector.cpp:1268 encodingdetector.cpp:1313
+#: encodingdetector.cpp:1188 encodingdetector.cpp:1233
 msgid ""
 "_: @item Text character set\n"
 "Arabic"
 msgstr ""
 
-#: encodingdetector.cpp:1340
+#: encodingdetector.cpp:1260
 msgid ""
 "_: @item Text character set\n"
 "Chinese Traditional"
 msgstr ""
 
-#: encodingdetector.cpp:1343
+#: encodingdetector.cpp:1263
 msgid ""
 "_: @item Text character set\n"
 "Chinese Simplified"
 msgstr ""
 
-#: encodingdetector.cpp:1346
+#: encodingdetector.cpp:1266
 msgid ""
 "_: @item Text character set\n"
 "Korean"
 msgstr ""
 
-#: encodingdetector.cpp:1349
+#: encodingdetector.cpp:1269
 msgid ""
 "_: @item Text character set\n"
 "Thai"
 msgstr ""
 
-#: expirejob.cpp:164
+#: expirejob.cpp:177
 #, fuzzy
 msgid ""
 "_n: Removing 1 old message from folder %1...\n"
@@ -2942,17 +3240,17 @@ msgstr ""
 "%n poruke, %1.\n"
 "%n poruka, %1."
 
-#: expirejob.cpp:171
+#: expirejob.cpp:184
 msgid "Cannot expire messages from folder %1: destination folder %2 not found"
 msgstr ""
 
-#: 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..."
 msgstr ""
 
-#: expirejob.cpp:214
+#: expirejob.cpp:227
 #, fuzzy
 msgid ""
 "_n: Removed 1 old message from folder %1.\n"
@@ -2962,7 +3260,7 @@ msgstr ""
 "%n poruke, %1.\n"
 "%n poruka, %1."
 
-#: expirejob.cpp:220
+#: expirejob.cpp:233
 #, fuzzy
 msgid ""
 "_n: Moved 1 old message from folder %1 to folder %2.\n"
@@ -2972,12 +3270,12 @@ msgstr ""
 "%n poruke, %1.\n"
 "%n poruka, %1."
 
-#: expirejob.cpp:227
+#: expirejob.cpp:240
 #, fuzzy
 msgid "Removing old messages from folder %1 failed."
 msgstr "Premještanje poruka nije uspjelo."
 
-#: expirejob.cpp:231
+#: expirejob.cpp:244
 #, fuzzy
 msgid "Moving old messages from folder %1 to folder %2 failed."
 msgstr ""
@@ -2985,7 +3283,7 @@ msgstr ""
 "%n poruke, %1.\n"
 "%n poruka, %1."
 
-#: expirejob.cpp:237
+#: expirejob.cpp:250
 #, fuzzy
 msgid "Removing old messages from folder %1 was canceled."
 msgstr ""
@@ -2993,7 +3291,7 @@ msgstr ""
 "%n poruke, %1.\n"
 "%n poruka, %1."
 
-#: expirejob.cpp:241
+#: expirejob.cpp:254
 msgid "Moving old messages from folder %1 to folder %2 was canceled."
 msgstr ""
 
@@ -3037,90 +3335,107 @@ msgid ""
 "Note: Expiry action will be applied immediately after confirming settings."
 msgstr ""
 
-#: expirypropertiesdialog.cpp:163
+#: expirypropertiesdialog.cpp:167
 #, fuzzy
 msgid "Please select a folder to expire messages into."
 msgstr "Označite koje filtere želite kreirati unutar KMail-a."
 
-#: expirypropertiesdialog.cpp:164
+#: expirypropertiesdialog.cpp:168
 #, fuzzy
 msgid "No Folder Selected"
 msgstr "&Duži popis mapa"
 
-#: favoritefolderview.cpp:90
+#: expirypropertiesdialog.cpp:176
 #, fuzzy
-msgid "Favorite Folders"
-msgstr "Načini direktorij"
+msgid ""
+"Please select a different folder than the current folder to expire message "
+"into."
+msgstr "Označite koje filtere želite kreirati unutar KMail-a."
 
-#: favoritefolderview.cpp:326
+#: expirypropertiesdialog.cpp:178
 #, fuzzy
-msgid "Remove From Favorites"
-msgstr "Ukloni znakove za citi&ranje"
+msgid "Wrong Folder Selected"
+msgstr "&Duži popis mapa"
 
-#: favoritefolderview.cpp:328 favoritefolderview.cpp:378
+#: favoritefolderview.cpp:90
 #, fuzzy
-msgid "Rename Favorite"
-msgstr "Promijeni ime filtera"
+msgid "Favorite Folders"
+msgstr "Načini direktorij"
 
-#: favoritefolderview.cpp:337 kmfoldertree.cpp:1153 kmmainwidget.cpp:2767
+#: favoritefolderview.cpp:337 kmfoldertree.cpp:1190 kmmainwidget.cpp:2790
 msgid "&Assign Shortcut..."
 msgstr ""
 
-#: favoritefolderview.cpp:338 kmfoldertree.cpp:1158
+#: favoritefolderview.cpp:338 kmfoldertree.cpp:1195
 #, fuzzy
 msgid "Expire..."
 msgstr "Izbaci stare poruke"
 
-#: favoritefolderview.cpp:341
+#: favoritefolderview.cpp:342
+#, fuzzy
+msgid "Remove From Favorites"
+msgstr "Ukloni znakove za citi&ranje"
+
+#: favoritefolderview.cpp:344 favoritefolderview.cpp:389
+#, fuzzy
+msgid "Rename Favorite"
+msgstr "Promijeni ime filtera"
+
+#: favoritefolderview.cpp:347
 #, fuzzy
 msgid "Add Favorite Folder..."
 msgstr "&Novi direktorij..."
 
-#: favoritefolderview.cpp:395
+#: favoritefolderview.cpp:406
 #, fuzzy
 msgid "Local Inbox"
 msgstr "&Lokalni sandučić"
 
-#: 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 "Načini direktorij"
 
-#: filterimporterexporter.cpp:51
+#: filterimporterexporter.cpp:50
 #, fuzzy
 msgid "Select Filters"
 msgstr "Obriši Mapu"
 
-#: filterimporterexporter.cpp:58
+#: filterimporterexporter.cpp:61
 #, fuzzy
 msgid "Filters"
 msgstr "Filtar %1"
 
-#: filterimporterexporter.cpp:182
+#: filterimporterexporter.cpp:67
+#, fuzzy
+msgid "Unselect All"
+msgstr "Od&aberi sve poruke..."
+
+#: filterimporterexporter.cpp:213
 #, fuzzy
 msgid "Import Filters"
 msgstr "&Napravi filtar"
 
-#: 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 "Izbaci stare poruke iz mape"
@@ -3191,8 +3506,8 @@ msgstr ""
 "Pisanje u datoteku %1 nije uspjelo:\n"
 "\"%2\" je detaljni opis greške."
 
-#: 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 greška"
 
@@ -3243,79 +3558,96 @@ msgid ""
 "account on the server will tell you which one it is."
 msgstr ""
 
-#: folderdiaacltab.cpp:106 folderdiaacltab.cpp:341
+#: folderdiaacltab.cpp:103 recipientseditor.cpp:776
+#, fuzzy
+msgid "Se&lect..."
+msgstr "Obriši Mapu"
+
+#: folderdiaacltab.cpp:106 folderdiaacltab.cpp:340
 msgid "Permissions"
 msgstr "Dozvole"
 
-#: 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 ""
 
-#: folderdiaacltab.cpp:249
+#: folderdiaacltab.cpp:247
 msgid "Custom Permissions (%1)"
 msgstr ""
 
-#: folderdiaacltab.cpp:340
+#: folderdiaacltab.cpp:339
 msgid "User Id"
 msgstr ""
 
-#: folderdiaacltab.cpp:352
+#: folderdiaacltab.cpp:351
 #, fuzzy
 msgid "Add Entry..."
 msgstr "Dodaj korisnički račun"
 
-#: folderdiaacltab.cpp:353
+#: folderdiaacltab.cpp:352
 #, fuzzy
 msgid "Modify Entry..."
 msgstr "Promijeni korisnički račun"
 
-#: folderdiaacltab.cpp:354
+#: folderdiaacltab.cpp:353
 #, fuzzy
 msgid "Remove Entry"
 msgstr "&Ukloni"
 
-#: folderdiaacltab.cpp:426
+#: folderdiaacltab.cpp:428
 msgid "Error retrieving user permissions."
 msgstr ""
 
-#: 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 "Nemate dozvole za čitanje i(ili) upis u mapu za smeće."
+
+#: folderdiaacltab.cpp:435
+msgid ""
+"Information not retrieved from server, you need to use \"Check Mail\" and have "
+"administrative privileges on the folder."
 msgstr ""
 
-#: folderdiaacltab.cpp:446 folderdiaquotatab.cpp:114
+#: folderdiaacltab.cpp:450 folderdiaquotatab.cpp:114
 msgid "Error: no IMAP account defined for this folder"
 msgstr ""
 
-#: folderdiaacltab.cpp:452 folderdiaquotatab.cpp:120
+#: folderdiaacltab.cpp:456 folderdiaquotatab.cpp:120
 msgid "Connecting to server %1, please wait..."
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: folderdiaacltab.cpp:519
+#: folderdiaacltab.cpp:524
 #, c-format
 msgid ""
 "Error retrieving access control list (ACL) from server\n"
 "%1"
 msgstr ""
 
-#: folderdiaacltab.cpp:564
+#: folderdiaacltab.cpp:569
 msgid "Modify Permissions"
 msgstr ""
 
-#: folderdiaacltab.cpp:598
+#: folderdiaacltab.cpp:603
 msgid "Add Permissions"
 msgstr ""
 
-#: 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."
@@ -3349,8 +3681,8 @@ msgstr ""
 msgid "Select Folder"
 msgstr "Obriši Mapu"
 
-#: 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 "Direktoriji"
 
@@ -3381,7 +3713,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 ""
 
@@ -3397,13 +3729,20 @@ msgstr "&Iskopiraj ovdje"
 msgid "C&ancel"
 msgstr "O&tkaži"
 
-#: 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 "Napoznato"
 
-#: 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 "Nema Teme"
 
@@ -3421,47 +3760,47 @@ msgstr ""
 msgid "Stat&us:"
 msgstr ""
 
-#: headerlistquicksearch.cpp:72
+#: headerlistquicksearch.cpp:73
 msgid "Any Status"
 msgstr ""
 
-#: headerlistquicksearch.cpp:91
+#: headerlistquicksearch.cpp:93
 #, fuzzy
 msgid "Open Full Search"
 msgstr "<primatelji>"
 
-#: 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 "[vCard]"
 
-#: headerstyle.cpp:174 headerstyle.cpp:314 headerstyle.cpp:672
-#: headerstyle.cpp:797
+#: headerstyle.cpp:175 headerstyle.cpp:316 headerstyle.cpp:790
+#: headerstyle.cpp:998
 msgid "CC: "
 msgstr "CC: "
 
-#: headerstyle.cpp:177 headerstyle.cpp:318 headerstyle.cpp:679
-#: headerstyle.cpp:800
+#: headerstyle.cpp:178 headerstyle.cpp:320 headerstyle.cpp:797
+#: headerstyle.cpp:1008
 msgid "BCC: "
 msgstr "BCC: "
 
-#: headerstyle.cpp:272 headerstyle.cpp:685
+#: headerstyle.cpp:274 headerstyle.cpp:803
 msgid "Date: "
 msgstr "Datum: "
 
-#: headerstyle.cpp:292 headerstyle.cpp:639 headerstyle.cpp:865
+#: headerstyle.cpp:294 headerstyle.cpp:757 headerstyle.cpp:979
 msgid "From: "
 msgstr "Od: "
 
-#: headerstyle.cpp:310 headerstyle.cpp:665 headerstyle.cpp:873
+#: headerstyle.cpp:312 headerstyle.cpp:783 headerstyle.cpp:988
 msgid "To: "
 msgstr "Za: "
 
-#: headerstyle.cpp:322
+#: headerstyle.cpp:324
 msgid "Reply to: "
 msgstr "Odgovori na: "
 
-#: headerstyle.cpp:408
+#: headerstyle.cpp:410
 msgid ""
 "%1% probability of being spam.\n"
 "\n"
@@ -3469,24 +3808,47 @@ 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 "Upozorenja"
+
+#: headerstyle.cpp:678
+#, fuzzy
+msgid "Afternoon"
+msgstr "Poslije"
+
+#: headerstyle.cpp:687
+msgid "Evening"
+msgstr ""
+
+#: headerstyle.cpp:724
+#, fuzzy
+msgid "Sender's Current Time:"
+msgstr "Identitet pošiljao&ca:"
+
+#: headerstyle.cpp:760
 msgid "(resent from %1)"
 msgstr ""
 
-#: headerstyle.cpp:694
+#: headerstyle.cpp:812
 #, fuzzy
 msgid "User-Agent: "
 msgstr "&Hitno"
 
-#: headerstyle.cpp:703
+#: headerstyle.cpp:821
 msgid "X-Mailer: "
 msgstr ""
 
-#: headerstyle.cpp:723
+#: headerstyle.cpp:843
 #, fuzzy
 msgid "Spam Status:"
 msgstr "Status: "
@@ -3540,15 +3902,15 @@ msgid ""
 "<br>e</qt>"
 msgstr ""
 
-#: identitydialog.cpp:90
+#: identitydialog.cpp:93
 msgid "Edit Identity"
 msgstr "Uredi identitet"
 
-#: identitydialog.cpp:118
+#: identitydialog.cpp:121
 msgid "&Your name:"
 msgstr "&Vaše ime:"
 
-#: identitydialog.cpp:120
+#: identitydialog.cpp:123
 msgid ""
 "<qt>"
 "<h3>Your name</h3>"
@@ -3558,11 +3920,11 @@ msgid ""
 "address.</p></qt>"
 msgstr ""
 
-#: identitydialog.cpp:132
+#: identitydialog.cpp:135
 msgid "Organi&zation:"
 msgstr "Or&ganizacija:"
 
-#: identitydialog.cpp:134
+#: identitydialog.cpp:137
 msgid ""
 "<qt>"
 "<h3>Organization</h3>"
@@ -3571,34 +3933,61 @@ msgid ""
 "<p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
 
-#: identitydialog.cpp:147
+#: identitydialog.cpp:149
 msgid "&Email address:"
 msgstr "Email adresa:"
 
-#: identitydialog.cpp:149
+#: identitydialog.cpp:151
 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 ""
 
-#: identitydialog.cpp:161
+#: identitydialog.cpp:165
+#, fuzzy
+msgid "Email a&liases:"
+msgstr "Email adresa:"
+
+#: 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 ""
 
-#: 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 "Skupovi &znakova..."
 
-#: identitydialog.cpp:169
+#: identitydialog.cpp:193
 #, fuzzy
 msgid "Your OpenPGP Signature Key"
 msgstr "Vaš OpenPGP ključ"
 
-#: identitydialog.cpp:170
+#: identitydialog.cpp:194
 #, fuzzy
 msgid ""
 "Select the OpenPGP key which should be used to digitally sign your messages."
@@ -3606,7 +3995,7 @@ msgstr ""
 "Odaberite OpenPGP ključ koji će biti korišten za potpisivanje vaših poruka i "
 "pri šifriranju za sebe. "
 
-#: identitydialog.cpp:174
+#: identitydialog.cpp:198
 msgid ""
 "<qt>"
 "<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
@@ -3616,17 +4005,17 @@ msgid ""
 "<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
 msgstr ""
 
-#: identitydialog.cpp:181
+#: identitydialog.cpp:205
 #, fuzzy
 msgid "OpenPGP signing key:"
 msgstr "OpenPGP ključ:"
 
-#: identitydialog.cpp:193
+#: identitydialog.cpp:217
 #, fuzzy
 msgid "Your OpenPGP Encryption Key"
 msgstr "Vaš OpenPGP ključ"
 
-#: identitydialog.cpp:194
+#: identitydialog.cpp:218
 #, fuzzy
 msgid ""
 "Select the OpenPGP key which should be used when encrypting to yourself and for "
@@ -3635,7 +4024,7 @@ msgstr ""
 "Odaberite OpenPGP ključ koji će biti korišten za potpisivanje vaših poruka i "
 "pri šifriranju za sebe. "
 
-#: identitydialog.cpp:199
+#: identitydialog.cpp:223
 msgid ""
 "<qt>"
 "<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
@@ -3647,17 +4036,17 @@ msgid ""
 "<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
 msgstr ""
 
-#: identitydialog.cpp:206
+#: identitydialog.cpp:230
 #, fuzzy
 msgid "OpenPGP encryption key:"
 msgstr "OpenPGP ključ:"
 
-#: identitydialog.cpp:218
+#: identitydialog.cpp:242
 #, fuzzy
 msgid "Your S/MIME Signature Certificate"
 msgstr "Greška: Potpis nije provjeren"
 
-#: identitydialog.cpp:219
+#: identitydialog.cpp:243
 #, fuzzy
 msgid ""
 "Select the S/MIME certificate which should be used to digitally sign your "
@@ -3666,7 +4055,7 @@ msgstr ""
 "Odaberite OpenPGP ključ koji će biti korišten za potpisivanje vaših poruka i "
 "pri šifriranju za sebe. "
 
-#: identitydialog.cpp:223
+#: identitydialog.cpp:247
 msgid ""
 "<qt>"
 "<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
@@ -3675,22 +4064,22 @@ msgid ""
 "emails using S/MIME; normal mail functions will not be affected.</p></qt>"
 msgstr ""
 
-#: identitydialog.cpp:228
+#: identitydialog.cpp:252
 #, fuzzy
 msgid "S/MIME signing certificate:"
 msgstr "Slanje certifikata"
 
-#: identitydialog.cpp:244
+#: identitydialog.cpp:268
 msgid "Your S/MIME Encryption Certificate"
 msgstr ""
 
-#: 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."
 msgstr ""
 
-#: identitydialog.cpp:250
+#: identitydialog.cpp:274
 msgid ""
 "<qt>"
 "<p>The S/MIME certificate you choose here will be used to encrypt messages to "
@@ -3700,24 +4089,24 @@ msgid ""
 "affected.</p></qt>"
 msgstr ""
 
-#: identitydialog.cpp:256
+#: identitydialog.cpp:280
 #, fuzzy
 msgid "S/MIME encryption certificate:"
 msgstr "Odaberite &certifikat:"
 
-#: identitydialog.cpp:277
+#: identitydialog.cpp:301
 msgid "Preferred crypto message format:"
 msgstr ""
 
-#: identitydialog.cpp:290
+#: identitydialog.cpp:314
 msgid "&Advanced"
 msgstr "&Napredno"
 
-#: identitydialog.cpp:300
+#: identitydialog.cpp:324
 msgid "&Reply-To address:"
 msgstr "Ad&resa za odgovor (Reply-To):"
 
-#: identitydialog.cpp:302
+#: identitydialog.cpp:326
 msgid ""
 "<qt>"
 "<h3>Reply-To addresses</h3>"
@@ -3729,11 +4118,11 @@ msgid ""
 "<p>If in doubt, leave this field blank.</p></qt>"
 msgstr ""
 
-#: identitydialog.cpp:319
+#: identitydialog.cpp:343
 msgid "&BCC addresses:"
 msgstr "BCC a&drese:"
 
-#: identitydialog.cpp:321
+#: identitydialog.cpp:345
 msgid ""
 "<qt>"
 "<h3>BCC (Blind Carbon Copy) addresses</h3>"
@@ -3746,52 +4135,57 @@ msgid ""
 "<p>If in doubt, leave this field blank.</p></qt>"
 msgstr ""
 
-#: identitydialog.cpp:337
+#: identitydialog.cpp:361
 msgid "D&ictionary:"
 msgstr "&Rječnik:"
 
-#: identitydialog.cpp:346
+#: identitydialog.cpp:370
 #, fuzzy
 msgid "Sent-mail &folder:"
 msgstr "&Mapa za poslanu poštu:"
 
-#: identitydialog.cpp:355
+#: identitydialog.cpp:379
 msgid "&Drafts folder:"
 msgstr "Mapa &nacrta:"
 
-#: identitydialog.cpp:364
+#: identitydialog.cpp:388
 #, fuzzy
 msgid "&Templates folder:"
 msgstr "&Mapa za smeće:"
 
-#: identitydialog.cpp:369
+#: identitydialog.cpp:393
 #, fuzzy
 msgid "Special &transport:"
 msgstr "Poseban &transport"
 
-#: identitydialog.cpp:386 kmfolderdia.cpp:717
+#: identitydialog.cpp:410 kmfolderdia.cpp:808
 #, fuzzy
 msgid "&Use custom message templates"
 msgstr "Koristi poseban s&ufiks za id. poruke"
 
-#: identitydialog.cpp:392 kmfolderdia.cpp:725
+#: identitydialog.cpp:416 kmfolderdia.cpp:816
 msgid "&Copy global templates"
 msgstr ""
 
-#: identitydialog.cpp:407
+#: identitydialog.cpp:431
 msgid "&Signature"
 msgstr "&Potpis"
 
-#: identitydialog.cpp:411
+#: identitydialog.cpp:435
 #, fuzzy
 msgid "&Picture"
 msgstr "&Potpis"
 
-#: identitydialog.cpp:486 identitydialog.cpp:498 kmcomposewin.cpp:4004
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
 msgid "Invalid Email Address"
 msgstr "Neispravna adresa e-pošte"
 
-#: identitydialog.cpp:518
+#: identitydialog.cpp:530
+#, fuzzy
+msgid "Invalid Email Alias \"%1\""
+msgstr "Neispravna adresa e-pošte"
+
+#: 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"
@@ -3799,13 +4193,13 @@ msgid ""
 "verify signatures made with this configuration."
 msgstr ""
 
-#: 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)."
 msgstr ""
 
-#: 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"
@@ -3813,39 +4207,39 @@ msgid ""
 "verify signatures made with this configuration."
 msgstr ""
 
-#: 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)."
 msgstr ""
 
-#: identitydialog.cpp:551
+#: identitydialog.cpp:584
 #, fuzzy
 msgid "Email Address Not Found in Key/Certificates"
 msgstr "&E-mail adresa od CA koja-i izdaje certifikate:"
 
-#: identitydialog.cpp:562
+#: identitydialog.cpp:595
 #, fuzzy
 msgid "The signature file is not valid"
 msgstr "Potpis je istekao."
 
-#: identitydialog.cpp:582
+#: identitydialog.cpp:615
 msgid "Edit Identity \"%1\""
 msgstr "Uredi identitet „%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."
 msgstr ""
 
-#: 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."
 msgstr ""
 
-#: 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."
@@ -3866,122 +4260,122 @@ msgstr "Ime identiteta"
 msgid "Email Address"
 msgstr "Adresa e-pošte"
 
-#: imapaccountbase.cpp:291 popaccount.cpp:154
+#: imapaccountbase.cpp:293 popaccount.cpp:154
 #, fuzzy
 msgid "You need to supply a username and a password to access this mailbox."
 msgstr ""
 "Morate navesti korisničko ime i lozinku da biste pristupili ovom poštanskom "
 "sandučetu."
 
-#: 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 "Račun:"
 
-#: imapaccountbase.cpp:318
+#: imapaccountbase.cpp:320
 #, c-format
 msgid "Could not start process for %1."
 msgstr "Ne mogu pokrenuti proces %1."
 
-#: imapaccountbase.cpp:399
+#: imapaccountbase.cpp:403
 #, fuzzy
 msgid "Error while trying to subscribe to %1:"
 msgstr ""
 "Greška prilikom pisanja datoteke:\n"
 "%1"
 
-#: imapaccountbase.cpp:637
+#: imapaccountbase.cpp:645
 #, fuzzy
 msgid "Retrieving Namespaces"
 msgstr "Potpiši poruku"
 
-#: 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
 #, fuzzy
 msgid "<unknown>"
 msgstr "nepoznato"
 
-#: imapaccountbase.cpp:876
+#: imapaccountbase.cpp:884
 msgid "Error while uploading message"
 msgstr "Greška prilikom slanja poruke"
 
-#: 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 mogu poslati poruku %1 na poslužitelj iz mape %2  s URL-om %3."
 
-#: imapaccountbase.cpp:880
+#: imapaccountbase.cpp:888
 #, fuzzy
 msgid "The destination folder was: <b>%1</b>."
 msgstr "&Odredišni direktorij:"
 
-#: 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 "Nema dostupnih informacija o statusu."
 
-#: 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
 #, fuzzy
 msgid "Error while uploading status of messages to server: "
 msgstr "Šaljem poruke za %1"
 
-#: imapaccountbase.cpp:1290 listjob.cpp:118
+#: imapaccountbase.cpp:1298 listjob.cpp:118
 #, fuzzy
 msgid "retrieving folders"
 msgstr "Dobavljam popis mapi"
 
-#: imapjob.cpp:153 kmfolderimap.cpp:496
+#: imapjob.cpp:153 kmfolderimap.cpp:490
 #, fuzzy
 msgid "Uploading message data"
 msgstr "Šaljem poruke na poslužitelj"
@@ -4011,50 +4405,296 @@ msgstr "Popisa poruka"
 msgid "Error while retrieving messages from the server."
 msgstr "Greška prilikom slanja poruke"
 
-#: imapjob.cpp:483
+#: imapjob.cpp:485
 #, fuzzy
 msgid "Error while retrieving information on the structure of a message."
 msgstr "Greška prilikom slanja poruke"
 
-#: imapjob.cpp:541
+#: imapjob.cpp:543
 #, fuzzy
 msgid "Uploading message data failed."
 msgstr "Šaljem poruke na poslužitelj"
 
-#: imapjob.cpp:546
+#: imapjob.cpp:548
 #, fuzzy
 msgid "Uploading message data completed."
 msgstr "Šaljem poruke na poslužitelj"
 
-#: imapjob.cpp:650
+#: imapjob.cpp:652
 #, fuzzy
 msgid "Error while copying messages."
 msgstr "Greška prilikom slanja poruke"
 
-#: keyresolver.cpp:234
+#: importarchivedialog.cpp:36
+#, fuzzy
+msgid "Import Archive"
+msgstr "Arhive liste"
+
+#: importarchivedialog.cpp:87
+msgid "Please select an archive file that should be imported."
+msgstr ""
+
+#: importarchivedialog.cpp:88
+#, fuzzy
+msgid "No archive file selected"
+msgstr "&Duži popis mapa"
+
+#: importarchivedialog.cpp:93
+#, fuzzy
+msgid "Please select the folder where the archive should be imported to."
+msgstr "Označite koje filtere želite kreirati unutar KMail-a."
+
+#: importarchivedialog.cpp:94
+#, fuzzy
+msgid "No target folder selected"
+msgstr "&Duži popis mapa"
+
+#: 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 ""
+"uvezen je jedan novi tajni ključ.\n"
+"uvezena su %n. nova tajna ključa.\n"
+"uvezeno je %n. novih tajnih ključeva."
+
+#: importjob.cpp:83
+#, fuzzy
+msgid "Import finished."
+msgstr "&Napravi filtar"
+
+#: importjob.cpp:98
+#, fuzzy
+msgid "Failed to import the archive into folder '%1'."
+msgstr "Neuspjelo stvaranje direktorija"
+
+#: importjob.cpp:105
+#, fuzzy
+msgid "Importing archive failed."
+msgstr "Ažuriram keš datoteka"
+
+#: importjob.cpp:114 importjob.cpp:287
+#, fuzzy
+msgid "Unable to create subfolder for folder '%1'."
+msgstr "Neuspjelo stvaranje direktorija"
+
+#: importjob.cpp:214
+#, fuzzy, c-format
+msgid "Importing folder %1"
+msgstr "&Odredišni direktorij:"
+
+#: importjob.cpp:234
+#, fuzzy
+msgid "Failed to add a message to the folder '%1'."
+msgstr "Nisam mogao dodati poruku u mapu: "
+
+#: importjob.cpp:254
+#, fuzzy
+msgid "Failed to upload a message to the IMAP server."
+msgstr "Greška prilikom slanja poruke"
+
+#: 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 "Arhive liste"
+
+#: 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 "Nedefiniran ključ za kriptiranje"
 
-#: keyresolver.cpp:553
+#: keyresolver.cpp:642
+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 ""
+
+#: keyresolver.cpp:647
+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 ""
+
+#: keyresolver.cpp:652
+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 ""
+
+#: keyresolver.cpp:662
+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 ""
+
+#: keyresolver.cpp:669
+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 ""
+
+#: keyresolver.cpp:676
+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 ""
+
+#: keyresolver.cpp:684
+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 ""
+
+#: keyresolver.cpp:691
+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 ""
+
+#: keyresolver.cpp:698
+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 ""
+
+#: keyresolver.cpp:707
+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 ""
+
+#: keyresolver.cpp:712
+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 ""
+
+#: keyresolver.cpp:717
+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 ""
+
+#: keyresolver.cpp:724
+#, fuzzy
+msgid "OpenPGP Key Expired"
+msgstr "OpenPGP ključ 0x%1"
+
+#: keyresolver.cpp:725
+#, fuzzy
+msgid "S/MIME Certificate Expired"
+msgstr "Čarobnjak za certifikate"
+
+#: keyresolver.cpp:750
 msgid ""
 "_n: "
 "<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
@@ -4063,7 +4703,7 @@ msgid ""
 "<p>expires in less than %n days.</p>"
 msgstr ""
 
-#: keyresolver.cpp:558
+#: keyresolver.cpp:755
 msgid ""
 "_n: "
 "<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
@@ -4072,7 +4712,7 @@ msgid ""
 "<p>expires in less than %n days.</p>"
 msgstr ""
 
-#: keyresolver.cpp:563
+#: keyresolver.cpp:760
 msgid ""
 "_n: "
 "<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
@@ -4081,7 +4721,7 @@ msgid ""
 "<p>expires in less than %n days.</p>"
 msgstr ""
 
-#: keyresolver.cpp:573
+#: keyresolver.cpp:770
 msgid ""
 "_n: "
 "<p>The root certificate</p><p align=center><b>%3</b></p>"
@@ -4094,7 +4734,7 @@ msgid ""
 "<p>expires in less than %n days.</p>"
 msgstr ""
 
-#: keyresolver.cpp:580
+#: keyresolver.cpp:777
 msgid ""
 "_n: "
 "<p>The root certificate</p><p align=center><b>%3</b></p>"
@@ -4107,7 +4747,7 @@ msgid ""
 "<p>expires in less than %n days.</p>"
 msgstr ""
 
-#: keyresolver.cpp:587
+#: keyresolver.cpp:784
 msgid ""
 "_n: "
 "<p>The root certificate</p><p align=center><b>%3</b></p>"
@@ -4118,7 +4758,7 @@ msgid ""
 "<p>expires in less than %n days.</p>"
 msgstr ""
 
-#: keyresolver.cpp:595
+#: keyresolver.cpp:792
 msgid ""
 "_n: "
 "<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
@@ -4131,7 +4771,7 @@ msgid ""
 "<p>expires in less than %n days.</p>"
 msgstr ""
 
-#: keyresolver.cpp:602
+#: keyresolver.cpp:799
 msgid ""
 "_n: "
 "<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
@@ -4144,7 +4784,7 @@ msgid ""
 "<p>expires in less than %n days.</p>"
 msgstr ""
 
-#: keyresolver.cpp:609
+#: keyresolver.cpp:806
 msgid ""
 "_n: "
 "<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
@@ -4155,7 +4795,7 @@ msgid ""
 "<p>expires in less than %n days.</p>"
 msgstr ""
 
-#: keyresolver.cpp:618
+#: keyresolver.cpp:815
 msgid ""
 "_n: "
 "<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
@@ -4166,7 +4806,7 @@ msgid ""
 "<p>expires in less than %n days.</p>"
 msgstr ""
 
-#: keyresolver.cpp:623
+#: keyresolver.cpp:820
 msgid ""
 "_n: "
 "<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
@@ -4177,7 +4817,7 @@ msgid ""
 "<p>expires in less than %n days.</p>"
 msgstr ""
 
-#: keyresolver.cpp:628
+#: keyresolver.cpp:825
 msgid ""
 "_n: "
 "<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
@@ -4188,16 +4828,16 @@ msgid ""
 "<p>expires in less than %n days.</p>"
 msgstr ""
 
-#: keyresolver.cpp:634
+#: keyresolver.cpp:832
 #, fuzzy
 msgid "OpenPGP Key Expires Soon"
 msgstr "OpenPGP ključ 0x%1"
 
-#: keyresolver.cpp:635
+#: keyresolver.cpp:833
 msgid "S/MIME Certificate Expires Soon"
 msgstr ""
 
-#: 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 "
@@ -4206,12 +4846,12 @@ msgid ""
 "prompted to specify the keys to use."
 msgstr ""
 
-#: keyresolver.cpp:676 keyresolver.cpp:989 keyresolver.cpp:1016
+#: keyresolver.cpp:875 keyresolver.cpp:1204 keyresolver.cpp:1231
 #, fuzzy
 msgid "Unusable Encryption Keys"
 msgstr "Nedefiniran ključ za kriptiranje"
 
-#: 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 "
@@ -4220,12 +4860,12 @@ msgid ""
 "prompted to specify the keys to use."
 msgstr ""
 
-#: keyresolver.cpp:720 keyresolver.cpp:1043 keyresolver.cpp:1059
+#: keyresolver.cpp:919 keyresolver.cpp:1258 keyresolver.cpp:1274
 #, fuzzy
 msgid "Unusable Signing Keys"
 msgstr "Nedefiniran ključ za potpisivanje"
 
-#: 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"
@@ -4235,7 +4875,7 @@ msgid ""
 "be able to read your own messages if you do so."
 msgstr ""
 
-#: 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"
@@ -4245,7 +4885,7 @@ msgid ""
 "be able to read your own messages if you do so."
 msgstr ""
 
-#: 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"
@@ -4253,11 +4893,11 @@ msgid ""
 "identity."
 msgstr ""
 
-#: keyresolver.cpp:1044
+#: keyresolver.cpp:1259
 msgid "Do Not OpenPGP-Sign"
 msgstr ""
 
-#: 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"
@@ -4265,109 +4905,111 @@ msgid ""
 "identity."
 msgstr ""
 
-#: keyresolver.cpp:1060
+#: keyresolver.cpp:1275
 msgid "Do Not S/MIME-Sign"
 msgstr ""
 
-#: 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"
 "Send message without signing?"
 msgstr ""
 
-#: keyresolver.cpp:1120
+#: keyresolver.cpp:1335
 #, fuzzy
 msgid "No signing possible"
 msgstr "Koristi za &potpisivanje"
 
-#: 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."
 msgstr ""
 
-#: keyresolver.cpp:1279 keyresolver.cpp:1303 keyresolver.cpp:1317
+#: keyresolver.cpp:1494 keyresolver.cpp:1518 keyresolver.cpp:1532
 #, fuzzy
 msgid "Missing Key Warning"
 msgstr "Nedostaje ključ za potpisivanje"
 
-#: 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 "&Kriptiraj"
 
-#: 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."
 msgstr ""
 
-#: 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."
 msgstr ""
 
-#: keyresolver.cpp:1304 messagecomposer.cpp:933
+#: keyresolver.cpp:1519 messagecomposer.cpp:931
 #, fuzzy
 msgid "Send &Unencrypted"
 msgstr "Snimi &nekriptirano"
 
-#: 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."
 msgstr ""
 
-#: 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."
 msgstr ""
 
-#: keyresolver.cpp:1367
+#: keyresolver.cpp:1585
 #, fuzzy
 msgid "Encryption Key Selection"
 msgstr "Podešavanja kriptiranja"
 
-#: keyresolver.cpp:1408
+#: keyresolver.cpp:1628
 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 ""
 
-#: keyresolver.cpp:1452
+#: keyresolver.cpp:1678
 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 ""
 
-#: keyresolver.cpp:1459
+#: keyresolver.cpp:1687
 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 ""
 
-#: keyresolver.cpp:1567
+#: keyresolver.cpp:1800
 #, fuzzy
 msgid "Name Selection"
 msgstr "Pismo popisa direktorija"
 
-#: keyresolver.cpp:1567
+#: keyresolver.cpp:1800
 msgid "Which name shall the contact '%1' have in your addressbook?"
 msgstr ""
 
-#: 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 "Izvršavam prednaredbu %1"
@@ -4400,11 +5042,11 @@ msgstr ""
 msgid "Checking account: %1"
 msgstr "Provjeravam da li ima nove pošte za korisnički račun %1"
 
-#: kmacctimap.cpp:398 kmfolderimap.cpp:858
+#: kmacctimap.cpp:398 kmfolderimap.cpp:852
 msgid " completed"
 msgstr ""
 
-#: kmacctimap.cpp:607 kmheaders.cpp:1275
+#: kmacctimap.cpp:607 kmheaders.cpp:1313
 #, fuzzy
 msgid "Unable to process messages: "
 msgstr "Ne mogu da obradim poruke: "
@@ -4438,11 +5080,11 @@ msgstr "Prenos nije uspio: Nisam mogao da zaključam %1."
 msgid "Moving message %3 of %2 from %1."
 msgstr "Premještam poruku %3 od %2 iz %1."
 
-#: kmacctlocal.cpp:244
+#: kmacctlocal.cpp:245
 msgid "<qt>Cannot remove mail from mailbox <b>%1</b>:<br>%2</qt>"
 msgstr "<qt>Ne mogu ukloniti poštu iz sandučića<b>%1</b>:<br>%2</qt>"
 
-#: kmacctlocal.cpp:254
+#: kmacctlocal.cpp:255
 #, fuzzy
 msgid ""
 "_n: Fetched 1 message from mailbox %1.\n"
@@ -4491,88 +5133,97 @@ msgstr "&Odspojeno IMAP"
 msgid "&Maildir mailbox"
 msgstr "&Maildir sandučić"
 
-#: kmailicalifaceimpl.cpp:90 kmfolderdia.cpp:448 newfolderdialog.cpp:125
+#: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 #, fuzzy
 msgid "Mail"
 msgstr "KMail"
 
-#: kmailicalifaceimpl.cpp:91 kmfolderdia.cpp:449 newfolderdialog.cpp:126
+#: kmailicalifaceimpl.cpp:94 kmfolderdia.cpp:507 newfolderdialog.cpp:131
 msgid "Calendar"
 msgstr ""
 
-#: kmailicalifaceimpl.cpp:92 kmfolderdia.cpp:450 newfolderdialog.cpp:127
+#: kmailicalifaceimpl.cpp:95 kmfolderdia.cpp:508 newfolderdialog.cpp:132
 #, fuzzy
 msgid "Contacts"
 msgstr "&Zbijeno"
 
-#: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:451 newfolderdialog.cpp:128
+#: kmailicalifaceimpl.cpp:96 kmfolderdia.cpp:509 newfolderdialog.cpp:133
 #, fuzzy
 msgid "Notes"
 msgstr "&Nijedan"
 
-#: kmailicalifaceimpl.cpp:94 kmfolderdia.cpp:452 newfolderdialog.cpp:129
+#: kmailicalifaceimpl.cpp:97 kmfolderdia.cpp:510 newfolderdialog.cpp:134
 msgid "Tasks"
 msgstr ""
 
-#: kmailicalifaceimpl.cpp:95 kmfolderdia.cpp:453 newfolderdialog.cpp:130
+#: kmailicalifaceimpl.cpp:98 kmfolderdia.cpp:511 newfolderdialog.cpp:135
 msgid "Journal"
 msgstr ""
 
-#: kmailicalifaceimpl.cpp:667
+#: kmailicalifaceimpl.cpp:684
 msgid "%1's %2"
 msgstr ""
 
-#: kmailicalifaceimpl.cpp:681
+#: kmailicalifaceimpl.cpp:700
 #, fuzzy
 msgid "My %1 (%2)"
 msgstr "Nije uspjelo: %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"
 msgstr ""
 
-#: 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"
 "<br>If you do not want this, cancel and the IMAP resource will be disabled"
 msgstr ""
 
-#: kmailicalifaceimpl.cpp:1751
+#: kmailicalifaceimpl.cpp:1802
 #, fuzzy
 msgid "Standard Groupware Folders"
 msgstr "Isključi groupware funkcije"
 
-#: kmailicalifaceimpl.cpp:1953
+#: kmailicalifaceimpl.cpp:1992
+#, fuzzy
+msgid "Default folder"
+msgstr "Obriši Mapu"
+
+#: kmailicalifaceimpl.cpp:1993
+msgid "There are multiple %1 default folders, please choose one:"
+msgstr ""
+
+#: kmailicalifaceimpl.cpp:2019
 #, fuzzy
 msgid "You do not have read/write permission to your %1 folder."
 msgstr "Nemate dozvole za čitanje i upis u mapu %1."
 
-#: kmailicalifaceimpl.cpp:2007
+#: kmailicalifaceimpl.cpp:2073
 #, fuzzy
 msgid "You do not have read/write permission to your folder."
 msgstr "Nemate dozvole za čitanje i upis u mapu %1."
 
-#: kmcommands.cpp:300
+#: kmcommands.cpp:304
 msgid "Please wait"
 msgstr "Molim pričekajte"
 
-#: kmcommands.cpp:302 kmcommands.cpp:403
+#: kmcommands.cpp:306 kmcommands.cpp:407
 #, fuzzy, c-format
 msgid ""
 "_n: Please wait while the message is transferred\n"
@@ -4582,35 +5233,41 @@ msgstr ""
 "Pričekajte dok se prenesu %n poruke\n"
 "Pričekajte dok se prenese %n poruka"
 
-#: kmcommands.cpp:594
+#: kmcommands.cpp:598
 msgid "Address copied to clipboard."
 msgstr "Adresa iskopirana na odlagalište (clipboard)."
 
-#: kmcommands.cpp:601
+#: kmcommands.cpp:605
 msgid "URL copied to clipboard."
 msgstr "URL iskopiran na odlagalište (clipboard)."
 
-#: kmcommands.cpp:638
+#: kmcommands.cpp:642
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr "<qt>Datoteka <b>%1</b> postoji.<br>Želite li je zamijeniti?</qt>"
 
-#: kmcommands.cpp:639 kmcommands.cpp:939 kmkernel.cpp:1940
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2050
 msgid "Save to File"
 msgstr "Spremi u datoteku"
 
-#: kmcommands.cpp:639 kmcommands.cpp:939 kmkernel.cpp:1940
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2050
 msgid "&Replace"
 msgstr "&Zamijeni"
 
-#: kmcommands.cpp:739
+#: kmcommands.cpp:743
 msgid "Message as Plain Text"
 msgstr "Poruka kao čisti tekst"
 
-#: kmcommands.cpp:882
+#: kmcommands.cpp:775
+msgid ""
+"*.mbox|email messages (*.mbox)\n"
+"*|all files (*)"
+msgstr ""
+
+#: kmcommands.cpp:908
 msgid "The message was removed while saving it. It has not been saved."
 msgstr ""
 
-#: kmcommands.cpp:938 kmkernel.cpp:1939
+#: kmcommands.cpp:965 kmkernel.cpp:2049
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -4618,20 +5275,20 @@ msgstr ""
 "Datoteka %1 postoji.\n"
 "Želite li je zamijeniti?"
 
-#: kmcommands.cpp:982
+#: kmcommands.cpp:1009
 msgid "Open Message"
 msgstr ""
 
-#: kmcommands.cpp:1020 kmcommands.cpp:1048
+#: kmcommands.cpp:1047 kmcommands.cpp:1075
 #, fuzzy
 msgid "The file does not contain a message."
 msgstr "Izbaci &nepročitane poruke"
 
-#: kmcommands.cpp:1066
+#: kmcommands.cpp:1093
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr ""
 
-#: kmcommands.cpp:1363
+#: kmcommands.cpp:1404
 msgid ""
 "\n"
 "This is a MIME digest forward. The content of the message is contained in the "
@@ -4644,89 +5301,89 @@ msgstr ""
 "\n"
 "\n"
 
-#: kmcommands.cpp:1697 kmheaders.cpp:1407
+#: kmcommands.cpp:1750 kmheaders.cpp:1445
 #, fuzzy
 msgid "Filtering messages"
 msgstr "Obriši poruke"
 
-#: kmcommands.cpp:1705 kmheaders.cpp:1415
+#: kmcommands.cpp:1758 kmheaders.cpp:1453
 #, fuzzy
 msgid "Filtering message %1 of %2"
 msgstr "Premještam poruku %3 od %2 iz %1."
 
-#: kmcommands.cpp:1715
+#: kmcommands.cpp:1768
 msgid "Not enough free disk space?"
 msgstr "Nema dovoljno slobodnog prostora na disku?"
 
-#: kmcommands.cpp:1881 kmfoldertree.cpp:1891
+#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr "Premjesti u ovu mapu"
 
-#: kmcommands.cpp:1883 kmfoldertree.cpp:1893
+#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr "Kopiraj u ovu mapu"
 
-#: kmcommands.cpp:1959
+#: kmcommands.cpp:2012
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr ""
 
-#: kmcommands.cpp:2133
+#: kmcommands.cpp:2186
 #, fuzzy
 msgid "Moving messages"
 msgstr "Premještanje poruka nije uspjelo."
 
-#: kmcommands.cpp:2133
+#: kmcommands.cpp:2186
 #, fuzzy
 msgid "Deleting messages"
 msgstr "Obriši poruke"
 
-#: kmcommands.cpp:2406
+#: kmcommands.cpp:2471
 msgid "Opening URL..."
 msgstr "Otvaram URL..."
 
-#: kmcommands.cpp:2413
+#: kmcommands.cpp:2478
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt>Da li zaista želite izvršiti <b>%1</b>?</qt>"
 
-#: kmcommands.cpp:2414
+#: kmcommands.cpp:2479
 #, fuzzy
 msgid "Execute"
 msgstr "izvrši naredbu"
 
-#: kmcommands.cpp:2495
+#: kmcommands.cpp:2561
 msgid "Found no attachments to save."
 msgstr "Nema priloga za spremanje."
 
-#: kmcommands.cpp:2508
+#: kmcommands.cpp:2574
 #, fuzzy
 msgid "Save Attachments To"
 msgstr "Snimi prilog kao"
 
-#: kmcommands.cpp:2528
+#: kmcommands.cpp:2594
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr ""
 
-#: kmcommands.cpp:2556
+#: kmcommands.cpp:2622
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr ""
 
-#: kmcommands.cpp:2595
+#: kmcommands.cpp:2661
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr "Fajl sa imenom %1 već postoji. Želite li da ga prebrišete?"
 
-#: kmcommands.cpp:2597
+#: kmcommands.cpp:2663
 msgid "File Already Exists"
 msgstr ""
 
-#: kmcommands.cpp:2597 util.h:211
+#: kmcommands.cpp:2663 util.h:211
 msgid "&Overwrite"
 msgstr ""
 
-#: kmcommands.cpp:2619
+#: kmcommands.cpp:2685
 #, fuzzy
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
@@ -4735,21 +5392,21 @@ msgstr ""
 "Ovaj dio poruke je kriptiran. Želite li da ga zadržite takvim prilikom "
 "spremanja?"
 
-#: kmcommands.cpp:2621 kmcommands.cpp:2630
+#: kmcommands.cpp:2687 kmcommands.cpp:2696
 msgid "KMail Question"
 msgstr "KMail pitanje"
 
-#: kmcommands.cpp:2621
+#: kmcommands.cpp:2687
 #, fuzzy
 msgid "Keep Encryption"
 msgstr "Ši&firiraj"
 
-#: kmcommands.cpp:2621 kmcommands.cpp:2630
+#: kmcommands.cpp:2687 kmcommands.cpp:2696
 #, fuzzy
 msgid "Do Not Keep"
 msgstr "&Kriptiraj"
 
-#: kmcommands.cpp:2628
+#: kmcommands.cpp:2694
 #, fuzzy
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
@@ -4757,215 +5414,246 @@ msgid ""
 msgstr ""
 "Ovaj dio poruke je potpisan. Želite li da zadržite potpis prilikom spremanja?"
 
-#: kmcommands.cpp:2630
+#: kmcommands.cpp:2696
 #, fuzzy
 msgid "Keep Signature"
 msgstr "Signatures"
 
-#: kmcommands.cpp:2703
+#: kmcommands.cpp:2769
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
 "%2"
 msgstr ""
 
-#: kmcommands.cpp:2728
+#: kmcommands.cpp:2794
 #, fuzzy, c-format
 msgid "Could not write the file %1."
 msgstr ""
 "Ne mogu pisati u datoteku:\n"
 "%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 "
 "client."
 msgstr ""
 
-#: kmcommands.cpp:2955
+#: kmcommands.cpp:3021
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
 " it is not possible to determine who to chat with."
 msgstr ""
 
-#: 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
 #, fuzzy
 msgid "Chiasmus Decryption Key Selection"
 msgstr "Podešavanja kriptiranja"
 
-#: 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 "Pokaži priloge kako je predložio pošiljatelj."
-
-#: 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 "KMail"
 
-#: kmcomposewin.cpp:233
+#: kmcomposewin.cpp:207
+#, fuzzy
+msgid "Select an identity for this message"
+msgstr "Uključi iscrtavanje HTML-a za ovu poruku."
+
+#: 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
 #, fuzzy
 msgid "Select email address(es)"
 msgstr "Odaberite e-adrese"
 
-#: kmcomposewin.cpp:286
+#: kmcomposewin.cpp:295
+#, fuzzy
+msgid "Set a subject for this message"
+msgstr "Postavi temu poruke."
+
+#: kmcomposewin.cpp:297
+msgid "&Identity:"
+msgstr "&Identitet:"
+
+#: kmcomposewin.cpp:298
+msgid "&Dictionary:"
+msgstr "&Rječnik:"
+
+#: kmcomposewin.cpp:299
+#, fuzzy
+msgid "&Sent-Mail folder:"
+msgstr "Mapa za po&slatu poštu:"
+
+#: kmcomposewin.cpp:300
+#, fuzzy
+msgid "&Mail transport:"
+msgstr "&Transport pošte:"
+
+#: kmcomposewin.cpp:301
+msgid ""
+"_: sender address field\n"
+"&From:"
+msgstr ""
+
+#: kmcomposewin.cpp:302
+msgid "&Reply to:"
+msgstr "O&dgovori-na:"
+
+#: kmcomposewin.cpp:303
+msgid "S&ubject:"
+msgstr "&Tema:"
+
+#: kmcomposewin.cpp:305
 msgid "Sticky"
 msgstr "Ljepljiv"
 
-#: 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 "Veličina"
 
-#: kmcomposewin.cpp:368 kmmimeparttree.cpp:66
+#: kmcomposewin.cpp:399 kmmimeparttree.cpp:66
 msgid "Encoding"
 msgstr "Kodiranje"
 
-#: kmcomposewin.cpp:375 kmcomposewin.cpp:3247
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
 #, fuzzy
 msgid "Compress"
 msgstr "Composer"
 
-#: kmcomposewin.cpp:377
+#: kmcomposewin.cpp:408
 msgid "Encrypt"
 msgstr "Kriptiraj"
 
-#: kmcomposewin.cpp:379
+#: kmcomposewin.cpp:410
 msgid "Sign"
 msgstr "Znak"
 
-#: kmcomposewin.cpp:590 kmcomposewin.cpp:3616
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
 #, fuzzy
 msgid "Name of the attachment:"
 msgstr "prilog"
 
-#: kmcomposewin.cpp:828
+#: kmcomposewin.cpp:868
 #, fuzzy
 msgid ""
 "Autosaving the message as %1 failed.\n"
 "Reason: %2"
 msgstr "Premještanje poruka nije uspjelo."
 
-#: kmcomposewin.cpp:832
+#: kmcomposewin.cpp:872
 #, fuzzy
 msgid "Autosaving Failed"
 msgstr "Premještanje poruka nije uspjelo."
 
-#: kmcomposewin.cpp:970
-msgid "&Identity:"
-msgstr "&Identitet:"
-
-#: kmcomposewin.cpp:974
-msgid "&Dictionary:"
-msgstr "&Rječnik:"
-
-#: kmcomposewin.cpp:978
-#, fuzzy
-msgid "&Sent-Mail folder:"
-msgstr "Mapa za po&slatu poštu:"
-
-#: kmcomposewin.cpp:982
-#, fuzzy
-msgid "&Mail transport:"
-msgstr "&Transport pošte:"
-
-#: kmcomposewin.cpp:986
-msgid ""
-"_: sender address field\n"
-"&From:"
-msgstr ""
-
-#: kmcomposewin.cpp:992
-msgid "&Reply to:"
-msgstr "O&dgovori-na:"
-
-#: kmcomposewin.cpp:1000
-msgid ""
-"_: recipient address field\n"
-"&To:"
-msgstr ""
-
-#: kmcomposewin.cpp:1002
+#: kmcomposewin.cpp:1042
 #, fuzzy
 msgid "Primary Recipients"
 msgstr "<primatelji>"
 
-#: kmcomposewin.cpp:1003
+#: kmcomposewin.cpp:1043
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email.</qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:1010
-msgid "&Copy to (CC):"
-msgstr ""
-
-#: kmcomposewin.cpp:1012
+#: kmcomposewin.cpp:1052
 msgid "Additional Recipients"
 msgstr ""
 
-#: 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> "
@@ -4973,374 +5661,386 @@ msgid ""
 "(CC) is a listener, not the main recipient.</qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:1025
-msgid "&Blind copy to (BCC):"
-msgstr ""
-
-#: kmcomposewin.cpp:1027
+#: kmcomposewin.cpp:1067
 #, fuzzy
 msgid "Hidden Recipients"
 msgstr "<primatelji>"
 
-#: 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 "
 "copy.</qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:1060
-msgid "S&ubject:"
-msgstr "&Tema:"
-
-#: kmcomposewin.cpp:1198 kmcomposewin.cpp:1220
+#: kmcomposewin.cpp:1236 kmcomposewin.cpp:1258
 #, fuzzy
 msgid "&Send Mail"
 msgstr "Sendmail"
 
-#: kmcomposewin.cpp:1202 kmcomposewin.cpp:1224
+#: kmcomposewin.cpp:1240 kmcomposewin.cpp:1262
 #, fuzzy
 msgid "&Send Mail Via"
 msgstr "Sendmail"
 
-#: 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 "Poša&lji kasnije"
 
-#: kmcomposewin.cpp:1207 kmcomposewin.cpp:1217
+#: kmcomposewin.cpp:1245 kmcomposewin.cpp:1255
 #, fuzzy
 msgid "Send &Later Via"
 msgstr "Poša&lji kasnije"
 
-#: kmcomposewin.cpp:1255
+#: kmcomposewin.cpp:1293
 #, fuzzy
 msgid "Save as &Draft"
 msgstr "&Snimi kao nedovršenu"
 
-#: kmcomposewin.cpp:1258
+#: kmcomposewin.cpp:1296
 #, fuzzy
 msgid "Save as &Template"
 msgstr "&Zamijeni"
 
-#: kmcomposewin.cpp:1261
+#: kmcomposewin.cpp:1299
 msgid "&Insert File..."
 msgstr "Umetni &datoteku..."
 
-#: kmcomposewin.cpp:1264
+#: kmcomposewin.cpp:1302
 #, fuzzy
 msgid "&Insert File Recent"
 msgstr "Umetni datoteku"
 
-#: kmcomposewin.cpp:1271
+#: kmcomposewin.cpp:1309
 msgid "&Address Book"
 msgstr "&Adresar..."
 
-#: kmcomposewin.cpp:1274
+#: kmcomposewin.cpp:1312
 msgid "&New Composer"
 msgstr "&Novi uređivač"
 
-#: kmcomposewin.cpp:1278
+#: kmcomposewin.cpp:1316
 msgid "New Main &Window"
 msgstr "Novi &prozor za poštu"
 
-#: kmcomposewin.cpp:1283
+#: kmcomposewin.cpp:1321
 #, fuzzy
 msgid "Select &Recipients..."
 msgstr "<primatelji>"
 
-#: kmcomposewin.cpp:1285
+#: kmcomposewin.cpp:1323
 #, fuzzy
 msgid "Save &Distribution List..."
 msgstr "Opis:"
 
-#: kmcomposewin.cpp:1307
+#: kmcomposewin.cpp:1345
 msgid "Pa&ste as Quotation"
 msgstr "Umetni kao &citat"
 
-#: kmcomposewin.cpp:1310
+#: kmcomposewin.cpp:1348
 #, fuzzy
 msgid "Paste as Attac&hment"
 msgstr "prilog"
 
-#: kmcomposewin.cpp:1313
+#: kmcomposewin.cpp:1351
 msgid "Add &Quote Characters"
 msgstr "Dodaj znake za &citiranje"
 
-#: kmcomposewin.cpp:1316
+#: kmcomposewin.cpp:1356
 msgid "Re&move Quote Characters"
 msgstr "Ukloni znakove za citi&ranje"
 
-#: kmcomposewin.cpp:1320
+#: kmcomposewin.cpp:1362
 msgid "Cl&ean Spaces"
 msgstr "&Očisti razmake"
 
-#. i18n: file kmail.kcfg line 341
-#: kmcomposewin.cpp:1323 kmreaderwin.cpp:683 rc.cpp:779
+#. i18n: file kmail.kcfg line 358
+#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
 #, fuzzy, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "&Koristi pismo fiksne širine"
 
-#: kmcomposewin.cpp:1328
+#: kmcomposewin.cpp:1370
 msgid "&Urgent"
 msgstr "&Hitno"
 
-#: kmcomposewin.cpp:1331
+#: kmcomposewin.cpp:1373
 msgid "&Request Disposition Notification"
 msgstr "&Zatraži obavijest dispozicije"
 
-#: kmcomposewin.cpp:1336
+#: kmcomposewin.cpp:1378
 #, fuzzy
 msgid "Se&t Encoding"
 msgstr "Pos&tavi kodiranje"
 
-#: kmcomposewin.cpp:1339
+#: kmcomposewin.cpp:1381
 #, fuzzy
 msgid "&Wordwrap"
 msgstr "&Prelom teksta"
 
-#: kmcomposewin.cpp:1344
+#: kmcomposewin.cpp:1386
 msgid "&Snippets"
 msgstr ""
 
-#: kmcomposewin.cpp:1350
+#: kmcomposewin.cpp:1392
 msgid "&Automatic Spellchecking"
 msgstr "&Automatski pravopis"
 
-#: kmcomposewin.cpp:1360
+#: kmcomposewin.cpp:1402
 msgid "Auto-Detect"
 msgstr "Auto-detekcija"
 
-#: kmcomposewin.cpp:1365
+#: kmcomposewin.cpp:1407
 msgid "Formatting (HTML)"
 msgstr ""
 
-#: kmcomposewin.cpp:1369
+#: kmcomposewin.cpp:1411
 msgid "&All Fields"
 msgstr "Sva &polja"
 
-#: kmcomposewin.cpp:1372
+#: kmcomposewin.cpp:1414
 msgid "&Identity"
 msgstr "&Identitet"
 
-#: kmcomposewin.cpp:1375
+#: kmcomposewin.cpp:1417
 msgid "&Dictionary"
 msgstr "&Rječnik"
 
-#: kmcomposewin.cpp:1378
+#: kmcomposewin.cpp:1420
 #, fuzzy
 msgid "&Sent-Mail Folder"
 msgstr "Mapa za p&oslatu poštu"
 
-#: kmcomposewin.cpp:1381
+#: kmcomposewin.cpp:1423
 msgid "&Mail Transport"
 msgstr "&Transport Pošte"
 
-#: kmcomposewin.cpp:1384
+#: kmcomposewin.cpp:1426
 msgid "&From"
 msgstr "&Od"
 
-#: kmcomposewin.cpp:1387
+#: kmcomposewin.cpp:1429
 msgid "&Reply To"
 msgstr "&Odgovori na"
 
-#: kmcomposewin.cpp:1391
+#: kmcomposewin.cpp:1433
 msgid "&To"
 msgstr "&Za:"
 
-#: kmcomposewin.cpp:1394
+#: kmcomposewin.cpp:1436
 msgid "&CC"
 msgstr "&Kopija"
 
-#: kmcomposewin.cpp:1397
+#: kmcomposewin.cpp:1439
 msgid "&BCC"
 msgstr "&BCC"
 
-#: kmcomposewin.cpp:1401
+#: kmcomposewin.cpp:1443
 #, fuzzy
 msgid "S&ubject"
 msgstr "&Tema:"
 
-#: kmcomposewin.cpp:1406
+#: kmcomposewin.cpp:1448
 msgid "Append S&ignature"
 msgstr "Dodaj po&tpis"
 
-#: kmcomposewin.cpp:1409
+#: kmcomposewin.cpp:1451
 #, fuzzy
 msgid "Prepend S&ignature"
 msgstr "Dodaj po&tpis"
 
-#: kmcomposewin.cpp:1413
+#: kmcomposewin.cpp:1455
 #, fuzzy
 msgid "Insert Signature At C&ursor Position"
 msgstr "Položaj mape"
 
-#: kmcomposewin.cpp:1417
+#: kmcomposewin.cpp:1459
 msgid "Attach &Public Key..."
 msgstr "Priloži jav&ni ključ..."
 
-#: kmcomposewin.cpp:1420
+#: kmcomposewin.cpp:1462
 msgid "Attach &My Public Key"
 msgstr "Priloži &moj javni ključ"
 
-#: kmcomposewin.cpp:1423 kmcomposewin.cpp:2272
+#: kmcomposewin.cpp:1465 kmcomposewin.cpp:2337
 msgid "&Attach File..."
 msgstr "&Priloži datoteku..."
 
-#: kmcomposewin.cpp:1426
+#: kmcomposewin.cpp:1468
 msgid "&Remove Attachment"
 msgstr "&Ukloni prilog"
 
-#: kmcomposewin.cpp:1429
+#: kmcomposewin.cpp:1471
 #, fuzzy
 msgid "&Save Attachment As..."
 msgstr "&Snimi prilog kao..."
 
-#: kmcomposewin.cpp:1432
+#: kmcomposewin.cpp:1474
 #, fuzzy
 msgid "Attachment Pr&operties"
 msgstr "Sv&ojstva priloga..."
 
-#: kmcomposewin.cpp:1442
+#: kmcomposewin.cpp:1484
 msgid "&Spellchecker..."
 msgstr "&Provjera pravopisa"
 
-#: kmcomposewin.cpp:1446 kmcomposewin.cpp:1449
+#: kmcomposewin.cpp:1488 kmcomposewin.cpp:1491
 #, fuzzy
 msgid "Encrypt Message with Chiasmus..."
 msgstr "Odaberite mapu sa fokusom"
 
-#: kmcomposewin.cpp:1457
+#: kmcomposewin.cpp:1499
 msgid "&Encrypt Message"
 msgstr "&Šifriraj poruku"
 
-#: kmcomposewin.cpp:1460
+#: kmcomposewin.cpp:1502
 #, fuzzy
 msgid "&Sign Message"
 msgstr "&Potpiši poruku"
 
-#: kmcomposewin.cpp:1507
+#: kmcomposewin.cpp:1549
 msgid "&Cryptographic Message Format"
 msgstr ""
 
-#: kmcomposewin.cpp:1515 kmcomposewin.cpp:4970
+#: kmcomposewin.cpp:1554
+#, fuzzy
+msgid "Select a cryptographic format for this message"
+msgstr "Kriptirati sve dijelove poruke?"
+
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
 msgid "Standard"
 msgstr ""
 
-#: kmcomposewin.cpp:1516 kmcomposewin.cpp:4972
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
 msgid "Bulleted List (Disc)"
 msgstr ""
 
-#: kmcomposewin.cpp:1517 kmcomposewin.cpp:4974
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
 msgid "Bulleted List (Circle)"
 msgstr ""
 
-#: kmcomposewin.cpp:1518 kmcomposewin.cpp:4976
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
 msgid "Bulleted List (Square)"
 msgstr ""
 
-#: kmcomposewin.cpp:1519 kmcomposewin.cpp:4978
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
 msgid "Ordered List (Decimal)"
 msgstr ""
 
-#: kmcomposewin.cpp:1520 kmcomposewin.cpp:4980
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
 msgid "Ordered List (Alpha lower)"
 msgstr ""
 
-#: kmcomposewin.cpp:1521 kmcomposewin.cpp:4982
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
 msgid "Ordered List (Alpha upper)"
 msgstr ""
 
-#: kmcomposewin.cpp:1523
+#: kmcomposewin.cpp:1566
 msgid "Select Style"
 msgstr ""
 
-#: kmcomposewin.cpp:1537
+#: kmcomposewin.cpp:1569
+#, fuzzy
+msgid "Select a list style"
+msgstr "Izaberite zvučnu datoteku"
+
+#: kmcomposewin.cpp:1574
+#, fuzzy
+msgid "Select a font"
+msgstr "Od&aberi sve poruke..."
+
+#: kmcomposewin.cpp:1579
+#, fuzzy
+msgid "Select a font size"
+msgstr "Izaberite zvučnu datoteku"
+
+#: kmcomposewin.cpp:1583
 msgid "Align Left"
 msgstr ""
 
-#: kmcomposewin.cpp:1541
+#: kmcomposewin.cpp:1587
 msgid "Align Right"
 msgstr ""
 
-#: kmcomposewin.cpp:1544
+#: kmcomposewin.cpp:1590
 msgid "Align Center"
 msgstr ""
 
-#: kmcomposewin.cpp:1547
+#: kmcomposewin.cpp:1593
 msgid "&Bold"
 msgstr ""
 
-#: kmcomposewin.cpp:1550
+#: kmcomposewin.cpp:1596
 msgid "&Italic"
 msgstr ""
 
-#: kmcomposewin.cpp:1553
+#: kmcomposewin.cpp:1599
 #, fuzzy
 msgid "&Underline"
 msgstr "&Inline..."
 
-#: kmcomposewin.cpp:1556
+#: kmcomposewin.cpp:1602
 msgid "Reset Font Settings"
 msgstr ""
 
-#: kmcomposewin.cpp:1559
+#: kmcomposewin.cpp:1605
 msgid "Text Color..."
 msgstr ""
 
-#: kmcomposewin.cpp:1573
+#: kmcomposewin.cpp:1619
 #, fuzzy
 msgid "Configure KMail..."
 msgstr "&Namjesti KMail..."
 
-#: kmcomposewin.cpp:1582
+#: kmcomposewin.cpp:1628
 #, fuzzy
 msgid " Spellcheck: %1 "
 msgstr "Provjera pisanja"
 
-#: kmcomposewin.cpp:1583 kmcomposewin.cpp:1597
+#: kmcomposewin.cpp:1629 kmcomposewin.cpp:1643
 #, fuzzy
 msgid " Column: %1 "
 msgstr " Stupac"
 
-#: kmcomposewin.cpp:1584 kmcomposewin.cpp:1595
+#: kmcomposewin.cpp:1630 kmcomposewin.cpp:1641
 #, fuzzy
 msgid " Line: %1 "
 msgstr " Linija"
 
-#: kmcomposewin.cpp:2188
+#: kmcomposewin.cpp:2252
 #, fuzzy
 msgid "Re&save as Template"
 msgstr "&Zamijeni"
 
-#: kmcomposewin.cpp:2189
+#: kmcomposewin.cpp:2253
 #, fuzzy
 msgid "&Save as Draft"
 msgstr "&Snimi kao nedovršenu"
 
-#: 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
 #, fuzzy
 msgid "Do you want to save the message for later or discard it?"
 msgstr "Želite li odbaciti poruku ili je spremiti za kasnije?"
 
-#: kmcomposewin.cpp:2198
+#: kmcomposewin.cpp:2262
 #, fuzzy
 msgid "Close Composer"
 msgstr "&Novi uređivač"
 
-#: kmcomposewin.cpp:2268
+#: kmcomposewin.cpp:2333
 #, fuzzy
 msgid ""
 "The message you have composed seems to refer to an attached file but you have "
@@ -5351,107 +6051,107 @@ msgstr ""
 "niste priložili.\n"
 "Želite li da priložite datoteka uz vašu poruku?"
 
-#: kmcomposewin.cpp:2271
+#: kmcomposewin.cpp:2336
 msgid "File Attachment Reminder"
 msgstr "Podsjetnik za prilaganje datoteka"
 
-#: kmcomposewin.cpp:2273
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Send as Is"
 msgstr "Pošalji &kako jest"
 
-#: kmcomposewin.cpp:2350
+#: kmcomposewin.cpp:2415
 msgid ""
 "<qt>"
 "<p>KMail could not recognize the location of the attachment (%1);</p>"
 "<p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
 
-#: 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 "Priloži datoteku"
 
 #. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2698 rc.cpp:57
+#: kmcomposewin.cpp:2778 rc.cpp:57
 #, no-c-format
 msgid "&Attach"
 msgstr "&Prikvači"
 
-#: kmcomposewin.cpp:2878
+#: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "Umetni datoteku"
 
-#: kmcomposewin.cpp:3048
+#: kmcomposewin.cpp:3129
 msgid ""
 "<qt>"
 "<p>An error occurred while trying to export the key from the backend:</p>"
 "<p><b>%1</b></p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:3052
+#: kmcomposewin.cpp:3133
 msgid "Key Export Failed"
 msgstr ""
 
-#: kmcomposewin.cpp:3079
+#: kmcomposewin.cpp:3160
 #, fuzzy
 msgid "Exporting key..."
 msgstr "&Prekini slanje"
 
-#: kmcomposewin.cpp:3090
+#: kmcomposewin.cpp:3171
 #, c-format
 msgid "OpenPGP key 0x%1"
 msgstr "OpenPGP ključ 0x%1"
 
-#: kmcomposewin.cpp:3105
+#: kmcomposewin.cpp:3186
 msgid "Attach Public OpenPGP Key"
 msgstr "Priloži javni OpenPGP ključ"
 
-#: kmcomposewin.cpp:3106
+#: kmcomposewin.cpp:3187
 #, fuzzy
 msgid "Select the public key which should be attached."
 msgstr "Odabiranje javnog ključa koji treba priložiti."
 
-#: kmcomposewin.cpp:3128 kmmimeparttree.cpp:137 kmreaderwin.cpp:1967
+#: kmcomposewin.cpp:3209 kmmimeparttree.cpp:135 kmreaderwin.cpp:2032
 #, fuzzy
 msgid ""
 "_: to open\n"
 "Open"
 msgstr "Pokaži"
 
-#: kmcomposewin.cpp:3130 kmmimeparttree.cpp:138 kmreaderwin.cpp:1968
+#: kmcomposewin.cpp:3211 kmmimeparttree.cpp:136 kmreaderwin.cpp:2033
 msgid "Open With..."
 msgstr "Otvori sa..."
 
-#: kmcomposewin.cpp:3132
+#: kmcomposewin.cpp:3213
 #, fuzzy
 msgid ""
 "_: to view\n"
 "View"
 msgstr "Pokaži"
 
-#: kmcomposewin.cpp:3135
+#: kmcomposewin.cpp:3216
 #, fuzzy
 msgid "Edit With..."
 msgstr "Uredi..."
 
-#: kmcomposewin.cpp:3143
+#: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "Dodaj Privitak..."
 
-#: kmcomposewin.cpp:3232 kmcomposewin.cpp:3240
+#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
 #, fuzzy
 msgid "KMail could not compress the file."
 msgstr ""
 "Ne mogu pisati u datoteku:\n"
 "%1"
 
-#: kmcomposewin.cpp:3246
+#: kmcomposewin.cpp:3326
 #, fuzzy
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
@@ -5459,49 +6159,49 @@ msgid ""
 msgstr ""
 "Ovaj dio poruke je potpisan. Želite li da zadržite potpis prilikom spremanja?"
 
-#: kmcomposewin.cpp:3247
+#: kmcomposewin.cpp:3327
 #, fuzzy
 msgid "Keep"
 msgstr "&Beep"
 
-#: kmcomposewin.cpp:3313 kmcomposewin.cpp:3321
+#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
 #, fuzzy
 msgid "KMail could not uncompress the file."
 msgstr ""
 "Ne mogu pisati u datoteku:\n"
 "%1"
 
-#: kmcomposewin.cpp:3519
+#: kmcomposewin.cpp:3601
 #, fuzzy
 msgid "Save Attachment As"
 msgstr "Snimi prilog kao"
 
-#: 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
 #, fuzzy
 msgid "Add as Attachment"
 msgstr "Dodaj Privitak..."
 
-#: 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 "prilog"
 
-#: 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 "neimenovan"
 
-#: kmcomposewin.cpp:3873
+#: kmcomposewin.cpp:3961
 msgid ""
 "<qt>"
 "<p>You have requested that messages be encrypted to yourself, but the currently "
@@ -5510,12 +6210,12 @@ msgid ""
 "<p>Please select the key(s) to use in the identity configuration.</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:3880
+#: kmcomposewin.cpp:3968
 #, fuzzy
 msgid "Undefined Encryption Key"
 msgstr "Nedefiniran ključ za kriptiranje"
 
-#: kmcomposewin.cpp:3924
+#: kmcomposewin.cpp:4015
 msgid ""
 "<qt>"
 "<p>In order to be able to sign this message you first have to define the "
@@ -5523,206 +6223,237 @@ msgid ""
 "<p>Please select the key to use in the identity configuration.</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:3931
+#: kmcomposewin.cpp:4022
 #, fuzzy
 msgid "Undefined Signing Key"
 msgstr "Nedefiniran ključ za potpisivanje"
 
-#: 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 "
 "message."
 msgstr ""
 
-#: kmcomposewin.cpp:4044
+#: kmcomposewin.cpp:4157
 #, fuzzy
 msgid ""
 "You must specify at least one receiver,either in the To: field or as CC or as "
 "BCC."
 msgstr "Morate odreditti bar jednog primatelja u polju „Za:“."
 
-#: kmcomposewin.cpp:4052
+#: kmcomposewin.cpp:4165
 #, fuzzy
 msgid "To field is missing.Send message anyway?"
 msgstr "Niste upisali temu. Da li da pošaljem poruku sa praznom temom?"
 
-#: kmcomposewin.cpp:4054
+#: kmcomposewin.cpp:4167
 #, fuzzy
 msgid "No To: specified"
 msgstr "Nije naznačen naslov"
 
-#: kmcomposewin.cpp:4079
+#: kmcomposewin.cpp:4192
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Niste upisali temu. Da li da pošaljem poruku sa praznom temom?"
 
-#: kmcomposewin.cpp:4081
+#: kmcomposewin.cpp:4194
 msgid "No Subject Specified"
 msgstr "Nije naznačen naslov"
 
-#: kmcomposewin.cpp:4082
+#: kmcomposewin.cpp:4195
 #, fuzzy
 msgid "S&end as Is"
 msgstr "Pošalji ponovo..."
 
-#: kmcomposewin.cpp:4083
+#: kmcomposewin.cpp:4196
 #, fuzzy
 msgid "&Specify the Subject"
 msgstr "Ne, želim upisati temu"
 
-#: kmcomposewin.cpp:4121
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not sign/encrypt"
 msgstr ""
 
-#: kmcomposewin.cpp:4122
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not encrypt"
 msgstr ""
 
-#: kmcomposewin.cpp:4123
+#: kmcomposewin.cpp:4236
 msgid "&Keep markup, do not sign"
 msgstr ""
 
-#: kmcomposewin.cpp:4125
+#: kmcomposewin.cpp:4238
 #, fuzzy
 msgid "Sign/Encrypt (delete markup)"
 msgstr "Potpiši/kriptiraj"
 
-#: kmcomposewin.cpp:4126
+#: kmcomposewin.cpp:4239
 msgid "Encrypt (delete markup)"
 msgstr ""
 
-#: kmcomposewin.cpp:4127
+#: kmcomposewin.cpp:4240
 msgid "Sign (delete markup)"
 msgstr ""
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4242
 msgid ""
 "<qt>"
 "<p>Inline signing/encrypting of HTML messages is not possible;</p>"
 "<p>do you want to delete your markup?</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:4131
+#: kmcomposewin.cpp:4244
 msgid "Sign/Encrypt Message?"
 msgstr ""
 
-#: 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."
 msgstr ""
 
-#: kmcomposewin.cpp:4326
+#: kmcomposewin.cpp:4393 kmsender.cpp:114
+msgid "Please create an account for sending and try again."
+msgstr "Napravite korisnički račun za slanje pa pokušajte ponovo."
+
+#: kmcomposewin.cpp:4456
 msgid "About to send email..."
 msgstr "Spremam se poslati email..."
 
-#: kmcomposewin.cpp:4327
+#: kmcomposewin.cpp:4457
 #, fuzzy
 msgid "Send Confirmation"
 msgstr "Potvrda slanja poruke"
 
-#: kmcomposewin.cpp:4328 redirectdialog.cpp:82
+#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "Pošalji &odmah"
 
-#: 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 "<primatelji>"
+
+#: kmcomposewin.cpp:4482
+#, fuzzy
+msgid "&Edit Recipients"
+msgstr "<primatelji>"
+
+#: kmcomposewin.cpp:4728
 #, fuzzy
 msgid "Spellcheck: on"
 msgstr "Provjera pisanja"
 
-#: kmcomposewin.cpp:4551
+#: kmcomposewin.cpp:4730
 #, fuzzy
 msgid "Spellcheck: off"
 msgstr "Provjera pisanja"
 
-#: kmcomposewin.cpp:4608
+#: kmcomposewin.cpp:4787
 #, fuzzy
 msgid " Spell check canceled."
 msgstr " Provjera pravopisa je otkazana."
 
-#: kmcomposewin.cpp:4611
+#: kmcomposewin.cpp:4790
 msgid " Spell check stopped."
 msgstr "Zaustavljena provjera pravopisa."
 
-#: kmcomposewin.cpp:4614
+#: kmcomposewin.cpp:4793
 msgid " Spell check complete."
 msgstr "Završena provjera pravopisa."
 
-#: kmcomposewin.cpp:4798 kmcomposewin.cpp:4806
+#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
 msgid "Spellchecker"
 msgstr "Provjera pisanja"
 
-#: 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
 #, fuzzy
 msgid "No Chiasmus Keys Found"
 msgstr "Nisu nađeni certifikati"
 
-#: kmcomposewin.cpp:5157
+#: kmcomposewin.cpp:5346
 #, fuzzy
 msgid "Chiasmus Encryption Key Selection"
 msgstr "Podešavanja kriptiranja"
 
-#: kmcomposewin.cpp:5189
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will be signed"
 msgstr "Poruku je potpisao"
 
-#: kmcomposewin.cpp:5189
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will not be signed"
 msgstr "Poruku je potpisao"
 
-#: kmcomposewin.cpp:5190
+#: kmcomposewin.cpp:5379
 #, fuzzy
 msgid "Message will be encrypted"
 msgstr "OpenPGP poruka — kriptirano"
 
-#: kmcomposewin.cpp:5190
+#: kmcomposewin.cpp:5379
 #, fuzzy
 msgid "Message will not be encrypted"
 msgstr "Popisa poruka"
 
-#: kmedit.cpp:391
+#: kmedit.cpp:458
 #, fuzzy
 msgid "Unable to start external editor."
 msgstr "Ne mogu pokrenuti vanjski uređivač."
 
-#: kmedit.cpp:442
-msgid "Suggestions"
+#: kmedit.cpp:522
+#, fuzzy
+msgid "No Suggestions"
 msgstr "Prijedlozi"
 
-#: kmedit.cpp:494
+#: kmedit.cpp:529
+#, fuzzy
+msgid "Add to Dictionary"
+msgstr "&Rječnik"
+
+#: kmedit.cpp:530
+#, fuzzy
+msgid "Ignore All"
+msgstr "Z&anemari"
+
+#: kmedit.cpp:587
 msgid "Automatic spellchecking is not possible on text with markup."
 msgstr ""
 
-#: kmedit.cpp:538
+#: kmedit.cpp:631
 #, fuzzy
 msgid ""
 "The external editor is still running.\n"
@@ -5731,19 +6462,19 @@ msgstr ""
 "Vanjski uređivač još uvijek radi.\n"
 "Da prekinem vanjski uređivač ili da ga ostavim?"
 
-#: kmedit.cpp:541
+#: kmedit.cpp:634
 msgid "Abort Editor"
 msgstr "Prekini uređivač"
 
-#: kmedit.cpp:541
+#: kmedit.cpp:634
 msgid "Leave Editor Open"
 msgstr "Ostavi uređivač otvoren"
 
-#: kmedit.cpp:565
+#: kmedit.cpp:661
 msgid "Spellcheck - KMail"
 msgstr "Provjera pisanja - 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."
@@ -5751,15 +6482,20 @@ msgstr ""
 "ISpell/Aspell se ne može pokrenuti.Provjerite da li je ISpell ili Aspell "
 "ispravno podešen i da li se nalazi u vašoj putanji."
 
-#: kmedit.cpp:743
+#: kmedit.cpp:893
 msgid "ISpell/Aspell seems to have crashed."
 msgstr "Izgleda da se ISpell/Aspell srušio."
 
-#: kmedit.cpp:752
+#: kmedit.cpp:902
 msgid "No misspellings encountered."
 msgstr "Nema pogrešno napisanih reči."
 
-#: kmfawidgets.cpp:102
+#: kmfawidgets.cpp:39
+#, fuzzy
+msgid "Open Address Book"
+msgstr "Otvori u adresaru"
+
+#: kmfawidgets.cpp:107
 msgid "Select Sound File"
 msgstr "Izaberite zvučnu datoteku"
 
@@ -5782,210 +6518,242 @@ msgid ""
 "<br>Ignoring it.</qt>"
 msgstr ""
 
-#: kmfilteraction.cpp:598
+#: kmfilteraction.cpp:601
 #, fuzzy
 msgid "Confirm Delivery"
 msgstr "potvrdi dostavu"
 
-#: kmfilteraction.cpp:634
+#: kmfilteraction.cpp:637
 #, fuzzy
 msgid "Set Transport To"
 msgstr "postavi transport na"
 
-#: kmfilteraction.cpp:665
+#: kmfilteraction.cpp:668
 #, fuzzy
 msgid "Set Reply-To To"
 msgstr "postavi „Odgovor na“ na"
 
-#: kmfilteraction.cpp:701
+#: kmfilteraction.cpp:704
 #, fuzzy
 msgid "Set Identity To"
 msgstr "postavi identitet na"
 
-#: kmfilteraction.cpp:784
+#: kmfilteraction.cpp:787
 #, fuzzy
 msgid "Mark As"
 msgstr "označi kao"
 
-#: kmfilteraction.cpp:789
+#: kmfilteraction.cpp:792
 msgid ""
 "_: msg status\n"
 "Important"
 msgstr "Važna"
 
-#: kmfilteraction.cpp:790
+#: kmfilteraction.cpp:793
 msgid ""
 "_: msg status\n"
 "Read"
 msgstr "Pročitana"
 
-#: kmfilteraction.cpp:791
+#: kmfilteraction.cpp:794
 msgid ""
 "_: msg status\n"
 "Unread"
 msgstr "Nepročitana"
 
-#: kmfilteraction.cpp:792
+#: kmfilteraction.cpp:795
 msgid ""
 "_: msg status\n"
 "Replied"
 msgstr "Odgovorena"
 
-#: kmfilteraction.cpp:793
+#: kmfilteraction.cpp:796
 msgid ""
 "_: msg status\n"
 "Forwarded"
 msgstr "Proslijeđena"
 
-#: kmfilteraction.cpp:794
+#: kmfilteraction.cpp:797
 msgid ""
 "_: msg status\n"
 "Old"
 msgstr "Stara"
 
-#: 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 "Nadgledana"
 
-#: kmfilteraction.cpp:797
+#: kmfilteraction.cpp:800
 msgid ""
 "_: msg status\n"
 "Ignored"
 msgstr "Ignorirana"
 
-#: kmfilteraction.cpp:798
+#: kmfilteraction.cpp:801
 msgid ""
 "_: msg status\n"
 "Spam"
 msgstr "Spam"
 
-#: kmfilteraction.cpp:799
+#: kmfilteraction.cpp:802
 msgid ""
 "_: msg status\n"
 "Ham"
 msgstr "Ham"
 
-#: kmfilteraction.cpp:883
+#: kmfilteraction.cpp:886
 #, fuzzy
 msgid "Send Fake MDN"
 msgstr "pošalji lažni MDN"
 
-#: kmfilteraction.cpp:888
+#: kmfilteraction.cpp:891
 msgid ""
 "_: MDN type\n"
 "Ignore"
 msgstr "Ignoriran"
 
-#: kmfilteraction.cpp:889
+#: kmfilteraction.cpp:892
 msgid ""
 "_: MDN type\n"
 "Displayed"
 msgstr "Prikazano"
 
-#: kmfilteraction.cpp:890
+#: kmfilteraction.cpp:893
 msgid ""
 "_: MDN type\n"
 "Deleted"
 msgstr "Obrisano"
 
-#: kmfilteraction.cpp:891
+#: kmfilteraction.cpp:894
 msgid ""
 "_: MDN type\n"
 "Dispatched"
 msgstr "Poslano"
 
-#: kmfilteraction.cpp:892
+#: kmfilteraction.cpp:895
 msgid ""
 "_: MDN type\n"
 "Processed"
 msgstr "Obrađeno"
 
-#: kmfilteraction.cpp:893
+#: kmfilteraction.cpp:896
 msgid ""
 "_: MDN type\n"
 "Denied"
 msgstr "Odbijeno"
 
-#: kmfilteraction.cpp:894
+#: kmfilteraction.cpp:897
 msgid ""
 "_: MDN type\n"
 "Failed"
 msgstr "Nije uspjelo"
 
-#: kmfilteraction.cpp:963
+#: kmfilteraction.cpp:966
 #, fuzzy
 msgid "Remove Header"
 msgstr "ukloni zaglavlje"
 
-#: kmfilteraction.cpp:1036
+#: kmfilteraction.cpp:1039
 #, fuzzy
 msgid "Add Header"
 msgstr "dodaj zaglavlje"
 
-#: kmfilteraction.cpp:1063
+#: kmfilteraction.cpp:1066
 #, fuzzy
 msgid "With value:"
 msgstr "sa vrednošću"
 
-#: kmfilteraction.cpp:1177
+#: kmfilteraction.cpp:1180
 #, fuzzy
 msgid "Rewrite Header"
 msgstr "prepiši zaglavlje"
 
-#: kmfilteraction.cpp:1213
+#: kmfilteraction.cpp:1216
 #, fuzzy
 msgid "Replace:"
 msgstr "&Zamijeni"
 
-#: kmfilteraction.cpp:1220
+#: kmfilteraction.cpp:1223
 #, fuzzy
 msgid "With:"
 msgstr "sa"
 
-#: kmfilteraction.cpp:1340
+#: kmfilteraction.cpp:1343
 #, fuzzy
 msgid "Move Into Folder"
 msgstr "Premjesti u ovu mapu"
 
-#: kmfilteraction.cpp:1390
+#: kmfilteraction.cpp:1393
 #, fuzzy
 msgid "Copy Into Folder"
 msgstr "Kopiraj u ovu mapu"
 
-#: kmfilteraction.cpp:1452
+#: kmfilteraction.cpp:1467
 #, fuzzy
 msgid "Forward To"
 msgstr "Proslijedi na..."
 
-#: 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 "&Zamijeni"
+
+#: kmfilteraction.cpp:1525
+#, fuzzy
+msgid "The template used when forwarding"
+msgstr "Označi trenutnu poruku kao p&roslijeđenu"
+
+#: 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 "Koristi poseban s&ufiks za id. poruke"
+
+#: kmfilteraction.cpp:1622
+#, fuzzy
+msgid "Forward to %1 with template %2"
+msgstr "Koristi poseban s&ufiks za id. poruke"
+
+#: kmfilteraction.cpp:1643
 #, fuzzy
 msgid "Redirect To"
 msgstr "preusmjeri na"
 
-#: kmfilteraction.cpp:1605
+#: kmfilteraction.cpp:1683
 #, fuzzy
 msgid "Execute Command"
 msgstr "izvrši naredbu"
 
-#: kmfilteraction.cpp:1702
+#: kmfilteraction.cpp:1780
 #, fuzzy
 msgid "Pipe Through"
 msgstr "pusti kroz cjevovod"
 
-#: kmfilteraction.cpp:1809
+#: kmfilteraction.cpp:1887
 #, fuzzy
 msgid "Play Sound"
 msgstr "pusti zvuk"
 
-#: kmfilterdlg.cpp:51
+#: kmfilterdlg.cpp:55
 msgid ""
 "<qt>"
 "<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
@@ -5993,7 +6761,7 @@ msgid ""
 "the dialog.</p></qt>"
 msgstr ""
 
-#: kmfilterdlg.cpp:57
+#: kmfilterdlg.cpp:61
 msgid ""
 "<qt>"
 "<p>Click this button to create a new filter.</p>"
@@ -6003,7 +6771,7 @@ msgid ""
 "on the <em>Delete</em> button.</p></qt>"
 msgstr ""
 
-#: kmfilterdlg.cpp:64
+#: kmfilterdlg.cpp:68
 msgid ""
 "<qt>"
 "<p>Click this button to copy a filter.</p>"
@@ -6011,7 +6779,7 @@ msgid ""
 "on the <em>Delete</em> button.</p></qt>"
 msgstr ""
 
-#: kmfilterdlg.cpp:68
+#: kmfilterdlg.cpp:72
 msgid ""
 "<qt>"
 "<p>Click this button to <em>delete</em> the currently-selected filter from the "
@@ -6021,7 +6789,7 @@ msgid ""
 "made.</p></qt>"
 msgstr ""
 
-#: kmfilterdlg.cpp:75
+#: kmfilterdlg.cpp:79
 msgid ""
 "<qt>"
 "<p>Click this button to move the currently-selected filter to the <em>top</em> "
@@ -6031,7 +6799,7 @@ msgid ""
 "first.</p></qt>"
 msgstr ""
 
-#: kmfilterdlg.cpp:81
+#: kmfilterdlg.cpp:85
 msgid ""
 "<qt>"
 "<p>Click this button to move the currently-selected filter <em>up</em> "
@@ -6043,7 +6811,7 @@ msgid ""
 "on the <em>Down</em> button.</p></qt>"
 msgstr ""
 
-#: kmfilterdlg.cpp:89
+#: kmfilterdlg.cpp:93
 msgid ""
 "<qt>"
 "<p>Click this button to move the currently-selected filter <em>down</em> "
@@ -6055,7 +6823,7 @@ msgid ""
 "on the <em>Up</em> button.</p></qt>"
 msgstr ""
 
-#: kmfilterdlg.cpp:97
+#: kmfilterdlg.cpp:101
 msgid ""
 "<qt>"
 "<p>Click this button to move the currently-selected filter to the <em>"
@@ -6065,7 +6833,7 @@ msgid ""
 "first.</p></qt>"
 msgstr ""
 
-#: kmfilterdlg.cpp:103
+#: kmfilterdlg.cpp:107
 msgid ""
 "<qt>"
 "<p>Click this button to rename the currently-selected filter.</p>"
@@ -6075,7 +6843,7 @@ msgid ""
 "in the appearing dialog.</p></qt>"
 msgstr ""
 
-#: kmfilterdlg.cpp:110
+#: kmfilterdlg.cpp:114
 msgid ""
 "<qt>"
 "<p>Check this button to force the confirmation dialog to be displayed.</p>"
@@ -6086,127 +6854,132 @@ msgid ""
 "differently.</p></qt>"
 msgstr ""
 
-#: kmfilterdlg.cpp:129
+#: kmfilterdlg.cpp:133
 msgid "POP3 Filter Rules"
 msgstr "Pravila POP3 filtra"
 
-#: kmfilterdlg.cpp:129
+#: kmfilterdlg.cpp:133
 msgid "Filter Rules"
 msgstr "Filter pravila"
 
-#: kmfilterdlg.cpp:151
+#: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "Postojeći Filteri"
 
-#: kmfilterdlg.cpp:164
+#: kmfilterdlg.cpp:168
 #, fuzzy
 msgid "A&dvanced"
 msgstr "&Napredno"
 
-#: kmfilterdlg.cpp:171
+#: kmfilterdlg.cpp:175
 msgid "Filter Criteria"
 msgstr "Kriterij filtra"
 
-#: kmfilterdlg.cpp:175
+#: kmfilterdlg.cpp:179
 msgid "Filter Action"
 msgstr "Akcija filtra"
 
-#: kmfilterdlg.cpp:178
+#: kmfilterdlg.cpp:182
 msgid "Global Options"
 msgstr "Napredni Pop3"
 
-#: kmfilterdlg.cpp:179
+#: kmfilterdlg.cpp:183
 msgid "Always &show matched 'Download Later' messages in confirmation dialog"
 msgstr ""
 "Uvijek &pokaži odgovarajuće „Preuzmi kasnije“ poruke u dijalogu za potvrdu"
 
-#: kmfilterdlg.cpp:184
+#: kmfilterdlg.cpp:188
 msgid "Filter Actions"
 msgstr "Akcije filtera"
 
-#: kmfilterdlg.cpp:189
+#: kmfilterdlg.cpp:193
 msgid "Advanced Options"
 msgstr "Napredne opcije"
 
-#: kmfilterdlg.cpp:197
+#: kmfilterdlg.cpp:201
 #, fuzzy
 msgid "Apply this filter to incoming messages:"
 msgstr "na &dolazeće poruke"
 
-#: kmfilterdlg.cpp:201
+#: kmfilterdlg.cpp:205
 #, fuzzy
 msgid "from all accounts"
 msgstr "Računi"
 
-#: 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
 #, fuzzy
 msgid "Account Name"
 msgstr "Račun:"
 
-#: kmfilterdlg.cpp:220
+#: kmfilterdlg.cpp:224
 #, fuzzy
 msgid "Apply this filter to &sent messages"
 msgstr "Primijeni ovaj filter"
 
-#: kmfilterdlg.cpp:223
+#: kmfilterdlg.cpp:227
 #, fuzzy
 msgid "Apply this filter on manual &filtering"
 msgstr "pri ručnom &filtriranju"
 
-#: kmfilterdlg.cpp:226
+#: kmfilterdlg.cpp:230
 msgid "If this filter &matches, stop processing here"
 msgstr "Ako se ovaj filter po&klapa, prestanite s obradom ovdje"
 
-#: kmfilterdlg.cpp:230
+#: kmfilterdlg.cpp:234
 msgid "Add this filter to the Apply Filter menu"
 msgstr ""
 
-#: kmfilterdlg.cpp:232
+#: kmfilterdlg.cpp:236
 msgid "Shortcut:"
 msgstr ""
 
-#: kmfilterdlg.cpp:238
+#: kmfilterdlg.cpp:242
 msgid "Additionally add this filter to the toolbar"
 msgstr ""
 
-#: kmfilterdlg.cpp:243
+#: kmfilterdlg.cpp:247
 msgid "Icon for this filter:"
 msgstr "Sličica za ovaj filtar:"
 
-#: kmfilterdlg.cpp:608
+#: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "Gore"
 
-#: kmfilterdlg.cpp:609
+#: kmfilterdlg.cpp:613
 msgid "Down"
 msgstr "Dolje"
 
-#: kmfilterdlg.cpp:628
+#: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "Promijeni ime..."
 
 #. 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 "Novi"
 
-#: kmfilterdlg.cpp:744
+#: kmfilterdlg.cpp:645
+#, fuzzy
+msgid "Select Source Folders"
+msgstr "&Kratka lista mapi"
+
+#: 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
 #, fuzzy
 msgid ""
 "The following filters have not been saved because they were invalid (e.g. "
@@ -6215,29 +6988,34 @@ msgstr ""
 "Sljedeći filteri nisu snimljeni zato jer su neispravni (npr. ne sadrže ni jednu "
 "akciju ili pravila za pretragu)."
 
-#: kmfilterdlg.cpp:935
+#: kmfilterdlg.cpp:947
 msgid "Rename Filter"
 msgstr "Promijeni ime filtera"
 
-#: kmfilterdlg.cpp:936
+#: kmfilterdlg.cpp:948
 msgid ""
 "Rename filter \"%1\" to:\n"
 "(leave the field empty for automatic naming)"
 msgstr ""
 
-#: kmfilterdlg.cpp:1113
+#: kmfilterdlg.cpp:973
+#, fuzzy
+msgid "Select Folders to Filter"
+msgstr "Odaberite mapu sa fokusom"
+
+#: kmfilterdlg.cpp:1136
 msgid "Please select an action."
 msgstr "Odaberite akciju."
 
-#: kmfilterdlg.cpp:1280
+#: kmfilterdlg.cpp:1303
 msgid "&Download mail"
 msgstr "&Preuzmi poštu"
 
-#: kmfilterdlg.cpp:1281
+#: kmfilterdlg.cpp:1304
 msgid "Download mail la&ter"
 msgstr "Preuzmi poš&tu kasnije"
 
-#: kmfilterdlg.cpp:1282
+#: kmfilterdlg.cpp:1305
 msgid "D&elete mail from server"
 msgstr "&Obriši poštu sa poslužitelja"
 
@@ -6245,10 +7023,28 @@ msgstr "&Obriši poštu sa poslužitelja"
 msgid "<qt>Error while creating file <b>%1</b>:<br>%2</qt>"
 msgstr "<qt>Greška pri izradi datoteka <b>%1</b>:<br>%2</qt>"
 
-#: kmfolder.cpp:272
+#: kmfolder.cpp:276
 msgid "Failed to create folder"
 msgstr "Neuspjelo stvaranje direktorija"
 
+#: 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
 #, fuzzy
 msgid "Troubleshooting IMAP Cache"
@@ -6300,25 +7096,25 @@ msgstr "Mape re&sursa su podmape:"
 msgid "Refresh &Cache"
 msgstr "Osviježi &predmemoriju"
 
-#: kmfoldercachedimap.cpp:203
+#: kmfoldercachedimap.cpp:216
 msgid ""
 "The UID cache file for folder %1 could not be read. There could be a problem "
 "with file system permission, or it is corrupted."
 msgstr ""
 
-#: kmfoldercachedimap.cpp:452
+#: kmfoldercachedimap.cpp:488
 msgid ""
 "The UID cache file for folder %1 could not be written. There could be a problem "
 "with file system permission."
 msgstr ""
 
-#: kmfoldercachedimap.cpp:562
+#: kmfoldercachedimap.cpp:612
 #, fuzzy
 msgid "You must synchronize with the server before renaming IMAP folders."
 msgstr ""
 "Morate se sinhronizovati sa poslužiteljom prije promjene imena IMAP mapi."
 
-#: kmfoldercachedimap.cpp:679
+#: kmfoldercachedimap.cpp:735
 msgid ""
 "No account setup for this folder.\n"
 "Please try running a sync before this."
@@ -6326,7 +7122,7 @@ msgstr ""
 "Nema korisničkih računa za ovu mapu.\n"
 "Pokušajte da pokrenete sinhronizaciju prije ovoga."
 
-#: kmfoldercachedimap.cpp:683
+#: kmfoldercachedimap.cpp:739
 #, fuzzy
 msgid ""
 "Are you sure you want to refresh the IMAP cache of the folder %1 and all its "
@@ -6337,20 +7133,20 @@ msgstr ""
 "pod mape?\n"
 "Ovo će ukloniti sve izmjene koje ste napravili lokalno u vašim mapama."
 
-#: kmfoldercachedimap.cpp:687 kmmainwidget.cpp:1352
+#: kmfoldercachedimap.cpp:743 kmmainwidget.cpp:1316
 msgid "Refresh IMAP Cache"
 msgstr "Osviježi IMAP predmemoriju"
 
-#: kmfoldercachedimap.cpp:688 kmmainwidget.cpp:1352
+#: kmfoldercachedimap.cpp:744 kmmainwidget.cpp:1316
 msgid "&Refresh"
 msgstr "&Osvježi"
 
-#: kmfoldercachedimap.cpp:711
+#: kmfoldercachedimap.cpp:767
 #, fuzzy
 msgid "The index of this folder has been recreated."
 msgstr "Indeks ove mape je ponovo napravljen."
 
-#: kmfoldercachedimap.cpp:721
+#: kmfoldercachedimap.cpp:777
 #, fuzzy
 msgid ""
 "Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
@@ -6359,141 +7155,141 @@ msgstr ""
 "Mapa %1 nije u početnom sinhronizacijskom stanju (stanje je %2). Želite li\n"
 "da vratite stanje na početno ili da ipak napravite sinhronizaciju?"
 
-#: kmfoldercachedimap.cpp:721
+#: kmfoldercachedimap.cpp:777
 msgid "Reset && Sync"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:741
+#: kmfoldercachedimap.cpp:798
 #, fuzzy
 msgid "Synchronization skipped"
 msgstr "Sinhronizacija je preskočena"
 
-#: kmfoldercachedimap.cpp:831
+#: kmfoldercachedimap.cpp:890
 msgid "Synchronizing"
 msgstr "Sinkroniziranje"
 
-#: kmfoldercachedimap.cpp:850
+#: kmfoldercachedimap.cpp:909
 #, c-format
 msgid "Connecting to %1"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:872
+#: kmfoldercachedimap.cpp:934
 msgid "Checking permissions"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:886
+#: kmfoldercachedimap.cpp:956
 #, fuzzy
 msgid "Renaming folder"
 msgstr "&Odredišni direktorij:"
 
-#: kmfoldercachedimap.cpp:948
+#: kmfoldercachedimap.cpp:1021
 #, fuzzy
 msgid "Retrieving folderlist"
 msgstr "Dobavljam popis mapi"
 
-#: kmfoldercachedimap.cpp:952
+#: kmfoldercachedimap.cpp:1026
 msgid "Error while retrieving the folderlist"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:959
+#: kmfoldercachedimap.cpp:1035
 #, fuzzy
 msgid "Retrieving subfolders"
 msgstr "Dobavljam podmape"
 
-#: kmfoldercachedimap.cpp:966
+#: kmfoldercachedimap.cpp:1043
 msgid "Deleting folders from server"
 msgstr "Brišem mape s poslužitelja"
 
-#: kmfoldercachedimap.cpp:981
+#: kmfoldercachedimap.cpp:1058
 #, fuzzy
 msgid "Retrieving message list"
 msgstr "Potpiši poruku"
 
-#: kmfoldercachedimap.cpp:994
+#: kmfoldercachedimap.cpp:1071
 msgid "No messages to delete..."
 msgstr "Nema poruka za brisanje..."
 
-#: kmfoldercachedimap.cpp:1005
+#: kmfoldercachedimap.cpp:1082
 msgid "Expunging deleted messages"
 msgstr "Nepročitana poruka"
 
-#: kmfoldercachedimap.cpp:1019
-#, fuzzy
-msgid "Retrieving new messages"
-msgstr "Dobavljam nove poruke"
+#: kmfoldercachedimap.cpp:1096
+#, fuzzy, c-format
+msgid ""
+"_n: Retrieving one new message\n"
+"Retrieving %n new messages"
+msgstr ""
+"%n poruka, %1.\n"
+"%n poruke, %1.\n"
+"%n poruka, %1."
 
-#: kmfoldercachedimap.cpp:1031
+#: kmfoldercachedimap.cpp:1108
 msgid "No new messages from server"
 msgstr "Nema novih poruka s poslužitelja"
 
-#: kmfoldercachedimap.cpp:1064
+#: kmfoldercachedimap.cpp:1141
 #, fuzzy
 msgid "Checking annotation support"
 msgstr "%1: Dohvaćam nove poruke"
 
-#: kmfoldercachedimap.cpp:1111
+#: kmfoldercachedimap.cpp:1191
 #, fuzzy
 msgid "Retrieving annotations"
 msgstr "%1: Dohvaćam nove poruke"
 
-#: kmfoldercachedimap.cpp:1133
+#: kmfoldercachedimap.cpp:1213
 msgid "Setting annotations"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:1174
+#: kmfoldercachedimap.cpp:1260
 msgid "Setting permissions"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:1193
+#: kmfoldercachedimap.cpp:1279
 #, fuzzy
 msgid "Retrieving permissions"
 msgstr "%1: Dohvaćam nove poruke"
 
-#: kmfoldercachedimap.cpp:1203
+#: kmfoldercachedimap.cpp:1306
 #, fuzzy
 msgid "Getting quota information"
 msgstr "Greška prilikom slanja mape"
 
-#: kmfoldercachedimap.cpp:1218
-#, fuzzy
-msgid "Updating cache file"
-msgstr "Ažuriram keš datoteka"
-
-#: kmfoldercachedimap.cpp:1244
+#: kmfoldercachedimap.cpp:1321
 #, fuzzy
 msgid "Synchronization done"
 msgstr "Sinhronizacija je završena"
 
-#: kmfoldercachedimap.cpp:1326
+#: kmfoldercachedimap.cpp:1464
 #, fuzzy
 msgid "Uploading messages to server"
 msgstr "Šaljem poruke na poslužitelj"
 
-#: 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 "Nema poruka za slanje na poslužitelj"
 
-#: kmfoldercachedimap.cpp:1366 kmfoldercachedimap.cpp:1410
+#: kmfoldercachedimap.cpp:1504 kmfoldercachedimap.cpp:1553
 #, fuzzy
 msgid "Uploading status of messages to server"
 msgstr "Šaljem poruke za %1"
 
-#: kmfoldercachedimap.cpp:1490
+#: kmfoldercachedimap.cpp:1647
 msgid "Creating subfolders on server"
 msgstr "Stvaram podmape na poslužitelju"
 
-#: 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 "
@@ -6501,57 +7297,57 @@ msgid ""
 "<br>UIDs: %2</p></qt>"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:1558
+#: kmfoldercachedimap.cpp:1719
 msgid "Deleting removed messages from server"
 msgstr "Brišem uklonjene poruke s poslužitelja"
 
-#: kmfoldercachedimap.cpp:1592
+#: kmfoldercachedimap.cpp:1758
 msgid "Checking folder validity"
 msgstr "Provjeravam valjanost mape"
 
-#: kmfoldercachedimap.cpp:1806
+#: kmfoldercachedimap.cpp:1972
 msgid "Folder listing failed in interesting ways."
 msgstr ""
 
-#: kmfoldercachedimap.cpp:1888
+#: kmfoldercachedimap.cpp:2058
 #, fuzzy, c-format
 msgid "Retrieving folders for namespace %1"
 msgstr "Dobavljam popis mapi"
 
-#: 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 "
 "from the server?</p></qt>"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:2411
+#: kmfoldercachedimap.cpp:2597
 #, fuzzy
 msgid "Aborted"
 msgstr "&Prekini slanje"
 
-#: 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."
 msgstr ""
 
-#: 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"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:2729
+#: kmfoldercachedimap.cpp:2951
 #, fuzzy
 msgid "Error while setting annotation: "
 msgstr "Greška prilikom slanja mape"
 
-#: 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 "
@@ -6560,11 +7356,11 @@ msgid ""
 "to avoid data loss.</p>"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:2901
+#: kmfoldercachedimap.cpp:3123
 msgid "Insufficient access rights"
 msgstr ""
 
-#: 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 "
@@ -6574,59 +7370,66 @@ 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 ""
 
-#: kmfoldercachedimap.cpp:2916
+#: kmfoldercachedimap.cpp:3138
 #, fuzzy
 msgid "Move Messages to Folder"
 msgstr "Premjesti poruku u mapu"
 
-#: kmfolderdia.cpp:83
+#: kmfolderdia.cpp:84
 #, fuzzy
 msgid "Permissions (ACL)"
 msgstr "Dozvole"
 
 #. 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 "Općenito"
 
-#: kmfolderdia.cpp:124
+#: kmfolderdia.cpp:125
 msgid "Templates"
 msgstr ""
 
-#: kmfolderdia.cpp:133
+#: kmfolderdia.cpp:134
 msgid "Access Control"
 msgstr ""
 
-#: kmfolderdia.cpp:140
+#: kmfolderdia.cpp:141
 #, fuzzy
 msgid "Quota"
 msgstr "Ukupno"
 
+#: kmfolderdia.cpp:327
+msgid ""
+"Not enough permissions to rename this folder.\n"
+"The parent folder doesn't have write support.\n"
+"A sync is needed after changing the permissions."
+msgstr ""
+
 #. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:299 rc.cpp:239
+#: kmfolderdia.cpp:356 rc.cpp:245
 #, fuzzy, no-c-format
 msgid "Use custom &icons"
 msgstr "Koristi posebne &sličice"
 
-#: kmfolderdia.cpp:304
+#: kmfolderdia.cpp:361
 msgid "&Normal:"
 msgstr "&Obično:"
 
-#: kmfolderdia.cpp:319
+#: kmfolderdia.cpp:376
 msgid "&Unread:"
 msgstr "&Nepročitano:"
 
-#: kmfolderdia.cpp:356
+#: kmfolderdia.cpp:413
 #, fuzzy
 msgid "Act on new/unread mail in this folder"
 msgstr "Provjeri poštu u ovoj mapi"
 
-#: kmfolderdia.cpp:358
+#: kmfolderdia.cpp:415
 msgid ""
 "<qt>"
 "<p>If this option is enabled then you will be notified about new/unread mail in "
@@ -6638,53 +7441,53 @@ msgid ""
 "new/unread mail in your trash and spam folder.</p></qt>"
 msgstr ""
 
-#: kmfolderdia.cpp:374
+#: kmfolderdia.cpp:431
 #, fuzzy
 msgid "Include this folder in mail checks"
 msgstr "Uključi u provjeru:"
 
-#: kmfolderdia.cpp:385
+#: kmfolderdia.cpp:442
 #, fuzzy
 msgid "Keep replies in this folder"
 msgstr "I&zbaci stare poruke iz ove mape"
 
-#: 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 "
 "folder."
 msgstr ""
 
-#: kmfolderdia.cpp:402
+#: kmfolderdia.cpp:459
 msgid "Show Sender/Receiver Column in List of Messages"
 msgstr ""
 
-#: kmfolderdia.cpp:404
+#: kmfolderdia.cpp:461
 #, fuzzy
 msgid "Sho&w column:"
 msgstr " Stupac"
 
 #. 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 "Pošiljatelj"
 
 #. 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 "Primatelj"
 
-#: kmfolderdia.cpp:423
+#: kmfolderdia.cpp:480
 #, fuzzy
 msgid "&Sender identity:"
 msgstr "Identitet pošiljao&ca:"
 
-#: 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 "
@@ -6693,16 +7496,16 @@ msgid ""
 "configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
 
-#: kmfolderdia.cpp:442
+#: kmfolderdia.cpp:500
 #, fuzzy
 msgid "&Folder contents:"
 msgstr "Sličice mapa"
 
-#: 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 "
@@ -6718,31 +7521,42 @@ msgid ""
 "is not known who will go to those events."
 msgstr ""
 
-#: kmfolderdia.cpp:497
+#: kmfolderdia.cpp:555
 #, fuzzy
 msgid "Nobody"
 msgstr "<tijelo>"
 
-#: kmfolderdia.cpp:498
+#: kmfolderdia.cpp:556
 #, fuzzy
 msgid "Admins of This Folder"
 msgstr "I&zbaci stare poruke iz ove mape"
 
-#: kmfolderdia.cpp:499
+#: kmfolderdia.cpp:557
 #, fuzzy
 msgid "All Readers of This Folder"
 msgstr "I&zbaci stare poruke iz ove mape"
 
-#: 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 "
@@ -6751,81 +7565,81 @@ 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 mogu ući u mapu <b>%1</b>.</qt>"
 
-#: kmfolderdir.cpp:192
+#: kmfolderdir.cpp:217
 msgid "<qt>Folder <b>%1</b> is unreadable.</qt>"
 msgstr "<qt>Mapa <b>%1</b> nije čitljiva.</qt>"
 
-#: kmfolderimap.cpp:251
+#: kmfolderimap.cpp:247
 #, fuzzy
 msgid "Removing folder"
 msgstr "&Odredišni direktorij:"
 
-#: kmfolderimap.cpp:252 searchjob.cpp:270
+#: kmfolderimap.cpp:248 searchjob.cpp:270
 #, c-format
 msgid "URL: %1"
 msgstr ""
 
-#: kmfolderimap.cpp:267
+#: kmfolderimap.cpp:263
 #, fuzzy
 msgid "Error while removing a folder."
 msgstr "Greška prilikom slanja mape"
 
-#: kmfolderimap.cpp:497
+#: kmfolderimap.cpp:491
 #, fuzzy, c-format
 msgid "Destination folder: %1"
 msgstr "&Odredišni direktorij:"
 
-#: kmfolderimap.cpp:1068
+#: kmfolderimap.cpp:1069
 msgid "checking"
 msgstr ""
 
-#: kmfolderimap.cpp:1118
+#: kmfolderimap.cpp:1119
 #, fuzzy
 msgid "Error while querying the server status."
 msgstr "Greška prilikom slanja poruke"
 
-#: kmfolderimap.cpp:1233
+#: kmfolderimap.cpp:1234
 #, fuzzy
 msgid "Retrieving message status"
 msgstr "Potpiši poruku"
 
-#: kmfolderimap.cpp:1248 kmfolderimap.cpp:1343
+#: kmfolderimap.cpp:1249 kmfolderimap.cpp:1344
 #, fuzzy
 msgid "Retrieving messages"
 msgstr "Potpiši poruku"
 
-#: kmfolderimap.cpp:1273
+#: kmfolderimap.cpp:1274
 #, fuzzy, c-format
 msgid "Error while listing the contents of the folder %1."
 msgstr ""
 "Greška prilikom pisanja datoteke:\n"
 "%1"
 
-#: kmfolderimap.cpp:1694
+#: kmfolderimap.cpp:1695
 #, fuzzy
 msgid "Error while retrieving messages."
 msgstr "Greška prilikom slanja poruke"
 
-#: kmfolderimap.cpp:1763
+#: kmfolderimap.cpp:1764
 #, fuzzy
 msgid "Error while creating a folder."
 msgstr "Greška prilikom slanja mape"
 
-#: kmfolderimap.cpp:2130
+#: kmfolderimap.cpp:2131
 #, fuzzy
 msgid "updating message counts"
 msgstr "Nema duplikata poruka."
 
-#: kmfolderimap.cpp:2154
+#: kmfolderimap.cpp:2155
 #, fuzzy
 msgid "Error while getting folder information."
 msgstr "Greška prilikom slanja mape"
 
-#: kmfolderindex.cpp:334
+#: kmfolderindex.cpp:369
 #, fuzzy
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
@@ -6837,20 +7651,20 @@ msgstr ""
 "informacije, uključujući i oznake statusa, mogu biti izgubljene. Želite li da "
 "osiromašite vaš indeksni datoteka?"
 
-#: kmfolderindex.cpp:337
+#: kmfolderindex.cpp:372
 #, fuzzy
 msgid "Downgrade"
 msgstr "Dolje"
 
-#: kmfolderindex.cpp:337
+#: kmfolderindex.cpp:372
 msgid "Do Not Downgrade"
 msgstr ""
 
-#: 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 ""
 "Indeks pošte za %1 je od nepoznate inačice KMail-a (%2).\n"
 "Ovaj indeks može biti ponovno napravljen iz vaše poštanske mape, ali neke "
@@ -6871,31 +7685,31 @@ msgstr ""
 msgid "Folder `%1' changed; recreating index."
 msgstr ""
 
-#: kmfoldermaildir.cpp:252
+#: kmfoldermaildir.cpp:253
 msgid "Could not sync maildir folder."
 msgstr ""
 
-#: 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: je nenormalno prekinuo rad da bi se sprječio gubitak "
 "podataka."
 
-#: kmfoldermaildir.cpp:884 kmfoldermbox.cpp:794
+#: kmfoldermaildir.cpp:888 kmfoldermbox.cpp:799
 msgid "Writing index file"
 msgstr "Zapisujem indeksnu datoteku"
 
-#: 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."
 msgstr ""
 
-#: kmfoldermbox.cpp:111
+#: kmfoldermbox.cpp:112
 msgid ""
 "Cannot open file \"%1\":\n"
 "%2"
@@ -6903,7 +7717,7 @@ msgstr ""
 "Ne mogu otvoriti datoteku „%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 "
@@ -6914,23 +7728,23 @@ msgid ""
 "this problem from happening again.</p></qt>"
 msgstr ""
 
-#: kmfoldermbox.cpp:152 kmfoldermbox.cpp:158
+#: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
 msgid "Index Out of Date"
 msgstr "Indeks je zastario"
 
-#: kmfoldermbox.cpp:165
+#: kmfoldermbox.cpp:166
 msgid "Folder `%1' changed. Recreating index."
 msgstr "Sadržaj direktorija `%1' se promijenio. Stvaram indeks."
 
-#: kmfoldermbox.cpp:298
+#: kmfoldermbox.cpp:300
 msgid "Could not sync index file <b>%1</b>: %2"
 msgstr "Ne mogu sinhronizirati datoteu <b>%1</b>: %2"
 
-#: kmfoldermbox.cpp:298
+#: kmfoldermbox.cpp:300
 msgid "Internal error. Please copy down the details and report a bug."
 msgstr "Interna greška. Molim vas kopirajte detalje i prijavite grešku."
 
-#: kmfoldermbox.cpp:597
+#: kmfoldermbox.cpp:602
 #, fuzzy, c-format
 msgid ""
 "_n: Creating index file: one message done\n"
@@ -6940,15 +7754,15 @@ msgstr ""
 "Radim indeksnu datoteka: %n poruke su obrađene\n"
 "Radim indeksnu datoteka: %n poruka je obrađeno"
 
-#: kmfoldermbox.cpp:1038
+#: kmfoldermbox.cpp:1043
 msgid "Could not add message to folder: "
 msgstr "Nisam mogao dodati poruku u mapu: "
 
-#: kmfoldermbox.cpp:1119
+#: kmfoldermbox.cpp:1127
 msgid "Could not add message to folder:"
 msgstr "Nisam mogao dodati poruku u mapu:"
 
-#: kmfoldermbox.cpp:1121
+#: kmfoldermbox.cpp:1129
 msgid "Could not add message to folder (No space left on device?)"
 msgstr "Nisam mogao dodati poruku u mapu (nema više mesta na uređaju?)"
 
@@ -6956,11 +7770,11 @@ msgstr "Nisam mogao dodati poruku u mapu (nema više mesta na uređaju?)"
 msgid "Are you sure you want to expire old messages?"
 msgstr "Jeste li sigurni da želite da isteknu stare poruke?"
 
-#: kmfoldermgr.cpp:69 kmmainwidget.cpp:1366
+#: kmfoldermgr.cpp:69 kmmainwidget.cpp:1330
 msgid "Expire Old Messages?"
 msgstr "Izbaciti stare poruke?"
 
-#: kmfoldermgr.cpp:69 kmmainwidget.cpp:1366
+#: kmfoldermgr.cpp:69 kmmainwidget.cpp:1330
 msgid "Expire"
 msgstr "Izbaci stare poruke"
 
@@ -6972,13 +7786,13 @@ msgstr ""
 "'%1' izgleda da nije mapa.\n"
 "Uklonite datoteku."
 
-#: 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."
 msgstr ""
 
-#: 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'."
@@ -6995,7 +7809,7 @@ msgstr ""
 msgid "Could Not Create Folder"
 msgstr "Neuspjelo stvaranje direktorija"
 
-#: 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."
@@ -7003,202 +7817,207 @@ msgstr ""
 "Ne mogu stvoriti datoteku `%1' u %2.\n"
 "KMail ne može startati bez te datoteke."
 
-#: 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..."
 
-#: kmfolderseldlg.cpp:446 kmfolderseldlg.cpp:466
+#: kmfolderseldlg.cpp:26 kmfolderseldlg.cpp:48
 msgid "Create a new subfolder under the currently selected folder"
 msgstr ""
 
-#: kmfoldertree.cpp:386 kmheaders.cpp:128
+#: kmfolderseldlg.cpp:36 kmfolderseldlg.cpp:55
+msgid "You can start typing to filter the list of folders"
+msgstr ""
+
+#: kmfoldertree.cpp:407 kmheaders.cpp:130
 #, fuzzy
 msgid "View Columns"
 msgstr "Gledaj stupci"
 
-#: kmfoldertree.cpp:388
+#: kmfoldertree.cpp:409
 #, fuzzy
 msgid "Unread Column"
 msgstr "Stupaca nepročitanih"
 
-#: kmfoldertree.cpp:389
+#: kmfoldertree.cpp:410
 #, fuzzy
 msgid "Total Column"
 msgstr "Stupaca ukupno"
 
-#: kmfoldertree.cpp:390
+#: kmfoldertree.cpp:411
 #, fuzzy
 msgid "Size Column"
 msgstr "Gledaj stupci"
 
-#: kmfoldertree.cpp:567 kmfoldertree.cpp:1059
+#: kmfoldertree.cpp:591 kmfoldertree.cpp:1094
 #, fuzzy
 msgid "Searches"
 msgstr "Pretrage"
 
-#: kmfoldertree.cpp:884
+#: kmfoldertree.cpp:920
 msgid "<qt>Go to the next unread message in folder <b>%1</b>?</qt>"
 msgstr "<qt>Treba li ići na sljedeću nepročitanu poruku u mapi <b>%1</b>?</qt>"
 
-#: kmfoldertree.cpp:886
+#: kmfoldertree.cpp:922
 #, fuzzy
 msgid "Go to Next Unread Message"
 msgstr "Idi na sljedeću nepročitanu poruku"
 
-#: kmfoldertree.cpp:887
+#: kmfoldertree.cpp:923
 #, fuzzy
 msgid "Go To"
 msgstr "&Kopiraj u"
 
-#: kmfoldertree.cpp:887
+#: kmfoldertree.cpp:923
 msgid "Do Not Go To"
 msgstr ""
 
-#: kmfoldertree.cpp:1057 kmmainwidget.cpp:2757
+#: kmfoldertree.cpp:1092 kmmainwidget.cpp:2780
 msgid "&New Folder..."
 msgstr "&Novi direktorij..."
 
-#: kmfoldertree.cpp:1068 kmmainwidget.cpp:2645
+#: kmfoldertree.cpp:1103 kmmainwidget.cpp:2668
 msgid "Check &Mail"
 msgstr "Provjeri &poštu"
 
-#: kmfoldertree.cpp:1084
+#: kmfoldertree.cpp:1119
 #, fuzzy
 msgid "&Copy Folder To"
 msgstr "Premjesti u ovu mapu"
 
-#: kmfoldertree.cpp:1090
+#: kmfoldertree.cpp:1125
 #, fuzzy
 msgid "&Move Folder To"
 msgstr "Premjesti u ovu mapu"
 
-#: kmfoldertree.cpp:1104
+#: kmfoldertree.cpp:1141
 #, fuzzy
 msgid "Add to Favorite Folders"
 msgstr "Isključi groupware funkcije"
 
-#: kmfoldertree.cpp:1123
-msgid "Subscription..."
+#: kmfoldertree.cpp:1160
+#, fuzzy
+msgid "Serverside Subscription..."
 msgstr "Opis:..."
 
-#: kmfoldertree.cpp:1126
+#: kmfoldertree.cpp:1163
 #, fuzzy
 msgid "Local Subscription..."
 msgstr "Opis:..."
 
-#: kmfoldertree.cpp:1133
+#: kmfoldertree.cpp:1170
 #, fuzzy
 msgid "Refresh Folder List"
 msgstr "Dobavljam popis mapi"
 
-#: kmfoldertree.cpp:1140 kmmainwidget.cpp:3737
+#: kmfoldertree.cpp:1177 kmmainwidget.cpp:3771
 #, fuzzy
 msgid "&Troubleshoot IMAP Cache..."
 msgstr "&Otkloni probleme u IMAP kešu..."
 
-#: 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 "Nepročitano"
 
-#: 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 "Ukupno"
 
-#: kmfoldertree.cpp:1951
+#: kmfoldertree.cpp:1989
 #, fuzzy
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> here because a folder with the same "
 "name already exists.</qt>"
 msgstr "<qt>Nisam uspio napraviti mapu <b>%1</b>; mapa već postoji.</qt>"
 
-#: kmfoldertree.cpp:1961
+#: kmfoldertree.cpp:2000
 #, fuzzy
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> because it is not completely copied "
 "itself.</qt>"
 msgstr "<qt>Ne mogu premjestiti mapu <b>%1</b> u njenu podmapu.</qt>"
 
-#: kmfoldertree.cpp:1970
+#: kmfoldertree.cpp:2010
 #, fuzzy
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> into a subfolder below itself.</qt>"
 msgstr "<qt>Ne mogu premjestiti mapu <b>%1</b> u njenu podmapu.</qt>"
 
-#: kmfoldertree.cpp:2012
+#: kmfoldertree.cpp:2055
 #, fuzzy
 msgid "Moving the selected folders is not possible"
 msgstr "Premještanje IMAP mapi nije podržano"
 
-#: kmheaders.cpp:130
+#: kmheaders.cpp:132
 msgid "Status"
 msgstr "Status"
 
-#: kmheaders.cpp:131 kmsearchpattern.h:218
+#: kmheaders.cpp:133 kmsearchpattern.h:218
 #, fuzzy
 msgid "Important"
 msgstr "važno"
 
-#: kmheaders.cpp:132
+#: kmheaders.cpp:134
 msgid "Action Item"
 msgstr ""
 
-#: kmheaders.cpp:133
+#: kmheaders.cpp:135
 #, fuzzy
 msgid "Attachment"
 msgstr "prilog"
 
-#: kmheaders.cpp:134
+#: kmheaders.cpp:136 kmsearchpattern.h:233
+#, fuzzy
+msgid "Invitation"
+msgstr "Dokumentacija"
+
+#: kmheaders.cpp:137
 #, fuzzy
 msgid "Spam/Ham"
 msgstr "neželjena pošta"
 
-#: kmheaders.cpp:135
+#: kmheaders.cpp:138
 #, fuzzy
 msgid "Watched/Ignored"
 msgstr "zanemareno"
 
-#: kmheaders.cpp:136
+#: kmheaders.cpp:139
 #, fuzzy
 msgid "Signature"
 msgstr "Signatures"
 
-#: 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 "Subjekt"
 
-#: kmheaders.cpp:182 kmheaders.cpp:770 kmheaders.cpp:2599
-#: kmpopfiltercnfrmdlg.cpp:42 searchwindow.cpp:228
-#: templatesinsertcommand.cpp:66 templatesinsertcommand.cpp:167
+#: kmheaders.cpp:186 kmheaders.cpp:799 kmheaders.cpp:2641
+#: kmpopfiltercnfrmdlg.cpp:42 searchwindow.cpp:227
+#: templatesinsertcommand.cpp:66 templatesinsertcommand.cpp:170
 msgid "Date"
 msgstr "Datum"
 
-#: kmheaders.cpp:772 kmheaders.cpp:2601
+#: kmheaders.cpp:801 kmheaders.cpp:2643
 #, fuzzy
 msgid "Order of Arrival"
 msgstr "Datum (redoslijed prispjeća)"
 
-#: kmheaders.cpp:777 kmheaders.cpp:2606
+#: kmheaders.cpp:806 kmheaders.cpp:2648
 msgid " (Status)"
 msgstr " (Stanje)"
 
-#: kmheaders.cpp:1360
+#: kmheaders.cpp:1398
 #, fuzzy, c-format
 msgid ""
 "_n: 1 unsent\n"
@@ -7208,11 +8027,11 @@ msgstr ""
 "%n nepročitane\n"
 "%n nepročitanih"
 
-#: kmheaders.cpp:1360
+#: kmheaders.cpp:1398
 msgid "0 unsent"
 msgstr ""
 
-#: kmheaders.cpp:1362
+#: kmheaders.cpp:1400
 #, fuzzy, c-format
 msgid ""
 "_n: 1 unread\n"
@@ -7222,12 +8041,12 @@ msgstr ""
 "%n nepročitane\n"
 "%n nepročitanih"
 
-#: kmheaders.cpp:1362
+#: kmheaders.cpp:1400
 #, fuzzy
 msgid "0 unread"
 msgstr "nepročitano"
 
-#: kmheaders.cpp:1364
+#: kmheaders.cpp:1402
 #, fuzzy
 msgid ""
 "_n: 1 message, %1.\n"
@@ -7237,18 +8056,18 @@ msgstr ""
 "%n poruke, %1.\n"
 "%n poruka, %1."
 
-#: kmheaders.cpp:1365
+#: kmheaders.cpp:1403
 #, fuzzy
 msgid "0 messages"
 msgstr "<poruka>"
 
-#: kmheaders.cpp:1367
+#: kmheaders.cpp:1405
 msgid ""
 "_: %1 = n messages, m unread.\n"
 "%1 Folder is read-only."
 msgstr ""
 
-#: kmheaders.cpp:1560
+#: kmheaders.cpp:1598
 #, c-format
 msgid ""
 "_n: <qt>Do you really want to delete the selected message?"
@@ -7257,56 +8076,56 @@ msgid ""
 "<br>Once deleted, they cannot be restored.</qt>"
 msgstr ""
 
-#: kmheaders.cpp:1562
+#: kmheaders.cpp:1600
 #, fuzzy
 msgid "Delete Messages"
 msgstr "Obriši poruke"
 
-#: kmheaders.cpp:1562
+#: kmheaders.cpp:1600
 #, fuzzy
 msgid "Delete Message"
 msgstr "Obriši poruke"
 
-#: kmheaders.cpp:1586
+#: kmheaders.cpp:1624
 #, fuzzy
 msgid "Messages deleted successfully."
 msgstr "Poruke su uspješno premještene."
 
-#: kmheaders.cpp:1586
+#: kmheaders.cpp:1624
 #, fuzzy
 msgid "Messages moved successfully"
 msgstr "Poruke su uspješno premještene."
 
-#: kmheaders.cpp:1609
+#: kmheaders.cpp:1647
 #, fuzzy
 msgid "Deleting messages failed."
 msgstr "Premještanje poruka nije uspjelo."
 
-#: kmheaders.cpp:1609
+#: kmheaders.cpp:1647
 msgid "Moving messages failed."
 msgstr "Premještanje poruka nije uspjelo."
 
-#: kmheaders.cpp:1612
+#: kmheaders.cpp:1650
 #, fuzzy
 msgid "Deleting messages canceled."
 msgstr "Premještanje poruka nije uspjelo."
 
-#: kmheaders.cpp:1612
+#: kmheaders.cpp:1650
 #, fuzzy
 msgid "Moving messages canceled."
 msgstr "Premještanje poruka nije uspjelo."
 
-#: 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 "&Kopiraj u"
 
-#: 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 "&Premjesti u"
 
-#: kmheaders.cpp:2774 kmheaders.cpp:2814
+#: kmheaders.cpp:2818 kmheaders.cpp:2858
 msgid ""
 "Failure modifying %1\n"
 "(No space left on device?)"
@@ -7314,91 +8133,103 @@ msgstr ""
 "Greška pri promijeni %1\n"
 "(Nema više prostora na uređaju?)"
 
-#: kmkernel.cpp:684
+#: kmkernel.cpp:712
 msgid "Certificate Signature Request"
 msgstr "Zahtjev za potpis Certifikata"
 
-#: kmkernel.cpp:687
+#: kmkernel.cpp:715
 msgid "Please create a certificate from attachment and return to sender."
 msgstr "Stvorite certifikat iz privitka i vratite ga pošiljatelju."
 
-#: 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 ""
 
-#: kmkernel.cpp:1245 kmmainwidget.cpp:1897
+#: kmkernel.cpp:1287 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr ""
 
-#: kmkernel.cpp:1379
+#: kmkernel.cpp:1429
 #, fuzzy
 msgid "You do not have read/write permission to your inbox folder."
 msgstr "Nemate dozvole za čitanje i(ili) upis u mapu za pristiglu poštu."
 
-#: kmkernel.cpp:1387
+#: kmkernel.cpp:1437
 msgid "outbox"
 msgstr "Dolazna pošta"
 
-#: kmkernel.cpp:1389
+#: kmkernel.cpp:1439
 #, fuzzy
 msgid "You do not have read/write permission to your outbox folder."
 msgstr "Nemate dozvole za čitanje i(ili) upis u mapu za odlaznu poštu."
 
-#: kmkernel.cpp:1406
+#: kmkernel.cpp:1456
 msgid "sent-mail"
 msgstr "poslana-pošta"
 
-#: kmkernel.cpp:1408
+#: kmkernel.cpp:1458
 #, fuzzy
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr "Nemate dozvole za čitanje i(ili) upis u mapu za poslanu poštu."
 
-#: kmkernel.cpp:1415
+#: kmkernel.cpp:1465
 msgid "trash"
 msgstr "smeće"
 
-#: kmkernel.cpp:1417
+#: kmkernel.cpp:1467
 #, fuzzy
 msgid "You do not have read/write permission to your trash folder."
 msgstr "Nemate dozvole za čitanje i(ili) upis u mapu za smeće."
 
-#: kmkernel.cpp:1424
+#: kmkernel.cpp:1474
 msgid "drafts"
 msgstr "skice"
 
-#: kmkernel.cpp:1426
+#: kmkernel.cpp:1476
 #, fuzzy
 msgid "You do not have read/write permission to your drafts folder."
 msgstr "Nemate dozvole za čitanje i(ili) upis u mapu za nedovršenu poštu."
 
-#: kmkernel.cpp:1435
+#: kmkernel.cpp:1485
 #, fuzzy
 msgid "templates"
 msgstr "&Zamijeni"
 
-#: kmkernel.cpp:1437
+#: kmkernel.cpp:1487
 #, fuzzy
 msgid "You do not have read/write permission to your templates folder."
 msgstr "Nemate dozvole za čitanje i(ili) upis u mapu za smeće."
 
-#: 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 "Posljednja pretraga"
 
-#: 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> "
@@ -7408,7 +8239,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> "
@@ -7417,15 +8248,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 "KMail je naišao na fatalnu grešku i odmah će završiti sa radom."
 
-#: kmkernel.cpp:2025
+#: kmkernel.cpp:2137
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -7436,82 +8267,82 @@ msgstr ""
 "Greška je:\n"
 "%1"
 
-#: kmkernel.cpp:2158 kmmainwidget.cpp:1176
+#: kmkernel.cpp:2270 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "Isprazni smeće"
 
-#: kmkernel.cpp:2159
+#: kmkernel.cpp:2271
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr ""
 
-#: kmlineeditspell.cpp:105
+#: kmlineeditspell.cpp:134
 msgid "vCard Import Failed"
 msgstr ""
 
-#: kmlineeditspell.cpp:116
+#: kmlineeditspell.cpp:135
 #, fuzzy
 msgid "<qt>Unable to access <b>%1</b>.</qt>"
 msgstr "<qt>Ne mogu da naći korisnički račun <b>%1</b>.</qt>"
 
-#: kmlineeditspell.cpp:168 recipientspicker.cpp:578
+#: kmlineeditspell.cpp:194 recipientspicker.cpp:578
 #, fuzzy
 msgid "Recent Addresses"
 msgstr "Uredi nedavne adrese..."
 
-#: kmmainwidget.cpp:611
+#: kmmainwidget.cpp:601
 msgid "S&earch:"
 msgstr ""
 
-#: kmmainwidget.cpp:674 kmmainwidget.cpp:1709
+#: kmmainwidget.cpp:664 kmmainwidget.cpp:1686
 msgid "Move Message to Folder"
 msgstr "Premjesti poruku u mapu"
 
-#: kmmainwidget.cpp:679 kmmainwidget.cpp:1818
+#: kmmainwidget.cpp:669 kmmainwidget.cpp:1795
 msgid "Copy Message to Folder"
 msgstr "Kopiraj poruku u mapu"
 
-#: kmmainwidget.cpp:684 kmmainwidget.cpp:1697
+#: kmmainwidget.cpp:674 kmmainwidget.cpp:1674
 #, fuzzy
 msgid "Jump to Folder"
 msgstr "Kopiraj u ovu mapu"
 
-#: kmmainwidget.cpp:743
+#: kmmainwidget.cpp:717
 msgid "Remove Duplicate Messages"
 msgstr "Ukloni duplicirane poruke"
 
-#: kmmainwidget.cpp:748
+#: kmmainwidget.cpp:722
 msgid "Abort Current Operation"
 msgstr ""
 
-#: kmmainwidget.cpp:753
+#: kmmainwidget.cpp:727
 msgid "Focus on Next Folder"
 msgstr "Fokus na sljedeću mapu"
 
-#: kmmainwidget.cpp:758
+#: kmmainwidget.cpp:732
 msgid "Focus on Previous Folder"
 msgstr "Fokus na prethodnu mapu"
 
-#: kmmainwidget.cpp:763
+#: kmmainwidget.cpp:737
 #, fuzzy
 msgid "Select Folder with Focus"
 msgstr "Odaberite mapu sa fokusom"
 
-#: kmmainwidget.cpp:768
+#: kmmainwidget.cpp:742
 #, fuzzy
 msgid "Focus on Next Message"
 msgstr "Fokus na sljedeću mapu"
 
-#: kmmainwidget.cpp:773
+#: kmmainwidget.cpp:747
 #, fuzzy
 msgid "Focus on Previous Message"
 msgstr "Fokus na prethodnu mapu"
 
-#: kmmainwidget.cpp:778
+#: kmmainwidget.cpp:752
 #, fuzzy
 msgid "Select Message with Focus"
 msgstr "Odaberite mapu sa fokusom"
 
-#: kmmainwidget.cpp:977
+#: kmmainwidget.cpp:951
 #, fuzzy
 msgid ""
 "_n: 1 new message in %1\n"
@@ -7521,49 +8352,49 @@ msgstr ""
 "%n poruke, %1.\n"
 "%n poruka, %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 ""
 
-#: kmmainwidget.cpp:997
+#: kmmainwidget.cpp:971
 msgid "New mail arrived"
 msgstr "Stigla je nova pošta"
 
-#: kmmainwidget.cpp:1128
+#: kmmainwidget.cpp:1100
 #, c-format
 msgid "Properties of Folder %1"
 msgstr "Svojstva mape %1"
 
-#: kmmainwidget.cpp:1149
+#: kmmainwidget.cpp:1124
 #, fuzzy
 msgid "This folder does not have any expiry options set"
 msgstr "Ova mapa nema postavljene nikakve opcije za izbacivanje starih poruka"
 
-#: kmmainwidget.cpp:1157
+#: kmmainwidget.cpp:1132
 msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 msgstr ""
 "<qt>Jeste li sigurni da želite izbaciti stare poruke iz mape <b>%1</b>?</qt>"
 
-#: kmmainwidget.cpp:1158
+#: kmmainwidget.cpp:1133
 msgid "Expire Folder"
 msgstr "Izbaci stare poruke iz mape"
 
-#: kmmainwidget.cpp:1159
+#: kmmainwidget.cpp:1134
 msgid "&Expire"
 msgstr "&Istječe"
 
-#: kmmainwidget.cpp:1176
+#: kmmainwidget.cpp:1151
 msgid "Move to Trash"
 msgstr "Pošalji u smeće"
 
-#: kmmainwidget.cpp:1178
+#: kmmainwidget.cpp:1153
 msgid "Are you sure you want to empty the trash folder?"
 msgstr "Jeste li sigurni da želite ispraznitimapu za smeće?"
 
-#: 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>"
@@ -7571,16 +8402,28 @@ msgstr ""
 "<qt>Jeste li sigurni da želite premjestiti sve poruke iz mape <b>%1</b> "
 "u smeće?</qt>"
 
-#: kmmainwidget.cpp:1198
+#: kmmainwidget.cpp:1173
 msgid "Moved all messages to the trash"
 msgstr "Sve poruke su premještene u smeće"
 
-#: 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 "Neuspjelo stvaranje direktorija"
+
+#: kmmainwidget.cpp:1209
 #, fuzzy
 msgid "Delete Search"
 msgstr "<primatelji>"
 
-#: kmmainwidget.cpp:1221
+#: kmmainwidget.cpp:1210
 #, fuzzy
 msgid ""
 "<qt>Are you sure you want to delete the search <b>%1</b>?"
@@ -7590,15 +8433,15 @@ msgstr ""
 "? Poruke prikazane unutar nje neće biti obrisane jer su pohranjene u drugoj "
 "mapi.</qt>"
 
-#: kmmainwidget.cpp:1225
+#: kmmainwidget.cpp:1214
 msgid "Delete Folder"
 msgstr "Obriši Mapu"
 
-#: kmmainwidget.cpp:1228
+#: kmmainwidget.cpp:1217
 msgid "<qt>Are you sure you want to delete the empty folder <b>%1</b>?</qt>"
 msgstr "<qt>Jeste li sigurni da želite da obrisati praznu mapu <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> "
@@ -7611,7 +8454,7 @@ msgstr ""
 "i sve njene podmape? Ove podmape možda nisu prazne i njihov sadržaj će također "
 "biti obrisan.</qt>"
 
-#: kmmainwidget.cpp:1242
+#: kmmainwidget.cpp:1231
 #, fuzzy
 msgid ""
 "<qt>Are you sure you want to delete the folder <b>%1</b>"
@@ -7622,7 +8465,7 @@ msgstr ""
 "<qt>Jeste li sigurni da želite obrisati mapu <b>%1</b>"
 ", odbacujući njen sadržaj?</qt>"
 
-#: kmmainwidget.cpp:1249
+#: kmmainwidget.cpp:1238
 #, fuzzy
 msgid ""
 "<qt>Are you sure you want to delete the folder <b>%1</b> "
@@ -7633,14 +8476,7 @@ msgstr ""
 "<qt>Jeste li sigurni da želite obrisati mapu <b>%1</b> "
 "i sve njene podmape, odbacujući njihov sadržaj?</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."
@@ -7648,11 +8484,11 @@ msgstr ""
 "Jeste li sigurni da želite da osviježite IMAP međuspremnik?\n"
 "Ovo će ukloniti sve izmjene koje ste radili nad vašim IMAP fasciklama u lokalu."
 
-#: kmmainwidget.cpp:1365
+#: kmmainwidget.cpp:1329
 msgid "Are you sure you want to expire all old messages?"
 msgstr "Jeste li sigurni da želite da isteknu sve stare poruke?"
 
-#: kmmainwidget.cpp:1389
+#: kmmainwidget.cpp:1353
 #, fuzzy
 msgid ""
 "Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
@@ -7663,15 +8499,15 @@ msgstr ""
 "vjerojatnoću da će vaš sustav biti kompromitovan drugim prisutnim i očekivanim "
 "bezbedonosnim zloupotrebama."
 
-#: kmmainwidget.cpp:1392 kmmainwidget.cpp:1416 kmsender.cpp:503
+#: kmmainwidget.cpp:1356 kmmainwidget.cpp:1380 kmsender.cpp:504
 msgid "Security Warning"
 msgstr "Sigurnosno upozorenje"
 
-#: kmmainwidget.cpp:1393
+#: kmmainwidget.cpp:1357
 msgid "Use HTML"
 msgstr ""
 
-#: kmmainwidget.cpp:1413
+#: kmmainwidget.cpp:1377
 #, fuzzy
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
@@ -7682,19 +8518,19 @@ msgstr ""
 "vjerojatnoću da će vaš sustav biti kompromitovan drugim prisutnim i očekivanim "
 "bezbedonosnim zloupotrebama."
 
-#: kmmainwidget.cpp:1417
+#: kmmainwidget.cpp:1381
 msgid "Load External References"
 msgstr ""
 
-#: kmmainwidget.cpp:1658
+#: kmmainwidget.cpp:1634
 msgid "Filter on Mailing-List..."
 msgstr "Filtriraj po listi za raspravu..."
 
-#: kmmainwidget.cpp:1663
+#: kmmainwidget.cpp:1639
 msgid "Filter on Mailing-List %1..."
 msgstr "Filtriraj po listi za raspravu %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"
@@ -7705,532 +8541,540 @@ msgstr ""
 "Ovo možete učiniti u tabu „Filtriranje“ dijaloga za podešavanje IMAP "
 "korisničkog računa."
 
-#: kmmainwidget.cpp:1766
+#: kmmainwidget.cpp:1743
 msgid "No Server-Side Filtering Configured"
 msgstr "Filtriranje na strani poslužitelja nije podešeno"
 
-#: kmmainwidget.cpp:1793
-msgid "Could not start certificate manager; please check your installation."
-msgstr ""
+#: kmmainwidget.cpp:1770
+#, fuzzy
+msgid ""
+"Could not start certificate manager 'kleopatra'; please check your "
+"installation."
+msgstr "Ne mogu pokrenuti upravite certifikata. Provjerite vašu instalaciju!"
 
-#: kmmainwidget.cpp:1810
+#: kmmainwidget.cpp:1787
 #, fuzzy
 msgid ""
 "Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
 msgstr "Ne mogu pokrenuti upravite certifikata. Provjerite vašu instalaciju!"
 
-#: kmmainwidget.cpp:2485
+#: kmmainwidget.cpp:2508
 #, fuzzy
 msgid "Forward With Custom Template"
 msgstr "Koristi poseban s&ufiks za id. poruke"
 
-#: kmmainwidget.cpp:2494
+#: kmmainwidget.cpp:2517
 #, fuzzy
 msgid "Reply With Custom Template"
 msgstr "Koristi poseban s&ufiks za id. poruke"
 
-#: kmmainwidget.cpp:2502
+#: kmmainwidget.cpp:2525
 #, fuzzy
 msgid "Reply to All With Custom Template"
 msgstr "Koristi poseban s&ufiks za id. poruke"
 
-#: kmmainwidget.cpp:2597 kmmainwidget.cpp:2602 kmmainwidget.cpp:2607
+#: kmmainwidget.cpp:2620 kmmainwidget.cpp:2625 kmmainwidget.cpp:2630
 #, fuzzy
 msgid "(no custom templates)"
 msgstr "Koristi poseban s&ufiks za id. poruke"
 
-#: kmmainwidget.cpp:2622 kmmimeparttree.cpp:141
+#: kmmainwidget.cpp:2645 kmmimeparttree.cpp:139
 msgid "Save &As..."
 msgstr "Spremi pod &drugim imenom..."
 
-#: kmmainwidget.cpp:2629
+#: kmmainwidget.cpp:2652
 msgid "&Compact All Folders"
 msgstr "&Sažmi sve mape"
 
-#: kmmainwidget.cpp:2633
+#: kmmainwidget.cpp:2656
 msgid "&Expire All Folders"
 msgstr "&Izbaci stare poruke iz svih mapa"
 
-#: kmmainwidget.cpp:2637
+#: kmmainwidget.cpp:2660
 msgid "&Refresh Local IMAP Cache"
 msgstr "&Osviježi lokalnu IMAP predmemoriju"
 
-#: kmmainwidget.cpp:2641
+#: kmmainwidget.cpp:2664
 msgid "Empty All &Trash Folders"
 msgstr ""
 
-#: kmmainwidget.cpp:2649
+#: kmmainwidget.cpp:2672
 #, fuzzy
 msgid "Check Mail in Favorite Folders"
 msgstr "Provjeri poštu u ovoj mapi"
 
-#: kmmainwidget.cpp:2656
+#: kmmainwidget.cpp:2679
 msgid "Check Mail &In"
 msgstr "Pro&vjeri poštu u"
 
-#: kmmainwidget.cpp:2666
+#: kmmainwidget.cpp:2689
 #, fuzzy
 msgid "&Send Queued Messages"
 msgstr "&Pošalji spremljene poruke"
 
-#: kmmainwidget.cpp:2669
+#: kmmainwidget.cpp:2692
 msgid "Online Status (unknown)"
 msgstr ""
 
-#: kmmainwidget.cpp:2673
+#: kmmainwidget.cpp:2696
 #, fuzzy
 msgid "Send Queued Messages Via"
 msgstr "&Pošalji spremljene poruke"
 
-#: kmmainwidget.cpp:2684
+#: kmmainwidget.cpp:2707
 msgid "&Address Book..."
 msgstr "&Adresar..."
 
-#: kmmainwidget.cpp:2689
+#: kmmainwidget.cpp:2712
 msgid "Certificate Manager..."
 msgstr "Upravitelj Certifikatima..."
 
-#: kmmainwidget.cpp:2694
+#: kmmainwidget.cpp:2717
 #, fuzzy
 msgid "GnuPG Log Viewer..."
 msgstr "Preglednik filtara i &logova..."
 
-#: kmmainwidget.cpp:2699
+#: kmmainwidget.cpp:2722
 msgid "&Import Messages..."
 msgstr "&Uvoz poruka..."
 
-#: kmmainwidget.cpp:2704
+#: kmmainwidget.cpp:2727
 msgid "&Debug Sieve..."
 msgstr ""
 
-#: kmmainwidget.cpp:2710
+#: kmmainwidget.cpp:2733
 msgid "Edit \"Out of Office\" Replies..."
 msgstr "Uredi odgovore „izvan ureda“..."
 
-#: kmmainwidget.cpp:2716
+#: kmmainwidget.cpp:2739
 msgid "Filter &Log Viewer..."
 msgstr "Preglednik filtara i &logova..."
 
-#: kmmainwidget.cpp:2719
+#: kmmainwidget.cpp:2742
 msgid "&Anti-Spam Wizard..."
 msgstr ""
 
-#: kmmainwidget.cpp:2721
+#: kmmainwidget.cpp:2744
 msgid "&Anti-Virus Wizard..."
 msgstr ""
 
-#: kmmainwidget.cpp:2725 kmreadermainwin.cpp:316
+#: kmmainwidget.cpp:2748 kmreadermainwin.cpp:367
 msgid "&Move to Trash"
 msgstr "Pre&mjesti u smeće"
 
-#: kmmainwidget.cpp:2726 kmreadermainwin.cpp:317
+#: kmmainwidget.cpp:2749 kmreadermainwin.cpp:368
 msgid "Move message to trashcan"
 msgstr "Premjesti poruku u smeće"
 
-#: kmmainwidget.cpp:2738
+#: kmmainwidget.cpp:2761
 #, fuzzy
 msgid "M&ove Thread to Trash"
 msgstr "Pošalji u smeće"
 
-#: kmmainwidget.cpp:2739
+#: kmmainwidget.cpp:2762
 #, fuzzy
 msgid "Move thread to trashcan"
 msgstr "Premjesti poruku u smeće"
 
-#: kmmainwidget.cpp:2743
+#: kmmainwidget.cpp:2766
 #, fuzzy
 msgid "Delete T&hread"
 msgstr "izbrisano"
 
-#: kmmainwidget.cpp:2747
+#: kmmainwidget.cpp:2770
 msgid "&Find Messages..."
 msgstr "&Nađi poruke..."
 
-#: kmmainwidget.cpp:2750
+#: kmmainwidget.cpp:2773
 msgid "&Find in Message..."
 msgstr "&Nađi u poruci..."
 
-#: kmmainwidget.cpp:2753
+#: kmmainwidget.cpp:2776
 #, fuzzy
 msgid "Select &All Messages"
 msgstr "Od&aberi sve poruke..."
 
-#: kmmainwidget.cpp:2760
+#: kmmainwidget.cpp:2783
 msgid "&Properties"
 msgstr "&Svojstva"
 
-#: kmmainwidget.cpp:2763
+#: kmmainwidget.cpp:2786
 #, fuzzy
 msgid "&Mailing List Management..."
 msgstr "Upravljanje Certifikatima"
 
-#: kmmainwidget.cpp:2772
+#: kmmainwidget.cpp:2795
 msgid "Mark All Messages as &Read"
 msgstr "Označi sve poruke kao p&ročitane"
 
-#: kmmainwidget.cpp:2775
+#: kmmainwidget.cpp:2798
 #, fuzzy
 msgid "&Expiration Settings"
 msgstr "&Postojeći identiteti:"
 
-#: kmmainwidget.cpp:2778
+#: kmmainwidget.cpp:2801
 #, fuzzy
 msgid "&Compact Folder"
 msgstr "&Sažmi sve mape"
 
-#: kmmainwidget.cpp:2781
+#: kmmainwidget.cpp:2804
 #, fuzzy
 msgid "Check Mail &in This Folder"
 msgstr "Provjeri &poštu u ovoj mapi"
 
-#: kmmainwidget.cpp:2793
+#: kmmainwidget.cpp:2816
+#, fuzzy
+msgid "&Archive Folder..."
+msgstr "&Novi direktorij..."
+
+#: kmmainwidget.cpp:2820
 msgid "Prefer &HTML to Plain Text"
 msgstr "Preferiraj HTML nad običnim tekstom"
 
-#: kmmainwidget.cpp:2796
+#: kmmainwidget.cpp:2823
 msgid "Load E&xternal References"
 msgstr ""
 
-#: kmmainwidget.cpp:2799
+#: kmmainwidget.cpp:2826
 #, fuzzy
 msgid "&Thread Messages"
 msgstr "&Poveži poruke u lance"
 
-#: kmmainwidget.cpp:2802
+#: kmmainwidget.cpp:2829
 #, fuzzy
 msgid "Thread Messages also by &Subject"
 msgstr "Poveži poruke u lance i po &temi"
 
-#: kmmainwidget.cpp:2805
+#: kmmainwidget.cpp:2832
 #, fuzzy
 msgid "Copy Folder"
 msgstr "Kopiraj u ovu mapu"
 
-#: kmmainwidget.cpp:2807
+#: kmmainwidget.cpp:2834
 #, fuzzy
 msgid "Cut Folder"
 msgstr "Načini direktorij"
 
-#: kmmainwidget.cpp:2809
+#: kmmainwidget.cpp:2836
 #, fuzzy
 msgid "Paste Folder"
 msgstr "Načini direktorij"
 
-#: kmmainwidget.cpp:2812
+#: kmmainwidget.cpp:2839
 #, fuzzy
 msgid "Copy Messages"
 msgstr "<poruka>"
 
-#: kmmainwidget.cpp:2814
+#: kmmainwidget.cpp:2841
 #, fuzzy
 msgid "Cut Messages"
 msgstr "<poruka>"
 
-#: kmmainwidget.cpp:2816
+#: kmmainwidget.cpp:2843
 #, fuzzy
 msgid "Paste Messages"
 msgstr "Obriši poruke"
 
-#: kmmainwidget.cpp:2820
+#: kmmainwidget.cpp:2847
 msgid "&New Message..."
 msgstr "&Nova poruka..."
 
-#: kmmainwidget.cpp:2823 kmmainwidget.cpp:2915
+#: kmmainwidget.cpp:2850 kmmainwidget.cpp:2927
 #, fuzzy
 msgid "New Message From &Template"
 msgstr "Nema novih poruka s poslužitelja"
 
-#: kmmainwidget.cpp:2831
+#: kmmainwidget.cpp:2858
 msgid "New Message t&o Mailing-List..."
 msgstr "Nova poruka u &raspravnoj listi..."
 
-#: kmmainwidget.cpp:2836 kmreadermainwin.cpp:327 searchwindow.cpp:320
+#: kmmainwidget.cpp:2863 kmreadermainwin.cpp:378 searchwindow.cpp:321
 msgid ""
 "_: Message->\n"
 "&Forward"
 msgstr "&Proslijedi"
 
-#: kmmainwidget.cpp:2840 kmreadermainwin.cpp:330 searchwindow.cpp:329
+#: kmmainwidget.cpp:2867 kmreadermainwin.cpp:381 searchwindow.cpp:330
 msgid "&Inline..."
 msgstr "&Inline..."
 
-#: 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 "Kao &prilog..."
 
-#: kmmainwidget.cpp:2852 kmreadermainwin.cpp:342 searchwindow.cpp:341
+#: kmmainwidget.cpp:2879 kmreadermainwin.cpp:393 searchwindow.cpp:342
 #, fuzzy
 msgid ""
 "_: Message->Forward->\n"
 "As Di&gest..."
 msgstr "Kao &prilog..."
 
-#: kmmainwidget.cpp:2858 kmreadermainwin.cpp:348 searchwindow.cpp:346
+#: kmmainwidget.cpp:2885 kmreadermainwin.cpp:399 searchwindow.cpp:347
 msgid ""
 "_: Message->Forward->\n"
 "&Redirect..."
 msgstr "P&reusmjeri..."
 
-#: kmmainwidget.cpp:2885
+#: kmmainwidget.cpp:2897
 msgid "Send A&gain..."
 msgstr "&Pošalji ponovno..."
 
-#: kmmainwidget.cpp:2890
+#: kmmainwidget.cpp:2902
 msgid "&Create Filter"
 msgstr "&Napravi filtar"
 
-#: kmmainwidget.cpp:2893
+#: kmmainwidget.cpp:2905
 msgid "Filter on &Subject..."
 msgstr "Filtriraj po &Naslovu..."
 
-#: kmmainwidget.cpp:2898
+#: kmmainwidget.cpp:2910
 msgid "Filter on &From..."
 msgstr "Filter po polju &Od..."
 
-#: kmmainwidget.cpp:2903
+#: kmmainwidget.cpp:2915
 msgid "Filter on &To..."
 msgstr "Filtriraj po polju &Za..."
 
-#: kmmainwidget.cpp:2908
+#: kmmainwidget.cpp:2920
 msgid "Filter on Mailing-&List..."
 msgstr "Filtriraj po listi za raspravu..."
 
-#: kmmainwidget.cpp:2921
+#: kmmainwidget.cpp:2933
 msgid "Mark &Thread"
 msgstr "&Označi nit"
 
-#: kmmainwidget.cpp:2924
+#: kmmainwidget.cpp:2936
 msgid "Mark Thread as &Read"
 msgstr "Označi nit kao &pročitanu"
 
-#: kmmainwidget.cpp:2925
+#: kmmainwidget.cpp:2937
 msgid "Mark all messages in the selected thread as read"
 msgstr "Označi sve poruke u odabranoj niti kao pročitane"
 
-#: kmmainwidget.cpp:2930
+#: kmmainwidget.cpp:2942
 msgid "Mark Thread as &New"
 msgstr "Označi nit kao &novu"
 
-#: kmmainwidget.cpp:2931
+#: kmmainwidget.cpp:2943
 msgid "Mark all messages in the selected thread as new"
 msgstr "Označi sve poruke u odabranoj niti kao nove"
 
-#: kmmainwidget.cpp:2936
+#: kmmainwidget.cpp:2948
 msgid "Mark Thread as &Unread"
 msgstr "Označi nit kao nep&ročitanu"
 
-#: kmmainwidget.cpp:2937
+#: kmmainwidget.cpp:2949
 msgid "Mark all messages in the selected thread as unread"
 msgstr "Označi sve poruke u odabranoj niti kao nepročitane"
 
-#: kmmainwidget.cpp:2945
+#: kmmainwidget.cpp:2957
 msgid "Mark Thread as &Important"
 msgstr "Označi nit kao &važnu"
 
-#: kmmainwidget.cpp:2948
+#: kmmainwidget.cpp:2960
 msgid "Remove &Important Thread Mark"
 msgstr ""
 
-#: kmmainwidget.cpp:2951
+#: kmmainwidget.cpp:2963
 #, fuzzy
 msgid "Mark Thread as &Action Item"
 msgstr "Označi nit kao &poslanu"
 
-#: kmmainwidget.cpp:2954
+#: kmmainwidget.cpp:2966
 #, fuzzy
 msgid "Remove &Action Item Thread Mark"
 msgstr "Važna poruka"
 
-#: kmmainwidget.cpp:2958
+#: kmmainwidget.cpp:2970
 msgid "&Watch Thread"
 msgstr "&Gledaj nit"
 
-#: kmmainwidget.cpp:2962
+#: kmmainwidget.cpp:2974
 msgid "&Ignore Thread"
 msgstr "&Ignoriraj Niz"
 
-#: kmmainwidget.cpp:2970
+#: kmmainwidget.cpp:2982
 msgid "Save A&ttachments..."
 msgstr "&Spremi privitke..."
 
-#: kmmainwidget.cpp:2980
+#: kmmainwidget.cpp:2992
 #, fuzzy
 msgid "Appl&y All Filters"
 msgstr "Primij&eni izbornik filter-e"
 
-#. 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 "&Primijeni filter"
 
-#: kmmainwidget.cpp:2992
+#: kmmainwidget.cpp:3004
 #, fuzzy
 msgid ""
 "_: View->\n"
 "&Unread Count"
 msgstr "&Broj nepročitanih"
 
-#: kmmainwidget.cpp:2994
+#: kmmainwidget.cpp:3006
 msgid "Choose how to display the count of unread messages"
 msgstr "Odaberite kako će se prikazivati broj nepročitanih poruka"
 
-#: kmmainwidget.cpp:2996
+#: kmmainwidget.cpp:3008
 #, fuzzy
 msgid ""
 "_: View->Unread Count\n"
 "View in &Separate Column"
 msgstr "Pokaži u po&sebnoj stupcu"
 
-#: kmmainwidget.cpp:3002
+#: kmmainwidget.cpp:3014
 #, fuzzy
 msgid ""
 "_: View->Unread Count\n"
 "View After &Folder Name"
 msgstr "Pokaži poslije imena &mape"
 
-#: kmmainwidget.cpp:3009
+#: kmmainwidget.cpp:3021
 #, fuzzy
 msgid ""
 "_: View->\n"
 "&Total Column"
 msgstr "&Stupci ukupnih"
 
-#: kmmainwidget.cpp:3012
+#: kmmainwidget.cpp:3024
 #, fuzzy
 msgid ""
 "Toggle display of column showing the total number of messages in folders."
 msgstr ""
 "Uključuje ili isključuje kolonu koja prikazuje ukupan broj poruka u mapama."
 
-#: kmmainwidget.cpp:3014
+#: kmmainwidget.cpp:3026
 #, fuzzy
 msgid ""
 "_: View->\n"
 "&Size Column"
 msgstr "&Stupci ukupnih"
 
-#: kmmainwidget.cpp:3017
+#: kmmainwidget.cpp:3029
 #, fuzzy
 msgid "Toggle display of column showing the total size of messages in folders."
 msgstr ""
 "Uključuje ili isključuje kolonu koja prikazuje ukupan broj poruka u mapama."
 
-#: kmmainwidget.cpp:3020
+#: kmmainwidget.cpp:3032
 #, fuzzy
 msgid ""
 "_: View->\n"
 "&Expand Thread"
 msgstr "&Raširi lanac"
 
-#: kmmainwidget.cpp:3021
+#: kmmainwidget.cpp:3033
 msgid "Expand the current thread"
 msgstr "Razgranava trenutnu nit"
 
-#: kmmainwidget.cpp:3026
+#: kmmainwidget.cpp:3038
 #, fuzzy
 msgid ""
 "_: View->\n"
 "&Collapse Thread"
 msgstr "&Sažmi lanac"
 
-#: kmmainwidget.cpp:3027
+#: kmmainwidget.cpp:3039
 msgid "Collapse the current thread"
 msgstr "Sažima trenutnu nit"
 
-#: kmmainwidget.cpp:3032
+#: kmmainwidget.cpp:3044
 #, fuzzy
 msgid ""
 "_: View->\n"
 "Ex&pand All Threads"
 msgstr "R&aširi sve lance"
 
-#: kmmainwidget.cpp:3033
+#: kmmainwidget.cpp:3045
 msgid "Expand all threads in the current folder"
 msgstr "Razgranava se niti u trenutnoj mapi"
 
-#: kmmainwidget.cpp:3038
+#: kmmainwidget.cpp:3050
 #, fuzzy
 msgid ""
 "_: View->\n"
 "C&ollapse All Threads"
 msgstr "S&ažmi sve lance"
 
-#: kmmainwidget.cpp:3039
+#: kmmainwidget.cpp:3051
 msgid "Collapse all threads in the current folder"
 msgstr "Sažima sve niti u trenutnoj mapi"
 
-#: kmmainwidget.cpp:3044 kmreadermainwin.cpp:322
+#: kmmainwidget.cpp:3056 kmreadermainwin.cpp:373
 msgid "&View Source"
 msgstr "Pogledaj izvor..."
 
-#: kmmainwidget.cpp:3048
+#: kmmainwidget.cpp:3060
 #, fuzzy
 msgid "&Display Message"
 msgstr "&Prikaži veličine poruka"
 
-#: kmmainwidget.cpp:3054
+#: kmmainwidget.cpp:3066
 msgid "&Next Message"
 msgstr "&Sljedeća poruka"
 
-#: kmmainwidget.cpp:3055
+#: kmmainwidget.cpp:3067
 msgid "Go to the next message"
 msgstr "Idi na sljedeću poruku"
 
-#: kmmainwidget.cpp:3059
+#: kmmainwidget.cpp:3071
 msgid "Next &Unread Message"
 msgstr "&Sljedeća nepročitana poruka"
 
-#: kmmainwidget.cpp:3061
+#: kmmainwidget.cpp:3073
 msgid "Go to the next unread message"
 msgstr "Idi na sljedeću nepročitanu poruku"
 
 #. i18n("Go to the next important message") ),
-#: kmmainwidget.cpp:3072
+#: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "&Prethodna poruka"
 
-#: kmmainwidget.cpp:3073
+#: kmmainwidget.cpp:3085
 msgid "Go to the previous message"
 msgstr "Idi na prethodnu poruku"
 
-#: kmmainwidget.cpp:3077
+#: kmmainwidget.cpp:3089
 msgid "Previous Unread &Message"
 msgstr "&Prethodna nepročitana poruka"
 
-#: kmmainwidget.cpp:3079
+#: kmmainwidget.cpp:3091
 msgid "Go to the previous unread message"
 msgstr "Idi na prethodnu nepročitanu poruku"
 
-#: kmmainwidget.cpp:3091
+#: kmmainwidget.cpp:3103
 msgid "Next Unread &Folder"
 msgstr "Sljedeća nepročitana &mapa"
 
-#: kmmainwidget.cpp:3092
+#: kmmainwidget.cpp:3104
 msgid "Go to the next folder with unread messages"
 msgstr "Idi na sljedeću mapu s nepročitanim porukama"
 
-#: kmmainwidget.cpp:3100
+#: kmmainwidget.cpp:3112
 msgid "Previous Unread F&older"
 msgstr "Prethodna nepročitana mapa"
 
-#: kmmainwidget.cpp:3101
+#: kmmainwidget.cpp:3113
 msgid "Go to the previous folder with unread messages"
 msgstr "Idi na sljedeću mapu s nepročitanim porukama"
 
-#: kmmainwidget.cpp:3108
+#: kmmainwidget.cpp:3120
 msgid ""
 "_: Go->\n"
 "Next Unread &Text"
 msgstr "Sljedeći nepročitani &tekst"
 
-#: kmmainwidget.cpp:3109
+#: kmmainwidget.cpp:3121
 msgid "Go to the next unread text"
 msgstr "Idi na sljedeći nepročitani tekst"
 
-#: kmmainwidget.cpp:3110
+#: kmmainwidget.cpp:3122
 #, fuzzy
 msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
@@ -8239,53 +9083,57 @@ msgstr ""
 "Pomera na dole tekuću poruku. Ako je na kraju poruke, ide na sljedeću "
 "nepročitanu poruku."
 
-#: kmmainwidget.cpp:3117
+#: kmmainwidget.cpp:3129
+msgid "Show Quick Search"
+msgstr ""
+
+#: kmmainwidget.cpp:3136
 msgid "Configure &Filters..."
 msgstr "Namjesti &filtere..."
 
-#: kmmainwidget.cpp:3119
+#: kmmainwidget.cpp:3138
 msgid "Configure &POP Filters..."
 msgstr "&Namjesti POP filtere..."
 
-#: kmmainwidget.cpp:3121
+#: kmmainwidget.cpp:3140
 #, fuzzy
 msgid "Manage &Sieve Scripts..."
 msgstr "Postojeći Filteri"
 
-#: kmmainwidget.cpp:3124
+#: kmmainwidget.cpp:3143
 msgid "KMail &Introduction"
 msgstr "&Uvod u KMail"
 
-#: kmmainwidget.cpp:3125
+#: kmmainwidget.cpp:3144
 msgid "Display KMail's Welcome Page"
 msgstr "Pokaži KMailovu stranicu dobrodošlice"
 
-#: kmmainwidget.cpp:3131
+#: kmmainwidget.cpp:3150
 msgid "Configure &Notifications..."
 msgstr "Podešava&nje obavijesti..."
 
-#: kmmainwidget.cpp:3136
+#: kmmainwidget.cpp:3155
 msgid "&Configure KMail..."
 msgstr "&Namjesti KMail..."
 
-#: kmmainwidget.cpp:3431
+#: kmmainwidget.cpp:3454
 msgid "E&mpty Trash"
 msgstr "&Isprazni smeće"
 
-#: kmmainwidget.cpp:3431
+#: kmmainwidget.cpp:3455
 msgid "&Move All Messages to Trash"
 msgstr "&Premjesti sve poruke u smeće"
 
-#: kmmainwidget.cpp:3434
+#: kmmainwidget.cpp:3464
 #, fuzzy
 msgid "&Delete Search"
 msgstr "Načini direktorij"
 
-#: kmmainwidget.cpp:3434
+#: kmmainwidget.cpp:3465
 msgid "&Delete Folder"
 msgstr "Načini direktorij"
 
-#: kmmainwidget.cpp:3615
+#: kmmainwidget.cpp:3649
 #, fuzzy, c-format
 msgid ""
 "_n: Removed %n duplicate message.\n"
@@ -8295,25 +9143,25 @@ msgstr ""
 "Uklonjene su %n dvostruke poruke.\n"
 "Uklonjeno je %n dvostukih poruka."
 
-#: kmmainwidget.cpp:3617
+#: kmmainwidget.cpp:3651
 msgid "No duplicate messages found."
 msgstr "Nema duplikata poruka."
 
-#: kmmainwidget.cpp:3687
+#: kmmainwidget.cpp:3721
 #, c-format
 msgid "Filter %1"
 msgstr "Filtar %1"
 
-#: kmmainwidget.cpp:3821
+#: kmmainwidget.cpp:3855
 msgid "Subscription"
 msgstr "Opis:"
 
-#: kmmainwidget.cpp:3838
+#: kmmainwidget.cpp:3872
 #, fuzzy
 msgid "Local Subscription"
 msgstr "Opis:"
 
-#: kmmainwidget.cpp:3971
+#: kmmainwidget.cpp:4007
 #, fuzzy
 msgid "Out of office reply active"
 msgstr "Uredi odgovore „izvan ureda“..."
@@ -8326,7 +9174,7 @@ msgstr "Novi &prozor"
 msgid " Initializing..."
 msgstr " Inicijalizacija..."
 
-#: kmmessage.cpp:1316
+#: kmmessage.cpp:1336
 #, fuzzy
 msgid ""
 "This message contains a request to return a notification about your reception "
@@ -8338,7 +9186,7 @@ msgstr ""
 "Možete ili ignorirati zahtjev ili pustiti KMail da pošalje „odbijen“ ili običan "
 "odgovor."
 
-#: kmmessage.cpp:1321
+#: kmmessage.cpp:1341
 #, fuzzy
 msgid ""
 "This message contains a request to send a notification about your reception of "
@@ -8352,7 +9200,7 @@ msgstr ""
 "nije poznata KMail-u.\n"
 "Možete ili ignorirati zahtjev ili pustiti KMail da pošalje odgovor „neuspio“."
 
-#: kmmessage.cpp:1328
+#: kmmessage.cpp:1348
 #, fuzzy
 msgid ""
 "This message contains a request to send a notification about your reception of "
@@ -8366,7 +9214,7 @@ msgstr ""
 "Možete ili ignorirati zahtjev ili pustiti KMail da pošalje „odbijen“ ili običan "
 "odgovor."
 
-#: kmmessage.cpp:1335
+#: kmmessage.cpp:1355
 #, fuzzy
 msgid ""
 "This message contains a request to send a notification about your reception of "
@@ -8380,7 +9228,7 @@ msgstr ""
 "Možete ili ignorirati zahtjev ili pustiti KMail da pošalje „odbijen“ ili običan "
 "odgovor."
 
-#: kmmessage.cpp:1341
+#: kmmessage.cpp:1361
 #, fuzzy
 msgid ""
 "This message contains a request to send a notification about your reception of "
@@ -8396,20 +9244,20 @@ msgstr ""
 "Možete ili ignorirati zahtjev ili pustiti KMail da pošalje „odbijen“ ili običan "
 "odgovor."
 
-#: kmmessage.cpp:1359 kmmessage.cpp:1366
+#: kmmessage.cpp:1379 kmmessage.cpp:1386
 msgid "Message Disposition Notification Request"
 msgstr "Zahtjev za slanjem izvještaja o raspoređivanju poruke"
 
-#: kmmessage.cpp:1361
+#: kmmessage.cpp:1381
 #, fuzzy
 msgid "Send \"&denied\""
 msgstr "Pošalji „o&dbijen“"
 
-#: kmmessage.cpp:1361 kmmessage.cpp:1368
+#: kmmessage.cpp:1381 kmmessage.cpp:1388
 msgid "&Send"
 msgstr "&Pošalji"
 
-#: kmmessage.cpp:1436
+#: kmmessage.cpp:1458
 msgid ""
 "Header \"Disposition-Notification-Options\" contained required, but unknown "
 "parameter"
@@ -8417,37 +9265,46 @@ msgstr ""
 "Zaglavlje \"Disposition-Notification-Options\" sadrži zahtjevani, ali nepoznat "
 "parametar."
 
-#: kmmessage.cpp:1628
+#: kmmessage.cpp:1650
 msgid "Receipt: "
 msgstr "Potvrda: "
 
-#: kmmessage.cpp:3128 urlhandlermanager.cpp:551
+#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "Prilog: %1"
 
-#: kmmimeparttree.cpp:139 kmreaderwin.cpp:1969
+#: kmmessage.cpp:3199
+#, fuzzy
+msgid "This attachment has been deleted."
+msgstr "Pokaži priloge kako je predložio pošiljatelj."
+
+#: kmmessage.cpp:3201
+msgid "The attachment '%1' has been deleted."
+msgstr ""
+
+#: kmmimeparttree.cpp:137 kmreaderwin.cpp:2034
 #, fuzzy
 msgid ""
 "_: to view something\n"
 "View"
 msgstr "Pokaži"
 
-#: kmmimeparttree.cpp:147
+#: kmmimeparttree.cpp:145
 msgid "Save All Attachments..."
 msgstr "Spremanje svih privitaka..."
 
-#: kmmimeparttree.cpp:154 kmreaderwin.cpp:1975 kmreaderwin.cpp:2626
+#: kmmimeparttree.cpp:152 kmreaderwin.cpp:2041 kmreaderwin.cpp:2805
 #, fuzzy
 msgid "Delete Attachment"
 msgstr "&Ukloni prilog"
 
-#: kmmimeparttree.cpp:157 kmreaderwin.cpp:1973 kmreaderwin.cpp:2638
+#: kmmimeparttree.cpp:155 kmreaderwin.cpp:2039 kmreaderwin.cpp:2861
 #, fuzzy
 msgid "Edit Attachment"
 msgstr "prilog"
 
-#: kmmimeparttree.cpp:370
+#: kmmimeparttree.cpp:368
 #, fuzzy
 msgid "Unspecified Binary Data"
 msgstr "Nenaznačeni binarni podaci"
@@ -8620,250 +9477,262 @@ msgstr "Nema Teme"
 msgid "unknown"
 msgstr "nepoznato"
 
-#: kmreadermainwin.cpp:477 searchwindow.cpp:352
+#: kmreadermainwin.cpp:515 searchwindow.cpp:353
 msgid "Save Attachments..."
 msgstr "Spremi privitke..."
 
-#: kmreaderwin.cpp:562
+#: kmreaderwin.cpp:489
 #, fuzzy
 msgid ""
 "_: View->\n"
 "&Headers"
 msgstr "&Zaglavlja"
 
-#: kmreaderwin.cpp:563
+#: kmreaderwin.cpp:490
 msgid "Choose display style of message headers"
 msgstr "Odaberite stil prikaza zaglavlja poruka"
 
-#: kmreaderwin.cpp:568
+#: kmreaderwin.cpp:495
 #, fuzzy
 msgid ""
 "_: View->headers->\n"
 "&Enterprise Headers"
 msgstr "&Kratka zaglavlja"
 
-#: kmreaderwin.cpp:571
+#: kmreaderwin.cpp:498
 #, fuzzy
 msgid "Show the list of headers in Enterprise style"
 msgstr "Pokaži popis zaglavlja u modernom formatu"
 
-#: kmreaderwin.cpp:575
+#: kmreaderwin.cpp:502
 #, fuzzy
 msgid ""
 "_: View->headers->\n"
 "&Fancy Headers"
 msgstr "&Moderna zaglavlja"
 
-#: kmreaderwin.cpp:578
+#: kmreaderwin.cpp:505
 #, fuzzy
 msgid "Show the list of headers in a fancy format"
 msgstr "Pokaži popis zaglavlja u modernom formatu"
 
-#: kmreaderwin.cpp:582
+#: kmreaderwin.cpp:509
 #, fuzzy
 msgid ""
 "_: View->headers->\n"
 "&Brief Headers"
 msgstr "&Kratka zaglavlja"
 
-#: kmreaderwin.cpp:585
+#: kmreaderwin.cpp:512
 #, fuzzy
 msgid "Show brief list of message headers"
 msgstr "Pokaži kratku popis zaglavlja poruka"
 
-#: kmreaderwin.cpp:589
+#: kmreaderwin.cpp:516
 #, fuzzy
 msgid ""
 "_: View->headers->\n"
 "&Standard Headers"
 msgstr "&Standardna zaglavlja"
 
-#: kmreaderwin.cpp:592
+#: kmreaderwin.cpp:519
 #, fuzzy
 msgid "Show standard list of message headers"
 msgstr "Pokaži standardnu popis zaglavlja poruka"
 
-#: kmreaderwin.cpp:596
+#: kmreaderwin.cpp:523
 #, fuzzy
 msgid ""
 "_: View->headers->\n"
 "&Long Headers"
 msgstr "&Duga zaglavlja"
 
-#: kmreaderwin.cpp:599
+#: kmreaderwin.cpp:526
 #, fuzzy
 msgid "Show long list of message headers"
 msgstr "Pokaži dugu popis zaglavlja poruka"
 
-#: kmreaderwin.cpp:603
+#: kmreaderwin.cpp:530
 #, fuzzy
 msgid ""
 "_: View->headers->\n"
 "&All Headers"
 msgstr "&Sva zaglavlja"
 
-#: kmreaderwin.cpp:606
+#: kmreaderwin.cpp:533
 #, fuzzy
 msgid "Show all message headers"
 msgstr "Pokaži sva zaglavlja poruka"
 
-#: kmreaderwin.cpp:612
+#: kmreaderwin.cpp:539
 #, fuzzy
 msgid ""
 "_: View->\n"
 "&Attachments"
 msgstr "&Priloga"
 
-#: kmreaderwin.cpp:613
+#: kmreaderwin.cpp:540
 msgid "Choose display style of attachments"
 msgstr "Odaberite stil prikaza priloga"
 
-#: kmreaderwin.cpp:617
+#: kmreaderwin.cpp:544
 #, fuzzy
 msgid ""
 "_: View->attachments->\n"
 "&As Icons"
 msgstr "&Kao sličice"
 
-#: kmreaderwin.cpp:620
+#: kmreaderwin.cpp:547
 #, fuzzy
 msgid "Show all attachments as icons. Click to see them."
 msgstr "Pokaži sve priloge kao sličice. Kliknite da biste ih videli."
 
-#: kmreaderwin.cpp:624
+#: kmreaderwin.cpp:551
 #, fuzzy
 msgid ""
 "_: View->attachments->\n"
 "&Smart"
 msgstr "&Pametno"
 
-#: kmreaderwin.cpp:627
+#: kmreaderwin.cpp:554
 #, fuzzy
 msgid "Show attachments as suggested by sender."
 msgstr "Pokaži priloge kako je predložio pošiljatelj."
 
-#: kmreaderwin.cpp:631
+#: kmreaderwin.cpp:558
 #, fuzzy
 msgid ""
 "_: View->attachments->\n"
 "&Inline"
 msgstr "&Ugrađeno"
 
-#: kmreaderwin.cpp:634
+#: kmreaderwin.cpp:561
 #, fuzzy
 msgid "Show all attachments inline (if possible)"
 msgstr "Vidi priloge kao ugrađene (ako je moguće)"
 
-#: kmreaderwin.cpp:638
+#: kmreaderwin.cpp:565
 #, fuzzy
 msgid ""
 "_: View->attachments->\n"
 "&Hide"
 msgstr "&Sakriveno"
 
-#: kmreaderwin.cpp:641
+#: kmreaderwin.cpp:568
 msgid "Do not show attachments in the message viewer"
 msgstr ""
 
-#: kmreaderwin.cpp:646
+#: kmreaderwin.cpp:572
+#, fuzzy
+msgid ""
+"_: View->attachments->\n"
+"In Header &Only"
+msgstr "&Sakriveno"
+
+#: kmreaderwin.cpp:575
+#, fuzzy
+msgid "Show Attachments only in the header of the mail"
+msgstr "Pokaži sve priloge kao sličice. Kliknite da biste ih videli."
+
+#: kmreaderwin.cpp:580
 #, fuzzy
 msgid "&Set Encoding"
 msgstr "&Postavi kodiranje"
 
-#: kmreaderwin.cpp:654
+#: kmreaderwin.cpp:588
 msgid "New Message To..."
 msgstr "Nova poruka za..."
 
-#: kmreaderwin.cpp:657
+#: kmreaderwin.cpp:591
 msgid "Reply To..."
 msgstr "Odgovori na..."
 
-#: kmreaderwin.cpp:660
+#: kmreaderwin.cpp:594
 msgid "Forward To..."
 msgstr "Proslijedi na..."
 
-#: kmreaderwin.cpp:663
+#: kmreaderwin.cpp:597
 msgid "Add to Address Book"
 msgstr "Dodaj u adresar"
 
-#: kmreaderwin.cpp:666
+#: kmreaderwin.cpp:600
 msgid "Open in Address Book"
 msgstr "Otvori u adresaru"
 
-#: kmreaderwin.cpp:670
+#: kmreaderwin.cpp:604
 #, fuzzy
 msgid "Select All Text"
 msgstr "Od&aberi sve poruke..."
 
-#: kmreaderwin.cpp:672
+#: kmreaderwin.cpp:606 kmreaderwin.cpp:1994
 #, fuzzy
 msgid "Copy Link Address"
 msgstr "Otvori u adresaru"
 
-#: kmreaderwin.cpp:674
+#: kmreaderwin.cpp:608
 msgid "Open URL"
 msgstr "Otvori URL"
 
-#: kmreaderwin.cpp:676
+#: kmreaderwin.cpp:610
 msgid "Bookmark This Link"
 msgstr "Snimi bookmark za ovaj link"
 
-#: kmreaderwin.cpp:680
+#: kmreaderwin.cpp:614
 msgid "Save Link As..."
 msgstr "Spremiti link pod drugim imenom..."
 
-#: kmreaderwin.cpp:687
+#: kmreaderwin.cpp:621
 #, fuzzy
 msgid "Chat &With..."
 msgstr "Otvori sa..."
 
-#: 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
 #, fuzzy
 msgid "Automatically delete older mails on POP servers"
 msgstr "Šalji potvrde o prijemu automat&ski"
 
-#: kmreaderwin.cpp:1338
-msgid "The email client for the K Desktop Environment."
+#: kmreaderwin.cpp:1302
+msgid "The email client for the Trinity Desktop Environment."
 msgstr ""
 
-#: 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: "
@@ -8889,13 +9758,13 @@ msgid ""
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; The KMail Team</p>"
 msgstr ""
 
-#: 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"
@@ -8903,30 +9772,39 @@ msgid ""
 "outgoing mail account.</p>\n"
 msgstr ""
 
-#: 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 "( tijelo poruke )"
 
-#: kmreaderwin.cpp:1854
+#: kmreaderwin.cpp:1890
 msgid "Could not send MDN."
 msgstr "Ne mogu poslati MDN."
 
-#: kmreaderwin.cpp:1978
+#: kmreaderwin.cpp:1992
+#, fuzzy
+msgid "Copy Email Address"
+msgstr "Adresa e-pošte"
+
+#: kmreaderwin.cpp:2044
 msgid "Decrypt With Chiasmus..."
 msgstr ""
 
-#: kmreaderwin.cpp:2133 kmreaderwin.cpp:2169 kmreaderwin.cpp:2188
+#: kmreaderwin.cpp:2050
+msgid "Scroll To"
+msgstr ""
+
+#: kmreaderwin.cpp:2208 kmreaderwin.cpp:2244 kmreaderwin.cpp:2264
 #, fuzzy, c-format
 msgid "View Attachment: %1"
 msgstr "Pogledaj prilog: %1"
 
-#: kmreaderwin.cpp:2181
+#: kmreaderwin.cpp:2257
 #, fuzzy, c-format
 msgid ""
 "_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
@@ -8936,51 +9814,51 @@ msgstr ""
 "[KMail: Prilog sadrži binarne podatke. Pokušaj prikaza prva %n znaka.]\n"
 "[KMail: Prilog sadrži binarne podatke. Pokušaj prikaza prvih %n znakova.]"
 
-#: kmreaderwin.cpp:2277
+#: kmreaderwin.cpp:2353
 #, fuzzy
 msgid "&Open with '%1'"
 msgstr "&Otvori s? '%1'"
 
-#: kmreaderwin.cpp:2279
+#: kmreaderwin.cpp:2355
 msgid "&Open With..."
 msgstr "&Otvori s..."
 
-#: kmreaderwin.cpp:2281
+#: kmreaderwin.cpp:2357
 msgid ""
 "Open attachment '%1'?\n"
 "Note that opening an attachment may compromise your system's security."
 msgstr ""
 
-#: kmreaderwin.cpp:2286
+#: kmreaderwin.cpp:2362
 msgid "Open Attachment?"
 msgstr "Otvori prilog?"
 
-#: 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 "prilog"
 
-#: kmsearchpattern.cpp:898
+#: kmsearchpattern.cpp:913
 msgid ""
 "_: name used for a virgin filter\n"
 "unknown"
 msgstr "nepoznato"
 
-#: kmsearchpattern.cpp:904
+#: kmsearchpattern.cpp:919
 msgid "(match any of the following)"
 msgstr "(nađi bilo što od sljedećeg)"
 
-#: kmsearchpattern.cpp:906
+#: kmsearchpattern.cpp:921
 msgid "(match all of the following)"
 msgstr "(nađi sve od sljedećeg)"
 
@@ -9019,27 +9897,48 @@ msgstr "<starost u danima>"
 msgid "Message Status"
 msgstr "Popisa poruka"
 
-#: kmsearchpatternedit.cpp:391
+#: kmsearchpatternedit.cpp:42
+#, fuzzy
+msgid "From"
+msgstr "&Od"
+
+#: kmsearchpatternedit.cpp:43 recipientseditor.cpp:100
+#, fuzzy
+msgid "To"
+msgstr "&Za:"
+
+#: kmsearchpatternedit.cpp:44 recipientseditor.cpp:102
+#, fuzzy
+msgid "CC"
+msgstr "&Kopija"
+
+#: kmsearchpatternedit.cpp:45
+#, fuzzy
+msgid "Reply To"
+msgstr "&Odgovori na"
+
+#: kmsearchpatternedit.cpp:46
+#, fuzzy
+msgid "Organization"
+msgstr "Organizacija:"
+
+#: kmsearchpatternedit.cpp:397
 msgid "Search Criteria"
 msgstr "Traži u"
 
-#: kmsearchpatternedit.cpp:408
+#: kmsearchpatternedit.cpp:414
 msgid "Match a&ll of the following"
 msgstr "&Nađi sve od sljedećeg:"
 
-#: kmsearchpatternedit.cpp:409
+#: kmsearchpatternedit.cpp:415
 msgid "Match an&y of the following"
 msgstr "&Nađi bilo što od sljedećeg:"
 
-#: kmsender.cpp:114
-msgid "Please create an account for sending and try again."
-msgstr "Napravite korisnički račun za slanje pa pokušajte ponovo."
-
 #: kmsender.cpp:171
 msgid "Cannot add message to outbox folder"
 msgstr "Ne mogu dodati poruku u odlazeći direktorij"
 
-#: kmsender.cpp:373
+#: kmsender.cpp:374
 msgid ""
 "Critical error: Unable to process sent mail (out of space?)Moving failing "
 "message to \"sent-mail\" folder."
@@ -9047,7 +9946,7 @@ msgstr ""
 "Kritična greška: Ne mogu obraditi poslanu poštu (nema mjesta?) Premještam "
 "poruku u mapu za poslanu poštu."
 
-#: kmsender.cpp:385
+#: kmsender.cpp:386
 msgid ""
 "Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
 "failed.\n"
@@ -9058,14 +9957,14 @@ msgstr ""
 "Mogući razlozi su nedostatak prostora na disku ili pravo pisanja. Pokušajte "
 "pronaći problem i premjestiti poruku ručno."
 
-#: 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 "
 "configuration dialog and then try again."
 msgstr ""
 
-#: kmsender.cpp:453
+#: kmsender.cpp:454
 #, fuzzy, c-format
 msgid ""
 "_n: %n queued message successfully sent.\n"
@@ -9075,46 +9974,46 @@ msgstr ""
 "%n poruke koje su čekale su uspješno poslane.\n"
 "%n poruka koje su čekale su uspješno poslane."
 
-#: kmsender.cpp:456
+#: kmsender.cpp:457
 msgid "%1 of %2 queued messages successfully sent."
 msgstr "%1 od %2 poruka iz mape za slanje je uspješno poslano."
 
-#: kmsender.cpp:471
+#: kmsender.cpp:472
 #, fuzzy
 msgid "Sending messages"
 msgstr "na &dolazeće poruke"
 
-#: kmsender.cpp:472
+#: kmsender.cpp:473
 msgid "Initiating sender process..."
 msgstr "Počinjem sa slanjem..."
 
-#: 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
 #, fuzzy
 msgid "Send Unencrypted"
 msgstr "Snimi &nekriptirano"
 
-#: kmsender.cpp:556
+#: kmsender.cpp:557
 #, fuzzy
 msgid "Unrecognized transport protocol. Unable to send message."
 msgstr "Protokol za transport nije prepoznat. Ne mogu da pošaljem poruku."
 
-#: kmsender.cpp:597
+#: kmsender.cpp:598
 msgid ""
 "_: %3: subject of message\n"
 "Sending message %1 of %2: %3"
 msgstr "Slanje poruke %1 od %2: %3"
 
-#: kmsender.cpp:616
+#: kmsender.cpp:617
 msgid "Failed to send (some) queued messages."
 msgstr "Nisam mogao poslati (neke) od poredanih poruka."
 
-#: kmsender.cpp:693
+#: kmsender.cpp:694
 #, fuzzy
 msgid ""
 "Sending aborted:\n"
@@ -9131,12 +10030,12 @@ msgstr ""
 "Korišten je sljedeći transportni protokol:\n"
 "  %2"
 
-#: kmsender.cpp:701 kmsender.cpp:746
+#: kmsender.cpp:702 kmsender.cpp:747
 #, fuzzy
 msgid "Sending aborted."
 msgstr "Slanje je otkazano."
 
-#: kmsender.cpp:719
+#: kmsender.cpp:720
 msgid ""
 "<p>Sending failed:</p>"
 "<p>%1</p>"
@@ -9147,19 +10046,19 @@ msgid ""
 "<p>Do you want me to continue sending the remaining messages?</p>"
 msgstr ""
 
-#: kmsender.cpp:729
+#: kmsender.cpp:730
 msgid "Continue Sending"
 msgstr "&Nastavi slanje"
 
-#: kmsender.cpp:729
+#: kmsender.cpp:730
 msgid "&Continue Sending"
 msgstr "&Nastavi slanje"
 
-#: kmsender.cpp:730
+#: kmsender.cpp:731
 msgid "&Abort Sending"
 msgstr "&Prekini slanje"
 
-#: kmsender.cpp:732
+#: kmsender.cpp:733
 #, fuzzy
 msgid ""
 "Sending failed:\n"
@@ -9176,11 +10075,11 @@ msgstr ""
 "Korišten je sljedeći transportni protokol:\n"
 "  %2"
 
-#: kmsender.cpp:930
+#: kmsender.cpp:931
 msgid "Please specify a mailer program in the settings."
 msgstr "Odreditte poštanski program u postavkama."
 
-#: kmsender.cpp:931
+#: kmsender.cpp:932
 #, fuzzy
 msgid ""
 "Sending failed:\n"
@@ -9197,71 +10096,71 @@ msgstr ""
 "Korišten je sljedeći transportni protokol:\n"
 "  %2"
 
-#: kmsender.cpp:979
+#: kmsender.cpp:980
 #, c-format
 msgid "Failed to execute mailer program %1"
 msgstr "Nisam uspio izvršiti program za poštu %1"
 
-#: kmsender.cpp:1029
+#: kmsender.cpp:1030
 #, fuzzy
 msgid "Sendmail exited abnormally."
 msgstr "„Sendmail“ nije normalno završio sa radom."
 
-#: kmsender.cpp:1099
+#: kmsender.cpp:1100
 #, fuzzy
 msgid "You need to supply a username and a password to use this SMTP server."
 msgstr ""
 "Morate obezbediti korisničko ime i lozinku koji će se koristiti za ovaj SMTP "
 "poslužitelj."
 
-#: 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 "
 "are sure that it is not already running."
 msgstr ""
 
-#: 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 "
 "are sure that %1 is not running."
 msgstr ""
 
-#: 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 "
 "it is not already running on %2."
 msgstr ""
 
-#: 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 "
 "%1 is not running on %3."
 msgstr ""
 
-#: kmstartup.cpp:231
+#: kmstartup.cpp:232
 #, c-format
 msgid "Start %1"
 msgstr ""
 
-#: kmstartup.cpp:232
+#: kmstartup.cpp:233
 msgid "Exit"
 msgstr ""
 
-#: kmsystemtray.cpp:337
+#: kmsystemtray.cpp:357
 #, fuzzy
 msgid "New Messages In"
 msgstr "Nove poruke u..."
 
-#: kmsystemtray.cpp:547
+#: kmsystemtray.cpp:567
 #, fuzzy
 msgid "There are no unread messages"
 msgstr "Izbaci &nepročitane poruke"
 
-#: kmsystemtray.cpp:549
+#: kmsystemtray.cpp:569
 #, fuzzy, c-format
 msgid ""
 "_n: There is 1 unread message.\n"
@@ -9551,59 +10450,64 @@ msgstr "Postojeći Filteri"
 msgid "Available Scripts"
 msgstr "Postojeći Filteri"
 
-#: managesievescriptsdialog.cpp:116
+#: managesievescriptsdialog.cpp:121
 #, fuzzy
 msgid "No Sieve URL configured"
 msgstr "Filtriranje na strani poslužitelja nije podešeno"
 
-#: managesievescriptsdialog.cpp:135
+#: managesievescriptsdialog.cpp:140
 msgid "Failed to fetch the list of scripts"
 msgstr ""
 
-#: managesievescriptsdialog.cpp:160
+#: managesievescriptsdialog.cpp:165
 #, fuzzy
 msgid "Delete Script"
 msgstr "<primatelji>"
 
-#: managesievescriptsdialog.cpp:161
+#: managesievescriptsdialog.cpp:166
 #, fuzzy
 msgid "Edit Script..."
 msgstr "Uredi..."
 
-#: managesievescriptsdialog.cpp:164
+#: managesievescriptsdialog.cpp:167
+#, fuzzy
+msgid "Deactivate Script"
+msgstr "<primatelji>"
+
+#: managesievescriptsdialog.cpp:170
 #, fuzzy
 msgid "New Script..."
 msgstr "Opis:..."
 
-#: managesievescriptsdialog.cpp:233
+#: managesievescriptsdialog.cpp:256
 msgid "Really delete script \"%1\" from the server?"
 msgstr ""
 
-#: managesievescriptsdialog.cpp:234
+#: managesievescriptsdialog.cpp:257
 #, fuzzy
 msgid "Delete Sieve Script Confirmation"
 msgstr "Potvrde o prijemu"
 
-#: managesievescriptsdialog.cpp:278
+#: managesievescriptsdialog.cpp:300
 #, fuzzy
 msgid "New Sieve Script"
 msgstr "Postojeći Filteri"
 
-#: managesievescriptsdialog.cpp:279
+#: managesievescriptsdialog.cpp:301
 #, fuzzy
 msgid "Please enter a name for the new Sieve script:"
 msgstr "Odreditte poštanski program u postavkama."
 
-#: managesievescriptsdialog.cpp:293
+#: managesievescriptsdialog.cpp:315
 #, fuzzy
 msgid "Edit Sieve Script"
 msgstr "Postojeći Filteri"
 
-#: 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 ""
 
@@ -9613,7 +10517,7 @@ msgid ""
 "&Reply"
 msgstr "&Odgovori"
 
-#: messageactions.cpp:48 searchwindow.cpp:311
+#: messageactions.cpp:48 searchwindow.cpp:312
 msgid "&Reply..."
 msgstr "Odgovo&ri..."
 
@@ -9622,11 +10526,11 @@ msgstr "Odgovo&ri..."
 msgid "Reply to A&uthor..."
 msgstr "Odgovori &piscu..."
 
-#: messageactions.cpp:58 searchwindow.cpp:313
+#: messageactions.cpp:58 searchwindow.cpp:314
 msgid "Reply to &All..."
 msgstr "Odgovori &svima..."
 
-#: messageactions.cpp:63 searchwindow.cpp:316
+#: messageactions.cpp:63 searchwindow.cpp:317
 #, fuzzy
 msgid "Reply to Mailing-&List..."
 msgstr "Odgovori u diskusionu &popis..."
@@ -9691,7 +10595,7 @@ msgstr "Važna poruka"
 msgid "&Edit Message"
 msgstr "&Uredi poruku"
 
-#: messagecomposer.cpp:222
+#: messagecomposer.cpp:223
 msgid ""
 "<qt>"
 "<p>Structuring information returned by the Crypto plug-in could not be "
@@ -9699,7 +10603,7 @@ msgid ""
 "<p>Please contact your system administrator.</p></qt>"
 msgstr ""
 
-#: 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>"
@@ -9711,7 +10615,7 @@ msgid ""
 "Identity->Advanced tab.</li></ul>"
 msgstr ""
 
-#: 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."
@@ -9719,180 +10623,180 @@ msgstr ""
 "Nije pronađeno odgovarajući znakovni skup za vašu poruku.\n"
 "Postavite znakovni skup korištenjem izbornika Odrednice."
 
-#: 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"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
 
-#: messagecomposer.cpp:642
+#: messagecomposer.cpp:640
 msgid "Insecure Message Format"
 msgstr ""
 
-#: messagecomposer.cpp:643
+#: messagecomposer.cpp:641
 #, fuzzy
 msgid "Use Inline OpenPGP"
 msgstr "ubačeni OpenPGP (ugrađeni)"
 
-#: messagecomposer.cpp:644
+#: messagecomposer.cpp:642
 msgid "Use OpenPGP/MIME"
 msgstr ""
 
-#: 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"
 "Sign this message?"
 msgstr ""
 
-#: messagecomposer.cpp:765 messagecomposer.cpp:788
+#: messagecomposer.cpp:763 messagecomposer.cpp:786
 #, fuzzy
 msgid "Sign Message?"
 msgstr "&Potpiši poruku"
 
-#: messagecomposer.cpp:766 messagecomposer.cpp:789
+#: messagecomposer.cpp:764 messagecomposer.cpp:787
 msgid ""
 "_: to sign\n"
 "&Sign"
 msgstr ""
 
-#: messagecomposer.cpp:767 messagecomposer.cpp:790
+#: messagecomposer.cpp:765 messagecomposer.cpp:788
 msgid "Do &Not Sign"
 msgstr ""
 
-#: messagecomposer.cpp:784
+#: messagecomposer.cpp:782
 msgid ""
 "There are conflicting signing preferences for these recipients.\n"
 "Sign this message?"
 msgstr ""
 
-#: 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."
 msgstr ""
 
-#: messagecomposer.cpp:810
+#: messagecomposer.cpp:808
 #, fuzzy
 msgid "Send Unsigned?"
 msgstr "Pošalji „o&dbijen“"
 
-#: messagecomposer.cpp:811
+#: messagecomposer.cpp:809
 #, fuzzy
 msgid "Send &Unsigned"
 msgstr "Pošalji „o&dbijen“"
 
-#: 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"
 "Sign all parts instead?"
 msgstr ""
 
-#: messagecomposer.cpp:829
+#: messagecomposer.cpp:827
 msgid ""
 "This message will not be signed.\n"
 "Sending unsigned message might violate site policy.\n"
 "Sign message instead?"
 msgstr ""
 
-#: messagecomposer.cpp:833
+#: messagecomposer.cpp:831
 #, fuzzy
 msgid "&Sign All Parts"
 msgstr "&Potpiši sve dijelove"
 
-#: messagecomposer.cpp:833
+#: messagecomposer.cpp:831
 #, fuzzy
 msgid "&Sign"
 msgstr "Znak"
 
-#: messagecomposer.cpp:835
+#: messagecomposer.cpp:833
 #, fuzzy
 msgid "Unsigned-Message Warning"
 msgstr "Upozorenje o potpisivanju"
 
-#: messagecomposer.cpp:837
+#: messagecomposer.cpp:835
 #, fuzzy
 msgid "Send &As Is"
 msgstr "Pošalji &kako jest"
 
-#: messagecomposer.cpp:875
+#: messagecomposer.cpp:873
 msgid ""
 "Valid trusted encryption keys were found for all recipients.\n"
 "Encrypt this message?"
 msgstr ""
 
-#: 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"
 "Encrypt this message?"
 msgstr ""
 
-#: messagecomposer.cpp:882 messagecomposer.cpp:909
+#: messagecomposer.cpp:880 messagecomposer.cpp:907
 msgid "Encrypt Message?"
 msgstr "Kriptirati poruku?"
 
-#: messagecomposer.cpp:884
+#: messagecomposer.cpp:882
 #, fuzzy
 msgid "Sign && &Encrypt"
 msgstr "Po&tpiši i kriptiraj"
 
-#: messagecomposer.cpp:887 messagecomposer.cpp:962
+#: messagecomposer.cpp:885 messagecomposer.cpp:960
 msgid "&Sign Only"
 msgstr "&Samo Potpis"
 
-#: messagecomposer.cpp:888 messagecomposer.cpp:963
+#: messagecomposer.cpp:886 messagecomposer.cpp:961
 #, fuzzy
 msgid "&Send As-Is"
 msgstr "Pošalji &kako jest"
 
-#: messagecomposer.cpp:905
+#: messagecomposer.cpp:903
 msgid ""
 "There are conflicting encryption preferences for these recipients.\n"
 "Encrypt this message?"
 msgstr ""
 
-#: messagecomposer.cpp:911
+#: messagecomposer.cpp:909
 #, fuzzy
 msgid "Do &Not Encrypt"
 msgstr "&Kriptiraj"
 
-#: 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."
 msgstr ""
 
-#: messagecomposer.cpp:932
+#: messagecomposer.cpp:930
 #, fuzzy
 msgid "Send Unencrypted?"
 msgstr "Snimi &nekriptirano"
 
-#: 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 "
@@ -9900,7 +10804,7 @@ msgid ""
 "Encrypt all parts instead?"
 msgstr ""
 
-#: 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 "
@@ -9908,16 +10812,16 @@ msgid ""
 "Encrypt messages instead?"
 msgstr ""
 
-#: messagecomposer.cpp:957
+#: messagecomposer.cpp:955
 msgid "&Encrypt All Parts"
 msgstr "K&riptiraj sve dijelove"
 
-#: messagecomposer.cpp:959
+#: messagecomposer.cpp:957
 #, fuzzy
 msgid "Unencrypted Message Warning"
 msgstr "Šifriraj poruku"
 
-#: messagecomposer.cpp:2040
+#: messagecomposer.cpp:2038
 msgid ""
 "<qt>"
 "<p>Error: The backend did not return any encoded data.</p>"
@@ -9925,79 +10829,85 @@ msgid ""
 "<br>%2</p></qt>"
 msgstr ""
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2111
 msgid ""
 "<qt>Not all characters fit into the chosen encoding."
 "<br>"
 "<br>Send the message anyway?</qt>"
 msgstr ""
 
-#: messagecomposer.cpp:2115
+#: messagecomposer.cpp:2113
 #, fuzzy
 msgid "Some Characters Will Be Lost"
 msgstr "Neki znaci mogu biti izgubljeni"
 
-#: messagecomposer.cpp:2116
+#: messagecomposer.cpp:2114
 msgid "Lose Characters"
 msgstr ""
 
-#: messagecomposer.cpp:2116
+#: messagecomposer.cpp:2114
 msgid "Change Encoding"
 msgstr "Podesi &kodiranje.."
 
-#: messagecomposer.cpp:2164
+#: messagecomposer.cpp:2149
+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 ""
+
+#: 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."
 msgstr ""
 
-#: 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."
 msgstr ""
 
-#: 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 "
 "happen, please report this bug."
 msgstr ""
 
-#: newfolderdialog.cpp:58
+#: newfolderdialog.cpp:59
 #, fuzzy
 msgid "New Folder"
 msgstr "&Novi direktorij..."
 
-#: newfolderdialog.cpp:65
+#: newfolderdialog.cpp:69
 #, fuzzy, c-format
 msgid "New Subfolder of %1"
 msgstr "&Nova..."
 
-#: newfolderdialog.cpp:81
+#: newfolderdialog.cpp:85
 msgid "Enter a name for the new folder."
 msgstr ""
 
-#: newfolderdialog.cpp:92
+#: newfolderdialog.cpp:96
 #, fuzzy
 msgid "Mailbox &format:"
 msgstr "Mailbox for&mat:"
 
-#: 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 "
@@ -10005,139 +10915,126 @@ msgid ""
 "this option as-is."
 msgstr ""
 
-#: newfolderdialog.cpp:119
+#: newfolderdialog.cpp:124
 #, fuzzy
 msgid "Folder &contains:"
 msgstr "Sličice mapa"
 
-#: 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
 #, fuzzy
 msgid "Select the personal namespace the folder should be created in."
 msgstr "Odabiranje javnog ključa koji treba priložiti."
 
-#: newfolderdialog.cpp:188
+#: newfolderdialog.cpp:193
 #, fuzzy
 msgid "Please specify a name for the new folder."
 msgstr "Odreditte poštanski program u postavkama."
 
-#: newfolderdialog.cpp:189
+#: newfolderdialog.cpp:194
 #, fuzzy
 msgid "No Name Specified"
 msgstr "Nije naznačen naslov"
 
-#: 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>Nisam uspio napraviti mapu <b>%1</b>; mapa već postoji.</qt>"
 
-#: newfolderdialog.cpp:246
+#: newfolderdialog.cpp:222
 #, fuzzy
 msgid "<qt>Failed to create folder <b>%1</b>.</qt> "
 msgstr "<qt>Ne mogu ući u mapu <b>%1</b>.</qt>"
 
-#: objecttreeparser.cpp:450
+#: objecttreeparser.cpp:490
 msgid "Wrong Crypto Plug-In."
 msgstr "Neispravni umetak za kriptiranje."
 
-#: objecttreeparser.cpp:490 objecttreeparser.cpp:1909
+#: objecttreeparser.cpp:594 objecttreeparser.cpp:2130
 msgid "Different results for signatures"
 msgstr "Različiti rezultati za potpise"
 
-#: objecttreeparser.cpp:573
+#: objecttreeparser.cpp:667
 msgid "The crypto engine returned no cleartext data."
 msgstr ""
 
-#: objecttreeparser.cpp:576 objecttreeparser.cpp:2350
-#: objecttreeparser.cpp:2393
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
+#: objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr "Status: "
 
-#: objecttreeparser.cpp:583
+#: objecttreeparser.cpp:677
 msgid "(unknown)"
 msgstr "(nepoznato)"
 
-#: objecttreeparser.cpp:594 objecttreeparser.cpp:748
+#: objecttreeparser.cpp:688 objecttreeparser.cpp:903
 msgid "Crypto plug-in \"%1\" is not initialized."
 msgstr "Umetak za kriptiranje „%1“ nije inicijaliziran."
 
-#: objecttreeparser.cpp:598
+#: objecttreeparser.cpp:692
 msgid "Crypto plug-in \"%1\" cannot verify signatures."
 msgstr ""
 
-#: objecttreeparser.cpp:603 objecttreeparser.cpp:756
+#: objecttreeparser.cpp:697 objecttreeparser.cpp:911
 msgid "No appropriate crypto plug-in was found."
 msgstr "Nije pronađen odgovarajući umetak za kriptiranje."
 
-#: objecttreeparser.cpp:606
+#: objecttreeparser.cpp:700
 msgid ""
 "_: %1 is either 'OpenPGP' or 'S/MIME'\n"
 "No %1 plug-in was found."
 msgstr "Nijedan %1 umetak nije pronađen."
 
-#: objecttreeparser.cpp:610
+#: objecttreeparser.cpp:704
 #, c-format
 msgid ""
 "The message is signed, but the validity of the signature cannot be verified.<br "
 "/>Reason: %1"
 msgstr ""
 
-#: objecttreeparser.cpp:667
+#: objecttreeparser.cpp:737
+#, fuzzy
+msgid "Encrypted data not shown"
+msgstr "Prikazani su podaci koji se ne mogu dešifrovati."
+
+#: objecttreeparser.cpp:755
 #, fuzzy
 msgid "This message is encrypted."
 msgstr "Pohrani poslane poruke u ši&frovanom obliku"
 
-#: objecttreeparser.cpp:672
+#: objecttreeparser.cpp:760
 #, fuzzy
 msgid "Decrypt Message"
 msgstr "&Šifriraj poruku"
 
-#: objecttreeparser.cpp:731 objecttreeparser.cpp:744 objecttreeparser.cpp:773
+#: objecttreeparser.cpp:886 objecttreeparser.cpp:899 objecttreeparser.cpp:928
 #, fuzzy
 msgid "Encrypted data not shown."
 msgstr "Prikazani su podaci koji se ne mogu dešifrovati."
 
-#: objecttreeparser.cpp:734
+#: objecttreeparser.cpp:889
 msgid "Crypto plug-in \"%1\" could not decrypt the data."
 msgstr "Umetak za kriptiranje „%1“ ne može dekriptirati podatke."
 
-#: objecttreeparser.cpp:737
+#: objecttreeparser.cpp:892
 #, c-format
 msgid "Error: %1"
 msgstr "Greška: %1"
 
-#: objecttreeparser.cpp:752
+#: objecttreeparser.cpp:907
 msgid "Crypto plug-in \"%1\" cannot decrypt messages."
 msgstr ""
 
-#: objecttreeparser.cpp:844
+#: objecttreeparser.cpp:1000
 msgid ""
 "<b>Note:</b> This HTML message may contain external references to images etc. "
 "For security/privacy reasons external references are not loaded. If you trust "
@@ -10145,7 +11042,7 @@ msgid ""
 "message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
 
-#: 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 "
@@ -10153,21 +11050,32 @@ msgid ""
 "by clicking here</a>."
 msgstr ""
 
-#: 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 "Proslijeđena poruka"
+
+#: objecttreeparser.cpp:1658
 #, c-format
 msgid "Sorry, certificate could not be imported.<br>Reason: %1"
 msgstr ""
 
-#: objecttreeparser.cpp:1461
+#: objecttreeparser.cpp:1668
 #, fuzzy
 msgid "Sorry, no certificates were found in this message."
 msgstr "Postava za slanje i primanje poruka"
 
-#: objecttreeparser.cpp:1464
+#: objecttreeparser.cpp:1671
 msgid "Certificate import status:"
 msgstr "Status učitavanja Certifikata:"
 
-#: objecttreeparser.cpp:1467
+#: objecttreeparser.cpp:1674
 #, fuzzy, c-format
 msgid ""
 "_n: 1 new certificate was imported.\n"
@@ -10177,7 +11085,7 @@ msgstr ""
 "uvezena su %n. nova certifikata.\n"
 "uvezeno je %n. novih certifikata."
 
-#: objecttreeparser.cpp:1470
+#: objecttreeparser.cpp:1677
 #, fuzzy, c-format
 msgid ""
 "_n: 1 certificate was unchanged.\n"
@@ -10187,7 +11095,7 @@ msgstr ""
 "nepromijenjena su %n. certifikata.\n"
 "nepromijenjeno je %n. certifikata."
 
-#: objecttreeparser.cpp:1473
+#: objecttreeparser.cpp:1680
 #, fuzzy, c-format
 msgid ""
 "_n: 1 new secret key was imported.\n"
@@ -10197,7 +11105,7 @@ msgstr ""
 "uvezena su %n. nova tajna ključa.\n"
 "uvezeno je %n. novih tajnih ključeva."
 
-#: objecttreeparser.cpp:1476
+#: objecttreeparser.cpp:1683
 #, fuzzy, c-format
 msgid ""
 "_n: 1 secret key was unchanged.\n"
@@ -10207,189 +11115,204 @@ msgstr ""
 "nepromijenjena su %n. tajna ključa.\n"
 "nepromijenjeno je %n. tajnih ključeva."
 
-#: objecttreeparser.cpp:1485
+#: objecttreeparser.cpp:1692
 msgid "Sorry, no details on certificate import available."
 msgstr ""
 
-#: objecttreeparser.cpp:1488
+#: objecttreeparser.cpp:1695
 msgid "Certificate import details:"
 msgstr "Detalji unosa certifikata:"
 
-#: objecttreeparser.cpp:1491
+#: objecttreeparser.cpp:1698
 msgid "Failed: %1 (%2)"
 msgstr "Nije uspjelo: %1 (%2)"
 
-#: objecttreeparser.cpp:1496
+#: objecttreeparser.cpp:1703
 msgid "New or changed: %1 (secret key available)"
 msgstr "Novo ili promijenjeno: %1 (tajni ključ dostupan)"
 
-#: objecttreeparser.cpp:1498
+#: objecttreeparser.cpp:1706
 #, c-format
 msgid "New or changed: %1"
 msgstr "Novo ili promijenjeno: %1"
 
-#: objecttreeparser.cpp:1891
+#: objecttreeparser.cpp:2112
 msgid "Error: Signature not verified"
 msgstr "Greška: Potpis nije provjeren"
 
-#: objecttreeparser.cpp:1894
+#: objecttreeparser.cpp:2115
 msgid "Good signature"
 msgstr "Datoteka s potpisom:"
 
-#: objecttreeparser.cpp:1897
+#: objecttreeparser.cpp:2118
 msgid "<b>Bad</b> signature"
 msgstr "<b>Loš</b> potpis"
 
-#: objecttreeparser.cpp:1900
+#: objecttreeparser.cpp:2121
 msgid "No public key to verify the signature"
 msgstr "Nema javnog ključa za provjeru potpisa"
 
-#: objecttreeparser.cpp:1903
+#: objecttreeparser.cpp:2124
 msgid "No signature found"
 msgstr "Nije pronađen potpis"
 
-#: objecttreeparser.cpp:1906
+#: objecttreeparser.cpp:2127
 msgid "Error verifying the signature"
 msgstr "Greška prilikom provjere potpisa"
 
-#: objecttreeparser.cpp:1929
+#: objecttreeparser.cpp:2150
 msgid "No status information available."
 msgstr "Nema dostupnih informacija o statusu."
 
-#: objecttreeparser.cpp:1936 objecttreeparser.cpp:2020
+#: objecttreeparser.cpp:2157 objecttreeparser.cpp:2241
 msgid "Good signature."
 msgstr "Datoteka s potpisom:."
 
-#: objecttreeparser.cpp:1957
+#: objecttreeparser.cpp:2178
 msgid "One key has expired."
 msgstr "Jedan ključ je istekao."
 
-#: objecttreeparser.cpp:1961
+#: objecttreeparser.cpp:2182
 #, fuzzy
 msgid "The signature has expired."
 msgstr "Potpis je istekao."
 
-#: objecttreeparser.cpp:1966
+#: objecttreeparser.cpp:2187
 #, fuzzy
 msgid "Unable to verify: key missing."
 msgstr "Ne mogu da provjerim: nedostaje ključ."
 
-#: objecttreeparser.cpp:1973
+#: objecttreeparser.cpp:2194
 msgid "CRL not available."
 msgstr "CRL nije dostupan."
 
-#: objecttreeparser.cpp:1977
+#: objecttreeparser.cpp:2198
 msgid "Available CRL is too old."
 msgstr "Dostupan CRL je isuviše star."
 
-#: objecttreeparser.cpp:1981
+#: objecttreeparser.cpp:2202
 msgid "A policy was not met."
 msgstr "Politika nije zadovoljena."
 
-#: objecttreeparser.cpp:1985
+#: objecttreeparser.cpp:2206
 msgid "A system error occurred."
 msgstr "Pojavila se sistemska greška."
 
-#: objecttreeparser.cpp:1996
+#: objecttreeparser.cpp:2217
 msgid "One key has been revoked."
 msgstr "Jedan ključ je opozvan."
 
-#: objecttreeparser.cpp:2022
+#: objecttreeparser.cpp:2243
 msgid "<b>Bad</b> signature."
 msgstr "<b>Loš</b> potpis."
 
-#: objecttreeparser.cpp:2049
+#: objecttreeparser.cpp:2270
 #, fuzzy
 msgid "Invalid signature."
 msgstr "&Uključi potpis"
 
-#: objecttreeparser.cpp:2051
+#: objecttreeparser.cpp:2272
 #, fuzzy
 msgid "Not enough information to check signature validity."
 msgstr "Nema dovoljno informacija za provjeru potpisa. %1"
 
-#: objecttreeparser.cpp:2060
+#: objecttreeparser.cpp:2281
 #, fuzzy
 msgid "Signature is valid."
 msgstr "Signatures"
 
-#: 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 "[Detalji]"
 
-#: objecttreeparser.cpp:2082
+#: objecttreeparser.cpp:2308
 #, fuzzy
 msgid "No Audit Log available"
 msgstr "Nije dostupno"
 
-#: objecttreeparser.cpp:2089
+#: objecttreeparser.cpp:2310
+#, fuzzy, c-format
+msgid "Error Retrieving Audit Log: %1"
+msgstr "Greška prilikom slanja poruke"
+
+#: 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 "[Detalji]"
 
-#: objecttreeparser.cpp:2124 objecttreeparser.cpp:2126
+#: objecttreeparser.cpp:2357 objecttreeparser.cpp:2359
 msgid "Encapsulated message"
 msgstr "Enkapsulirana poruka"
 
-#: objecttreeparser.cpp:2135
+#: objecttreeparser.cpp:2368
+#, fuzzy
+msgid "Please wait while the message is being decrypted..."
+msgstr "Pohrani poslane poruke u ši&frovanom obliku"
+
+#: objecttreeparser.cpp:2370
 msgid "Encrypted message"
 msgstr "Šifriraj poruku"
 
-#: objecttreeparser.cpp:2137
+#: objecttreeparser.cpp:2372
 msgid "Encrypted message (decryption not possible)"
 msgstr "Kriptirana poruka (dekriptiranje nije moguće)"
 
-#: objecttreeparser.cpp:2139
+#: objecttreeparser.cpp:2374
 #, c-format
 msgid "Reason: %1"
 msgstr "Razlog: %1"
 
-#: objecttreeparser.cpp:2194
+#: objecttreeparser.cpp:2384
+#, fuzzy
+msgid "Please wait while the signature is being verified..."
+msgstr "Ispravnost potpisa se ne može provjeriti."
+
+#: objecttreeparser.cpp:2438
 msgid "[Details]"
 msgstr "[Detalji]"
 
-#: objecttreeparser.cpp:2233 objecttreeparser.cpp:2235
+#: objecttreeparser.cpp:2477 objecttreeparser.cpp:2479
 #, fuzzy
 msgid "certificate"
 msgstr "Potvrda"
 
-#: objecttreeparser.cpp:2242 objecttreeparser.cpp:2267
+#: objecttreeparser.cpp:2486 objecttreeparser.cpp:2511
 msgid "Warning:"
 msgstr "Upozorenje:"
 
-#: objecttreeparser.cpp:2244
+#: objecttreeparser.cpp:2488
 #, fuzzy
 msgid "Sender's mail address is not stored in the %1 used for signing."
 msgstr ""
 "Pošiljaočeva poštanska adresa nije pohranjena u %1 koji je korišten za "
 "potpisivanje."
 
-#: objecttreeparser.cpp:2247
+#: objecttreeparser.cpp:2491
 #, fuzzy
 msgid "sender: "
 msgstr "pošiljatelj: "
 
-#: objecttreeparser.cpp:2250
+#: objecttreeparser.cpp:2494
 #, fuzzy
 msgid "stored: "
 msgstr "pohranjen: "
 
-#: 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."
@@ -10397,101 +11320,101 @@ msgstr ""
 "Nema poštanskih adresa pohranjenih u %1 kojo se koristi za potpisivanje, tako "
 "da uspoređivanje s adresom pošiljaoca %2; nije moguće."
 
-#: objecttreeparser.cpp:2292
+#: objecttreeparser.cpp:2536
 #, c-format
 msgid "Not enough information to check signature. %1"
 msgstr "Nema dovoljno informacija za provjeru potpisa. %1"
 
-#: objecttreeparser.cpp:2309 objecttreeparser.cpp:2387
+#: objecttreeparser.cpp:2553 objecttreeparser.cpp:2631
 msgid "Message was signed with unknown key."
 msgstr "Poruka je potpisana nepoznatim ključem."
 
-#: objecttreeparser.cpp:2311 objecttreeparser.cpp:2425
-#: objecttreeparser.cpp:2469
+#: objecttreeparser.cpp:2555 objecttreeparser.cpp:2669
+#: objecttreeparser.cpp:2713
 #, fuzzy, c-format
 msgid "Message was signed by %1."
 msgstr "Poruku je potpisao"
 
-#: objecttreeparser.cpp:2318 objecttreeparser.cpp:2327
-#: objecttreeparser.cpp:2338
+#: objecttreeparser.cpp:2562 objecttreeparser.cpp:2571
+#: objecttreeparser.cpp:2582
 #, fuzzy, c-format
 msgid "Message was signed with key %1."
 msgstr "Poruku je potpisana ključem %2."
 
-#: objecttreeparser.cpp:2321
+#: objecttreeparser.cpp:2565
 msgid "Message was signed on %1 with key %2."
 msgstr "Poruku je potpisana na %1, ključem %2."
 
-#: objecttreeparser.cpp:2330
+#: objecttreeparser.cpp:2574
 msgid "Message was signed by %3 on %1 with key %2"
 msgstr "Poruka je potpisana od %3 na %1 s ključem %2"
 
-#: objecttreeparser.cpp:2341
+#: objecttreeparser.cpp:2585
 msgid "Message was signed by %2 with key %1."
 msgstr "Poruku je potpisana od %2 (id. ključa: %1)."
 
-#: objecttreeparser.cpp:2379
+#: objecttreeparser.cpp:2623
 msgid "Message was signed on %1 with unknown key %2."
 msgstr "Poruku je potpisana na %1, nepoznatim ključem %2."
 
-#: objecttreeparser.cpp:2383
+#: objecttreeparser.cpp:2627
 #, c-format
 msgid "Message was signed with unknown key %1."
 msgstr "Poruka je potpisana nepoznatim ključem %1."
 
-#: objecttreeparser.cpp:2389
+#: objecttreeparser.cpp:2633
 #, fuzzy
 msgid "The validity of the signature cannot be verified."
 msgstr "Ispravnost potpisa se ne može provjeriti."
 
-#: objecttreeparser.cpp:2421 objecttreeparser.cpp:2465
+#: objecttreeparser.cpp:2665 objecttreeparser.cpp:2709
 msgid "Message was signed by %2 (Key ID: %1)."
 msgstr "Poruku je potpisana od %2 (id. ključa: %1)."
 
-#: objecttreeparser.cpp:2431
+#: objecttreeparser.cpp:2675
 #, fuzzy
 msgid "The signature is valid, but the key's validity is unknown."
 msgstr "Potpis je ispravan, ali ispravnost ključa je nepoznata."
 
-#: objecttreeparser.cpp:2435
+#: objecttreeparser.cpp:2679
 #, fuzzy
 msgid "The signature is valid and the key is marginally trusted."
 msgstr "Potpis je ispravan, ali se ključu malo veruje."
 
-#: objecttreeparser.cpp:2439
+#: objecttreeparser.cpp:2683
 msgid "The signature is valid and the key is fully trusted."
 msgstr "Odaberite datoteku s potpisom"
 
-#: objecttreeparser.cpp:2443
+#: objecttreeparser.cpp:2687
 #, fuzzy
 msgid "The signature is valid and the key is ultimately trusted."
 msgstr "Potpis je ispravan i ključu se do kraja veruje."
 
-#: objecttreeparser.cpp:2447
+#: objecttreeparser.cpp:2691
 msgid "The signature is valid, but the key is untrusted."
 msgstr "Odaberite datoteku s potpisom"
 
-#: objecttreeparser.cpp:2471
+#: objecttreeparser.cpp:2715
 msgid "Warning: The signature is bad."
 msgstr "Upozorenje: Loš potpis od"
 
-#: objecttreeparser.cpp:2495
+#: objecttreeparser.cpp:2739
 msgid "End of signed message"
 msgstr "Kraj potpisane poruke"
 
-#: objecttreeparser.cpp:2501
+#: objecttreeparser.cpp:2745
 msgid "End of encrypted message"
 msgstr "Kraj kriptirane poruke"
 
-#: objecttreeparser.cpp:2508
+#: objecttreeparser.cpp:2752
 msgid "End of encapsulated message"
 msgstr "Kraj enkapsulirane poruke"
 
-#: partNode.cpp:481
+#: partNode.cpp:505
 msgid "internal part"
 msgstr "interni dio"
 
-#: partNode.cpp:483
+#: partNode.cpp:507
 msgid "body part"
 msgstr "dio tijela"
 
@@ -10575,19 +11498,19 @@ msgstr "&Idi"
 msgid "F&older"
 msgstr "&Mapa"
 
-#. 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 "Poru&ka"
 
-#. 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"
@@ -10731,158 +11654,170 @@ msgstr ""
 msgid "Never sign/encrypt when sa&ving as draft"
 msgstr "Nemoj enkriptirati kada se sprema kao nacrt"
 
-#. 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
+#, no-c-format
+msgid "To:"
+msgstr "Za:"
+
+#. i18n: file customtemplates_base.ui line 177
+#: rc.cpp:200 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "CC: "
+
+#. i18n: file customtemplates_base.ui line 234
+#: rc.cpp:203
 #, fuzzy, no-c-format
 msgid "Universal"
 msgstr "Općenito"
 
-#. i18n: file customtemplates_base.ui line 185
-#: rc.cpp:197
+#. i18n: file customtemplates_base.ui line 239
+#: rc.cpp:206
 #, fuzzy, no-c-format
 msgid "Reply"
 msgstr "&Odgovori na"
 
-#. i18n: file customtemplates_base.ui line 190
-#: rc.cpp:200
+#. i18n: file customtemplates_base.ui line 244
+#: rc.cpp:209
 #, fuzzy, no-c-format
 msgid "Reply to All"
 msgstr "Odgovori &svima..."
 
-#. i18n: file customtemplates_base.ui line 195
-#: rc.cpp:203
+#. i18n: file customtemplates_base.ui line 249
+#: rc.cpp:212
 #, fuzzy, no-c-format
 msgid "Forward"
 msgstr "&Naprijed"
 
-#. i18n: file customtemplates_base.ui line 207
-#: rc.cpp:206
+#. i18n: file customtemplates_base.ui line 261
+#: rc.cpp:215
 #, fuzzy, no-c-format
 msgid "Shortc&ut:"
 msgstr "&Pokaži:"
 
-#. i18n: file customtemplates_base.ui line 229
-#: rc.cpp:209
+#. i18n: file customtemplates_base.ui line 283
+#: rc.cpp:218
 #, fuzzy, no-c-format
 msgid "&Template type:"
 msgstr "&Zamijeni"
 
-#. 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 "Svojstva mape"
 
 #. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:227
+#: rc.cpp:233
 #, no-c-format
 msgid "Folder holds a &mailing list"
 msgstr "Mapa sadrži &listu za raspravu"
 
 #. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:230
+#: rc.cpp:236
 #, no-c-format
 msgid "List &address:"
 msgstr "&Adresa liste:"
 
 #. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:233
+#: rc.cpp:239
 #, no-c-format
 msgid "N&ormal:"
 msgstr "&Obično:"
 
 #. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:236
+#: rc.cpp:242
 #, no-c-format
 msgid "Unr&ead:"
 msgstr "&Nepročitano:"
 
 #. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:242
+#: rc.cpp:248
 #, no-c-format
 msgid "Message Expiring"
 msgstr "Zastarijevanje poruka"
 
 #. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:245
+#: rc.cpp:251
 #, no-c-format
 msgid "E&xpire after:"
 msgstr "I&zbaci poslije:"
 
 #. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:248
+#: rc.cpp:254
 #, no-c-format
 msgid "Expire &read messages"
 msgstr "Izbaci p&ročitane poruke"
 
 #. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:251
+#: rc.cpp:257
 #, no-c-format
 msgid "Expire a&fter:"
 msgstr "Izbaci po&slije:"
 
 #. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:254
+#: rc.cpp:260
 #, no-c-format
 msgid "Expire &unread messages"
 msgstr "Izbaci &nepročitane poruke"
 
 #. 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 "Dan(a)"
 
 #. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:260 rc.cpp:269
+#: rc.cpp:266 rc.cpp:275
 #, fuzzy, no-c-format
 msgid "Week(s)"
 msgstr "Sedmica"
 
 #. 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 "Mjesec(i)"
 
 #. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:275
+#: rc.cpp:281
 #, no-c-format
 msgid "Advanced"
 msgstr "&Napredno"
 
 #. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:278
+#: rc.cpp:284
 #, fuzzy, no-c-format
 msgid "Sender identit&y:"
 msgstr "Identitet pošiljao&ca:"
 
 #. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:281
+#: rc.cpp:287
 #, fuzzy, no-c-format
 msgid "&Storage format:"
 msgstr "&Format pohranjivanja:"
 
 #. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:284
+#: rc.cpp:290
 #, fuzzy, no-c-format
 msgid "&List displays:"
 msgstr "Prikaz &lista:"
 
 #. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:293
+#: rc.cpp:299
 #, no-c-format
 msgid "Validate certificates using CRLs"
 msgstr ""
 
 #. 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 "
@@ -10890,13 +11825,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:299
+#: rc.cpp:305
 #, no-c-format
 msgid "Validate certificates online (OCSP)"
 msgstr ""
 
 #. 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 "
@@ -10905,19 +11840,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:305
+#: rc.cpp:311
 #, fuzzy, no-c-format
 msgid "Online Certificate Validation"
 msgstr "Pravljenje certifikata"
 
 #. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:308
+#: rc.cpp:314
 #, no-c-format
 msgid "OCSP responder URL:"
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:311
+#: rc.cpp:317
 #, no-c-format
 msgid ""
 "Enter here the address of the server for online validation of certificates "
@@ -10925,25 +11860,25 @@ msgid ""
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:314
+#: rc.cpp:320
 #, fuzzy, no-c-format
 msgid "OCSP responder signature:"
 msgstr "Datoteka s potpisom:"
 
 #. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:317
+#: rc.cpp:323
 #, fuzzy, no-c-format
 msgid "Ignore service URL of certificates"
 msgstr "Pošalji &moj osobni certifikat"
 
 #. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:320
+#: rc.cpp:326
 #, fuzzy, no-c-format
 msgid "Do not check certificate policies"
 msgstr "Provjeri &putanju certifikata"
 
 #. 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 "
@@ -10951,13 +11886,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:326
+#: rc.cpp:332
 #, no-c-format
 msgid "Never consult a CRL"
 msgstr ""
 
 #. 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 "
@@ -10965,13 +11900,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:332
+#: rc.cpp:338
 #, fuzzy, no-c-format
 msgid "Fetch missing issuer certificates"
 msgstr "Prilikom dodavanja novih certifikata"
 
 #. 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 "
@@ -10979,37 +11914,37 @@ msgid ""
 msgstr ""
 
 #. 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 "
@@ -11018,7 +11953,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 "
@@ -11027,13 +11962,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 "Pošalji &moj osobni certifikat"
 
 #. 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 "
@@ -11044,31 +11979,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 "Pošalji &moj osobni certifikat"
 
 #. 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 "
@@ -11079,13 +12014,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 "
@@ -11098,86 +12033,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 "&Dodaj..."
 
 #. 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 "&Groupware"
 
 #. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:408
+#: rc.cpp:414
 #, fuzzy, no-c-format
 msgid "Snippet Settings"
 msgstr "&Postojeći identiteti:"
 
 #. 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 "
@@ -11185,50 +12120,50 @@ msgid ""
 msgstr ""
 
 #. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:438
+#: rc.cpp:444
 #, fuzzy, no-c-format
 msgid "Delimiter:"
 msgstr "neograničeno"
 
 #. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:441
+#: rc.cpp:447
 #, fuzzy, no-c-format
 msgid "TemplatesConfiguration"
 msgstr "Podešavanje potpisa"
 
 #. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:447
+#: rc.cpp:453
 #, fuzzy, no-c-format
 msgid "Reply to Sender"
 msgstr "&Odgovori pošiljaocu:"
 
 #. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:450
+#: rc.cpp:456
 #, fuzzy, no-c-format
 msgid "Reply to All / Reply to List"
 msgstr "Odgovori &svima..."
 
 #. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:453
+#: rc.cpp:459
 #, fuzzy, no-c-format
 msgid "Forward Message"
 msgstr "Proslijeđena poruka"
 
 #. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:462
+#: rc.cpp:468
 #, fuzzy, no-c-format
 msgid "Warn when trying to send &unsigned messages"
 msgstr "Upozori pri pokušaju slanja &nepotpisanih poruka"
 
 #. 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 ""
 "Uključite ovo ako želite biti upozoreni pri slanju nepotpisanih poruka."
 
 #. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:468
+#: rc.cpp:474
 #, fuzzy, no-c-format
 msgid ""
 "<qt>\n"
@@ -11248,13 +12183,13 @@ msgstr ""
 "</qt>"
 
 #. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:476
+#: rc.cpp:482
 #, fuzzy, no-c-format
 msgid "&Warn when trying to send unencrypted messages"
 msgstr "&Upozori pri pokušaju slanja nekriptiranih poruka"
 
 #. 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 ""
@@ -11262,7 +12197,7 @@ msgstr ""
 "poruka."
 
 #. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:482
+#: rc.cpp:488
 #, fuzzy, no-c-format
 msgid ""
 "<qt>\n"
@@ -11282,20 +12217,20 @@ 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 "Upozori ako primaočeva e-adresa &nije u certifikatu"
 
 #. 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 ""
 "Uključite ovu opciju ako želite biti  upozoreni ako adresa nije u certifikatu"
 
 #. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:496
+#: rc.cpp:502
 #, fuzzy, no-c-format
 msgid ""
 "<qt>\n"
@@ -11315,38 +12250,38 @@ msgstr ""
 "</qt>"
 
 #. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:504
+#: rc.cpp:510
 #, fuzzy, no-c-format
 msgid "Warn if certificates/keys expire soon (configure thresholds below)"
 msgstr "Upozori ako CA certifikat &ističe za manje od"
 
 #. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:507
+#: rc.cpp:513
 #, fuzzy, no-c-format
 msgid "For signing"
 msgstr "Koristi za &potpisivanje"
 
 #. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:510
+#: rc.cpp:516
 #, fuzzy, no-c-format
 msgid "For encryption"
 msgstr "Ši&firiraj"
 
 #. 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 " dana"
 
 #. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:516 rc.cpp:530 rc.cpp:544 rc.cpp:558 rc.cpp:572 rc.cpp:586
+#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
 #, fuzzy, no-c-format
 msgid "Select the number of days here"
 msgstr "Ovdje odaberite broj dana"
 
 #. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:519
+#: rc.cpp:525
 #, fuzzy, no-c-format
 msgid ""
 "<qt>\n"
@@ -11366,7 +12301,7 @@ msgstr ""
 "</qt>"
 
 #. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:533
+#: rc.cpp:539
 #, fuzzy, no-c-format
 msgid ""
 "<qt>\n"
@@ -11386,7 +12321,7 @@ msgstr ""
 "</qt>"
 
 #. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:547
+#: rc.cpp:553
 #, fuzzy, no-c-format
 msgid ""
 "<qt>\n"
@@ -11406,7 +12341,7 @@ msgstr ""
 "</qt>"
 
 #. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:561
+#: rc.cpp:567
 #, fuzzy, no-c-format
 msgid ""
 "<qt>\n"
@@ -11426,7 +12361,7 @@ msgstr ""
 "</qt>"
 
 #. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:575 rc.cpp:589
+#: rc.cpp:581 rc.cpp:595
 #, fuzzy, no-c-format
 msgid ""
 "<qt>\n"
@@ -11446,55 +12381,55 @@ msgstr ""
 "</qt>"
 
 #. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:597
+#: rc.cpp:603
 #, fuzzy, no-c-format
 msgid "For root certificates:"
 msgstr "Pošalji &moj osobni certifikat"
 
 #. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:600
+#: rc.cpp:606
 #, fuzzy, no-c-format
 msgid "For intermediate CA certificates:"
 msgstr "Potražite druge certifikate"
 
 #. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:603
+#: rc.cpp:609
 #, no-c-format
 msgid "For end-user certificates/keys:"
 msgstr ""
 
 #. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:606
+#: rc.cpp:612
 #, no-c-format
 msgid "Re-enable All \"Don't Ask Again\" Warnings"
 msgstr ""
 
 #. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:609
+#: rc.cpp:615
 #, fuzzy, no-c-format
 msgid "Template content"
 msgstr "Sličice mapa"
 
 #. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:612
+#: rc.cpp:618
 #, fuzzy, no-c-format
 msgid "Template shortcut"
 msgstr "&Zamijeni"
 
 #. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:615
+#: rc.cpp:621
 #, fuzzy, no-c-format
 msgid "Template type"
 msgstr "&Zamijeni"
 
-#. 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 ""
 
-#. i18n: file kmail.kcfg line 60
-#: rc.cpp:621
+#. i18n: file kmail.kcfg line 62
+#: rc.cpp:627
 #, no-c-format
 msgid ""
 "<qt>"
@@ -11503,16 +12438,16 @@ msgid ""
 "automatically at all. </p></qt>"
 msgstr ""
 
-#. 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 "
@@ -11521,14 +12456,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 "
@@ -11537,42 +12472,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 ""
 
-#. i18n: file kmail.kcfg line 99
-#: rc.cpp:640
+#. i18n: file kmail.kcfg line 101
+#: rc.cpp:646
 #, no-c-format
 msgid ""
 "Disregard the users umask setting and use \"read-write for the user only\" "
 "instead"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 107
-#: rc.cpp:646
+#. i18n: file kmail.kcfg line 109
+#: rc.cpp:652
 #, fuzzy, no-c-format
 msgid "Policy for showing the system tray icon"
 msgstr "&Uvijek prikazuj sustemska traka"
 
-#. i18n: file kmail.kcfg line 115
-#: rc.cpp:649
+#. i18n: file kmail.kcfg line 117
+#: rc.cpp:655
 #, no-c-format
 msgid ""
 "Close the application when the mainwindow is closed, even if there is a system "
 "tray icon active."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 119
-#: rc.cpp:652
+#. i18n: file kmail.kcfg line 121
+#: rc.cpp:658
 #, fuzzy, no-c-format
 msgid "Verbose new mail notification"
 msgstr "&Obavijest o novim porukama"
 
-#. 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 "
@@ -11580,41 +12515,41 @@ msgid ""
 "simple 'New mail arrived' message."
 msgstr ""
 
-#. 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 "&Navedite uređivač:"
 
-#. 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 "&Koristi vanjski uređivač umjesto sastavljača"
 
-#. 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 ""
 
-#. i18n: file kmail.kcfg line 170
-#: rc.cpp:670
+#. i18n: file kmail.kcfg line 172
+#: rc.cpp:676
 #, fuzzy, no-c-format
 msgid "Mangle From:/To: headers in replies to replies"
 msgstr ""
 "S&tari način rada: Odsjeci „Od:/Za:“ zaglavlja iz odgovora na pozivnice"
 
-#. 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 "
@@ -11622,14 +12557,14 @@ msgid ""
 "with Outlook users not being able to get your replies, try setting this option."
 msgstr ""
 
-#. 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 ""
 
-#. 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 "
@@ -11638,16 +12573,34 @@ msgid ""
 "option."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 182
-#: rc.cpp:682
+#. i18n: file kmail.kcfg line 184
+#: rc.cpp:688
 #, no-c-format
 msgid "Exchange compatible invitations naming"
 msgstr ""
 
-#. 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
+#, no-c-format
+msgid ""
 "When this is checked, you will not see the mail composer window. Instead, all "
 "invitation mails are sent automatically. If you want to see the mail before "
 "sending it, you can uncheck this option. However, be aware that the text in the "
@@ -11655,22 +12608,38 @@ msgid ""
 "hand."
 msgstr ""
 
-#. 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 "
@@ -11679,16 +12648,16 @@ msgid ""
 "IMAP resource; this is done in the Trinity Control Center.</p>"
 msgstr ""
 
-#. 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 "
 "resources. But if you need to see them, you can set that here.</p>"
 msgstr ""
 
-#. 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"
@@ -11699,8 +12668,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. "
@@ -11713,22 +12682,22 @@ msgid ""
 "Kolab server or a compatible solution.</li></ul></p>"
 msgstr ""
 
-#. 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>"
 "<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
 msgstr ""
 
-#. 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 ""
 
-#. 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 "
@@ -11739,103 +12708,91 @@ msgid ""
 "<p>So do not set this unless you have to.</p>"
 msgstr ""
 
-#. 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 "
 "displayed."
 msgstr ""
 
-#. 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 ""
 
-#. 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 "
 "for new mail. By default the number of connections is unlimited (0)."
 msgstr ""
 
-#. 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 ""
 
-#. i18n: file kmail.kcfg line 293
-#: rc.cpp:745
+#. i18n: file kmail.kcfg line 309
+#: rc.cpp:760
 #, no-c-format
 msgid ""
 "This option enables or disables the search line edit above the message list "
 "which can be used to quickly search the information shown in the message list."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 297
-#: rc.cpp:748
-#, no-c-format
-msgid "Show folder quick search line edit"
-msgstr ""
-
-#. 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 ""
 "&Zadrži originalni kod lokalnih znakova kod odgovora ili proslijeđivanja (ako "
 "je moguće)."
 
-#. 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 "&Automatski dodaj potpis"
 
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:766
+#. i18n: file kmail.kcfg line 337
+#: rc.cpp:778
 #, no-c-format
 msgid ""
 "Remember this identity, so that it will be used in future composer windows as "
@@ -11843,30 +12800,53 @@ msgid ""
 "        "
 msgstr ""
 
-#. 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 "
 "windows as well."
 msgstr ""
 
-#. 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 "
 "windows as well."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:776
+#. i18n: file kmail.kcfg line 350
+#: rc.cpp:788
+#, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows as "
+"well.\n"
+"        "
+msgstr ""
+
+#. i18n: file kmail.kcfg line 354
+#: rc.cpp:792
 #, no-c-format
 msgid "Word &wrap at column:"
 msgstr "Prelomi riječ na stupcu:"
 
-#. 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 "Upozori ako koreni certifikat ističe za &manje od"
+
+#. 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 "
@@ -11875,14 +12855,14 @@ msgstr ""
 "Uključite ovu opciju ako želite da Outlook(tm) razume vaše odgovore na "
 "pozivnice"
 
-#. i18n: file kmail.kcfg line 386
-#: rc.cpp:791
+#. i18n: file kmail.kcfg line 416
+#: rc.cpp:816
 #, no-c-format
 msgid "Automatically request &message disposition notifications"
 msgstr "Auto&matski zahtjevaj obavijest o raspoređivanju poruke"
 
-#. i18n: file kmail.kcfg line 387
-#: rc.cpp:794
+#. i18n: file kmail.kcfg line 417
+#: rc.cpp:819
 #, no-c-format
 msgid ""
 "<qt>"
@@ -11893,28 +12873,28 @@ msgid ""
 "<em>Request Disposition Notification</em>.</p></qt>"
 msgstr ""
 
-#. 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 ""
 
-#. 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
 #, fuzzy, no-c-format
 msgid "Autosave interval:"
 msgstr "Pe&riod provjere:"
 
-#. 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 "
@@ -11922,93 +12902,113 @@ msgid ""
 "setting it to the value 0."
 msgstr ""
 
-#. 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 "Promijeni prepoznati prefiks za \"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 "Zamijeni prepoznati prefiks sa \"&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 "&Upotrijebi pametno citiranje"
 
-#. 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 "Potpis je istekao."
+
+#. i18n: file kmail.kcfg line 474
+#: rc.cpp:849
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#. i18n: file kmail.kcfg line 479
+#: rc.cpp:852
 #, no-c-format
 msgid "Type of addressee selector"
 msgstr ""
 
-#. 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
 #, no-c-format
 msgid "Type of recipients editor"
 msgstr ""
 
-#. 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
 #, no-c-format
 msgid "Maximum number of recipient editor lines."
 msgstr ""
 
-#. 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 ""
+"&Zadrži originalni kod lokalnih znakova kod odgovora ili proslijeđivanja (ako "
+"je moguće)."
+
+#. i18n: file kmail.kcfg line 572
+#: rc.cpp:884
 #, no-c-format
 msgid ""
 "Some emails, especially those generated automatically, do not specify the "
@@ -12018,88 +13018,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 "Pohrani poslane poruke u ši&frovanom obliku"
+
+#. 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 "Pokaži sva zaglavlja poruka"
 
-#. 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 "Obavijesti o raspoređivanju poruka"
 
-#. 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 "
@@ -12107,92 +13121,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 "Lista poruka — polje za datum"
 
-#. 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
 #, fuzzy, no-c-format
 msgid "Message template for forward"
 msgstr "Označi trenutnu poruku kao p&roslijeđenu"
 
-#. i18n: file kmail.kcfg line 631
-#: rc.cpp:916
+#. i18n: file kmail.kcfg line 679
+#: rc.cpp:956
 #, fuzzy, no-c-format
 msgid "Quote characters"
 msgstr "Dodaj znake za &citiranje"
 
-#. 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
-#, fuzzy
-msgid "To"
-msgstr "&Za:"
-
-#: recipientseditor.cpp:102
-#, fuzzy
-msgid "CC"
-msgstr "&Kopija"
-
 #: recipientseditor.cpp:104
 #, fuzzy
 msgid "BCC"
@@ -12208,49 +13212,48 @@ msgstr "<primatelji>"
 msgid "Select type of recipient"
 msgstr "<primatelji>"
 
-#: recipientseditor.cpp:181
+#: recipientseditor.cpp:163
+msgid "Set the list of email addresses to receive this message"
+msgstr ""
+
+#: recipientseditor.cpp:183
 #, fuzzy
 msgid "Remove recipient line"
 msgstr "<primatelji>"
 
-#: 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
 #, fuzzy
 msgid "Save List..."
 msgstr "&Napravi filtar"
 
-#: recipientseditor.cpp:772
+#: recipientseditor.cpp:774
 #, fuzzy
 msgid "Save recipients as distribution list"
 msgstr "Opis:"
 
-#: recipientseditor.cpp:774
-#, fuzzy
-msgid "Se&lect..."
-msgstr "Obriši Mapu"
-
-#: recipientseditor.cpp:777
+#: recipientseditor.cpp:779
 #, fuzzy
 msgid "Select recipients from address book"
 msgstr "Dodaj u adresar"
 
-#: recipientseditor.cpp:810
+#: recipientseditor.cpp:812
 #, fuzzy
 msgid "No recipients"
 msgstr "<primatelji>"
 
-#: recipientseditor.cpp:811
+#: recipientseditor.cpp:813
 #, fuzzy, c-format
 msgid ""
 "_n: 1 recipient\n"
@@ -12260,7 +13263,7 @@ msgstr ""
 "%n nepročitane\n"
 "%n nepročitanih"
 
-#: recipientseditor.cpp:914
+#: recipientseditor.cpp:917
 msgid "Truncating recipients list to %1 of %2 entries."
 msgstr ""
 
@@ -12357,11 +13360,11 @@ msgid ""
 "available addresses."
 msgstr ""
 
-#: redirectdialog.cpp:107
+#: redirectdialog.cpp:116
 msgid "You cannot redirect the message without an address."
 msgstr ""
 
-#: redirectdialog.cpp:108
+#: redirectdialog.cpp:117
 #, fuzzy
 msgid "Empty Redirection Address"
 msgstr "Otvori u adresaru"
@@ -12505,39 +13508,39 @@ msgstr "Traži &samo u:"
 msgid "I&nclude sub-folders"
 msgstr "&Uključi podmape"
 
-#: searchwindow.cpp:226
+#: searchwindow.cpp:225
 #, fuzzy
 msgid "Sender/Receiver"
 msgstr "Pošiljatelj/primalac"
 
-#: searchwindow.cpp:249
+#: searchwindow.cpp:250
 #, fuzzy
 msgid "Search folder &name:"
 msgstr "Traži &ime mape:"
 
-#: searchwindow.cpp:259
+#: searchwindow.cpp:260
 #, fuzzy
 msgid "Op&en Search Folder"
 msgstr "Traži u direktorijima"
 
-#: searchwindow.cpp:268
+#: searchwindow.cpp:269
 #, fuzzy
 msgid "Open &Message"
 msgstr "Poru&ka"
 
-#: searchwindow.cpp:274
+#: searchwindow.cpp:275
 msgid "AMiddleLengthText..."
 msgstr "SrednjeDugačkiTekst..."
 
-#: searchwindow.cpp:275
+#: searchwindow.cpp:276
 msgid "Ready."
 msgstr "Spreman."
 
-#: searchwindow.cpp:356
+#: searchwindow.cpp:357
 msgid "Clear Selection"
 msgstr "Pismo popisa direktorija"
 
-#: searchwindow.cpp:415
+#: searchwindow.cpp:416
 #, fuzzy, c-format
 msgid ""
 "_n: %n message searched\n"
@@ -12547,12 +13550,12 @@ msgstr ""
 "obrađene su %n poruke\n"
 "obrađeno je %n poruka"
 
-#: searchwindow.cpp:418
+#: searchwindow.cpp:419
 #, fuzzy
 msgid "Done."
 msgstr "Gotovo"
 
-#: searchwindow.cpp:419
+#: searchwindow.cpp:420
 #, fuzzy
 msgid ""
 "_n: %n match in %1\n"
@@ -12562,12 +13565,12 @@ msgstr ""
 "%n poklapanja (%1)\n"
 "%n poklapanja (%1)"
 
-#: searchwindow.cpp:422
+#: searchwindow.cpp:423
 #, fuzzy
 msgid "Search canceled."
 msgstr "Pretraga je otkazana"
 
-#: searchwindow.cpp:423
+#: searchwindow.cpp:424
 #, fuzzy
 msgid ""
 "_n: %n match so far in %1\n"
@@ -12577,7 +13580,7 @@ msgstr ""
 "Za sada ima %n poklapanja (%1)\n"
 "Za sada ima %n poklapanja (%1)"
 
-#: searchwindow.cpp:427
+#: searchwindow.cpp:428
 #, fuzzy, c-format
 msgid ""
 "_n: %n message\n"
@@ -12587,7 +13590,7 @@ msgstr ""
 "%n poruke, %1.\n"
 "%n poruka, %1."
 
-#: searchwindow.cpp:428
+#: searchwindow.cpp:429
 #, fuzzy, c-format
 msgid ""
 "_n: %n match\n"
@@ -12597,7 +13600,7 @@ msgstr ""
 "%n poklapanja\n"
 "%n poklapanja"
 
-#: searchwindow.cpp:429
+#: searchwindow.cpp:430
 #, fuzzy
 msgid "Searching in %1. %2 searched so far"
 msgstr "Tražim u %1 (poruka %2)"
@@ -12630,42 +13633,42 @@ 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
 #, fuzzy
 msgid ""
 "(Account does not support Sieve)\n"
 "\n"
 msgstr "Ova vrsta računa nije podržana"
 
-#: sievedebugdialog.cpp:266
+#: sievedebugdialog.cpp:278
 #, fuzzy
 msgid ""
 "(Account is not an IMAP account)\n"
 "\n"
 msgstr "Vrsta naloga: POP nalog"
 
-#: 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"
@@ -12673,41 +13676,41 @@ 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 "Nije dostupno"
 
-#: sievedebugdialog.cpp:355
+#: sievedebugdialog.cpp:354
 #, fuzzy
 msgid ""
 "Available Sieve scripts:\n"
 msgstr "Postojeći Filteri"
 
-#: 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."
 msgstr ""
 
-#: 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."
@@ -12792,19 +13795,23 @@ msgstr "&Navedite naredbu:"
 msgid "New entry:"
 msgstr "Nov unos:"
 
-#: simplestringlisteditor.cpp:205
+#: simplestringlisteditor.cpp:214
 msgid "New Value"
 msgstr "Nova vrijednost"
 
-#: simplestringlisteditor.cpp:225
+#: simplestringlisteditor.cpp:235
 msgid "Change Value"
 msgstr "Promijeni vrijednost"
 
-#: snippetdlg.cpp:71
+#: snippetdlg.cpp:78
 #, fuzzy
 msgid "Sh&ortcut:"
 msgstr "&Pokaži:"
 
+#: snippetitem.cpp:133 snippetwidget.cpp:171
+msgid "GROUP"
+msgstr ""
+
 #: snippetwidget.cpp:148
 #, c-format
 msgid "Snippet %1"
@@ -12889,8 +13896,8 @@ msgstr "Postavi kao uob&ičajeno"
 
 #: 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
@@ -12907,39 +13914,44 @@ msgstr ""
 msgid "Do Not Enable"
 msgstr "&Kriptiraj"
 
-#: templateparser.cpp:238 templateparser.cpp:271
+#: templateparser.cpp:263 templateparser.cpp:296
 #, fuzzy
 msgid "Cannot insert content from file %1: %2"
 msgstr ""
 "Ne mogu otvoriti datoteku „%1“:\n"
 "%2"
 
-#: templateparser.cpp:1009 templateparser.cpp:1013
+#: templateparser.cpp:970
+#, fuzzy, c-format
+msgid "Attachment %1"
+msgstr "Prilog: %1"
+
+#: templateparser.cpp:1150 templateparser.cpp:1154
 #, fuzzy
 msgid "Pipe command exit with status %1: %2"
 msgstr ""
 "Prednaredba se završila sa kodom %1:\n"
 "%2"
 
-#: templateparser.cpp:1024 templateparser.cpp:1028
+#: templateparser.cpp:1165 templateparser.cpp:1169
 msgid "Pipe command killed by signal %1: %2"
 msgstr ""
 
-#: templateparser.cpp:1040
+#: templateparser.cpp:1181
 #, fuzzy
 msgid "Pipe command did not finish within %1 seconds: %2"
 msgstr ""
 "Prednaredba se završila sa kodom %1:\n"
 "%2"
 
-#: templateparser.cpp:1052 templateparser.cpp:1055
+#: templateparser.cpp:1193 templateparser.cpp:1196
 #, fuzzy, c-format
 msgid "Cannot write to process stdin: %1"
 msgstr ""
 "Ne mogu pisati u datoteku:\n"
 "%1"
 
-#: templateparser.cpp:1063
+#: templateparser.cpp:1204
 #, c-format
 msgid "Cannot start pipe command from template: %1"
 msgstr ""
@@ -12993,9 +14005,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"
@@ -13004,35 +14016,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"
@@ -13063,178 +14079,182 @@ msgstr "Šifriraj poruku"
 msgid "Message Text as Is"
 msgstr "Popisa poruka"
 
-#: templatesinsertcommand.cpp:62 templatesinsertcommand.cpp:163
+#: templatesinsertcommand.cpp:62 templatesinsertcommand.cpp:166
 #, fuzzy
 msgid "Message Id"
 msgstr "Tijelo poruke"
 
-#: templatesinsertcommand.cpp:70 templatesinsertcommand.cpp:171
+#: templatesinsertcommand.cpp:70 templatesinsertcommand.cpp:174
 msgid "Date in Short Format"
 msgstr ""
 
-#: templatesinsertcommand.cpp:74 templatesinsertcommand.cpp:175
+#: templatesinsertcommand.cpp:74 templatesinsertcommand.cpp:178
 msgid "Date in C Locale"
 msgstr ""
 
-#: templatesinsertcommand.cpp:78 templatesinsertcommand.cpp:179
+#: templatesinsertcommand.cpp:78 templatesinsertcommand.cpp:182
 msgid "Day of Week"
 msgstr ""
 
-#: templatesinsertcommand.cpp:82 templatesinsertcommand.cpp:183
+#: templatesinsertcommand.cpp:82 templatesinsertcommand.cpp:186
 msgid "Time"
 msgstr ""
 
-#: templatesinsertcommand.cpp:86 templatesinsertcommand.cpp:187
+#: templatesinsertcommand.cpp:86 templatesinsertcommand.cpp:190
 msgid "Time in Long Format"
 msgstr ""
 
-#: templatesinsertcommand.cpp:90 templatesinsertcommand.cpp:191
+#: templatesinsertcommand.cpp:90 templatesinsertcommand.cpp:194
 msgid "Time in C Locale"
 msgstr ""
 
-#: templatesinsertcommand.cpp:94 templatesinsertcommand.cpp:195
+#: templatesinsertcommand.cpp:94 templatesinsertcommand.cpp:198
 #, fuzzy
 msgid "To Field Address"
 msgstr "Email adresa:"
 
-#: templatesinsertcommand.cpp:98 templatesinsertcommand.cpp:199
+#: templatesinsertcommand.cpp:98 templatesinsertcommand.cpp:202
 #, fuzzy
 msgid "To Field Name"
 msgstr "&Promijeni ime"
 
-#: templatesinsertcommand.cpp:102 templatesinsertcommand.cpp:203
+#: templatesinsertcommand.cpp:102 templatesinsertcommand.cpp:206
 #, fuzzy
 msgid "To Field First Name"
 msgstr "&Promijeni ime"
 
-#: templatesinsertcommand.cpp:106 templatesinsertcommand.cpp:207
+#: templatesinsertcommand.cpp:106 templatesinsertcommand.cpp:210
 #, fuzzy
 msgid "To Field Last Name"
 msgstr "&Promijeni ime"
 
-#: templatesinsertcommand.cpp:110 templatesinsertcommand.cpp:211
+#: templatesinsertcommand.cpp:110 templatesinsertcommand.cpp:214
 #, fuzzy
 msgid "CC Field Address"
 msgstr "BCC a&drese:"
 
-#: templatesinsertcommand.cpp:114 templatesinsertcommand.cpp:215
+#: templatesinsertcommand.cpp:114 templatesinsertcommand.cpp:218
 #, fuzzy
 msgid "CC Field Name"
 msgstr "&Promijeni ime"
 
-#: templatesinsertcommand.cpp:118 templatesinsertcommand.cpp:219
+#: templatesinsertcommand.cpp:118 templatesinsertcommand.cpp:222
 #, fuzzy
 msgid "CC Field First Name"
 msgstr "&Promijeni ime"
 
-#: templatesinsertcommand.cpp:122 templatesinsertcommand.cpp:223
+#: templatesinsertcommand.cpp:122 templatesinsertcommand.cpp:226
 #, fuzzy
 msgid "CC Field Last Name"
 msgstr "&Promijeni ime"
 
-#: templatesinsertcommand.cpp:126 templatesinsertcommand.cpp:227
+#: templatesinsertcommand.cpp:126 templatesinsertcommand.cpp:230
 #, fuzzy
 msgid "From Field Address"
 msgstr "Email adresa:"
 
-#: templatesinsertcommand.cpp:130 templatesinsertcommand.cpp:231
+#: templatesinsertcommand.cpp:130 templatesinsertcommand.cpp:234
 #, fuzzy
 msgid "From Field Name"
 msgstr "Email adresa:"
 
-#: templatesinsertcommand.cpp:134 templatesinsertcommand.cpp:235
+#: templatesinsertcommand.cpp:134 templatesinsertcommand.cpp:238
 #, fuzzy
 msgid "From Field First Name"
 msgstr "Email adresa:"
 
-#: templatesinsertcommand.cpp:138 templatesinsertcommand.cpp:239
+#: templatesinsertcommand.cpp:138 templatesinsertcommand.cpp:242
 #, fuzzy
 msgid "From Field Last Name"
 msgstr "Email adresa:"
 
-#: templatesinsertcommand.cpp:146
+#: templatesinsertcommand.cpp:142
+msgid "Addresses of all original recipients"
+msgstr ""
+
+#: templatesinsertcommand.cpp:149
 #, fuzzy
 msgid "Quoted Headers"
 msgstr "Dodaj znake za &citiranje"
 
-#: templatesinsertcommand.cpp:150
+#: templatesinsertcommand.cpp:153
 #, fuzzy
 msgid "Headers as Is"
 msgstr "Poš&alji tako kako jeste"
 
-#: templatesinsertcommand.cpp:154 templatesinsertcommand.cpp:247
+#: templatesinsertcommand.cpp:157 templatesinsertcommand.cpp:250
 #, fuzzy
 msgid "Header Content"
 msgstr "Sličice mapa"
 
-#: templatesinsertcommand.cpp:160
+#: templatesinsertcommand.cpp:163
 #, fuzzy
 msgid "Current Message"
 msgstr "Trenutno korištenje"
 
-#: templatesinsertcommand.cpp:253
+#: templatesinsertcommand.cpp:256
 msgid "Process With External Programs"
 msgstr ""
 
-#: templatesinsertcommand.cpp:256
+#: templatesinsertcommand.cpp:259
 #, fuzzy
 msgid "Insert Result of Command"
 msgstr "Umetni &datoteku..."
 
-#: 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
 #, fuzzy
 msgid "Set Cursor Position"
 msgstr "Položaj mape"
 
-#: templatesinsertcommand.cpp:289
+#: templatesinsertcommand.cpp:292
 #, fuzzy
 msgid "Insert File Content"
 msgstr "Umetni datoteku"
 
-#: templatesinsertcommand.cpp:293
+#: templatesinsertcommand.cpp:296
 msgid "DNL"
 msgstr ""
 
-#: templatesinsertcommand.cpp:297
+#: templatesinsertcommand.cpp:300
 #, fuzzy
 msgid "Template Comment"
 msgstr "Sličice mapa"
 
-#: templatesinsertcommand.cpp:301
+#: templatesinsertcommand.cpp:304
 #, fuzzy
 msgid "No Operation"
 msgstr "Potvrde o prijemu"
 
-#: templatesinsertcommand.cpp:305
+#: templatesinsertcommand.cpp:308
 #, fuzzy
 msgid "Clear Generated Message"
 msgstr "Šifriraj poruku"
 
-#: templatesinsertcommand.cpp:309
+#: templatesinsertcommand.cpp:312
 msgid "Turn Debug On"
 msgstr ""
 
-#: templatesinsertcommand.cpp:313
+#: templatesinsertcommand.cpp:316
 msgid "Turn Debug Off"
 msgstr ""
 
@@ -13338,61 +14358,71 @@ msgstr ""
 msgid "There is nothing to undo."
 msgstr "Nema nikakve akcije za poništiti"
 
-#: urlhandlermanager.cpp:422
+#: urlhandlermanager.cpp:482
 #, fuzzy
 msgid "Turn on HTML rendering for this message."
 msgstr "Uključi iscrtavanje HTML-a za ovu poruku."
 
-#: urlhandlermanager.cpp:424
+#: urlhandlermanager.cpp:484
 #, fuzzy
 msgid "Load external references from the Internet for this message."
 msgstr "Dozvoli porukama da učitaju &vanjske reference sa Interneta"
 
-#: urlhandlermanager.cpp:426
+#: urlhandlermanager.cpp:486
 msgid "Work online."
 msgstr ""
 
-#: urlhandlermanager.cpp:428
+#: urlhandlermanager.cpp:488
 #, fuzzy
 msgid "Decrypt message."
 msgstr "Šifriraj poruku"
 
-#: urlhandlermanager.cpp:430
+#: urlhandlermanager.cpp:490
 #, fuzzy
 msgid "Show signature details."
 msgstr "Nije pronađen potpis"
 
-#: urlhandlermanager.cpp:432
+#: urlhandlermanager.cpp:492
 #, fuzzy
 msgid "Hide signature details."
 msgstr "Datoteka s potpisom:."
 
-#: urlhandlermanager.cpp:464
+#: urlhandlermanager.cpp:494
+#, fuzzy
+msgid "Hide attachment list"
+msgstr "Snimi prilog kao"
+
+#: urlhandlermanager.cpp:496
+#, fuzzy
+msgid "Show attachment list"
+msgstr "Pogledaj prilog: "
+
+#: 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 mogu pokrenuti upravite certifikata. Provjerite vašu instalaciju!"
 
-#: urlhandlermanager.cpp:497
+#: urlhandlermanager.cpp:564
 #, fuzzy, c-format
 msgid "Show certificate 0x%1"
 msgstr "Sigurnosne postavke"
 
-#: urlhandlermanager.cpp:552
+#: urlhandlermanager.cpp:693
 msgid "Attachment #%1 (unnamed)"
 msgstr "Prilog: #%1 (bez imena)"
 
-#: 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"
@@ -13416,7 +14446,7 @@ msgstr ""
 "S poštovanjem,\n"
 "-- <ovdje unesite svoje ime i e-adresu>\n"
 
-#: vacation.cpp:606
+#: vacation.cpp:612
 msgid ""
 "Your server did not list \"vacation\" in its list of supported Sieve "
 "extensions;\n"
@@ -13424,11 +14454,11 @@ msgid ""
 "Please contact you system administrator."
 msgstr ""
 
-#: vacation.cpp:616
+#: vacation.cpp:622
 msgid "Configure \"Out of Office\" Replies"
 msgstr "Namještavanje odgovora \"izvan ureda\""
 
-#: vacation.cpp:626
+#: vacation.cpp:632
 #, fuzzy
 msgid ""
 "Someone (probably you) changed the vacation script on the server.\n"
@@ -13440,17 +14470,17 @@ msgstr ""
 "odgovore.\n"
 "Biti će korištene uobičajene vrijednosti."
 
-#: 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 "Z&anemari"
@@ -13463,41 +14493,41 @@ msgstr "Namjesti obavijesti o odmoru da budu poslana:"
 msgid "&Activate vacation notifications"
 msgstr "&Uključi obavijesti o odmoru"
 
-#: vacationdialog.cpp:76
+#: vacationdialog.cpp:78
 #, fuzzy
 msgid "&Resend notification only after:"
 msgstr "&Pošalji ponovo obavijest samo posle:"
 
-#: vacationdialog.cpp:82
+#: vacationdialog.cpp:84
 msgid "&Send responses for these addresses:"
 msgstr "&Pošalji odgovor za ove adrese."
 
-#: vacationdialog.cpp:87
+#: vacationdialog.cpp:89
 #, fuzzy
 msgid "Do not send vacation replies to spam messages"
 msgstr "&Upozori pri pokušaju slanja nekriptiranih poruka"
 
-#: 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 "VCard preglednik"
 
-#: vcardviewer.cpp:42
+#: vcardviewer.cpp:46
 msgid "&Import"
 msgstr "&Uvezi"
 
-#: vcardviewer.cpp:42
+#: vcardviewer.cpp:46
 msgid "&Next Card"
 msgstr "Nova &kartica..."
 
-#: vcardviewer.cpp:42
+#: vcardviewer.cpp:46
 msgid "&Previous Card"
 msgstr "&Prethodna kartica"
 
-#: vcardviewer.cpp:62
+#: vcardviewer.cpp:70
 msgid "Failed to parse vCard."
 msgstr "Nisam uspio obraditi vCard."
 
@@ -13714,7 +14744,7 @@ msgstr "pršut"
 msgid "To Do"
 msgstr "Za: "
 
-#: kmsearchpattern.h:233
+#: kmsearchpattern.h:234
 #, fuzzy
 msgid "Has Attachment"
 msgstr "prilog"
@@ -13723,6 +14753,11 @@ msgstr "prilog"
 msgid "%1 of %2 %3 used"
 msgstr ""
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr ""
+
 #: util.h:208
 #, fuzzy
 msgid ""
@@ -13734,6 +14769,10 @@ msgstr "Fajl sa imenom %1 već postoji. Želite li da ga prebrišete?"
 msgid "Overwrite File?"
 msgstr "Umetni datoteku"
 
+#, fuzzy
+#~ msgid "Retrieving new messages"
+#~ msgstr "Dobavljam nove poruke"
+
 #~ msgid "Op&en"
 #~ msgstr "&Otvori"
 
@@ -14214,9 +15253,6 @@ msgstr "Umetni datoteku"
 #~ msgid "Always"
 #~ msgstr "Uvijek"
 
-#~ msgid "After"
-#~ msgstr "Poslije"
-
 #, fuzzy
 #~ msgid "Warn if CA certificate e&xpires in less than:"
 #~ msgstr "Upozori ako CA certifikat &ističe za manje od"
@@ -14242,10 +15278,6 @@ msgstr "Umetni datoteku"
 #~ msgstr "Upozori ako sert&ifikat za potpisivanje ističe za manje od"
 
 #, fuzzy
-#~ msgid "Warn if root certificate expires in &less than:"
-#~ msgstr "Upozori ako koreni certifikat ističe za &manje od"
-
-#, fuzzy
 #~ msgid "Warn if signer's email address is &not in certificate"
 #~ msgstr "Upozori ako potpisnikova e-adresa &nije u certifikatu"
 
@@ -14356,9 +15388,6 @@ msgstr "Umetni datoteku"
 #~ msgid "&Request..."
 #~ msgstr "&Zahtjevaj..."
 
-#~ msgid "Certificate Wizard"
-#~ msgstr "Čarobnjak za certifikate"
-
 #, fuzzy
 #~ msgid "Your Personal Data"
 #~ msgstr "Vaši osobni podaci"
@@ -14584,10 +15613,6 @@ msgstr "Umetni datoteku"
 #~ msgstr "<qt>Odredišna mapa za korisnički račun <b>%1</b> je obnovljena mapi ulazne pošte.</qt>"
 
 #, fuzzy
-#~ msgid "Please select the tools to be used by KMail"
-#~ msgstr "Označite koje alate želite koristiti od strane KMail-a."
-
-#, fuzzy
 #~ msgid "<p>Here you can get some assistance in setting up KMail's filter rules to use some commonly-known anti-spam tools.</p><p>The wizard can detect those tools on your computer as well as create filter rules to classify messages using these tools and to separate messages classified as spam. The wizard will not take any existing filter rules into consideration: it will always append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen during the scan of the messages for spam, you may encounter problems with the responsiveness of KMail because anti-spam tool operations are usually time consuming; please consider deleting the filter rules created by the wizard to get back to the former behavior."
 #~ msgstr "<p>Ovdje vam je pružena podrška pri postavljanju KMail-ovih filter pravila za upotrebu nekih poznatijih alata protiv neželjene pošte (spam). </p><p> Čarobnjak može detektirati instalirane alate na računalu kao što može i kreirati filter pravila kako bi raspoznao i odvojio neželjenu poštu. Čarobnjak neće razmatrati već definirana pravila već će dodati nova.</p>"
 
@@ -14601,9 +15626,6 @@ msgstr "Umetni datoteku"
 #~ msgid "Let the anti-spam tools classify your messages. The wizard will create appropriate filters. The messages are usually marked by the tools so that following filters can react on this and, for example, move spam messages to a special folder."
 #~ msgstr "Neka alati protiv neželjene pošte (spam) klasificiraju vaše poruke. Čarobnjak će stvoriti odgovarajuće filtere. Poruke će obično biti označene tako da sljedeći filteri mogu na njih reagirati i, npr., maknuti neželjenu poruku u posebnu mapu."
 
-#~ msgid "Move detected spam messages to the selected folder"
-#~ msgstr "Premjesti pronađene neželjene poruke u odabranu mapu"
-
 #, fuzzy
 #~ msgid "Target folder for spam:"
 #~ msgstr "Traži &ime mape:"
@@ -14817,9 +15839,6 @@ msgstr "Umetni datoteku"
 #~ "%n poruke, %1.\n"
 #~ "%n poruka, %1."
 
-#~ msgid "To:"
-#~ msgstr "Za:"
-
 #~ msgid "&Queue"
 #~ msgstr "&Niz"
 
@@ -15114,9 +16133,6 @@ msgstr "Umetni datoteku"
 #~ msgid "Sign all parts of this message?"
 #~ msgstr "Da potpišem sve dijelove ove poruke?"
 
-#~ msgid "Encrypt all parts of this message?"
-#~ msgstr "Kriptirati sve dijelove poruke?"
-
 #~ msgid "Encryption Warning"
 #~ msgstr "Upozorenje o kriptiranju"
 
@@ -15318,13 +16334,6 @@ msgstr "Umetni datoteku"
 #~ "Da ipak nastavim ?"
 
 #~ msgid ""
-#~ "Could not open file for writing:\n"
-#~ "%1"
-#~ msgstr ""
-#~ "Ne mogu otvoriti datoteku za pisanje:\n"
-#~ "%1"
-
-#~ msgid ""
 #~ "Error while writing file:\n"
 #~ "%1"
 #~ msgstr ""
@@ -15344,10 +16353,6 @@ msgstr "Umetni datoteku"
 #~ msgid "&Expire old messages"
 #~ msgstr "&Izbaci stare poruke"
 
-#, fuzzy
-#~ msgid "Error while uploading messages to the server."
-#~ msgstr "Greška prilikom slanja poruke"
-
 #~ msgid "Expiring old messages..."
 #~ msgstr "Izbacujem stare poruke..."