talons

commit c3972c4f02a4514efd54f8a0f82ac80fd3ce31e5
parent 978206196e39b1b7460af7d87a05cefcbc580018
Author: Paul <paul@claws-mail.org>
Date:   Mon, 27 Mar 2017 16:06:11 +0100

update Czech and Slovak translations

Diffstat:
M
po/cs.po
 | 
4405
+++++++++++++++++++++++++++++++++++++++++--------------------------------------
M
po/sk.po
 | 
4753
++++++++++++++++++++++++++++++++++++++++---------------------------------------

2 files changed, 4712 insertions(+), 4446 deletions(-)
diff --git a/po/cs.po b/po/cs.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Claws Mail 3.10.0\n"
 "Report-Msgid-Bugs-To: paul@claws-mail.org\n"
-"POT-Creation-Date: 2016-11-06 10:47+0000\n"
-"PO-Revision-Date: 2016-10-30 21:41+0100\n"
+"POT-Creation-Date: 2017-03-27 16:04+0100\n"
+"PO-Revision-Date: 2017-03-26 14:59+0200\n"
 "Last-Translator: David Vachulka <david@konstrukce-cad.com>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "Language: cs\n"
@@ -59,67 +59,67 @@ msgstr ""
 msgid "Copy of %s"
 msgstr "Kopie %s"
 
-#: src/account.c:1075
+#: src/account.c:1096
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Opravdu chcete odstranit účet '%s'?"
 
-#: src/account.c:1077
+#: src/account.c:1098
 msgid "(Untitled)"
 msgstr "(Nepojmenovaný)"
 
-#: src/account.c:1078
+#: src/account.c:1099
 msgid "Delete account"
 msgstr "Odstranit účet"
 
-#: src/account.c:1562
+#: src/account.c:1589
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "P"
 
-#: src/account.c:1568
+#: src/account.c:1595
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr ""
 "Funkce 'Přijmout poštu ze všech účtů' načte zprávy z účtů označených "
 "zaškrtnutím"
 
-#: src/account.c:1575 src/addrduplicates.c:471 src/addressadd.c:215
-#: src/addressbook.c:125 src/compose.c:7205 src/editaddress.c:1264
+#: src/account.c:1602 src/addrduplicates.c:471 src/addressadd.c:215
+#: src/addressbook.c:125 src/compose.c:7333 src/editaddress.c:1264
 #: src/editaddress.c:1321 src/editaddress.c:1341
 #: src/editaddress_other_attributes_ldap.c:302
 #: src/editaddress_other_attributes_ldap.c:350 src/editbook.c:170
 #: src/editgroup.c:288 src/editjpilot.c:257 src/editldap.c:428
 #: src/editvcard.c:173 src/importmutt.c:222 src/importpine.c:221
 #: src/mimeview.c:274 src/plugins/managesieve/sieve_manager.c:465
-#: src/plugins/pdf_viewer/poppler_viewer.c:1800
+#: src/plugins/pdf_viewer/poppler_viewer.c:1792
 #: src/plugins/pgpcore/select-keys.c:395 src/prefs_filtering.c:384
-#: src/prefs_filtering.c:1866 src/prefs_template.c:79
+#: src/prefs_filtering.c:1868 src/prefs_template.c:79
 msgid "Name"
 msgstr "Jméno"
 
-#: src/account.c:1583 src/prefs_account.c:1096 src/prefs_account.c:4141
+#: src/account.c:1610 src/prefs_account.c:1096 src/prefs_account.c:4141
 msgid "Protocol"
 msgstr "Protokol"
 
-#: src/account.c:1591 src/ssl_manager.c:100
+#: src/account.c:1618 src/ssl_manager.c:100
 msgid "Server"
 msgstr "Server"
 
-#: src/action.c:382
+#: src/action.c:380
 #, c-format
 msgid "Could not get message file %d"
 msgstr "Nelze načíst soubor %d se zprávou"
 
-#: src/action.c:419
+#: src/action.c:418
 msgid "Could not get message part."
 msgstr "Nelze načíst část zprávy."
 
-#: src/action.c:436
+#: src/action.c:435
 #, c-format
 msgid "Can't get part of multipart message: %s"
 msgstr "Nemohu získat část ze zprávy o více částech: %s"
 
-#: src/action.c:608
+#: src/action.c:607
 #, c-format
 msgid ""
 "The selected action cannot be used in the compose window\n"
@@ -128,11 +128,11 @@ msgstr ""
 "V okně pro psaní zprávy nelze použít akci,\n"
 "která obsahuje %%f, %%F, %%as nebo %%p."
 
-#: src/action.c:720
+#: src/action.c:719
 msgid "There is no filtering action set"
 msgstr "Není nastavena žádná akce filtrování"
 
-#: src/action.c:722
+#: src/action.c:721
 #, c-format
 msgid ""
 "Invalid filtering action(s):\n"
@@ -141,7 +141,7 @@ msgstr ""
 "Neplatná(é) filtrovací akce:\n"
 "%s"
 
-#: src/action.c:987
+#: src/action.c:986
 #, c-format
 msgid ""
 "Could not fork to execute the following command:\n"
@@ -152,34 +152,34 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:989 src/ldaputil.c:323 src/plugins/bogofilter/bogofilter.c:884
-#: src/plugins/tnef_parse/tnef_parse.c:67
-#: src/plugins/vcalendar/vcal_folder.c:1821
-#: src/plugins/vcalendar/vcal_folder.c:1825
-#: src/plugins/vcalendar/vcal_folder.c:1836
-#: src/plugins/vcalendar/vcal_folder.c:1839 src/privacy.c:62
+#: src/action.c:988 src/ldaputil.c:323 src/plugins/bogofilter/bogofilter.c:857
+#: src/plugins/tnef_parse/tnef_parse.c:75
+#: src/plugins/vcalendar/vcal_folder.c:1827
+#: src/plugins/vcalendar/vcal_folder.c:1831
+#: src/plugins/vcalendar/vcal_folder.c:1844
+#: src/plugins/vcalendar/vcal_folder.c:1847 src/privacy.c:62
 msgid "Unknown error"
 msgstr "Neznámá chyba"
 
-#: src/action.c:1207 src/action.c:1372
+#: src/action.c:1206 src/action.c:1371
 msgid "Completed"
 msgstr "Dokončeno"
 
-#: src/action.c:1243
+#: src/action.c:1242
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- Spuštěno: %s\n"
 
-#: src/action.c:1247
+#: src/action.c:1246
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Ukončeno: %s\n"
 
-#: src/action.c:1280
+#: src/action.c:1279
 msgid "Action's input/output"
 msgstr "Vstup/výstup akce"
 
-#: src/action.c:1608
+#: src/action.c:1607
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -190,11 +190,11 @@ msgstr ""
 "('%%h' bude nahrazeno parametrem)\n"
 "  %s"
 
-#: src/action.c:1613
+#: src/action.c:1612
 msgid "Action's hidden user argument"
 msgstr "Skrytý uživatelský parametr akce"
 
-#: src/action.c:1617
+#: src/action.c:1616
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -205,7 +205,7 @@ msgstr ""
 "('%%u' bude nahrazeno parametrem)\n"
 "  %s"
 
-#: src/action.c:1622
+#: src/action.c:1621
 msgid "Action's user argument"
 msgstr "Uživatelský parametr akce"
 
@@ -296,13 +296,13 @@ msgstr ""
 
 #: src/addrcustomattr.c:212 src/addressbook.c:438 src/addressbook.c:466
 #: src/addressbook.c:483 src/edittags.c:272
-#: src/plugins/archive/archiver_gtk.c:1186 src/prefs_actions.c:1090
-#: src/prefs_filtering.c:1693 src/prefs_template.c:1119
+#: src/plugins/archive/archiver_gtk.c:1307 src/prefs_actions.c:1084
+#: src/prefs_filtering.c:1695 src/prefs_template.c:1109
 msgid "_Delete"
 msgstr "_Odstranit"
 
-#: src/addrcustomattr.c:213 src/edittags.c:273 src/prefs_actions.c:1091
-#: src/prefs_filtering.c:1694 src/prefs_template.c:1120
+#: src/addrcustomattr.c:213 src/edittags.c:273 src/prefs_actions.c:1085
+#: src/prefs_filtering.c:1696 src/prefs_template.c:1110
 msgid "Delete _all"
 msgstr "Odstranit _vše"
 
@@ -357,7 +357,7 @@ msgid "Duplicate email addresses"
 msgstr "Duplikovat emailovou adresu(y)"
 
 #: src/addrduplicates.c:442 src/addressadd.c:227
-#: src/plugins/pgpcore/select-keys.c:396 src/toolbar.c:434
+#: src/plugins/pgpcore/select-keys.c:396 src/toolbar.c:526
 msgid "Address"
 msgstr "Adresa"
 
@@ -417,17 +417,17 @@ msgid "_Book"
 msgstr "_Kniha"
 
 #: src/addressbook.c:406 src/addressbook.c:437 src/addressbook.c:465
-#: src/addressbook.c:482 src/compose.c:586 src/mainwindow.c:512
+#: src/addressbook.c:482 src/compose.c:602 src/mainwindow.c:514
 #: src/messageview.c:209 src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
 msgstr "Ú_pravy"
 
-#: src/addressbook.c:407 src/compose.c:591 src/mainwindow.c:515
+#: src/addressbook.c:407 src/compose.c:607 src/mainwindow.c:517
 #: src/messageview.c:212
 msgid "_Tools"
 msgstr "_Nástroje"
 
-#: src/addressbook.c:408 src/compose.c:592 src/mainwindow.c:517
+#: src/addressbook.c:408 src/compose.c:608 src/mainwindow.c:519
 #: src/messageview.c:213
 msgid "_Help"
 msgstr "Nápo_věda"
@@ -460,14 +460,14 @@ msgstr "Up_ravit knihu"
 msgid "_Delete book"
 msgstr "_Odstranit knihu"
 
-#: src/addressbook.c:427 src/compose.c:603
+#: src/addressbook.c:427 src/compose.c:619
 #: src/plugins/managesieve/sieve_editor.c:85
 #: src/plugins/managesieve/sieve_editor.c:433
 #: src/plugins/managesieve/sieve_editor.c:631
 msgid "_Save"
 msgstr "_Uložit"
 
-#: src/addressbook.c:428 src/compose.c:607 src/messageview.c:222
+#: src/addressbook.c:428 src/compose.c:623 src/messageview.c:222
 #: src/plugins/managesieve/sieve_editor.c:88
 #: src/plugins/managesieve/sieve_editor.c:629
 msgid "_Close"
@@ -482,13 +482,13 @@ msgid "C_ut"
 msgstr "_Vyjmout"
 
 #: src/addressbook.c:434 src/addressbook.c:473 src/addressbook.c:489
-#: src/compose.c:615 src/mainwindow.c:546 src/messageview.c:225
+#: src/compose.c:631 src/mainwindow.c:548 src/messageview.c:225
 #: src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr "_Kopírovat"
 
 #: src/addressbook.c:435 src/addressbook.c:474 src/addressbook.c:490
-#: src/compose.c:616 src/plugins/managesieve/sieve_editor.c:97
+#: src/compose.c:632 src/plugins/managesieve/sieve_editor.c:97
 msgid "_Paste"
 msgstr "V_ložit"
 
@@ -532,8 +532,8 @@ msgstr "Najít duplikované..."
 msgid "Edit custom attributes..."
 msgstr "Upravit uživatelské atributy..."
 
-#: src/addressbook.c:458 src/compose.c:695 src/mainwindow.c:813
-#: src/messageview.c:338
+#: src/addressbook.c:458 src/compose.c:709 src/mainwindow.c:815
+#: src/messageview.c:337
 msgid "_About"
 msgstr "_O programu"
 
@@ -544,8 +544,8 @@ msgstr "_Prohlížet záznam"
 #: src/addressbook.c:507 src/crash.c:456 src/crash.c:475 src/importldif.c:114
 #: src/plugins/pgpcore/select-keys.c:250 src/plugins/pgpcore/sgpgme.c:143
 #: src/plugins/pgpcore/sgpgme.c:171 src/plugins/vcalendar/day-view.c:402
-#: src/plugins/vcalendar/month-view.c:428 src/prefs_themes.c:682
-#: src/prefs_themes.c:714 src/prefs_themes.c:715
+#: src/plugins/vcalendar/month-view.c:428 src/prefs_themes.c:782
+#: src/prefs_themes.c:814 src/prefs_themes.c:815
 msgid "Unknown"
 msgstr "Neznámá(ý)"
 
@@ -650,7 +650,7 @@ msgid "Sources"
 msgstr "Zdroje adres"
 
 #: src/addressbook.c:917 src/prefs_matcher.c:632 src/prefs_other.c:492
-#: src/toolbar.c:225 src/toolbar.c:2142
+#: src/toolbar.c:268 src/toolbar.c:2441
 msgid "Address book"
 msgstr "Kniha adres"
 
@@ -684,8 +684,8 @@ msgid "Do you want to delete the query results and addresses in '%s'?"
 msgstr "Opravdu chcete odstranit výsledky vyhledávání a adresy v '%s'?"
 
 #: src/addressbook.c:2916 src/addressbook.c:2942 src/addressbook.c:2949
-#: src/plugins/archive/archiver_prefs.c:329 src/prefs_filtering_action.c:177
-#: src/toolbar.c:415
+#: src/plugins/archive/archiver_prefs.c:431 src/prefs_filtering_action.c:177
+#: src/toolbar.c:494
 msgid "Delete"
 msgstr "Odstranit"
 
@@ -698,7 +698,7 @@ msgstr ""
 "Chcete odstranit '%s'? Pokud odstraníte pouze složku, adresy v ní obsažené "
 "budou přesunuty do nadřazené složky."
 
-#: src/addressbook.c:2928 src/imap_gtk.c:360 src/mh_gtk.c:206
+#: src/addressbook.c:2928 src/imap_gtk.c:370 src/mh_gtk.c:206
 #: src/plugins/mailmbox/plugin_gtk.c:332 src/plugins/rssyl/rssyl_cb_menu.c:155
 msgid "Delete folder"
 msgstr "Odstranit složku"
@@ -810,8 +810,8 @@ msgstr "Kniha adres"
 msgid "Person"
 msgstr "Osoba"
 
-#: src/addressbook.c:4958 src/exporthtml.c:884 src/folderview.c:348
-#: src/folderview.c:436 src/prefs_account.c:2799 src/prefs_folder_column.c:78
+#: src/addressbook.c:4958 src/exporthtml.c:884 src/folderview.c:355
+#: src/folderview.c:443 src/prefs_account.c:2799 src/prefs_folder_column.c:78
 msgid "Folder"
 msgstr "Složka"
 
@@ -844,12 +844,12 @@ msgstr "Kniha adres"
 #: src/plugins/bsfilter/bsfilter_gtk.c:266
 #: src/plugins/bsfilter/bsfilter_gtk.c:326
 #: src/plugins/spamassassin/spamassassin.c:117
-#: src/plugins/spamassassin/spamassassin_gtk.c:442
-#: src/plugins/spamassassin/spamassassin_gtk.c:489
-#: src/plugins/spamassassin/spamassassin_gtk.c:612 src/prefs_matcher.c:675
-#: src/prefs_matcher.c:710 src/prefs_matcher.c:1618 src/prefs_matcher.c:1625
-#: src/prefs_matcher.c:1633 src/prefs_matcher.c:1635 src/prefs_matcher.c:2519
-#: src/prefs_matcher.c:2523
+#: src/plugins/spamassassin/spamassassin_gtk.c:443
+#: src/plugins/spamassassin/spamassassin_gtk.c:490
+#: src/plugins/spamassassin/spamassassin_gtk.c:613 src/prefs_matcher.c:675
+#: src/prefs_matcher.c:710 src/prefs_matcher.c:1619 src/prefs_matcher.c:1626
+#: src/prefs_matcher.c:1634 src/prefs_matcher.c:1636 src/prefs_matcher.c:2520
+#: src/prefs_matcher.c:2524
 msgid "Any"
 msgstr "Kterákoliv"
 
@@ -903,7 +903,7 @@ msgstr "Zpracovat tato pole z hlavičky zprávy"
 msgid "Include subfolders"
 msgstr "Zahrnout podsložky"
 
-#: src/addrgather.c:450 src/prefs_filtering_action.c:1425
+#: src/addrgather.c:450 src/prefs_filtering_action.c:1426
 msgid "Header Name"
 msgstr "Záhlaví"
 
@@ -952,18 +952,18 @@ msgstr "Aktualizace adres"
 msgid "Update failed. Changes not written to Directory."
 msgstr "Aktualizace selhala. Změny do slovníku nebyly zapsány. "
 
-#: src/alertpanel.c:146 src/compose.c:9454
+#: src/alertpanel.c:146 src/compose.c:9624
 msgid "Notice"
 msgstr "Poznámka"
 
-#: src/alertpanel.c:159 src/compose.c:5689 src/compose.c:6212
-#: src/compose.c:11905 src/file_checker.c:78 src/file_checker.c:100
-#: src/messageview.c:854 src/messageview.c:867 src/plugins/pgpcore/sgpgme.c:788
-#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:4851
+#: src/alertpanel.c:159 src/compose.c:5780 src/compose.c:6301
+#: src/compose.c:12047 src/file_checker.c:78 src/file_checker.c:100
+#: src/messageview.c:855 src/messageview.c:882 src/plugins/pgpcore/sgpgme.c:788
+#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:4895
 msgid "Warning"
 msgstr "Varování"
 
-#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5630 src/inc.c:663
+#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5717 src/inc.c:663
 #: src/plugins/pgpcore/sgpgme.c:155 src/plugins/pgpcore/sgpgme.c:314
 msgid "Error"
 msgstr "Chyba"
@@ -1082,7 +1082,7 @@ msgstr "Vaše verze Claws Mail je příliš stará na použití s modulem '%s'."
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "Vaše verze Claws Mail je příliš stará na použití s tímto modulem."
 
-#: src/common/session.c:183 src/imap.c:1210
+#: src/common/session.c:183 src/imap.c:1207
 msgid "SSL/TLS handshake failed\n"
 msgstr "Inicializace SSL/TLS spojení selhala\n"
 
@@ -1115,30 +1115,30 @@ msgstr "Zpráva je příliš velká (maximální velikost je %s)\n"
 msgid "couldn't start STARTTLS session\n"
 msgstr "nelze spustit STARTTLS relaci\n"
 
-#: src/common/socket.c:569
+#: src/common/socket.c:571
 msgid "Socket IO timeout.\n"
 msgstr "Časový limit pro V/V operace se socketem.\n"
 
-#: src/common/socket.c:598
+#: src/common/socket.c:600
 msgid "Connection timed out.\n"
 msgstr "Časový limit připojení vypršel.\n"
 
-#: src/common/socket.c:732
+#: src/common/socket.c:734
 #, c-format
 msgid "%s:%d: connection failed (%s).\n"
 msgstr "%s:%d: spojení selhalo (%s).\n"
 
-#: src/common/socket.c:972
+#: src/common/socket.c:974
 #, c-format
 msgid "%s:%d: unknown host.\n"
 msgstr "%s:%d: neznámý hostitel.\n"
 
-#: src/common/socket.c:1064
+#: src/common/socket.c:1066
 #, c-format
 msgid "%s:%s: host lookup failed (%s).\n"
 msgstr "%s:%s: hledání hostitele selhalo (%s).\n"
 
-#: src/common/socket.c:1368
+#: src/common/socket.c:1370
 #, c-format
 msgid "write on fd%d: %s\n"
 msgstr "zápis do fd%d: %s\n"
@@ -1228,647 +1228,647 @@ msgstr "<not in certificate>"
 msgid "(Subject cleared by RegExp)"
 msgstr "(Předmět odstraněn reg. výrazem)"
 
-#: src/common/utils.c:259
+#: src/common/utils.c:256
 #, c-format
 msgid "%dB"
 msgstr "%dB"
 
-#: src/common/utils.c:260
+#: src/common/utils.c:257
 #, c-format
 msgid "%d.%02dKB"
 msgstr "%d.%02dKB"
 
-#: src/common/utils.c:261
+#: src/common/utils.c:258
 #, c-format
 msgid "%d.%02dMB"
 msgstr "%d.%02dMB"
 
-#: src/common/utils.c:262
+#: src/common/utils.c:259
 #, c-format
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: src/common/utils.c:4764
+#: src/common/utils.c:4759
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "Neděle"
 
-#: src/common/utils.c:4765
+#: src/common/utils.c:4760
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "Pondělí"
 
-#: src/common/utils.c:4766
+#: src/common/utils.c:4761
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "Úterý"
 
-#: src/common/utils.c:4767
+#: src/common/utils.c:4762
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "Středa"
 
-#: src/common/utils.c:4768
+#: src/common/utils.c:4763
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "Čtvrtek"
 
-#: src/common/utils.c:4769
+#: src/common/utils.c:4764
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "Pátek"
 
-#: src/common/utils.c:4770
+#: src/common/utils.c:4765
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "Sobota"
 
-#: src/common/utils.c:4772
+#: src/common/utils.c:4767
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "Leden"
 
-#: src/common/utils.c:4773
+#: src/common/utils.c:4768
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "Únor"
 
-#: src/common/utils.c:4774
+#: src/common/utils.c:4769
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "Březen"
 
-#: src/common/utils.c:4775
+#: src/common/utils.c:4770
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "Duben"
 
-#: src/common/utils.c:4776
+#: src/common/utils.c:4771
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "Květen"
 
-#: src/common/utils.c:4777
+#: src/common/utils.c:4772
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "Červen"
 
-#: src/common/utils.c:4778
+#: src/common/utils.c:4773
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "Červenec"
 
-#: src/common/utils.c:4779
+#: src/common/utils.c:4774
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "Srpen"
 
-#: src/common/utils.c:4780
+#: src/common/utils.c:4775
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "Září"
 
-#: src/common/utils.c:4781
+#: src/common/utils.c:4776
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "Říjen"
 
-#: src/common/utils.c:4782
+#: src/common/utils.c:4777
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "Listopad"
 
-#: src/common/utils.c:4783
+#: src/common/utils.c:4778
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "Prosinec"
 
-#: src/common/utils.c:4785
+#: src/common/utils.c:4780
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "ne"
 
-#: src/common/utils.c:4786
+#: src/common/utils.c:4781
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "po"
 
-#: src/common/utils.c:4787
+#: src/common/utils.c:4782
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "út"
 
-#: src/common/utils.c:4788
+#: src/common/utils.c:4783
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "st"
 
-#: src/common/utils.c:4789
+#: src/common/utils.c:4784
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "čt"
 
-#: src/common/utils.c:4790
+#: src/common/utils.c:4785
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "pá"
 
-#: src/common/utils.c:4791
+#: src/common/utils.c:4786
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "so"
 
-#: src/common/utils.c:4793
+#: src/common/utils.c:4788
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "led"
 
-#: src/common/utils.c:4794
+#: src/common/utils.c:4789
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "úno"
 
-#: src/common/utils.c:4795
+#: src/common/utils.c:4790
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "bře"
 
-#: src/common/utils.c:4796
+#: src/common/utils.c:4791
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "dub"
 
-#: src/common/utils.c:4797
+#: src/common/utils.c:4792
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "kvě"
 
-#: src/common/utils.c:4798
+#: src/common/utils.c:4793
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "čen"
 
-#: src/common/utils.c:4799
+#: src/common/utils.c:4794
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "čvc"
 
-#: src/common/utils.c:4800
+#: src/common/utils.c:4795
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "srp"
 
-#: src/common/utils.c:4801
+#: src/common/utils.c:4796
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "zář"
 
-#: src/common/utils.c:4802
+#: src/common/utils.c:4797
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "říj"
 
-#: src/common/utils.c:4803
+#: src/common/utils.c:4798
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "lis"
 
-#: src/common/utils.c:4804
+#: src/common/utils.c:4799
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "pro"
 
-#: src/common/utils.c:4815
+#: src/common/utils.c:4810
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "DOP."
 
-#: src/common/utils.c:4816
+#: src/common/utils.c:4811
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "ODP."
 
-#: src/common/utils.c:4817
+#: src/common/utils.c:4812
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "dop."
 
-#: src/common/utils.c:4818
+#: src/common/utils.c:4813
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "odp."
 
-#: src/compose.c:575
+#: src/compose.c:591
 msgid "_Add..."
 msgstr "_Přidat..."
 
-#: src/compose.c:576 src/mh_gtk.c:367 src/plugins/mailmbox/plugin_gtk.c:301
+#: src/compose.c:592 src/mh_gtk.c:377 src/plugins/mailmbox/plugin_gtk.c:301
 #: src/plugins/rssyl/rssyl_cb_menu.c:316
 msgid "_Remove"
 msgstr "_Odstranit"
 
-#: src/compose.c:578 src/folderview.c:247
+#: src/compose.c:594 src/folderview.c:254
 msgid "_Properties..."
 msgstr "_Vlastnosti..."
 
-#: src/compose.c:585 src/mainwindow.c:514 src/messageview.c:211
+#: src/compose.c:601 src/mainwindow.c:516 src/messageview.c:211
 msgid "_Message"
 msgstr "_Zpráva"
 
-#: src/compose.c:588
+#: src/compose.c:604
 msgid "_Spelling"
 msgstr "_Pravopis"
 
-#: src/compose.c:590 src/compose.c:657
+#: src/compose.c:606 src/compose.c:673
 msgid "_Options"
 msgstr "Nastav_ení"
 
-#: src/compose.c:594
+#: src/compose.c:610
 msgid "S_end"
 msgstr "_Odeslat"
 
-#: src/compose.c:595
+#: src/compose.c:611
 msgid "Send _later"
 msgstr "Poslat _později"
 
-#: src/compose.c:598
+#: src/compose.c:614
 msgid "_Attach file"
 msgstr "Připojit _soubor"
 
-#: src/compose.c:599
+#: src/compose.c:615
 msgid "_Insert file"
 msgstr "_Vložit soubor"
 
-#: src/compose.c:600
+#: src/compose.c:616
 msgid "Insert si_gnature"
 msgstr "Vložit p_odpis"
 
-#: src/compose.c:601
+#: src/compose.c:617
 msgid "_Replace signature"
 msgstr "Na_hradit podpis"
 
-#: src/compose.c:605
+#: src/compose.c:621
 msgid "_Print"
 msgstr "_Tisk"
 
-#: src/compose.c:610 src/plugins/managesieve/sieve_editor.c:91
+#: src/compose.c:626 src/plugins/managesieve/sieve_editor.c:91
 msgid "_Undo"
 msgstr "_Zpět"
 
-#: src/compose.c:611 src/plugins/managesieve/sieve_editor.c:92
+#: src/compose.c:627 src/plugins/managesieve/sieve_editor.c:92
 msgid "_Redo"
 msgstr "Z_novu"
 
-#: src/compose.c:614 src/plugins/managesieve/sieve_editor.c:95
+#: src/compose.c:630 src/plugins/managesieve/sieve_editor.c:95
 msgid "Cu_t"
 msgstr "_Vyjmout"
 
-#: src/compose.c:618
+#: src/compose.c:634
 msgid "_Special paste"
 msgstr "_Vložit jinak"
 
-#: src/compose.c:619
+#: src/compose.c:635
 msgid "As _quotation"
 msgstr "Jako _citaci"
 
-#: src/compose.c:620
+#: src/compose.c:636
 msgid "_Wrapped"
 msgstr "_Zalomené"
 
-#: src/compose.c:621
+#: src/compose.c:637
 msgid "_Unwrapped"
 msgstr "_Nezalomené"
 
-#: src/compose.c:623 src/mainwindow.c:547
+#: src/compose.c:639 src/mainwindow.c:549
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "Vybrat vš_e"
 
-#: src/compose.c:625
+#: src/compose.c:641
 msgid "A_dvanced"
 msgstr "Po_kročilé"
 
-#: src/compose.c:626
+#: src/compose.c:642
 msgid "Move a character backward"
 msgstr "Přesun o znak zpět"
 
-#: src/compose.c:627
+#: src/compose.c:643
 msgid "Move a character forward"
 msgstr "Přesun o znak dále"
 
-#: src/compose.c:628
+#: src/compose.c:644
 msgid "Move a word backward"
 msgstr "Přesun o slovo zpět"
 
-#: src/compose.c:629
+#: src/compose.c:645
 msgid "Move a word forward"
 msgstr "Přesun o slovo dále"
 
-#: src/compose.c:630
+#: src/compose.c:646
 msgid "Move to beginning of line"
 msgstr "Přesun na začátek řádku"
 
-#: src/compose.c:631
+#: src/compose.c:647
 msgid "Move to end of line"
 msgstr "Přesun na konec řádku"
 
-#: src/compose.c:632
+#: src/compose.c:648
 msgid "Move to previous line"
 msgstr "Přesun na předchozí řádek"
 
-#: src/compose.c:633
+#: src/compose.c:649
 msgid "Move to next line"
 msgstr "Přesun na další řádek"
 
-#: src/compose.c:634
+#: src/compose.c:650
 msgid "Delete a character backward"
 msgstr "Smazat znak zpět"
 
-#: src/compose.c:635
+#: src/compose.c:651
 msgid "Delete a character forward"
 msgstr "Smazat znak vpřed"
 
-#: src/compose.c:636
+#: src/compose.c:652
 msgid "Delete a word backward"
 msgstr "Smazat slovo zpět"
 
-#: src/compose.c:637
+#: src/compose.c:653
 msgid "Delete a word forward"
 msgstr "Smazat slovo vpřed"
 
-#: src/compose.c:638
+#: src/compose.c:654
 msgid "Delete line"
 msgstr "Smazat řádek"
 
-#: src/compose.c:639
+#: src/compose.c:655
 msgid "Delete to end of line"
 msgstr "Smazat do konce řádku"
 
-#: src/compose.c:642 src/messageview.c:228
+#: src/compose.c:658 src/messageview.c:228
 #: src/plugins/managesieve/sieve_editor.c:102
 msgid "_Find"
 msgstr "_Najít"
 
-#: src/compose.c:645
+#: src/compose.c:661
 msgid "_Wrap current paragraph"
 msgstr "_Zalomit aktuální odstavec"
 
-#: src/compose.c:646
+#: src/compose.c:662
 msgid "Wrap all long _lines"
 msgstr "Zalomit všechny _dlouhé řádky"
 
-#: src/compose.c:648
+#: src/compose.c:664
 msgid "Edit with e_xternal editor"
 msgstr "Upravit e_xterním editorem"
 
-#: src/compose.c:651
+#: src/compose.c:667
 msgid "_Check all or check selection"
 msgstr "_Zkontrolovat vše nebo výběr"
 
-#: src/compose.c:652
+#: src/compose.c:668
 msgid "_Highlight all misspelled words"
 msgstr "Z_výraznit nesprávná slova"
 
-#: src/compose.c:653
+#: src/compose.c:669
 msgid "Check _backwards misspelled word"
 msgstr "Přejít na _předchozí chybu"
 
-#: src/compose.c:654
+#: src/compose.c:670
 msgid "_Forward to next misspelled word"
 msgstr "Přejít na _následující chybu"
 
-#: src/compose.c:662
+#: src/compose.c:677
 msgid "Reply _mode"
 msgstr "_Mód odpovědi"
 
-#: src/compose.c:664
+#: src/compose.c:679
 msgid "Privacy _System"
 msgstr "Systém _zabezpečení"
 
-#: src/compose.c:669
+#: src/compose.c:683
 msgid "_Priority"
 msgstr "_Priorita"
 
-#: src/compose.c:671 src/mainwindow.c:610 src/messageview.c:264
+#: src/compose.c:685 src/mainwindow.c:611 src/messageview.c:264
 msgid "Character _encoding"
 msgstr "_Kódování znaků"
 
-#: src/compose.c:676 src/mainwindow.c:615 src/messageview.c:269
+#: src/compose.c:690 src/mainwindow.c:616 src/messageview.c:269
 msgid "Western European"
 msgstr "Západní Evropa"
 
-#: src/compose.c:677 src/mainwindow.c:616 src/messageview.c:270
+#: src/compose.c:691 src/mainwindow.c:617 src/messageview.c:270
 msgid "Baltic"
 msgstr "Baltské"
 
-#: src/compose.c:678 src/mainwindow.c:617 src/messageview.c:271
+#: src/compose.c:692 src/mainwindow.c:618 src/messageview.c:271
 msgid "Hebrew"
 msgstr "Hebrejština"
 
-#: src/compose.c:679 src/mainwindow.c:618 src/messageview.c:272
+#: src/compose.c:693 src/mainwindow.c:619 src/messageview.c:272
 msgid "Arabic"
 msgstr "Arabština"
 
-#: src/compose.c:680 src/mainwindow.c:619 src/messageview.c:273
+#: src/compose.c:694 src/mainwindow.c:620 src/messageview.c:273
 msgid "Cyrillic"
 msgstr "Azbuka"
 
-#: src/compose.c:681 src/mainwindow.c:620 src/messageview.c:274
+#: src/compose.c:695 src/mainwindow.c:621 src/messageview.c:274
 msgid "Japanese"
 msgstr "Japonština"
 
-#: src/compose.c:682 src/mainwindow.c:621 src/messageview.c:275
+#: src/compose.c:696 src/mainwindow.c:622 src/messageview.c:275
 msgid "Chinese"
 msgstr "Čínština"
 
-#: src/compose.c:683 src/mainwindow.c:622 src/messageview.c:276
+#: src/compose.c:697 src/mainwindow.c:623 src/messageview.c:276
 msgid "Korean"
 msgstr "Korejština"
 
-#: src/compose.c:684 src/mainwindow.c:623 src/messageview.c:277
+#: src/compose.c:698 src/mainwindow.c:624 src/messageview.c:277
 msgid "Thai"
 msgstr "Thajština"
 
-#: src/compose.c:687 src/mainwindow.c:732 src/messageview.c:313
+#: src/compose.c:701 src/mainwindow.c:734 src/messageview.c:313
 msgid "_Address book"
 msgstr "_Kniha adres"
 
-#: src/compose.c:689
+#: src/compose.c:703
 msgid "_Template"
 msgstr "Ša_blona"
 
-#: src/compose.c:691 src/mainwindow.c:760 src/messageview.c:334
+#: src/compose.c:705 src/mainwindow.c:762 src/messageview.c:333
 msgid "Actio_ns"
 msgstr "Ak_ce"
 
-#: src/compose.c:700
+#: src/compose.c:714
 msgid "Aut_o wrapping"
 msgstr "Aut_omatické zalamování"
 
-#: src/compose.c:701
+#: src/compose.c:715
 msgid "Auto _indent"
 msgstr "Automatické _odsazení"
 
-#: src/compose.c:702
+#: src/compose.c:716
 msgid "Si_gn"
 msgstr "Po_depsat"
 
-#: src/compose.c:703
+#: src/compose.c:717
 msgid "_Encrypt"
 msgstr "Ši_frovat"
 
-#: src/compose.c:704
+#: src/compose.c:718
 msgid "_Request Return Receipt"
 msgstr "_Vyžadovat potvrzení o doručení"
 
-#: src/compose.c:705
+#: src/compose.c:719
 msgid "Remo_ve references"
 msgstr "Odstranit reference"
 
-#: src/compose.c:706
+#: src/compose.c:720
 msgid "Show _ruler"
 msgstr "Zobrazit _pravítko"
 
-#: src/compose.c:711 src/compose.c:721
+#: src/compose.c:725 src/compose.c:735
 msgid "_Normal"
 msgstr "_Normální"
 
-#: src/compose.c:712 src/mainwindow.c:664 src/messageview.c:302
+#: src/compose.c:726 src/mainwindow.c:665 src/messageview.c:302
 msgid "_All"
 msgstr "_Všem"
 
-#: src/compose.c:713 src/mainwindow.c:665 src/messageview.c:303
+#: src/compose.c:727 src/mainwindow.c:666 src/messageview.c:303
 msgid "_Sender"
 msgstr "_Odesílateli"
 
-#: src/compose.c:714
+#: src/compose.c:728
 msgid "_Mailing-list"
 msgstr "Kon_ference"
 
-#: src/compose.c:719
+#: src/compose.c:733
 msgid "_Highest"
 msgstr "_Nejvyšší"
 
-#: src/compose.c:720
+#: src/compose.c:734
 msgid "Hi_gh"
 msgstr "Vy_soká"
 
-#: src/compose.c:722
+#: src/compose.c:736
 msgid "Lo_w"
 msgstr "Ní_zká"
 
-#: src/compose.c:723
+#: src/compose.c:737
 msgid "_Lowest"
 msgstr "Ne_jnižsí"
 
-#: src/compose.c:728 src/mainwindow.c:878 src/messageview.c:351
+#: src/compose.c:742 src/mainwindow.c:880 src/messageview.c:350
 msgid "_Automatic"
 msgstr "_Automaticky"
 
-#: src/compose.c:729 src/mainwindow.c:879 src/messageview.c:352
+#: src/compose.c:743 src/mainwindow.c:881 src/messageview.c:351
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "7bitové ASCII (US-ASC_II)"
 
-#: src/compose.c:730 src/mainwindow.c:880 src/messageview.c:353
+#: src/compose.c:744 src/mainwindow.c:882 src/messageview.c:352
 msgid "Unicode (_UTF-8)"
 msgstr "Unicode (_UTF-8)"
 
-#: src/compose.c:734 src/mainwindow.c:884 src/messageview.c:357
+#: src/compose.c:748 src/mainwindow.c:886 src/messageview.c:356
 msgid "Central European (ISO-8859-_2)"
 msgstr "Střední Evropa (ISO-8859-_2)"
 
-#: src/compose.c:737 src/mainwindow.c:887 src/messageview.c:360
+#: src/compose.c:751 src/mainwindow.c:889 src/messageview.c:359
 msgid "Greek (ISO-8859-_7)"
 msgstr "Řečtina (ISO-8859-_7)"
 
-#: src/compose.c:742 src/mainwindow.c:892 src/messageview.c:365
+#: src/compose.c:756 src/mainwindow.c:894 src/messageview.c:364
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Turečtina (ISO-8859-_9)"
 
-#: src/compose.c:1071
+#: src/compose.c:1085
 msgid "New message From format error."
 msgstr "Chyba ve formátu pole Od nové zprávy."
 
-#: src/compose.c:1163
+#: src/compose.c:1177
 msgid "New message subject format error."
 msgstr "Chyba v předmětu šablony nové zprávy."
 
-#: src/compose.c:1194 src/quote_fmt.c:570
+#: src/compose.c:1208 src/quote_fmt.c:570
 #, c-format
 msgid "The body of the \"New message\" template has an error at line %d."
 msgstr "Chyba v těle šablony \"Napsat\" na řádku %d."
 
-#: src/compose.c:1455
+#: src/compose.c:1469
 msgid "Unable to reply. The original email probably doesn't exist."
 msgstr "Není možno odpovědět. Originální email pravděpodobně neexistuje."
 
-#: src/compose.c:1638 src/quote_fmt.c:587
+#: src/compose.c:1652 src/quote_fmt.c:587
 msgid ""
 "The \"From\" field of the \"Reply\" template contains an invalid email "
 "address."
 msgstr ""
 "Pole \"Od\" v šabloně \"Odpovědět\" obsahuje neplatnou emailovou adresu."
 
-#: src/compose.c:1686 src/quote_fmt.c:590
+#: src/compose.c:1700 src/quote_fmt.c:590
 #, c-format
 msgid "The body of the \"Reply\" template has an error at line %d."
 msgstr "Chyba v těle šablony \"Odpovědět\" na řádku %d."
 
-#: src/compose.c:1822 src/compose.c:2014 src/quote_fmt.c:607
+#: src/compose.c:1834 src/compose.c:2025 src/quote_fmt.c:607
 msgid ""
 "The \"From\" field of the \"Forward\" template contains an invalid email "
 "address."
 msgstr "Pole \"Od\" v šabloně \"Předat\" obsahuje neplatnou emailovou adresu."
 
-#: src/compose.c:1882 src/quote_fmt.c:610
+#: src/compose.c:1894 src/quote_fmt.c:610
 #, c-format
 msgid "The body of the \"Forward\" template has an error at line %d."
 msgstr "Chyba v těle šablony \"Předat\" na řádku %d."
 
-#: src/compose.c:2056
+#: src/compose.c:2067
 msgid "Fw: multiple emails"
 msgstr "Fw: vice zprav"
 
-#: src/compose.c:2539
+#: src/compose.c:2569
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr "Chyba v těle šablony \"Přesměrovat\" na řádku %d."
 
-#: src/compose.c:2606 src/gtk/headers.h:14
+#: src/compose.c:2636 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "Kopie:"
 
-#: src/compose.c:2609 src/gtk/headers.h:15
+#: src/compose.c:2639 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "Skrytá kopie:"
 
-#: src/compose.c:2612 src/gtk/headers.h:12
+#: src/compose.c:2642 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "Odpovědět komu:"
 
-#: src/compose.c:2615 src/compose.c:4948 src/compose.c:4950
+#: src/compose.c:2645 src/compose.c:4963 src/compose.c:4965
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "Diskusní skupiny:"
 
-#: src/compose.c:2618 src/gtk/headers.h:34
+#: src/compose.c:2648 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "Pokračování:"
 
-#: src/compose.c:2621 src/gtk/headers.h:17
+#: src/compose.c:2651 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "V odpovědi komu:"
 
-#: src/compose.c:2625 src/compose.c:4945 src/compose.c:4953
-#: src/gtk/headers.h:13 src/summary_search.c:433
+#: src/compose.c:2655 src/compose.c:4960 src/compose.c:4968
+#: src/gtk/headers.h:13 src/summary_search.c:481
 msgid "To:"
 msgstr "Komu:"
 
-#: src/compose.c:2834
+#: src/compose.c:2841
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr "Nepodařilo se připojit soubor (konverze znakové sady se nezdařila)."
 
-#: src/compose.c:2840
+#: src/compose.c:2847
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -1886,73 +1886,73 @@ msgstr[2] ""
 "Následující soubory byly připojeny: \n"
 "%s"
 
-#: src/compose.c:3115
+#: src/compose.c:3124
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "\"Značka pro citaci\" v šabloně je neplatná."
 
-#: src/compose.c:3615
+#: src/compose.c:3630
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr "Nemohu získat velikost souboru '%s'."
 
-#: src/compose.c:3626
+#: src/compose.c:3641
 #, c-format
 msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
 "want to do that?"
 msgstr "Chystáte se vložit soubor %s do těla zprávy. Jste si tím jistý?"
 
-#: src/compose.c:3629
+#: src/compose.c:3644
 msgid "Are you sure?"
 msgstr "Jste si jistý?"
 
-#: src/compose.c:3630 src/compose.c:10510 src/compose.c:11386
+#: src/compose.c:3645 src/compose.c:10650 src/compose.c:11526
 msgid "_Insert"
 msgstr "_Vložit"
 
-#: src/compose.c:3754
+#: src/compose.c:3769
 #, c-format
 msgid "File %s is empty."
 msgstr "Soubor %s je prázdný."
 
-#: src/compose.c:3755
+#: src/compose.c:3770
 msgid "Empty file"
 msgstr "Prázdný soubor"
 
-#: src/compose.c:3756
+#: src/compose.c:3771
 msgid "_Attach anyway"
 msgstr "_Přesto přiložit"
 
-#: src/compose.c:3765
+#: src/compose.c:3780
 #, c-format
 msgid "Can't read %s."
 msgstr "Nemohu načíst %s."
 
-#: src/compose.c:3792
+#: src/compose.c:3807
 #, c-format
 msgid "Message: %s"
 msgstr "Zpráva: %s"
 
-#: src/compose.c:4785 src/plugins/managesieve/sieve_editor.c:694
+#: src/compose.c:4800 src/plugins/managesieve/sieve_editor.c:694
 #: src/plugins/python/composewindowtype.c:498
 msgid " [Edited]"
 msgstr " [Upraveno]"
 
-#: src/compose.c:4792 src/plugins/python/composewindowtype.c:501
+#: src/compose.c:4807 src/plugins/python/composewindowtype.c:501
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Psaní zprávy%s"
 
-#: src/compose.c:4795 src/plugins/python/composewindowtype.c:504
+#: src/compose.c:4810 src/plugins/python/composewindowtype.c:504
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[žádný předmět] - Psaní zprávy%s"
 
-#: src/compose.c:4797 src/plugins/python/composewindowtype.c:492
+#: src/compose.c:4812 src/plugins/python/composewindowtype.c:492
 msgid "Compose message"
 msgstr "Napsat zprávu"
 
-#: src/compose.c:4824 src/messageview.c:889
+#: src/compose.c:4839 src/messageview.c:903
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1960,55 +1960,57 @@ msgstr ""
 "Není zadán účet pro odesílání mailů.\n"
 "Před odesláním vyberte prosím nějaký účet."
 
-#: src/compose.c:5044 src/compose.c:5076 src/compose.c:5118
-#: src/prefs_account.c:3323 src/toolbar.c:406 src/toolbar.c:424
+#: src/compose.c:5060 src/compose.c:5097
+#, c-format
+msgid "The only recipient is the default '%s' address. Send anyway?"
+msgstr "Jediný adresát je výchozí %s příjemce. Opravdu odeslat?"
+
+#: src/compose.c:5062 src/compose.c:5099 src/compose.c:5142 src/compose.c:5190
+#: src/prefs_account.c:3323 src/toolbar.c:484 src/toolbar.c:516
 msgid "Send"
 msgstr "Odeslat"
 
-#: src/compose.c:5045
-msgid "The only recipient is the default CC address. Send anyway?"
-msgstr ""
-"Jediný adresát je výchozí příjemce kopií (viz nastavení účtu). Opravdu "
-"odeslat?"
-
-#: src/compose.c:5046 src/compose.c:5078 src/compose.c:5111 src/compose.c:5631
-#: src/folderview.c:2462 src/messageview.c:855 src/messageview.c:872
-#: src/plugins/attachwarner/attachwarner.c:210 src/toolbar.c:2629
+#: src/compose.c:5064 src/compose.c:5101 src/compose.c:5135 src/compose.c:5183
+#: src/compose.c:5718 src/folderview.c:2543 src/messageview.c:856
+#: src/messageview.c:884 src/plugins/attachwarner/attachwarner.c:210
+#: src/toolbar.c:2933
 msgid "_Send"
 msgstr "_Odeslat"
 
-#: src/compose.c:5077
-msgid "The only recipient is the default BCC address. Send anyway?"
-msgstr ""
-"Jediný adresát je výchozí příjemce skrytých kopií (viz nastavení účtu). "
-"Opravdu odeslat?"
-
-#: src/compose.c:5094
+#: src/compose.c:5118
 msgid "Recipient is not specified."
 msgstr "Není uveden příjemce."
 
-#: src/compose.c:5113 src/plugins/attachwarner/attachwarner.c:212
+#: src/compose.c:5137 src/compose.c:5185
+#: src/plugins/attachwarner/attachwarner.c:212
 msgid "_Queue"
 msgstr "_Fronta"
 
-#: src/compose.c:5114
+#: src/compose.c:5138
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "Předmět je prázdný.  %s"
 
-#: src/compose.c:5115 src/plugins/attachwarner/attachwarner.c:222
+#: src/compose.c:5139 src/compose.c:5187
+#: src/plugins/attachwarner/attachwarner.c:222
 msgid "Send it anyway?"
 msgstr "Přesto odeslat?"
 
-#: src/compose.c:5116 src/plugins/attachwarner/attachwarner.c:222
+#: src/compose.c:5140 src/compose.c:5188
+#: src/plugins/attachwarner/attachwarner.c:222
 msgid "Queue it anyway?"
 msgstr "Opravdu zařadit do fronty?"
 
-#: src/compose.c:5118 src/toolbar.c:425
+#: src/compose.c:5142 src/compose.c:5190 src/toolbar.c:517
 msgid "Send later"
 msgstr "Poslat později"
 
-#: src/compose.c:5171 src/compose.c:9974
+#: src/compose.c:5186
+#, c-format
+msgid "Sending to %d recipients. %s"
+msgstr "Posílám %d příjemcům. %s"
+
+#: src/compose.c:5243 src/compose.c:10122
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2018,7 +2020,7 @@ msgstr ""
 "\n"
 "Konverze znakové sady se nezdařila."
 
-#: src/compose.c:5174 src/compose.c:9977
+#: src/compose.c:5246 src/compose.c:10125
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2028,7 +2030,7 @@ msgstr ""
 "\n"
 "Nepodařilo se získat šifrovací klíč příjemce."
 
-#: src/compose.c:5180 src/compose.c:9971
+#: src/compose.c:5252 src/compose.c:10119
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2039,7 +2041,7 @@ msgstr ""
 "\n"
 "Podepisování se nezdařilo: %s"
 
-#: src/compose.c:5183
+#: src/compose.c:5255
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2050,11 +2052,11 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:5185
+#: src/compose.c:5257
 msgid "Could not queue message for sending."
 msgstr "Zprávu nelze uložit do fronty pro odeslání."
 
-#: src/compose.c:5200 src/compose.c:5260
+#: src/compose.c:5272 src/compose.c:5332
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -2062,7 +2064,7 @@ msgstr ""
 "Zpráva byla uložena do fronty ale nemohla být odeslána.\n"
 "Použijte nabídku \"Odeslat pozdržené zprávy \" z hlavního okna."
 
-#: src/compose.c:5256
+#: src/compose.c:5328
 #, c-format
 msgid ""
 "%s\n"
@@ -2071,7 +2073,7 @@ msgstr ""
 "%s\n"
 "Použijte nabídku \"Odeslat pozdržené zprávy \" z hlavního okna."
 
-#: src/compose.c:5627
+#: src/compose.c:5714
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2082,7 +2084,7 @@ msgstr ""
 "na %s.\n"
 "Odeslat v kódování %s?"
 
-#: src/compose.c:5685
+#: src/compose.c:5776
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2095,99 +2097,103 @@ msgstr ""
 "\n"
 "Přesto odeslat?"
 
-#: src/compose.c:5796
+#: src/compose.c:5887
 #, c-format
 msgid "Couldn't encrypt the email: %s"
 msgstr "Nepodařilo se zašifrovat zprávu: %s"
 
-#: src/compose.c:5917
+#: src/compose.c:6008
 msgid "Encryption warning"
 msgstr "Varování šifrování"
 
-#: src/compose.c:5918
+#: src/compose.c:6009
 msgid "C_ontinue"
 msgstr "_Pokračovat"
 
-#: src/compose.c:5967
+#: src/compose.c:6058
 msgid "No account for sending mails available!"
 msgstr "Není dostupný žádný účet pro odeslání pošty!"
 
-#: src/compose.c:5976
+#: src/compose.c:6067
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "Vybraný účet není NNTP: Odeslání není možné. "
 
-#: src/compose.c:6211
+#: src/compose.c:6300
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "Příloha %s už neexistuje. Ignorovat?"
 
-#: src/compose.c:6212 src/mainwindow.c:655 src/toolbar.c:231 src/toolbar.c:2167
+#: src/compose.c:6301 src/mainwindow.c:656 src/toolbar.c:274 src/toolbar.c:2466
 msgid "Cancel sending"
 msgstr "Zrušit posílání"
 
-#: src/compose.c:6212
+#: src/compose.c:6301
 msgid "Ignore attachment"
 msgstr "Ignorovat přílohu"
 
-#: src/compose.c:6252
+#: src/compose.c:6341
 #, c-format
 msgid "Original %s part"
 msgstr "Část originálu %s"
 
-#: src/compose.c:6813
+#: src/compose.c:6941
 msgid "Add to address _book"
 msgstr "Přidat do knihy adres"
 
-#: src/compose.c:6974
+#: src/compose.c:7102
 msgid "Delete entry contents"
 msgstr "Smazat obsah pole"
 
-#: src/compose.c:6978 src/plugins/vcalendar/vcal_meeting_gtk.c:289
+#: src/compose.c:7106 src/plugins/vcalendar/vcal_meeting_gtk.c:289
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Použijte <tab> pro automatické dokončení podle knihy adres"
 
-#: src/compose.c:7193
+#: src/compose.c:7321
 msgid "Mime type"
 msgstr "MIME typ"
 
-#: src/compose.c:7199 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:393
-#: src/prefs_matcher.c:630 src/prefs_summaries.c:434
+#: src/compose.c:7327 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:393
+#: src/prefs_matcher.c:630 src/prefs_summaries.c:442
 #: src/prefs_summary_column.c:85 src/summaryview.c:446
 msgid "Size"
 msgstr "Délka"
 
-#: src/compose.c:7262
+#: src/compose.c:7390
 msgid "Save Message to "
 msgstr "Uložit zprávu do "
 
-#: src/compose.c:7299 src/editjpilot.c:276 src/editldap.c:519
+#: src/compose.c:7427 src/editjpilot.c:276 src/editldap.c:519
 #: src/editvcard.c:192 src/export.c:164 src/import.c:163 src/importmutt.c:238
-#: src/importpine.c:237 src/plugins/archive/archiver_gtk.c:1025
+#: src/importpine.c:237 src/plugins/archive/archiver_gtk.c:1075
 #: src/plugins/bogofilter/bogofilter_gtk.c:229
 #: src/plugins/bogofilter/bogofilter_gtk.c:252
 #: src/plugins/bsfilter/bsfilter_gtk.c:181
-#: src/plugins/clamd/clamav_plugin_gtk.c:299
-#: src/plugins/spamassassin/spamassassin_gtk.c:417
+#: src/plugins/clamd/clamav_plugin_gtk.c:300
+#: src/plugins/spamassassin/spamassassin_gtk.c:418
 msgid "_Browse"
 msgstr "P_rocházet"
 
-#: src/compose.c:7772
+#: src/compose.c:7449
+msgid "Select folder to save message to"
+msgstr "Vybrat složku pro uložení zprávy"
+
+#: src/compose.c:7906
 msgid "Hea_der"
 msgstr "_Záhlaví"
 
-#: src/compose.c:7777
+#: src/compose.c:7911
 msgid "_Attachments"
 msgstr "_Přílohy"
 
-#: src/compose.c:7791
+#: src/compose.c:7925
 msgid "Othe_rs"
 msgstr "_Ostatní"
 
-#: src/compose.c:7806
+#: src/compose.c:7940
 msgid "S_ubject:"
 msgstr "Pře_dmět:"
 
-#: src/compose.c:8030
+#: src/compose.c:8164
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2196,19 +2202,19 @@ msgstr ""
 "Nelze spustit kontrolu pravopisu.\n"
 "%s"
 
-#: src/compose.c:8169
+#: src/compose.c:8311
 msgid "_From:"
 msgstr "_Od:"
 
-#: src/compose.c:8186
+#: src/compose.c:8328
 msgid "Account to use for this email"
 msgstr "Účet použitý pro tuto zprávu"
 
-#: src/compose.c:8188
+#: src/compose.c:8330
 msgid "Sender address to be used"
 msgstr "Adresa odesílatele musí být uvedena"
 
-#: src/compose.c:8354
+#: src/compose.c:8496
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2217,68 +2223,50 @@ msgstr ""
 "Systém zabezpečení '%s' se nepodařilo načíst. Nebudete moci digitálně "
 "podepsat nebo šifrovat zprávu."
 
-#: src/compose.c:8455 src/plugins/archive/archiver_gtk.c:1077
+#: src/compose.c:8597 src/plugins/archive/archiver_gtk.c:1174
 msgid "_None"
 msgstr "Žá_dné"
 
-#: src/compose.c:8556 src/prefs_template.c:760
+#: src/compose.c:8698 src/prefs_template.c:750
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "Chyba v těle šablony na řádku %d."
 
-#: src/compose.c:8672
-msgid "Template From format error."
-msgstr "Chyba v poli 'Od' šablony."
-
-#: src/compose.c:8690
-msgid "Template To format error."
-msgstr "Chyba v poli 'Komu' šablony."
-
-#: src/compose.c:8708
-msgid "Template Cc format error."
-msgstr "Chyba v poli 'Kopie' šablony."
-
-#: src/compose.c:8726
-msgid "Template Bcc format error."
-msgstr "Chyba v poli 'Skrytá kopie' šablony."
-
-#: src/compose.c:8744
-msgid "Template Reply-To format error."
-msgstr "Chyba v poli 'Komu' šablony."
-
-#: src/compose.c:8763
-msgid "Template subject format error."
-msgstr "Chyba v poli 'Předmět' šablony."
+#: src/compose.c:8793
+#, c-format
+msgctxt "'%s' stands for a header name"
+msgid "Template '%s' format error."
+msgstr "Chyba formátu %s šablony."
 
-#: src/compose.c:9032
+#: src/compose.c:9194
 msgid "Invalid MIME type."
 msgstr "Neplatný MIME typ."
 
-#: src/compose.c:9047
+#: src/compose.c:9209
 msgid "File doesn't exist or is empty."
 msgstr "Soubor neexistuje nebo je prázdný."
 
-#: src/compose.c:9121
+#: src/compose.c:9283
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: src/compose.c:9138
+#: src/compose.c:9300
 msgid "MIME type"
 msgstr "MIME typ"
 
-#: src/compose.c:9179
+#: src/compose.c:9341
 msgid "Encoding"
 msgstr "Kódování"
 
-#: src/compose.c:9199
+#: src/compose.c:9361
 msgid "Path"
 msgstr "Cesta k souboru"
 
-#: src/compose.c:9200
+#: src/compose.c:9362
 msgid "File name"
 msgstr "Název souboru"
 
-#: src/compose.c:9451
+#: src/compose.c:9621
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2289,15 +2277,15 @@ msgstr ""
 "Mám přerušit proces?\n"
 "číslo procesu: %d"
 
-#: src/compose.c:9940 src/messageview.c:1083
+#: src/compose.c:10088 src/messageview.c:1105
 msgid "Claws Mail needs network access in order to send this email."
 msgstr "Claws Mail potřebuje přístup k síti, aby mohl odeslat tuto zprávu."
 
-#: src/compose.c:9966
+#: src/compose.c:10114
 msgid "Could not queue message."
 msgstr "Zprávu nelze uložit do fronty pro odeslání."
 
-#: src/compose.c:9968
+#: src/compose.c:10116
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2308,15 +2296,15 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:10146
+#: src/compose.c:10294
 msgid "Could not save draft."
 msgstr "Nelze uložit koncept."
 
-#: src/compose.c:10150
+#: src/compose.c:10298
 msgid "Could not save draft"
 msgstr "Nelze uložit koncept"
 
-#: src/compose.c:10151
+#: src/compose.c:10299
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2324,24 +2312,24 @@ msgstr ""
 "Nemohu uložit koncept.\n"
 "Chcete zrušit ukončení nebo zahodit tuto zprávu?"
 
-#: src/compose.c:10153
+#: src/compose.c:10301
 msgid "_Cancel exit"
 msgstr "_Zrušit ukončení"
 
-#: src/compose.c:10153
+#: src/compose.c:10301
 msgid "_Discard email"
 msgstr "_Zahodit zprávu"
 
-#: src/compose.c:10313 src/compose.c:10327
+#: src/compose.c:10461 src/compose.c:10475
 msgid "Select file"
 msgstr "Výběr souboru"
 
-#: src/compose.c:10341
+#: src/compose.c:10489
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Soubor '%s' nelze číst."
 
-#: src/compose.c:10343
+#: src/compose.c:10491
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2350,50 +2338,50 @@ msgstr ""
 "Soubor '%s' obsahuje neplatné znaky\n"
 "pro nastavené kódování, vložení může obsahovat chyby."
 
-#: src/compose.c:10430
+#: src/compose.c:10570
 msgid "Discard message"
 msgstr "Zrušit zprávu"
 
-#: src/compose.c:10431
+#: src/compose.c:10571
 msgid "This message has been modified. Discard it?"
 msgstr "Zpráva byla modifikována. Chcete ji zahodit?"
 
-#: src/compose.c:10432 src/plugins/managesieve/sieve_editor.c:433
+#: src/compose.c:10572 src/plugins/managesieve/sieve_editor.c:433
 msgid "_Discard"
 msgstr "_Zahodit"
 
-#: src/compose.c:10432 src/compose.c:10436
+#: src/compose.c:10572 src/compose.c:10576
 msgid "_Save to Drafts"
 msgstr "Uložit jako _koncept"
 
-#: src/compose.c:10434 src/plugins/managesieve/sieve_editor.c:431
+#: src/compose.c:10574 src/plugins/managesieve/sieve_editor.c:431
 msgid "Save changes"
 msgstr "Uložit změny"
 
-#: src/compose.c:10435
+#: src/compose.c:10575
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Zpráva byla modifikována. Chcete uložit poslední změny?"
 
-#: src/compose.c:10436
+#: src/compose.c:10576
 msgid "_Don't save"
 msgstr "_Neukládat"
 
-#: src/compose.c:10507
+#: src/compose.c:10647
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Chcete použít šablonu '%s'?"
 
-#: src/compose.c:10509
+#: src/compose.c:10649
 msgid "Apply template"
 msgstr "Použít šablonu"
 
-#: src/compose.c:10510 src/prefs_actions.c:329 src/prefs_filtering_action.c:610
-#: src/prefs_filtering.c:477 src/prefs_matcher.c:773 src/prefs_template.c:311
-#: src/prefs_toolbar.c:1050
+#: src/compose.c:10650 src/prefs_actions.c:329 src/prefs_filtering_action.c:610
+#: src/prefs_filtering.c:477 src/prefs_matcher.c:774 src/prefs_template.c:311
+#: src/prefs_toolbar.c:1063
 msgid "_Replace"
 msgstr "_Nahradit"
 
-#: src/compose.c:11379
+#: src/compose.c:11519
 #, c-format
 msgid ""
 "Do you want to insert the contents of the file into the message body, or "
@@ -2411,20 +2399,20 @@ msgstr[2] ""
 "Chcete obsah %d souborů vložit do textu zprávy nebo soubory připojit ke "
 "zprávě jako přílohu?"
 
-#: src/compose.c:11385
+#: src/compose.c:11525
 msgid "Insert or attach?"
 msgstr "Vložit nebo připojit?"
 
-#: src/compose.c:11386
+#: src/compose.c:11526
 msgid "_Attach"
 msgstr "_Přiložit"
 
-#: src/compose.c:11604
+#: src/compose.c:11744
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Chyba formátu citace na řádku %d."
 
-#: src/compose.c:11899
+#: src/compose.c:12041
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2455,7 +2443,7 @@ msgstr ""
 msgid "Debug log"
 msgstr "Debug log"
 
-#: src/crash.c:251 src/toolbar.c:422
+#: src/crash.c:251 src/toolbar.c:534
 msgid "Close"
 msgstr "Zavřít"
 
@@ -2535,7 +2523,7 @@ msgstr "E-mailová adresa musí být uvedena."
 msgid "A Name and Value must be supplied."
 msgstr "Musí být zadáno jméno a hodnota."
 
-#: src/editaddress.c:675 src/prefs_folder_item.c:1679
+#: src/editaddress.c:675 src/prefs_folder_item.c:1694
 msgid "Discard"
 msgstr "_Zahodit"
 
@@ -2690,12 +2678,12 @@ msgstr "Upravit složku"
 msgid "Input the new name of folder:"
 msgstr "Zadejte název složky:"
 
-#: src/editgroup.c:556 src/foldersel.c:586 src/imap_gtk.c:193 src/mh_gtk.c:144
+#: src/editgroup.c:556 src/foldersel.c:594 src/imap_gtk.c:193 src/mh_gtk.c:144
 #: src/plugins/mailmbox/plugin_gtk.c:244 src/plugins/rssyl/rssyl_cb_menu.c:91
 msgid "New folder"
 msgstr "Nová složka"
 
-#: src/editgroup.c:557 src/foldersel.c:587 src/mh_gtk.c:145
+#: src/editgroup.c:557 src/foldersel.c:595 src/mh_gtk.c:145
 #: src/plugins/mailmbox/plugin_gtk.c:245 src/plugins/rssyl/rssyl_cb_menu.c:92
 msgid "Input the name of new folder:"
 msgstr "Zadejte název složky:"
@@ -2729,7 +2717,7 @@ msgid "Hostname"
 msgstr "Název počítače"
 
 #: src/editldap_basedn.c:166 src/editldap.c:458
-#: src/plugins/clamd/clamav_plugin_gtk.c:389 src/ssl_manager.c:108
+#: src/plugins/clamd/clamav_plugin_gtk.c:390 src/ssl_manager.c:108
 msgid "Port"
 msgstr "Port"
 
@@ -2975,7 +2963,7 @@ msgstr "Maximální počet položek, které budou vráceny při prohledávání.
 msgid "Basic"
 msgstr "Server"
 
-#: src/editldap.c:782 src/gtk/quicksearch.c:680
+#: src/editldap.c:782 src/gtk/quicksearch.c:708
 msgid "Extended"
 msgstr "Ostatní"
 
@@ -2983,8 +2971,8 @@ msgstr "Ostatní"
 msgid "Add New LDAP Server"
 msgstr "Přidat nový LDAP server"
 
-#: src/edittags.c:187 src/prefs_filtering_action.c:1446
-#: src/prefs_summaries.c:441
+#: src/edittags.c:187 src/prefs_filtering_action.c:1447
+#: src/prefs_summaries.c:449
 msgid "Tag"
 msgstr "Značka"
 
@@ -3105,10 +3093,10 @@ msgid "Stylesheet"
 msgstr "Šablona stylu"
 
 #: src/exphtmldlg.c:453 src/gtk/colorlabel.c:387 src/gtk/gtkaspell.c:1571
-#: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:125 src/mainwindow.c:1188
-#: src/plugins/archive/archiver_prefs.c:235
+#: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:125 src/mainwindow.c:1190
+#: src/plugins/archive/archiver_prefs.c:313
 #: src/plugins/libravatar/libravatar_prefs.c:304 src/prefs_account.c:941
-#: src/prefs_toolbar.c:780 src/prefs_toolbar.c:1466 src/summaryview.c:5977
+#: src/prefs_toolbar.c:790 src/prefs_toolbar.c:1479 src/summaryview.c:6019
 msgid "None"
 msgstr "Žádná"
 
@@ -3347,7 +3335,7 @@ msgstr "Exportovat knihu adres do LDIF souboru"
 msgid "Distinguished Name"
 msgstr "Rozlišovací jméno (dn)"
 
-#: src/export.c:113 src/summaryview.c:8124
+#: src/export.c:113 src/summaryview.c:8177
 msgid "Export to mbox file"
 msgstr "Exportovat do mbox souboru"
 
@@ -3379,12 +3367,16 @@ msgstr "Zdrojová složka nebyla nalezena."
 msgid "Select exporting file"
 msgstr "Vyberte soubor pro export"
 
+#: src/export.c:268
+msgid "Select folder to export"
+msgstr "Vybrat složku pro export"
+
 #: src/exporthtml.c:767
 msgid "Full Name"
 msgstr "Celý název"
 
 #: src/exporthtml.c:771 src/importldif.c:1021
-#: src/plugins/archive/archiver_gtk.c:735
+#: src/plugins/archive/archiver_gtk.c:769
 msgid "Attributes"
 msgstr "Atributy"
 
@@ -3599,23 +3591,23 @@ msgstr ""
 "filtrování zprávy (%s%s%s)\n"
 "%ssoubor zprávy: %s\n"
 
-#: src/folder.c:1570 src/foldersel.c:404 src/prefs_folder_item.c:315
+#: src/folder.c:1570 src/foldersel.c:412 src/prefs_folder_item.c:315
 msgid "Inbox"
 msgstr "Doručená pošta"
 
-#: src/folder.c:1574 src/foldersel.c:408
+#: src/folder.c:1574 src/foldersel.c:416
 msgid "Sent"
 msgstr "Odeslaná pošta"
 
-#: src/folder.c:1578 src/foldersel.c:412 src/prefs_folder_item.c:318
+#: src/folder.c:1578 src/foldersel.c:420 src/prefs_folder_item.c:318
 msgid "Queue"
 msgstr "Fronta"
 
-#: src/folder.c:1582 src/foldersel.c:416 src/prefs_folder_item.c:319
+#: src/folder.c:1582 src/foldersel.c:424 src/prefs_folder_item.c:319
 msgid "Trash"
 msgstr "Koš"
 
-#: src/folder.c:1586 src/foldersel.c:420 src/prefs_folder_item.c:317
+#: src/folder.c:1586 src/foldersel.c:428 src/prefs_folder_item.c:317
 msgid "Drafts"
 msgstr "Koncepty"
 
@@ -3634,116 +3626,129 @@ msgstr "Kopíruji %s do %s...\n"
 msgid "Moving %s to %s...\n"
 msgstr "Přesouvám %s do %s...\n"
 
-#: src/folder.c:3568
+#: src/folder.c:3572
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Aktualizuji vyrovnávací paměť pro %s..."
 
-#: src/folder.c:4430
+#: src/folder.c:4434
 msgid "Processing messages..."
 msgstr "Zpracovávám zprávy..."
 
-#: src/folder.c:4565
+#: src/folder.c:4569
 #, c-format
 msgid "Synchronising %s for offline use...\n"
 msgstr "Synchronizuji %s pro použití offline...\n"
 
-#: src/folder.c:4822
+#: src/folder.c:4828
 msgid "A folder name cannot begin or end with a dot."
 msgstr "Jméno složky nemůže začínat nebo končit tečkou."
 
-#: src/folder.c:4826
+#: src/folder.c:4832
 msgid "A folder name can not end with a space."
 msgstr "Jméno složky nemůže končit tečkou."
 
-#: src/foldersel.c:248
+#: src/foldersel.c:250
 msgid "Select folder"
 msgstr "Vybrat složku"
 
-#: src/foldersel.c:588 src/imap_gtk.c:197 src/mh_gtk.c:146
+#: src/foldersel.c:596 src/imap_gtk.c:197 src/mh_gtk.c:146
 #: src/plugins/mailmbox/plugin_gtk.c:246 src/plugins/rssyl/rssyl_cb_menu.c:93
 msgid "NewFolder"
 msgstr "Nová složka"
 
-#: src/foldersel.c:596 src/imap_gtk.c:208 src/imap_gtk.c:214 src/imap_gtk.c:270
+#: src/foldersel.c:604 src/imap_gtk.c:208 src/imap_gtk.c:214 src/imap_gtk.c:270
 #: src/imap_gtk.c:275 src/mh_gtk.c:154 src/mh_gtk.c:262 src/news_gtk.c:299
-#: src/plugins/mailmbox/plugin_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:422
+#: src/plugins/mailmbox/plugin_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:432
 #: src/plugins/rssyl/rssyl_cb_menu.c:204
-#: src/plugins/vcalendar/vcal_folder.c:2052
+#: src/plugins/vcalendar/vcal_folder.c:2063
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "'%c' nemůže být obsaženo ve jméně složky."
 
-#: src/foldersel.c:611 src/imap_gtk.c:224 src/imap_gtk.c:282 src/mh_gtk.c:167
+#: src/foldersel.c:619 src/imap_gtk.c:224 src/imap_gtk.c:282 src/mh_gtk.c:167
 #: src/mh_gtk.c:272 src/news_gtk.c:306 src/plugins/mailmbox/plugin_gtk.c:269
-#: src/plugins/mailmbox/plugin_gtk.c:434 src/plugins/rssyl/rssyl_cb_menu.c:217
-#: src/plugins/vcalendar/vcal_folder.c:2059
+#: src/plugins/mailmbox/plugin_gtk.c:444 src/plugins/rssyl/rssyl_cb_menu.c:217
+#: src/plugins/vcalendar/vcal_folder.c:2070
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "Složka '%s' už existuje."
 
-#: src/foldersel.c:618 src/imap_gtk.c:230 src/mh_gtk.c:173
+#: src/foldersel.c:626 src/imap_gtk.c:230 src/mh_gtk.c:173
 #: src/plugins/mailmbox/plugin_gtk.c:276 src/plugins/rssyl/opml_import.c:91
 #: src/plugins/rssyl/rssyl_cb_menu.c:124
 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr "Nemohu vytvořit složku '%s'."
 
-#: src/folderview.c:242
+#: src/folderview.c:247
 msgid "Mark all re_ad"
 msgstr "Označit všechny jako _přečtené"
 
-#: src/folderview.c:243
+#: src/folderview.c:248
+msgid "Mark all u_nread"
+msgstr "Označit všechny jako _nepřečtené"
+
+#: src/folderview.c:249
 msgid "Mark all read recursi_vely"
 msgstr "Označit všechny jako přečtené rekurzi_vně"
 
-#: src/folderview.c:245
+#: src/folderview.c:250
+msgid "Mark all unread recursi_vely"
+msgstr "Označit všechny jako nepřečtené rek_urzivně"
+
+#: src/folderview.c:252
 msgid "R_un processing rules"
 msgstr "S_pustit pravidla zpracování"
 
-#: src/folderview.c:246 src/mainwindow.c:551
+#: src/folderview.c:253 src/mainwindow.c:553
 msgid "_Search folder..."
 msgstr "_Prohledat složku..."
 
-#: src/folderview.c:248
+#: src/folderview.c:255
 msgid "Process_ing..."
 msgstr "_Zpracování..."
 
-#: src/folderview.c:249
+#: src/folderview.c:256
 msgid "Empty _trash..."
 msgstr "Vyprázdnit _koš..."
 
-#: src/folderview.c:250
+#: src/folderview.c:257
 msgid "Send _queue..."
 msgstr "Odeslat _frontu..."
 
-#: src/folderview.c:390 src/folderview.c:437
+#: src/folderview.c:397 src/folderview.c:444
 #: src/plugins/notification/notification_lcdproc.c:141
-#: src/prefs_folder_column.c:79 src/prefs_matcher.c:393 src/summaryview.c:6251
+#: src/prefs_folder_column.c:79 src/prefs_matcher.c:393 src/summaryview.c:6293
 msgid "New"
 msgstr "Nové"
 
-#: src/folderview.c:391 src/folderview.c:438
+#: src/folderview.c:398 src/folderview.c:445
 #: src/plugins/notification/notification_lcdproc.c:145
-#: src/prefs_folder_column.c:80 src/prefs_matcher.c:392 src/summaryview.c:6253
+#: src/prefs_folder_column.c:80 src/prefs_matcher.c:392 src/summaryview.c:6295
+#: src/toolbar.c:509
 msgid "Unread"
 msgstr "Nepřečtené"
 
-#: src/folderview.c:392 src/plugins/notification/notification_lcdproc.c:149
+#: src/folderview.c:399 src/plugins/notification/notification_lcdproc.c:149
 #: src/prefs_folder_column.c:81
 msgid "Total"
 msgstr "Celkem"
 
 #. TRANSLATORS: This in Number sign in American style
-#: src/folderview.c:440 src/summaryview.c:447
+#: src/folderview.c:447 src/summaryview.c:447
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:775
+#: src/folderview.c:782
 msgid "Setting folder info..."
 msgstr "Nastavuji informace o složce..."
 
-#: src/folderview.c:847
+#: src/folderview.c:867 src/summaryview.c:4140
+msgid "Mark all as read"
+msgstr "Označit všechny jako přečtené"
+
+#: src/folderview.c:868
 msgid ""
 "Do you really want to mark all mails in this folder and its sub-folders as "
 "read?"
@@ -3751,99 +3756,111 @@ msgstr ""
 "Opravdu chcete označit všechny zprávy v této složce a jejích podsložkách "
 "jako přečtené?"
 
-#: src/folderview.c:849 src/summaryview.c:4104
+#: src/folderview.c:870 src/summaryview.c:4141
 msgid "Do you really want to mark all mails in this folder as read?"
 msgstr "Opravdu chcete označit všechny zprávy v této složce jako přečtené?"
 
-#: src/folderview.c:853 src/summaryview.c:4103
-msgid "Mark all as read"
-msgstr "Označit všechny jako přečtené"
+#: src/folderview.c:873 src/summaryview.c:4179
+msgid "Mark all as unread"
+msgstr "Označit všechny jako nepřečtené"
+
+#: src/folderview.c:874
+msgid ""
+"Do you really want to mark all mails in this folder and its sub-folders as "
+"unread?"
+msgstr ""
+"Opravdu chcete označit všechny zprávy v této složce a jejích podsložkách "
+"jako nepřečtené?"
+
+#: src/folderview.c:876 src/summaryview.c:4180
+msgid "Do you really want to mark all mails in this folder as unread?"
+msgstr "Opravdu chcete označit všechny zprávy v této složce jako nepřečtené?"
 
-#: src/folderview.c:1032 src/imap.c:4636
+#: src/folderview.c:1066 src/imap.c:4605
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "Prohledávám složku %s/%s..."
 
-#: src/folderview.c:1035 src/imap.c:4640 src/mainwindow.c:5197 src/setup.c:96
+#: src/folderview.c:1069 src/imap.c:4609 src/mainwindow.c:5249 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Prohledávám složku %s..."
 
-#: src/folderview.c:1066
+#: src/folderview.c:1100
 msgid "Rebuild folder tree"
 msgstr "Obnovit strom složek"
 
-#: src/folderview.c:1067
+#: src/folderview.c:1101
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr ""
 "Obnovení stromu složek vyčistí všechny lokální vyrovnávací paměti. Chcete "
 "pokračovat?"
 
-#: src/folderview.c:1077
+#: src/folderview.c:1111
 msgid "Rebuilding folder tree..."
 msgstr "Provádím obnovu stromu složek..."
 
-#: src/folderview.c:1079
+#: src/folderview.c:1113
 msgid "Scanning folder tree..."
 msgstr "Prohledávám strom složek..."
 
-#: src/folderview.c:1170
+#: src/folderview.c:1204
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "Nepodařilo se načíst obsah adresáře %s\n"
 
-#: src/folderview.c:1224
+#: src/folderview.c:1258
 msgid "Checking for new messages in all folders..."
 msgstr "Zjišťuji nové zprávy ve všech složkách..."
 
-#: src/folderview.c:2148
+#: src/folderview.c:2229
 #, c-format
 msgid "Closing folder %s..."
 msgstr "Zavírám složku %s..."
 
-#: src/folderview.c:2243
+#: src/folderview.c:2324
 #, c-format
 msgid "Opening folder %s..."
 msgstr "Otevírám složku %s..."
 
-#: src/folderview.c:2261
+#: src/folderview.c:2342
 msgid "Folder could not be opened."
 msgstr "Složku nelze otevřít."
 
-#: src/folderview.c:2403 src/mainwindow.c:2903 src/mainwindow.c:2907
+#: src/folderview.c:2484 src/mainwindow.c:2906 src/mainwindow.c:2910
 msgid "Empty trash"
 msgstr "Vyprázdnit koš"
 
-#: src/folderview.c:2404
+#: src/folderview.c:2485
 msgid "Delete all messages in trash?"
 msgstr "Odstranit všechny zprávy v koši?"
 
-#: src/folderview.c:2405
+#: src/folderview.c:2486
 msgid "_Empty trash"
 msgstr "_Vyprázdnit koš"
 
-#: src/folderview.c:2448 src/inc.c:1533 src/toolbar.c:2607
+#: src/folderview.c:2529 src/inc.c:1533 src/toolbar.c:2911
 msgid "Offline warning"
 msgstr "Varování offline režimu"
 
-#: src/folderview.c:2449 src/toolbar.c:2608
+#: src/folderview.c:2530 src/toolbar.c:2912
 msgid "You're working offline. Override?"
 msgstr "Pracujete v režimu offline. Přepnout?"
 
-#: src/folderview.c:2460 src/toolbar.c:2627
+#: src/folderview.c:2541 src/toolbar.c:2931
 msgid "Send queued messages"
 msgstr "Odeslat pozdržené zprávy"
 
-#: src/folderview.c:2461 src/toolbar.c:2628
+#: src/folderview.c:2542 src/toolbar.c:2932
 msgid "Send all queued messages?"
 msgstr "Odeslat všechny zprávy ve frontě pozdržených zpráv?"
 
-#: src/folderview.c:2470 src/toolbar.c:2647
+#: src/folderview.c:2551 src/toolbar.c:2951
 msgid "Some errors occurred while sending queued messages."
 msgstr "Při posílání pozdržených zpráv nastala stejná chyba."
 
-#: src/folderview.c:2473 src/main.c:2744 src/toolbar.c:2650
+#: src/folderview.c:2554 src/main.c:2752 src/toolbar.c:2954
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -3852,64 +3869,64 @@ msgstr ""
 "Při odesílání pozdržených zpráv nastala chyba:\n"
 "%s"
 
-#: src/folderview.c:2548
+#: src/folderview.c:2629
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr "Opravdu chcete složku '%s' zkopírovat do '%s'?"
 
-#: src/folderview.c:2549
+#: src/folderview.c:2630
 #, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
 msgstr "Opravdu chcete složku '%s' učinit podsložkou složky '%s'?"
 
-#: src/folderview.c:2551
+#: src/folderview.c:2632
 msgid "Copy folder"
 msgstr "Kopírovat složku"
 
-#: src/folderview.c:2551
+#: src/folderview.c:2632
 msgid "Move folder"
 msgstr "Přesunout složku"
 
-#: src/folderview.c:2562
+#: src/folderview.c:2643
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Kopíruji %s do %s..."
 
-#: src/folderview.c:2562
+#: src/folderview.c:2643
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Přesouvám %s do %s..."
 
-#: src/folderview.c:2596
+#: src/folderview.c:2677
 msgid "Source and destination are the same."
 msgstr "Zdroj i cíl jsou totožné."
 
-#: src/folderview.c:2599
+#: src/folderview.c:2680
 msgid "Can't copy a folder to one of its children."
 msgstr "Nelze kopírovat složku do své vlastní podsložky."
 
-#: src/folderview.c:2600
+#: src/folderview.c:2681
 msgid "Can't move a folder to one of its children."
 msgstr "Nelze přesunout složku do své vlastní podsložky."
 
-#: src/folderview.c:2603
+#: src/folderview.c:2684
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "Složka nemůže být přesouvána mezi různými poštovními schránkami."
 
-#: src/folderview.c:2606
+#: src/folderview.c:2687
 msgid "Copy failed!"
 msgstr "Kopírování se nezdařilo!"
 
-#: src/folderview.c:2606
+#: src/folderview.c:2687
 msgid "Move failed!"
 msgstr "Přesun se nezdařil!"
 
-#: src/folderview.c:2656
+#: src/folderview.c:2737
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Zpracování složky - pravidla pro složku %s"
 
-#: src/folderview.c:3096 src/summaryview.c:4542 src/summaryview.c:4643
+#: src/folderview.c:3177 src/summaryview.c:4576 src/summaryview.c:4682
 msgid "The destination folder can only be used to store subfolders."
 msgstr "Cílová složka může být použita pouze k uložení podsložek."
 
@@ -3950,8 +3967,8 @@ msgid "readonly"
 msgstr "pouze pro čtení"
 
 #: src/grouplistdialog.c:351 src/plugins/att_remover/att_remover.c:297
-#: src/plugins/vcalendar/vcal_manager.c:113
-#: src/plugins/vcalendar/vcal_manager.c:146
+#: src/plugins/vcalendar/vcal_manager.c:114
+#: src/plugins/vcalendar/vcal_manager.c:148
 msgid "unknown"
 msgstr "neznámý"
 
@@ -3959,7 +3976,7 @@ msgstr "neznámý"
 msgid "Can't retrieve newsgroup list."
 msgstr "Nemohu načíst seznam diskuzních skupin."
 
-#: src/grouplistdialog.c:459 src/gtk/gtkutils.c:1922 src/summaryview.c:1564
+#: src/grouplistdialog.c:459 src/gtk/gtkutils.c:1922 src/summaryview.c:1587
 msgid "Done."
 msgstr "Hotovo."
 
@@ -3968,63 +3985,42 @@ msgstr "Hotovo."
 msgid "%d newsgroups received (%s read)"
 msgstr "%d diskuzních skupin přijato (%s načteno)"
 
-#: src/gtk/about.c:131
-msgid ""
-"Claws Mail is a lightweight, fast and highly-configurable email client.\n"
-"\n"
-"For further information visit the Claws Mail website:\n"
-msgstr ""
-"Claws Mail je rychlý a bohatě konfigurovatelný e-mailový klient.\n"
-"\n"
-"Pro další informace navštivte webové stránky Claws Mail:\n"
+#: src/gtk/about.c:132
+msgid "Claws Mail is a lightweight, fast and highly-configurable email client."
+msgstr "Claws Mail je rychlý a bohatě konfigurovatelný e-mailový klient."
 
-#: src/gtk/about.c:137
+#: src/gtk/about.c:135
+msgid "For further information visit the Claws Mail website:"
+msgstr "Pro více informací o zásuvných modulech navštivte stránku Claws Mail:"
+
+#: src/gtk/about.c:140
 msgid ""
-"\n"
-"\n"
-"For support and discussion subscribe to the Claws Mail users' mailing list:\n"
-msgstr ""
-"\n"
-"\n"
-"Pro podporu a diskuze se přihlaste do mailových konferencí Claws Mail:\n"
+"For support and discussion subscribe to the Claws Mail users' mailing list:"
+msgstr "Pro podporu a diskuze se přihlaste do mailových konferencí Claws Mail:"
 
-#: src/gtk/about.c:142
+#: src/gtk/about.c:146
 msgid ""
-"\n"
-"\n"
 "Claws Mail is free software released under the GPL. If you wish to donate to "
-"the Claws Mail project you can do so at:\n"
+"the Claws Mail project you can do so at:"
 msgstr ""
-"\n"
-"\n"
 "Claws Mail je volně šiřitelný software distribuovaný pod licencí GPL. Pokud "
-"chcete přispět na projekt Claws Mail, můžete tak učinit na:\n"
+"chcete přispět na projekt Claws Mail, můžete tak učinit na:"
 
-#: src/gtk/about.c:158
+#: src/gtk/about.c:162
 msgid ""
-"\n"
-"\n"
-"Copyright (C) 1999-2016\n"
+"Copyright (C) 1999-2017\n"
 "The Claws Mail Team\n"
 " and Hiroyuki Yamamoto"
 msgstr ""
-"\n"
-"\n"
-"Copyright (C) 1999-2016\n"
+"Copyright (C) 1999-2017\n"
 "The Claws Mail Team\n"
-" a Hiroyuki Yamamoto"
+"a Hiroyuki Yamamoto"
 
-#: src/gtk/about.c:161
-msgid ""
-"\n"
-"\n"
-"System Information\n"
-msgstr ""
-"\n"
-"\n"
-"Informace o systému\n"
+#: src/gtk/about.c:167
+msgid "System Information\n"
+msgstr "Informace o systému\n"
 
-#: src/gtk/about.c:168
+#: src/gtk/about.c:173
 #, c-format
 msgid ""
 "Locale: %s (charset: %s)\n"
@@ -4033,7 +4029,7 @@ msgstr ""
 "Lokalizace: %s (znaková sada: %s)\n"
 "Operační systém: %s %s (%s)"
 
-#: src/gtk/about.c:177
+#: src/gtk/about.c:182
 #, c-format
 msgid ""
 "Locale: %s (charset: %s)\n"
@@ -4042,7 +4038,7 @@ msgstr ""
 "Lokalizace: %s (znaková sada: %s)\n"
 "Operační systém: %s"
 
-#: src/gtk/about.c:186
+#: src/gtk/about.c:191
 #, c-format
 msgid ""
 "Locale: %s (charset: %s)\n"
@@ -4051,115 +4047,115 @@ msgstr ""
 "Lokalizace: %s (znaková sada: %s)\n"
 "Operační systém: neznámý"
 
-#: src/gtk/about.c:242 src/prefs_themes.c:705 src/wizard.c:527
+#: src/gtk/about.c:247 src/prefs_themes.c:805 src/wizard.c:527
 msgid "The Claws Mail Team"
 msgstr "Tým Claws Mail"
 
-#: src/gtk/about.c:261
+#: src/gtk/about.c:266
 msgid "Previous team members"
 msgstr "Dřívější členové týmu"
 
-#: src/gtk/about.c:280
+#: src/gtk/about.c:285
 msgid "The translation team"
 msgstr "Překladatelský tým"
 
-#: src/gtk/about.c:299
+#: src/gtk/about.c:304
 msgid "Documentation team"
 msgstr "Tým pro dokumentaci"
 
-#: src/gtk/about.c:318
+#: src/gtk/about.c:322
 msgid "Logo"
 msgstr "Logo"
 
-#: src/gtk/about.c:337
+#: src/gtk/about.c:341
 msgid "Icons"
 msgstr "Ikony"
 
-#: src/gtk/about.c:356
+#: src/gtk/about.c:360
 msgid "Contributors"
 msgstr "Přispěvatelé"
 
-#: src/gtk/about.c:404
-msgid "Compiled-in Features\n"
-msgstr "Zakompilované vlastnosti\n"
+#: src/gtk/about.c:408
+msgid "Compiled-in Features"
+msgstr "Zakompilované vlastnosti"
 
-#: src/gtk/about.c:420
+#: src/gtk/about.c:425
 msgctxt "compface"
 msgid "adds support for the X-Face header\n"
 msgstr "obrázky X-Face v hlavičce zprávy\n"
 
-#: src/gtk/about.c:430
+#: src/gtk/about.c:435
 msgctxt "Enchant"
 msgid "adds support for spell checking\n"
 msgstr "přidává podporu pro kontrolu pravopisu\n"
 
-#: src/gtk/about.c:440
+#: src/gtk/about.c:445
 msgctxt "GnuTLS"
 msgid "adds support for encrypted connections to servers\n"
 msgstr "přidává podporu pro šifrované spojení k severům\n"
 
-#: src/gtk/about.c:450
+#: src/gtk/about.c:455
 msgctxt "IPv6"
 msgid "adds support for IPv6 addresses, the new Internet addressing protocol\n"
 msgstr "přidává podporu IPv6 adres, nového protokolu adresování v Internetu\n"
 
-#: src/gtk/about.c:461
+#: src/gtk/about.c:466
 msgctxt "iconv"
 msgid "allows converting to and from different character sets\n"
 msgstr "konverze mezi různými znakovými sadami\n"
 
-#: src/gtk/about.c:471
+#: src/gtk/about.c:476
 msgctxt "JPilot"
 msgid "adds support for PalmOS addressbooks\n"
 msgstr "práce s adresáři PalmOS\n"
 
-#: src/gtk/about.c:481
+#: src/gtk/about.c:486
 msgctxt "LDAP"
 msgid "adds support for LDAP shared addressbooks\n"
 msgstr "práce s adresáři LDAP\n"
 
-#: src/gtk/about.c:491
+#: src/gtk/about.c:496
 msgctxt "libetpan"
 msgid "adds support for IMAP and NNTP servers\n"
 msgstr "přidává podporu IMAP a NNTP serverů\n"
 
-#: src/gtk/about.c:501
+#: src/gtk/about.c:506
 msgctxt "libSM"
 msgid "adds support for session handling\n"
 msgstr "správa X relací\n"
 
-#: src/gtk/about.c:511
+#: src/gtk/about.c:516
 msgctxt "NetworkManager"
 msgid "adds support for detection of network connection changes\n"
 msgstr "doplní podporu pro detekci změn síťových připojení\n"
 
-#: src/gtk/about.c:543
+#: src/gtk/about.c:526
+msgctxt "librSVG"
+msgid "adds support for SVG themes\n"
+msgstr "přidává podporu SVG témat\n"
+
+#: src/gtk/about.c:558
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 3, or (at your option) any later "
-"version.\n"
-"\n"
+"Software Foundation; either version 3, or (at your option) any later version."
 msgstr ""
 "Tento program je volně šiřitelný, můžete jej redistribuovat a/nebo měnit tak "
 "jak to popisuje GNU General Public License publikovaný Free Software "
 "Foundation a to ve verzi 3, nebo (podle vašeho uvážení) v jakékoliv pozdější "
-"verzi.\n"
-"\n"
+"verzi."
 
-#: src/gtk/about.c:549
+#: src/gtk/about.c:565
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
 "FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
-"more details.\n"
-"\n"
+"more details."
 msgstr ""
 "Tento program je šířen v dobré víře v jeho užitečnost, ale BEZ JAKÉKOLIV "
-"ZÁRUKY. Více detailů naleznete v GNU General Public License.\n"
-"\n"
+"ZÁRUKY. Více detailů naleznete v GNU General Public License."
 
-#: src/gtk/about.c:567
+#: src/gtk/about.c:584
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program. If not, see "
@@ -4167,83 +4163,83 @@ msgstr ""
 "Kopii GNU General Public License byste měli obdržet společně s tímto "
 "programem. Pokud ne, viz."
 
-#: src/gtk/about.c:698 src/main.c:2568
+#: src/gtk/about.c:717 src/main.c:2576
 msgid "Session statistics\n"
 msgstr "Statistiky relace\n"
 
-#: src/gtk/about.c:708 src/gtk/about.c:711 src/main.c:2578 src/main.c:2581
+#: src/gtk/about.c:727 src/gtk/about.c:730 src/main.c:2586 src/main.c:2589
 #, c-format
 msgid "Started: %s\n"
 msgstr "Spuštěno: %s\n"
 
-#: src/gtk/about.c:718 src/main.c:2587
+#: src/gtk/about.c:737 src/main.c:2595
 msgid "Incoming traffic\n"
 msgstr "Příchozí provoz\n"
 
-#: src/gtk/about.c:721 src/main.c:2590
+#: src/gtk/about.c:740 src/main.c:2598
 #, c-format
 msgid "Received messages: %d\n"
 msgstr "Přijaté zprávy: %d\n"
 
-#: src/gtk/about.c:728 src/main.c:2596
+#: src/gtk/about.c:747 src/main.c:2604
 msgid "Outgoing traffic\n"
 msgstr "Odchozí provoz\n"
 
-#: src/gtk/about.c:731 src/main.c:2599
+#: src/gtk/about.c:750 src/main.c:2607
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr "Nové/přesměrované zprávy: %d\n"
 
-#: src/gtk/about.c:736 src/main.c:2603
+#: src/gtk/about.c:755 src/main.c:2611
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr "Zodpovězené zprávy: %d\n"
 
-#: src/gtk/about.c:741 src/main.c:2607
+#: src/gtk/about.c:760 src/main.c:2615
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr "Přeposlané zprávy: %d\n"
 
-#: src/gtk/about.c:746 src/main.c:2611
+#: src/gtk/about.c:765 src/main.c:2619
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr "Celkem odchozích zpráv: %d\n"
 
-#: src/gtk/about.c:773
+#: src/gtk/about.c:792
 msgid "About Claws Mail"
 msgstr "O Claws Mail"
 
-#: src/gtk/about.c:831
+#: src/gtk/about.c:850
 msgid ""
-"Copyright (C) 1999-2016\n"
+"Copyright (C) 1999-2017\n"
 "The Claws Mail Team\n"
 "and Hiroyuki Yamamoto"
 msgstr ""
-"Copyright (C) 1999-2016\n"
+"Copyright (C) 1999-2017\n"
 "The Claws Mail Team\n"
 "a Hiroyuki Yamamoto"
 
-#: src/gtk/about.c:845
+#: src/gtk/about.c:864
 msgid "_Info"
 msgstr "_Informace"
 
-#: src/gtk/about.c:851
+#: src/gtk/about.c:870
 msgid "_Authors"
 msgstr "_Autoři"
 
-#: src/gtk/about.c:857
+#: src/gtk/about.c:876
 msgid "_Features"
 msgstr "_Vlastnosti"
 
-#: src/gtk/about.c:863
+#: src/gtk/about.c:882
 msgid "_License"
 msgstr "_Licence"
 
-#: src/gtk/about.c:871
+#: src/gtk/about.c:890
 msgid "_Release Notes"
 msgstr "_Poznámky k verzi"
 
-#: src/gtk/about.c:877
+#: src/gtk/about.c:896
 msgid "_Statistics"
 msgstr "_Statistiky"
 
@@ -4446,7 +4442,7 @@ msgid "Configuring..."
 msgstr "Nastavování..."
 
 #: src/gtk/headers.h:9 src/prefs_filtering_action.c:1259
-#: src/prefs_matcher.c:2165 src/prefs_summaries.c:435
+#: src/prefs_matcher.c:2166 src/prefs_summaries.c:443
 #: src/prefs_summary_column.c:84 src/quote_fmt.c:49 src/summaryview.c:445
 msgid "Date"
 msgstr "Datum"
@@ -4456,12 +4452,12 @@ msgid "Date:"
 msgstr "Datum:"
 
 #: src/gtk/headers.h:10 src/prefs_filtering_action.c:1256
-#: src/prefs_matcher.c:2162 src/prefs_summaries.c:437
+#: src/prefs_matcher.c:2163 src/prefs_summaries.c:445
 #: src/prefs_summary_column.c:82 src/quote_fmt.c:50 src/summaryview.c:443
 msgid "From"
 msgstr "Od"
 
-#: src/gtk/headers.h:10 src/summary_search.c:426
+#: src/gtk/headers.h:10 src/summary_search.c:474
 msgid "From:"
 msgstr "Od:"
 
@@ -4477,25 +4473,23 @@ msgstr "Odesílatel:"
 msgid "Reply-To"
 msgstr "Odpovědět komu"
 
-#: src/gtk/headers.h:13 src/plugins/address_keeper/address_keeper_prefs.c:140
-#: src/prefs_filtering_action.c:1257 src/prefs_matcher.c:2163
-#: src/prefs_summaries.c:438 src/prefs_summary_column.c:83 src/quote_fmt.c:57
-#: src/summaryview.c:444
+#: src/gtk/headers.h:13 src/prefs_filtering_action.c:1257
+#: src/prefs_matcher.c:2164 src/prefs_summaries.c:446
+#: src/prefs_summary_column.c:83 src/quote_fmt.c:57 src/summaryview.c:444
 msgid "To"
 msgstr "Komu"
 
-#: src/gtk/headers.h:14 src/plugins/address_keeper/address_keeper_prefs.c:149
-#: src/prefs_filtering_action.c:1258 src/prefs_matcher.c:2164
-#: src/quote_fmt.c:58
+#: src/gtk/headers.h:14 src/prefs_filtering_action.c:1258
+#: src/prefs_matcher.c:2165 src/quote_fmt.c:58
 msgid "Cc"
 msgstr "Kopie"
 
-#: src/gtk/headers.h:15 src/plugins/address_keeper/address_keeper_prefs.c:158
+#: src/gtk/headers.h:15
 msgid "Bcc"
 msgstr "Skrytá kopie"
 
 #: src/gtk/headers.h:16 src/prefs_filtering_action.c:1260
-#: src/prefs_matcher.c:2166 src/quote_fmt.c:61
+#: src/prefs_matcher.c:2167 src/quote_fmt.c:61
 msgid "Message-ID"
 msgstr "Message-ID"
 
@@ -4508,7 +4502,7 @@ msgid "In-Reply-To"
 msgstr "V odpovědi komu"
 
 #: src/gtk/headers.h:18 src/prefs_filtering_action.c:1262
-#: src/prefs_matcher.c:2168 src/quote_fmt.c:60
+#: src/prefs_matcher.c:2169 src/quote_fmt.c:60
 msgid "References"
 msgstr "References"
 
@@ -4517,17 +4511,17 @@ msgid "References:"
 msgstr "References:"
 
 #: src/gtk/headers.h:19 src/prefs_filtering_action.c:1255
-#: src/prefs_matcher.c:2161 src/prefs_summaries.c:439
+#: src/prefs_matcher.c:2162 src/prefs_summaries.c:447
 #: src/prefs_summary_column.c:81 src/quote_fmt.c:56 src/summaryview.c:442
 msgid "Subject"
 msgstr "Předmět"
 
 #: src/gtk/headers.h:19 src/plugins/pdf_viewer/poppler_viewer.c:700
-#: src/summary_search.c:440
+#: src/summary_search.c:488
 msgid "Subject:"
 msgstr "Předmět:"
 
-#: src/gtk/headers.h:20 src/plugins/rssyl/rssyl_feed_props.c:433
+#: src/gtk/headers.h:20 src/plugins/rssyl/rssyl_feed_props.c:431
 msgid "Comments"
 msgstr "Komentáře"
 
@@ -4616,7 +4610,7 @@ msgid "Received:"
 msgstr "Příjmuto:"
 
 #: src/gtk/headers.h:33 src/prefs_filtering_action.c:1261
-#: src/prefs_matcher.c:2167 src/quote_fmt.c:59
+#: src/prefs_matcher.c:2168 src/quote_fmt.c:59
 msgid "Newsgroups"
 msgstr "Diskusní skupiny"
 
@@ -4641,12 +4635,12 @@ msgid "Seen:"
 msgstr "Zobrazen:"
 
 #: src/gtk/headers.h:37 src/gtk/progressdialog.c:149
-#: src/gtk/sslcertwindow.c:164 src/prefs_summaries.c:443
-#: src/prefs_summary_column.c:79 src/summaryview.c:2812
+#: src/gtk/sslcertwindow.c:164 src/prefs_summaries.c:451
+#: src/prefs_summary_column.c:79 src/summaryview.c:2810
 msgid "Status"
 msgstr "Stav"
 
-#: src/gtk/headers.h:37 src/prefs_themes.c:880
+#: src/gtk/headers.h:37 src/prefs_themes.c:996
 msgid "Status:"
 msgstr "Stav:"
 
@@ -5023,12 +5017,12 @@ msgstr ""
 "%s\n"
 
 #: src/gtk/pluginwindow.c:303 src/plugins/acpi_notifier/acpi_notifier.c:790
-#: src/plugins/address_keeper/address_keeper_prefs.c:256
-#: src/plugins/archive/archiver_prefs.c:90
+#: src/plugins/address_keeper/address_keeper_prefs.c:273
+#: src/plugins/archive/archiver_prefs.c:106
 #: src/plugins/attachwarner/attachwarner_prefs.c:229
 #: src/plugins/bogofilter/bogofilter_gtk.c:498
 #: src/plugins/bsfilter/bsfilter_gtk.c:400
-#: src/plugins/clamd/clamav_plugin_gtk.c:548
+#: src/plugins/clamd/clamav_plugin_gtk.c:549
 #: src/plugins/fancy/fancy_prefs.c:114
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:181
 #: src/plugins/gdata/cm_gdata_prefs.c:137
@@ -5044,8 +5038,8 @@ msgstr ""
 #: src/plugins/notification/notification_prefs.c:522
 #: src/plugins/pgpcore/prefs_gpg.c:617 src/plugins/rssyl/rssyl_prefs.c:70
 #: src/plugins/spam_report/spam_report_prefs.c:82
-#: src/plugins/spamassassin/spamassassin_gtk.c:647
-#: src/plugins/vcalendar/vcal_prefs.c:774 src/prefs_toolbar.c:944
+#: src/plugins/spamassassin/spamassassin_gtk.c:648
+#: src/plugins/vcalendar/vcal_prefs.c:774 src/prefs_toolbar.c:957
 msgid "Plugins"
 msgstr "Zásuvné moduly"
 
@@ -5057,7 +5051,7 @@ msgstr "Zavést..."
 msgid "Unload"
 msgstr "Odebrat"
 
-#: src/gtk/pluginwindow.c:350 src/prefs_summaries.c:222
+#: src/gtk/pluginwindow.c:350 src/prefs_summaries.c:229
 msgid "Description"
 msgstr "Popis"
 
@@ -5083,7 +5077,7 @@ msgstr "Zavedené moduly"
 msgid "Page Index"
 msgstr "Index stránky"
 
-#: src/gtk/progressdialog.c:91 src/mainwindow.c:841
+#: src/gtk/progressdialog.c:91 src/mainwindow.c:843
 msgid "_Hide"
 msgstr "_Skrýt"
 
@@ -5091,209 +5085,212 @@ msgstr "_Skrýt"
 #: src/prefs_account.c:3286 src/prefs_account.c:3304 src/prefs_account.c:3322
 #: src/prefs_account.c:3340 src/prefs_account.c:3358 src/prefs_account.c:3376
 #: src/prefs_account.c:3395 src/prefs_account.c:3488
-#: src/prefs_filtering_action.c:1421 src/prefs_filtering.c:397
-#: src/prefs_filtering.c:1875
+#: src/prefs_filtering_action.c:1422 src/prefs_filtering.c:397
+#: src/prefs_filtering.c:1877
 msgid "Account"
 msgstr "Účet"
 
-#: src/gtk/quicksearch.c:451
+#: src/gtk/quicksearch.c:478
 msgid "all messages"
 msgstr "všechny zprávy"
 
-#: src/gtk/quicksearch.c:452
+#: src/gtk/quicksearch.c:479
 msgid "messages whose age is greater than # days"
 msgstr "zprávy starší než # dnů"
 
-#: src/gtk/quicksearch.c:453
+#: src/gtk/quicksearch.c:480
 msgid "messages whose age is less than # days"
 msgstr "zprávy mladší než # dnů"
 
-#: src/gtk/quicksearch.c:454
+#: src/gtk/quicksearch.c:481
 msgid "messages whose age is greater than # hours"
 msgstr "zprávy starší než # hodin"
 
-#: src/gtk/quicksearch.c:455
+#: src/gtk/quicksearch.c:482
 msgid "messages whose age is less than # hours"
 msgstr "zprávy mladší než # hodin"
 
-#: src/gtk/quicksearch.c:456
+#: src/gtk/quicksearch.c:483
 msgid "messages which contain S in the message body"
 msgstr "zprávy obsahující S v těle zprávy"
 
-#: src/gtk/quicksearch.c:457
+#: src/gtk/quicksearch.c:484
 msgid "messages which contain S in the whole message"
 msgstr "zprávy obsahující S v celé zprávě"
 
-#: src/gtk/quicksearch.c:458
+#: src/gtk/quicksearch.c:485
 msgid "messages carbon-copied to S"
 msgstr "zpráva obsahující S v poli \"Kopie\""
 
-#: src/gtk/quicksearch.c:459
-msgid "message is either to: or cc: to S"
+#: src/gtk/quicksearch.c:486
+msgid "message is either To: or Cc: to S"
 msgstr "zpráva obsahující S v poli \"Komu\" nebo \"Kopie\""
 
-#: src/gtk/quicksearch.c:460
+#: src/gtk/quicksearch.c:487
 msgid "deleted messages"
 msgstr "odstraněné zprávy"
 
-#: src/gtk/quicksearch.c:461
+#: src/gtk/quicksearch.c:488
 msgid "messages which contain S in the Sender field"
 msgstr "zpráva obsahující S v poli \"Odesílatel\""
 
-#: src/gtk/quicksearch.c:462
+#: src/gtk/quicksearch.c:489
 msgid "true if execute \"S\" succeeds"
 msgstr "pravda, pokud bylo provedení \"S\" úspěšné"
 
-#: src/gtk/quicksearch.c:463
+#: src/gtk/quicksearch.c:490
 msgid "messages originating from user S"
 msgstr "zprávy pocházející od uživatele S"
 
-#: src/gtk/quicksearch.c:464
+#: src/gtk/quicksearch.c:491
 msgid "forwarded messages"
 msgstr "přeposlané zprávy"
 
-#: src/gtk/quicksearch.c:465
+#: src/gtk/quicksearch.c:492
 msgid "messages which have attachments"
 msgstr "zprávy, které mají přílohy"
 
-#: src/gtk/quicksearch.c:466
+#: src/gtk/quicksearch.c:493
 msgid "messages which contain S in any header name or value"
 msgstr "zprávy obsahující S ve jméně nebo hodnotě záhlaví"
 
-#: src/gtk/quicksearch.c:467
+#: src/gtk/quicksearch.c:494
 msgid "messages which contain S in the value of any header"
 msgstr "zprávy obsahující S v hodnotě záhlaví"
 
-#: src/gtk/quicksearch.c:468
+#: src/gtk/quicksearch.c:495
 msgid "messages which contain S in Message-ID header"
 msgstr "zprávy obsahující S v záhlaví \"Message-ID\""
 
-#: src/gtk/quicksearch.c:469
+#: src/gtk/quicksearch.c:496
 msgid "messages which contain S in In-Reply-To header"
 msgstr "zprávy obsahující S v záhlaví In-Reply-To"
 
-#: src/gtk/quicksearch.c:470
+#: src/gtk/quicksearch.c:497
 msgid "messages which are marked with color #"
 msgstr "zprávy obarvené barvou č. #"
 
-#: src/gtk/quicksearch.c:471
+#: src/gtk/quicksearch.c:498
 msgid "locked messages"
 msgstr "zamknuté zprávy"
 
-#: src/gtk/quicksearch.c:472
+#: src/gtk/quicksearch.c:499
 msgid "messages which are in newsgroup S"
 msgstr "zprávy, které jsou v diskusní skupině S"
 
-#: src/gtk/quicksearch.c:473
+#: src/gtk/quicksearch.c:500
 msgid "new messages"
 msgstr "nové zprávy"
 
-#: src/gtk/quicksearch.c:474
+#: src/gtk/quicksearch.c:501
 msgid "old messages"
 msgstr "staré zprávy"
 
-#: src/gtk/quicksearch.c:475
+#: src/gtk/quicksearch.c:502
 msgid "incomplete messages (not entirely downloaded)"
 msgstr "nekompletní zprávy (zprávy neúplně stažené)"
 
-#: src/gtk/quicksearch.c:476
+#: src/gtk/quicksearch.c:503
 msgid "messages which you have replied to"
 msgstr "zprávy, na které bylo odpovězeno"
 
-#: src/gtk/quicksearch.c:477
+#: src/gtk/quicksearch.c:504
 msgid "read messages"
 msgstr "přečtené zprávy"
 
-#: src/gtk/quicksearch.c:478
+#: src/gtk/quicksearch.c:505
 msgid "messages which contain S in subject"
 msgstr "zprávy obsahující S v poli \"Předmět\""
 
-#: src/gtk/quicksearch.c:479
+#: src/gtk/quicksearch.c:506
 msgid "messages whose score is equal to # points"
 msgstr "zprávy, jejichž ohodnocení je rovné # bodům"
 
-#: src/gtk/quicksearch.c:480
+#: src/gtk/quicksearch.c:507
 msgid "messages whose score is greater than # points"
 msgstr "zprávy, jejichž ohodnocení je větší než # bodů"
 
-#: src/gtk/quicksearch.c:481
+#: src/gtk/quicksearch.c:508
 msgid "messages whose score is lower than # points"
 msgstr "zprávy, jejichž ohodnocení je menší než # bodů"
 
-#: src/gtk/quicksearch.c:482
+#: src/gtk/quicksearch.c:509
 msgid "messages whose size is equal to # bytes"
 msgstr "zprávy, jejichž velikost je rovna # bytů"
 
-#: src/gtk/quicksearch.c:483
+#: src/gtk/quicksearch.c:510
 msgid "messages whose size is greater than # bytes"
 msgstr "zprávy, jejichž velikost je větší než # bytů"
 
-#: src/gtk/quicksearch.c:484
+#: src/gtk/quicksearch.c:511
 msgid "messages whose size is smaller than # bytes"
 msgstr "zprávy, jejichž velikost je menší než # bytů"
 
-#: src/gtk/quicksearch.c:485
+#: src/gtk/quicksearch.c:512
 msgid "messages which have been sent to S"
 msgstr "zprávy, které byly odeslány S"
 
-#: src/gtk/quicksearch.c:486
+#: src/gtk/quicksearch.c:513
 msgid "messages which tags contain S"
 msgstr "zprávy se značkami obsahujícími S"
 
-#: src/gtk/quicksearch.c:487
+#: src/gtk/quicksearch.c:514
 msgid "messages which have tag(s)"
 msgstr "zprávy, se značkami"
 
-#: src/gtk/quicksearch.c:488
+#: src/gtk/quicksearch.c:515
 msgid "marked messages"
 msgstr "označené zprávy"
 
-#: src/gtk/quicksearch.c:489
+#: src/gtk/quicksearch.c:516
 msgid "unread messages"
 msgstr "nepřečtené zprávy"
 
-#: src/gtk/quicksearch.c:490
+#: src/gtk/quicksearch.c:517
 msgid "messages which contain S in References header"
 msgstr "zprávy obsahující S v záhlaví \"References\""
 
-#: src/gtk/quicksearch.c:491
+#: src/gtk/quicksearch.c:518
 #, c-format
 msgid "messages returning 0 when passed to command - %F is message file"
 msgstr "zprávy vracející 0, jsou-li předány příkazu - %F je soubor se zprávou"
 
-#: src/gtk/quicksearch.c:492
+#: src/gtk/quicksearch.c:519
 msgid "messages which contain S in X-Label header"
 msgstr "zprávy obsahující S v záhlaví \"X-Label\""
 
-#: src/gtk/quicksearch.c:494
+#: src/gtk/quicksearch.c:521
 msgid "logical AND operator"
 msgstr "logický operátor A (AND)"
 
-#: src/gtk/quicksearch.c:495
+#: src/gtk/quicksearch.c:522
 msgid "logical OR operator"
 msgstr "logický operátor NEBO (OR)"
 
-#: src/gtk/quicksearch.c:496
+#: src/gtk/quicksearch.c:523
 msgid "logical NOT operator"
 msgstr "logický operátor NENÍ PRAVDA, ŽE (NOT)"
 
-#: src/gtk/quicksearch.c:497
+#: src/gtk/quicksearch.c:524
 msgid "case sensitive search"
 msgstr "vyhledávání rozlišuje malá a velká písmena"
 
-#: src/gtk/quicksearch.c:498
+#: src/gtk/quicksearch.c:525
 msgid "match using regular expressions instead of substring search"
 msgstr "shodné pomocí regulárních výrazů místo hledání části řetězce"
 
-#: src/gtk/quicksearch.c:500
-msgid "all filtering expressions are allowed"
-msgstr "všechny filtrovací výrazy jsou povoleny"
+#: src/gtk/quicksearch.c:527
+msgid ""
+"all filtering expressions are allowed, but cannot be mixed through logical "
+"operators with the expressions above"
+msgstr ""
+"výrazy pro filtrování jsou povoleny, ale nemůžou být mixovány ve výrazu výše"
 
-#: src/gtk/quicksearch.c:509 src/summary_search.c:471
+#: src/gtk/quicksearch.c:537 src/summary_search.c:521
 msgid "Extended Search"
 msgstr "Rozšířené vyhledávání"
 
-#: src/gtk/quicksearch.c:510
+#: src/gtk/quicksearch.c:538
 msgid ""
 "Extended Search allows the user to define criteria that messages must have "
 "in order to match and be displayed in the message list.\n"
@@ -5303,51 +5300,51 @@ msgstr ""
 "splňovat, aby byla zobrazena v seznamu zpráv.\n"
 "Následující symboly mohou být použity:"
 
-#: src/gtk/quicksearch.c:610
+#: src/gtk/quicksearch.c:638
 msgid "Something went wrong during search. Please check your logs."
 msgstr "Něco selhalo během hledání. Prosím zkontrolujte záznamy."
 
-#: src/gtk/quicksearch.c:676
+#: src/gtk/quicksearch.c:704
 msgid "From/To/Cc/Subject/Tag"
 msgstr "Od/Komu/Kopie/Předmět/Značka"
 
-#: src/gtk/quicksearch.c:687 src/plugins/archive/archiver_prefs.c:314
+#: src/gtk/quicksearch.c:715 src/plugins/archive/archiver_prefs.c:416
 msgid "Recursive"
 msgstr "Včetně podsložek"
 
-#: src/gtk/quicksearch.c:696
+#: src/gtk/quicksearch.c:724
 msgid "Sticky"
 msgstr "Zachovat i při změně složky"
 
-#: src/gtk/quicksearch.c:706
+#: src/gtk/quicksearch.c:734
 msgid "Type-ahead"
 msgstr "Vyhledávat během psaní"
 
-#: src/gtk/quicksearch.c:718
+#: src/gtk/quicksearch.c:746
 msgid "Run on select"
 msgstr "Spustit na vybrané"
 
-#: src/gtk/quicksearch.c:760
+#: src/gtk/quicksearch.c:788
 msgid "Clear the current search"
 msgstr "Odstranit nastavenou podmínku"
 
-#: src/gtk/quicksearch.c:770 src/summary_search.c:424
+#: src/gtk/quicksearch.c:798 src/summary_search.c:472
 msgid "Edit search criteria"
 msgstr "Upravit vyhledávací kritéria"
 
-#: src/gtk/quicksearch.c:779
+#: src/gtk/quicksearch.c:807
 msgid "Information about extended symbols"
 msgstr "Informace o rozšířených možnostech vyhledávání"
 
-#: src/gtk/quicksearch.c:817 src/gtk/quicksearch.c:832
+#: src/gtk/quicksearch.c:845 src/gtk/quicksearch.c:869
 msgid "_Information"
 msgstr "_Informace"
 
-#: src/gtk/quicksearch.c:818 src/gtk/quicksearch.c:833
+#: src/gtk/quicksearch.c:846 src/gtk/quicksearch.c:870
 msgid "E_dit"
 msgstr "U_pravit"
 
-#: src/gtk/quicksearch.c:819 src/gtk/quicksearch.c:834 src/prefs_actions.c:347
+#: src/gtk/quicksearch.c:847 src/gtk/quicksearch.c:871 src/prefs_actions.c:347
 #: src/prefs_filtering.c:495 src/prefs_template.c:330
 msgid "C_lear"
 msgstr "Vyč_istit"
@@ -5366,7 +5363,7 @@ msgid "Signer"
 msgstr "Podepsal"
 
 #: src/gtk/sslcertwindow.c:170 src/gtk/sslcertwindow.c:194
-#: src/prefs_themes.c:836
+#: src/prefs_themes.c:952
 msgid "Name: "
 msgstr "Jméno: "
 
@@ -5498,15 +5495,15 @@ msgstr "Značky:"
 
 #: src/headerview.c:192 src/plugins/notification/notification_popup.c:313
 #: src/plugins/notification/notification_popup.c:620
-#: src/plugins/notification/notification_trayicon.c:884 src/summaryview.c:3383
-#: src/summaryview.c:3401 src/summaryview.c:3422
+#: src/plugins/notification/notification_trayicon.c:886 src/summaryview.c:3381
+#: src/summaryview.c:3399 src/summaryview.c:3420
 msgid "(No From)"
 msgstr "(Neznámý odesílatel)"
 
 #: src/headerview.c:207 src/plugins/notification/notification_popup.c:315
 #: src/plugins/notification/notification_popup.c:624
-#: src/plugins/notification/notification_trayicon.c:887 src/summaryview.c:3434
-#: src/summaryview.c:3437
+#: src/plugins/notification/notification_trayicon.c:889 src/summaryview.c:3432
+#: src/summaryview.c:3435
 msgid "(No Subject)"
 msgstr "(Žádný předmět)"
 
@@ -5514,7 +5511,7 @@ msgstr "(Žádný předmět)"
 msgid "Error:"
 msgstr "Chyba:"
 
-#: src/image_viewer.c:299 src/mimeview.c:2558
+#: src/image_viewer.c:299 src/mimeview.c:2611
 #: src/plugins/att_remover/att_remover.c:301
 #: src/plugins/pdf_viewer/poppler_viewer.c:696
 msgid "Filename:"
@@ -5528,193 +5525,193 @@ msgstr "Velikost souboru:"
 msgid "Load Image"
 msgstr "Načíst obrázek"
 
-#: src/imap.c:579
+#: src/imap.c:576
 msgid "IMAP connection broken\n"
 msgstr "Přerušeno IMAP spojení\n"
 
-#: src/imap.c:618 src/imap.c:621 src/imap.c:624 src/imap.c:627 src/imap.c:630
-#: src/imap.c:634 src/imap.c:637 src/imap.c:640 src/imap.c:643 src/imap.c:647
-#: src/imap.c:650 src/imap.c:653 src/imap.c:656 src/imap.c:659 src/imap.c:662
-#: src/imap.c:665 src/imap.c:668 src/imap.c:671 src/imap.c:674 src/imap.c:677
-#: src/imap.c:680 src/imap.c:683 src/imap.c:686 src/imap.c:689 src/imap.c:692
-#: src/imap.c:695 src/imap.c:698 src/imap.c:701 src/imap.c:704 src/imap.c:707
-#: src/imap.c:710 src/imap.c:713 src/imap.c:716 src/imap.c:719 src/imap.c:722
-#: src/imap.c:725 src/imap.c:728 src/imap.c:731 src/imap.c:734 src/imap.c:737
-#: src/imap.c:741 src/imap.c:745
+#: src/imap.c:615 src/imap.c:618 src/imap.c:621 src/imap.c:624 src/imap.c:627
+#: src/imap.c:631 src/imap.c:634 src/imap.c:637 src/imap.c:640 src/imap.c:644
+#: src/imap.c:647 src/imap.c:650 src/imap.c:653 src/imap.c:656 src/imap.c:659
+#: src/imap.c:662 src/imap.c:665 src/imap.c:668 src/imap.c:671 src/imap.c:674
+#: src/imap.c:677 src/imap.c:680 src/imap.c:683 src/imap.c:686 src/imap.c:689
+#: src/imap.c:692 src/imap.c:695 src/imap.c:698 src/imap.c:701 src/imap.c:704
+#: src/imap.c:707 src/imap.c:710 src/imap.c:713 src/imap.c:716 src/imap.c:719
+#: src/imap.c:722 src/imap.c:725 src/imap.c:728 src/imap.c:731 src/imap.c:734
+#: src/imap.c:738 src/imap.c:742
 #, c-format
 msgid "IMAP error on %s:"
 msgstr "IMAP chyba na %s:"
 
-#: src/imap.c:618
+#: src/imap.c:615
 msgid "authenticated"
 msgstr "autentizován"
 
-#: src/imap.c:621
+#: src/imap.c:618
 msgid "not authenticated"
 msgstr "ne autentizován"
 
-#: src/imap.c:624
+#: src/imap.c:621
 msgid "bad state"
 msgstr "špatný stav"
 
-#: src/imap.c:627
+#: src/imap.c:624
 msgid "stream error"
 msgstr "chyba proudu"
 
-#: src/imap.c:630
+#: src/imap.c:627
 msgid "parse error (very probably non-RFC compliance from the server)"
 msgstr "chyba parsování (velmi pravděpodobně non-RFC data ze serveru)"
 
-#: src/imap.c:634
+#: src/imap.c:631
 msgid "connection refused"
 msgstr "spojení odmítnuto"
 
-#: src/imap.c:637
+#: src/imap.c:634
 msgid "memory error"
 msgstr "chyba paměti"
 
-#: src/imap.c:640
+#: src/imap.c:637
 msgid "fatal error"
 msgstr "fatální chyba"
 
-#: src/imap.c:643
+#: src/imap.c:640
 msgid "protocol error (very probably non-RFC compliance from the server)"
 msgstr "chyba protokolu(velmi pravděpodobně non-RFC data ze serveru)"
 
-#: src/imap.c:647
+#: src/imap.c:644
 msgid "connection not accepted"
 msgstr "spojení nepřijato"
 
-#: src/imap.c:650
+#: src/imap.c:647
 msgid "APPEND error"
 msgstr "APPEND chyba"
 
-#: src/imap.c:653
+#: src/imap.c:650
 msgid "NOOP error"
 msgstr "NOOP chyba"
 
-#: src/imap.c:656
+#: src/imap.c:653
 msgid "LOGOUT error"
 msgstr "LOGOUT chyba"
 
-#: src/imap.c:659
+#: src/imap.c:656
 msgid "CAPABILITY error"
 msgstr "CAPABILITY chyba"
 
-#: src/imap.c:662
+#: src/imap.c:659
 msgid "CHECK error"
 msgstr "CHECK chyba"
 
-#: src/imap.c:665
+#: src/imap.c:662
 msgid "CLOSE error"
 msgstr "CLOSE chyba"
 
-#: src/imap.c:668
+#: src/imap.c:665
 msgid "EXPUNGE error"
 msgstr " EXPUNGE chyba"
 
-#: src/imap.c:671
+#: src/imap.c:668
 msgid "COPY error"
 msgstr "COPY chyba"
 
-#: src/imap.c:674
+#: src/imap.c:671
 msgid "UID COPY error"
 msgstr "UID COPY chyba"
 
-#: src/imap.c:677
+#: src/imap.c:674
 msgid "CREATE error"
 msgstr "CREATE chyba"
 
-#: src/imap.c:680
+#: src/imap.c:677
 msgid "DELETE error"
 msgstr "DELETE chyba"
 
-#: src/imap.c:683
+#: src/imap.c:680
 msgid "EXAMINE error"
 msgstr "EXAMINE chyba"
 
-#: src/imap.c:686
+#: src/imap.c:683
 msgid "FETCH error"
 msgstr "FETCH chyba"
 
-#: src/imap.c:689
+#: src/imap.c:686
 msgid "UID FETCH error"
 msgstr "UID FETCH chyba"
 
-#: src/imap.c:692
+#: src/imap.c:689
 msgid "LIST error"
 msgstr "LIST chyba"
 
-#: src/imap.c:695
+#: src/imap.c:692
 msgid "LOGIN error"
 msgstr "LOGIN chyba"
 
-#: src/imap.c:698
+#: src/imap.c:695
 msgid "LSUB error"
 msgstr "LSUB chyba"
 
-#: src/imap.c:701
+#: src/imap.c:698
 msgid "RENAME error"
 msgstr "RENAME chyba"
 
-#: src/imap.c:704
+#: src/imap.c:701
 msgid "SEARCH error"
 msgstr "SEARCH chyba"
 
-#: src/imap.c:707
+#: src/imap.c:704
 msgid "UID SEARCH error"
 msgstr "UID SEARCH chyba"
 
-#: src/imap.c:710
+#: src/imap.c:707
 msgid "SELECT error"
 msgstr "SELECT chyba"
 
-#: src/imap.c:713
+#: src/imap.c:710
 msgid "STATUS error"
 msgstr "STATUS chyba"
 
-#: src/imap.c:716
+#: src/imap.c:713
 msgid "STORE error"
 msgstr "STORE chyba"
 
-#: src/imap.c:719
+#: src/imap.c:716
 msgid "UID STORE error"
 msgstr "UID STORE chyba"
 
-#: src/imap.c:722
+#: src/imap.c:719
 msgid "SUBSCRIBE error"
 msgstr "SUBSCRIBE chyba"
 
-#: src/imap.c:725
+#: src/imap.c:722
 msgid "UNSUBSCRIBE error"
 msgstr "UNSUBSCRIBE chyba"
 
-#: src/imap.c:728
+#: src/imap.c:725
 msgid "STARTTLS error"
 msgstr "STARTTLS chyba"
 
-#: src/imap.c:731
+#: src/imap.c:728
 msgid "INVAL error"
 msgstr "INVAL chyba"
 
-#: src/imap.c:734
+#: src/imap.c:731
 msgid "EXTENSION error"
 msgstr "EXTENSION chyba"
 
-#: src/imap.c:737
+#: src/imap.c:734
 msgid "SASL error"
 msgstr "SASL chyba"
 
-#: src/imap.c:741
+#: src/imap.c:738
 msgid "SSL/TLS error"
 msgstr "SSL/TLS chyba"
 
-#: src/imap.c:745
+#: src/imap.c:742
 #, c-format
 msgid "Unknown error [%d]"
 msgstr "Neznámá chyba [%d]"
 
-#: src/imap.c:949
+#: src/imap.c:946
 msgid ""
 "\n"
 "\n"
@@ -5726,7 +5723,7 @@ msgstr ""
 "Přihlášení pomocí CRAM-MD5 pracuje pouze pokud byl libetpan zkompilován s "
 "podporou SASL a je nainstalován zásuvný modul CRAM-MD5 SASL."
 
-#: src/imap.c:955
+#: src/imap.c:952
 msgid ""
 "\n"
 "\n"
@@ -5738,7 +5735,7 @@ msgstr ""
 "Přihlášení pomocí DIGEST-MD5 pracuje pouze pokud byl libetpan zkompilován s "
 "podporou SASL a je nainstalován zásuvný modul DIGEST-MD5 SASL."
 
-#: src/imap.c:961
+#: src/imap.c:958
 msgid ""
 "\n"
 "\n"
@@ -5750,7 +5747,7 @@ msgstr ""
 "Přihlášení pomocí SCRAM-SHA-1 pracuje pouze pokud byl libetpan zkompilován s "
 "podporou SASL a je nainstalován zásuvný modul SCRAM SASL."
 
-#: src/imap.c:967
+#: src/imap.c:964
 msgid ""
 "\n"
 "\n"
@@ -5762,7 +5759,7 @@ msgstr ""
 "Přihlášení pomocí PLAIN pracuje pouze pokud byl libetpan zkompilován s "
 "podporou SASL a je nainstalován zásuvný modul PLAIN SASL."
 
-#: src/imap.c:973
+#: src/imap.c:970
 msgid ""
 "\n"
 "\n"
@@ -5774,37 +5771,37 @@ msgstr ""
 "Přihlášení pomocí LOGIN pracuje pouze pokud byl libetpan zkompilován s "
 "podporou SASL a je nainstalován zásuvný modul LOGIN SASL."
 
-#: src/imap.c:980
+#: src/imap.c:977
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Připojení k %s selhalo: přihlášení odmítnuto.%s"
 
-#: src/imap.c:984
+#: src/imap.c:981
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "Připojení k %s selhalo: přihlášení odmítnuto.%s\n"
 
-#: src/imap.c:1002
+#: src/imap.c:999
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Připojení k %s selhalo"
 
-#: src/imap.c:1009 src/imap.c:1012
+#: src/imap.c:1006 src/imap.c:1009
 #, c-format
 msgid "IMAP connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP spojení s %s bylo rozpojeno. Obnovuji spojení...\n"
 
-#: src/imap.c:1042 src/imap.c:3686 src/imap.c:4345 src/imap.c:4439
-#: src/imap.c:4617 src/imap.c:5428
+#: src/imap.c:1039 src/imap.c:3655 src/imap.c:4314 src/imap.c:4408
+#: src/imap.c:4586 src/imap.c:5397
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr ""
 "Claws Mail potřebuje přístup k síti, aby mohl přistupovat k IMAP serveru."
 
-#: src/imap.c:1151 src/inc.c:811 src/news.c:388 src/send_message.c:282
+#: src/imap.c:1148 src/inc.c:811 src/news.c:388 src/send_message.c:282
 msgid "Insecure connection"
 msgstr "Nezabezpečené připojení"
 
-#: src/imap.c:1152 src/inc.c:812 src/news.c:389 src/send_message.c:283
+#: src/imap.c:1149 src/inc.c:812 src/news.c:389 src/send_message.c:283
 msgid ""
 "This connection is configured to be secured using SSL/TLS, but SSL/TLS is "
 "not available in this build of Claws Mail. \n"
@@ -5817,104 +5814,104 @@ msgstr ""
 "\n"
 "Chcete pokračovat v připojování k serveru? Komunikace nebude zabezpečena."
 
-#: src/imap.c:1158 src/inc.c:818 src/news.c:395 src/send_message.c:289
+#: src/imap.c:1155 src/inc.c:818 src/news.c:395 src/send_message.c:289
 msgid "Con_tinue connecting"
 msgstr "_Pokračovat v připojování"
 
-#: src/imap.c:1168
+#: src/imap.c:1165
 #, c-format
 msgid "Account '%s': Connecting to IMAP server: %s:%d..."
 msgstr "Účet '%s': Připojuji se na IMAP server: %s:%d..."
 
-#: src/imap.c:1216
+#: src/imap.c:1213
 #, c-format
 msgid "Can't connect to IMAP server: %s:%d"
 msgstr "Nemohu se spojit s IMAP serverem: %s:%d"
 
-#: src/imap.c:1219
+#: src/imap.c:1216
 #, c-format
 msgid "Can't connect to IMAP server: %s:%d\n"
 msgstr "Nemohu se spojit s IMAP serverem: %s:%d\n"
 
-#: src/imap.c:1252 src/imap.c:4107
+#: src/imap.c:1249 src/imap.c:4076
 msgid "Can't start STARTTLS session.\n"
 msgstr "Nelze spustit STARTTLS relaci.\n"
 
-#: src/imap.c:1319
+#: src/imap.c:1316
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Nepodařilo se přihlásit k IMAP serveru %s.\n"
 
-#: src/imap.c:1322
+#: src/imap.c:1319
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Nepodařilo se přihlásit k IMAP serveru %s."
 
-#: src/imap.c:1749
+#: src/imap.c:1746
 msgid "Adding messages..."
 msgstr "Přidávám zprávy..."
 
-#: src/imap.c:1954 src/mh.c:529
+#: src/imap.c:1951 src/mh.c:529
 msgid "Copying messages..."
 msgstr "Kopíruji zprávy..."
 
-#: src/imap.c:2547
+#: src/imap.c:2544
 msgid "can't set deleted flags\n"
 msgstr "nelze nastavit příznak odstranění\n"
 
-#: src/imap.c:2554 src/imap.c:5058
+#: src/imap.c:2551 src/imap.c:5027
 msgid "can't expunge\n"
 msgstr "nelze odstranit\n"
 
-#: src/imap.c:2905
+#: src/imap.c:2902
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Vyhledávám odhlášené složky v %s..."
 
-#: src/imap.c:2908
+#: src/imap.c:2905
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Hledám podsložky %s..."
 
-#: src/imap.c:3226
+#: src/imap.c:3195
 msgid "can't create mailbox: LIST failed\n"
 msgstr "nelze vytvořit mailbox: selhal příkaz LIST\n"
 
-#: src/imap.c:3241
+#: src/imap.c:3210
 msgid "can't create mailbox\n"
 msgstr "nelze vytvořit mailbox\n"
 
-#: src/imap.c:3372
+#: src/imap.c:3341
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "nelze přejmenovat mailbox: %s na %s\n"
 
-#: src/imap.c:3485
+#: src/imap.c:3454
 msgid "can't delete mailbox\n"
 msgstr "nelze odstranit mailbox\n"
 
-#: src/imap.c:3764
+#: src/imap.c:3733
 msgid "LIST failed\n"
 msgstr "LIST selhal\n"
 
-#: src/imap.c:3849
+#: src/imap.c:3818
 msgid "Flagging messages..."
 msgstr "Označuji zprávy..."
 
-#: src/imap.c:3952
+#: src/imap.c:3921
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "nelze vybrat složku: %s\n"
 
-#: src/imap.c:4104
+#: src/imap.c:4073
 msgid "Server requires STARTTLS to log in.\n"
 msgstr "Server vyžaduje STARTTLS pro přihlášení.\n"
 
-#: src/imap.c:4114
+#: src/imap.c:4083
 msgid "Can't refresh capabilities.\n"
 msgstr "Nepodařilo se načíst údaje o schopnostech serveru IMAP.\n"
 
-#: src/imap.c:4119
+#: src/imap.c:4088
 #, c-format
 msgid ""
 "Connection to %s failed: server requires STARTTLS, but Claws Mail has been "
@@ -5923,20 +5920,20 @@ msgstr ""
 "Připojení k %s selhalo: server požaduje STARTTLS, ale Claws Mail je "
 "zkompilován bez podpory STARTTLS.\n"
 
-#: src/imap.c:4127
+#: src/imap.c:4096
 msgid "Server logins are disabled.\n"
 msgstr "Přihlašování k serveru je mimo provoz.\n"
 
-#: src/imap.c:4350
+#: src/imap.c:4319
 msgid "Fetching message..."
 msgstr "Stahuji zprávu..."
 
-#: src/imap.c:5051
+#: src/imap.c:5020
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "nelze nastavit příznak odstranění: %d\n"
 
-#: src/imap.c:6086
+#: src/imap.c:6055
 msgid ""
 "You have one or more IMAP accounts defined. However this version of Claws "
 "Mail has been built without IMAP support; your IMAP accounts are disabled.\n"
@@ -5986,7 +5983,7 @@ msgstr "_Odebírání"
 msgid "_Subscribe..."
 msgstr "_Odebírat..."
 
-#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:168
+#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:169
 msgid "_Unsubscribe..."
 msgstr "_Odhlásit..."
 
@@ -6022,21 +6019,21 @@ msgid "Inherit properties from parent folder"
 msgstr "Zdědit vlastnosti z rodičovské složky"
 
 #: src/imap_gtk.c:259 src/mh_gtk.c:252 src/news_gtk.c:290
-#: src/plugins/mailmbox/plugin_gtk.c:411 src/plugins/rssyl/rssyl_cb_menu.c:197
-#: src/plugins/vcalendar/vcal_folder.c:2044
+#: src/plugins/mailmbox/plugin_gtk.c:421 src/plugins/rssyl/rssyl_cb_menu.c:197
+#: src/plugins/vcalendar/vcal_folder.c:2055
 #, c-format
 msgid "Input new name for '%s':"
 msgstr "Zadejte nové jméno pro '%s':"
 
-#: src/imap_gtk.c:261 src/mh_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:412
+#: src/imap_gtk.c:261 src/mh_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:422
 #: src/plugins/rssyl/rssyl_cb_menu.c:198
-#: src/plugins/vcalendar/vcal_folder.c:2045
+#: src/plugins/vcalendar/vcal_folder.c:2056
 msgid "Rename folder"
 msgstr "Přejmenovat složku"
 
 #: src/imap_gtk.c:290 src/mh_gtk.c:280 src/news_gtk.c:312
-#: src/plugins/mailmbox/plugin_gtk.c:442 src/plugins/rssyl/rssyl_cb_menu.c:224
-#: src/plugins/vcalendar/vcal_folder.c:2065
+#: src/plugins/mailmbox/plugin_gtk.c:452 src/plugins/rssyl/rssyl_cb_menu.c:224
+#: src/plugins/vcalendar/vcal_folder.c:2076
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -6044,7 +6041,23 @@ msgstr ""
 "Složka nemohla být přejmenována.\n"
 "Nové jméno složky není dovoleno."
 
-#: src/imap_gtk.c:357 src/mh_gtk.c:203 src/plugins/rssyl/rssyl_cb_menu.c:152
+#: src/imap_gtk.c:318 src/mh_gtk.c:308 src/plugins/mailmbox/plugin_gtk.c:373
+#: src/summaryview.c:4626
+msgid "Select folder to move selected message to"
+msgid_plural "Select folder to move selected messages to"
+msgstr[0] "Vybrat složku pro přesunutí vybrané zprávy"
+msgstr[1] "Vybrat složku pro přesunutí vybrané zprávy"
+msgstr[2] "Vybrat složku pro přesunutí vybrané zprávy"
+
+#: src/imap_gtk.c:339 src/mh_gtk.c:329 src/plugins/mailmbox/plugin_gtk.c:394
+#: src/summaryview.c:4711
+msgid "Select folder to copy selected message to"
+msgid_plural "Select folder to copy selected messages to"
+msgstr[0] "Vybrat složku pro kopírování vybrané zprávy"
+msgstr[1] "Vybrat složku pro kopírování vybrané zprávy"
+msgstr[2] "Vybrat složku pro kopírování vybrané zprávy"
+
+#: src/imap_gtk.c:367 src/mh_gtk.c:203 src/plugins/rssyl/rssyl_cb_menu.c:152
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted. Recovery "
@@ -6057,44 +6070,44 @@ msgstr ""
 "\n"
 "Chcete je opravdu odstranit?"
 
-#: src/imap_gtk.c:376 src/news_gtk.c:265 src/plugins/mailmbox/plugin_gtk.c:347
+#: src/imap_gtk.c:386 src/news_gtk.c:265 src/plugins/mailmbox/plugin_gtk.c:347
 #: src/plugins/rssyl/rssyl_cb_menu.c:171
-#: src/plugins/vcalendar/vcal_folder.c:1998
+#: src/plugins/vcalendar/vcal_folder.c:2009
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Nemohu odstranit složku '%s'."
 
-#: src/imap_gtk.c:498
+#: src/imap_gtk.c:508
 #, c-format
 msgid "Do you want to search for unsubscribed subfolders of '%s'?"
 msgstr "Chcete vyhledat odhlášené podsložky v '%s'?"
 
-#: src/imap_gtk.c:501
+#: src/imap_gtk.c:511
 msgid "Search recursively"
 msgstr "Vyhledávat i v podsložkách"
 
-#: src/imap_gtk.c:506 src/imap_gtk.c:565
+#: src/imap_gtk.c:516 src/imap_gtk.c:575
 msgid "Subscriptions"
 msgstr "Odebírání"
 
-#: src/imap_gtk.c:507
+#: src/imap_gtk.c:517
 msgid "_Search"
 msgstr "_Vyhledat"
 
-#: src/imap_gtk.c:517
+#: src/imap_gtk.c:527
 #, c-format
 msgid "Choose a subfolder of %s to subscribe to: "
 msgstr "Vyberte podsložku ve složce %s, kterou chcete odebírat: "
 
-#: src/imap_gtk.c:528 src/mainwindow.c:679
+#: src/imap_gtk.c:538 src/mainwindow.c:680
 msgid "Subscribe"
 msgstr "Odebírat"
 
-#: src/imap_gtk.c:530 src/imap_gtk.c:532
+#: src/imap_gtk.c:540 src/imap_gtk.c:542
 msgid "All of them"
 msgstr "Všechny"
 
-#: src/imap_gtk.c:548
+#: src/imap_gtk.c:558
 msgid ""
 "This folder is already subscribed and has no unsubscribed subfolders.\n"
 "\n"
@@ -6106,29 +6119,29 @@ msgstr ""
 "Jestliže existují nové složky, vytvořené a přihlášené z jiného klienta, "
 "použijte \"Vyhledat nové složky\" v rodičovském adresáři."
 
-#: src/imap_gtk.c:557
+#: src/imap_gtk.c:567
 #, c-format
 msgid "Do you want to %s the '%s' folder?"
 msgstr "Chcete %s složku '%s'?"
 
-#: src/imap_gtk.c:558
+#: src/imap_gtk.c:568
 msgid "subscribe"
 msgstr "odebírat"
 
-#: src/imap_gtk.c:558
+#: src/imap_gtk.c:568
 msgid "unsubscribe"
 msgstr "odhlásit"
 
-#: src/imap_gtk.c:560 src/prefs_folder_item.c:1432 src/prefs_folder_item.c:1460
-#: src/prefs_folder_item.c:1488
+#: src/imap_gtk.c:570 src/prefs_folder_item.c:1447 src/prefs_folder_item.c:1475
+#: src/prefs_folder_item.c:1503
 msgid "Apply to subfolders"
 msgstr "Nastavit u podsložek"
 
-#: src/imap_gtk.c:566
+#: src/imap_gtk.c:576
 msgid "_Subscribe"
 msgstr "_Odebírat"
 
-#: src/imap_gtk.c:567 src/news_gtk.c:252
+#: src/imap_gtk.c:577 src/news_gtk.c:252
 msgid "_Unsubscribe"
 msgstr "_Odhlásit"
 
@@ -6164,6 +6177,10 @@ msgstr "Cílová složka nebyla nalezena."
 msgid "Select importing file"
 msgstr "Vybrat soubor pro import"
 
+#: src/import.c:272
+msgid "Select folder to import to"
+msgstr "Vybrat složku pro import"
+
 #: src/importldif.c:185
 msgid "Please specify address book name and file to import."
 msgstr "Zadejte prosím název knihy adres a soubor pro import."
@@ -6354,16 +6371,16 @@ msgstr "Hotovo (Nejsou žádné nové zprávy)"
 msgid "Connection failed"
 msgstr "Spojení selhalo"
 
-#: src/inc.c:649 src/plugins/managesieve/managesieve.c:886
+#: src/inc.c:649 src/plugins/managesieve/managesieve.c:887
 msgid "Auth failed"
 msgstr "Autentizace selhala"
 
-#: src/inc.c:656 src/prefs_matcher.c:398 src/prefs_summaries.c:446
-#: src/prefs_summary_column.c:88 src/summaryview.c:2808 src/summaryview.c:6277
+#: src/inc.c:656 src/prefs_matcher.c:398 src/prefs_summaries.c:454
+#: src/prefs_summary_column.c:88 src/summaryview.c:2806 src/summaryview.c:6319
 msgid "Locked"
 msgstr "Zamknuto"
 
-#: src/inc.c:666 src/plugins/spamassassin/spamassassin_gtk.c:377
+#: src/inc.c:666 src/plugins/spamassassin/spamassassin_gtk.c:378
 msgid "Timeout"
 msgstr "Časový limit"
 
@@ -6551,7 +6568,7 @@ msgstr "SN"
 msgid "Nick Name"
 msgstr "Přezdívka"
 
-#: src/main.c:244
+#: src/main.c:246
 #, c-format
 msgid ""
 "File '%s' already exists.\n"
@@ -6560,7 +6577,7 @@ msgstr ""
 "Soubor '%s' už existuje.\n"
 "Nemohu vytvořit složku."
 
-#: src/main.c:365
+#: src/main.c:367
 #, c-format
 msgid ""
 "Configuration for %s found.\n"
@@ -6569,7 +6586,7 @@ msgstr ""
 "Byla nalezena konfigurace pro %s.\n"
 "Chcete převést tuto konfiguraci?"
 
-#: src/main.c:367
+#: src/main.c:369
 #, c-format
 msgid ""
 "\n"
@@ -6582,11 +6599,11 @@ msgstr ""
 "Vaše pravidla filtrování Sylpheed mohou být převedena pomocí\n"
 "skriptu dostupného na %s."
 
-#: src/main.c:379
+#: src/main.c:381
 msgid "Keep old configuration"
 msgstr "Ponechat původní nastavení"
 
-#: src/main.c:382
+#: src/main.c:384
 msgid ""
 "Keeping a backup will allow you to go back to an older version, but may take "
 "a while if you have cached IMAP or News data, and will take some extra room "
@@ -6597,31 +6614,31 @@ msgstr ""
 "pro IMAP nebo diskuzní skupiny. Záloha také vyžaduje určité místo na vašem "
 "disku."
 
-#: src/main.c:390
+#: src/main.c:392
 msgid "Migration of configuration"
 msgstr "Převedení konfigurace"
 
-#: src/main.c:401
+#: src/main.c:403
 msgid "Copying configuration... This may take a while..."
 msgstr "Kopíruji konfiguraci... Může to chvíli trvat..."
 
-#: src/main.c:410
+#: src/main.c:412
 msgid "Migration failed!"
 msgstr "Převedení selhalo!"
 
-#: src/main.c:419
+#: src/main.c:421
 msgid "Migrating configuration..."
 msgstr "Převádím konfiguraci..."
 
-#: src/main.c:1120
+#: src/main.c:1128
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread není v glib podporován.\n"
 
-#: src/main.c:1140 src/main.c:1144 src/main.c:1148
+#: src/main.c:1148 src/main.c:1152 src/main.c:1156
 msgid "(or older)"
 msgstr "(nebo starší)"
 
-#: src/main.c:1449
+#: src/main.c:1457
 #, c-format
 msgid ""
 "The following plugin failed to load. Check the Plugins configuration for "
@@ -6641,7 +6658,7 @@ msgstr[2] ""
 "Následující zásuvné moduly se nepodařilo načíst. Zkontrolujte nastavení.\n"
 "%s"
 
-#: src/main.c:1500
+#: src/main.c:1508
 msgid ""
 "Claws Mail has detected a configured mailbox, but it is incomplete. It is "
 "possibly due to a failing IMAP account. Use \"Rebuild folder tree\" on the "
@@ -6651,7 +6668,7 @@ msgstr ""
 "Pravděpodobně chyba IMAP účtu. Použijte \"Obnovit strom složek\" v menu "
 "rodičovské složky pro opravu."
 
-#: src/main.c:1506
+#: src/main.c:1514
 msgid ""
 "Claws Mail has detected a configured mailbox, but could not load it. It is "
 "probably provided by an out-of-date external plugin. Please reinstall the "
@@ -6661,36 +6678,36 @@ msgstr ""
 "pochází od zastaralého externího modulu. Prosím přeinstalujte modul a zkuste "
 "to znovu."
 
-#: src/main.c:1751
+#: src/main.c:1759
 msgid "Missing filename\n"
 msgstr "Chybějící jméno souboru\n"
 
-#: src/main.c:1758
+#: src/main.c:1766
 msgid "Cannot open filename for reading\n"
 msgstr "Nepodařilo se otevřít soubor pro čtení\n"
 
-#: src/main.c:1769
+#: src/main.c:1777
 msgid "Malformed header\n"
 msgstr "Poškozená hlavička\n"
 
-#: src/main.c:1776
+#: src/main.c:1784
 msgid "Duplicated 'To:' header\n"
 msgstr "Duplikovaná hlavička 'To:'\n"
 
-#: src/main.c:1787
+#: src/main.c:1795
 msgid "Missing required 'To:' header\n"
 msgstr "Chybějící požadovaná hlavička 'To:'\n"
 
-#: src/main.c:1930
+#: src/main.c:1938
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Použití: %s [VOLBY]...\n"
 
-#: src/main.c:1932
+#: src/main.c:1940
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adresa]             otevře okno pro psaní nové zprávy"
 
-#: src/main.c:1933
+#: src/main.c:1941
 msgid ""
 "  --compose-from-file file\n"
 "                         open composition window with data from given file;\n"
@@ -6709,13 +6726,13 @@ msgstr ""
 "do\n"
 "                         prázdné řádky, pak tělo do konce souboru."
 
-#: src/main.c:1938
+#: src/main.c:1946
 msgid "  --subscribe [uri]      subscribe to the given URI if possible"
 msgstr ""
 "  --subscribe [uri]              přihlásí se k odběru zadaného URI pokud to "
 "lze"
 
-#: src/main.c:1939
+#: src/main.c:1947
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -6725,23 +6742,23 @@ msgstr ""
 "                         otevře okno pro psaní zprávy s připojeným\n"
 "                         souborem(y)"
 
-#: src/main.c:1942
+#: src/main.c:1950
 msgid "  --receive              receive new messages"
 msgstr "  --receive                      načte nové zprávy"
 
-#: src/main.c:1943
+#: src/main.c:1951
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all                  načte nové zprávy ze všech účtů"
 
-#: src/main.c:1944
+#: src/main.c:1952
 msgid "  --cancel-receiving     cancel receiving of messages"
 msgstr "  --cancel-receiving     zrušit přijímání zpráv"
 
-#: src/main.c:1945
+#: src/main.c:1953
 msgid "  --cancel-sending       cancel sending of messages"
 msgstr "  --cancel-sending       zrušit odesílání zpráv"
 
-#: src/main.c:1946
+#: src/main.c:1954
 msgid ""
 "  --search folder type request [recursive]\n"
 "                         searches mail\n"
@@ -6760,15 +6777,15 @@ msgstr ""
 "                         rekurzivně: nepravda když argument startuje s 0, n, "
 "N, f nebo F"
 
-#: src/main.c:1953
+#: src/main.c:1961
 msgid "  --send                 send all queued messages"
 msgstr "  --send                         pošle všechny pozdržené zprávy"
 
-#: src/main.c:1954
+#: src/main.c:1962
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [složka]...           zobrazit celkový počet zpráv"
 
-#: src/main.c:1955
+#: src/main.c:1963
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -6776,15 +6793,15 @@ msgstr ""
 "  --status-full [složka]...\n"
 "                         zobrazí status každé složky"
 
-#: src/main.c:1957
+#: src/main.c:1965
 msgid "  --statistics           show session statistics"
 msgstr "  --statistics           zobrazí statistiky relace"
 
-#: src/main.c:1958
+#: src/main.c:1966
 msgid "  --reset-statistics     reset session statistics"
 msgstr "  --reset-statistics     resetuje statistiky relace"
 
-#: src/main.c:1959
+#: src/main.c:1967
 msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"
 "                         folder is a folder id like 'folder/sub_folder'"
@@ -6792,35 +6809,35 @@ msgstr ""
 "  --select složka[/msg]  přejde na uvedenou složku/zprávu\n"
 "                         složka je id složky, např. 'složka/podsložka'"
 
-#: src/main.c:1961
+#: src/main.c:1969
 msgid "  --online               switch to online mode"
 msgstr "  --online                       přejde do online režimu"
 
-#: src/main.c:1962
+#: src/main.c:1970
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline                      přejde do offline režimu"
 
-#: src/main.c:1963
+#: src/main.c:1971
 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr "  --exit  --quit -q                       ukončí Claws Mail"
 
-#: src/main.c:1964
+#: src/main.c:1972
 msgid "  --debug                debug mode"
 msgstr "  --debug                        režim trasování"
 
-#: src/main.c:1965
+#: src/main.c:1973
 msgid "  --toggle-debug         toggle debug mode"
 msgstr "  --toggle-debug                        přepne režim trasování"
 
-#: src/main.c:1966
+#: src/main.c:1974
 msgid "  --help -h              display this help and exit"
 msgstr "  --help -h                         vypíše tuto nápovědu a skončí"
 
-#: src/main.c:1967
+#: src/main.c:1975
 msgid "  --version -v           output version information and exit"
 msgstr "  --version -v                   vypíše informace o verzi a skončí"
 
-#: src/main.c:1968
+#: src/main.c:1976
 msgid ""
 "  --version-full -V      output version and built-in features information "
 "and exit"
@@ -6828,11 +6845,11 @@ msgstr ""
 "  --version-full -V     vypíše informace o verzi a vestavěných vlastnostech "
 "a skončí"
 
-#: src/main.c:1969
+#: src/main.c:1977
 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir                   vypíše název adresáře s konfigurací"
 
-#: src/main.c:1970
+#: src/main.c:1978
 msgid ""
 "  --alternate-config-dir [dir]\n"
 "                         use specified configuration directory"
@@ -6840,7 +6857,7 @@ msgstr ""
 "  --alternate-config-dir [dir]\n"
 "                  použije zadaný adresář s konfigurací"
 
-#: src/main.c:1972
+#: src/main.c:1980
 msgid ""
 "  --geometry -geometry WxH+X+Y\n"
 "                         set geometry for main window"
@@ -6848,844 +6865,848 @@ msgstr ""
 "  --geometry -geometry WxH+X+Y\n"
 "                         nastaví polohu a velikost hlavního okna"
 
-#: src/main.c:2025
+#: src/main.c:2033
 msgid "Unknown option\n"
 msgstr "Neznámá volba\n"
 
-#: src/main.c:2043
+#: src/main.c:2051
 #, c-format
 msgid "Processing (%s)..."
 msgstr "Zpracovávám (%s)..."
 
-#: src/main.c:2046
+#: src/main.c:2054
 msgid "top level folder"
 msgstr "nejvyšší složka v hierarchii"
 
-#: src/main.c:2129
+#: src/main.c:2137
 msgid "Queued messages"
 msgstr "Pozdržené zprávy"
 
-#: src/main.c:2130
+#: src/main.c:2138
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Ve frontě jsou neodeslaně zprávy. Skončit nyní?"
 
-#: src/main.c:2872
+#: src/main.c:2880
 msgid "NetworkManager: network is online.\n"
 msgstr "NetworkManager: network is online.\n"
 
-#: src/main.c:2878
+#: src/main.c:2886
 msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: síť je odpojena.\n"
 
-#: src/mainwindow.c:511 src/messageview.c:208
+#: src/mainwindow.c:513 src/messageview.c:208
 msgid "_File"
 msgstr "_Soubor"
 
-#: src/mainwindow.c:513 src/messageview.c:210 src/summaryview.c:435
+#: src/mainwindow.c:515 src/messageview.c:210 src/summaryview.c:435
 msgid "_View"
 msgstr "Z_obrazit"
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:518
 msgid "_Configuration"
 msgstr "Nastav_ení"
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:522
 msgid "_Add mailbox"
 msgstr "_Přidat mailbox"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:523
 msgid "MH..."
 msgstr "MH..."
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:526
 msgid "Change mailbox order..."
 msgstr "Změnit pořadí schránek..."
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:529
 msgid "_Import mbox file..."
 msgstr "_Importovat mbox soubor..."
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:530
 msgid "_Export to mbox file..."
 msgstr "_Exportovat do mbox souboru..."
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:531
 msgid "_Export selected to mbox file..."
 msgstr "Exportovat _vybrané do mbox souboru..."
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:533
 msgid "Empty all _Trash folders"
 msgstr "Vyprázdnit všechny _koše"
 
-#: src/mainwindow.c:534 src/messageview.c:217
+#: src/mainwindow.c:536 src/messageview.c:217
 msgid "_Save email as..."
 msgstr "Uložit email j_ako..."
 
-#: src/mainwindow.c:535 src/messageview.c:218
+#: src/mainwindow.c:537 src/messageview.c:218
 msgid "_Save part as..."
 msgstr "Uložit část j_ako..."
 
-#: src/mainwindow.c:538 src/messageview.c:219
+#: src/mainwindow.c:540 src/messageview.c:219
 msgid "Page setup..."
 msgstr "Nastavení stránky..."
 
-#: src/mainwindow.c:539 src/messageview.c:220
+#: src/mainwindow.c:541 src/messageview.c:220
 msgid "_Print..."
 msgstr "_Tisk..."
 
-#: src/mainwindow.c:541
+#: src/mainwindow.c:543
 msgid "Synchronise folders"
 msgstr "Synchronizovat složky"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:545
 msgid "E_xit"
 msgstr "_Konec"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:550
 msgid "Select _thread"
 msgstr "Vybrat _vlákno"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:552
 msgid "_Find in current message..."
 msgstr "_Hledat v aktuální zprávě..."
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:554
 msgid "_Quick search"
 msgstr "_Rychlé vyhledávání"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:557
 msgid "Show or hi_de"
 msgstr "Zobrazit nebo s_krýt"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:558
 msgid "_Toolbar"
 msgstr "Nástrojová lišta"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:560
 msgid "Set displayed _columns"
 msgstr "Zobrazované _sloupce"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:561
 msgid "In _folder list..."
 msgstr "V seznamu _složek..."
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:562
 msgid "In _message list..."
 msgstr "V seznamu _zpráv..."
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:567
 msgid "La_yout"
 msgstr "Us_pořádání"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:569
 msgid "_Sort"
 msgstr "_Seřadit"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:571
 msgid "_Attract by subject"
 msgstr "_Seskupit dle předmětu"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:573
 msgid "E_xpand all threads"
 msgstr "Rozbalit vše_chna vlákna"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:574
 msgid "Co_llapse all threads"
 msgstr "_Sbalit všechna vlákna"
 
-#: src/mainwindow.c:575 src/messageview.c:231
+#: src/mainwindow.c:576 src/messageview.c:231
 msgid "_Go to"
 msgstr "_Jít na"
 
-#: src/mainwindow.c:576 src/messageview.c:232
+#: src/mainwindow.c:577 src/messageview.c:232
 msgid "_Previous message"
 msgstr "_Předchozí zpráva"
 
-#: src/mainwindow.c:577 src/messageview.c:233
+#: src/mainwindow.c:578 src/messageview.c:233
 msgid "_Next message"
 msgstr "_Další zpráva"
 
-#: src/mainwindow.c:579 src/messageview.c:235
+#: src/mainwindow.c:580 src/messageview.c:235
 msgid "P_revious unread message"
 msgstr "Pře_dchozí nepřečtenou zpráva"
 
-#: src/mainwindow.c:580 src/messageview.c:236
+#: src/mainwindow.c:581 src/messageview.c:236
 msgid "N_ext unread message"
 msgstr "Da_lší nepřečtená zpráva"
 
-#: src/mainwindow.c:582 src/messageview.c:238
+#: src/mainwindow.c:583 src/messageview.c:238
 msgid "Previous ne_w message"
 msgstr "Předchozí no_vá zpráva"
 
-#: src/mainwindow.c:583 src/messageview.c:239
+#: src/mainwindow.c:584 src/messageview.c:239
 msgid "Ne_xt new message"
 msgstr "D_alší nová zpráva"
 
-#: src/mainwindow.c:585 src/messageview.c:241
+#: src/mainwindow.c:586 src/messageview.c:241
 msgid "Previous _marked message"
 msgstr "Předchozí _označená zpráva"
 
-#: src/mainwindow.c:586 src/messageview.c:242
+#: src/mainwindow.c:587 src/messageview.c:242
 msgid "Next m_arked message"
 msgstr "Další o_značená zpráva"
 
-#: src/mainwindow.c:588 src/messageview.c:244
+#: src/mainwindow.c:589 src/messageview.c:244
 msgid "Previous _labeled message"
 msgstr "Předchozí _obarvená zpráva"
 
-#: src/mainwindow.c:589 src/messageview.c:245
+#: src/mainwindow.c:590 src/messageview.c:245
 msgid "Next la_beled message"
 msgstr "Další o_barvená zpráva"
 
-#: src/mainwindow.c:591 src/messageview.c:247
+#: src/mainwindow.c:592 src/messageview.c:247
 msgid "Previous opened message"
 msgstr "Předchozí otevřená zpráva"
 
-#: src/mainwindow.c:592 src/messageview.c:248
+#: src/mainwindow.c:593 src/messageview.c:248
 msgid "Next opened message"
 msgstr "Další otevřená zpráva"
 
-#: src/mainwindow.c:594 src/messageview.c:250
+#: src/mainwindow.c:595 src/messageview.c:250
 msgid "Parent message"
 msgstr "Rodičovská zpráva"
 
-#: src/mainwindow.c:596 src/messageview.c:252
+#: src/mainwindow.c:597 src/messageview.c:252
 msgid "Next unread _folder"
 msgstr "Následující nepřečtená _složka"
 
-#: src/mainwindow.c:597 src/messageview.c:253
+#: src/mainwindow.c:598 src/messageview.c:253
 msgid "F_older..."
 msgstr "Sl_ožka..."
 
-#: src/mainwindow.c:599 src/messageview.c:255 src/mimeview.c:200
+#: src/mainwindow.c:600 src/messageview.c:255 src/mimeview.c:200
 msgid "Next part"
 msgstr "Další část"
 
-#: src/mainwindow.c:600 src/messageview.c:256 src/mimeview.c:201
+#: src/mainwindow.c:601 src/messageview.c:256 src/mimeview.c:201
 msgid "Previous part"
 msgstr "Předchozí část"
 
-#: src/mainwindow.c:603 src/messageview.c:257
+#: src/mainwindow.c:604 src/messageview.c:257
 msgid "Message scroll"
 msgstr "Rolování zpráv"
 
-#: src/mainwindow.c:604 src/messageview.c:258
+#: src/mainwindow.c:605 src/messageview.c:258
 msgid "Previous line"
 msgstr "Předchozí řádek"
 
-#: src/mainwindow.c:605 src/messageview.c:259
+#: src/mainwindow.c:606 src/messageview.c:259
 msgid "Next line"
 msgstr "Další řádek"
 
-#: src/mainwindow.c:606 src/messageview.c:260 src/printing.c:481
+#: src/mainwindow.c:607 src/messageview.c:260 src/printing.c:481
 msgid "Previous page"
 msgstr "Předchozí stránka"
 
-#: src/mainwindow.c:607 src/messageview.c:261 src/printing.c:488
+#: src/mainwindow.c:608 src/messageview.c:261 src/printing.c:488
 msgid "Next page"
 msgstr "Další stránka"
 
-#: src/mainwindow.c:625 src/messageview.c:279
+#: src/mainwindow.c:626 src/messageview.c:279
 msgid "Decode"
 msgstr "Dekódovat"
 
-#: src/mainwindow.c:632
+#: src/mainwindow.c:633
 msgid "Open in new _window"
 msgstr "Otevřít v _novém okně"
 
-#: src/mainwindow.c:633 src/messageview.c:286
+#: src/mainwindow.c:634 src/messageview.c:286
 msgid "Mess_age source"
 msgstr "Zd_roj zprávy"
 
-#: src/mainwindow.c:635 src/messageview.c:287
+#: src/mainwindow.c:636 src/messageview.c:287
 msgid "Message part"
 msgstr "Část zprávy"
 
-#: src/mainwindow.c:636 src/messageview.c:288
+#: src/mainwindow.c:637 src/messageview.c:288
 msgid "View as text"
 msgstr "Zobrazit jako text"
 
-#: src/mainwindow.c:637 src/messageview.c:289 src/toolbar.c:403
+#: src/mainwindow.c:638 src/messageview.c:289 src/toolbar.c:491
 msgid "Open"
 msgstr "Otevřít"
 
-#: src/mainwindow.c:639 src/messageview.c:291
+#: src/mainwindow.c:640 src/messageview.c:291
 msgid "Open with..."
 msgstr "Otevřít čím..."
 
-#: src/mainwindow.c:643 src/messageview.c:294
+#: src/mainwindow.c:644 src/messageview.c:294
 msgid "Quotes"
 msgstr "Citace"
 
-#: src/mainwindow.c:645
+#: src/mainwindow.c:646
 msgid "_Update summary"
 msgstr "_Aktualizace souhrnu"
 
-#: src/mainwindow.c:648
+#: src/mainwindow.c:649
 msgid "Recei_ve"
 msgstr "Přij_mout"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:650
 msgid "Get from _current account"
 msgstr "Přijmout z _aktuálního účtu"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:651
 msgid "Get from _all accounts"
 msgstr "Přijmout ze _všech účtů"
 
-#: src/mainwindow.c:651
+#: src/mainwindow.c:652
 msgid "Cancel receivin_g"
 msgstr "Přerušit stahování zprá_v"
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:655
 msgid "_Send queued messages"
 msgstr "_Odeslat pozdržené zprávy"
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:660
 msgid "Compose a_n email message"
 msgstr "_Napsat nový mail"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:661
 msgid "Compose a news message"
 msgstr "_Napsat news zprávu"
 
-#: src/mainwindow.c:662 src/messageview.c:300
+#: src/mainwindow.c:663 src/messageview.c:300
 #: src/plugins/notification/notification_banner.c:95
 msgid "_Reply"
 msgstr "_Odpovědět"
 
-#: src/mainwindow.c:663 src/messageview.c:301 src/summaryview.c:427
+#: src/mainwindow.c:664 src/messageview.c:301 src/summaryview.c:427
 msgid "Repl_y to"
 msgstr "Odpovědět ko_mu"
 
-#: src/mainwindow.c:666 src/messageview.c:304
+#: src/mainwindow.c:667 src/messageview.c:304
 msgid "Mailing _list"
 msgstr "Kon_ference"
 
-#: src/mainwindow.c:667
+#: src/mainwindow.c:668
 msgid "Follow-up and reply to"
 msgstr "Postoupit a odpovědět"
 
-#: src/mainwindow.c:670 src/messageview.c:307 src/toolbar.c:2069
+#: src/mainwindow.c:671 src/messageview.c:307 src/toolbar.c:2368
 msgid "_Forward"
 msgstr "Pře_dat"
 
-#: src/mainwindow.c:671 src/messageview.c:308 src/toolbar.c:2070
+#: src/mainwindow.c:672 src/messageview.c:308 src/toolbar.c:2369
 msgid "For_ward as attachment"
 msgstr "Předat jako pří_lohu"
 
-#: src/mainwindow.c:672 src/messageview.c:309 src/toolbar.c:2071
+#: src/mainwindow.c:673 src/messageview.c:309 src/toolbar.c:2370
 msgid "Redirec_t"
 msgstr "Pře_směrovat"
 
-#: src/mainwindow.c:674
+#: src/mainwindow.c:675
 msgid "Mailing-_List"
 msgstr "Kon_ference"
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:676
 msgid "Post"
 msgstr "Pošta"
 
-#: src/mainwindow.c:677
+#: src/mainwindow.c:678
 msgid "Help"
 msgstr "Nápověda"
 
-#: src/mainwindow.c:681
+#: src/mainwindow.c:682
 msgid "Unsubscribe"
 msgstr "Odhlásit"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:684
 msgid "View archive"
 msgstr "Zobrazit archív"
 
-#: src/mainwindow.c:685
+#: src/mainwindow.c:686
 msgid "Contact owner"
 msgstr "Kontaktovat vlastníka"
 
-#: src/mainwindow.c:689
+#: src/mainwindow.c:690
 msgid "M_ove..."
 msgstr "Přesunou_t..."
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:691
 msgid "_Copy..."
 msgstr "_Kopírovat..."
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:692
 msgid "Move to _trash"
 msgstr "Přesuno_ut do koše"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:693
 msgid "_Delete..."
 msgstr "_Odstranit..."
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:694
 msgid "Move thread to tr_ash"
 msgstr "Přesunout vlákno do _koše"
 
-#: src/mainwindow.c:694
+#: src/mainwindow.c:695
 msgid "Delete t_hread"
 msgstr "Odstranit _vlákno"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:696
 msgid "Cancel a news message"
 msgstr "Stornovat news zprávu"
 
-#: src/mainwindow.c:698 src/mainwindow.c:699 src/summaryview.c:428
+#: src/mainwindow.c:699 src/mainwindow.c:700 src/summaryview.c:428
 msgid "_Mark"
 msgstr "Označ_it"
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:701
 msgid "_Unmark"
 msgstr "Odo_značit"
 
-#: src/mainwindow.c:703
-msgid "Mark as unr_ead"
-msgstr "Označit jako _nepřečtené"
-
 #: src/mainwindow.c:704
 msgid "Mark as rea_d"
 msgstr "Označit jako _přečtené"
 
-#: src/mainwindow.c:706
+#: src/mainwindow.c:705
+msgid "Mark as unr_ead"
+msgstr "Označit jako _nepřečtené"
+
+#: src/mainwindow.c:707
 msgid "Mark all read"
 msgstr "Označit všechny jako přečtené"
 
-#: src/mainwindow.c:708 src/prefs_filtering_action.c:199 src/toolbar.c:208
-#: src/toolbar.c:419
+#: src/mainwindow.c:708
+msgid "Mark all unread"
+msgstr "Označit všechny jako nepřečtené"
+
+#: src/mainwindow.c:710 src/prefs_filtering_action.c:199 src/toolbar.c:242
+#: src/toolbar.c:500
 msgid "Ignore thread"
 msgstr "Ignorovat vlákno"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:711
 msgid "Unignore thread"
 msgstr "Přestat ignorovat vlákno"
 
-#: src/mainwindow.c:710 src/prefs_filtering_action.c:200 src/toolbar.c:209
-#: src/toolbar.c:420
+#: src/mainwindow.c:712 src/prefs_filtering_action.c:200 src/toolbar.c:243
+#: src/toolbar.c:501
 msgid "Watch thread"
 msgstr "Sledovat vlákno"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:713
 msgid "Unwatch thread"
 msgstr "Nesledovat vlákno"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:716
 msgid "Mark as _spam"
 msgstr "Označit jako _spam"
 
-#: src/mainwindow.c:715
+#: src/mainwindow.c:717
 msgid "Mark as _ham"
 msgstr "Označit jako n_e spam"
 
-#: src/mainwindow.c:718 src/prefs_filtering_action.c:181
+#: src/mainwindow.c:720 src/prefs_filtering_action.c:181 src/toolbar.c:504
 msgid "Lock"
 msgstr "Zamknout"
 
-#: src/mainwindow.c:719 src/prefs_filtering_action.c:182
+#: src/mainwindow.c:721 src/prefs_filtering_action.c:182 src/toolbar.c:505
 msgid "Unlock"
 msgstr "Odemknout"
 
-#: src/mainwindow.c:721 src/summaryview.c:429
+#: src/mainwindow.c:723 src/summaryview.c:429
 msgid "Color la_bel"
 msgstr "O_barvit"
 
-#: src/mainwindow.c:722 src/summaryview.c:430
+#: src/mainwindow.c:724 src/summaryview.c:430
 msgid "Ta_gs"
 msgstr "Zn_ačky"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:727
 msgid "Re-_edit"
 msgstr "Znovu _upravit"
 
-#: src/mainwindow.c:728 src/messageview.c:310 src/mimeview.c:1021
+#: src/mainwindow.c:730 src/messageview.c:310 src/mimeview.c:1021
 msgid "Check signature"
 msgstr "Zkontrolovat podpis"
 
-#: src/mainwindow.c:733 src/messageview.c:314
+#: src/mainwindow.c:735 src/messageview.c:314
 msgid "Add sender to address boo_k"
 msgstr "Přidat odesílatele do kni_hy adres"
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:737
 msgid "C_ollect addresses"
 msgstr "S_bírat adresy"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:738
 msgid "From current _folder..."
 msgstr "Z aktuální _složky..."
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:739
 msgid "From selected _messages..."
 msgstr "Z vybraných _zpráv..."
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:742
 msgid "_Filter all messages in folder"
 msgstr "Pře_filtrovat všechny zprávy ve složce"
 
-#: src/mainwindow.c:741
+#: src/mainwindow.c:743
 msgid "Filter _selected messages"
 msgstr "Přefiltrovat _vybrané zprávy"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:744
 msgid "Run folder pr_ocessing rules"
 msgstr "Spustit pravidl_o zpracování složky"
 
-#: src/mainwindow.c:744 src/messageview.c:317
+#: src/mainwindow.c:746 src/messageview.c:317
 msgid "_Create filter rule"
 msgstr "Vytvořit pravidlo _filtru"
 
-#: src/mainwindow.c:745 src/mainwindow.c:751 src/messageview.c:318
+#: src/mainwindow.c:747 src/mainwindow.c:753 src/messageview.c:318
 #: src/messageview.c:324
 msgid "_Automatically"
 msgstr "_Automaticky"
 
-#: src/mainwindow.c:746 src/mainwindow.c:752 src/mainwindow.c:858
+#: src/mainwindow.c:748 src/mainwindow.c:754 src/mainwindow.c:860
 #: src/messageview.c:319 src/messageview.c:325
 msgid "By _From"
 msgstr "Podle _Od"
 
-#: src/mainwindow.c:747 src/mainwindow.c:753 src/mainwindow.c:859
+#: src/mainwindow.c:749 src/mainwindow.c:755 src/mainwindow.c:861
 #: src/messageview.c:320 src/messageview.c:326
 msgid "By _To"
 msgstr "Podle _Komu"
 
-#: src/mainwindow.c:748 src/mainwindow.c:754 src/messageview.c:321
+#: src/mainwindow.c:750 src/mainwindow.c:756 src/messageview.c:321
 #: src/messageview.c:327
 msgid "By _Subject"
 msgstr "Podle _Předmětu"
 
-#: src/mainwindow.c:750 src/messageview.c:323 src/summaryview.c:433
+#: src/mainwindow.c:752 src/messageview.c:323 src/summaryview.c:433
 msgid "Create processing rule"
 msgstr "Vytvořit pravidlo zpracování"
 
-#: src/mainwindow.c:757 src/messageview.c:331
+#: src/mainwindow.c:759 src/messageview.c:330
 msgid "List _URLs..."
 msgstr "Seznam _URLs..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:766
 msgid "Ch_eck for new messages in all folders"
 msgstr "_Zjistit nové zprávy ve všech složkách"
 
-#: src/mainwindow.c:765
+#: src/mainwindow.c:767
 msgid "Delete du_plicated messages"
 msgstr "_Odstranit duplikáty zpráv"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:768
 msgid "In selected folder"
 msgstr "Ve vybrané složce"
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:769
 msgid "In all folders"
 msgstr "Ve všech složkách"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:772
 msgid "E_xecute"
 msgstr "S_pustit"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:773
 msgid "Exp_unge"
 msgstr "Vy_mazat"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:776
 msgid "SSL/TLS cer_tificates"
 msgstr "SSL/TLS cer_tifikáty"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:780
 msgid "Filtering Lo_g"
 msgstr "Záznam filtrování"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "Network _Log"
 msgstr "Záznam o připojení"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:784
 msgid "_Forget all session passwords"
 msgstr "_Zapomenout všechna hesla relace"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:786
 msgid "Forget _master passphrase"
 msgstr "Zapomenout _hlavní heslo"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:790
 msgid "C_hange current account"
 msgstr "_Zvolit aktuální účet"
 
-#: src/mainwindow.c:790
+#: src/mainwindow.c:792
 msgid "_Preferences for current account..."
 msgstr "Upravit a_ktuální účet..."
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:793
 msgid "Create _new account..."
 msgstr "Vytvořit _nový účet..."
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:794
 msgid "_Edit accounts..."
 msgstr "U_pravit účty..."
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:797
 msgid "P_references..."
 msgstr "_Volby..."
 
-#: src/mainwindow.c:796
+#: src/mainwindow.c:798
 msgid "Pre-pr_ocessing..."
 msgstr "Před zpracování..."
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:799
 msgid "Post-pro_cessing..."
 msgstr "Následné zpracování..."
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:800
 msgid "_Filtering..."
 msgstr "_Filtrování..."
 
-#: src/mainwindow.c:799
+#: src/mainwindow.c:801
 msgid "_Templates..."
 msgstr "Ša_blony..."
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:802
 msgid "_Actions..."
 msgstr "_Akce..."
 
-#: src/mainwindow.c:801
+#: src/mainwindow.c:803
 msgid "Tag_s..."
 msgstr "Znač_ky..."
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:805
 msgid "Plu_gins..."
 msgstr "Zásuvné _moduly..."
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:808
 msgid "_Manual"
 msgstr "_Manuál"
 
-#: src/mainwindow.c:807
+#: src/mainwindow.c:809
 msgid "_Online User-contributed FAQ"
 msgstr "FAQ (online)"
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:810
 msgid "Icon _Legend"
 msgstr "_Význam ikon"
 
-#: src/mainwindow.c:810
+#: src/mainwindow.c:812
 msgid "Set as default client"
 msgstr "Nastavit jako výchozí klient"
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:819
 msgid "Offline _mode"
 msgstr "Offline _mód"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:820
 msgid "Men_ubar"
 msgstr "Řádek men_u"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:821
 msgid "_Message view"
 msgstr "_Náhled zprávy"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:823
 msgid "Status _bar"
 msgstr "_Stavový řádek"
 
-#: src/mainwindow.c:823
+#: src/mainwindow.c:825
 msgid "Column headers"
 msgstr "Záhlaví sloupců"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:826
 msgid "Th_read view"
 msgstr "Zobrazit _vlákna"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:827
 msgid "Hide read threads"
 msgstr "Skrýt přečtená vlákna"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:828
 msgid "_Hide read messages"
 msgstr "Skrýt přeč_tené zprávy"
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:829
 msgid "Hide deleted messages"
 msgstr "Skrýt odstraněné zprávy"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:830
 msgid "_Fullscreen"
 msgstr "_Celá obrazovka"
 
-#: src/mainwindow.c:829 src/messageview.c:343
+#: src/mainwindow.c:831 src/messageview.c:342
 msgid "Show all _headers"
 msgstr "Zobrazit všechny _hlavičky"
 
-#: src/mainwindow.c:830 src/messageview.c:344
+#: src/mainwindow.c:832 src/messageview.c:343
 msgid "_Collapse all"
 msgstr "_Sbalit vše"
 
-#: src/mainwindow.c:831 src/messageview.c:345
+#: src/mainwindow.c:833 src/messageview.c:344
 msgid "Collapse from level _2"
 msgstr "Sbalit od úrovně _2"
 
-#: src/mainwindow.c:832 src/messageview.c:346
+#: src/mainwindow.c:834 src/messageview.c:345
 msgid "Collapse from level _3"
 msgstr "Sbalit od úrovně _3"
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:838
 msgid "Text _below icons"
 msgstr "Text _pod ikonami"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:839
 msgid "Text be_side icons"
 msgstr "Text _vedle ikon"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:840
 msgid "_Icons only"
 msgstr "Jen _ikony"
 
-#: src/mainwindow.c:839
+#: src/mainwindow.c:841
 msgid "_Text only"
 msgstr "Jen _text"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:848
 msgid "_Standard"
 msgstr "_Standartní"
 
-#: src/mainwindow.c:847
+#: src/mainwindow.c:849
 msgid "_Three columns"
 msgstr "_Tři sloupce"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:850
 msgid "_Wide message"
 msgstr "Široký náhled _zpráv"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:851
 msgid "W_ide message list"
 msgstr "Široký _seznam zpráv"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:852
 msgid "S_mall screen"
 msgstr "_Malá obrazovka"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:856
 msgid "By _number"
 msgstr "Podle čí_sla"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:857
 msgid "By s_ize"
 msgstr "Podle _velikosti"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:858
 msgid "By _date"
 msgstr "Podle _data"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:859
 msgid "By thread date"
 msgstr "Podle data vlákna"
 
-#: src/mainwindow.c:860
+#: src/mainwindow.c:862
 msgid "By s_ubject"
 msgstr "Podle _předmětu"
 
-#: src/mainwindow.c:861
+#: src/mainwindow.c:863
 msgid "By _color label"
 msgstr "Podle _barevného označení zprávy"
 
-#: src/mainwindow.c:862
+#: src/mainwindow.c:864
 msgid "By tag"
 msgstr "Podle tag"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:865
 msgid "By _mark"
 msgstr "Podle _značky"
 
-#: src/mainwindow.c:864
+#: src/mainwindow.c:866
 msgid "By _status"
 msgstr "Podle _stavu"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:867
 msgid "By a_ttachment"
 msgstr "Podle _přílohy"
 
-#: src/mainwindow.c:866
+#: src/mainwindow.c:868
 msgid "By score"
 msgstr "Podle skóre"
 
-#: src/mainwindow.c:867
+#: src/mainwindow.c:869
 msgid "By locked"
 msgstr "Podle zamknuto"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:870
 msgid "D_on't sort"
 msgstr "N_eřadit"
 
-#: src/mainwindow.c:872 src/prefs_summaries.c:455
+#: src/mainwindow.c:874 src/prefs_summaries.c:463
 msgid "Ascending"
 msgstr "Vzestupně"
 
-#: src/mainwindow.c:873 src/prefs_summaries.c:456
+#: src/mainwindow.c:875 src/prefs_summaries.c:464
 msgid "Descending"
 msgstr "Sestupně"
 
-#: src/mainwindow.c:915 src/messageview.c:388
+#: src/mainwindow.c:917 src/messageview.c:387
 msgid "_Auto detect"
 msgstr "_Autodetekce"
 
-#: src/mainwindow.c:1312 src/summaryview.c:6203
+#: src/mainwindow.c:1314 src/summaryview.c:6245
 msgid "Apply tags..."
 msgstr "Použít značky..."
 
-#: src/mainwindow.c:1959
+#: src/mainwindow.c:1962
 msgid "Some error(s) happened. Click here to view log."
 msgstr "Došlo k chybě (chybám). Klikněte zde pro zobrazení protokolu."
 
-#: src/mainwindow.c:1974
+#: src/mainwindow.c:1977
 msgid "You are online. Click the icon to go offline"
 msgstr ""
 "Pracujete v režimu online. Klikněte na ikonu pro přechod do režimu offline"
 
-#: src/mainwindow.c:1977
+#: src/mainwindow.c:1980
 msgid "You are offline. Click the icon to go online"
 msgstr ""
 "Pracujete v režimu offline. Klikněte na ikonu pro přechod do režimu online"
 
-#: src/mainwindow.c:1991
+#: src/mainwindow.c:1994
 msgid "Select account"
 msgstr "Vybrat účet"
 
-#: src/mainwindow.c:2018 src/prefs_logging.c:140
+#: src/mainwindow.c:2021 src/prefs_logging.c:140
 msgid "Network log"
 msgstr "Síťový protokol"
 
-#: src/mainwindow.c:2022
+#: src/mainwindow.c:2025
 msgid "Filtering/Processing debug log"
 msgstr "Protokol filtrování zpráv a zpracování složek"
 
-#: src/mainwindow.c:2041 src/prefs_logging.c:392
+#: src/mainwindow.c:2044 src/prefs_logging.c:392
 msgid "filtering log enabled\n"
 msgstr "protokolování filtrů zapnuto\n"
 
-#: src/mainwindow.c:2043 src/prefs_logging.c:394
+#: src/mainwindow.c:2046 src/prefs_logging.c:394
 msgid "filtering log disabled\n"
 msgstr "protokolování filtrů vypnuto\n"
 
-#: src/mainwindow.c:2486 src/mainwindow.c:2493 src/mainwindow.c:2536
-#: src/mainwindow.c:2569 src/mainwindow.c:2601 src/mainwindow.c:2646
+#: src/mainwindow.c:2489 src/mainwindow.c:2496 src/mainwindow.c:2539
+#: src/mainwindow.c:2572 src/mainwindow.c:2604 src/mainwindow.c:2649
 #: src/plugins/notification/notification_trayicon.c:372
-#: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1062
+#: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1077
 msgid "Untitled"
 msgstr "Neoznačený"
 
-#: src/mainwindow.c:2647 src/prefs_summary_open.c:114
+#: src/mainwindow.c:2650 src/prefs_summary_open.c:114
 msgid "none"
 msgstr "žádný"
 
-#: src/mainwindow.c:2904 src/mainwindow.c:2908
+#: src/mainwindow.c:2907 src/mainwindow.c:2911
 msgid "Delete all messages in trash folders?"
 msgstr "Odstranit všechny zprávy ve VŠECH koších?"
 
-#: src/mainwindow.c:2905
+#: src/mainwindow.c:2908
 msgid "Don't quit"
 msgstr "Neukončit"
 
-#: src/mainwindow.c:2934 src/plugins/mailmbox/plugin_gtk.c:189
+#: src/mainwindow.c:2937 src/plugins/mailmbox/plugin_gtk.c:189
 msgid "Add mailbox"
 msgstr "Přidat mailbox"
 
-#: src/mainwindow.c:2935
+#: src/mainwindow.c:2938
 msgid ""
 "Input the location of mailbox.\n"
 "If an existing mailbox is specified, it will be\n"
@@ -7695,18 +7716,18 @@ msgstr ""
 "Pokud je zadán existující, bude automaticky\n"
 "prohledán."
 
-#: src/mainwindow.c:2941 src/plugins/mailmbox/plugin_gtk.c:196
+#: src/mainwindow.c:2944 src/plugins/mailmbox/plugin_gtk.c:196
 #: src/plugins/rssyl/rssyl_gtk.c:132
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Mailbox '%s' již existuje."
 
-#: src/mainwindow.c:2946 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
+#: src/mainwindow.c:2949 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
 #: src/wizard.c:740
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:2951 src/plugins/mailmbox/plugin_gtk.c:215 src/setup.c:55
+#: src/mainwindow.c:2954 src/plugins/mailmbox/plugin_gtk.c:215 src/setup.c:55
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -7716,43 +7737,67 @@ msgstr ""
 "Může to být tím, že mailbox již existuje, nebo nemáte dostatečná práva pro "
 "zápis."
 
-#: src/mainwindow.c:3417
+#: src/mainwindow.c:3423
 msgid "No posting allowed"
 msgstr "Zasílání zpráv do konference není povoleno"
 
-#: src/mainwindow.c:4000
+#: src/mainwindow.c:4006
 msgid "Mbox import has failed."
 msgstr "Import souboru mbox se nezdařil."
 
-#: src/mainwindow.c:4009 src/mainwindow.c:4018
+#: src/mainwindow.c:4015 src/mainwindow.c:4024
 msgid "Export to mbox has failed."
 msgstr "Export do mbox souboru se nezdařil."
 
-#: src/mainwindow.c:4059 src/plugins/notification/notification_trayicon.c:548
+#: src/mainwindow.c:4065 src/plugins/notification/notification_trayicon.c:550
 msgid "Exit"
 msgstr "Ukončení programu"
 
-#: src/mainwindow.c:4059 src/plugins/notification/notification_trayicon.c:548
+#: src/mainwindow.c:4065 src/plugins/notification/notification_trayicon.c:550
 msgid "Exit Claws Mail?"
 msgstr "Ukončit Claws Mail?"
 
-#: src/mainwindow.c:4250
+#: src/mainwindow.c:4256
 msgid "Folder synchronisation"
 msgstr "Synchronizace složek"
 
-#: src/mainwindow.c:4251
+#: src/mainwindow.c:4257
 msgid "Do you want to synchronise your folders now?"
 msgstr "Chcete nyní synchronizovat složky?"
 
-#: src/mainwindow.c:4252
+#: src/mainwindow.c:4258
 msgid "_Synchronise"
 msgstr "_Synchronizovat"
 
-#: src/mainwindow.c:4693
+#: src/mainwindow.c:4706
 msgid "Deleting duplicated messages..."
 msgstr "Vymazávám duplikované zprávy..."
 
-#: src/mainwindow.c:4730
+#: src/mainwindow.c:4716
+msgid "No duplicate message found in selected folder.\n"
+msgstr "Žádná duplicitní zpráva ve vybrané složce.\n"
+
+#: src/mainwindow.c:4722
+#, c-format
+msgid "Deleted %d duplicate message in selected folder.\n"
+msgid_plural "Deleted %d duplicate messages in selected folder.\n"
+msgstr[0] "Odstraněna %d duplicitní zpráva ve vybrané složce.\n"
+msgstr[1] "Odstraněny %d duplicitní zprávy ve vybrané složce.\n"
+msgstr[2] "Odstraněno %d duplicitních zpráv ve vybrané složce.\n"
+
+#: src/mainwindow.c:4726
+#, c-format
+msgid "Marked %d duplicate message for deletion in selected folder.\n"
+msgid_plural "Marked %d duplicate messages for deletion in selected folder.\n"
+msgstr[0] "Označit %d duplicitní zprávu ve vybrané složce.\n"
+msgstr[1] "Označit %d duplicitní zprávy ve vybrané složce.\n"
+msgstr[2] "Označit %d duplicitních zpráv ve vybrané složce.\n"
+
+#: src/mainwindow.c:4764
+msgid "Deleting duplicated messages in all folders..."
+msgstr "Vymazávám duplikované zprávy ve všech složkách..."
+
+#: src/mainwindow.c:4770
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
@@ -7760,38 +7805,47 @@ msgstr[0] "Odstraněna %d duplicitní zpráva v %d složkách.\n"
 msgstr[1] "Odstraněny %d duplicitní zprávy v %d složkách.\n"
 msgstr[2] "Odstraněno %d duplicitních zpráv v %d složkách.\n"
 
-#: src/mainwindow.c:4986 src/summaryview.c:5694
+#: src/mainwindow.c:4775
+#, c-format
+msgid "No duplicate message found in %d folders.\n"
+msgstr "Žádné duplicitní zprávy v %d složkách.\n"
+
+#: src/mainwindow.c:4937 src/messageview.c:2657
+msgid "Select folder to go to"
+msgstr "Vybrat složku pro přejití"
+
+#: src/mainwindow.c:5038 src/summaryview.c:5736
 msgid "Processing rules to apply before folder rules"
 msgstr "Zpracování složky - pravidla prováděná před pravidly složky"
 
-#: src/mainwindow.c:4994
+#: src/mainwindow.c:5046
 msgid "Processing rules to apply after folder rules"
 msgstr "Zpracování složky - pravidla prováděná po pravidlech složky"
 
-#: src/mainwindow.c:5002 src/summaryview.c:5705
+#: src/mainwindow.c:5054 src/summaryview.c:5747
 msgid "Filtering configuration"
 msgstr "Filtr pro příjem - nastavení pravidel"
 
-#: src/mainwindow.c:5117
+#: src/mainwindow.c:5169
 msgid "Can not register as default client: impossible to get executable path."
 msgstr "Nemohu zaregistrovat jako výchozí klient: není možné získat cestu."
 
-#: src/mainwindow.c:5176
+#: src/mainwindow.c:5228
 msgid "Claws Mail has been registered as default client."
 msgstr "Claws Mail byl zaregistrován jako výchozí klient."
 
-#: src/mainwindow.c:5178
+#: src/mainwindow.c:5230
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr ""
 "Nemohu zaregistrovat jako výchozí klient: není možné zapisovat do registrů."
 
-#: src/mainwindow.c:5192 src/setup.c:91
+#: src/mainwindow.c:5244 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Prohledávám složku %s%c%s..."
 
-#: src/mainwindow.c:5336
+#: src/mainwindow.c:5388
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
@@ -7822,7 +7876,7 @@ msgid "tag"
 msgstr "značka"
 
 #: src/matcher.c:528 src/matcher.c:533 src/matcher.c:552 src/matcher.c:557
-#: src/message_search.c:212 src/prefs_matcher.c:742 src/summary_search.c:466
+#: src/message_search.c:212 src/prefs_matcher.c:743 src/summary_search.c:514
 msgid "Case sensitive"
 msgstr "Rozlišovat malá a velká písmena"
 
@@ -7830,21 +7884,21 @@ msgstr "Rozlišovat malá a velká písmena"
 msgid "Case insensitive"
 msgstr "Rozlišovat malá a velká písmena"
 
-#: src/matcher.c:1849
+#: src/matcher.c:1862
 #, c-format
 msgid "checking if message matches [ %s ]\n"
 msgstr "zkontrolovat jestli zpráva odpovídá [ %s ]\n"
 
-#: src/matcher.c:1920 src/matcher.c:1939 src/matcher.c:1952
+#: src/matcher.c:1933 src/matcher.c:1952 src/matcher.c:1965
 msgid "message matches\n"
 msgstr "zpráva odpovídá\n"
 
-#: src/matcher.c:1927 src/matcher.c:1945 src/matcher.c:1954
+#: src/matcher.c:1940 src/matcher.c:1958 src/matcher.c:1967
 msgid "message does not match\n"
 msgstr "zpráva neodpovídá\n"
 
-#: src/matcher.c:2217 src/matcher.c:2218 src/matcher.c:2219 src/matcher.c:2220
-#: src/matcher.c:2221 src/matcher.c:2222 src/matcher.c:2223 src/matcher.c:2224
+#: src/matcher.c:2230 src/matcher.c:2231 src/matcher.c:2232 src/matcher.c:2233
+#: src/matcher.c:2234 src/matcher.c:2235 src/matcher.c:2236 src/matcher.c:2237
 msgid "(none)"
 msgstr "(žádný)"
 
@@ -7873,8 +7927,8 @@ msgstr "Přepsat mbox soubor"
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Tento soubor již existuje. Chcete ho přepsat?"
 
-#: src/mbox.c:551 src/messageview.c:1842 src/mimeview.c:1842
-#: src/prefs_themes.c:533 src/textview.c:3076
+#: src/mbox.c:551 src/messageview.c:1864 src/mimeview.c:1843
+#: src/prefs_themes.c:561 src/textview.c:3086
 msgid "Overwrite"
 msgstr "Přepsat"
 
@@ -7899,11 +7953,11 @@ msgstr "Hledat text v aktuální zprávě"
 msgid "Find text:"
 msgstr "Hledaný text:"
 
-#: src/message_search.c:328 src/summary_search.c:779
+#: src/message_search.c:328 src/summary_search.c:838
 msgid "Search failed"
 msgstr "Neúspěšné hledání"
 
-#: src/message_search.c:329 src/summary_search.c:780
+#: src/message_search.c:329 src/summary_search.c:839
 msgid "Search string not found."
 msgstr "Hledaný řetězec nebyl nalezen."
 
@@ -7915,30 +7969,30 @@ msgstr "Dosažen začátek zprávy, pokračovat od konce?"
 msgid "End of message reached; continue from beginning?"
 msgstr "Dosažen konec zprávy, pokračovat od začátku?"
 
-#: src/message_search.c:344 src/summary_search.c:791
+#: src/message_search.c:344 src/summary_search.c:850
 msgid "Search finished"
 msgstr "Hledání ukončeno"
 
-#: src/messageview.c:297 src/textview.c:238
+#: src/messageview.c:297 src/textview.c:252
 msgid "Compose _new message"
 msgstr "_Napsat novou zprávu"
 
-#: src/messageview.c:713 src/messageview.c:1433 src/messageview.c:1584
+#: src/messageview.c:712 src/messageview.c:1455 src/messageview.c:1606
 msgid "Claws Mail - Message View"
 msgstr "Claws Mail - Náhled zprávy"
 
-#: src/messageview.c:840
+#: src/messageview.c:842
 msgid "<No Return-Path found>"
 msgstr "<návratová adresa nebyla nalezena>"
 
-#: src/messageview.c:848
+#: src/messageview.c:849
 #, c-format
 msgid ""
 "The notification address to which the return receipt is\n"
 "to be sent does not correspond to the return path:\n"
 "Notification address: %s\n"
 "Return path: %s\n"
-"It is advised to not to send the return receipt."
+"It is advised to not send the return receipt."
 msgstr ""
 "Adresa, na kterou je směrováno potvrzení o doručení\n"
 "neodpovídá návratové adrese:\n"
@@ -7946,79 +8000,81 @@ msgstr ""
 "Návratová adresa: %s\n"
 "Doporučuje se neodesílat potvrzení o doručení."
 
-#: src/messageview.c:855 src/messageview.c:872
+#: src/messageview.c:856 src/messageview.c:884
 msgid "_Don't Send"
 msgstr "_Neodesílat"
 
-#: src/messageview.c:868
+#: src/messageview.c:875
+#, c-format
+msgctxt "'%s' stands for 'To' then 'Cc'"
 msgid ""
 "This message is asking for a return receipt notification\n"
-"but according to its 'To:' and 'CC:' headers it was not\n"
+"but according to its '%s' and '%s' headers it was not\n"
 "officially addressed to you.\n"
-"It is advised to not to send the return receipt."
+"It is advised to not send the return receipt."
 msgstr ""
-"Tato zpráva vyžaduje potvrzení o doručení, ale podle záhlaví\n"
-"'Komu:' a 'Kopie:' nejste oficiálním adresátem.\n"
+"Tato zpráva vyžaduje potvrzení o doručení, ale podle %s a %s\n"
+"v záhlaví nejste oficiálním adresátem.\n"
 "Doporučuje se neodesílat potvrzení o doručení."
 
-#: src/messageview.c:1363
+#: src/messageview.c:1385
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "Přijímaní zprávy (%s)..."
 
-#: src/messageview.c:1399 src/procmime.c:1008
+#: src/messageview.c:1421 src/procmime.c:1008
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Nepodařilo se rozšifrovat: %s"
 
-#: src/messageview.c:1480 src/messageview.c:1488
+#: src/messageview.c:1502 src/messageview.c:1510
 msgid "Message doesn't conform to MIME standard. It may render wrongly."
 msgstr "Zpráva nevyhovuje MIME standardu. Může být špatně zobrazena."
 
-#: src/messageview.c:1834 src/messageview.c:1837 src/mimeview.c:1995
-#: src/plugins/fancy/fancy_viewer.c:663 src/summaryview.c:4796
-#: src/summaryview.c:4799 src/textview.c:3064
+#: src/messageview.c:1856 src/messageview.c:1859 src/mimeview.c:2048
+#: src/plugins/fancy/fancy_viewer.c:663 src/summaryview.c:4840
+#: src/summaryview.c:4843 src/textview.c:3074
 msgid "Save as"
 msgstr "Uložit jako"
 
-#: src/messageview.c:1843
+#: src/messageview.c:1865
 msgid "Overwrite existing file?"
 msgstr "Přepsat existující soubor?"
 
-#: src/messageview.c:1851 src/summaryview.c:4816 src/summaryview.c:4819
-#: src/summaryview.c:4834
+#: src/messageview.c:1873 src/summaryview.c:4860 src/summaryview.c:4863
+#: src/summaryview.c:4878
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "Nemohu uložit soubor '%s'."
 
-#: src/messageview.c:1904
+#: src/messageview.c:1926
 #, c-format
 msgid "Show all %s."
 msgstr "Zobrazit všechny %s."
 
-#: src/messageview.c:1906
+#: src/messageview.c:1928
 msgid "Only the first megabyte of text is shown."
 msgstr "Je zobrazen jen první megabyte textu."
 
-#: src/messageview.c:1937
+#: src/messageview.c:1959
 msgid ""
 "You got a return receipt for this message: it has been displayed by the "
 "recipient."
 msgstr "Obdržel potvrzení pro tuto zprávu: byla zobrazena příjemcem."
 
-#: src/messageview.c:1940
+#: src/messageview.c:1962
 msgid "You asked for a return receipt in this message."
 msgstr "U této zprávy jste vyžádal(a) potvrzení o doručení."
 
-#: src/messageview.c:1946
+#: src/messageview.c:1968
 msgid "This message asks for a return receipt."
 msgstr "Tato zpráva vyžaduje potvrzení o duručení."
 
-#: src/messageview.c:1947
+#: src/messageview.c:1969
 msgid "Send receipt"
 msgstr "Odeslat potvrzení"
 
-#: src/messageview.c:1990
+#: src/messageview.c:2012
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -8026,7 +8082,7 @@ msgstr ""
 "Tato zpráva byla částečně stažena\n"
 "a byla odstraněna ze serveru."
 
-#: src/messageview.c:1996
+#: src/messageview.c:2018
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8035,15 +8091,15 @@ msgstr ""
 "Tato zpráva byla částečně stažena;\n"
 "je %s."
 
-#: src/messageview.c:2000 src/messageview.c:2022
+#: src/messageview.c:2022 src/messageview.c:2044
 msgid "Mark for download"
 msgstr "Označit ke stažení"
 
-#: src/messageview.c:2001 src/messageview.c:2013
+#: src/messageview.c:2023 src/messageview.c:2035
 msgid "Mark for deletion"
 msgstr "Označit k odstranění"
 
-#: src/messageview.c:2006
+#: src/messageview.c:2028
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8052,12 +8108,12 @@ msgstr ""
 "Tato zpráva byla částečně stažena;\n"
 "je %s a bude stažena úplně."
 
-#: src/messageview.c:2011 src/messageview.c:2024
-#: src/prefs_filtering_action.c:180
+#: src/messageview.c:2033 src/messageview.c:2046
+#: src/prefs_filtering_action.c:180 src/toolbar.c:503
 msgid "Unmark"
 msgstr "Odoznačit"
 
-#: src/messageview.c:2017
+#: src/messageview.c:2039
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8066,11 +8122,11 @@ msgstr ""
 "Tato zpráva byla částečně stažena;\n"
 "je %s a bude odstraněna."
 
-#: src/messageview.c:2090
+#: src/messageview.c:2112
 msgid "Return Receipt Notification"
 msgstr "Oznámení o doručení"
 
-#: src/messageview.c:2091
+#: src/messageview.c:2113
 msgid ""
 "More than one of your accounts uses the address that this message was sent "
 "to.\n"
@@ -8080,19 +8136,19 @@ msgstr ""
 "Tato zpráva byla doručena do více vašich účtů.\n"
 "Vyberte si prosím účet, ze kterého bude odesláno potvrzení o doručení:"
 
-#: src/messageview.c:2095 src/plugins/rssyl/rssyl_feed_props.c:508
+#: src/messageview.c:2117 src/plugins/rssyl/rssyl_feed_props.c:506
 msgid "_Cancel"
 msgstr "_Zrušit"
 
-#: src/messageview.c:2095
+#: src/messageview.c:2117
 msgid "_Send Notification"
 msgstr "_Odeslat oznámení"
 
-#: src/messageview.c:2184
+#: src/messageview.c:2206
 msgid "Cannot print: the message doesn't contain text."
 msgstr "Nemohu tisknout: zpráva neobsahuje text."
 
-#: src/messageview.c:2944
+#: src/messageview.c:2967
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -8100,7 +8156,7 @@ msgstr ""
 "\n"
 "  Ve složce nejsou žádné zprávy"
 
-#: src/messageview.c:2952
+#: src/messageview.c:2975
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -8108,7 +8164,7 @@ msgstr ""
 "\n"
 "  Zpráva smazána"
 
-#: src/messageview.c:2953
+#: src/messageview.c:2976
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -8116,8 +8172,8 @@ msgstr ""
 "\n"
 "  Zpráva byla smazána nebo přesunuta do jiné složky"
 
-#: src/messageview.c:2986 src/messageview.c:2992 src/summaryview.c:4177
-#: src/summaryview.c:6972
+#: src/messageview.c:3009 src/messageview.c:3015 src/summaryview.c:4253
+#: src/summaryview.c:7012
 msgid "An error happened while learning.\n"
 msgstr "Během učení došlo k chybě.\n"
 
@@ -8125,7 +8181,7 @@ msgstr "Během učení došlo k chybě.\n"
 msgid "Moving messages..."
 msgstr "Přesouvám zprávy..."
 
-#: src/mh.c:671 src/plugins/mailmbox/mailmbox_folder.c:839
+#: src/mh.c:671 src/plugins/mailmbox/mailmbox_folder.c:838
 msgid "Deleting messages..."
 msgstr "Odstraňuji zprávy..."
 
@@ -8144,7 +8200,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/mh_gtk.c:364 src/plugins/mailmbox/plugin_gtk.c:298
+#: src/mh_gtk.c:374 src/plugins/mailmbox/plugin_gtk.c:298
 #, c-format
 msgid ""
 "Really remove the mailbox '%s'?\n"
@@ -8153,7 +8209,7 @@ msgstr ""
 "Opravdu odstranit mailbox '%s' ?\n"
 "(Zprávy NEBUDOU odstraněny z disku)"
 
-#: src/mh_gtk.c:366 src/plugins/mailmbox/plugin_gtk.c:300
+#: src/mh_gtk.c:376 src/plugins/mailmbox/plugin_gtk.c:300
 msgid "Remove mailbox"
 msgstr "Odstranit mailbox"
 
@@ -8225,31 +8281,77 @@ msgstr "Kontroluji podpis..."
 msgid "Go back to email"
 msgstr "Zpět na zprávu"
 
-#: src/mimeview.c:1761 src/mimeview.c:1850 src/mimeview.c:2042
-#: src/mimeview.c:2078 src/mimeview.c:2190 src/plugins/fancy/fancy_viewer.c:416
+#: src/mimeview.c:1761 src/mimeview.c:1853 src/mimeview.c:2095
+#: src/mimeview.c:2131 src/mimeview.c:2243 src/plugins/fancy/fancy_viewer.c:416
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "Nepodařilo se uložit tuto část zprávy: %s"
 
-#: src/mimeview.c:1839 src/textview.c:3074
+#: src/mimeview.c:1840 src/textview.c:3084
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "Přepsat existující soubor '%s'?"
 
-#: src/mimeview.c:1881 src/plugins/archive/archiver_prefs.c:126
+#: src/mimeview.c:1864
+#, c-format
+msgid ""
+"An error has occurred while saving message part #%d. Do you want to cancel "
+"operation or skip error and continue?"
+msgstr ""
+"Nastala chyba při ukládání části zprávy #%d. Chcete operaci zrušit nebo "
+"přeskočit chybu a pokračovat?"
+
+#: src/mimeview.c:1867
+msgid "Error saving all message parts"
+msgstr "Chyba při ukládání všech částí zprávy"
+
+#: src/mimeview.c:1868
+msgid "Skip"
+msgstr "Přeskočit"
+
+#: src/mimeview.c:1868
+msgid "Skip all"
+msgstr "Vše přeskočit"
+
+#: src/mimeview.c:1878
+#, c-format
+msgid "%d file saved successfully."
+msgid_plural "%d files saved successfully."
+msgstr[0] "%d soubor úspěšně uložen"
+msgstr[1] "%d soubory úspěšně uloženy"
+msgstr[2] "%d souborů úspěšně uloženo"
+
+#: src/mimeview.c:1886
+#, c-format
+msgid "%d file saved successfully"
+msgid_plural "%d files saved successfully"
+msgstr[0] "%d soubor úspěšně uložen"
+msgstr[1] "%d soubory úspěšně uloženy"
+msgstr[2] "%d souborů úspěšně uloženo"
+
+#: src/mimeview.c:1891
+#, c-format
+msgid "%s, %d file failed."
+msgid_plural "%s, %d files failed."
+msgstr[0] "%s, %d soubor selhal."
+msgstr[1] "%s, %d soubory selhaly."
+msgstr[2] "%s, %d souborů selhalo."
+
+#: src/mimeview.c:1924 src/plugins/archive/archiver_prefs.c:142
+#: src/prefs_filtering_action.c:1297
 msgid "Select destination folder"
 msgstr "Vybrat cílovou složku"
 
-#: src/mimeview.c:1888 src/plugins/archive/archiver_prefs.c:132
+#: src/mimeview.c:1931 src/plugins/archive/archiver_prefs.c:148
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "'%s' není adresář."
 
-#: src/mimeview.c:2125 src/mimeview.c:2132 src/textview.c:2991
+#: src/mimeview.c:2178 src/mimeview.c:2185 src/textview.c:3001
 msgid "Open with"
 msgstr "Otevřít čím"
 
-#: src/mimeview.c:2126 src/mimeview.c:2133 src/textview.c:2992
+#: src/mimeview.c:2179 src/mimeview.c:2186 src/textview.c:3002
 #, c-format
 msgid ""
 "Enter the command-line to open file:\n"
@@ -8258,7 +8360,7 @@ msgstr ""
 "Vložte příkazovou řádku pro otevření souboru:\n"
 "('%s' bude nahrazeno jménem souboru)"
 
-#: src/mimeview.c:2228
+#: src/mimeview.c:2281
 #, c-format
 msgid ""
 "Could not convert attachment name to UTF-16:\n"
@@ -8269,11 +8371,11 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/mimeview.c:2236
+#: src/mimeview.c:2289
 msgid "Execute untrusted binary?"
 msgstr "Spustit nedůvěryhodný binární soubor?"
 
-#: src/mimeview.c:2237
+#: src/mimeview.c:2290
 msgid ""
 "This attachment is an executable file. Executing untrusted binaries is "
 "dangerous and could probably lead to compromission of your computer.\n"
@@ -8285,20 +8387,20 @@ msgstr ""
 "\n"
 "Chcete ho spustit?"
 
-#: src/mimeview.c:2241
+#: src/mimeview.c:2294
 msgid "Run binary"
 msgstr "Spustit binární soubor"
 
-#: src/mimeview.c:2543 src/plugins/att_remover/att_remover.c:299
+#: src/mimeview.c:2596 src/plugins/att_remover/att_remover.c:299
 msgid "Type:"
 msgstr "Typ:"
 
-#: src/mimeview.c:2544 src/plugins/att_remover/att_remover.c:300
-#: src/plugins/pdf_viewer/poppler_viewer.c:697 src/summaryview.c:2702
+#: src/mimeview.c:2597 src/plugins/att_remover/att_remover.c:300
+#: src/plugins/pdf_viewer/poppler_viewer.c:697 src/summaryview.c:2700
 msgid "Size:"
 msgstr "Velikost:"
 
-#: src/mimeview.c:2558 src/plugins/vcalendar/vcalendar.c:1265
+#: src/mimeview.c:2611 src/plugins/vcalendar/vcalendar.c:1265
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1709
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1719
 msgid "Description:"
@@ -8561,7 +8663,7 @@ msgid "Laptop LED"
 msgstr "LED dioda laptopu"
 
 #: src/plugins/address_keeper/address_keeper.c:252
-#: src/plugins/attachwarner/attachwarner.c:256
+#: src/plugins/attachwarner/attachwarner.c:257
 msgid "Failed to register check before send hook"
 msgstr "Nepodařilo se zaregistrovat kontrolu do operace odesílání zprávy"
 
@@ -8571,63 +8673,59 @@ msgstr "Udržuje všechny adresy příjemců v knize adres."
 
 #: src/plugins/address_keeper/address_keeper.c:333
 #: src/plugins/address_keeper/address_keeper.h:32
-#: src/plugins/address_keeper/address_keeper_prefs.c:257
+#: src/plugins/address_keeper/address_keeper_prefs.c:274
 msgid "Address Keeper"
 msgstr "Údržbář adresář"
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:106
+#: src/plugins/address_keeper/address_keeper_prefs.c:108
 msgid "Address book location"
 msgstr "Cesta ke knize adres"
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:111
+#: src/plugins/address_keeper/address_keeper_prefs.c:113
 msgid "Keep to folder"
 msgstr "Uchovat do složky"
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:119
+#: src/plugins/address_keeper/address_keeper_prefs.c:121
 msgid "Address book path where addresses are kept"
 msgstr "Cesta knihy adres kde jsou adresy uloženy"
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:121
+#: src/plugins/address_keeper/address_keeper_prefs.c:123
 #: src/plugins/bogofilter/bogofilter_gtk.c:278
 #: src/plugins/bsfilter/bsfilter_gtk.c:201
-#: src/plugins/spamassassin/spamassassin_gtk.c:446
+#: src/plugins/spamassassin/spamassassin_gtk.c:447
 #: src/prefs_filtering_action.c:573 src/prefs_filtering_action.c:580
 #: src/prefs_matcher.c:679
 msgid "Select..."
 msgstr "Vybírám..."
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:137
+#: src/plugins/address_keeper/address_keeper_prefs.c:139
 msgid "Fields to keep addresses from"
 msgstr "Pole z kterých uchovávat adresy"
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:144
-msgid "Keep addresses which appear in 'To' headers"
-msgstr "Uchová adresy, které jsou v 'To' hlavičce"
-
-#: src/plugins/address_keeper/address_keeper_prefs.c:153
-msgid "Keep addresses which appear in 'Cc' headers"
-msgstr "Uchová adresy, které jsou v 'Cc' hlavičce"
-
-#: src/plugins/address_keeper/address_keeper_prefs.c:162
-msgid "Keep addresses which appear in 'Bcc' headers"
-msgstr "Uchová adresy, které jsou v 'Bcc' hlavičce"
+#: src/plugins/address_keeper/address_keeper_prefs.c:147
+#: src/plugins/address_keeper/address_keeper_prefs.c:161
+#: src/plugins/address_keeper/address_keeper_prefs.c:175
+#, c-format
+msgctxt "address keeper: %s stands for a header name"
+msgid "Keep addresses which appear in '%s' headers"
+msgstr "Uchová adresy, které jsou v '%s' hlavičce"
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:168
+#: src/plugins/address_keeper/address_keeper_prefs.c:185
 msgid ""
 "Exclude addresses matching the following regular expressions (one per line)"
 msgstr ""
 "Vyloučit adresy odpovídající jednomu z těchto regulárních výrazů (každý "
 "výraz na samostatný řádek)"
 
-#: src/plugins/archive/archiver.c:43 src/plugins/archive/archiver_prefs.c:91
+#: src/plugins/archive/archiver.c:45 src/plugins/archive/archiver_prefs.c:107
 msgid "Mail Archiver"
 msgstr "Archivování mailů"
 
-#: src/plugins/archive/archiver.c:54
+#: src/plugins/archive/archiver.c:56
 msgid "Create Archive..."
 msgstr "Vytvořit archiv..."
 
-#: src/plugins/archive/archiver.c:122
+#: src/plugins/archive/archiver.c:123
 #, c-format
 msgid ""
 "This plugin adds archiving features to Claws Mail.\n"
@@ -8638,11 +8736,7 @@ msgid ""
 "Several archiving options are also available.\n"
 "\n"
 "The archive can be stored as:\n"
-"\tTAR\n"
-"\tPAX\n"
-"\tSHAR\n"
-"\tCPIO\n"
-"\n"
+"%s\n"
 "The archive can be compressed using:\n"
 "%s\n"
 "The archives can be restored with any standard tool that supports the chosen "
@@ -8662,11 +8756,7 @@ msgstr ""
 "Jsou dostupné i další možnosti.\n"
 "\n"
 "Archiv může být uložen jako:\n"
-"\tTAR\n"
-"\tPAX\n"
-"\tSHAR\n"
-"\tCPIO\n"
-"\n"
+"%s\n"
 "Archiv může být komprimován:\n"
 "%s\n"
 "Archivy můžou být obnoveny nástroji podporující formát a kompresi.\n"
@@ -8677,52 +8767,80 @@ msgstr ""
 "\n"
 "Nastavení v /Nastavení/Volby/Zásuvné moduly/Archivování mailů"
 
-#: src/plugins/archive/archiver.c:152
+#: src/plugins/archive/archiver.c:170
 msgid "Archiver"
 msgstr "Archivování"
 
-#: src/plugins/archive/archiver_gtk.c:104
+#: src/plugins/archive/archiver_gtk.c:107
 msgid "Archiving"
 msgstr "Archivování"
 
-#: src/plugins/archive/archiver_gtk.c:122
+#: src/plugins/archive/archiver_gtk.c:125
 msgid "Press Cancel button to stop archiving"
 msgstr "Stisknutím Zrušit zastavíte archivování"
 
-#: src/plugins/archive/archiver_gtk.c:138
+#: src/plugins/archive/archiver_gtk.c:141
 msgid "Archiving:"
 msgstr "Archivování:"
 
-#: src/plugins/archive/archiver_gtk.c:507
-msgid "Folder and archive must be selected"
-msgstr "Složka a archiv musí být vybrán"
+#: src/plugins/archive/archiver_gtk.c:525
+#, c-format
+msgid ""
+"Some uninitialized data prevents from starting\n"
+"the archiving process:\n"
+"%s%s"
+msgstr ""
+"Neinicializovaná data zabránila spuštění\n"
+"procesu archivace:\n"
+"%s%s"
+
+#: src/plugins/archive/archiver_gtk.c:528
+msgid ""
+"\n"
+"- the folder to archive is not set"
+msgstr ""
+"\n"
+"- složka pro archivování není nastavena"
+
+#: src/plugins/archive/archiver_gtk.c:529
+msgid ""
+"\n"
+"- the name for archive is not set"
+msgstr ""
+"\n"
+"- jméno archívu není nastaveno"
 
-#: src/plugins/archive/archiver_gtk.c:516
+#: src/plugins/archive/archiver_gtk.c:552
 #, c-format
 msgid "%s: Exists. Continue anyway?"
 msgstr "%s: Existuje. Přesto pokračovat?"
 
-#: src/plugins/archive/archiver_gtk.c:519
+#: src/plugins/archive/archiver_gtk.c:555
 #, c-format
 msgid "%s: Is a link. Cannot continue"
 msgstr "%s: Je odkaz. Nemohu pokračovat"
 
-#: src/plugins/archive/archiver_gtk.c:522
+#: src/plugins/archive/archiver_gtk.c:558
 #, c-format
 msgid "%s: Is a directory. Cannot continue"
 msgstr "%s: Je adresář. Nemohu pokračovat"
 
-#: src/plugins/archive/archiver_gtk.c:525
+#: src/plugins/archive/archiver_gtk.c:561
 #, c-format
 msgid "%s: Missing permissions. Cannot continue"
 msgstr "%s: Chybějící práva. Nemohu pokračovat"
 
-#: src/plugins/archive/archiver_gtk.c:528
+#: src/plugins/archive/archiver_gtk.c:564
 #, c-format
 msgid "%s: Unknown error. Cannot continue"
 msgstr "%s: Neznámá chyba. Nemohu pokračovat"
 
-#: src/plugins/archive/archiver_gtk.c:565
+#: src/plugins/archive/archiver_gtk.c:572
+#: src/plugins/archive/archiver_gtk.c:619
+msgid "Creating archive"
+msgstr "Vytváření archivu"
+
+#: src/plugins/archive/archiver_gtk.c:585
 #, c-format
 msgid ""
 "Not a valid file name:\n"
@@ -8731,7 +8849,7 @@ msgstr ""
 "Neplatné jméno souboru:\n"
 "%s."
 
-#: src/plugins/archive/archiver_gtk.c:578
+#: src/plugins/archive/archiver_gtk.c:590
 #, c-format
 msgid ""
 "Not a valid Claws Mail folder:\n"
@@ -8740,7 +8858,7 @@ msgstr ""
 "Neplatná složka Claws Mail:\n"
 "%s."
 
-#: src/plugins/archive/archiver_gtk.c:607
+#: src/plugins/archive/archiver_gtk.c:614
 #, c-format
 msgid ""
 "Adding files in folder failed\n"
@@ -8755,179 +8873,183 @@ msgstr ""
 "\n"
 "Přesto pokračovat?"
 
-#: src/plugins/archive/archiver_gtk.c:709
+#: src/plugins/archive/archiver_gtk.c:631
+#, c-format
+msgid ""
+"Archive creation error:\n"
+"%s"
+msgstr ""
+"Chyba při tvorbě archivu:\n"
+"%s"
+
+#: src/plugins/archive/archiver_gtk.c:743
 msgid "Archive result"
 msgstr "Výsledek archivování"
 
-#: src/plugins/archive/archiver_gtk.c:739
+#: src/plugins/archive/archiver_gtk.c:773
 msgid "Values"
 msgstr "Hodnoty"
 
-#: src/plugins/archive/archiver_gtk.c:748
+#: src/plugins/archive/archiver_gtk.c:782
 msgid "Archive"
 msgstr "Archiv"
 
-#: src/plugins/archive/archiver_gtk.c:754
+#: src/plugins/archive/archiver_gtk.c:788
 msgid "Archive format"
 msgstr "Formát archivu"
 
-#: src/plugins/archive/archiver_gtk.c:761
+#: src/plugins/archive/archiver_gtk.c:795
 msgid "Compression method"
 msgstr "Metoda komprese"
 
-#: src/plugins/archive/archiver_gtk.c:769
+#: src/plugins/archive/archiver_gtk.c:803
 msgid "Number of files"
 msgstr "Počet souborů"
 
-#: src/plugins/archive/archiver_gtk.c:777
+#: src/plugins/archive/archiver_gtk.c:811
 msgid "Archive Size"
 msgstr "Velikost archivu"
 
-#: src/plugins/archive/archiver_gtk.c:785
+#: src/plugins/archive/archiver_gtk.c:819
 msgid "Folder Size"
 msgstr "Velikost složky"
 
-#: src/plugins/archive/archiver_gtk.c:794
+#: src/plugins/archive/archiver_gtk.c:828
 msgid "Compression level"
 msgstr "Úroveň komprese"
 
-#: src/plugins/archive/archiver_gtk.c:799
-#: src/plugins/archive/archiver_gtk.c:807
-#: src/plugins/archive/archiver_gtk.c:815
+#: src/plugins/archive/archiver_gtk.c:833
+#: src/plugins/archive/archiver_gtk.c:841
+#: src/plugins/archive/archiver_gtk.c:849
 #: src/plugins/pdf_viewer/poppler_viewer.c:716 src/prefs_folder_item.c:522
 msgid "Yes"
 msgstr "Ano"
 
-#: src/plugins/archive/archiver_gtk.c:799
-#: src/plugins/archive/archiver_gtk.c:807
-#: src/plugins/archive/archiver_gtk.c:815
+#: src/plugins/archive/archiver_gtk.c:833
+#: src/plugins/archive/archiver_gtk.c:841
+#: src/plugins/archive/archiver_gtk.c:849
 #: src/plugins/pdf_viewer/poppler_viewer.c:719 src/prefs_folder_item.c:521
-#: src/prefs_summaries.c:372
+#: src/prefs_summaries.c:380
 msgid "No"
 msgstr "Ne"
 
-#: src/plugins/archive/archiver_gtk.c:802
+#: src/plugins/archive/archiver_gtk.c:836
 msgid "MD5 checksum"
 msgstr "MD5 kontrola"
 
-#: src/plugins/archive/archiver_gtk.c:810
+#: src/plugins/archive/archiver_gtk.c:844
 msgid "Descriptive names"
 msgstr "Popisná jména"
 
-#: src/plugins/archive/archiver_gtk.c:818
+#: src/plugins/archive/archiver_gtk.c:852
 msgid "Delete selected files"
 msgstr "Smazat vybrané soubory"
 
-#: src/plugins/archive/archiver_gtk.c:827
-#: src/plugins/archive/archiver_gtk.c:1203
+#: src/plugins/archive/archiver_gtk.c:861
+#: src/plugins/archive/archiver_gtk.c:1324
 msgid "Select mails before"
 msgstr "Vybrat maily před"
 
-#: src/plugins/archive/archiver_gtk.c:903
+#: src/plugins/archive/archiver_gtk.c:917
+msgid "Select folder to archive"
+msgstr "Vybrat složku pro archivaci"
+
+#: src/plugins/archive/archiver_gtk.c:938
 msgid "Select file name for archive [suffix should reflect archive like .tgz]"
 msgstr ""
 "Vyberte jméno archivu [přípona by měla odpovídat archivu jako např. .tgz]"
 
-#: src/plugins/archive/archiver_gtk.c:951
+#: src/plugins/archive/archiver_gtk.c:986
 #, c-format
 msgid "%ld of %ld"
 msgstr "%ld z %ld"
 
-#: src/plugins/archive/archiver_gtk.c:988
+#: src/plugins/archive/archiver_gtk.c:1038
 msgid "Create Archive"
 msgstr "Vytvořit archiv"
 
-#: src/plugins/archive/archiver_gtk.c:1003
+#: src/plugins/archive/archiver_gtk.c:1053
 msgid "Enter Archiver arguments"
 msgstr "Vložte argumenty archivu"
 
-#: src/plugins/archive/archiver_gtk.c:1016
+#: src/plugins/archive/archiver_gtk.c:1066
 msgid "Folder to archive"
 msgstr "Složka pro archivaci"
 
-#: src/plugins/archive/archiver_gtk.c:1023
+#: src/plugins/archive/archiver_gtk.c:1073
 msgid "Folder which is the root of the archive"
 msgstr "Složka, která bude hlavní v archivu"
 
-#: src/plugins/archive/archiver_gtk.c:1028
+#: src/plugins/archive/archiver_gtk.c:1078
 msgid "Click this button to select a folder which is to be root of the archive"
 msgstr "Vyberte složku, která bude hlavní v archivu"
 
-#: src/plugins/archive/archiver_gtk.c:1034
+#: src/plugins/archive/archiver_gtk.c:1084
 msgid "Name for archive"
 msgstr "Jméno archivu"
 
-#: src/plugins/archive/archiver_gtk.c:1040
+#: src/plugins/archive/archiver_gtk.c:1090
 msgid "Archive location and name"
 msgstr "Umístění a jméno archivu"
 
-#: src/plugins/archive/archiver_gtk.c:1042
-#: src/plugins/archive/archiver_prefs.c:194
+#: src/plugins/archive/archiver_gtk.c:1092
+#: src/plugins/archive/archiver_prefs.c:225
 #: src/plugins/pgpcore/select-keys.c:421
 msgid "_Select"
 msgstr "_Vybrat"
 
-#: src/plugins/archive/archiver_gtk.c:1045
+#: src/plugins/archive/archiver_gtk.c:1095
 msgid "Click this button to select a name and location for the archive"
 msgstr "Vyberte jméno a umístění archivu"
 
-#: src/plugins/archive/archiver_gtk.c:1047
+#: src/plugins/archive/archiver_gtk.c:1097
 msgid "Choose compression"
 msgstr "Vyberte kompresi"
 
-#: src/plugins/archive/archiver_gtk.c:1060
-msgid "Choose this option to use ZIP compression for the archive"
-msgstr "Vyberte tuto možnost pro používání ZIP komprese pro archivy"
-
-#: src/plugins/archive/archiver_gtk.c:1067
-msgid "Choose this option to use BZIP2 compression for the archive"
-msgstr "Vyberte tuto možnost pro používání BZIP2 komprese pro archivy"
-
-#: src/plugins/archive/archiver_gtk.c:1074
-msgid "Choose this to use Compress compression for your archive"
-msgstr "Vyberte tuto možnost pro používání COMPRESS komprese pro archivy"
-
-#: src/plugins/archive/archiver_gtk.c:1081
-msgid "Choose this option to disable compression for the archive"
-msgstr "Vyberte tuto možnost pro vypnutí komprese pro archivy"
+#: src/plugins/archive/archiver_gtk.c:1109
+#: src/plugins/archive/archiver_gtk.c:1115
+#: src/plugins/archive/archiver_gtk.c:1121
+#: src/plugins/archive/archiver_gtk.c:1128
+#: src/plugins/archive/archiver_gtk.c:1134
+#: src/plugins/archive/archiver_gtk.c:1142
+#: src/plugins/archive/archiver_gtk.c:1150
+#: src/plugins/archive/archiver_gtk.c:1156
+#: src/plugins/archive/archiver_gtk.c:1162
+#: src/plugins/archive/archiver_gtk.c:1170
+#: src/plugins/archive/archiver_gtk.c:1177
+#, c-format
+msgid "Choose this option to use %s compression for the archive"
+msgstr "Vyberte tuto možnost pro používání %s komprese pro archivy"
 
-#: src/plugins/archive/archiver_gtk.c:1101
+#: src/plugins/archive/archiver_gtk.c:1226
 msgid "Choose format"
 msgstr "Vyberte formát"
 
-#: src/plugins/archive/archiver_gtk.c:1114
-msgid "Choose this option to use TAR as format for the archive"
-msgstr "Vyberte tuto možnost pro používání TAR formátu pro archivy"
-
-#: src/plugins/archive/archiver_gtk.c:1121
-msgid "Choose this to use SHAR as format for the archive"
-msgstr "Vyberte tuto možnost pro používání SHAR formátu pro archivy"
-
-#: src/plugins/archive/archiver_gtk.c:1128
-msgid "Choose this option to use CPIO as format for the archive"
-msgstr "Vyberte tuto možnost pro používání CPIO formát pro archivy"
-
-#: src/plugins/archive/archiver_gtk.c:1135
-msgid "Choose this option to use PAX as format for the archive"
-msgstr "Vyberte tuto možnost pro používání PAX formátu pro archivy"
+#: src/plugins/archive/archiver_gtk.c:1238
+#: src/plugins/archive/archiver_gtk.c:1244
+#: src/plugins/archive/archiver_gtk.c:1250
+#: src/plugins/archive/archiver_gtk.c:1256
+#, c-format
+msgid "Choose this to use %s as format for the archive"
+msgstr "Vyberte tuto možnost pro používání %s formátu pro archivy"
 
-#: src/plugins/archive/archiver_gtk.c:1155
+#: src/plugins/archive/archiver_gtk.c:1276
 msgid "Miscellaneous options"
 msgstr "Různé volby"
 
-#: src/plugins/archive/archiver_gtk.c:1164
+#: src/plugins/archive/archiver_gtk.c:1285
 msgid "_Recursive"
 msgstr "_Rekurzivně"
 
-#: src/plugins/archive/archiver_gtk.c:1168
+#: src/plugins/archive/archiver_gtk.c:1289
 msgid "Choose this option to include subfolders in the archive"
 msgstr "Vyberte tuto možnost pro vkládání podsložek do archivu"
 
-#: src/plugins/archive/archiver_gtk.c:1170
+#: src/plugins/archive/archiver_gtk.c:1291
 msgid "_MD5sum"
 msgstr "_MD5sum"
 
-#: src/plugins/archive/archiver_gtk.c:1174
+#: src/plugins/archive/archiver_gtk.c:1295
 msgid ""
 "Choose this option to add MD5 checksums for each file in the archive.\n"
 "Be aware though, that this dramatically increases the time it\n"
@@ -8937,12 +9059,12 @@ msgstr ""
 "Uvědomte si, že to dramaticky zvýší čas\n"
 "potřebný pro vytvoření archivu"
 
-#: src/plugins/archive/archiver_gtk.c:1178
+#: src/plugins/archive/archiver_gtk.c:1299
 msgid "R_ename"
 msgstr "Pře_jmenovat"
 
-#: src/plugins/archive/archiver_gtk.c:1182
-#: src/plugins/archive/archiver_prefs.c:325
+#: src/plugins/archive/archiver_gtk.c:1303
+#: src/plugins/archive/archiver_prefs.c:427
 msgid ""
 "Choose this option to use descriptive names for each file in the archive.\n"
 "The naming scheme: date_from@to@subject.\n"
@@ -8952,7 +9074,7 @@ msgstr ""
 "Schéma pro pojmenování: datum_od@komu@předmět.\n"
 "Jména bude oříznuty na maximálně 96 znaků"
 
-#: src/plugins/archive/archiver_gtk.c:1190
+#: src/plugins/archive/archiver_gtk.c:1311
 msgid ""
 "Choose this option to delete mails after archiving\n"
 "At this point only handles IMAP4, Local mbox and POP3"
@@ -8960,11 +9082,11 @@ msgstr ""
 "Vyberte tuto možnost pro mazání mailů po archivaci\n"
 "Funguje jen IMAP4, lokálním mboxem a POP3"
 
-#: src/plugins/archive/archiver_gtk.c:1194
+#: src/plugins/archive/archiver_gtk.c:1315
 msgid "Selection options"
 msgstr "Volby výběru"
 
-#: src/plugins/archive/archiver_gtk.c:1210
+#: src/plugins/archive/archiver_gtk.c:1331
 msgid ""
 "Select emails before a certain date\n"
 "Date must comply to ISO-8601 [YYYY-MM-DD]"
@@ -8972,67 +9094,58 @@ msgstr ""
 "Vybrat maily před datem\n"
 "Datum musí odpovídat ISO-8601 [YYYY-MM-DD]"
 
-#: src/plugins/archive/archiver_prefs.c:186
+#: src/plugins/archive/archiver_prefs.c:217
 msgid "Default save folder"
 msgstr "Výchozí adresář pro ukládání"
 
-#: src/plugins/archive/archiver_prefs.c:198
+#: src/plugins/archive/archiver_prefs.c:229
 msgid "Click this button to select the default location for saving archives"
 msgstr "Vyberte výchozí místo pro ukládání archivů"
 
-#: src/plugins/archive/archiver_prefs.c:207
+#: src/plugins/archive/archiver_prefs.c:238
 msgid "Default compression"
 msgstr "Výchozí komprese"
 
-#: src/plugins/archive/archiver_prefs.c:219
-msgid "Choose this option to use ZIP compression by default"
-msgstr "Vyberte tuto možnost pro používání ZIP komprese"
-
-#: src/plugins/archive/archiver_prefs.c:226
-msgid "Choose this option to use BZIP2 compression by default"
-msgstr "Vyberte tuto možnost pro používání BZIP2 komprese"
-
-#: src/plugins/archive/archiver_prefs.c:233
-msgid "Choose this option to use COMPRESS compression by default"
-msgstr "Vyberte tuto možnost pro používání COMPRESS komprese"
-
-#: src/plugins/archive/archiver_prefs.c:240
-msgid "Choose this option to disable compression by default"
-msgstr "Vyberte tuto možnost pro vypnutí komprese"
+#: src/plugins/archive/archiver_prefs.c:249
+#: src/plugins/archive/archiver_prefs.c:255
+#: src/plugins/archive/archiver_prefs.c:261
+#: src/plugins/archive/archiver_prefs.c:268
+#: src/plugins/archive/archiver_prefs.c:274
+#: src/plugins/archive/archiver_prefs.c:282
+#: src/plugins/archive/archiver_prefs.c:290
+#: src/plugins/archive/archiver_prefs.c:296
+#: src/plugins/archive/archiver_prefs.c:302
+#: src/plugins/archive/archiver_prefs.c:310
+#: src/plugins/archive/archiver_prefs.c:317
+#, c-format
+msgid "Choose this option to use %s compression by default"
+msgstr "Vyberte tuto možnost pro používání %s komprese"
 
-#: src/plugins/archive/archiver_prefs.c:257
+#: src/plugins/archive/archiver_prefs.c:363
 msgid "Default format"
 msgstr "Výchozí formát"
 
-#: src/plugins/archive/archiver_prefs.c:269
-msgid "Choose this option to use the TAR format by default"
-msgstr "Vyberte tuto možnost pro používání TAR komprese"
-
-#: src/plugins/archive/archiver_prefs.c:276
-msgid "Choose this option to use the SHAR format by default"
-msgstr "Vyberte tuto možnost pro používání SHAR komprese"
-
-#: src/plugins/archive/archiver_prefs.c:283
-msgid "Choose this option to use the CPIO format by default"
-msgstr "Vyberte tuto možnost pro používání CPIO komprese"
-
-#: src/plugins/archive/archiver_prefs.c:290
-msgid "Choose this option to use the PAX format by default"
-msgstr "Vyberte tuto možnost pro používání PAX komprese"
+#: src/plugins/archive/archiver_prefs.c:374
+#: src/plugins/archive/archiver_prefs.c:380
+#: src/plugins/archive/archiver_prefs.c:386
+#: src/plugins/archive/archiver_prefs.c:392
+#, c-format
+msgid "Choose this option to use the %s as format by default"
+msgstr "Vyberte tuto možnost pro používání %s formátu"
 
-#: src/plugins/archive/archiver_prefs.c:307
+#: src/plugins/archive/archiver_prefs.c:409
 msgid "Default miscellaneous options"
 msgstr "Různé volby"
 
-#: src/plugins/archive/archiver_prefs.c:316
+#: src/plugins/archive/archiver_prefs.c:418
 msgid "Choose this option to include subfolders in the archives by default"
 msgstr "Vyberte tuto možnost pro vkládání podsložek do archivu"
 
-#: src/plugins/archive/archiver_prefs.c:317
+#: src/plugins/archive/archiver_prefs.c:419
 msgid "MD5sum"
 msgstr "MD5sum"
 
-#: src/plugins/archive/archiver_prefs.c:319
+#: src/plugins/archive/archiver_prefs.c:421
 msgid ""
 "Choose this option to add MD5 checksums for each file in the archives by "
 "default.\n"
@@ -9044,12 +9157,12 @@ msgstr ""
 "Uvědomte si, že to dramaticky zvýší čas\n"
 "potřebný pro vytvoření archivu"
 
-#: src/plugins/archive/archiver_prefs.c:323
+#: src/plugins/archive/archiver_prefs.c:425
 #: src/plugins/managesieve/sieve_manager.c:761
 msgid "Rename"
 msgstr "Přejmenovat"
 
-#: src/plugins/archive/archiver_prefs.c:331
+#: src/plugins/archive/archiver_prefs.c:433
 msgid "Choose this option to delete mails after archiving"
 msgstr "Vyberte tuto možnost pro mazání mailů po archivování"
 
@@ -9058,12 +9171,12 @@ msgid "Remove attachments"
 msgstr "Odebrat přílohy"
 
 #: src/plugins/att_remover/att_remover.c:357
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:324 src/prefs_themes.c:944
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:324 src/prefs_themes.c:1060
 msgid "Remove"
 msgstr "Odstranit"
 
-#: src/plugins/att_remover/att_remover.c:365 src/prefs_summaries.c:444
-#: src/prefs_summary_column.c:80 src/summaryview.c:2796
+#: src/plugins/att_remover/att_remover.c:365 src/prefs_summaries.c:452
+#: src/prefs_summary_column.c:80 src/summaryview.c:2794
 msgid "Attachment"
 msgstr "Příloha"
 
@@ -9127,13 +9240,13 @@ msgstr ""
 msgid "Attachment warning"
 msgstr "Příloha - upozornění"
 
-#: src/plugins/attachwarner/attachwarner.c:249
-#: src/plugins/attachwarner/attachwarner.c:286
-#: src/plugins/attachwarner/attachwarner.c:338
+#: src/plugins/attachwarner/attachwarner.c:250
+#: src/plugins/attachwarner/attachwarner.c:287
+#: src/plugins/attachwarner/attachwarner.c:339
 msgid "Attach warner"
 msgstr "Kontrola příloh"
 
-#: src/plugins/attachwarner/attachwarner.c:296
+#: src/plugins/attachwarner/attachwarner.c:297
 msgid ""
 "Warns user if some reference to attachments is found in the message text and "
 "no file is attached."
@@ -9210,15 +9323,15 @@ msgstr "Kontrola příloh"
 msgid "Bogofilter"
 msgstr "Bogofilter"
 
-#: src/plugins/bogofilter/bogofilter.c:483
+#: src/plugins/bogofilter/bogofilter.c:456
 msgid "Bogofilter: fetching bodies..."
 msgstr "Bogofilter: stahuji těla zpráv..."
 
-#: src/plugins/bogofilter/bogofilter.c:496
+#: src/plugins/bogofilter/bogofilter.c:469
 msgid "Bogofilter: filtering messages..."
 msgstr "Bogofilter: filtruji zprávy..."
 
-#: src/plugins/bogofilter/bogofilter.c:612
+#: src/plugins/bogofilter/bogofilter.c:585
 msgid ""
 "The Bogofilter plugin couldn't filter a message. The probable cause of the "
 "error is that it didn't learn from any mail.\n"
@@ -9230,7 +9343,7 @@ msgstr ""
 "Pomocí \"/Označit/Označit jako spam\" a \"/Označit/Mark jako ne spam\" "
 "trénujte Bogofilter s několika stovkami spam a ne spam zprávami."
 
-#: src/plugins/bogofilter/bogofilter.c:619
+#: src/plugins/bogofilter/bogofilter.c:592
 #, c-format
 msgid ""
 "The Bogofilter plugin couldn't filter a message. The command `%s %s %s` "
@@ -9239,21 +9352,21 @@ msgstr ""
 "Zásuvný modul Bogofilter nemohl filtrovat zprávy. Příkaz `%s %s %s` nemohl "
 "být spuštěn."
 
-#: src/plugins/bogofilter/bogofilter.c:766
+#: src/plugins/bogofilter/bogofilter.c:739
 msgid "Bogofilter: learning from message..."
 msgstr "Bogofilter: učím se ze zprávy..."
 
-#: src/plugins/bogofilter/bogofilter.c:779
-#: src/plugins/bogofilter/bogofilter.c:826 src/plugins/bsfilter/bsfilter.c:513
+#: src/plugins/bogofilter/bogofilter.c:752
+#: src/plugins/bogofilter/bogofilter.c:799 src/plugins/bsfilter/bsfilter.c:486
 #, c-format
 msgid "Learning failed; `%s` returned with status %d."
 msgstr "Učení selhalo; `%s` vrácen se stavem %d."
 
-#: src/plugins/bogofilter/bogofilter.c:794
+#: src/plugins/bogofilter/bogofilter.c:767
 msgid "Bogofilter: learning from messages..."
 msgstr "Bogofilter: učím se ze zpráv..."
 
-#: src/plugins/bogofilter/bogofilter.c:882
+#: src/plugins/bogofilter/bogofilter.c:855
 #, c-format
 msgid ""
 "Learning failed; `%s %s %s` returned with error:\n"
@@ -9262,7 +9375,7 @@ msgstr ""
 "Učení selhalo; `%s %s %s` vráceno s chybou:\n"
 "%s"
 
-#: src/plugins/bogofilter/bogofilter.c:1010
+#: src/plugins/bogofilter/bogofilter.c:983
 msgid ""
 "This plugin can check all messages that are received from an IMAP, LOCAL or "
 "POP account for spam using Bogofilter. You will need Bogofilter installed "
@@ -9289,37 +9402,37 @@ msgstr ""
 "\n"
 "Nastavení v /Nastavení/Volby/Zásuvné moduly/Bogofilter"
 
-#: src/plugins/bogofilter/bogofilter.c:1043 src/plugins/bsfilter/bsfilter.c:676
-#: src/plugins/spamassassin/spamassassin.c:651
+#: src/plugins/bogofilter/bogofilter.c:1016 src/plugins/bsfilter/bsfilter.c:649
+#: src/plugins/spamassassin/spamassassin.c:624
 msgid "Spam detection"
 msgstr "Rozpoznávání spamu"
 
-#: src/plugins/bogofilter/bogofilter.c:1044 src/plugins/bsfilter/bsfilter.c:677
-#: src/plugins/spamassassin/spamassassin.c:652
+#: src/plugins/bogofilter/bogofilter.c:1017 src/plugins/bsfilter/bsfilter.c:650
+#: src/plugins/spamassassin/spamassassin.c:625
 msgid "Spam learning"
 msgstr "Učení se rozpoznávat spam"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:161
 #: src/plugins/bsfilter/bsfilter_gtk.c:143
-#: src/plugins/spamassassin/spamassassin_gtk.c:399
+#: src/plugins/spamassassin/spamassassin_gtk.c:400
 msgid "Process messages on receiving"
 msgstr "Zpracovat zprávy při příjmu"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:169
 #: src/plugins/bsfilter/bsfilter_gtk.c:151
-#: src/plugins/spamassassin/spamassassin_gtk.c:357
+#: src/plugins/spamassassin/spamassassin_gtk.c:358
 msgid "Maximum size"
 msgstr "Maximální velikost"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:178
 #: src/plugins/bsfilter/bsfilter_gtk.c:160
-#: src/plugins/spamassassin/spamassassin_gtk.c:366
+#: src/plugins/spamassassin/spamassassin_gtk.c:367
 msgid "Messages larger than this will not be checked"
 msgstr "Zprávy větší než tato velikost nebudou kontrolovány"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:181
 #: src/plugins/bsfilter/bsfilter_gtk.c:163
-#: src/plugins/spamassassin/spamassassin_gtk.c:369 src/prefs_account.c:1511
+#: src/plugins/spamassassin/spamassassin_gtk.c:370 src/prefs_account.c:1511
 msgid "KB"
 msgstr "KB"
 
@@ -9337,7 +9450,7 @@ msgstr "Jenom označit jako spam"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:227
 #: src/plugins/bsfilter/bsfilter_gtk.c:179
-#: src/plugins/spamassassin/spamassassin_gtk.c:415
+#: src/plugins/spamassassin/spamassassin_gtk.c:416
 msgid ""
 "Folder for storing identified spam. Leave empty to use the trash folder."
 msgstr ""
@@ -9346,7 +9459,7 @@ msgstr ""
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:233
 #: src/plugins/bsfilter/bsfilter_gtk.c:185
-#: src/plugins/spamassassin/spamassassin_gtk.c:421
+#: src/plugins/spamassassin/spamassassin_gtk.c:422
 msgid "Click this button to select a folder for storing spam"
 msgstr "Vybrat složku pro ukládání nevyžádaných zpráv"
 
@@ -9378,13 +9491,13 @@ msgstr "Provádět jen pro zprávy v MH složkách"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:268
 #: src/plugins/bsfilter/bsfilter_gtk.c:191
-#: src/plugins/spamassassin/spamassassin_gtk.c:436
+#: src/plugins/spamassassin/spamassassin_gtk.c:437
 msgid "Whitelist senders found in address book/folder"
 msgstr "Důvěryhodné odesílatelé nalezeni v knize adres/složce"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:272
 #: src/plugins/bsfilter/bsfilter_gtk.c:195
-#: src/plugins/spamassassin/spamassassin_gtk.c:440
+#: src/plugins/spamassassin/spamassassin_gtk.c:441
 msgid ""
 "Messages coming from your address book contacts will be received in the "
 "normal folder even if detected as spam"
@@ -9394,7 +9507,7 @@ msgstr ""
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:282
 #: src/plugins/bsfilter/bsfilter_gtk.c:205
-#: src/plugins/spamassassin/spamassassin_gtk.c:450
+#: src/plugins/spamassassin/spamassassin_gtk.c:451
 msgid "Click this button to select a book or folder in the address book"
 msgstr "Kliknutím na tlačítko vyberte knihu nebo složku v knize adres"
 
@@ -9421,7 +9534,7 @@ msgstr "Cesta k bogofilter"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:309
 #: src/plugins/bsfilter/bsfilter_gtk.c:232
-#: src/plugins/spamassassin/spamassassin_gtk.c:428
+#: src/plugins/spamassassin/spamassassin_gtk.c:429
 msgid "Mark spam as read"
 msgstr "Označit spam jako přečtený"
 
@@ -9429,15 +9542,15 @@ msgstr "Označit spam jako přečtený"
 msgid "Bsfilter"
 msgstr "Bsfilter"
 
-#: src/plugins/bsfilter/bsfilter.c:300
+#: src/plugins/bsfilter/bsfilter.c:273
 msgid "Bsfilter: fetching body..."
 msgstr "Bsfilter: získávám tělo..."
 
-#: src/plugins/bsfilter/bsfilter.c:309
+#: src/plugins/bsfilter/bsfilter.c:282
 msgid "Bsfilter: filtering message..."
 msgstr "Bsfilter: filtruji zprávu..."
 
-#: src/plugins/bsfilter/bsfilter.c:394
+#: src/plugins/bsfilter/bsfilter.c:367
 msgid ""
 "The Bsfilter plugin couldn't filter a message. The probable cause of the "
 "error is that it didn't learn from any mail.\n"
@@ -9449,18 +9562,18 @@ msgstr ""
 "Použijte \"/Označit/Označit jako spam\" a \"/Označit/Označit jako ne spam\" "
 "pro trénink Bsfilter s několika stovkami spamových a nespamových zpráv."
 
-#: src/plugins/bsfilter/bsfilter.c:401
+#: src/plugins/bsfilter/bsfilter.c:374
 #, c-format
 msgid ""
 "The Bsfilter plugin couldn't filter a message. The command `%s` couldn't be "
 "run."
 msgstr "Bsfilter nemůže filtrovat zprávy. Příkaz `%s` nemohl být spuštěn."
 
-#: src/plugins/bsfilter/bsfilter.c:502
+#: src/plugins/bsfilter/bsfilter.c:475
 msgid "Bsfilter: learning from message..."
 msgstr "Bsfilter: učení ze zprávy..."
 
-#: src/plugins/bsfilter/bsfilter.c:643
+#: src/plugins/bsfilter/bsfilter.c:616
 msgid ""
 "This plugin can check all messages that are received from an IMAP, LOCAL or "
 "POP account for spam using Bsfilter. You will need Bsfilter installed "
@@ -9488,7 +9601,7 @@ msgstr ""
 "Volby jsou dostupné v /Nastavení/Volby/Zásuvné moduly/Bsfilter"
 
 #: src/plugins/bsfilter/bsfilter_gtk.c:171
-#: src/plugins/spamassassin/spamassassin_gtk.c:407
+#: src/plugins/spamassassin/spamassassin_gtk.c:408
 msgid "Save spam in"
 msgstr "Uložit spam do"
 
@@ -9509,7 +9622,7 @@ msgid "Path to bsfilter executable"
 msgstr "Cesta ke spustitelnému souboru bsfilter"
 
 #: src/plugins/clamd/clamav_plugin.c:47
-#: src/plugins/clamd/clamav_plugin_gtk.c:549
+#: src/plugins/clamd/clamav_plugin_gtk.c:550
 msgid "Clam AntiVirus"
 msgstr "Clam AntiVirus"
 
@@ -9622,52 +9735,56 @@ msgstr ""
 msgid "Virus detection"
 msgstr "Detekce virů"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:249
+#: src/plugins/clamd/clamav_plugin_gtk.c:72
+msgid "Select folder to store infected messages in"
+msgstr "Vybrat složku pro infikované zprávy"
+
+#: src/plugins/clamd/clamav_plugin_gtk.c:250
 msgid "Enable virus scanning"
 msgstr "Povolit skenování virů"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:259
+#: src/plugins/clamd/clamav_plugin_gtk.c:260
 msgid "Maximum attachment size"
 msgstr "Maximální velikost přílohy"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:270
+#: src/plugins/clamd/clamav_plugin_gtk.c:271
 msgid "Message attachments larger than this will not be scanned"
 msgstr "Zprávy s přílohami většími než tato nebudou skenovány"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:274
+#: src/plugins/clamd/clamav_plugin_gtk.c:275
 msgid "MB"
 msgstr "MB"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:283
+#: src/plugins/clamd/clamav_plugin_gtk.c:284
 msgid "Save infected mail in"
 msgstr "Uložit nakažený mail v"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:287
+#: src/plugins/clamd/clamav_plugin_gtk.c:288
 msgid "Save mail that contains viruses"
 msgstr "Uložit mail obsahující virus"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:295
+#: src/plugins/clamd/clamav_plugin_gtk.c:296
 msgid ""
 "Folder for storing infected mail. Leave empty to use the default trash folder"
 msgstr "Složka pro ukládání nakažené zprávy. Prázdné bude používat výchozí koš"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:303
+#: src/plugins/clamd/clamav_plugin_gtk.c:304
 msgid "Click this button to select a folder for storing infected mail"
 msgstr "Kliknutím vyberte složku pro uložení nakažené zprávy"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:311
+#: src/plugins/clamd/clamav_plugin_gtk.c:312
 msgid "Automatic configuration"
 msgstr "Automatická konfigurace"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:316
+#: src/plugins/clamd/clamav_plugin_gtk.c:317
 msgid "Should configuration be done automatic or manual"
 msgstr "Konfigurace automaticky nebo ručně"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:324
+#: src/plugins/clamd/clamav_plugin_gtk.c:325
 msgid "Where is clamd.conf"
 msgstr "Umístění clamd.conf"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:332
+#: src/plugins/clamd/clamav_plugin_gtk.c:333
 msgid ""
 "Full path to clamd.conf. If this field is not empty then the plugin has been "
 "able to locate the file automatically"
@@ -9675,35 +9792,35 @@ msgstr ""
 "Cesta k clamd.conf. Jestliže není prázdné, zásuvný modul lokalizuje soubor "
 "automaticky"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:336
+#: src/plugins/clamd/clamav_plugin_gtk.c:337
 msgid "Br_owse"
 msgstr "Pr_ocházet"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:340
+#: src/plugins/clamd/clamav_plugin_gtk.c:341
 msgid "Click this button to select full path to clamd.conf"
 msgstr "Kliknutím vyberte cestu k clamd.conf"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:348
+#: src/plugins/clamd/clamav_plugin_gtk.c:349
 msgid "Check permission for folders and adjust if necessary"
 msgstr "Zkontrolovat práva ke složkám a nastavení, jestliže bude potřeba"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:361
+#: src/plugins/clamd/clamav_plugin_gtk.c:362
 msgid "Click this button to check and adjust folder permissions"
 msgstr "Kliknutím zkontrolujete a nastavíte práva ke složce"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:369
+#: src/plugins/clamd/clamav_plugin_gtk.c:370
 msgid "Remote Host"
 msgstr "Hostitel"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:377
+#: src/plugins/clamd/clamav_plugin_gtk.c:378
 msgid "Hostname or IP for remote host running clamav daemon"
 msgstr "Adresa nebo IP, na které běží clamav démon"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:397
+#: src/plugins/clamd/clamav_plugin_gtk.c:398
 msgid "Port number where clamav daemon is listening"
 msgstr "Číslo portu, na kterém naslouchá clamav démon"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:524
+#: src/plugins/clamd/clamav_plugin_gtk.c:525
 msgid ""
 "New config\n"
 "No socket information.\n"
@@ -9713,7 +9830,7 @@ msgstr ""
 "Žádné informace o socketu.\n"
 "Antivirus zakázán."
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:528
+#: src/plugins/clamd/clamav_plugin_gtk.c:529
 msgid ""
 "New config\n"
 "Clamd does not respond to ping.\n"
@@ -9723,7 +9840,7 @@ msgstr ""
 "Clamd neodpovídá na ping.\n"
 "Běží clamd?"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:117
+#: src/plugins/clamd/libclamd/clamd-plugin.c:121
 #, c-format
 msgid ""
 "%s: Unable to open\n"
@@ -9732,7 +9849,7 @@ msgstr ""
 "%s: Nemohu otevřít\n"
 "clamd bude zakázán"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:215
+#: src/plugins/clamd/libclamd/clamd-plugin.c:216
 #, c-format
 msgid ""
 "%s: Not able to find required information\n"
@@ -9741,30 +9858,30 @@ msgstr ""
 "%s: Nemohu najít požadovanou informaci\n"
 "clamd bude zakázán"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:249
+#: src/plugins/clamd/libclamd/clamd-plugin.c:250
 msgid "Could not create socket"
 msgstr "Nemohu vytvořit soket"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:422
+#: src/plugins/clamd/libclamd/clamd-plugin.c:437
 msgid ": File does not exist"
 msgstr ": Soubor neexistuje"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:435
+#: src/plugins/clamd/libclamd/clamd-plugin.c:450
 msgid ": Unable to open"
 msgstr ": Nemohu otevřít"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:455
-#: src/plugins/clamd/libclamd/clamd-plugin.c:460
-#: src/plugins/clamd/libclamd/clamd-plugin.c:474
+#: src/plugins/clamd/libclamd/clamd-plugin.c:470
+#: src/plugins/clamd/libclamd/clamd-plugin.c:475
+#: src/plugins/clamd/libclamd/clamd-plugin.c:489
 msgid "Socket write error"
 msgstr "Chyba při psaní do soketu"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:467
+#: src/plugins/clamd/libclamd/clamd-plugin.c:482
 #, c-format
 msgid "%s: Error reading"
 msgstr "%s: Chyba čtení"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:481
+#: src/plugins/clamd/libclamd/clamd-plugin.c:496
 msgid "Socket read error"
 msgstr "Chyba při čtení ze soketu"
 
@@ -9987,17 +10104,17 @@ msgstr ""
 "automaticky načteny. Nastavení naleznete v / Nastavení / Předvolby / Zásuvné "
 "moduly / Fancy"
 
-#: src/plugins/fetchinfo/fetchinfo_plugin.c:167
-#: src/plugins/fetchinfo/fetchinfo_plugin.c:200
+#: src/plugins/fetchinfo/fetchinfo_plugin.c:161
+#: src/plugins/fetchinfo/fetchinfo_plugin.c:194
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:182
 msgid "Fetchinfo"
 msgstr "Fetchinfo"
 
-#: src/plugins/fetchinfo/fetchinfo_plugin.c:173
+#: src/plugins/fetchinfo/fetchinfo_plugin.c:167
 msgid "Failed to register mail receive hook"
 msgstr "Selhala registrace obsluhy příjmu mailů"
 
-#: src/plugins/fetchinfo/fetchinfo_plugin.c:209
+#: src/plugins/fetchinfo/fetchinfo_plugin.c:203
 msgid ""
 "This plugin modifies the downloaded messages. It inserts headers containing "
 "some download information: UIDL, Claws Mail account name, POP server, user "
@@ -10010,7 +10127,7 @@ msgstr ""
 "\n"
 "Volby jsou dostupné v  /Nastavení/Volby/Zásuvné moduly/Fetchinfo"
 
-#: src/plugins/fetchinfo/fetchinfo_plugin.c:236
+#: src/plugins/fetchinfo/fetchinfo_plugin.c:230
 msgid "Mail marking"
 msgstr "Značkování mailů"
 
@@ -10168,23 +10285,23 @@ msgstr ""
 "Zásuvný modul GData: Nezískán autorizační kód, požadavek na autorizaci "
 "zrušen\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:498
+#: src/plugins/gdata/cm_gdata_contacts.c:497
 #, c-format
 msgid "GData plugin: Authorization refresh error: %s\n"
 msgstr "Zásuvný modul GData: Chyba obnovení autentizace: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:507
+#: src/plugins/gdata/cm_gdata_contacts.c:506
 msgid "GData plugin: Authorization refresh successful\n"
 msgstr "Zásuvný modul GData: Obnovení autentizace úspěšné\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:568
+#: src/plugins/gdata/cm_gdata_contacts.c:566
 #, c-format
 msgid ""
 "GData plugin: Elapsed time since last refresh: %d minutes, refreshing now\n"
 msgstr ""
 "Zásuvný modul GData: Čas od posledního obnovení: %d minut, obnovuji teď\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:577
+#: src/plugins/gdata/cm_gdata_contacts.c:574
 msgid "GData plugin: Trying to refresh authorization\n"
 msgstr "Zásuvný modul GData: Pokus o obnovení autentizace\n"
 
@@ -10528,43 +10645,48 @@ msgstr "Odpojeno"
 msgid "Disconnected: %s"
 msgstr "Odpojeno: %s"
 
-#: src/plugins/managesieve/managesieve.c:724
-#: src/plugins/managesieve/managesieve.c:869
+#: src/plugins/managesieve/managesieve.c:725
+#: src/plugins/managesieve/managesieve.c:870
 #, c-format
 msgid "unhandled message on Sieve session: %s\n"
 msgstr "neošetřená zpráva na Sieve relaci: %s\n"
 
-#: src/plugins/managesieve/managesieve.c:731
+#: src/plugins/managesieve/managesieve.c:732
 msgid "STARTTLS failed"
 msgstr "STARTTLS selhal"
 
-#: src/plugins/managesieve/managesieve.c:796
-#: src/plugins/managesieve/managesieve.c:812
-#: src/plugins/managesieve/managesieve.c:839
-#: src/plugins/managesieve/managesieve.c:921
-#: src/plugins/managesieve/managesieve.c:939
+#: src/plugins/managesieve/managesieve.c:797
+#: src/plugins/managesieve/managesieve.c:813
+#: src/plugins/managesieve/managesieve.c:840
+#: src/plugins/managesieve/managesieve.c:922
+#: src/plugins/managesieve/managesieve.c:940
 msgid "error occurred on SIEVE session\n"
 msgstr "nastala chyba v SIEVE relaci\n"
 
-#: src/plugins/managesieve/managesieve.c:865
+#: src/plugins/managesieve/managesieve.c:866
 #, c-format
 msgid "error occurred on Sieve session. data: %s\n"
 msgstr "nastala chyba v SMTP relaci. data: %s\n"
 
-#: src/plugins/managesieve/managesieve.c:874
+#: src/plugins/managesieve/managesieve.c:875
 #, c-format
 msgid "unhandled message on Sieve session: %d\n"
 msgstr "neošetřená zpráva na Sieve relaci: %d\n"
 
-#: src/plugins/managesieve/managesieve.c:1131
+#: src/plugins/managesieve/managesieve.c:1132
 msgid "Sieve: retrying auth\n"
 msgstr "Sieve: opakováni auth\n"
 
-#: src/plugins/managesieve/managesieve.c:1133
+#: src/plugins/managesieve/managesieve.c:1134
 msgid "Auth method not available"
 msgstr "Metoda autentizace nedostupná"
 
-#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5592
+#: src/plugins/managesieve/managesieve.c:1151
+#, c-format
+msgid "sending error on Sieve session: %s\n"
+msgstr "chyba odesílání na Sieve relaci: %s\n"
+
+#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5634
 msgid "_Filter"
 msgstr "_Filtrovat"
 
@@ -10729,7 +10851,7 @@ msgid "Require STARTTLS"
 msgstr "Vyžadovat STARTTLS"
 
 #: src/plugins/managesieve/sieve_prefs.c:206
-#: src/plugins/rssyl/rssyl_feed_props.c:264
+#: src/plugins/rssyl/rssyl_feed_props.c:262
 msgid "No authentication"
 msgstr "Žádná autentizace"
 
@@ -10749,7 +10871,7 @@ msgid "User ID"
 msgstr "Uživatelské jméno"
 
 #: src/plugins/managesieve/sieve_prefs.c:250
-#: src/plugins/rssyl/rssyl_feed_props.c:395
+#: src/plugins/rssyl/rssyl_feed_props.c:393
 #: src/plugins/vcalendar/vcal_prefs.c:399
 #: src/plugins/vcalendar/vcal_prefs.c:518 src/prefs_account.c:1281
 #: src/prefs_account.c:1818 src/prefs_account.c:2535 src/prefs_account.c:2557
@@ -10764,6 +10886,7 @@ msgstr "Metoda autentizace"
 
 #: src/plugins/managesieve/sieve_prefs.c:275 src/prefs_account.c:1583
 #: src/prefs_account.c:1779 src/prefs_send.c:233 src/prefs_send.c:304
+#: src/prefs_themes.c:1075
 msgid "Automatic"
 msgstr "Automaticky"
 
@@ -10928,7 +11051,7 @@ msgid "New Calendar message"
 msgstr "Nová kalendářová zpráva"
 
 #: src/plugins/notification/notification_popup.c:337
-#: src/plugins/notification/notification_trayicon.c:905
+#: src/plugins/notification/notification_trayicon.c:907
 msgid "A new calendar message arrived"
 msgstr "Přišla nová kalendářová zpráva"
 
@@ -10937,7 +11060,7 @@ msgid "New RSS feed article"
 msgstr "Zpráva v RSS kanálu"
 
 #: src/plugins/notification/notification_popup.c:341
-#: src/plugins/notification/notification_trayicon.c:908
+#: src/plugins/notification/notification_trayicon.c:910
 msgid "A new article in a RSS feed arrived"
 msgstr "Byla přijata nová zpráva v RSS kanálu"
 
@@ -10950,7 +11073,7 @@ msgid "Unknown message type arrived"
 msgstr "Byla přijata nová zpráva neznámého typu"
 
 #: src/plugins/notification/notification_popup.c:378
-#: src/plugins/notification/notification_trayicon.c:677
+#: src/plugins/notification/notification_trayicon.c:679
 msgid "Present main window"
 msgstr "Otevřít v hlavním okně"
 
@@ -10976,7 +11099,7 @@ msgid "Calendar message"
 msgstr "Kalendářová zpráva"
 
 #: src/plugins/notification/notification_popup.c:501
-#: src/plugins/notification/notification_trayicon.c:942
+#: src/plugins/notification/notification_trayicon.c:944
 #, c-format
 msgid "%d new calendar message arrived"
 msgid_plural "%d new calendar messages arrived"
@@ -11079,12 +11202,12 @@ msgstr "Zobrazovat proužek"
 
 #: src/plugins/notification/notification_prefs.c:766
 #: src/plugins/pgpcore/select-keys.c:237 src/plugins/pgpcore/sgpgme.c:147
-#: src/prefs_receive.c:231 src/prefs_summaries.c:504
+#: src/prefs_receive.c:231
 msgid "Never"
 msgstr "Nikdy"
 
 #: src/plugins/notification/notification_prefs.c:768 src/prefs_receive.c:229
-#: src/prefs_summaries.c:486 src/prefs_summaries.c:505
+#: src/prefs_summaries.c:494 src/prefs_summaries.c:504
 msgid "Always"
 msgstr "Vždy"
 
@@ -11182,8 +11305,8 @@ msgstr "Časový limit pro zobrazení okna"
 #: src/plugins/notification/notification_prefs.c:1072
 #: src/plugins/notification/notification_prefs.c:1367
 #: src/plugins/notification/notification_prefs.c:1673
-#: src/plugins/spamassassin/spamassassin_gtk.c:390 src/prefs_other.c:575
-#: src/prefs_receive.c:203 src/prefs_summaries.c:538
+#: src/plugins/spamassassin/spamassassin_gtk.c:391 src/prefs_other.c:575
+#: src/prefs_receive.c:203 src/prefs_summaries.c:544
 msgid "seconds"
 msgstr "sekund"
 
@@ -11328,27 +11451,27 @@ msgstr "Zobrazit trayicon upozorňování"
 msgid "New %d, Unread: %d, Total: %d"
 msgstr "Nové: %d, Nepřečtené: %d, Celkem: %d"
 
-#: src/plugins/notification/notification_trayicon.c:855
+#: src/plugins/notification/notification_trayicon.c:857
 msgid "New mail message"
 msgstr "Nová mailová zpráva"
 
-#: src/plugins/notification/notification_trayicon.c:857
+#: src/plugins/notification/notification_trayicon.c:859
 msgid "New news post"
 msgstr "Nová News zpráva "
 
-#: src/plugins/notification/notification_trayicon.c:859
+#: src/plugins/notification/notification_trayicon.c:861
 msgid "New calendar message"
 msgstr "Nová kalendářová zpráva"
 
-#: src/plugins/notification/notification_trayicon.c:861
+#: src/plugins/notification/notification_trayicon.c:863
 msgid "New article in RSS feed"
 msgstr "Nový článek v RSS kanálu"
 
-#: src/plugins/notification/notification_trayicon.c:864
+#: src/plugins/notification/notification_trayicon.c:866
 msgid "New messages arrived"
 msgstr "Přišly nové zpávy"
 
-#: src/plugins/notification/notification_trayicon.c:920
+#: src/plugins/notification/notification_trayicon.c:922
 #, c-format
 msgid "%d new mail message arrived"
 msgid_plural "%d new mail messages arrived"
@@ -11356,7 +11479,7 @@ msgstr[0] "Přišla %d nová zpráva"
 msgstr[1] "Přišly %d nové zprávy"
 msgstr[2] "Přišlo %d nových zpráv"
 
-#: src/plugins/notification/notification_trayicon.c:931
+#: src/plugins/notification/notification_trayicon.c:933
 #, c-format
 msgid "%d new news post arrived"
 msgid_plural "%d new news posts arrived"
@@ -11364,7 +11487,7 @@ msgstr[0] "Přišla %d nová News zpráva"
 msgstr[1] "Přišly %d nové News zprávy"
 msgstr[2] "Přišlo %d nových News zpráv"
 
-#: src/plugins/notification/notification_trayicon.c:953
+#: src/plugins/notification/notification_trayicon.c:955
 #, c-format
 msgid "%d new article in RSS feeds arrived"
 msgid_plural "%d new articles in RSS feeds arrived"
@@ -11433,63 +11556,63 @@ msgid "PDF rendering failed for an unknown reason."
 msgstr "Renderovaní PDF selhalo z neznámého důvodu."
 
 #: src/plugins/pdf_viewer/poppler_viewer.c:1725
-#: src/plugins/pdf_viewer/poppler_viewer.c:1942
+#: src/plugins/pdf_viewer/poppler_viewer.c:1934
 msgid "Document Index"
 msgstr "Index dokumentu"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1910
+#: src/plugins/pdf_viewer/poppler_viewer.c:1902
 msgid "First Page"
 msgstr "První stránka"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1913
+#: src/plugins/pdf_viewer/poppler_viewer.c:1905
 msgid "Previous Page"
 msgstr "Předchozí stránka"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1916
+#: src/plugins/pdf_viewer/poppler_viewer.c:1908
 msgid "Next Page"
 msgstr "Následující stránka"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1919
+#: src/plugins/pdf_viewer/poppler_viewer.c:1911
 msgid "Last Page"
 msgstr "Poslední stránka"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1922
+#: src/plugins/pdf_viewer/poppler_viewer.c:1914
 msgid "Zoom In"
 msgstr "Zvětšit"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1924
+#: src/plugins/pdf_viewer/poppler_viewer.c:1916
 msgid "Zoom Out"
 msgstr "Zmenšit"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1927
+#: src/plugins/pdf_viewer/poppler_viewer.c:1919
 msgid "Fit Page"
 msgstr "Přizpůsobit stránce"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1930
+#: src/plugins/pdf_viewer/poppler_viewer.c:1922
 msgid "Fit Page Width"
 msgstr "Přizpůsobit šířce stránky"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1933
+#: src/plugins/pdf_viewer/poppler_viewer.c:1925
 msgid "Rotate Left"
 msgstr "Otočit vlevo"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1936
+#: src/plugins/pdf_viewer/poppler_viewer.c:1928
 msgid "Rotate Right"
 msgstr "Otočit vpravo"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1939
+#: src/plugins/pdf_viewer/poppler_viewer.c:1931
 msgid "Document Info"
 msgstr "Informace o dokumentu"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1944
+#: src/plugins/pdf_viewer/poppler_viewer.c:1936
 msgid "Page Number"
 msgstr "Číslo stránky"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1946
+#: src/plugins/pdf_viewer/poppler_viewer.c:1938
 msgid "Zoom Factor"
 msgstr "Faktor zobrazení"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2051
+#: src/plugins/pdf_viewer/poppler_viewer.c:2043
 #, c-format
 msgid ""
 "This plugin enables the viewing of PDF and PostScript attachments using the "
@@ -11502,13 +11625,13 @@ msgstr ""
 "\n"
 "Jakákoliv zpětná vazba je vítána: iwkse@claws-mail.org"
 
+#: src/plugins/pdf_viewer/poppler_viewer.c:2049
 #: src/plugins/pdf_viewer/poppler_viewer.c:2057
-#: src/plugins/pdf_viewer/poppler_viewer.c:2065
-#: src/plugins/pdf_viewer/poppler_viewer.c:2085
+#: src/plugins/pdf_viewer/poppler_viewer.c:2077
 msgid "PDF Viewer"
 msgstr "Prohlížeč PDF"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2061
+#: src/plugins/pdf_viewer/poppler_viewer.c:2053
 #, c-format
 msgid ""
 "Warning: could not find ghostscript binary (gs) required for %s plugin to "
@@ -11571,7 +11694,7 @@ msgstr ""
 "Tento klíč není ve vašem seznamu klíčů. Chcete ho zkusit importovat ze "
 "serveru klíčů?"
 
-#: src/plugins/pgpcore/pgp_viewer.c:181 src/plugins/pgpcore/pgp_viewer.c:279
+#: src/plugins/pgpcore/pgp_viewer.c:181 src/plugins/pgpcore/pgp_viewer.c:280
 msgid ""
 "\n"
 "  Key ID "
@@ -11613,19 +11736,19 @@ msgstr ""
 "\n"
 "  Import klíče ID "
 
-#: src/plugins/pgpcore/pgp_viewer.c:268
+#: src/plugins/pgpcore/pgp_viewer.c:269
 msgid "   This key has been imported to your keyring.\n"
 msgstr "   Klíč byl importován do vašeho seznamu klíčů.\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:270
+#: src/plugins/pgpcore/pgp_viewer.c:271
 msgid "   This key couldn't be imported to your keyring.\n"
 msgstr "   Klíč se nepodařilo importovat do vašeho seznamu klíčů.\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:271
+#: src/plugins/pgpcore/pgp_viewer.c:272
 msgid "   Key servers are sometimes slow.\n"
 msgstr " Servery s klíči jsou někdy pomalé.\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:272
+#: src/plugins/pgpcore/pgp_viewer.c:273
 msgid ""
 "   You can try to import it manually with the command:\n"
 "\n"
@@ -11635,7 +11758,7 @@ msgstr ""
 "\n"
 "     "
 
-#: src/plugins/pgpcore/pgp_viewer.c:282
+#: src/plugins/pgpcore/pgp_viewer.c:283
 msgid "   This key is in your keyring.\n"
 msgstr "   Tento klíč je ve vašem seznamu klíčů.\n"
 
@@ -11693,7 +11816,7 @@ msgstr "Vyprší za"
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "Nastavte '0' pro uložení hesla po celou dobu relace"
 
-#: src/plugins/pgpcore/prefs_gpg.c:163 src/plugins/rssyl/rssyl_feed_props.c:476
+#: src/plugins/pgpcore/prefs_gpg.c:163 src/plugins/rssyl/rssyl_feed_props.c:474
 #: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1874
 #: src/prefs_receive.c:187
 msgid "minutes"
@@ -12108,7 +12231,7 @@ msgstr "Nelze převést text do žádné znakové sady."
 #: src/plugins/pgpinline/pgpinline.c:196 src/plugins/pgpinline/pgpinline.c:518
 #: src/plugins/pgpinline/pgpinline.c:657 src/plugins/pgpinline/pgpinline.c:713
 #: src/plugins/pgpmime/pgpmime.c:183 src/plugins/pgpmime/pgpmime.c:329
-#: src/plugins/pgpmime/pgpmime.c:509 src/plugins/pgpmime/pgpmime.c:652
+#: src/plugins/pgpmime/pgpmime.c:510 src/plugins/pgpmime/pgpmime.c:653
 #: src/plugins/smime/smime.c:413
 #, c-format
 msgid "Couldn't initialize GPG context, %s"
@@ -12162,25 +12285,27 @@ msgstr "Nelze testovat části šifrovaného souboru."
 msgid "Malformed message"
 msgstr "Chybná zpráva"
 
-#: src/plugins/pgpinline/pgpinline.c:503
-msgid "Couldn't create temporary file."
-msgstr "Nelze vytvořit dočasný soubor."
+#: src/plugins/pgpinline/pgpinline.c:503 src/plugins/pgpinline/pgpinline.c:695
+#: src/plugins/pgpmime/pgpmime.c:693
+#, c-format
+msgid "Couldn't create temporary file, %s"
+msgstr "Nelze vytvořit dočasný soubor, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:542 src/plugins/pgpmime/pgpmime.c:536
+#: src/plugins/pgpinline/pgpinline.c:542 src/plugins/pgpmime/pgpmime.c:537
 #, c-format
 msgid "Data signing failed, %s"
 msgstr "Digitální podepisování selhalo, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:560 src/plugins/pgpmime/pgpmime.c:563
+#: src/plugins/pgpinline/pgpinline.c:560 src/plugins/pgpmime/pgpmime.c:564
 #, c-format
 msgid "Data signing failed due to invalid signer: %s"
 msgstr "Digitální podepisování selhalo - neplatný podepisující: %s"
 
-#: src/plugins/pgpinline/pgpinline.c:569 src/plugins/pgpmime/pgpmime.c:572
+#: src/plugins/pgpinline/pgpinline.c:569 src/plugins/pgpmime/pgpmime.c:573
 msgid "Data signing failed, no results."
 msgstr "Digitální podepisování selhalo - žádný výstup."
 
-#: src/plugins/pgpinline/pgpinline.c:579 src/plugins/pgpmime/pgpmime.c:583
+#: src/plugins/pgpinline/pgpinline.c:579 src/plugins/pgpmime/pgpmime.c:584
 msgid "Data signing failed, no contents."
 msgstr "Digitální podepisování selhalo - žádný obsah."
 
@@ -12192,17 +12317,12 @@ msgstr ""
 "Upozornění, že přílohy nejsou šifrovány PGP/Inline systémem, stejně tak "
 "záhlaví, jako Předmět."
 
-#: src/plugins/pgpinline/pgpinline.c:667 src/plugins/pgpmime/pgpmime.c:662
+#: src/plugins/pgpinline/pgpinline.c:667 src/plugins/pgpmime/pgpmime.c:663
 #, c-format
 msgid "Couldn't add GPG key %s, %s"
 msgstr "Nepodařilo se přidat GPG klíč %s, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:695 src/plugins/pgpmime/pgpmime.c:691
-#, c-format
-msgid "Couldn't create temporary file, %s"
-msgstr "Nelze vytvořit dočasný soubor, %s"
-
-#: src/plugins/pgpinline/pgpinline.c:726 src/plugins/pgpmime/pgpmime.c:718
+#: src/plugins/pgpinline/pgpinline.c:726 src/plugins/pgpmime/pgpmime.c:720
 #, c-format
 msgid "Encryption failed, %s"
 msgstr "Šifrování selhalo, %s"
@@ -12253,23 +12373,23 @@ msgstr "Nelze analyzovat dešifrovaný soubor."
 msgid "Couldn't parse decrypted file parts."
 msgstr "Nelze analyzovat části dešifrového souboru."
 
-#: src/plugins/pgpmime/pgpmime.c:455 src/plugins/pgpmime/pgpmime.c:494
+#: src/plugins/pgpmime/pgpmime.c:456 src/plugins/pgpmime/pgpmime.c:495
 #, c-format
 msgid "Couldn't create temporary file: %s"
 msgstr "Nepodařilo se vytvořit dočasný soubor: %s"
 
-#: src/plugins/pgpmime/pgpmime.c:596
+#: src/plugins/pgpmime/pgpmime.c:597
 msgid "OpenPGP digital signature"
 msgstr "Digitální podpis OpenPGP"
 
-#: src/plugins/pgpmime/pgpmime.c:618
+#: src/plugins/pgpmime/pgpmime.c:619
 msgid ""
 "Please note that email headers, like Subject, are not encrypted by the PGP/"
 "Mime system."
 msgstr ""
 "Upozornění, že záhlaví, jako Předmět, nejsou šifrovány PGP/Mime systémem."
 
-#: src/plugins/pgpmime/pgpmime.c:790
+#: src/plugins/pgpmime/pgpmime.c:792
 msgid "PGP/Mime"
 msgstr "PGP/MIME"
 
@@ -12312,7 +12432,7 @@ msgid "Show Python console..."
 msgstr "Zobrazit konzoli Pythonu..."
 
 #: src/plugins/python/python_plugin.c:503
-#: src/plugins/rssyl/rssyl_feed_props.c:483
+#: src/plugins/rssyl/rssyl_feed_props.c:481
 msgid "Refresh"
 msgstr "Obnovit"
 
@@ -12488,7 +12608,7 @@ msgctxt "Empty RSS feed title placeholder"
 msgid "(empty)"
 msgstr "(obvykle prázdné)"
 
-#: src/plugins/rssyl/rssyl.c:155 src/plugins/rssyl/rssyl.c:166
+#: src/plugins/rssyl/rssyl.c:156 src/plugins/rssyl/rssyl.c:167
 msgid "Refresh all feeds"
 msgstr "Aktualizovat všechny kanály"
 
@@ -12525,11 +12645,6 @@ msgstr "Odstranit strom kanálů"
 msgid "Select an OPML file"
 msgstr "Vyberte OPML soubor"
 
-#: src/plugins/rssyl/rssyl_feed.c:75 src/plugins/rssyl/rssyl_subscribe.c:158
-#, c-format
-msgid "Couldn't create folder for new feed '%s'."
-msgstr "Nelze vytvořit složku pro nový kanál '%s'."
-
 #: src/plugins/rssyl/rssyl_feed.h:10
 #, c-format
 msgid "RSSyl: Subscribing new feed: %s\n"
@@ -12571,51 +12686,51 @@ msgid "RSSyl: Application is exiting, couldn't finish updating feed at '%s'\n"
 msgstr ""
 "RSSyl: Aplikace se ukončuje, nemohl být dokončen obnova kanálu na '%s'\n"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:270
+#: src/plugins/rssyl/rssyl_feed_props.c:268
 msgid "HTTP Basic authentication"
 msgstr "HTTP základní autentizace"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:291
+#: src/plugins/rssyl/rssyl_feed_props.c:289
 msgid "Use default refresh interval"
 msgstr "Použít výchozí nastavení intervalu aktualizace"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:303
+#: src/plugins/rssyl/rssyl_feed_props.c:301
 msgid "Keep old items"
 msgstr "Uchovat staré položky"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:309
+#: src/plugins/rssyl/rssyl_feed_props.c:307
 msgid "_Trim"
 msgstr "_Oříznout"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:311
+#: src/plugins/rssyl/rssyl_feed_props.c:309
 msgid "Update feed, deleting items which are no longer in the source feed"
 msgstr "Obnova kanálu, mazání položek, které už nejsou ve zdrojovém kanálu"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:314
+#: src/plugins/rssyl/rssyl_feed_props.c:312
 msgid "Fetch comments if possible"
 msgstr "Stahovat komentáře, pokud je to možné"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:339
+#: src/plugins/rssyl/rssyl_feed_props.c:337
 msgid "Always mark it as new"
 msgstr "Vždy označit jako nové"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:345
+#: src/plugins/rssyl/rssyl_feed_props.c:343
 msgid "Only mark it as new if its text has changed"
 msgstr "Označit jako nová jenom když změní její text"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:351
+#: src/plugins/rssyl/rssyl_feed_props.c:349
 msgid "Never mark it as new"
 msgstr "Nikdy označit jako nové"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:356
+#: src/plugins/rssyl/rssyl_feed_props.c:354
 msgid "Add item title to the top of message"
 msgstr "Přidat název položky na začátek zprávy"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:363
+#: src/plugins/rssyl/rssyl_feed_props.c:361
 msgid "Ignore title rename"
 msgstr "Ignorovat přejmenování názvu"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:368
+#: src/plugins/rssyl/rssyl_feed_props.c:366
 msgid ""
 "Enable this to keep current folder name, even if feed author changes title "
 "of the feed."
@@ -12623,54 +12738,54 @@ msgstr ""
 "Povolit pro uchování aktuálního jména složky, ačkoliv autor kanálu změní "
 "název kanálu."
 
-#: src/plugins/rssyl/rssyl_feed_props.c:372
+#: src/plugins/rssyl/rssyl_feed_props.c:370
 #: src/plugins/vcalendar/vcal_prefs.c:593
 msgid "Verify SSL/TLS certificate validity"
 msgstr "Ověřit platnost SSL/TLS certifikátu"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:392
+#: src/plugins/rssyl/rssyl_feed_props.c:390
 msgid "User name"
 msgstr "Uživatelské jméno"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:405
+#: src/plugins/rssyl/rssyl_feed_props.c:403
 msgid "Source URL"
 msgstr "Zdrojové URL"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:418
+#: src/plugins/rssyl/rssyl_feed_props.c:416
 msgid "Fetch comments on posts aged less than"
 msgstr "Stahovat komentáře staré méně než"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:426
+#: src/plugins/rssyl/rssyl_feed_props.c:424
 #: src/plugins/vcalendar/day-view.c:614 src/plugins/vcalendar/month-view.c:711
 #: src/prefs_account.c:1480 src/prefs_folder_item.c:568 src/prefs_matcher.c:337
 msgid "days"
 msgstr "dnech"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:427
+#: src/plugins/rssyl/rssyl_feed_props.c:425
 msgid "Set to -1 to fetch all comments"
 msgstr "Nastavit na -1 pro získání všech komentářů"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:451
+#: src/plugins/rssyl/rssyl_feed_props.c:449
 msgid "If an item changes"
 msgstr "Jen jestli se položka změní"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:456
+#: src/plugins/rssyl/rssyl_feed_props.c:454
 msgid "Items"
 msgstr "Položky"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:469
+#: src/plugins/rssyl/rssyl_feed_props.c:467
 msgid "Refresh interval"
 msgstr "Interval obnovy"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:477
+#: src/plugins/rssyl/rssyl_feed_props.c:475
 msgid "Set to 0 to disable automatic refreshing for this feed"
 msgstr "Vložte 0, pokud nechcete aktualizovat automaticky"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:529
+#: src/plugins/rssyl/rssyl_feed_props.c:527
 msgid "_OK"
 msgstr "_OK"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:537
+#: src/plugins/rssyl/rssyl_feed_props.c:535
 msgid "Set feed properties"
 msgstr "Vlastnosti kanálu"
 
@@ -12759,6 +12874,11 @@ msgstr "Obnovování"
 msgid "Security and privacy"
 msgstr "Bezpečnost a soukromí"
 
+#: src/plugins/rssyl/rssyl_subscribe.c:158
+#, c-format
+msgid "Couldn't create folder for new feed '%s'."
+msgstr "Nelze vytvořit složku pro nový kanál '%s'."
+
 #: src/plugins/rssyl/rssyl_subscribe_gtk.c:47
 msgid "Subscribe new feed?"
 msgstr "Odebírat nový kanál?"
@@ -12783,17 +12903,17 @@ msgid "Updating comments for '%s'..."
 msgstr "Aktualizuji komentáře pro '%s'..."
 
 #: src/plugins/rssyl/rssyl_update_feed.c:105
-#: src/plugins/vcalendar/vcal_folder.c:1614
+#: src/plugins/vcalendar/vcal_folder.c:1620
 msgid "401 (Authorisation required)"
 msgstr "401 (Vyžadována autorizace)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:108
-#: src/plugins/vcalendar/vcal_folder.c:1617
+#: src/plugins/vcalendar/vcal_folder.c:1623
 msgid "403 (Unauthorised)"
 msgstr "403 (Neuatorizován)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:111
-#: src/plugins/vcalendar/vcal_folder.c:1620
+#: src/plugins/vcalendar/vcal_folder.c:1626
 msgid "404 (Not found)"
 msgstr "404 (Nenalezen)"
 
@@ -12929,21 +13049,21 @@ msgid ""
 msgstr ""
 "Upozornění, že záhlaví, jako Předmět, nejsou šifrovány S/MIME systémem."
 
-#: src/plugins/spam_report/spam_report.c:299
+#: src/plugins/spam_report/spam_report.c:301
 msgid "Reporting spam..."
 msgstr "Oznamování spamu..."
 
-#: src/plugins/spam_report/spam_report.c:334
+#: src/plugins/spam_report/spam_report.c:336
 msgid "Report spam online..."
 msgstr "Oznamovat spam online..."
 
-#: src/plugins/spam_report/spam_report.c:345
-#: src/plugins/spam_report/spam_report.c:383
+#: src/plugins/spam_report/spam_report.c:347
+#: src/plugins/spam_report/spam_report.c:385
 #: src/plugins/spam_report/spam_report_prefs.c:83
 msgid "SpamReport"
 msgstr "Spam zpráva"
 
-#: src/plugins/spam_report/spam_report.c:388
+#: src/plugins/spam_report/spam_report.c:390
 msgid ""
 "This plugin reports spam to various places.\n"
 "Currently the following sites or methods are supported:\n"
@@ -12959,7 +13079,7 @@ msgstr ""
 "* spamcop.net\n"
 "* lists.debian.org nomination system"
 
-#: src/plugins/spam_report/spam_report.c:413
+#: src/plugins/spam_report/spam_report.c:415
 msgid "Spam reporting"
 msgstr "Oznamování spamu"
 
@@ -12976,7 +13096,7 @@ msgid "Password:"
 msgstr "Heslo:"
 
 #: src/plugins/spamassassin/spamassassin.c:77
-#: src/plugins/spamassassin/spamassassin_gtk.c:648
+#: src/plugins/spamassassin/spamassassin_gtk.c:649
 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 
@@ -12988,15 +13108,15 @@ msgstr "Modulu Spamassassin se nepodařilo připojit k serveru spamd.\n"
 msgid "SpamAssassin plugin filtering failed.\n"
 msgstr "Filtrování zprávy modulem SpamAssassin selhalo.\n"
 
-#: src/plugins/spamassassin/spamassassin.c:238
+#: src/plugins/spamassassin/spamassassin.c:211
 msgid "SpamAssassin plugin is disabled by its preferences.\n"
 msgstr "Modul SpamAssassin je v předvolbách vypnut.\n"
 
-#: src/plugins/spamassassin/spamassassin.c:243
+#: src/plugins/spamassassin/spamassassin.c:216
 msgid "SpamAssassin: filtering message..."
 msgstr "SpamAssasin: filtrování zprávy..."
 
-#: src/plugins/spamassassin/spamassassin.c:372
+#: src/plugins/spamassassin/spamassassin.c:345
 msgid ""
 "The SpamAssassin plugin couldn't filter a message. The probable cause of the "
 "error is an unreachable spamd daemon. Please make sure spamd is running and "
@@ -13006,7 +13126,7 @@ msgstr ""
 "pravděpodobně způsobena nedosažitelností serveru. Prosím ujistěte se, že "
 "server (spamd) běží a je přístupný."
 
-#: src/plugins/spamassassin/spamassassin.c:429
+#: src/plugins/spamassassin/spamassassin.c:402
 msgid ""
 "Claws Mail needs network access in order to feed the mail to the remote "
 "learner."
@@ -13014,15 +13134,15 @@ msgstr ""
 "Claws Mail potřebuje přístup na síť pro poslání mailu(ů) do vzdáleného "
 "učitele."
 
-#: src/plugins/spamassassin/spamassassin.c:574
+#: src/plugins/spamassassin/spamassassin.c:547
 msgid "Failed to get username"
 msgstr "Nepodařilo se získat přihlašovací jméno"
 
-#: src/plugins/spamassassin/spamassassin.c:586
+#: src/plugins/spamassassin/spamassassin.c:559
 msgid "SpamAssassin plugin is loaded but disabled by its preferences.\n"
 msgstr "Modul Spamassassin je načten, ale v předvolbách je vypnut.\n"
 
-#: src/plugins/spamassassin/spamassassin.c:620
+#: src/plugins/spamassassin/spamassassin.c:593
 msgid ""
 "This plugin can check all messages that are received from an IMAP, LOCAL or "
 "POP account for spam using a SpamAssassin server. You will need a "
@@ -13059,51 +13179,55 @@ msgstr "TCP"
 msgid "Unix Socket"
 msgstr "Unix Socket"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:268
+#: src/plugins/spamassassin/spamassassin_gtk.c:119
+msgid "Select folder to save spam to"
+msgstr "Vybrat složku pro uložení spamu"
+
+#: src/plugins/spamassassin/spamassassin_gtk.c:269
 msgid "Enable SpamAssassin plugin"
 msgstr "Povolit modul SpamAssassin"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:272
+#: src/plugins/spamassassin/spamassassin_gtk.c:273
 msgid "Transport"
 msgstr "Přenos"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:280
+#: src/plugins/spamassassin/spamassassin_gtk.c:281
 msgid "Type of transport"
 msgstr "Typ přenosu"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:301
+#: src/plugins/spamassassin/spamassassin_gtk.c:302
 msgid "User"
 msgstr "Uživatel"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:314
+#: src/plugins/spamassassin/spamassassin_gtk.c:315
 msgid "User to use with spamd server"
 msgstr ""
 "Uživatelské jméno, pod kterým se bude komunikovat se serverem SpamAssassin"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:316
+#: src/plugins/spamassassin/spamassassin_gtk.c:317
 msgid "spamd"
 msgstr "Server"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:334
+#: src/plugins/spamassassin/spamassassin_gtk.c:335
 msgid "Hostname or IP address of spamd server"
 msgstr "Název nebo IP adresa serveru"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:345
+#: src/plugins/spamassassin/spamassassin_gtk.c:346
 msgid "Port of spamd server"
 msgstr "Port serveru"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:351
+#: src/plugins/spamassassin/spamassassin_gtk.c:352
 msgid "Path of Unix socket"
 msgstr "Cesta k Unix socketu"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:386
+#: src/plugins/spamassassin/spamassassin_gtk.c:387
 msgid ""
 "Maximum time allowed for checking. If the check takes longer it will be "
 "aborted."
 msgstr ""
 "Časový limit pro kontrolu. Pokud bude kontrola trvat déle, bude přerušena."
 
-#: src/plugins/tnef_parse/tnef_parse.c:65
+#: src/plugins/tnef_parse/tnef_parse.c:73
 #, c-format
 msgid ""
 "\n"
@@ -13116,29 +13240,29 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: src/plugins/tnef_parse/tnef_parse.c:122
-#: src/plugins/tnef_parse/tnef_parse.c:129
+#: src/plugins/tnef_parse/tnef_parse.c:130
+#: src/plugins/tnef_parse/tnef_parse.c:137
 msgid "Failed to write the part data."
 msgstr "Selhalo zapsání části dat."
 
-#: src/plugins/tnef_parse/tnef_parse.c:174
+#: src/plugins/tnef_parse/tnef_parse.c:182
 msgid "Failed to parse VCalendar data."
 msgstr "Selhalo parsování VCalendar dat."
 
-#: src/plugins/tnef_parse/tnef_parse.c:213
+#: src/plugins/tnef_parse/tnef_parse.c:221
 msgid "Failed to parse VTask data."
 msgstr "Selhalo parsování VTask dat."
 
-#: src/plugins/tnef_parse/tnef_parse.c:263
+#: src/plugins/tnef_parse/tnef_parse.c:273
 msgid "Failed to parse VCard data."
 msgstr "Selhalo parsování VCard dat."
 
-#: src/plugins/tnef_parse/tnef_parse.c:399
-#: src/plugins/tnef_parse/tnef_parse.c:423
+#: src/plugins/tnef_parse/tnef_parse.c:413
+#: src/plugins/tnef_parse/tnef_parse.c:437
 msgid "TNEF Parser"
 msgstr "TNEF Parser"
 
-#: src/plugins/tnef_parse/tnef_parse.c:428
+#: src/plugins/tnef_parse/tnef_parse.c:442
 msgid ""
 "This Claws Mail plugin allows you to read application/ms-tnef attachments.\n"
 "\n"
@@ -13254,19 +13378,14 @@ msgstr "Prosinec"
 msgid "Week number"
 msgstr "Číslo týdne"
 
-#: src/plugins/vcalendar/month-view.c:887
+#: src/plugins/vcalendar/month-view.c:886
 msgid "Previous month"
 msgstr "Předchozí měsíc"
 
-#: src/plugins/vcalendar/month-view.c:907
+#: src/plugins/vcalendar/month-view.c:906
 msgid "Next month"
 msgstr "Další měsíc"
 
-#: src/plugins/vcalendar/plugin.c:44 src/plugins/vcalendar/plugin.c:68
-#: src/plugins/vcalendar/vcal_prefs.c:775
-msgid "vCalendar"
-msgstr "vCalendar"
-
 #: src/plugins/vcalendar/plugin.c:73
 msgid ""
 "This plugin enables vCalendar message handling like that produced by "
@@ -13279,7 +13398,7 @@ msgid ""
 "To create a meeting right-click on the vCalendar or Meetings folder and "
 "choose \"New meeting...\".\n"
 "\n"
-"You will also be able to subscribe to remote Webcal feeds,export your "
+"You will also be able to subscribe to remote Webcal feeds, export your "
 "meetings and calendars, publish your free/busy information and retrieve that "
 "information from others."
 msgstr ""
@@ -13478,63 +13597,63 @@ msgstr "Účastníci:"
 msgid "Action:"
 msgstr "Akce:"
 
-#: src/plugins/vcalendar/vcal_folder.c:165
+#: src/plugins/vcalendar/vcal_folder.c:166
 msgid "_New meeting..."
 msgstr "_Nová schůzka..."
 
-#: src/plugins/vcalendar/vcal_folder.c:166
+#: src/plugins/vcalendar/vcal_folder.c:167
 msgid "_Export calendar..."
 msgstr "_Exportovat kalendář..."
 
-#: src/plugins/vcalendar/vcal_folder.c:167
+#: src/plugins/vcalendar/vcal_folder.c:168
 msgid "_Subscribe to Webcal..."
 msgstr "_Přihlásit Webcal..."
 
-#: src/plugins/vcalendar/vcal_folder.c:169
+#: src/plugins/vcalendar/vcal_folder.c:170
 msgid "_Rename..."
 msgstr "Pře_jmenovat..."
 
-#: src/plugins/vcalendar/vcal_folder.c:170
+#: src/plugins/vcalendar/vcal_folder.c:171
 msgid "U_pdate subscriptions"
 msgstr "U_pdatovat přihlášení"
 
-#: src/plugins/vcalendar/vcal_folder.c:171
+#: src/plugins/vcalendar/vcal_folder.c:172
 msgid "_List view"
 msgstr "Zobrazení jako _seznam"
 
-#: src/plugins/vcalendar/vcal_folder.c:172
+#: src/plugins/vcalendar/vcal_folder.c:173
 msgid "_Week view"
 msgstr "Zobrazení po _týdnech"
 
-#: src/plugins/vcalendar/vcal_folder.c:173
+#: src/plugins/vcalendar/vcal_folder.c:174
 msgid "_Month view"
 msgstr "Zobrazení po _měsících"
 
-#: src/plugins/vcalendar/vcal_folder.c:1095
+#: src/plugins/vcalendar/vcal_folder.c:1101
 msgid "Meetings"
 msgstr "Schůzky"
 
-#: src/plugins/vcalendar/vcal_folder.c:1494
+#: src/plugins/vcalendar/vcal_folder.c:1500
 msgid "in the past"
 msgstr "v minulosti"
 
-#: src/plugins/vcalendar/vcal_folder.c:1497
+#: src/plugins/vcalendar/vcal_folder.c:1503
 msgid "today"
 msgstr "dnes"
 
-#: src/plugins/vcalendar/vcal_folder.c:1500
+#: src/plugins/vcalendar/vcal_folder.c:1506
 msgid "tomorrow"
 msgstr "zítra"
 
-#: src/plugins/vcalendar/vcal_folder.c:1503
+#: src/plugins/vcalendar/vcal_folder.c:1509
 msgid "this week"
 msgstr "tento týden"
 
-#: src/plugins/vcalendar/vcal_folder.c:1506
+#: src/plugins/vcalendar/vcal_folder.c:1512
 msgid "later"
 msgstr "později"
 
-#: src/plugins/vcalendar/vcal_folder.c:1510
+#: src/plugins/vcalendar/vcal_folder.c:1516
 #, c-format
 msgid ""
 "\n"
@@ -13543,17 +13662,17 @@ msgstr ""
 "\n"
 "Jsou plánovány tyto události %s:\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1605
+#: src/plugins/vcalendar/vcal_folder.c:1611
 #, c-format
 msgid "Timeout (%d seconds) connecting to %s\n"
 msgstr "Čas (%d sekund) připojení k %s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1623
+#: src/plugins/vcalendar/vcal_folder.c:1629
 #, c-format
 msgid "Error %ld"
 msgstr "Chyba %ld"
 
-#: src/plugins/vcalendar/vcal_folder.c:1820
+#: src/plugins/vcalendar/vcal_folder.c:1815
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -13566,20 +13685,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1824
-#, c-format
-msgid ""
-"Could not retrieve the Webcal URL:\n"
-"%s:\n"
-"\n"
-"%s\n"
-msgstr ""
-"Nemohl získat Webcal URL:\n"
-"%s:\n"
-"\n"
-"%s\n"
-
-#: src/plugins/vcalendar/vcal_folder.c:1835
+#: src/plugins/vcalendar/vcal_folder.c:1841
 #, c-format
 msgid ""
 "This URL does not look like a Webcal URL:\n"
@@ -13590,121 +13696,110 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1838
-#, c-format
-msgid ""
-"This URL does not look like a Webcal URL:\n"
-"%s\n"
-"%s\n"
-msgstr ""
-"URL nevypadá jako Webcal URL:\n"
-"%s\n"
-"%s\n"
-
-#: src/plugins/vcalendar/vcal_folder.c:1863
-#: src/plugins/vcalendar/vcal_folder.c:1866
+#: src/plugins/vcalendar/vcal_folder.c:1872
+#: src/plugins/vcalendar/vcal_folder.c:1875
 #, c-format
 msgid "Could not create directory %s"
 msgstr "Nepodařilo se vytvořit složku %s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1904
+#: src/plugins/vcalendar/vcal_folder.c:1915
 msgid "Claws Mail needs network access in order to update the Webcal feed."
 msgstr "Claws Mail potřebuje přístup na síť pro update Webcal kanálu."
 
-#: src/plugins/vcalendar/vcal_folder.c:1915
+#: src/plugins/vcalendar/vcal_folder.c:1926
 #, c-format
 msgid "Fetching calendar for %s..."
 msgstr "Stahování kalendáře pro %s..."
 
-#: src/plugins/vcalendar/vcal_folder.c:1916
+#: src/plugins/vcalendar/vcal_folder.c:1927
 msgid "new subscription"
 msgstr "nové přihlášení"
 
-#: src/plugins/vcalendar/vcal_folder.c:1927
+#: src/plugins/vcalendar/vcal_folder.c:1938
 msgid "Claws Mail needs network access in order to update the subscription."
 msgstr "Claws Mail potřebuje přístup na síť pro update přihlášení."
 
-#: src/plugins/vcalendar/vcal_folder.c:1939
+#: src/plugins/vcalendar/vcal_folder.c:1950
 msgid "Subscribe to Webcal"
 msgstr "Přihlásit Webcal"
 
-#: src/plugins/vcalendar/vcal_folder.c:1939
+#: src/plugins/vcalendar/vcal_folder.c:1950
 msgid "Enter the WebCal URL:"
 msgstr "Vložte WebCal URL:"
 
-#: src/plugins/vcalendar/vcal_folder.c:1951
+#: src/plugins/vcalendar/vcal_folder.c:1962
 msgid "Could not parse the URL."
 msgstr "Nemohu parsovat URL."
 
-#: src/plugins/vcalendar/vcal_folder.c:1979
+#: src/plugins/vcalendar/vcal_folder.c:1990
 msgid "Do you really want to unsubscribe?"
 msgstr "Skutečně chcete odhlásit?"
 
-#: src/plugins/vcalendar/vcal_folder.c:1980
+#: src/plugins/vcalendar/vcal_folder.c:1991
 msgid "Delete subscription"
 msgstr "Smazat odběr"
 
-#: src/plugins/vcalendar/vcal_manager.c:109
+#: src/plugins/vcalendar/vcal_manager.c:110
 msgid "accepted"
 msgstr "přijaté"
 
-#: src/plugins/vcalendar/vcal_manager.c:110
+#: src/plugins/vcalendar/vcal_manager.c:111
 msgid "tentatively accepted"
 msgstr "předběžně přijaté"
 
-#: src/plugins/vcalendar/vcal_manager.c:111
+#: src/plugins/vcalendar/vcal_manager.c:112
 msgid "declined"
 msgstr "odmítnuté"
 
-#: src/plugins/vcalendar/vcal_manager.c:112
+#: src/plugins/vcalendar/vcal_manager.c:113
 msgid "did not answer"
 msgstr "nezodpovězené"
 
-#: src/plugins/vcalendar/vcal_manager.c:142
+#: src/plugins/vcalendar/vcal_manager.c:144
 msgid "individual"
 msgstr "inviduální"
 
-#: src/plugins/vcalendar/vcal_manager.c:143
+#: src/plugins/vcalendar/vcal_manager.c:145
 msgid "group"
 msgstr "skupina"
 
-#: src/plugins/vcalendar/vcal_manager.c:144
+#: src/plugins/vcalendar/vcal_manager.c:146
 msgid "resource"
 msgstr "zdroj"
 
-#: src/plugins/vcalendar/vcal_manager.c:145
+#: src/plugins/vcalendar/vcal_manager.c:147
 msgid "room"
 msgstr "místnost"
 
-#: src/plugins/vcalendar/vcal_manager.c:556
+#: src/plugins/vcalendar/vcal_manager.c:558
 msgid "Past"
 msgstr "V minulosti"
 
-#: src/plugins/vcalendar/vcal_manager.c:559
+#: src/plugins/vcalendar/vcal_manager.c:561
 msgid "Today"
 msgstr "Dnes"
 
-#: src/plugins/vcalendar/vcal_manager.c:562
+#: src/plugins/vcalendar/vcal_manager.c:564
 msgid "Tomorrow"
 msgstr "Zítra"
 
-#: src/plugins/vcalendar/vcal_manager.c:565
+#: src/plugins/vcalendar/vcal_manager.c:567
 msgid "This week"
 msgstr "Tento týden"
 
-#: src/plugins/vcalendar/vcal_manager.c:568
+#: src/plugins/vcalendar/vcal_manager.c:570
 msgid "Later"
 msgstr "Později"
 
-#: src/plugins/vcalendar/vcal_manager.c:1256
+#: src/plugins/vcalendar/vcal_manager.c:1246
 msgid "Accepted: "
 msgstr "Přijaté: "
 
-#: src/plugins/vcalendar/vcal_manager.c:1258
+#: src/plugins/vcalendar/vcal_manager.c:1248
 msgid "Declined: "
 msgstr "Odmítnuté:"
 
-#: src/plugins/vcalendar/vcal_manager.c:1260
+#: src/plugins/vcalendar/vcal_manager.c:1250
 msgid "Tentatively Accepted: "
 msgstr "Předběžně přijaté:"
 
@@ -14337,7 +14432,7 @@ msgid "'Get Mail' checks for new messages on this account"
 msgstr "Zpracovat tento účet při volbě 'Přijmout poštu ze všech účtů'"
 
 #: src/prefs_account.c:1725 src/prefs_customheader.c:208
-#: src/prefs_matcher.c:623 src/prefs_matcher.c:1967 src/prefs_matcher.c:1989
+#: src/prefs_matcher.c:623 src/prefs_matcher.c:1968 src/prefs_matcher.c:1990
 msgid "Header"
 msgstr "Záhlaví"
 
@@ -14401,30 +14496,30 @@ msgstr "Automaticky nastavit následující adresy"
 msgid "Spell check dictionaries"
 msgstr "Slovníky pro kontrolu pravopisu"
 
-#: src/prefs_account.c:2082 src/prefs_folder_item.c:1089
+#: src/prefs_account.c:2082 src/prefs_folder_item.c:1104
 #: src/prefs_spelling.c:163
 msgid "Default dictionary"
 msgstr "Výchozí slovník"
 
-#: src/prefs_account.c:2095 src/prefs_folder_item.c:1123
+#: src/prefs_account.c:2095 src/prefs_folder_item.c:1138
 #: src/prefs_spelling.c:176
 msgid "Default alternate dictionary"
 msgstr "Výchozí alternativní slovník"
 
 #: src/prefs_account.c:2181 src/prefs_account.c:3341
-#: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1434
-#: src/prefs_folder_item.c:1824 src/prefs_quote.c:119 src/prefs_quote.c:237
+#: src/prefs_compose_writing.c:373 src/prefs_folder_item.c:1449
+#: src/prefs_folder_item.c:1841 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:336 src/prefs_wrapping.c:153
 msgid "Compose"
 msgstr "Napsat"
 
-#: src/prefs_account.c:2196 src/prefs_folder_item.c:1462 src/prefs_quote.c:134
-#: src/toolbar.c:409
+#: src/prefs_account.c:2196 src/prefs_folder_item.c:1477 src/prefs_quote.c:134
+#: src/toolbar.c:487
 msgid "Reply"
 msgstr "Odpovědět"
 
 #: src/prefs_account.c:2211 src/prefs_filtering_action.c:191
-#: src/prefs_folder_item.c:1490 src/prefs_quote.c:149 src/toolbar.c:413
+#: src/prefs_folder_item.c:1505 src/prefs_quote.c:149 src/toolbar.c:492
 msgid "Forward"
 msgstr "Předat"
 
@@ -14602,7 +14697,7 @@ msgstr "Nebyl zadán příkaz pro odeslání."
 msgid "Receive"
 msgstr "Přijmout"
 
-#: src/prefs_account.c:3359 src/prefs_folder_item.c:1840 src/prefs_quote.c:238
+#: src/prefs_account.c:3359 src/prefs_folder_item.c:1857 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Šablony"
 
@@ -14673,8 +14768,8 @@ msgid "Replace the selected action in list with the action above"
 msgstr "Nahradit vybranou akci v seznam tou nahoře"
 
 #: src/prefs_actions.c:337 src/prefs_filtering_action.c:616
-#: src/prefs_filtering.c:486 src/prefs_matcher.c:779 src/prefs_template.c:320
-#: src/prefs_toolbar.c:1056
+#: src/prefs_filtering.c:486 src/prefs_matcher.c:780 src/prefs_template.c:320
+#: src/prefs_toolbar.c:1069
 msgid "D_elete"
 msgstr "_Smazat"
 
@@ -14699,8 +14794,8 @@ msgid "Move selected action down"
 msgstr "Přesunout vybranou akci dolů"
 
 #: src/prefs_actions.c:535 src/prefs_filtering_action.c:704
-#: src/prefs_filtering.c:836 src/prefs_filtering.c:838
-#: src/prefs_filtering.c:839 src/prefs_filtering.c:949 src/prefs_matcher.c:896
+#: src/prefs_filtering.c:838 src/prefs_filtering.c:840
+#: src/prefs_filtering.c:841 src/prefs_filtering.c:951 src/prefs_matcher.c:897
 #: src/prefs_template.c:472
 msgid "(New)"
 msgstr "(Nová)"
@@ -14717,23 +14812,19 @@ msgstr "Název nabídky nemůže začínat znakem '/'."
 msgid "Colon ':' is not allowed in the menu name."
 msgstr "V názvu nabídky není povolena dvojtečka ':'."
 
-#: src/prefs_actions.c:616
-msgid "There is an action with this name already."
-msgstr "Existuje akce stejného jména."
-
-#: src/prefs_actions.c:635
+#: src/prefs_actions.c:629
 msgid "Menu name is too long."
 msgstr "Název nabídky je příliš dlouhý."
 
-#: src/prefs_actions.c:644
+#: src/prefs_actions.c:638
 msgid "Command-line not set."
 msgstr "Není nastavena příkazová řádka."
 
-#: src/prefs_actions.c:649
+#: src/prefs_actions.c:643
 msgid "Menu name and command are too long."
 msgstr "Název nabídky a příkaz jsou příliš dlouhé."
 
-#: src/prefs_actions.c:655
+#: src/prefs_actions.c:649
 #, c-format
 msgid ""
 "The command\n"
@@ -14744,165 +14835,165 @@ msgstr ""
 "%s\n"
 "má syntaktickou chybu."
 
-#: src/prefs_actions.c:713
+#: src/prefs_actions.c:707
 msgid "Delete action"
 msgstr "Odstranit akci"
 
-#: src/prefs_actions.c:714
+#: src/prefs_actions.c:708
 msgid "Do you really want to delete this action?"
 msgstr "Opravdu chcete odstranit tuto akci?"
 
-#: src/prefs_actions.c:734
+#: src/prefs_actions.c:728
 msgid "Delete all actions"
 msgstr "Odstranit všechny akce"
 
-#: src/prefs_actions.c:735
+#: src/prefs_actions.c:729
 msgid "Do you really want to delete all the actions?"
 msgstr "Opravdu chcete odstranit všechny akce?"
 
-#: src/prefs_actions.c:898 src/prefs_actions.c:929 src/prefs_filtering.c:1497
-#: src/prefs_filtering.c:1519 src/prefs_matcher.c:2114 src/prefs_template.c:572
+#: src/prefs_actions.c:892 src/prefs_actions.c:923 src/prefs_filtering.c:1499
+#: src/prefs_filtering.c:1521 src/prefs_matcher.c:2115 src/prefs_template.c:572
 #: src/prefs_template.c:597
 msgid "Entry not saved"
 msgstr "Neuložený záznam"
 
-#: src/prefs_actions.c:899 src/prefs_actions.c:930 src/prefs_filtering.c:1498
-#: src/prefs_filtering.c:1520 src/prefs_template.c:573 src/prefs_template.c:598
+#: src/prefs_actions.c:893 src/prefs_actions.c:924 src/prefs_filtering.c:1500
+#: src/prefs_filtering.c:1522 src/prefs_template.c:573 src/prefs_template.c:598
 msgid "The entry was not saved. Close anyway?"
 msgstr "Záznam nebyl uložen. Chcete přesto okno zavřít?"
 
-#: src/prefs_actions.c:900 src/prefs_actions.c:905 src/prefs_actions.c:931
-#: src/prefs_filtering.c:1477 src/prefs_filtering.c:1499
-#: src/prefs_filtering.c:1521 src/prefs_matcher.c:2117 src/prefs_template.c:574
+#: src/prefs_actions.c:894 src/prefs_actions.c:899 src/prefs_actions.c:925
+#: src/prefs_filtering.c:1479 src/prefs_filtering.c:1501
+#: src/prefs_filtering.c:1523 src/prefs_matcher.c:2118 src/prefs_template.c:574
 #: src/prefs_template.c:599 src/prefs_template.c:604
 msgid "_Continue editing"
 msgstr "_Pokračovat v úpravách"
 
-#: src/prefs_actions.c:903
+#: src/prefs_actions.c:897
 msgid "Actions list not saved"
 msgstr "Seznam akcí neuložen"
 
-#: src/prefs_actions.c:904
+#: src/prefs_actions.c:898
 msgid "The actions list has been modified. Close anyway?"
 msgstr "Seznam akcí byl změnen. Chcete přesto zavřít?"
 
-#: src/prefs_actions.c:974
+#: src/prefs_actions.c:968
 msgid "<span weight=\"bold\" underline=\"single\">Menu name:</span>"
 msgstr "<span weight=\"bold\" underline=\"single\">Název nabídky:</span>"
 
-#: src/prefs_actions.c:975
+#: src/prefs_actions.c:969
 msgid "Use / in menu name to make submenus."
 msgstr "Použijte \"/\" v názvu nabídky pro vytvoření podnabídek."
 
-#: src/prefs_actions.c:977
+#: src/prefs_actions.c:971
 msgid "<span weight=\"bold\" underline=\"single\">Command-line:</span>"
 msgstr "<span weight=\"bold\" underline=\"single\">Příkazová řádka:</span>"
 
-#: src/prefs_actions.c:978
+#: src/prefs_actions.c:972
 msgid "<span weight=\"bold\">Begin with:</span>"
 msgstr "<span weight=\"bold\">Začíná-li:</span>"
 
-#: src/prefs_actions.c:979
+#: src/prefs_actions.c:973
 msgid "to send message body or selection to command's standard input"
 msgstr ""
 "bude odesláno tělo zprávy nebo vybraná část na standardní vstup příkazu"
 
-#: src/prefs_actions.c:980
+#: src/prefs_actions.c:974
 msgid "to send user provided text to command's standard input"
 msgstr "bude odeslán uživatelem zadaný text na standardní vstup příkazu"
 
-#: src/prefs_actions.c:981
+#: src/prefs_actions.c:975
 msgid "to send user provided hidden text to command's standard input"
 msgstr "bude odeslán uživatelem skrytě zadaný text na standardní vstup příkazu"
 
-#: src/prefs_actions.c:982
+#: src/prefs_actions.c:976
 msgid "<span weight=\"bold\">End with:</span>"
 msgstr "<span weight=\"bold\">Končí-li:</span>"
 
-#: src/prefs_actions.c:983
+#: src/prefs_actions.c:977
 msgid "to replace message body or selection with command's standard output"
 msgstr ""
 "bude tělo zprávy nebo vybraná část nahrazena standardním výstupem příkazu"
 
-#: src/prefs_actions.c:984
+#: src/prefs_actions.c:978
 msgid "to insert command's standard output without replacing old text"
 msgstr "bude standardní výstup příkazu vložen bez nahrazení původního textu"
 
-#: src/prefs_actions.c:985
+#: src/prefs_actions.c:979
 msgid "to run command asynchronously"
 msgstr "bude příkaz spuštěn asynchronně"
 
-#: src/prefs_actions.c:986
+#: src/prefs_actions.c:980
 msgid "<span weight=\"bold\">Use:</span>"
 msgstr "<span weight=\"bold\">Použijte:</span>"
 
-#: src/prefs_actions.c:987
+#: src/prefs_actions.c:981
 msgid "for the file of the selected message in RFC822/2822 format "
 msgstr "pro soubor s vybranou zprávou ve formátu RFC822/2822"
 
-#: src/prefs_actions.c:988
+#: src/prefs_actions.c:982
 msgid ""
 "for the list of the files of the selected messages in RFC822/2822 format"
 msgstr "pro seznam souborů s vybranými zprávami ve formátu RFC822/2822"
 
-#: src/prefs_actions.c:989
+#: src/prefs_actions.c:983
 msgid "for the file of the selected decoded message MIME part"
 msgstr "pro soubor vybrané dekódované MIME části zprávy"
 
-#: src/prefs_actions.c:990
+#: src/prefs_actions.c:984
 msgid "for a user provided argument"
 msgstr "pro uživatelem zadaný parametr"
 
-#: src/prefs_actions.c:991
+#: src/prefs_actions.c:985
 msgid "for a user provided hidden argument (e.g. password)"
 msgstr "pro uživatelem skrytě zadaný parametr (např. heslo)"
 
-#: src/prefs_actions.c:992
+#: src/prefs_actions.c:986
 msgid "for the text selection"
 msgstr "pro vybraný text"
 
-#: src/prefs_actions.c:993
+#: src/prefs_actions.c:987
 msgid "apply filtering actions between {} to selected messages"
 msgstr "pro aplikaci filtrovacích pravidel mezi {} na vybrané zprávy"
 
-#: src/prefs_actions.c:994
+#: src/prefs_actions.c:988
 msgid "for a literal %"
 msgstr "pro znak %"
 
-#: src/prefs_actions.c:1004 src/prefs_themes.c:935
+#: src/prefs_actions.c:998 src/prefs_themes.c:1051
 msgid "Actions"
 msgstr "Akce"
 
-#: src/prefs_actions.c:1005
+#: src/prefs_actions.c:999
 msgid ""
 "The Actions feature is a way for the user to launch external commands to "
 "process a complete message file or just one of its parts."
 msgstr ""
 "Akce umožňují spouštět externí příkazy ke zpracování zpráv nebo jejich částí."
 
-#: src/prefs_actions.c:1092 src/prefs_filtering.c:1695
-#: src/prefs_template.c:1121
+#: src/prefs_actions.c:1086 src/prefs_filtering.c:1697
+#: src/prefs_template.c:1111
 msgid "D_uplicate"
 msgstr "D_uplikáty"
 
-#: src/prefs_actions.c:1212
+#: src/prefs_actions.c:1206
 msgid "Current actions"
 msgstr "Nadefinované akce"
 
-#: src/prefs_actions.c:1311 src/prefs_filtering.c:1074
-#: src/prefs_filtering.c:1132
+#: src/prefs_actions.c:1305 src/prefs_filtering.c:1076
+#: src/prefs_filtering.c:1134
 msgid "Action string is not valid."
 msgstr "Definice akce není platná."
 
-#: src/prefs_common.c:225 src/prefs_quote.c:69
+#: src/prefs_common.c:237 src/prefs_quote.c:69
 msgid "Hello,\\n"
 msgstr "Nazdar,\\n"
 
-#: src/prefs_common.c:303
+#: src/prefs_common.c:315
 msgid "On %d\\n%f wrote:\\n\\n%q\\n%X"
 msgstr "V %d\\n%f napsáno:\\n\\n%q\\n%X"
 
-#: src/prefs_common.c:309 src/prefs_quote.c:85
+#: src/prefs_common.c:321 src/prefs_quote.c:85
 msgid ""
 "\\n\\nBegin forwarded message:\\n\\n?d{Date: %d\\n}?f{From: %f\\n}?t{To: %t"
 "\\n}?c{Cc: %c\\n}?n{Newsgroups: %n\\n}?s{Subject: %s\\n}\\n\\n%M"
@@ -14914,95 +15005,96 @@ msgstr ""
 msgid "%x(%a) %H:%M"
 msgstr "%x(%a) %H:%M"
 
-#: src/prefs_compose_writing.c:125
+#: src/prefs_compose_writing.c:126
 msgid "Automatic account selection"
 msgstr "Automatický výběr účtu"
 
-#: src/prefs_compose_writing.c:133
+#: src/prefs_compose_writing.c:134
 msgid "when replying"
 msgstr "při odpovídání"
 
-#: src/prefs_compose_writing.c:135
+#: src/prefs_compose_writing.c:136
 msgid "when forwarding"
 msgstr "při přeposílání"
 
-#: src/prefs_compose_writing.c:137
+#: src/prefs_compose_writing.c:138
 msgid "when re-editing"
 msgstr "při opětovné editaci"
 
-#: src/prefs_compose_writing.c:140
+#: src/prefs_compose_writing.c:141
 msgid "Editing"
 msgstr "Editace"
 
-#: src/prefs_compose_writing.c:144
+#: src/prefs_compose_writing.c:145
 msgid "Automatically launch the external editor"
 msgstr "Automaticky spustit externí editor"
 
-#: src/prefs_compose_writing.c:152
+#: src/prefs_compose_writing.c:153
 msgid "Automatically save message to Drafts folder every"
 msgstr "Automaticky uložit text do složky s koncepty každých"
 
-#: src/prefs_compose_writing.c:162 src/prefs_wrapping.c:101
+#: src/prefs_compose_writing.c:163 src/prefs_wrapping.c:101
 msgid "characters"
 msgstr "znaků"
 
-#: src/prefs_compose_writing.c:173
+#: src/prefs_compose_writing.c:174
 msgid "Even if message is to be encrypted"
 msgstr "I když zpráva musí být šifrována"
 
-#: src/prefs_compose_writing.c:180
+#: src/prefs_compose_writing.c:181
 msgid "Undo level"
 msgstr "Úroveň zpětných kroků"
 
-#: src/prefs_compose_writing.c:198
+#: src/prefs_compose_writing.c:199
 msgid "Warn when inserting a file larger than"
 msgstr "Varovat při vložení souboru většího než"
 
-#: src/prefs_compose_writing.c:210
+#: src/prefs_compose_writing.c:211
 msgid "KB into message body "
 msgstr "KB v těle zprávy"
 
-#: src/prefs_compose_writing.c:216
+#: src/prefs_compose_writing.c:217
 msgid "Replying"
 msgstr "Odpovídání"
 
-#: src/prefs_compose_writing.c:219
+#: src/prefs_compose_writing.c:220
 msgid "Reply will quote by default"
 msgstr "Odpověď bude vždy s citací"
 
-#: src/prefs_compose_writing.c:222
+#: src/prefs_compose_writing.c:223
 msgid "Reply button invokes mailing list reply"
 msgstr "Tlačítko \"Odpovědět\" odpovídá do konference"
 
-#: src/prefs_compose_writing.c:224
+#: src/prefs_compose_writing.c:225
 msgid "Forwarding"
 msgstr "Předávání"
 
-#: src/prefs_compose_writing.c:227 src/prefs_filtering_action.c:192
+#: src/prefs_compose_writing.c:228 src/prefs_filtering_action.c:192
 msgid "Forward as attachment"
 msgstr "Předat dál jako přílohu"
 
 #: src/prefs_compose_writing.c:230
-msgid "Keep the original 'From' header when redirecting"
-msgstr "Při přesměrování zachovat původní záhlaví 'Od'"
+#, c-format
+msgid "Keep the original '%s' header when redirecting"
+msgstr "Při přesměrování zachovat původní záhlaví '%s'"
 
-#: src/prefs_compose_writing.c:233
+#: src/prefs_compose_writing.c:236
 msgid "When dropping files into the Compose window"
 msgstr "Při přetažení souboru do okna s rozepsanou zprávou"
 
-#: src/prefs_compose_writing.c:242
+#: src/prefs_compose_writing.c:245
 msgid "Ask"
 msgstr "Zeptat se"
 
-#: src/prefs_compose_writing.c:243 src/toolbar.c:427
+#: src/prefs_compose_writing.c:246 src/toolbar.c:519
 msgid "Insert"
 msgstr "Vložit"
 
-#: src/prefs_compose_writing.c:244 src/toolbar.c:428
+#: src/prefs_compose_writing.c:247 src/toolbar.c:520
 msgid "Attach"
 msgstr "Přiložit"
 
-#: src/prefs_compose_writing.c:371
+#: src/prefs_compose_writing.c:374
 msgid "Writing"
 msgstr "Psaní"
 
@@ -15010,8 +15102,8 @@ msgstr "Psaní"
 msgid "Custom header configuration"
 msgstr "Nastavení vlastního záhlaví"
 
-#: src/prefs_customheader.c:506 src/prefs_display_header.c:599
-#: src/prefs_matcher.c:1594 src/prefs_matcher.c:1609
+#: src/prefs_customheader.c:506 src/prefs_display_header.c:601
+#: src/prefs_matcher.c:1595 src/prefs_matcher.c:1610
 msgid "Header name is not set."
 msgstr "Není nastaven název záhlaví."
 
@@ -15078,27 +15170,27 @@ msgstr "Opravdu chcete odstranit toto záhlaví?"
 msgid "Current custom headers"
 msgstr "Aktuální vlastní záhlaví"
 
-#: src/prefs_display_header.c:250
+#: src/prefs_display_header.c:252
 msgid "Displayed header configuration"
 msgstr "Nastavení zobrazovaných záhlaví"
 
-#: src/prefs_display_header.c:274
+#: src/prefs_display_header.c:276
 msgid "Header name"
 msgstr "Název záhlaví"
 
-#: src/prefs_display_header.c:317
+#: src/prefs_display_header.c:319
 msgid "Displayed Headers"
 msgstr "Zobrazené záhlaví"
 
-#: src/prefs_display_header.c:379
+#: src/prefs_display_header.c:381
 msgid "Hidden headers"
 msgstr "Skryté záhlaví"
 
-#: src/prefs_display_header.c:405
+#: src/prefs_display_header.c:407
 msgid "Show all unspecified headers"
 msgstr "Zobrazit všechna nespecifikovaná záhlaví"
 
-#: src/prefs_display_header.c:609
+#: src/prefs_display_header.c:611
 msgid "This header is already in the list."
 msgstr "Toto záhlaví je již v seznamu."
 
@@ -15163,8 +15255,8 @@ msgstr "Skrýt"
 msgid "Message flags"
 msgstr "Příznaky zpráv"
 
-#: src/prefs_filtering_action.c:179 src/prefs_summaries.c:442
-#: src/prefs_summary_column.c:78 src/summaryview.c:2802
+#: src/prefs_filtering_action.c:179 src/prefs_summaries.c:450
+#: src/prefs_summary_column.c:78 src/summaryview.c:2800 src/toolbar.c:502
 msgid "Mark"
 msgstr "Označit"
 
@@ -15184,12 +15276,12 @@ msgstr "Označit jako spam"
 msgid "Mark as ham"
 msgstr "Označit jako ne spam"
 
-#: src/prefs_filtering_action.c:187 src/prefs_filtering_action.c:1438
-#: src/toolbar.c:205 src/toolbar.c:438 src/toolbar.c:2088
+#: src/prefs_filtering_action.c:187 src/prefs_filtering_action.c:1439
+#: src/toolbar.c:238 src/toolbar.c:496 src/toolbar.c:2387
 msgid "Execute"
 msgstr "Provést odložené operace"
 
-#: src/prefs_filtering_action.c:189 src/prefs_summaries.c:440
+#: src/prefs_filtering_action.c:189 src/prefs_summaries.c:448
 msgid "Color label"
 msgstr "Barevné značení zpráv"
 
@@ -15203,8 +15295,8 @@ msgid "Redirect"
 msgstr "Přesměrovat"
 
 #: src/prefs_filtering_action.c:194 src/prefs_filtering_action.c:195
-#: src/prefs_filtering_action.c:1442 src/prefs_matcher.c:629
-#: src/prefs_summaries.c:445 src/prefs_summary_column.c:87
+#: src/prefs_filtering_action.c:1443 src/prefs_matcher.c:629
+#: src/prefs_summaries.c:453 src/prefs_summary_column.c:87
 #: src/summaryview.c:448
 msgid "Score"
 msgstr "Ohodnocení"
@@ -15247,7 +15339,7 @@ msgstr "Zastavit filtrování"
 msgid "Action configuration"
 msgstr "Nastavení akcí"
 
-#: src/prefs_filtering_action.c:427 src/prefs_filtering.c:1886
+#: src/prefs_filtering_action.c:427 src/prefs_filtering.c:1888
 #: src/prefs_matcher.c:586
 msgid "Rule"
 msgstr "Pravidlo"
@@ -15288,25 +15380,25 @@ msgstr "Jméno značky je prázdné."
 msgid "No action was defined."
 msgstr "Není nastavena žádná akce."
 
-#: src/prefs_filtering_action.c:1254 src/prefs_matcher.c:2160
+#: src/prefs_filtering_action.c:1254 src/prefs_matcher.c:2161
 #: src/quote_fmt.c:79
 msgid "literal %"
 msgstr "Procento - znak %"
 
-#: src/prefs_filtering_action.c:1263 src/prefs_matcher.c:2169
+#: src/prefs_filtering_action.c:1263 src/prefs_matcher.c:2170
 msgid "filename (should not be modified)"
 msgstr "název souboru (neměl by být měněn)"
 
-#: src/prefs_filtering_action.c:1264 src/prefs_matcher.c:2170
+#: src/prefs_filtering_action.c:1264 src/prefs_matcher.c:2171
 #: src/quote_fmt.c:87
 msgid "new line"
 msgstr "nový řádek"
 
-#: src/prefs_filtering_action.c:1265 src/prefs_matcher.c:2171
+#: src/prefs_filtering_action.c:1265 src/prefs_matcher.c:2172
 msgid "escape character for quotes"
 msgstr "únikový znak pro citaci"
 
-#: src/prefs_filtering_action.c:1266 src/prefs_matcher.c:2172
+#: src/prefs_filtering_action.c:1266 src/prefs_matcher.c:2173
 msgid "quote character"
 msgstr "uvozovka (znak \")"
 
@@ -15324,23 +15416,23 @@ msgstr ""
 "skriptu.\n"
 "Při definici mohou být použity následující symboly:"
 
-#: src/prefs_filtering_action.c:1422
+#: src/prefs_filtering_action.c:1423
 msgid "Recipient"
 msgstr "Příjemce"
 
-#: src/prefs_filtering_action.c:1426
+#: src/prefs_filtering_action.c:1427
 msgid "Book/Folder"
 msgstr "Kniha/složka"
 
-#: src/prefs_filtering_action.c:1430
+#: src/prefs_filtering_action.c:1431
 msgid "Destination"
 msgstr "Místo určení"
 
-#: src/prefs_filtering_action.c:1434
+#: src/prefs_filtering_action.c:1435
 msgid "Color"
 msgstr "Barva"
 
-#: src/prefs_filtering_action.c:1520
+#: src/prefs_filtering_action.c:1521
 msgid "Current action list"
 msgstr "Platný seznam akcí"
 
@@ -15348,8 +15440,8 @@ msgstr "Platný seznam akcí"
 msgid "Filtering/Processing configuration"
 msgstr "Nastavení filtrování/zpracování"
 
-#: src/prefs_filtering.c:266 src/prefs_filtering.c:867
-#: src/prefs_filtering.c:981
+#: src/prefs_filtering.c:266 src/prefs_filtering.c:869
+#: src/prefs_filtering.c:983
 msgctxt "Filtering Account Menu"
 msgid "All"
 msgstr "všechny"
@@ -15378,83 +15470,83 @@ msgstr "Nahradit vybrané pravidlo pravidlem nahoře"
 msgid "Delete the selected rule from the list"
 msgstr "Odstranit vybrané pravidlo ze seznamu"
 
-#: src/prefs_filtering.c:532
+#: src/prefs_filtering.c:534
 msgid "Move the selected rule to the top"
 msgstr "Přesunout vybrané pravidlo na vrchol"
 
-#: src/prefs_filtering.c:535
+#: src/prefs_filtering.c:537
 msgid "Page u_p"
 msgstr "O stránku _výš"
 
-#: src/prefs_filtering.c:543
+#: src/prefs_filtering.c:545
 msgid "Move the selected rule one page up"
 msgstr "Přesunout vybrané pravidlo o stránku výš"
 
-#: src/prefs_filtering.c:552
+#: src/prefs_filtering.c:554
 msgid "Move the selected rule up"
 msgstr "Posunout vybrané pravidlo nahoru"
 
-#: src/prefs_filtering.c:560
+#: src/prefs_filtering.c:562
 msgid "Move the selected rule down"
 msgstr "Posunout vybrané pravidlo dolu"
 
-#: src/prefs_filtering.c:563
+#: src/prefs_filtering.c:565
 msgid "Page dow_n"
 msgstr "O stránku _dolu"
 
-#: src/prefs_filtering.c:571
+#: src/prefs_filtering.c:573
 msgid "Move the selected rule one page down"
 msgstr "Přesunout vybrané pravidlo o stránku níže"
 
-#: src/prefs_filtering.c:580
+#: src/prefs_filtering.c:582
 msgid "Move the selected rule to the bottom"
 msgstr "Přesunout vybrané pravidlo dospodu"
 
-#: src/prefs_filtering.c:1038 src/prefs_filtering.c:1124
+#: src/prefs_filtering.c:1040 src/prefs_filtering.c:1126
 msgid "Condition string is not valid."
 msgstr "Definice podmínky není platná."
 
-#: src/prefs_filtering.c:1111
+#: src/prefs_filtering.c:1113
 msgid "Condition string is empty."
 msgstr "Podmínka je prázdná."
 
-#: src/prefs_filtering.c:1117
+#: src/prefs_filtering.c:1119
 msgid "Action string is empty."
 msgstr "Akce je prázdná."
 
-#: src/prefs_filtering.c:1205
+#: src/prefs_filtering.c:1207
 msgid "Delete rule"
 msgstr "Odstranit pravidlo"
 
-#: src/prefs_filtering.c:1206
+#: src/prefs_filtering.c:1208
 msgid "Do you really want to delete this rule?"
 msgstr "Opravdu chcete odstranit toto pravidlo?"
 
-#: src/prefs_filtering.c:1224
+#: src/prefs_filtering.c:1226
 msgid "Delete all rules"
 msgstr "Odstranit všechna pravidla"
 
-#: src/prefs_filtering.c:1225
+#: src/prefs_filtering.c:1227
 msgid "Do you really want to delete all the rules?"
 msgstr "Opravdu chcete odstranit všechna pravidla?"
 
-#: src/prefs_filtering.c:1475
+#: src/prefs_filtering.c:1477
 msgid "Filtering rules not saved"
 msgstr "Pravidla filtrování neuložena"
 
-#: src/prefs_filtering.c:1476
+#: src/prefs_filtering.c:1478
 msgid "The list of filtering rules have been modified. Close anyway?"
 msgstr "Seznam pravidel filtrování byl změněn. Přesto zavřít?"
 
-#: src/prefs_filtering.c:1698
+#: src/prefs_filtering.c:1700
 msgid "Move one page up"
 msgstr "Přesunout o stránku výš"
 
-#: src/prefs_filtering.c:1699
+#: src/prefs_filtering.c:1701
 msgid "Move one page down"
 msgstr "Jít o stránku dolů"
 
-#: src/prefs_filtering.c:1854
+#: src/prefs_filtering.c:1856
 msgid "Enable"
 msgstr "Povolit"
 
@@ -15474,13 +15566,13 @@ msgstr ""
 msgid "Hidden columns"
 msgstr "Skryté sloupce"
 
-#: src/prefs_folder_column.c:290 src/prefs_summaries.c:409
-#: src/prefs_summaries.c:587 src/prefs_summary_column.c:304
+#: src/prefs_folder_column.c:290 src/prefs_summaries.c:417
+#: src/prefs_summaries.c:593 src/prefs_summary_column.c:304
 msgid "Displayed columns"
 msgstr "Zobrazené sloupce"
 
 #: src/prefs_folder_column.c:329 src/prefs_msg_colors.c:494
-#: src/prefs_summary_column.c:343 src/prefs_toolbar.c:1064
+#: src/prefs_summary_column.c:343 src/prefs_toolbar.c:1077
 msgid " Use default "
 msgstr " Použít výchozí "
 
@@ -15495,7 +15587,7 @@ msgstr ""
 "Může však být použito pro konfiguraci podřízených složek pomocí volby "
 "\"Nastavit také u podsložek\"."
 
-#: src/prefs_folder_item.c:289 src/prefs_folder_item.c:885
+#: src/prefs_folder_item.c:289 src/prefs_folder_item.c:886
 msgid ""
 "Apply to\n"
 "subfolders"
@@ -15535,7 +15627,7 @@ msgstr "Práva složky"
 msgid "Folder color"
 msgstr "Barva složky"
 
-#: src/prefs_folder_item.c:441 src/prefs_folder_item.c:1663
+#: src/prefs_folder_item.c:441 src/prefs_folder_item.c:1678
 msgid "Pick color for folder"
 msgstr "Zvolte barvu pro složku"
 
@@ -15591,41 +15683,44 @@ msgstr "Odstranit stará těla zpráv"
 msgid "Discard folder cache"
 msgstr "Zrušit cache složky"
 
-#: src/prefs_folder_item.c:894
+#: src/prefs_folder_item.c:895
 msgid "Request Return Receipt"
 msgstr "Vyžadovat potvrzení o doručení"
 
-#: src/prefs_folder_item.c:909
+#: src/prefs_folder_item.c:910
 msgid "Save copy of outgoing messages to this folder instead of Sent"
 msgstr "Uložit odeslané zprávy do této složky místo do Odeslané pošty"
 
-#: src/prefs_folder_item.c:922 src/prefs_folder_item.c:945
-#: src/prefs_folder_item.c:969 src/prefs_folder_item.c:992
-#: src/prefs_folder_item.c:1015
-msgid "Default "
-msgstr "Výchozí"
+#: src/prefs_folder_item.c:924 src/prefs_folder_item.c:976
+#: src/prefs_folder_item.c:1002 src/prefs_folder_item.c:1028
+#, c-format
+msgctxt "folder properties: %s stands for a header name"
+msgid "Default %s"
+msgstr "Výchozí %s"
 
-#: src/prefs_folder_item.c:946
-msgid " for replies"
-msgstr " pro odpovědi"
+#: src/prefs_folder_item.c:950
+#, c-format
+msgctxt "folder properties: %s stands for a header name"
+msgid "Default %s for replies"
+msgstr "Výchozí %s pro odpovědi"
 
-#: src/prefs_folder_item.c:1038
+#: src/prefs_folder_item.c:1053
 msgid "Default account"
 msgstr "Výchozí účet"
 
-#: src/prefs_folder_item.c:1676
+#: src/prefs_folder_item.c:1691
 msgid "Discard cache"
 msgstr "Zrušit cache"
 
-#: src/prefs_folder_item.c:1677
+#: src/prefs_folder_item.c:1692
 msgid "Do you really want to discard the local cached data for this folder?"
 msgstr "Opravdu chcete zahodit lokálně kešovaná data pro tuto složku?"
 
-#: src/prefs_folder_item.c:1807
+#: src/prefs_folder_item.c:1824
 msgid "General"
 msgstr "Obecné"
 
-#: src/prefs_folder_item.c:1886
+#: src/prefs_folder_item.c:1903
 #, c-format
 msgid "Properties for folder %s"
 msgstr "Vlastnosti složky %s"
@@ -15634,7 +15729,7 @@ msgstr "Vlastnosti složky %s"
 msgid "Folder and Message Lists"
 msgstr "Seznam složek a seznam zpráv"
 
-#: src/prefs_fonts.c:99 src/prefs_matcher.c:2035
+#: src/prefs_fonts.c:99 src/prefs_matcher.c:2036
 msgid "Message"
 msgstr "Text zprávy"
 
@@ -15658,8 +15753,8 @@ msgstr "Použít jiné písmo pro tisk"
 msgid "Message Printing"
 msgstr "Tisk zpráv"
 
-#: src/prefs_fonts.c:268 src/prefs_msg_colors.c:839 src/prefs_summaries.c:731
-#: src/prefs_themes.c:365
+#: src/prefs_fonts.c:268 src/prefs_msg_colors.c:839 src/prefs_summaries.c:768
+#: src/prefs_themes.c:389
 msgid "Display"
 msgstr "Zobrazení"
 
@@ -15667,7 +15762,7 @@ msgstr "Zobrazení"
 msgid "Fonts"
 msgstr "Písma"
 
-#: src/prefs_gtk.c:911 src/toolbar.c:213 src/toolbar.c:423
+#: src/prefs_gtk.c:908 src/toolbar.c:256 src/toolbar.c:514
 msgid "Preferences"
 msgstr "Předvolby"
 
@@ -15887,11 +15982,11 @@ msgstr "část těla"
 msgid "whole message"
 msgstr "celá zpráva"
 
-#: src/prefs_matcher.c:394 src/summaryview.c:6267
+#: src/prefs_matcher.c:394 src/summaryview.c:6309
 msgid "Marked"
 msgstr "Označené"
 
-#: src/prefs_matcher.c:395 src/summaryview.c:6265
+#: src/prefs_matcher.c:395 src/summaryview.c:6307
 msgid "Deleted"
 msgstr "Odstraněné"
 
@@ -15899,12 +15994,12 @@ msgstr "Odstraněné"
 msgid "Replied"
 msgstr "Odpovězené"
 
-#: src/prefs_matcher.c:397 src/summaryview.c:6259
+#: src/prefs_matcher.c:397 src/summaryview.c:6301
 msgid "Forwarded"
 msgstr "Předané"
 
-#: src/prefs_matcher.c:399 src/summaryview.c:6249 src/toolbar.c:416
-#: src/toolbar.c:934 src/toolbar.c:1978
+#: src/prefs_matcher.c:399 src/summaryview.c:6291 src/toolbar.c:512
+#: src/toolbar.c:981 src/toolbar.c:2261
 msgid "Spam"
 msgstr "Spam"
 
@@ -15912,7 +16007,7 @@ msgstr "Spam"
 msgid "Has attachment"
 msgstr "Má přílohu"
 
-#: src/prefs_matcher.c:401 src/summaryview.c:6285
+#: src/prefs_matcher.c:401 src/summaryview.c:6327
 msgid "Signed"
 msgstr "Podepsané"
 
@@ -16012,54 +16107,54 @@ msgstr "Částečně staženo"
 msgid "External program test"
 msgstr "Test externího programu"
 
-#: src/prefs_matcher.c:710 src/prefs_matcher.c:1615 src/prefs_matcher.c:1630
-#: src/prefs_matcher.c:2516
+#: src/prefs_matcher.c:710 src/prefs_matcher.c:1616 src/prefs_matcher.c:1631
+#: src/prefs_matcher.c:2517
 msgctxt "Filtering Matcher Menu"
 msgid "All"
 msgstr "všechny"
 
-#: src/prefs_matcher.c:743
+#: src/prefs_matcher.c:744
 msgid "Use regexp"
 msgstr "Použít regulární výraz"
 
-#: src/prefs_matcher.c:819
+#: src/prefs_matcher.c:820
 msgid "Message must match"
 msgstr "Zpráva musí odpovídat"
 
-#: src/prefs_matcher.c:823
+#: src/prefs_matcher.c:824
 msgid "at least one"
 msgstr "nejméně jeden"
 
-#: src/prefs_matcher.c:824
+#: src/prefs_matcher.c:825
 msgid "all"
 msgstr "vše"
 
-#: src/prefs_matcher.c:827
+#: src/prefs_matcher.c:828
 msgid "of above rules"
 msgstr "výše uvedenými pravidly"
 
-#: src/prefs_matcher.c:1533 src/prefs_matcher.c:1599
+#: src/prefs_matcher.c:1534 src/prefs_matcher.c:1600
 msgid "Search pattern is not set."
 msgstr "Není nastaven vzor pro vyhledávání."
 
-#: src/prefs_matcher.c:1542
+#: src/prefs_matcher.c:1543
 msgid "Test command is not set."
 msgstr "Není nastaven test příkazu."
 
-#: src/prefs_matcher.c:1616
+#: src/prefs_matcher.c:1617
 msgid "all addresses in all headers"
 msgstr "každá adresa ze všech položek záhlaví zprávy"
 
-#: src/prefs_matcher.c:1619
+#: src/prefs_matcher.c:1620
 msgid "any address in any header"
 msgstr "libovolná adresa z libovolného záhlaví zprávy"
 
-#: src/prefs_matcher.c:1621
+#: src/prefs_matcher.c:1622
 #, c-format
 msgid "the address(es) in header '%s'"
 msgstr "adresa ze záhlaví '%s' zprávy"
 
-#: src/prefs_matcher.c:1622
+#: src/prefs_matcher.c:1623
 #, c-format
 msgid ""
 "Book/folder path is not set.\n"
@@ -16072,83 +16167,83 @@ msgstr ""
 "Pokud chcete zjišťovat zda %s existuje v rámci celé knihy, vyberte '%s' z "
 "knihy/složky přetáhněte do seznamu."
 
-#: src/prefs_matcher.c:1841
+#: src/prefs_matcher.c:1842
 msgid "Headers part"
 msgstr "Část záhlaví"
 
-#: src/prefs_matcher.c:1845
+#: src/prefs_matcher.c:1846
 msgid "Headers values"
 msgstr "Hodnoty záhlaví"
 
-#: src/prefs_matcher.c:1849
+#: src/prefs_matcher.c:1850
 msgid "Body part"
 msgstr "Část těla"
 
-#: src/prefs_matcher.c:1853
+#: src/prefs_matcher.c:1854
 msgid "Whole message"
 msgstr "Celá zpráva"
 
-#: src/prefs_matcher.c:1966 src/prefs_matcher.c:2008
+#: src/prefs_matcher.c:1967 src/prefs_matcher.c:2009
 msgid "in"
 msgstr "v"
 
-#: src/prefs_matcher.c:1968
+#: src/prefs_matcher.c:1969
 msgid "content is"
 msgstr "obsahuje"
 
-#: src/prefs_matcher.c:1977
+#: src/prefs_matcher.c:1978
 msgid "Age is"
 msgstr "Věk je"
 
-#: src/prefs_matcher.c:1982
+#: src/prefs_matcher.c:1983
 msgid "Flag"
 msgstr "Příznak"
 
-#: src/prefs_matcher.c:1983 src/prefs_matcher.c:1998
+#: src/prefs_matcher.c:1984 src/prefs_matcher.c:1999
 msgid "is"
 msgstr "je"
 
-#: src/prefs_matcher.c:1988
+#: src/prefs_matcher.c:1989
 msgid "Name:"
 msgstr "Jméno: "
 
-#: src/prefs_matcher.c:1997
+#: src/prefs_matcher.c:1998
 msgid "Label"
 msgstr "Označení"
 
-#: src/prefs_matcher.c:2003
+#: src/prefs_matcher.c:2004
 msgid "Value:"
 msgstr "Hodnota:"
 
-#: src/prefs_matcher.c:2018
+#: src/prefs_matcher.c:2019
 msgid "Score is"
 msgstr "Skóre je"
 
-#: src/prefs_matcher.c:2019
+#: src/prefs_matcher.c:2020
 msgid "points"
 msgstr "body"
 
-#: src/prefs_matcher.c:2029
+#: src/prefs_matcher.c:2030
 msgid "Size is"
 msgstr "Velikost je"
 
-#: src/prefs_matcher.c:2034
+#: src/prefs_matcher.c:2035
 msgid "Scope:"
 msgstr "Rozsah:"
 
-#: src/prefs_matcher.c:2036
+#: src/prefs_matcher.c:2037
 msgid "tags"
 msgstr "značky"
 
-#: src/prefs_matcher.c:2041
+#: src/prefs_matcher.c:2042
 msgid "type is"
 msgstr "typ je"
 
-#: src/prefs_matcher.c:2045
+#: src/prefs_matcher.c:2046
 msgid "Program returns"
 msgstr "Návratové hodnoty programu"
 
-#: src/prefs_matcher.c:2115
+#: src/prefs_matcher.c:2116
 msgid ""
 "The entry was not saved.\n"
 "Close anyway?"
@@ -16156,11 +16251,11 @@ msgstr ""
 "Záznam nebyl uložen.\n"
 "Chcete přesto okno zavřít?"
 
-#: src/prefs_matcher.c:2181
+#: src/prefs_matcher.c:2182
 msgid "Match Type: 'Test'"
 msgstr "Typ podmínky: 'Test'"
 
-#: src/prefs_matcher.c:2182
+#: src/prefs_matcher.c:2183
 msgid ""
 "'Test' allows you to test a message or message element using an external "
 "program or script. The program will return either 0 or 1.\n"
@@ -16172,7 +16267,7 @@ msgstr ""
 "\n"
 "Následující symboly mohou být použity:"
 
-#: src/prefs_matcher.c:2281
+#: src/prefs_matcher.c:2282
 msgid "Current condition rules"
 msgstr "Aktuální pravidla podmínky"
 
@@ -16366,7 +16461,7 @@ msgctxt "Tooltip"
 msgid "Pick color for signatures"
 msgstr "Vybrat barvu pro podpisy"
 
-#: src/prefs_msg_colors.c:367 src/prefs_summaries.c:357
+#: src/prefs_msg_colors.c:367 src/prefs_summaries.c:365
 msgid "Folder list"
 msgstr "Seznam složek"
 
@@ -16909,172 +17004,188 @@ msgstr "Barva pro slova s chybou. Je-li vybrána černá, budou slova podtrhová
 msgid "Spell Checking"
 msgstr "Kontrola pravopisu"
 
-#: src/prefs_summaries.c:153
+#: src/prefs_summaries.c:160
 msgid "the abbreviated weekday name"
 msgstr "zkratky pro jména dnů v týdnu"
 
-#: src/prefs_summaries.c:154
+#: src/prefs_summaries.c:161
 msgid "the full weekday name"
 msgstr "plný název dne v týdnu"
 
-#: src/prefs_summaries.c:155
+#: src/prefs_summaries.c:162
 msgid "the abbreviated month name"
 msgstr "zkratka pro měsíc"
 
-#: src/prefs_summaries.c:156
+#: src/prefs_summaries.c:163
 msgid "the full month name"
 msgstr "plný název měsíce"
 
-#: src/prefs_summaries.c:157
+#: src/prefs_summaries.c:164
 msgid "the preferred date and time for the current locale"
 msgstr "preferované datum a čas podle aktuálního locale"
 
-#: src/prefs_summaries.c:158
+#: src/prefs_summaries.c:165
 msgid "the century number (year/100)"
 msgstr "století (rok/100)"
 
-#: src/prefs_summaries.c:159
+#: src/prefs_summaries.c:166
 msgid "the day of the month as a decimal number"
 msgstr "den v měsíci číselně"
 
-#: src/prefs_summaries.c:160
+#: src/prefs_summaries.c:167
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "hodiny číselně s 24 hodinových cyklem"
 
-#: src/prefs_summaries.c:161
+#: src/prefs_summaries.c:168
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "hodiny číselně s 12 hodinových cyklem"
 
-#: src/prefs_summaries.c:162
+#: src/prefs_summaries.c:169
 msgid "the day of the year as a decimal number"
 msgstr "rok číselně"
 
-#: src/prefs_summaries.c:163
+#: src/prefs_summaries.c:170
 msgid "the month as a decimal number"
 msgstr "měsíc číselně"
 
-#: src/prefs_summaries.c:164
+#: src/prefs_summaries.c:171
 msgid "the minute as a decimal number"
 msgstr "minuty číselně"
 
-#: src/prefs_summaries.c:165
+#: src/prefs_summaries.c:172
 msgid "either AM or PM"
 msgstr "AM nebo PM"
 
-#: src/prefs_summaries.c:166
+#: src/prefs_summaries.c:173
 msgid "the second as a decimal number"
 msgstr "vteřiny číselně"
 
-#: src/prefs_summaries.c:167
+#: src/prefs_summaries.c:174
 msgid "the day of the week as a decimal number"
 msgstr "den v týdnu číselně"
 
-#: src/prefs_summaries.c:168
+#: src/prefs_summaries.c:175
 msgid "the preferred date for the current locale"
 msgstr "preferovaný datum pro aktuální locale"
 
-#: src/prefs_summaries.c:169
+#: src/prefs_summaries.c:176
 msgid "the last two digits of a year"
 msgstr "poslední dvě číslice z roku"
 
-#: src/prefs_summaries.c:170
+#: src/prefs_summaries.c:177
 msgid "the year as a decimal number"
 msgstr "rok jako desítkové číslo"
 
-#: src/prefs_summaries.c:171
+#: src/prefs_summaries.c:178
 msgid "the time zone or name or abbreviation"
 msgstr "časová zóna, název nebo zkratka"
 
-#: src/prefs_summaries.c:192 src/prefs_summaries.c:240
-#: src/prefs_summaries.c:561
+#: src/prefs_summaries.c:199 src/prefs_summaries.c:247
+#: src/prefs_summaries.c:567
 msgid "Date format"
 msgstr "Formát datumu"
 
-#: src/prefs_summaries.c:216
+#: src/prefs_summaries.c:223
 msgid "Specifier"
 msgstr "Symbol"
 
-#: src/prefs_summaries.c:258
+#: src/prefs_summaries.c:265
 msgid "Example"
 msgstr "Příklad"
 
-#: src/prefs_summaries.c:363
+#: src/prefs_summaries.c:371
 msgid "Display message count next to folder name"
 msgstr "Zobrazit počet zpráv za názvem složky"
 
-#: src/prefs_summaries.c:373
+#: src/prefs_summaries.c:381
 msgid "Unread messages"
 msgstr "Ano - počet nepřečtených"
 
-#: src/prefs_summaries.c:374
+#: src/prefs_summaries.c:382
 msgid "Unread and Total messages"
 msgstr "Ano - počet nepřečtených a celkem"
 
-#: src/prefs_summaries.c:384
+#: src/prefs_summaries.c:392
 msgid "Open last opened folder at start-up"
 msgstr "Po startu otevřít naposledy otevřenou složku"
 
-#: src/prefs_summaries.c:387
+#: src/prefs_summaries.c:395
 msgid "Abbreviate newsgroup names longer than"
 msgstr "Zkrátit názvy diskuzních skupin delší než"
 
-#: src/prefs_summaries.c:401
+#: src/prefs_summaries.c:409
 msgid "letters"
 msgstr "dopisy(ů)"
 
-#: src/prefs_summaries.c:419
+#: src/prefs_summaries.c:427
 msgid "Message list"
 msgstr "Seznam zpráv"
 
-#: src/prefs_summaries.c:425
+#: src/prefs_summaries.c:433
 msgid "Sort new folders by"
 msgstr "Řadit nové složky podle"
 
-#: src/prefs_summaries.c:433 src/prefs_summary_column.c:86
+#: src/prefs_summaries.c:441 src/prefs_summary_column.c:86
 msgid "Number"
 msgstr "Číslo"
 
-#: src/prefs_summaries.c:436
+#: src/prefs_summaries.c:444
 msgid "Thread date"
 msgstr "Datum vlákna"
 
-#: src/prefs_summaries.c:447
+#: src/prefs_summaries.c:455
 msgid "Don't sort"
 msgstr "Neřadit"
 
-#: src/prefs_summaries.c:464
+#: src/prefs_summaries.c:472
 msgid "Set default selection when entering a folder"
 msgstr "Nastavit výchozí výběr při vstupu do složky"
 
-#: src/prefs_summaries.c:477
+#: src/prefs_summaries.c:485
 msgid "Show \"no unread (or new) message\" dialog"
 msgstr "Zobrazit dotaz \"nejsou nepřečtené (nebo nové) zprávy\""
 
-#: src/prefs_summaries.c:487
+#: src/prefs_summaries.c:495
 msgid "Assume 'Yes'"
 msgstr "Předpokládat 'Ano'"
 
-#: src/prefs_summaries.c:488
+#: src/prefs_summaries.c:496
 msgid "Assume 'No'"
 msgstr "Předpokládat 'Ne'"
 
-#: src/prefs_summaries.c:496
+#: src/prefs_summaries.c:501
 msgid "Open message when selected"
 msgstr "Zobrazit zprávu ihned po vybrání"
 
 #: src/prefs_summaries.c:506
-msgid "When message view is visible"
-msgstr "Když je okno zpráv zobrazené"
+msgid "When opening a folder"
+msgstr "Při vstupu do složky"
+
+#: src/prefs_summaries.c:508
+msgid "When displaying search results"
+msgstr "Při zobrazení výsledku hledání"
+
+#: src/prefs_summaries.c:510
+msgid "When selecting next or previous message using shortcuts"
+msgstr "Při vybrání následující nebo předchozí zprávy pomocí klávesové zkratky"
 
 #: src/prefs_summaries.c:512
+msgid "When deleting or moving messages"
+msgstr "Při odstraňování  nebo přesouvání zpráv"
+
+#: src/prefs_summaries.c:514
+msgid "When using directional keys"
+msgstr "Při použití navigačních kláves"
+
+#: src/prefs_summaries.c:518
 msgid "Thread using subject in addition to standard headers"
 msgstr "Vlákno z předmětu jako přídavek ke standardních záhlavím"
 
-#: src/prefs_summaries.c:516
+#: src/prefs_summaries.c:522
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Přesun a mazání provádět ihned"
 
-#: src/prefs_summaries.c:518
+#: src/prefs_summaries.c:524
 msgid ""
 "Defers moving, copying and deleting of messages until you choose 'Tools/"
 "Execute'"
@@ -17082,39 +17193,39 @@ msgstr ""
 "Odkládá přesouvání, kopírování a mazání zpráv do okamžiku, kdy použijete "
 "nabídku 'Nástroje/Provést odložené operace'"
 
-#: src/prefs_summaries.c:521
+#: src/prefs_summaries.c:527
 msgid "Mark message as read"
 msgstr "Označit zprávu za přečtenou"
 
-#: src/prefs_summaries.c:524
+#: src/prefs_summaries.c:530
 msgid "when selected, after"
 msgstr "když vybrána, potom"
 
-#: src/prefs_summaries.c:544
+#: src/prefs_summaries.c:550
 msgid "only when opened in a new window, or replied to"
 msgstr "jen při otevření v novém okně nebo odpovědi na ni"
 
-#: src/prefs_summaries.c:551
+#: src/prefs_summaries.c:557
 msgid "Display sender using address book"
 msgstr "Zobrazit odesílatele pomocí knihy adres"
 
-#: src/prefs_summaries.c:555
+#: src/prefs_summaries.c:561
 msgid "Show tooltips"
 msgstr "Zobrazovat tipy"
 
-#: src/prefs_summaries.c:581
+#: src/prefs_summaries.c:587
 msgid "Date format help"
 msgstr "Nápověda k formátu datumu"
 
-#: src/prefs_summaries.c:599
+#: src/prefs_summaries.c:605
 msgid "Confirm before marking all messages in a folder as read"
 msgstr "Potvrzení před označením všech zpráv ve složce jako přečtené"
 
-#: src/prefs_summaries.c:602
+#: src/prefs_summaries.c:608
 msgid "Translate header names"
 msgstr "Překládat záhlaví"
 
-#: src/prefs_summaries.c:604
+#: src/prefs_summaries.c:610
 msgid ""
 "The display of standard headers (such as 'From:', 'Subject:') will be "
 "translated into your language."
@@ -17122,7 +17233,7 @@ msgstr ""
 "Standardní záhlaví zpráv (jako 'From:', 'Subject:') budou překládána do "
 "vašeho jazyka."
 
-#: src/prefs_summaries.c:732
+#: src/prefs_summaries.c:769
 msgid "Summaries"
 msgstr "Seznamy"
 
@@ -17228,86 +17339,86 @@ msgstr "Seznam šablon neuložen"
 msgid "The templates list has been modified. Close anyway?"
 msgstr "Seznam šablon změněn. Chcete přesto zavřít?"
 
-#: src/prefs_template.c:768
+#: src/prefs_template.c:758
 msgid "The template's name is not set."
 msgstr "Název šablony není nastaven."
 
-#: src/prefs_template.c:811
+#: src/prefs_template.c:801
 msgid "The \"From\" field of the template contains an invalid email address."
 msgstr "Pole \"Od\" šablony obsahuje neplatnou emailovou adresu."
 
-#: src/prefs_template.c:817
+#: src/prefs_template.c:807
 msgid "The \"To\" field of the template contains an invalid email address."
 msgstr "Pole \"Komu\" šablony obsahuje neplatnou emailovou adresu."
 
-#: src/prefs_template.c:823
+#: src/prefs_template.c:813
 msgid "The \"Cc\" field of the template contains an invalid email address."
 msgstr "Pole \"Kopie\" šablony obsahuje neplatnou emailovou adresu."
 
-#: src/prefs_template.c:829
+#: src/prefs_template.c:819
 msgid "The \"Bcc\" field of the template contains an invalid email address."
 msgstr "Pole \"Skrytá kopie\" šablony obsahuje neplatnou emailovou adresu."
 
-#: src/prefs_template.c:835
+#: src/prefs_template.c:825
 msgid ""
 "The \"Reply-To\" field of the template contains an invalid email address."
 msgstr "Pole \"Komu\" šablony obsahuje neplatnou emailovou adresu."
 
-#: src/prefs_template.c:841
+#: src/prefs_template.c:831
 msgid "The \"Subject\" field of the template is invalid."
 msgstr "Pole \"Předmět\" šablony je neplatné."
 
-#: src/prefs_template.c:912
+#: src/prefs_template.c:902
 msgid "Delete template"
 msgstr "Odstranit šablonu"
 
-#: src/prefs_template.c:913
+#: src/prefs_template.c:903
 msgid "Do you really want to delete this template?"
 msgstr "Opravdu chcete odstranit tuto šablonu?"
 
-#: src/prefs_template.c:925
+#: src/prefs_template.c:915
 msgid "Delete all templates"
 msgstr "Odstranit všechny šablony"
 
-#: src/prefs_template.c:926
+#: src/prefs_template.c:916
 msgid "Do you really want to delete all the templates?"
 msgstr "Opravdu chcete odstranit všechny šablony?"
 
-#: src/prefs_template.c:1241
+#: src/prefs_template.c:1231
 msgid "Current templates"
 msgstr "Aktuální šablony"
 
-#: src/prefs_template.c:1269
+#: src/prefs_template.c:1259
 msgid "Template"
 msgstr "Šablona"
 
-#: src/prefs_themes.c:344 src/prefs_themes.c:704
+#: src/prefs_themes.c:368 src/prefs_themes.c:804
 msgid "Default internal theme"
 msgstr "Výchozí vnitřní motiv"
 
-#: src/prefs_themes.c:366
+#: src/prefs_themes.c:390
 msgid "Themes"
 msgstr "Motivy"
 
-#: src/prefs_themes.c:436
+#: src/prefs_themes.c:464
 msgid "Only root can remove system themes"
 msgstr "Pouze root může odstranit systémové motivy"
 
-#: src/prefs_themes.c:439
+#: src/prefs_themes.c:467
 #, c-format
 msgid "Remove system theme '%s'"
 msgstr "Odstranit systémový motiv '%s'"
 
-#: src/prefs_themes.c:442
+#: src/prefs_themes.c:470
 #, c-format
 msgid "Remove theme '%s'"
 msgstr "Odstranit motiv '%s'"
 
-#: src/prefs_themes.c:448
+#: src/prefs_themes.c:476
 msgid "Are you sure you want to remove this theme?"
 msgstr "Opravdu chcete odstranit tento motiv?"
 
-#: src/prefs_themes.c:458
+#: src/prefs_themes.c:486
 #, c-format
 msgid ""
 "File %s failed\n"
@@ -17316,24 +17427,24 @@ msgstr ""
 "Soubor %s selhal\n"
 "během odstraňování motivu."
 
-#: src/prefs_themes.c:462
+#: src/prefs_themes.c:490
 msgid "Removing theme directory failed."
 msgstr "Odstraňování složky motivu selhalo."
 
-#: src/prefs_themes.c:465
+#: src/prefs_themes.c:493
 msgid "Theme removed successfully"
 msgstr "Motiv byl úspěšně odstraněn"
 
-#: src/prefs_themes.c:485
+#: src/prefs_themes.c:513
 msgid "Select theme folder"
 msgstr "Vyberte složku s motivem"
 
-#: src/prefs_themes.c:500
+#: src/prefs_themes.c:528
 #, c-format
 msgid "Install theme '%s'"
 msgstr "Instalovat motiv '%s'"
 
-#: src/prefs_themes.c:503
+#: src/prefs_themes.c:531
 msgid ""
 "This folder doesn't seem to be a theme folder.\n"
 "Install anyway?"
@@ -17341,15 +17452,15 @@ msgstr ""
 "Tato složka zřejmě neobsahuje motiv.\n"
 "Přesto nainstalovat?"
 
-#: src/prefs_themes.c:510
+#: src/prefs_themes.c:538
 msgid "Do you want to install theme for all users?"
 msgstr "Chcete instalovat motiv pro všechny uživatele?"
 
-#: src/prefs_themes.c:530
+#: src/prefs_themes.c:558
 msgid "Theme exists"
 msgstr "Motiv existuje"
 
-#: src/prefs_themes.c:531
+#: src/prefs_themes.c:559
 msgid ""
 "A theme with the same name is\n"
 "already installed in this location.\n"
@@ -17361,25 +17472,25 @@ msgstr ""
 "\n"
 "Chcete ho nahradit?"
 
-#: src/prefs_themes.c:537
+#: src/prefs_themes.c:565
 #, c-format
 msgid "Couldn't delete the old theme in %s."
 msgstr "Nepodařilo se odstranit starý motiv v %s."
 
-#: src/prefs_themes.c:545
+#: src/prefs_themes.c:573
 #, c-format
 msgid "Couldn't create destination directory %s."
 msgstr "Nepodařilo se vytvořit cílovou složku %s."
 
-#: src/prefs_themes.c:558
+#: src/prefs_themes.c:586
 msgid "Theme installed successfully."
 msgstr "Motiv byl úspěšně nainstalován."
 
-#: src/prefs_themes.c:565
+#: src/prefs_themes.c:593
 msgid "Failed installing theme"
 msgstr "Instalace motivu se nezdařila"
 
-#: src/prefs_themes.c:568
+#: src/prefs_themes.c:596
 #, c-format
 msgid ""
 "File %s failed\n"
@@ -17388,58 +17499,74 @@ msgstr ""
 "Soubor %s selhal\n"
 "během instalace motivu."
 
-#: src/prefs_themes.c:666
+#: src/prefs_themes.c:766
 #, c-format
 msgid "%d themes available (%d user, %d system, 1 internal)"
 msgstr "%d dostupných motivů (uživatelské: %d, systémové: %d, vnitřní: 1)"
 
-#: src/prefs_themes.c:707
+#: src/prefs_themes.c:807
 #, c-format
 msgid "Internal theme has %d icons"
 msgstr "Vnitřní motiv má %d ikon"
 
-#: src/prefs_themes.c:713
+#: src/prefs_themes.c:813
 msgid "No info file available for this theme"
 msgstr "Pro tento motiv není dostupná žádná informace"
 
-#: src/prefs_themes.c:731
+#: src/prefs_themes.c:831
 msgid "Error: couldn't get theme status"
 msgstr "Chyba: nelze získat stav motivu"
 
-#: src/prefs_themes.c:755
+#: src/prefs_themes.c:861
 #, c-format
 msgid "%d files (%d icons), size: %s"
 msgstr "%d souborů (%d ikon), velikost: %s"
 
-#: src/prefs_themes.c:803
+#: src/prefs_themes.c:919
 msgid "Selector"
 msgstr "Výběr"
 
-#: src/prefs_themes.c:814
+#: src/prefs_themes.c:930
 msgid "Install new..."
 msgstr "Instalovat nový..."
 
-#: src/prefs_themes.c:819
+#: src/prefs_themes.c:935
 msgid "Get more..."
 msgstr "Získat další..."
 
-#: src/prefs_themes.c:830
+#: src/prefs_themes.c:946
 msgid "Information"
 msgstr "Informace"
 
-#: src/prefs_themes.c:844
+#: src/prefs_themes.c:960
 msgid "Author: "
 msgstr "Autor: "
 
-#: src/prefs_themes.c:852
+#: src/prefs_themes.c:968
 msgid "URL:"
 msgstr "URL:"
 
-#: src/prefs_themes.c:894
+#: src/prefs_themes.c:1010
 msgid "Preview"
 msgstr "Náhled"
 
-#: src/prefs_toolbar.c:176
+#: src/prefs_themes.c:1066
+msgid "SVG rendering"
+msgstr "SVG renderování"
+
+#: src/prefs_themes.c:1073
+msgid "Enable alpha channel"
+msgstr "Povolit alfa kanál"
+
+#: src/prefs_themes.c:1074
+msgid "Force scaling"
+msgstr "Přesto změnit velikost"
+
+#: src/prefs_themes.c:1080
+msgid "Pixels per inch (PPI)"
+msgstr "Pixelů na inch (PPI)"
+
+#: src/prefs_toolbar.c:186
 msgid ""
 "Selected Action already set.\n"
 "Please choose another Action from List"
@@ -17447,75 +17574,75 @@ msgstr ""
 "Vybraná akce je již aktivní.\n"
 "Vyberte prosím se seznamu jinou akci"
 
-#: src/prefs_toolbar.c:177
+#: src/prefs_toolbar.c:187
 msgid "Item has no icon defined."
 msgstr "Položka nemá definovanou žádnou ikonu."
 
-#: src/prefs_toolbar.c:178
+#: src/prefs_toolbar.c:188
 msgid "Item has no text defined."
 msgstr "Položka nemá definován žádný text."
 
-#: src/prefs_toolbar.c:916
+#: src/prefs_toolbar.c:929
 msgid "Toolbar item"
 msgstr "Položka nástrojové lišty"
 
-#: src/prefs_toolbar.c:932
+#: src/prefs_toolbar.c:945
 msgid "Item type"
 msgstr "Typ položky"
 
-#: src/prefs_toolbar.c:942
+#: src/prefs_toolbar.c:955
 msgid "Internal Function"
 msgstr "Vnitřní funkce"
 
-#: src/prefs_toolbar.c:943
+#: src/prefs_toolbar.c:956
 msgid "User Action"
 msgstr "Uživatelské akce"
 
-#: src/prefs_toolbar.c:945 src/toolbar.c:234
+#: src/prefs_toolbar.c:958 src/toolbar.c:277
 msgid "Separator"
 msgstr "Separátor"
 
-#: src/prefs_toolbar.c:952
+#: src/prefs_toolbar.c:965
 msgid "Event executed on click"
 msgstr "Událost spuštěná po klepnutí"
 
-#: src/prefs_toolbar.c:991
+#: src/prefs_toolbar.c:1004
 msgid "Toolbar text"
 msgstr "Text nástrojové lišty"
 
-#: src/prefs_toolbar.c:1006 src/prefs_toolbar.c:1382
+#: src/prefs_toolbar.c:1019 src/prefs_toolbar.c:1395
 msgid "Icon"
 msgstr "Ikona"
 
-#: src/prefs_toolbar.c:1042
+#: src/prefs_toolbar.c:1055
 msgid "A_dd"
 msgstr "Při_dat"
 
-#: src/prefs_toolbar.c:1262 src/prefs_toolbar.c:1276 src/prefs_toolbar.c:1290
+#: src/prefs_toolbar.c:1275 src/prefs_toolbar.c:1289 src/prefs_toolbar.c:1303
 msgid "Toolbars"
 msgstr "Nástrojová lišta"
 
-#: src/prefs_toolbar.c:1263
+#: src/prefs_toolbar.c:1276
 msgid "Main Window"
 msgstr "Hlavní okno"
 
-#: src/prefs_toolbar.c:1277
+#: src/prefs_toolbar.c:1290
 msgid "Message Window"
 msgstr "Okno zpráv"
 
-#: src/prefs_toolbar.c:1291
+#: src/prefs_toolbar.c:1304
 msgid "Compose Window"
 msgstr "Okno pro psaní zprávy"
 
-#: src/prefs_toolbar.c:1405
+#: src/prefs_toolbar.c:1418
 msgid "Icon text"
 msgstr "Text ikony"
 
-#: src/prefs_toolbar.c:1414
+#: src/prefs_toolbar.c:1427
 msgid "Mapped event"
 msgstr "Namapovaná událost"
 
-#: src/prefs_toolbar.c:1711
+#: src/prefs_toolbar.c:1724
 msgid "Toolbar item icon"
 msgstr "Ikony nástrojové lišty"
 
@@ -17588,31 +17715,31 @@ msgstr "Nejsou definovány klíče příjemce."
 msgid "[Error decoding BASE64]\n"
 msgstr "[Chyba při dekódování BASE64]\n"
 
-#: src/procmsg.c:936 src/procmsg.c:939
+#: src/procmsg.c:937 src/procmsg.c:940
 msgid "Already trying to send."
 msgstr "Již probíhá pokus o odeslání."
 
-#: src/procmsg.c:1557 src/procmsg.c:1616
+#: src/procmsg.c:1558 src/procmsg.c:1618
 #, c-format
 msgid "Couldn't open file %s."
 msgstr "Nepodařilo se otevřít soubor%s."
 
-#: src/procmsg.c:1626
+#: src/procmsg.c:1628
 msgid "Queued message header is broken."
 msgstr "Hlavička zprávy ve frontě je poškozená."
 
-#: src/procmsg.c:1646
+#: src/procmsg.c:1648
 msgid "An error happened during SMTP session."
 msgstr "Nastala chyba během SMTP relace."
 
-#: src/procmsg.c:1660
+#: src/procmsg.c:1662
 msgid ""
 "No specific account has been found to send, and an error happened during "
 "SMTP session."
 msgstr ""
 "Nebyl nalezen účet pro odeslání zprávy a nastala chyba během SMTP relace."
 
-#: src/procmsg.c:1668
+#: src/procmsg.c:1670
 msgid ""
 "Couldn't determine sending information. Maybe the email hasn't been "
 "generated by Claws Mail."
@@ -17620,20 +17747,20 @@ msgstr ""
 "Nepodařilo se zjistit informace nutné pro odeslání. Tento e-mail "
 "pravděpodobně nebyl vygenerován programem Claws Mail."
 
-#: src/procmsg.c:1690
+#: src/procmsg.c:1693
 msgid "Couldn't create temporary file for news sending."
 msgstr "Nelze vytvořit dočasný soubor pro odesílání do diskusní skupiny."
 
-#: src/procmsg.c:1703
+#: src/procmsg.c:1706
 msgid "Error when writing temporary file for news sending."
 msgstr "Chyba při zápisu dočasného souboru pro odesílání do diskusní skupiny."
 
-#: src/procmsg.c:1717
+#: src/procmsg.c:1720
 #, c-format
 msgid "Error occurred while posting the message to %s."
 msgstr "Nastala chyba při posílání zprávy do %s."
 
-#: src/procmsg.c:2269
+#: src/procmsg.c:2272
 msgid "Filtering messages...\n"
 msgstr "Filtruji zprávy...\n"
 
@@ -17941,12 +18068,12 @@ msgstr "Vložte text pro nahrazení '%s'"
 msgid "Enter variable"
 msgstr "Zadání proměnných"
 
-#: src/send_message.c:153
+#: src/send_message.c:152
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Posílám zprávu pomocí příkazu: %s\n"
 
-#: src/send_message.c:167
+#: src/send_message.c:166
 #, c-format
 msgid "Couldn't execute command: %s"
 msgstr "Nemohu provést příkaz: %s"
@@ -18068,40 +18195,40 @@ msgstr "Odstranit certifikát"
 msgid "Do you really want to delete this certificate?"
 msgstr "Opravdu chcete odstranit tento certifikát?"
 
-#: src/summary_search.c:259
+#: src/summary_search.c:305
 msgid "Search messages"
 msgstr "Hledat zprávy v aktuální složce"
 
-#: src/summary_search.c:281
+#: src/summary_search.c:327
 msgid "Match any of the following"
 msgstr "Zprávy splňující KTEROUKOLI podmínku"
 
-#: src/summary_search.c:283
+#: src/summary_search.c:329
 msgid "Match all of the following"
 msgstr "Zprávy splňující VŠECHNY podmínky"
 
-#: src/summary_search.c:447
+#: src/summary_search.c:495
 msgid "Body:"
 msgstr "Tělo:"
 
-#: src/summary_search.c:454
+#: src/summary_search.c:502
 msgid "Condition:"
 msgstr "Podmínka:"
 
-#: src/summary_search.c:484
+#: src/summary_search.c:536
 msgid "Find _all"
 msgstr "Najít _všechny"
 
-#: src/summary_search.c:690 src/summaryview.c:1088 src/summaryview.c:1350
+#: src/summary_search.c:751 src/summaryview.c:1089 src/summaryview.c:1351
 #, c-format
 msgid "Searching in %s... \n"
 msgstr "Hledám v %s... \n"
 
-#: src/summary_search.c:787
+#: src/summary_search.c:846
 msgid "Beginning of list reached; continue from end?"
 msgstr "Dosažen začátek seznamu, pokračovat od konce?"
 
-#: src/summary_search.c:789
+#: src/summary_search.c:848
 msgid "End of list reached; continue from beginning?"
 msgstr "Dosažen konec seznamu, pokračovat od začátku?"
 
@@ -18117,75 +18244,75 @@ msgstr "Přepnout panel rychlého vyhledávání"
 msgid "Toggle multiple selection"
 msgstr "Přepnout násobný výběr"
 
-#: src/summaryview.c:1278
+#: src/summaryview.c:1279
 msgid "Process mark"
 msgstr "Zpracovat označené"
 
-#: src/summaryview.c:1279
+#: src/summaryview.c:1280
 msgid "Some marks are left. Process them?"
 msgstr "Zbyly nějaké označené. Zpracovat je?"
 
-#: src/summaryview.c:1329
+#: src/summaryview.c:1330
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Prohledávám složku (%s)..."
 
-#: src/summaryview.c:1843 src/summaryview.c:1894
+#: src/summaryview.c:1870 src/summaryview.c:1918
 msgid "No more unread messages"
 msgstr "Nejsou další nepřečtené zprávy"
 
-#: src/summaryview.c:1844
+#: src/summaryview.c:1871
 msgid "No unread message found. Search from the end?"
 msgstr "Nebyla nalezena nepřečtená zpráva. Hledat od konce?"
 
-#: src/summaryview.c:1856 src/summaryview.c:1907 src/summaryview.c:1950
-#: src/summaryview.c:2001 src/summaryview.c:2079
+#: src/summaryview.c:1883 src/summaryview.c:1931 src/summaryview.c:1968
+#: src/summaryview.c:2016 src/summaryview.c:2083
 msgid ""
 "Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
 msgstr ""
 "Interní chyba: neočekávaná hodnota pro prefs_common.next_unread_msg_dialog\n"
 
-#: src/summaryview.c:1864
+#: src/summaryview.c:1895
 msgid "No unread messages."
 msgstr "Žádné nepřečtené zprávy."
 
-#: src/summaryview.c:1895
+#: src/summaryview.c:1919
 msgid "No unread message found. Go to next folder?"
 msgstr "Nebyla nalezena žádná nepřečtená zpráva. Chcete jít do další složky?"
 
-#: src/summaryview.c:1937 src/summaryview.c:1988
+#: src/summaryview.c:1955 src/summaryview.c:2003
 msgid "No more new messages"
 msgstr "Nejsou další nové zprávy"
 
-#: src/summaryview.c:1938
+#: src/summaryview.c:1956
 msgid "No new message found. Search from the end?"
 msgstr "Nebyla nalezena nová zpráva. Hledat od konce?"
 
-#: src/summaryview.c:1958
+#: src/summaryview.c:1980
 msgid "No new messages."
 msgstr "Žádné nové zprávy."
 
-#: src/summaryview.c:1989
+#: src/summaryview.c:2004
 msgid "No new message found. Go to next folder?"
 msgstr "Nebyla nalezena žádná nová zpráva. Chcete jít do další složky?"
 
-#: src/summaryview.c:2026 src/summaryview.c:2066
+#: src/summaryview.c:2037 src/summaryview.c:2070
 msgid "No more marked messages"
 msgstr "Nejsou další označené zprávy"
 
-#: src/summaryview.c:2027
+#: src/summaryview.c:2038
 msgid "No marked message found. Search from the end?"
 msgstr "Nebyla nalezena žádná označená zpráva. Hledat od konce?"
 
-#: src/summaryview.c:2036
+#: src/summaryview.c:2047
 msgid "No marked messages."
 msgstr "Žádné označené zprávy."
 
-#: src/summaryview.c:2067
+#: src/summaryview.c:2071
 msgid "No marked message found. Go to next folder?"
 msgstr "Nebyla nalezena žádná označená zpráva. Chcete jít do další složky?"
 
-#: src/summaryview.c:2104 src/summaryview.c:2129
+#: src/summaryview.c:2104 src/summaryview.c:2133
 msgid "No more labeled messages"
 msgstr "Nejsou další obarvené zprávy"
 
@@ -18193,125 +18320,125 @@ msgstr "Nejsou další obarvené zprávy"
 msgid "No labeled message found. Search from the end?"
 msgstr "Nebyla nalezena žádná obarvená zpráva. Hledat od konce?"
 
-#: src/summaryview.c:2114 src/summaryview.c:2139
+#: src/summaryview.c:2114 src/summaryview.c:2147
 msgid "No labeled messages."
 msgstr "Žádné obarvené zprávy."
 
-#: src/summaryview.c:2130
+#: src/summaryview.c:2134
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nebyla nalezena žádná obarvená zpráva. Hledat od začátku?"
 
-#: src/summaryview.c:2453
+#: src/summaryview.c:2451
 msgid "Attracting messages by subject..."
 msgstr "Seskupuji zprávy dle předmětu..."
 
-#: src/summaryview.c:2638
+#: src/summaryview.c:2636
 #, c-format
 msgid "%d deleted"
 msgstr "%d odstraněno"
 
-#: src/summaryview.c:2642
+#: src/summaryview.c:2640
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d přemístěno"
 
-#: src/summaryview.c:2643 src/summaryview.c:2650
+#: src/summaryview.c:2641 src/summaryview.c:2648
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2648
+#: src/summaryview.c:2646
 #, c-format
 msgid "%s%d copied"
 msgstr "%s %d zkopírováno"
 
-#: src/summaryview.c:2662
+#: src/summaryview.c:2660
 msgid " item selected"
 msgid_plural " items selected"
 msgstr[0] " položka vybrána"
 msgstr[1] " položky vybrány"
 msgstr[2] " položek vybráno"
 
-#: src/summaryview.c:2680 src/summaryview.c:2723
+#: src/summaryview.c:2678 src/summaryview.c:2721
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nová(é), %d nepřečtená(é), celkem %d (%s)"
 
-#: src/summaryview.c:2698
+#: src/summaryview.c:2696
 msgid "Message summary"
 msgstr "Shrnutí zprávy"
 
-#: src/summaryview.c:2699
+#: src/summaryview.c:2697
 msgid "New:"
 msgstr "Nové:"
 
-#: src/summaryview.c:2700
+#: src/summaryview.c:2698
 msgid "Unread:"
 msgstr "Nepřečtené:"
 
-#: src/summaryview.c:2701
+#: src/summaryview.c:2699
 msgid "Total:"
 msgstr "Celkem:"
 
-#: src/summaryview.c:2703
+#: src/summaryview.c:2701
 msgid "Marked:"
 msgstr "Označené:"
 
-#: src/summaryview.c:2704
+#: src/summaryview.c:2702
 msgid "Replied:"
 msgstr "Odpovězené:"
 
-#: src/summaryview.c:2705
+#: src/summaryview.c:2703
 msgid "Forwarded:"
 msgstr "Předané:"
 
-#: src/summaryview.c:2706
+#: src/summaryview.c:2704
 msgid "Locked:"
 msgstr "Zamknuté:"
 
-#: src/summaryview.c:2707
+#: src/summaryview.c:2705
 msgid "Ignored:"
 msgstr "Ignorované:"
 
-#: src/summaryview.c:2708
+#: src/summaryview.c:2706
 msgid "Watched:"
 msgstr "Sledováné:"
 
-#: src/summaryview.c:2718
+#: src/summaryview.c:2716
 #, c-format
 msgid "%d/%d selected (%s/%s), %d unread"
 msgstr "%d/%d vybráno (%s/%s), %d nepřečteno"
 
-#: src/summaryview.c:3011
+#: src/summaryview.c:3009
 msgid "Sorting summary..."
 msgstr "Celkové setřídění..."
 
-#: src/summaryview.c:3150
+#: src/summaryview.c:3148
 msgid "Setting summary from message data..."
 msgstr "Nastavuji přehled z dat zpráv..."
 
-#: src/summaryview.c:3355
+#: src/summaryview.c:3353
 msgid "(No Date)"
 msgstr "(Žádné datum)"
 
-#: src/summaryview.c:3407
+#: src/summaryview.c:3405
 msgid "(No Recipient)"
 msgstr "(Žádný příjemce)"
 
-#: src/summaryview.c:3442
+#: src/summaryview.c:3440
 #, c-format
 msgid "From: %s, on %s"
 msgstr "Od: %s, na %s"
 
-#: src/summaryview.c:3451
+#: src/summaryview.c:3449
 #, c-format
 msgid "To: %s, on %s"
 msgstr "Pro: %s, na %s"
 
-#: src/summaryview.c:4280
+#: src/summaryview.c:4314
 msgid "You're not the author of the article.\n"
 msgstr "Nejste autorem tohoto příspěvku.\n"
 
-#: src/summaryview.c:4370
+#: src/summaryview.c:4404
 #, c-format
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the %d selected messages?"
@@ -18319,65 +18446,65 @@ msgstr[0] "Opravdu chcete odstranit vybranou zprávu?"
 msgstr[1] "Opravdu chcete odstranit %d vybrané zprávy?"
 msgstr[2] "Opravdu chcete odstranit %d vybraných zpráv?"
 
-#: src/summaryview.c:4373
+#: src/summaryview.c:4407
 msgid "Delete message"
 msgid_plural "Delete messages"
 msgstr[0] "Odstranit zprávu"
 msgstr[1] "Odstranit zprávy"
 msgstr[2] "Odstranit zprávy"
 
-#: src/summaryview.c:4537
+#: src/summaryview.c:4571
 msgid "Destination is same as current folder."
 msgstr "Cílová položka je stejná jako aktuální složka."
 
-#: src/summaryview.c:4638
+#: src/summaryview.c:4677
 msgid "Destination to copy is same as current folder."
 msgstr "Cíl kopírování je stejný jako aktuální složka."
 
-#: src/summaryview.c:4803
+#: src/summaryview.c:4847
 msgid "Append or Overwrite"
 msgstr "Přidat nebo přepsat"
 
-#: src/summaryview.c:4804
+#: src/summaryview.c:4848
 msgid "Append or overwrite existing file?"
 msgstr "Přidat nebo přepsat existující soubor?"
 
-#: src/summaryview.c:4805
+#: src/summaryview.c:4849
 msgid "_Append"
 msgstr "_Přidat"
 
-#: src/summaryview.c:4805
+#: src/summaryview.c:4849
 msgid "_Overwrite"
 msgstr "Př_epsat"
 
-#: src/summaryview.c:4846
+#: src/summaryview.c:4890
 #, c-format
 msgid ""
 "You are about to print %d messages, one by one. Do you want to continue?"
 msgstr ""
 "Chystáte se vytisknout okolo %d zpráv postupně po jedné. Chcete pokračovat?"
 
-#: src/summaryview.c:5306
+#: src/summaryview.c:5348
 msgid "Building threads..."
 msgstr "Vytvářím vlákna..."
 
-#: src/summaryview.c:5554
+#: src/summaryview.c:5596
 msgid "Skip these rules"
 msgstr "Přeskočit"
 
-#: src/summaryview.c:5557
+#: src/summaryview.c:5599
 msgid "Apply these rules regardless of the account they belong to"
 msgstr "Aplikovat bez ohledu na účet ke kterému jsou přiřazena"
 
-#: src/summaryview.c:5560
+#: src/summaryview.c:5602
 msgid "Apply these rules if they apply to the current account"
 msgstr "Aplikovat, jsou-li přiřazena k aktuálnímu účtu"
 
-#: src/summaryview.c:5589
+#: src/summaryview.c:5631
 msgid "Filtering"
 msgstr "Filtrování"
 
-#: src/summaryview.c:5590
+#: src/summaryview.c:5632
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
@@ -18385,55 +18512,55 @@ msgstr ""
 "Některá filtrovací pravidla jsou přiřazena specifickým účtům.\n"
 "Zvolte prosím způsob aplikace těchto pravidel:"
 
-#: src/summaryview.c:5620
+#: src/summaryview.c:5662
 msgid "Filtering..."
 msgstr "Filtruji..."
 
-#: src/summaryview.c:5699
+#: src/summaryview.c:5741
 msgid "Processing configuration"
 msgstr "Zpracovávám nastavení"
 
-#: src/summaryview.c:6245
+#: src/summaryview.c:6287
 msgid "Ignored thread"
 msgstr "Ignorované vlákno"
 
-#: src/summaryview.c:6247
+#: src/summaryview.c:6289
 msgid "Watched thread"
 msgstr "Sledované vlákno"
 
-#: src/summaryview.c:6255
+#: src/summaryview.c:6297
 msgid "Replied but also forwarded - click to see reply"
 msgstr "Odpovězeno ale také přeposláno - klikněte pro zobrazení odpovědi"
 
-#: src/summaryview.c:6257
+#: src/summaryview.c:6299
 msgid "Replied - click to see reply"
 msgstr "Odpovězeno - klikněte pro zobrazení odpovědi"
 
-#: src/summaryview.c:6269
+#: src/summaryview.c:6311
 msgid "To be moved"
 msgstr "K přesunutí"
 
-#: src/summaryview.c:6271
+#: src/summaryview.c:6313
 msgid "To be copied"
 msgstr "Bude zkopírováno"
 
-#: src/summaryview.c:6283
+#: src/summaryview.c:6325
 msgid "Signed, has attachment(s)"
 msgstr "Zpráva je podepsaná a má přílohu/přílohy"
 
-#: src/summaryview.c:6287
+#: src/summaryview.c:6329
 msgid "Encrypted, has attachment(s)"
 msgstr "Zpráva je šifrovaná a má přílohu/přílohy"
 
-#: src/summaryview.c:6289
+#: src/summaryview.c:6331
 msgid "Encrypted"
 msgstr "Šifrovaná zpráva"
 
-#: src/summaryview.c:6291
+#: src/summaryview.c:6333
 msgid "Has attachment(s)"
 msgstr "Má přílohu/přílohy"
 
-#: src/summaryview.c:7938
+#: src/summaryview.c:7990
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -18442,53 +18569,53 @@ msgstr ""
 "Chyba v regulárním výrazu (regexp):\n"
 "%s"
 
-#: src/summaryview.c:8041
+#: src/summaryview.c:8093
 msgid "Go back to the folder list (You have unread messages)"
 msgstr "Přejít zpět na seznam složek (Máte nepřečtené zprávy)"
 
-#: src/summaryview.c:8046
+#: src/summaryview.c:8098
 msgid "Go back to the folder list"
 msgstr "Přejít zpět na seznam složek"
 
-#: src/textview.c:231
+#: src/textview.c:245
 msgid "_Open in web browser"
 msgstr "_Otevřít ve webovém prohlížeči"
 
-#: src/textview.c:232
+#: src/textview.c:246
 msgid "Copy this _link"
 msgstr "_Kopírovat odkaz"
 
-#: src/textview.c:239
+#: src/textview.c:253
 msgid "_Reply to this address"
 msgstr "_Odpovědět na tuto adresu"
 
-#: src/textview.c:240
+#: src/textview.c:254
 msgid "Add to _Address book"
 msgstr "Přidat do knihy _adres"
 
-#: src/textview.c:241
+#: src/textview.c:255
 msgid "Copy this add_ress"
 msgstr "_Kopírovat tuto adresu"
 
-#: src/textview.c:247
+#: src/textview.c:261
 msgid "_Open image"
 msgstr "Otevřít _obrázek"
 
-#: src/textview.c:248
+#: src/textview.c:262
 msgid "_Save image..."
 msgstr "_Uložit obrázek..."
 
-#: src/textview.c:722
+#: src/textview.c:724
 #, c-format
 msgid "[%s  %s (%d bytes)]"
 msgstr "[%s  %s (%d B)]"
 
-#: src/textview.c:725
+#: src/textview.c:727
 #, c-format
 msgid "[%s (%d bytes)]"
 msgstr "[%s (%d B)]"
 
-#: src/textview.c:915
+#: src/textview.c:917
 msgid ""
 "\n"
 "  This message can't be displayed.\n"
@@ -18502,68 +18629,68 @@ msgstr ""
 "\n"
 "  Použijte "
 
-#: src/textview.c:920
+#: src/textview.c:922
 msgid "'Network Log'"
 msgstr "'Záznam o připojení'"
 
-#: src/textview.c:921
+#: src/textview.c:923
 msgid " in the Tools menu for more information."
 msgstr " v menu Nástroje pro více informací."
 
-#: src/textview.c:984
+#: src/textview.c:986
 msgid "  The following can be performed on this part\n"
 msgstr "  Následující může být povedeno v této části\n"
 
-#: src/textview.c:986
+#: src/textview.c:988
 msgid "  by right-clicking the icon or list item:"
 msgstr "  po pravém kliknutí na ikonu nebo položku seznamu:"
 
-#: src/textview.c:990
+#: src/textview.c:992
 msgid "     - To save, select "
 msgstr "     - Uložit pomocí "
 
-#: src/textview.c:991
+#: src/textview.c:993
 msgid "'Save as...'"
 msgstr "'Uložit jako...'"
 
-#: src/textview.c:993 src/textview.c:1005 src/textview.c:1017
-#: src/textview.c:1027
+#: src/textview.c:995 src/textview.c:1007 src/textview.c:1019
+#: src/textview.c:1029
 msgid " (Shortcut key: '"
 msgstr " (Klávesová zkratka: '"
 
-#: src/textview.c:1001
+#: src/textview.c:1003
 msgid "     - To display as text, select "
 msgstr "     - Zobrazit jako text pomocí "
 
-#: src/textview.c:1002
+#: src/textview.c:1004
 msgid "'Display as text'"
 msgstr "'Zobrazit jako text'"
 
-#: src/textview.c:1013
+#: src/textview.c:1015
 msgid "     - To open with an external program, select "
 msgstr "     - Otevřít externím programem pomocí "
 
-#: src/textview.c:1014
+#: src/textview.c:1016
 msgid "'Open'"
 msgstr "'Otevřít' "
 
-#: src/textview.c:1022
+#: src/textview.c:1024
 msgid "       (alternately double-click, or click the middle "
 msgstr "       (nebo klikněte dvakrát či klikněte prostředním "
 
-#: src/textview.c:1023
+#: src/textview.c:1025
 msgid "mouse button)\n"
 msgstr "tlačítkem myši)\n"
 
-#: src/textview.c:1025
+#: src/textview.c:1027
 msgid "     - Or use "
 msgstr "     - Nebo použijte"
 
-#: src/textview.c:1026
+#: src/textview.c:1028
 msgid "'Open with...'"
 msgstr "'Otevřít čím...'"
 
-#: src/textview.c:1140
+#: src/textview.c:1146
 #, c-format
 msgid ""
 "The command to view attachment as text failed:\n"
@@ -18574,314 +18701,378 @@ msgstr ""
 "    %s\n"
 "Návratový kód %d\n"
 
-#: src/textview.c:2189
+#: src/textview.c:2197
 msgid "Tags: "
 msgstr "Značky:"
 
-#: src/textview.c:2895
+#: src/textview.c:2905
 msgid "The real URL is different from the displayed URL."
 msgstr "Skutečné URL se liší od zobrazeného."
 
-#: src/textview.c:2896
+#: src/textview.c:2906
 msgid "Displayed URL:"
 msgstr "Zobrazované URL:"
 
-#: src/textview.c:2897
+#: src/textview.c:2907
 msgid "Real URL:"
 msgstr "Reálná URL:"
 
-#: src/textview.c:2898
+#: src/textview.c:2908
 msgid "Open it anyway?"
 msgstr "Přesto otevřít?"
 
-#: src/textview.c:2899
+#: src/textview.c:2909
 msgid "Phishing attempt warning"
 msgstr "Upozornění na možný pokus o podvrh"
 
-#: src/textview.c:2900
+#: src/textview.c:2910
 msgid "_Open URL"
 msgstr "_Otevřít URL"
 
-#: src/toolbar.c:192 src/toolbar.c:1930
+#: src/toolbar.c:224 src/toolbar.c:2213
 msgid "Receive Mail from all Accounts"
 msgstr "Přijmout poštu ze všech účtů"
 
-#: src/toolbar.c:193 src/toolbar.c:1935
+#: src/toolbar.c:225 src/toolbar.c:2218
 msgid "Receive Mail from current Account"
 msgstr "Přijmout poštu z aktuálního účtu"
 
-#: src/toolbar.c:194 src/toolbar.c:1939
+#: src/toolbar.c:226 src/toolbar.c:2222
 msgid "Send Queued Messages"
 msgstr "Odeslat pozdržené zprávy"
 
-#: src/toolbar.c:195 src/toolbar.c:905 src/toolbar.c:1957 src/toolbar.c:1968
+#: src/toolbar.c:227 src/toolbar.c:952 src/toolbar.c:2240 src/toolbar.c:2251
 msgid "Compose Email"
 msgstr "Napsat novou zprávu"
 
-#: src/toolbar.c:196
+#: src/toolbar.c:228
 msgid "Compose News"
 msgstr "Napsat diskusní příspěvek"
 
-#: src/toolbar.c:197 src/toolbar.c:1996 src/toolbar.c:2006
+#: src/toolbar.c:229 src/toolbar.c:2295 src/toolbar.c:2305
 msgid "Reply to Message"
 msgstr "Odpovědět na zprávu"
 
-#: src/toolbar.c:198 src/toolbar.c:2013 src/toolbar.c:2023
+#: src/toolbar.c:230 src/toolbar.c:2312 src/toolbar.c:2322
 msgid "Reply to Sender"
 msgstr "Odpovědět odesílateli"
 
-#: src/toolbar.c:199 src/toolbar.c:2030 src/toolbar.c:2040
+#: src/toolbar.c:231 src/toolbar.c:2329 src/toolbar.c:2339
 msgid "Reply to All"
 msgstr "Odpovědět všem"
 
-#: src/toolbar.c:200 src/toolbar.c:2047 src/toolbar.c:2057
+#: src/toolbar.c:232 src/toolbar.c:2346 src/toolbar.c:2356
 msgid "Reply to Mailing-list"
 msgstr "Odpovědět do konference"
 
-#: src/toolbar.c:201 src/toolbar.c:1951
+#: src/toolbar.c:233 src/toolbar.c:2234
 msgid "Open email"
 msgstr "Otevřít email"
 
-#: src/toolbar.c:202 src/toolbar.c:2064 src/toolbar.c:2075
+#: src/toolbar.c:234 src/toolbar.c:2363 src/toolbar.c:2374
 msgid "Forward Message"
 msgstr "Předat zprávu"
 
-#: src/toolbar.c:203 src/toolbar.c:2080
+#: src/toolbar.c:235 src/toolbar.c:2379
 msgid "Trash Message"
 msgstr "Hodit zprávu do koše"
 
-#: src/toolbar.c:204 src/toolbar.c:2084
+#: src/toolbar.c:236 src/toolbar.c:2383
 msgid "Delete Message"
 msgstr "Odstranit zprávu"
 
-#: src/toolbar.c:206 src/toolbar.c:2092
+#: src/toolbar.c:237
+msgid "Delete duplicate messages"
+msgstr "Odstranit duplikáty zpráv"
+
+#: src/toolbar.c:239 src/toolbar.c:2391
 msgid "Go to Previous Unread Message"
 msgstr "Jít na předchozí nepřečtenou zprávu"
 
-#: src/toolbar.c:207 src/toolbar.c:2096
+#: src/toolbar.c:240 src/toolbar.c:2395
 msgid "Go to Next Unread Message"
 msgstr "Jít na následující nepřečtenou zprávu"
 
-#: src/toolbar.c:210 src/toolbar.c:421
+#: src/toolbar.c:244
+msgid "Mark Message"
+msgstr "Označit zprávu"
+
+#: src/toolbar.c:245
+msgid "Unmark Message"
+msgstr "Odznačit zprávu"
+
+#: src/toolbar.c:246
+msgid "Lock Message"
+msgstr "Zamknout zprávu"
+
+#: src/toolbar.c:247
+msgid "Unlock Message"
+msgstr "Uzamknout zpávu"
+
+#: src/toolbar.c:248
+msgid "Mark all Messages as read"
+msgstr "Označit všechny zprávy za přečtené"
+
+#: src/toolbar.c:249
+msgid "Mark all Messages as unread"
+msgstr "Označit všechny zprávy za nepřečtené"
+
+#: src/toolbar.c:250
+msgid "Mark Message as read"
+msgstr "Označit zprávu za přečtenou"
+
+#: src/toolbar.c:251
+msgid "Mark Message as unread"
+msgstr "Označit zprávu za nepřečtenou"
+
+#: src/toolbar.c:253 src/toolbar.c:511
 msgid "Print"
 msgstr "Tisk"
 
-#: src/toolbar.c:211
+#: src/toolbar.c:254
 msgid "Learn Spam or Ham"
 msgstr "Naučit se rozpoznat spam nebo ham"
 
-#: src/toolbar.c:212
+#: src/toolbar.c:255
 msgid "Open folder/Go to folder list"
 msgstr "Otevřít složku/Přejít na seznam složek"
 
-#: src/toolbar.c:215 src/toolbar.c:2102
+#: src/toolbar.c:258 src/toolbar.c:2401
 msgid "Send Message"
 msgstr "Odeslat zprávu"
 
-#: src/toolbar.c:216 src/toolbar.c:2106
+#: src/toolbar.c:259 src/toolbar.c:2405
 msgid "Put into queue folder and send later"
 msgstr "Zařadit do fronty a odeslat později"
 
-#: src/toolbar.c:217 src/toolbar.c:2110
+#: src/toolbar.c:260 src/toolbar.c:2409
 msgid "Save to draft folder"
 msgstr "Uložit do složky konceptů"
 
-#: src/toolbar.c:218 src/toolbar.c:2114
+#: src/toolbar.c:261 src/toolbar.c:2413
 msgid "Insert file"
 msgstr "Vložit soubor"
 
-#: src/toolbar.c:219 src/toolbar.c:2118
+#: src/toolbar.c:262 src/toolbar.c:2417
 msgid "Attach file"
 msgstr "Připojit soubor"
 
-#: src/toolbar.c:220 src/toolbar.c:2122
+#: src/toolbar.c:263 src/toolbar.c:2421
 msgid "Insert signature"
 msgstr "Vložit podpis"
 
-#: src/toolbar.c:221 src/toolbar.c:2126
+#: src/toolbar.c:264 src/toolbar.c:2425
 msgid "Replace signature"
 msgstr "Nahradit podpis"
 
-#: src/toolbar.c:222 src/toolbar.c:2130
+#: src/toolbar.c:265 src/toolbar.c:2429
 msgid "Edit with external editor"
 msgstr "Upravit externím editorem"
 
-#: src/toolbar.c:223 src/toolbar.c:2134
+#: src/toolbar.c:266 src/toolbar.c:2433
 msgid "Wrap long lines of current paragraph"
 msgstr "Zalomit dlouhé řádky aktuálního odstavce"
 
-#: src/toolbar.c:224 src/toolbar.c:2138
+#: src/toolbar.c:267 src/toolbar.c:2437
 msgid "Wrap all long lines"
 msgstr "Zalomit všechny dlouhé řádky"
 
-#: src/toolbar.c:227 src/toolbar.c:440 src/toolbar.c:2147
+#: src/toolbar.c:270 src/toolbar.c:528 src/toolbar.c:2446
 msgid "Check spelling"
 msgstr "Zkontrolovat pravopis"
 
-#: src/toolbar.c:229
+#: src/toolbar.c:272
 msgid "Claws Mail Actions Feature"
 msgstr "Akce Claws Mail"
 
-#: src/toolbar.c:230 src/toolbar.c:2163
+#: src/toolbar.c:273 src/toolbar.c:2462
 msgid "Cancel receiving"
 msgstr "Přerušit stahování zpráv"
 
-#: src/toolbar.c:232 src/toolbar.c:2171
+#: src/toolbar.c:275 src/toolbar.c:2470
 msgid "Cancel receiving/sending"
 msgstr "Zrušit stahování/posílání zpráv"
 
-#: src/toolbar.c:233 src/toolbar.c:1943
+#: src/toolbar.c:276 src/toolbar.c:2226
 msgid "Close window"
 msgstr "Zavřít okno"
 
-#: src/toolbar.c:235
+#: src/toolbar.c:278
 msgid "Claws Mail Plugins"
 msgstr "Zásuvné moduly Claws Mail"
 
-#: src/toolbar.c:379 src/toolbar.c:414
+#: src/toolbar.c:442 src/toolbar.c:493
 msgctxt "Toolbar"
 msgid "Trash"
 msgstr "Koš"
 
-#: src/toolbar.c:402
-msgid "Folders"
-msgstr "Složky"
-
-#: src/toolbar.c:404
+#: src/toolbar.c:482
 msgid "Get Mail"
 msgstr "Přijmout poštu"
 
-#: src/toolbar.c:405
+#: src/toolbar.c:483
 msgid "Get"
 msgstr "Získat"
 
-#: src/toolbar.c:407 src/toolbar.c:408
+#: src/toolbar.c:485 src/toolbar.c:486
 msgctxt "Toolbar"
 msgid "Compose"
 msgstr "Napsat zprávu"
 
-#: src/toolbar.c:410
-msgid "All"
-msgstr "Všem"
-
-#: src/toolbar.c:411
+#: src/toolbar.c:488
 msgctxt "Toolbar"
 msgid "Sender"
 msgstr "Odesílatel"
 
-#: src/toolbar.c:412
+#: src/toolbar.c:489
+msgid "All"
+msgstr "Všem"
+
+#: src/toolbar.c:490
 msgid "List"
 msgstr "Seznam"
 
-#: src/toolbar.c:417
+#: src/toolbar.c:495 src/toolbar.c:2279 src/toolbar.c:2288
+msgid "Delete duplicates"
+msgstr "Odstranit duplikáty"
+
+#: src/toolbar.c:497
 msgid "Prev"
 msgstr "Předchozí"
 
-#: src/toolbar.c:418
+#: src/toolbar.c:498
 msgid "Next"
 msgstr "Další"
 
-#: src/toolbar.c:426
+#: src/toolbar.c:506
+msgid "All read"
+msgstr "Všechny přečtené"
+
+#: src/toolbar.c:507
+msgid "All unread"
+msgstr "Všechny nepřečtené"
+
+#: src/toolbar.c:508
+msgid "Read"
+msgstr "Číst"
+
+#: src/toolbar.c:513
+msgid "Folders"
+msgstr "Složky"
+
+#: src/toolbar.c:518
 msgid "Draft"
 msgstr "Koncept"
 
-#: src/toolbar.c:429
+#: src/toolbar.c:521
 msgid "Insert sig."
 msgstr "Vložit podpis"
 
-#: src/toolbar.c:430
+#: src/toolbar.c:522
 msgid "Replace sig."
 msgstr "Nahradit podpis"
 
-#: src/toolbar.c:431
+#: src/toolbar.c:523
 msgid "Edit"
 msgstr "Úpravy"
 
-#: src/toolbar.c:432
+#: src/toolbar.c:524
 msgid "Wrap para."
 msgstr "Zalomit odstavec"
 
-#: src/toolbar.c:433
+#: src/toolbar.c:525
 msgid "Wrap all"
 msgstr "Zalomit vše"
 
-#: src/toolbar.c:435 src/toolbar.c:436
+#: src/toolbar.c:531 src/toolbar.c:532
 msgid "Stop"
 msgstr "Zastavit"
 
-#: src/toolbar.c:437
+#: src/toolbar.c:533
 msgid "Stop all"
 msgstr "Vše zastavit"
 
-#: src/toolbar.c:897
+#: src/toolbar.c:944
 msgid "Compose News message"
 msgstr "Napsat novou zprávu"
 
-#: src/toolbar.c:936
+#: src/toolbar.c:983
 msgid "Learn spam"
 msgstr "Naučit se, že jde o nevyžádanou zprávu (spam)"
 
-#: src/toolbar.c:945
+#: src/toolbar.c:992
 msgid "Ham"
 msgstr "Ham"
 
-#: src/toolbar.c:947
+#: src/toolbar.c:994
 msgid "Learn ham"
 msgstr "Naučit se, že nejde o nevyžádanou zprávu (ham)"
 
-#: src/toolbar.c:1925
+#: src/toolbar.c:2208
 msgid "Go to folder list"
 msgstr "Přejít na seznam složek"
 
-#: src/toolbar.c:1931
+#: src/toolbar.c:2214
 msgid "Receive Mail from selected Account"
 msgstr "Přijmout poštu z vybraného účtu"
 
-#: src/toolbar.c:1947
+#: src/toolbar.c:2230
 msgid "Open preferences"
 msgstr "Otevřít předvolby"
 
-#: src/toolbar.c:1958
+#: src/toolbar.c:2241
 msgid "Compose with selected Account"
 msgstr "Napsat novou zprávu pomocí vybraného účtu"
 
-#: src/toolbar.c:1979
+#: src/toolbar.c:2262
 msgid "Learn as..."
 msgstr "Učit se jako..."
 
-#: src/toolbar.c:1989
+#: src/toolbar.c:2272
 msgid "Learn as _Spam"
 msgstr "Učit jako _Spam"
 
-#: src/toolbar.c:1990
+#: src/toolbar.c:2273
 msgid "Learn as _Ham"
 msgstr "Učit jako _Ne spam"
 
-#: src/toolbar.c:1997
+#: src/toolbar.c:2280
+msgid "Delete duplicates options"
+msgstr "Volby odstranění duplikátů"
+
+#: src/toolbar.c:2284
+msgid "Delete duplicates in selected folder"
+msgstr "Odstranit duplikáty ve vybraných složkách"
+
+#: src/toolbar.c:2285
+msgid "Delete duplicates in all folders"
+msgstr "Odstranit duplikáty ve všech složkách"
+
+#: src/toolbar.c:2296
 msgid "Reply to Message options"
 msgstr "Odpovědět na zprávu"
 
-#: src/toolbar.c:2001 src/toolbar.c:2018 src/toolbar.c:2035 src/toolbar.c:2052
+#: src/toolbar.c:2300 src/toolbar.c:2317 src/toolbar.c:2334 src/toolbar.c:2351
 msgid "_Reply with quote"
 msgstr "Odpovědět s _citací"
 
-#: src/toolbar.c:2002 src/toolbar.c:2019 src/toolbar.c:2036 src/toolbar.c:2053
+#: src/toolbar.c:2301 src/toolbar.c:2318 src/toolbar.c:2335 src/toolbar.c:2352
 msgid "Reply without _quote"
 msgstr "Odpovědět _bez citace"
 
-#: src/toolbar.c:2014
+#: src/toolbar.c:2313
 msgid "Reply to Sender options"
 msgstr "Odpovědět odesílateli"
 
-#: src/toolbar.c:2031
+#: src/toolbar.c:2330
 msgid "Reply to All options"
 msgstr "Odpovědět všem"
 
-#: src/toolbar.c:2048
+#: src/toolbar.c:2347
 msgid "Reply to Mailing-list options"
 msgstr "Odpovědět do konference"
 
-#: src/toolbar.c:2065
+#: src/toolbar.c:2364
 msgid "Forward Message options"
 msgstr "Předat zprávu"
 
@@ -18941,7 +19132,7 @@ msgid ""
 "-----------\n"
 "Homepage:      <%s>\n"
 "Manual:        <%s>\n"
-"FAQ:\t       <%s>\n"
+"FAQ:           <%s>\n"
 "Themes:        <%s>\n"
 "Mailing Lists: <%s>\n"
 "\n"
diff --git a/po/sk.po b/po/sk.po
@@ -1,90 +1,23 @@
 # Slovak translation of Claws Mail.
-# Copyright © 2009-2016 The Claws Mail team.
+# Copyright © 2009-2017 The Claws Mail team.
 # This file is distributed under the same license
 # as the Claws Mail package, see COPYING file.
-# Slavko <linux@slavino.sk>, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016.
+# Slavko <linux@slavino.sk>, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: claws-mail 3.13\n"
+"Project-Id-Version: claws-mail 3.15.1\n"
 "Report-Msgid-Bugs-To: paul@claws-mail.org\n"
-"POT-Creation-Date: 2016-11-06 10:47+0000\n"
-"PO-Revision-Date: 2016-08-02 11:23+0200\n"
+"POT-Creation-Date: 2017-03-27 16:04+0100\n"
+"PO-Revision-Date: 2017-03-27 16:58+0200\n"
 "Last-Translator: Slavko <linux@slavino.sk>\n"
 "Language-Team: slovenčina <linux@slavino.sk>\n"
 "Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  sk.po (claws-mail 3.11.0)  #-#-#-#-#\n"
 "X-Generator: Gtranslator 2.91.7\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-POFile-SpellExtra: Distguished DIGEST-MD5 Foundation iconv compose Okt\n"
-"X-POFile-SpellExtra: EUC-JP send podzložiek X-Mailer faq List-Help XBM\n"
-"X-POFile-SpellExtra: status-full ubject POP3 item priklad LDAP Dillo jozef\n"
-"X-POFile-SpellExtra: SELECT RFC822 version Lomka bogofilter IMAP change\n"
-"X-POFile-SpellExtra: search ixed receive changed NOT NNTP EHLO Aug GnuTLS\n"
-"X-POFile-SpellExtra: LDIFbol select account 02dMB Pospracovanie gpgsm\n"
-"X-POFile-SpellExtra: EUC-TW UTF-8 GnuPG Glib PGP License PalmOS fd switch\n"
-"X-POFile-SpellExtra: inline PNG metadát ld gpg-agent libSM URI Control\n"
-"X-POFile-SpellExtra: debug LDIF Mailbox got offline claws-mail GPGME Big5\n"
-"X-POFile-SpellExtra: RFC mojadomena org Apr shred IPv6 IMAP4 Gpgme key\n"
-"X-POFile-SpellExtra: attach SASL TLS GTK NetworkManager Sep gnupg-agent\n"
-"X-POFile-SpellExtra: Claws GTK1 xtended kB Enter uri Relative RSS Dec\n"
-"X-POFile-SpellExtra: Libetpan GPGSM Free theme Mime ldap folder Bogofilter\n"
-"X-POFile-SpellExtra: US-ASCII dn spamd GPG dc CRAM-MD5 Enchant GBK PKCS12\n"
-"X-POFile-SpellExtra: close TCP ISO-8859-9 ISO-8859-8 ISO-8859-7 ISO-8859-6\n"
-"X-POFile-SpellExtra: ISO-8859-5 ISO-8859-4 SpamAssassin ISO-8859-2\n"
-"X-POFile-SpellExtra: ISO-8859-1 news OpenPGP 0x Unicode strftime cn\n"
-"X-POFile-SpellExtra: subscribe soketu Sylpheed-Claws quit podzložku\n"
-"X-POFile-SpellExtra: podzložky podzložka OpensSSL súbor1 súbor2 News\n"
-"X-POFile-SpellExtra: General mbox MIME conf ascii FAQ 7bit libetpan IP v3\n"
-"X-POFile-SpellExtra: 02dKB vyp KOI8-U KOI8-R menodomeny Zap BASE64\n"
-"X-POFile-SpellExtra: version-full Sylpheed UID ldif PEM JPilot home exit\n"
-"X-POFile-SpellExtra: Št localhost Ut Feb aktivovanú sProsím inbox\n"
-"X-POFile-SpellExtra: Pobaltie GB2312 sPracujete glib soket DNS RDN\n"
-"X-POFile-SpellExtra: Distinguished ISO-8859-15 ISO-8859-13 phishingovým\n"
-"X-POFile-SpellExtra: uid čítačku deaktivované ISO-2022-JP STARTTLS\n"
-"X-POFile-SpellExtra: update ISO-2022-CN vCard Return-Path X-Label Pine\n"
-"X-POFile-SpellExtra: Inline Resent-From Resent-To color Received GB18030\n"
-"X-POFile-SpellExtra: Sender From compface Content-Type\n"
-"X-POFile-SpellExtra: Disposition-Notification-To 48x48 Resent-Cc\n"
-"X-POFile-SpellExtra: compose-from-file List-Owner Resent-Date ShiftJIS\n"
-"X-POFile-SpellExtra: Seen Resent-Bcc TLSREQCERT alternate-config-dir\n"
-"X-POFile-SpellExtra: Resent-Message-ID Message-ID\n"
-"X-POFile-SpellExtra: Content-Transfer-Encoding 2fGB fullwindow St\n"
-"X-POFile-SpellExtra: Return-Receipt-To Precedence Cc local List-Subscribe\n"
-"X-POFile-SpellExtra: Delivered-To EUC-KR X-No-Archive sk Mailing-List\n"
-"X-POFile-SpellExtra: In-Reply-To List-Archive UIDL X-Bogosity TLSCACERTDIR\n"
-"X-POFile-SpellExtra: ID MIME-Version Followup-To Resent-Sender config-dir\n"
-"X-POFile-SpellExtra: List-Unsubscribe receive-all help Hraško LAST CHECK\n"
-"X-POFile-SpellExtra: Štýlopis LSUB štýlopis Werner Mutt domena\n"
-"X-POFile-SpellExtra: Yamamoto janko Subject people pospracovania arg HELO\n"
-"X-POFile-SpellExtra: SEARCH APOP PM asp oznamovača LOGOUT dirmngr INVAL\n"
-"X-POFile-SpellExtra: iconified Chmod SUBSCRIBE NOOP DELETE cc FETCH APPEND\n"
-"X-POFile-SpellExtra: Fw EXPUNGE Koch CLOSE pm Hiroyuki Bind Franklin\n"
-"X-POFile-SpellExtra: dfNFLIstcnriT RCPT EXAMINE References RENAME\n"
-"X-POFile-SpellExtra: EXTENSION af ao an as PATH LOGIN DATA id Localhost\n"
-"X-POFile-SpellExtra: CREATE CAPABILITY podmenu aT EChyba ABt podvýraz\n"
-"X-POFile-SpellExtra: AUTH MUTT COPY ABc FROM ABf bind hrasko Street\n"
-"X-POFile-SpellExtra: UNSUBSCRIBE Floor Fifth Core nezalomené shellu\n"
-"X-POFile-SpellExtra: prefscommon mailbox MIMEhowto xover Vypršaný xhdr\n"
-"X-POFile-SpellExtra: gthread nextunreadmsgdialog Nezalomené statistics\n"
-"X-POFile-SpellExtra: dillo Príjímanie Kocha reader Wernera\n"
-"X-POFile-SpellExtra: autentifikovaný reset-statistics distinguished www\n"
-"X-POFile-SpellExtra: 600 GNU am root MH Jan 110 Online 15 Public 2822 rom\n"
-"X-POFile-SpellExtra: 12-hod 25 List-Post php X-Face X- Max X-Status\n"
-"X-POFile-SpellExtra: User-Agent P12 HTML 02110-1301 online Windows-1256\n"
-"X-POFile-SpellExtra: 480 24-hod Windows-1251 102376 http AM 998 IO\n"
-"X-POFile-SpellExtra: Po-spracovanie 389 100 Face Janko Software AND 10\n"
-"X-POFile-SpellExtra: Windows-1255 OK TIS-620 Windows-874 1999-2012 51 mh\n"
-"X-POFile-SpellExtra: 2001 DoS podreťazca 725 OS OR ad ov\n"
-"X-POFile-SpellExtra: 20s check send before code gs vCalendar ClamAV\n"
-"X-POFile-SpellExtra: whitelist Bsfilter COMPRESS XFCE kanály\n"
-"X-POFile-SpellExtra: clamav-daemon hint AttRemover Filtering webCal\n"
-"#-#-#-#-#  iso_3166-3.56.sk.po (iso_3166 3.13)  #-#-#-#-#\n"
-"X-POFile-SpellExtra: novších Webcal GNOME ISO-8601 ghostscript gui\n"
-"X-POFile-SpellExtra: Mjanmarsko Tab imap4 Macao GeoLocation Džibutsko\n"
 
 #: src/account.c:396 src/account.c:463
 msgid ""
@@ -126,65 +59,65 @@ msgstr "Účty so vzdialenými zložkami nemožno kopírovať."
 msgid "Copy of %s"
 msgstr "Kópia %s"
 
-#: src/account.c:1075
+#: src/account.c:1096
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Naozaj chcete odstrániť účet „%s”?"
 
-#: src/account.c:1077
+#: src/account.c:1098
 msgid "(Untitled)"
 msgstr "(Bez názvu)"
 
-#: src/account.c:1078
+#: src/account.c:1099
 msgid "Delete account"
 msgstr "Zmazať účet"
 
-#: src/account.c:1562
+#: src/account.c:1589
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr " "
 
-#: src/account.c:1568
+#: src/account.c:1595
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "Tlačidlo „Prijať poštu” prijme poštu z označených účtov"
 
-#: src/account.c:1575 src/addrduplicates.c:471 src/addressadd.c:215
-#: src/addressbook.c:125 src/compose.c:7205 src/editaddress.c:1264
+#: src/account.c:1602 src/addrduplicates.c:471 src/addressadd.c:215
+#: src/addressbook.c:125 src/compose.c:7333 src/editaddress.c:1264
 #: src/editaddress.c:1321 src/editaddress.c:1341
 #: src/editaddress_other_attributes_ldap.c:302
 #: src/editaddress_other_attributes_ldap.c:350 src/editbook.c:170
 #: src/editgroup.c:288 src/editjpilot.c:257 src/editldap.c:428
 #: src/editvcard.c:173 src/importmutt.c:222 src/importpine.c:221
 #: src/mimeview.c:274 src/plugins/managesieve/sieve_manager.c:465
-#: src/plugins/pdf_viewer/poppler_viewer.c:1800
+#: src/plugins/pdf_viewer/poppler_viewer.c:1792
 #: src/plugins/pgpcore/select-keys.c:395 src/prefs_filtering.c:384
-#: src/prefs_filtering.c:1866 src/prefs_template.c:79
+#: src/prefs_filtering.c:1868 src/prefs_template.c:79
 msgid "Name"
 msgstr "Meno"
 
-#: src/account.c:1583 src/prefs_account.c:1096 src/prefs_account.c:4141
+#: src/account.c:1610 src/prefs_account.c:1096 src/prefs_account.c:4141
 msgid "Protocol"
 msgstr "Protokol"
 
-#: src/account.c:1591 src/ssl_manager.c:100
+#: src/account.c:1618 src/ssl_manager.c:100
 msgid "Server"
 msgstr "Server"
 
-#: src/action.c:382
+#: src/action.c:380
 #, c-format
 msgid "Could not get message file %d"
 msgstr "Nemožno získať súbor správy %d"
 
-#: src/action.c:419
+#: src/action.c:418
 msgid "Could not get message part."
 msgstr "Nemožno získať časť správy."
 
-#: src/action.c:436
+#: src/action.c:435
 #, c-format
 msgid "Can't get part of multipart message: %s"
 msgstr "Nemožno získať časť viacdielnej správy: %s"
 
-#: src/action.c:608
+#: src/action.c:607
 #, c-format
 msgid ""
 "The selected action cannot be used in the compose window\n"
@@ -193,11 +126,11 @@ msgstr ""
 "Zvolená akcia nemôže byť použitá v okne písania správy,\n"
 "pretože obsahuje %%f, %%F, %%as alebo %%p."
 
-#: src/action.c:720
+#: src/action.c:719
 msgid "There is no filtering action set"
 msgstr "Nie je nastavená žiadna akcia filtra"
 
-#: src/action.c:722
+#: src/action.c:721
 #, c-format
 msgid ""
 "Invalid filtering action(s):\n"
@@ -206,7 +139,7 @@ msgstr ""
 "Neplatné akcie filtra:\n"
 "%s"
 
-#: src/action.c:987
+#: src/action.c:986
 #, c-format
 msgid ""
 "Could not fork to execute the following command:\n"
@@ -217,34 +150,34 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:989 src/ldaputil.c:323 src/plugins/bogofilter/bogofilter.c:884
-#: src/plugins/tnef_parse/tnef_parse.c:67
-#: src/plugins/vcalendar/vcal_folder.c:1821
-#: src/plugins/vcalendar/vcal_folder.c:1825
-#: src/plugins/vcalendar/vcal_folder.c:1836
-#: src/plugins/vcalendar/vcal_folder.c:1839 src/privacy.c:62
+#: src/action.c:988 src/ldaputil.c:323 src/plugins/bogofilter/bogofilter.c:857
+#: src/plugins/tnef_parse/tnef_parse.c:75
+#: src/plugins/vcalendar/vcal_folder.c:1827
+#: src/plugins/vcalendar/vcal_folder.c:1831
+#: src/plugins/vcalendar/vcal_folder.c:1844
+#: src/plugins/vcalendar/vcal_folder.c:1847 src/privacy.c:62
 msgid "Unknown error"
 msgstr "Neznáma chyba"
 
-#: src/action.c:1207 src/action.c:1372
+#: src/action.c:1206 src/action.c:1371
 msgid "Completed"
 msgstr "Dokončené"
 
-#: src/action.c:1243
+#: src/action.c:1242
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- Bežiace: %s\n"
 
-#: src/action.c:1247
+#: src/action.c:1246
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Ukončené: %s\n"
 
-#: src/action.c:1280
+#: src/action.c:1279
 msgid "Action's input/output"
 msgstr "Akcie vstupu/výstupu"
 
-#: src/action.c:1608
+#: src/action.c:1607
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -255,11 +188,11 @@ msgstr ""
 "(„%%h” bude nahradené parametrom)\n"
 "  %s"
 
-#: src/action.c:1613
+#: src/action.c:1612
 msgid "Action's hidden user argument"
 msgstr "Skrytý používateľský parameter akcie"
 
-#: src/action.c:1617
+#: src/action.c:1616
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -270,7 +203,7 @@ msgstr ""
 "(„%%u” bude nahradené parametrom)\n"
 "  %s"
 
-#: src/action.c:1622
+#: src/action.c:1621
 msgid "Action's user argument"
 msgstr "Používateľský parameter"
 
@@ -361,13 +294,13 @@ msgstr ""
 
 #: src/addrcustomattr.c:212 src/addressbook.c:438 src/addressbook.c:466
 #: src/addressbook.c:483 src/edittags.c:272
-#: src/plugins/archive/archiver_gtk.c:1186 src/prefs_actions.c:1090
-#: src/prefs_filtering.c:1693 src/prefs_template.c:1119
+#: src/plugins/archive/archiver_gtk.c:1307 src/prefs_actions.c:1084
+#: src/prefs_filtering.c:1695 src/prefs_template.c:1109
 msgid "_Delete"
 msgstr "O_dstrániť"
 
-#: src/addrcustomattr.c:213 src/edittags.c:273 src/prefs_actions.c:1091
-#: src/prefs_filtering.c:1694 src/prefs_template.c:1120
+#: src/addrcustomattr.c:213 src/edittags.c:273 src/prefs_actions.c:1085
+#: src/prefs_filtering.c:1696 src/prefs_template.c:1110
 msgid "Delete _all"
 msgstr "Zm_azať všetko"
 
@@ -422,7 +355,7 @@ msgid "Duplicate email addresses"
 msgstr "Duplicitné adresy"
 
 #: src/addrduplicates.c:442 src/addressadd.c:227
-#: src/plugins/pgpcore/select-keys.c:396 src/toolbar.c:434
+#: src/plugins/pgpcore/select-keys.c:396 src/toolbar.c:526
 msgid "Address"
 msgstr "Adresa"
 
@@ -482,17 +415,17 @@ msgid "_Book"
 msgstr "_Adresár"
 
 #: src/addressbook.c:406 src/addressbook.c:437 src/addressbook.c:465
-#: src/addressbook.c:482 src/compose.c:586 src/mainwindow.c:512
+#: src/addressbook.c:482 src/compose.c:602 src/mainwindow.c:514
 #: src/messageview.c:209 src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
 msgstr "_Upraviť"
 
-#: src/addressbook.c:407 src/compose.c:591 src/mainwindow.c:515
+#: src/addressbook.c:407 src/compose.c:607 src/mainwindow.c:517
 #: src/messageview.c:212
 msgid "_Tools"
 msgstr "_Nástroje"
 
-#: src/addressbook.c:408 src/compose.c:592 src/mainwindow.c:517
+#: src/addressbook.c:408 src/compose.c:608 src/mainwindow.c:519
 #: src/messageview.c:213
 msgid "_Help"
 msgstr "_Pomocník"
@@ -525,14 +458,14 @@ msgstr "_Upraviť adresár"
 msgid "_Delete book"
 msgstr "Z_mazať adresár"
 
-#: src/addressbook.c:427 src/compose.c:603
+#: src/addressbook.c:427 src/compose.c:619
 #: src/plugins/managesieve/sieve_editor.c:85
 #: src/plugins/managesieve/sieve_editor.c:433
 #: src/plugins/managesieve/sieve_editor.c:631
 msgid "_Save"
 msgstr "_Uložiť"
 
-#: src/addressbook.c:428 src/compose.c:607 src/messageview.c:222
+#: src/addressbook.c:428 src/compose.c:623 src/messageview.c:222
 #: src/plugins/managesieve/sieve_editor.c:88
 #: src/plugins/managesieve/sieve_editor.c:629
 msgid "_Close"
@@ -547,13 +480,13 @@ msgid "C_ut"
 msgstr "_Vystrihnúť"
 
 #: src/addressbook.c:434 src/addressbook.c:473 src/addressbook.c:489
-#: src/compose.c:615 src/mainwindow.c:546 src/messageview.c:225
+#: src/compose.c:631 src/mainwindow.c:548 src/messageview.c:225
 #: src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr "_Kopírovať"
 
 #: src/addressbook.c:435 src/addressbook.c:474 src/addressbook.c:490
-#: src/compose.c:616 src/plugins/managesieve/sieve_editor.c:97
+#: src/compose.c:632 src/plugins/managesieve/sieve_editor.c:97
 msgid "_Paste"
 msgstr "V_ložiť"
 
@@ -597,8 +530,8 @@ msgstr "Nájsť duplikáty…"
 msgid "Edit custom attributes..."
 msgstr "Upraviť vlastné atribúty…"
 
-#: src/addressbook.c:458 src/compose.c:695 src/mainwindow.c:813
-#: src/messageview.c:338
+#: src/addressbook.c:458 src/compose.c:709 src/mainwindow.c:815
+#: src/messageview.c:337
 msgid "_About"
 msgstr "_O programe"
 
@@ -609,8 +542,8 @@ msgstr "P_rechádzať  položky"
 #: src/addressbook.c:507 src/crash.c:456 src/crash.c:475 src/importldif.c:114
 #: src/plugins/pgpcore/select-keys.c:250 src/plugins/pgpcore/sgpgme.c:143
 #: src/plugins/pgpcore/sgpgme.c:171 src/plugins/vcalendar/day-view.c:402
-#: src/plugins/vcalendar/month-view.c:428 src/prefs_themes.c:682
-#: src/prefs_themes.c:714 src/prefs_themes.c:715
+#: src/plugins/vcalendar/month-view.c:428 src/prefs_themes.c:782
+#: src/prefs_themes.c:814 src/prefs_themes.c:815
 msgid "Unknown"
 msgstr "Neznáme"
 
@@ -691,9 +624,8 @@ msgid "LDAP search terminated on request"
 msgstr "LDAP vyhľadávanie bolo ukončené na požiadavku používateľa"
 
 #: src/addressbook.c:542
-#, fuzzy
 msgid "Error starting STARTTLS connection"
-msgstr "Chyba vytvorenia TLS pripojenia"
+msgstr "Chyba vytvorenia spojenia STARTTLS"
 
 #: src/addressbook.c:543
 msgid "Distinguished Name (dn) is missing"
@@ -716,7 +648,7 @@ msgid "Sources"
 msgstr "Zdroje"
 
 #: src/addressbook.c:917 src/prefs_matcher.c:632 src/prefs_other.c:492
-#: src/toolbar.c:225 src/toolbar.c:2142
+#: src/toolbar.c:268 src/toolbar.c:2441
 msgid "Address book"
 msgstr "Adresár"
 
@@ -750,8 +682,8 @@ msgid "Do you want to delete the query results and addresses in '%s'?"
 msgstr "Chcete zmazať výsledky požiadavku a adresy v „%s”?"
 
 #: src/addressbook.c:2916 src/addressbook.c:2942 src/addressbook.c:2949
-#: src/plugins/archive/archiver_prefs.c:329 src/prefs_filtering_action.c:177
-#: src/toolbar.c:415
+#: src/plugins/archive/archiver_prefs.c:431 src/prefs_filtering_action.c:177
+#: src/toolbar.c:494
 msgid "Delete"
 msgstr "Odstrániť"
 
@@ -764,7 +696,7 @@ msgstr ""
 "Chcete odstrániť „%s”? Ak odstránite len zložku, adresy, ktoré obsahuje, "
 "budú presunuté do rodičovskej zložky."
 
-#: src/addressbook.c:2928 src/imap_gtk.c:360 src/mh_gtk.c:206
+#: src/addressbook.c:2928 src/imap_gtk.c:370 src/mh_gtk.c:206
 #: src/plugins/mailmbox/plugin_gtk.c:332 src/plugins/rssyl/rssyl_cb_menu.c:155
 msgid "Delete folder"
 msgstr "Odstrániť zložku"
@@ -876,8 +808,8 @@ msgstr "Adresáre"
 msgid "Person"
 msgstr "Osoba"
 
-#: src/addressbook.c:4958 src/exporthtml.c:884 src/folderview.c:348
-#: src/folderview.c:436 src/prefs_account.c:2799 src/prefs_folder_column.c:78
+#: src/addressbook.c:4958 src/exporthtml.c:884 src/folderview.c:355
+#: src/folderview.c:443 src/prefs_account.c:2799 src/prefs_folder_column.c:78
 msgid "Folder"
 msgstr "Zložka"
 
@@ -910,12 +842,12 @@ msgstr "Adresár"
 #: src/plugins/bsfilter/bsfilter_gtk.c:266
 #: src/plugins/bsfilter/bsfilter_gtk.c:326
 #: src/plugins/spamassassin/spamassassin.c:117
-#: src/plugins/spamassassin/spamassassin_gtk.c:442
-#: src/plugins/spamassassin/spamassassin_gtk.c:489
-#: src/plugins/spamassassin/spamassassin_gtk.c:612 src/prefs_matcher.c:675
-#: src/prefs_matcher.c:710 src/prefs_matcher.c:1618 src/prefs_matcher.c:1625
-#: src/prefs_matcher.c:1633 src/prefs_matcher.c:1635 src/prefs_matcher.c:2519
-#: src/prefs_matcher.c:2523
+#: src/plugins/spamassassin/spamassassin_gtk.c:443
+#: src/plugins/spamassassin/spamassassin_gtk.c:490
+#: src/plugins/spamassassin/spamassassin_gtk.c:613 src/prefs_matcher.c:675
+#: src/prefs_matcher.c:710 src/prefs_matcher.c:1619 src/prefs_matcher.c:1626
+#: src/prefs_matcher.c:1634 src/prefs_matcher.c:1636 src/prefs_matcher.c:2520
+#: src/prefs_matcher.c:2524
 msgid "Any"
 msgstr "Všetky"
 
@@ -968,7 +900,7 @@ msgstr "Spracovať tieto poštové hlavičky"
 msgid "Include subfolders"
 msgstr "Zahrnúť podzložky"
 
-#: src/addrgather.c:450 src/prefs_filtering_action.c:1425
+#: src/addrgather.c:450 src/prefs_filtering_action.c:1426
 msgid "Header Name"
 msgstr "Názov hlavičky"
 
@@ -1017,18 +949,18 @@ msgstr "Aktualizácia adries"
 msgid "Update failed. Changes not written to Directory."
 msgstr "Aktualizácia zlyhala. Zmeny neboli zapísané do adresára."
 
-#: src/alertpanel.c:146 src/compose.c:9454
+#: src/alertpanel.c:146 src/compose.c:9624
 msgid "Notice"
 msgstr "Upozornenie"
 
-#: src/alertpanel.c:159 src/compose.c:5689 src/compose.c:6212
-#: src/compose.c:11905 src/file_checker.c:78 src/file_checker.c:100
-#: src/messageview.c:854 src/messageview.c:867 src/plugins/pgpcore/sgpgme.c:788
-#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:4851
+#: src/alertpanel.c:159 src/compose.c:5780 src/compose.c:6301
+#: src/compose.c:12047 src/file_checker.c:78 src/file_checker.c:100
+#: src/messageview.c:855 src/messageview.c:882 src/plugins/pgpcore/sgpgme.c:788
+#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:4895
 msgid "Warning"
 msgstr "Upozornenie"
 
-#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5630 src/inc.c:663
+#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5717 src/inc.c:663
 #: src/plugins/pgpcore/sgpgme.c:155 src/plugins/pgpcore/sgpgme.c:314
 msgid "Error"
 msgstr "Chyba"
@@ -1149,10 +1081,9 @@ msgstr "Vaša verzia Claws Mail je pre zásuvný modul „%s” príliš stará.
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "Vaša verzia Claws Mail je pre tento zásuvný modul príliš stará."
 
-#: src/common/session.c:183 src/imap.c:1210
-#, fuzzy
+#: src/common/session.c:183 src/imap.c:1207
 msgid "SSL/TLS handshake failed\n"
-msgstr "Vytvorenie SSL spojenia zlyhalo\n"
+msgstr "Zlyhalo vytvorenie spojenia SSL/TLS\n"
 
 #: src/common/smtp.c:179
 msgid "No SMTP AUTH method available\n"
@@ -1180,34 +1111,33 @@ msgid "Message is too big (Maximum size is %s)\n"
 msgstr "Správa je príliš veľká (Maximálna veľkosť je %s)\n"
 
 #: src/common/smtp.c:617 src/pop.c:898
-#, fuzzy
 msgid "couldn't start STARTTLS session\n"
-msgstr "nemožno vytvoriť reláciu TLS\n"
+msgstr "nemožno vytvoriť reláciu STARTTLS\n"
 
-#: src/common/socket.c:569
+#: src/common/socket.c:571
 msgid "Socket IO timeout.\n"
 msgstr "Časový limit soketu IO.\n"
 
-#: src/common/socket.c:598
+#: src/common/socket.c:600
 msgid "Connection timed out.\n"
 msgstr "Uplynul časový limit spojenia.\n"
 
-#: src/common/socket.c:732
+#: src/common/socket.c:734
 #, c-format
 msgid "%s:%d: connection failed (%s).\n"
 msgstr "%s:%d: spojenie zlyhalo (%s).\n"
 
-#: src/common/socket.c:972
+#: src/common/socket.c:974
 #, c-format
 msgid "%s:%d: unknown host.\n"
 msgstr "%s:%d: neznámy hostiteľ.\n"
 
-#: src/common/socket.c:1064
+#: src/common/socket.c:1066
 #, c-format
 msgid "%s:%s: host lookup failed (%s).\n"
 msgstr "%s:%s: hľadanie hostiteľa zlyhalo (%s).\n"
 
-#: src/common/socket.c:1368
+#: src/common/socket.c:1370
 #, c-format
 msgid "write on fd%d: %s\n"
 msgstr "zápis na fd%d: %s\n"
@@ -1297,646 +1227,646 @@ msgstr "<chýba v certifikáte>"
 msgid "(Subject cleared by RegExp)"
 msgstr "(Predmet vymazaný regulárnym výrazom)"
 
-#: src/common/utils.c:259
+#: src/common/utils.c:256
 #, c-format
 msgid "%dB"
 msgstr "%dB"
 
-#: src/common/utils.c:260
+#: src/common/utils.c:257
 #, c-format
 msgid "%d.%02dKB"
 msgstr "%d.%02dKB"
 
-#: src/common/utils.c:261
+#: src/common/utils.c:258
 #, c-format
 msgid "%d.%02dMB"
 msgstr "%d.%02dMB"
 
-#: src/common/utils.c:262
+#: src/common/utils.c:259
 #, c-format
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: src/common/utils.c:4764
+#: src/common/utils.c:4759
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "Nedeľa"
 
-#: src/common/utils.c:4765
+#: src/common/utils.c:4760
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "Pondelok"
 
-#: src/common/utils.c:4766
+#: src/common/utils.c:4761
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "Utorok"
 
-#: src/common/utils.c:4767
+#: src/common/utils.c:4762
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "Streda"
 
-#: src/common/utils.c:4768
+#: src/common/utils.c:4763
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "Štvrtok"
 
-#: src/common/utils.c:4769
+#: src/common/utils.c:4764
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "Piatok"
 
-#: src/common/utils.c:4770
+#: src/common/utils.c:4765
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "Sobota"
 
-#: src/common/utils.c:4772
+#: src/common/utils.c:4767
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "Január"
 
-#: src/common/utils.c:4773
+#: src/common/utils.c:4768
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "Február"
 
-#: src/common/utils.c:4774
+#: src/common/utils.c:4769
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "Marec"
 
-#: src/common/utils.c:4775
+#: src/common/utils.c:4770
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "Apríl"
 
-#: src/common/utils.c:4776
+#: src/common/utils.c:4771
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "Máj"
 
-#: src/common/utils.c:4777
+#: src/common/utils.c:4772
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "Jún"
 
-#: src/common/utils.c:4778
+#: src/common/utils.c:4773
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "Júl"
 
-#: src/common/utils.c:4779
+#: src/common/utils.c:4774
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "August"
 
-#: src/common/utils.c:4780
+#: src/common/utils.c:4775
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "September"
 
-#: src/common/utils.c:4781
+#: src/common/utils.c:4776
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "Október"
 
-#: src/common/utils.c:4782
+#: src/common/utils.c:4777
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "November"
 
-#: src/common/utils.c:4783
+#: src/common/utils.c:4778
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "December"
 
-#: src/common/utils.c:4785
+#: src/common/utils.c:4780
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "Ne"
 
-#: src/common/utils.c:4786
+#: src/common/utils.c:4781
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "Po"
 
-#: src/common/utils.c:4787
+#: src/common/utils.c:4782
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "Ut"
 
-#: src/common/utils.c:4788
+#: src/common/utils.c:4783
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "St"
 
-#: src/common/utils.c:4789
+#: src/common/utils.c:4784
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "Št"
 
-#: src/common/utils.c:4790
+#: src/common/utils.c:4785
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "Pi"
 
-#: src/common/utils.c:4791
+#: src/common/utils.c:4786
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "So"
 
-#: src/common/utils.c:4793
+#: src/common/utils.c:4788
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "Jan"
 
-#: src/common/utils.c:4794
+#: src/common/utils.c:4789
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "Feb"
 
-#: src/common/utils.c:4795
+#: src/common/utils.c:4790
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "Mar"
 
-#: src/common/utils.c:4796
+#: src/common/utils.c:4791
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "Apr"
 
-#: src/common/utils.c:4797
+#: src/common/utils.c:4792
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "Máj"
 
-#: src/common/utils.c:4798
+#: src/common/utils.c:4793
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "Jún"
 
-#: src/common/utils.c:4799
+#: src/common/utils.c:4794
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "Júl"
 
-#: src/common/utils.c:4800
+#: src/common/utils.c:4795
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "Aug"
 
-#: src/common/utils.c:4801
+#: src/common/utils.c:4796
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "Sep"
 
-#: src/common/utils.c:4802
+#: src/common/utils.c:4797
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "Okt"
 
-#: src/common/utils.c:4803
+#: src/common/utils.c:4798
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "Nov"
 
-#: src/common/utils.c:4804
+#: src/common/utils.c:4799
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "Dec"
 
-#: src/common/utils.c:4815
+#: src/common/utils.c:4810
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "DOP"
 
-#: src/common/utils.c:4816
+#: src/common/utils.c:4811
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "ODP"
 
-#: src/common/utils.c:4817
+#: src/common/utils.c:4812
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "dop."
 
-#: src/common/utils.c:4818
+#: src/common/utils.c:4813
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "odp."
 
-#: src/compose.c:575
+#: src/compose.c:591
 msgid "_Add..."
 msgstr "_Pridať…"
 
-#: src/compose.c:576 src/mh_gtk.c:367 src/plugins/mailmbox/plugin_gtk.c:301
+#: src/compose.c:592 src/mh_gtk.c:377 src/plugins/mailmbox/plugin_gtk.c:301
 #: src/plugins/rssyl/rssyl_cb_menu.c:316
 msgid "_Remove"
 msgstr "_Odstrániť"
 
-#: src/compose.c:578 src/folderview.c:247
+#: src/compose.c:594 src/folderview.c:254
 msgid "_Properties..."
 msgstr "_Vlastnosti…"
 
-#: src/compose.c:585 src/mainwindow.c:514 src/messageview.c:211
+#: src/compose.c:601 src/mainwindow.c:516 src/messageview.c:211
 msgid "_Message"
 msgstr "Sp_ráva"
 
-#: src/compose.c:588
+#: src/compose.c:604
 msgid "_Spelling"
 msgstr "P_ravopis"
 
-#: src/compose.c:590 src/compose.c:657
+#: src/compose.c:606 src/compose.c:673
 msgid "_Options"
 msgstr "_Možnosti"
 
-#: src/compose.c:594
+#: src/compose.c:610
 msgid "S_end"
 msgstr "Odos_lať"
 
-#: src/compose.c:595
+#: src/compose.c:611
 msgid "Send _later"
 msgstr "Odoslať _neskôr"
 
-#: src/compose.c:598
+#: src/compose.c:614
 msgid "_Attach file"
 msgstr "Pripojiť sú_bor"
 
-#: src/compose.c:599
+#: src/compose.c:615
 msgid "_Insert file"
 msgstr "Vlož_iť súbor"
 
-#: src/compose.c:600
+#: src/compose.c:616
 msgid "Insert si_gnature"
 msgstr "Vložiť _podpis"
 
-#: src/compose.c:601
+#: src/compose.c:617
 msgid "_Replace signature"
 msgstr "Nah_radiť podpis"
 
-#: src/compose.c:605
+#: src/compose.c:621
 msgid "_Print"
 msgstr "_Tlačiť"
 
-#: src/compose.c:610 src/plugins/managesieve/sieve_editor.c:91
+#: src/compose.c:626 src/plugins/managesieve/sieve_editor.c:91
 msgid "_Undo"
 msgstr "_Späť"
 
-#: src/compose.c:611 src/plugins/managesieve/sieve_editor.c:92
+#: src/compose.c:627 src/plugins/managesieve/sieve_editor.c:92
 msgid "_Redo"
 msgstr "_Znova"
 
-#: src/compose.c:614 src/plugins/managesieve/sieve_editor.c:95
+#: src/compose.c:630 src/plugins/managesieve/sieve_editor.c:95
 msgid "Cu_t"
 msgstr "_Vystrihnúť"
 
-#: src/compose.c:618
+#: src/compose.c:634
 msgid "_Special paste"
 msgstr "Prilepiť _špeciálne"
 
-#: src/compose.c:619
+#: src/compose.c:635
 msgid "As _quotation"
 msgstr "Ako _citácia"
 
-#: src/compose.c:620
+#: src/compose.c:636
 msgid "_Wrapped"
 msgstr "_Zalomené"
 
-#: src/compose.c:621
+#: src/compose.c:637
 msgid "_Unwrapped"
 msgstr "_Nezalomené"
 
-#: src/compose.c:623 src/mainwindow.c:547
+#: src/compose.c:639 src/mainwindow.c:549
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "Vy_brať všetko"
 
-#: src/compose.c:625
+#: src/compose.c:641
 msgid "A_dvanced"
 msgstr "_Rozšírené"
 
-#: src/compose.c:626
+#: src/compose.c:642
 msgid "Move a character backward"
 msgstr "Presunúť o znak dozadu"
 
-#: src/compose.c:627
+#: src/compose.c:643
 msgid "Move a character forward"
 msgstr "Presunúť o znak dopredu"
 
-#: src/compose.c:628
+#: src/compose.c:644
 msgid "Move a word backward"
 msgstr "Presunúť o slovo dozadu"
 
-#: src/compose.c:629
+#: src/compose.c:645
 msgid "Move a word forward"
 msgstr "Presunúť o slovo dopredu"
 
-#: src/compose.c:630
+#: src/compose.c:646
 msgid "Move to beginning of line"
 msgstr "Presunúť na začiatok riadku"
 
-#: src/compose.c:631
+#: src/compose.c:647
 msgid "Move to end of line"
 msgstr "Presunúť na koniec riadku"
 
-#: src/compose.c:632
+#: src/compose.c:648
 msgid "Move to previous line"
 msgstr "Presunúť na predchádzajúci riadok"
 
-#: src/compose.c:633
+#: src/compose.c:649
 msgid "Move to next line"
 msgstr "Presunúť na ďalší riadok"
 
-#: src/compose.c:634
+#: src/compose.c:650
 msgid "Delete a character backward"
 msgstr "Zmazať znak naľavo od kurzora"
 
-#: src/compose.c:635
+#: src/compose.c:651
 msgid "Delete a character forward"
 msgstr "Zmazať znak napravo od kurzora"
 
-#: src/compose.c:636
+#: src/compose.c:652
 msgid "Delete a word backward"
 msgstr "Zmazať slovo naľavo od kurzora"
 
-#: src/compose.c:637
+#: src/compose.c:653
 msgid "Delete a word forward"
 msgstr "Zmazať slovo napravo od kurzora"
 
-#: src/compose.c:638
+#: src/compose.c:654
 msgid "Delete line"
 msgstr "Zmazať riadok"
 
-#: src/compose.c:639
+#: src/compose.c:655
 msgid "Delete to end of line"
 msgstr "Zmazať do konca riadku"
 
-#: src/compose.c:642 src/messageview.c:228
+#: src/compose.c:658 src/messageview.c:228
 #: src/plugins/managesieve/sieve_editor.c:102
 msgid "_Find"
 msgstr "_Hľadať"
 
-#: src/compose.c:645
+#: src/compose.c:661
 msgid "_Wrap current paragraph"
 msgstr "_Zalomiť aktuálny odsek"
 
-#: src/compose.c:646
+#: src/compose.c:662
 msgid "Wrap all long _lines"
 msgstr "Zalomiť všetky d_lhé riadky"
 
-#: src/compose.c:648
+#: src/compose.c:664
 msgid "Edit with e_xternal editor"
 msgstr "Upraviť pomocou e_xterného editora"
 
-#: src/compose.c:651
+#: src/compose.c:667
 msgid "_Check all or check selection"
 msgstr "_Skontrolovať všetko alebo výber"
 
-#: src/compose.c:652
+#: src/compose.c:668
 msgid "_Highlight all misspelled words"
 msgstr "_Zvýrazniť všetky nesprávne slová"
 
-#: src/compose.c:653
+#: src/compose.c:669
 msgid "Check _backwards misspelled word"
 msgstr "S_pätne skontrolovať nesprávne slovo"
 
-#: src/compose.c:654
+#: src/compose.c:670
 msgid "_Forward to next misspelled word"
 msgstr "_Dopredu na ďalšie nesprávne slovo"
 
-#: src/compose.c:662
+#: src/compose.c:677
 msgid "Reply _mode"
 msgstr "Reži_m odpovede"
 
-#: src/compose.c:664
+#: src/compose.c:679
 msgid "Privacy _System"
 msgstr "_Súkromie"
 
-#: src/compose.c:669
+#: src/compose.c:683
 msgid "_Priority"
 msgstr "Pri_orita"
 
-#: src/compose.c:671 src/mainwindow.c:610 src/messageview.c:264
+#: src/compose.c:685 src/mainwindow.c:611 src/messageview.c:264
 msgid "Character _encoding"
 msgstr "_Kódovanie znakov"
 
-#: src/compose.c:676 src/mainwindow.c:615 src/messageview.c:269
+#: src/compose.c:690 src/mainwindow.c:616 src/messageview.c:269
 msgid "Western European"
 msgstr "Západná Európa (ISO-8859-1)"
 
-#: src/compose.c:677 src/mainwindow.c:616 src/messageview.c:270
+#: src/compose.c:691 src/mainwindow.c:617 src/messageview.c:270
 msgid "Baltic"
 msgstr "Pobaltské"
 
-#: src/compose.c:678 src/mainwindow.c:617 src/messageview.c:271
+#: src/compose.c:692 src/mainwindow.c:618 src/messageview.c:271
 msgid "Hebrew"
 msgstr "Hebrejské"
 
-#: src/compose.c:679 src/mainwindow.c:618 src/messageview.c:272
+#: src/compose.c:693 src/mainwindow.c:619 src/messageview.c:272
 msgid "Arabic"
 msgstr "Arabské"
 
-#: src/compose.c:680 src/mainwindow.c:619 src/messageview.c:273
+#: src/compose.c:694 src/mainwindow.c:620 src/messageview.c:273
 msgid "Cyrillic"
 msgstr "Cyrilika"
 
-#: src/compose.c:681 src/mainwindow.c:620 src/messageview.c:274
+#: src/compose.c:695 src/mainwindow.c:621 src/messageview.c:274
 msgid "Japanese"
 msgstr "Japonské"
 
-#: src/compose.c:682 src/mainwindow.c:621 src/messageview.c:275
+#: src/compose.c:696 src/mainwindow.c:622 src/messageview.c:275
 msgid "Chinese"
 msgstr "Čínske"
 
-#: src/compose.c:683 src/mainwindow.c:622 src/messageview.c:276
+#: src/compose.c:697 src/mainwindow.c:623 src/messageview.c:276
 msgid "Korean"
 msgstr "Kórejské"
 
-#: src/compose.c:684 src/mainwindow.c:623 src/messageview.c:277
+#: src/compose.c:698 src/mainwindow.c:624 src/messageview.c:277
 msgid "Thai"
 msgstr "Thajské"
 
-#: src/compose.c:687 src/mainwindow.c:732 src/messageview.c:313
+#: src/compose.c:701 src/mainwindow.c:734 src/messageview.c:313
 msgid "_Address book"
 msgstr "_Adresár"
 
-#: src/compose.c:689
+#: src/compose.c:703
 msgid "_Template"
 msgstr "Šabló_na"
 
-#: src/compose.c:691 src/mainwindow.c:760 src/messageview.c:334
+#: src/compose.c:705 src/mainwindow.c:762 src/messageview.c:333
 msgid "Actio_ns"
 msgstr "A_kcie"
 
-#: src/compose.c:700
+#: src/compose.c:714
 msgid "Aut_o wrapping"
 msgstr "Aut_omatické zalamovanie"
 
-#: src/compose.c:701
+#: src/compose.c:715
 msgid "Auto _indent"
 msgstr "Automatické odsaden_ie"
 
-#: src/compose.c:702
+#: src/compose.c:716
 msgid "Si_gn"
 msgstr "Podpí_sať"
 
-#: src/compose.c:703
+#: src/compose.c:717
 msgid "_Encrypt"
 msgstr "_Šifrovať"
 
-#: src/compose.c:704
+#: src/compose.c:718
 msgid "_Request Return Receipt"
 msgstr "Vyžiadať potv_rdenie o prijatí"
 
-#: src/compose.c:705
+#: src/compose.c:719
 msgid "Remo_ve references"
 msgstr "_Odstrániť odkazy"
 
-#: src/compose.c:706
+#: src/compose.c:720
 msgid "Show _ruler"
 msgstr "Zobraziť p_ravítko"
 
-#: src/compose.c:711 src/compose.c:721
+#: src/compose.c:725 src/compose.c:735
 msgid "_Normal"
 msgstr "_Normálny"
 
-#: src/compose.c:712 src/mainwindow.c:664 src/messageview.c:302
+#: src/compose.c:726 src/mainwindow.c:665 src/messageview.c:302
 msgid "_All"
 msgstr "_Všetkým"
 
-#: src/compose.c:713 src/mainwindow.c:665 src/messageview.c:303
+#: src/compose.c:727 src/mainwindow.c:666 src/messageview.c:303
 msgid "_Sender"
 msgstr "Odo_sielateľ"
 
-#: src/compose.c:714
+#: src/compose.c:728
 msgid "_Mailing-list"
 msgstr "E_mailová konferencia"
 
-#: src/compose.c:719
+#: src/compose.c:733
 msgid "_Highest"
 msgstr "_Najvyššia"
 
-#: src/compose.c:720
+#: src/compose.c:734
 msgid "Hi_gh"
 msgstr "_Vysoká"
 
-#: src/compose.c:722
+#: src/compose.c:736
 msgid "Lo_w"
 msgstr "_Nízka"
 
-#: src/compose.c:723
+#: src/compose.c:737
 msgid "_Lowest"
 msgstr "Na_jnižšia"
 
-#: src/compose.c:728 src/mainwindow.c:878 src/messageview.c:351
+#: src/compose.c:742 src/mainwindow.c:880 src/messageview.c:350
 msgid "_Automatic"
 msgstr "_Automaticky"
 
-#: src/compose.c:729 src/mainwindow.c:879 src/messageview.c:352
+#: src/compose.c:743 src/mainwindow.c:881 src/messageview.c:351
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "7bit ASCII (US-ASC_II)"
 
-#: src/compose.c:730 src/mainwindow.c:880 src/messageview.c:353
+#: src/compose.c:744 src/mainwindow.c:882 src/messageview.c:352
 msgid "Unicode (_UTF-8)"
 msgstr "Unicode (_UTF-8)"
 
-#: src/compose.c:734 src/mainwindow.c:884 src/messageview.c:357
+#: src/compose.c:748 src/mainwindow.c:886 src/messageview.c:356
 msgid "Central European (ISO-8859-_2)"
 msgstr "Stredná Európa (ISO-8859-_2)"
 
-#: src/compose.c:737 src/mainwindow.c:887 src/messageview.c:360
+#: src/compose.c:751 src/mainwindow.c:889 src/messageview.c:359
 msgid "Greek (ISO-8859-_7)"
 msgstr "Grécke (ISO-8859-_7)"
 
-#: src/compose.c:742 src/mainwindow.c:892 src/messageview.c:365
+#: src/compose.c:756 src/mainwindow.c:894 src/messageview.c:364
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Turecké (ISO-8859-_9)"
 
-#: src/compose.c:1071
+#: src/compose.c:1085
 msgid "New message From format error."
 msgstr "Chyba v tvare odosielateľa novej správy."
 
-#: src/compose.c:1163
+#: src/compose.c:1177
 msgid "New message subject format error."
 msgstr "Chyba v tvare predmetu novej správy."
 
-#: src/compose.c:1194 src/quote_fmt.c:570
+#: src/compose.c:1208 src/quote_fmt.c:570
 #, c-format
 msgid "The body of the \"New message\" template has an error at line %d."
 msgstr "V tele šablóny „Nová správa” je chyba na riadku %d."
 
-#: src/compose.c:1455
+#: src/compose.c:1469
 msgid "Unable to reply. The original email probably doesn't exist."
 msgstr "Nemožno odpovedať. Pôvodná správa už asi neexistuje."
 
-#: src/compose.c:1638 src/quote_fmt.c:587
+#: src/compose.c:1652 src/quote_fmt.c:587
 msgid ""
 "The \"From\" field of the \"Reply\" template contains an invalid email "
 "address."
 msgstr "Pole „Od” šablóny „Odpovedať” obsahuje neplatnú emailovú adresu."
 
-#: src/compose.c:1686 src/quote_fmt.c:590
+#: src/compose.c:1700 src/quote_fmt.c:590
 #, c-format
 msgid "The body of the \"Reply\" template has an error at line %d."
 msgstr "V tele šablóny „Odpovedať” je chyba na riadku %d."
 
-#: src/compose.c:1822 src/compose.c:2014 src/quote_fmt.c:607
+#: src/compose.c:1834 src/compose.c:2025 src/quote_fmt.c:607
 msgid ""
 "The \"From\" field of the \"Forward\" template contains an invalid email "
 "address."
 msgstr "Pole „Od” šablóny „Poslať ďalej” obsahuje neplatnú emailovú adresu."
 
-#: src/compose.c:1882 src/quote_fmt.c:610
+#: src/compose.c:1894 src/quote_fmt.c:610
 #, c-format
 msgid "The body of the \"Forward\" template has an error at line %d."
 msgstr "V tele šablóny „Poslať ďalej” je chyba na riadku %d."
 
-#: src/compose.c:2056
+#: src/compose.c:2067
 msgid "Fw: multiple emails"
 msgstr "Fw: viacero správ"
 
-#: src/compose.c:2539
+#: src/compose.c:2569
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr "V tele šablóny „Presmerovať” je chyba na riadku %d."
 
-#: src/compose.c:2606 src/gtk/headers.h:14
+#: src/compose.c:2636 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "Kópia:"
 
-#: src/compose.c:2609 src/gtk/headers.h:15
+#: src/compose.c:2639 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "Slepá kópia:"
 
-#: src/compose.c:2612 src/gtk/headers.h:12
+#: src/compose.c:2642 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "Odpovedať komu:"
 
-#: src/compose.c:2615 src/compose.c:4948 src/compose.c:4950
+#: src/compose.c:2645 src/compose.c:4963 src/compose.c:4965
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "Diskusné skupiny:"
 
-#: src/compose.c:2618 src/gtk/headers.h:34
+#: src/compose.c:2648 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "Pokračovanie:"
 
-#: src/compose.c:2621 src/gtk/headers.h:17
+#: src/compose.c:2651 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "V odpovedi komu:"
 
-#: src/compose.c:2625 src/compose.c:4945 src/compose.c:4953
-#: src/gtk/headers.h:13 src/summary_search.c:433
+#: src/compose.c:2655 src/compose.c:4960 src/compose.c:4968
+#: src/gtk/headers.h:13 src/summary_search.c:481
 msgid "To:"
 msgstr "Komu:"
 
-#: src/compose.c:2834
+#: src/compose.c:2841
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr "Nemožno priložiť súbor (zlyhala konverzia kódovania)."
 
-#: src/compose.c:2840
+#: src/compose.c:2847
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -1954,73 +1884,73 @@ msgstr[2] ""
 "Nasledujúce súbory budú priložené:\n"
 "%s"
 
-#: src/compose.c:3115
+#: src/compose.c:3124
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "„Značka citácie” šablóny nie je platná."
 
-#: src/compose.c:3615
+#: src/compose.c:3630
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr "Nemožno zistiť veľkosť súboru „%s”."
 
-#: src/compose.c:3626
+#: src/compose.c:3641
 #, c-format
 msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
 "want to do that?"
 msgstr "Do tela správy vkladáte súbor %s. Ste si istý, že to chcete urobiť?"
 
-#: src/compose.c:3629
+#: src/compose.c:3644
 msgid "Are you sure?"
 msgstr "Ste si istý?"
 
-#: src/compose.c:3630 src/compose.c:10510 src/compose.c:11386
+#: src/compose.c:3645 src/compose.c:10650 src/compose.c:11526
 msgid "_Insert"
 msgstr "_Vložiť"
 
-#: src/compose.c:3754
+#: src/compose.c:3769
 #, c-format
 msgid "File %s is empty."
 msgstr "Súbor %s je prázdny."
 
-#: src/compose.c:3755
+#: src/compose.c:3770
 msgid "Empty file"
 msgstr "Prázdny súbor"
 
-#: src/compose.c:3756
+#: src/compose.c:3771
 msgid "_Attach anyway"
 msgstr "Pripojiť i _tak"
 
-#: src/compose.c:3765
+#: src/compose.c:3780
 #, c-format
 msgid "Can't read %s."
 msgstr "Nemožno čítať %s."
 
-#: src/compose.c:3792
+#: src/compose.c:3807
 #, c-format
 msgid "Message: %s"
 msgstr "Správa: %s"
 
-#: src/compose.c:4785 src/plugins/managesieve/sieve_editor.c:694
+#: src/compose.c:4800 src/plugins/managesieve/sieve_editor.c:694
 #: src/plugins/python/composewindowtype.c:498
 msgid " [Edited]"
 msgstr "[Upravené]"
 
-#: src/compose.c:4792 src/plugins/python/composewindowtype.c:501
+#: src/compose.c:4807 src/plugins/python/composewindowtype.c:501
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Písanie správy%s"
 
-#: src/compose.c:4795 src/plugins/python/composewindowtype.c:504
+#: src/compose.c:4810 src/plugins/python/composewindowtype.c:504
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[bez názvu] - Písanie správy%s"
 
-#: src/compose.c:4797 src/plugins/python/composewindowtype.c:492
+#: src/compose.c:4812 src/plugins/python/composewindowtype.c:492
 msgid "Compose message"
 msgstr "Napísať správu"
 
-#: src/compose.c:4824 src/messageview.c:889
+#: src/compose.c:4839 src/messageview.c:903
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -2028,51 +1958,57 @@ msgstr ""
 "Nie je zadaný účet na odosielanie správ.\n"
 "Pred odosielaním prosím zvoľte poštový účet."
 
-#: src/compose.c:5044 src/compose.c:5076 src/compose.c:5118
-#: src/prefs_account.c:3323 src/toolbar.c:406 src/toolbar.c:424
+#: src/compose.c:5060 src/compose.c:5097
+#, c-format
+msgid "The only recipient is the default '%s' address. Send anyway?"
+msgstr "Jediný príjemca je predvolená adresa „%s”. Odoslať i tak?"
+
+#: src/compose.c:5062 src/compose.c:5099 src/compose.c:5142 src/compose.c:5190
+#: src/prefs_account.c:3323 src/toolbar.c:484 src/toolbar.c:516
 msgid "Send"
 msgstr "Odoslať"
 
-#: src/compose.c:5045
-msgid "The only recipient is the default CC address. Send anyway?"
-msgstr "Jediný príjemca je prednastavená adresa Kópie. Odoslať i tak?"
-
-#: src/compose.c:5046 src/compose.c:5078 src/compose.c:5111 src/compose.c:5631
-#: src/folderview.c:2462 src/messageview.c:855 src/messageview.c:872
-#: src/plugins/attachwarner/attachwarner.c:210 src/toolbar.c:2629
+#: src/compose.c:5064 src/compose.c:5101 src/compose.c:5135 src/compose.c:5183
+#: src/compose.c:5718 src/folderview.c:2543 src/messageview.c:856
+#: src/messageview.c:884 src/plugins/attachwarner/attachwarner.c:210
+#: src/toolbar.c:2933
 msgid "_Send"
 msgstr "_Odoslať"
 
-#: src/compose.c:5077
-msgid "The only recipient is the default BCC address. Send anyway?"
-msgstr "Jediný príjemca je prednastavená adresa Skrytej kópie. Odoslať i tak?"
-
-#: src/compose.c:5094
+#: src/compose.c:5118
 msgid "Recipient is not specified."
 msgstr "Nie je zadaný príjemca."
 
-#: src/compose.c:5113 src/plugins/attachwarner/attachwarner.c:212
+#: src/compose.c:5137 src/compose.c:5185
+#: src/plugins/attachwarner/attachwarner.c:212
 msgid "_Queue"
 msgstr "Do _fronty"
 
-#: src/compose.c:5114
+#: src/compose.c:5138
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "Prázdny predmet. %s"
 
-#: src/compose.c:5115 src/plugins/attachwarner/attachwarner.c:222
+#: src/compose.c:5139 src/compose.c:5187
+#: src/plugins/attachwarner/attachwarner.c:222
 msgid "Send it anyway?"
 msgstr "Poslať i tak?"
 
-#: src/compose.c:5116 src/plugins/attachwarner/attachwarner.c:222
+#: src/compose.c:5140 src/compose.c:5188
+#: src/plugins/attachwarner/attachwarner.c:222
 msgid "Queue it anyway?"
 msgstr "Zaradiť do fronty i tak?"
 
-#: src/compose.c:5118 src/toolbar.c:425
+#: src/compose.c:5142 src/compose.c:5190 src/toolbar.c:517
 msgid "Send later"
 msgstr "Odoslať ho neskôr"
 
-#: src/compose.c:5171 src/compose.c:9974
+#: src/compose.c:5186
+#, c-format
+msgid "Sending to %d recipients. %s"
+msgstr "Odosielanie na %d adries. %s"
+
+#: src/compose.c:5243 src/compose.c:10122
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2082,7 +2018,7 @@ msgstr ""
 "\n"
 "Zlyhala konverzia kódovania."
 
-#: src/compose.c:5174 src/compose.c:9977
+#: src/compose.c:5246 src/compose.c:10125
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2092,7 +2028,7 @@ msgstr ""
 "\n"
 "Nie je dostupný šifrovací kľúč príjemcu."
 
-#: src/compose.c:5180 src/compose.c:9971
+#: src/compose.c:5252 src/compose.c:10119
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2103,7 +2039,7 @@ msgstr ""
 "\n"
 "Podpísanie zlyhalo: %s"
 
-#: src/compose.c:5183
+#: src/compose.c:5255
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2114,11 +2050,11 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:5185
+#: src/compose.c:5257
 msgid "Could not queue message for sending."
 msgstr "Nemožno zaradiť správu do fronty na odoslanie."
 
-#: src/compose.c:5200 src/compose.c:5260
+#: src/compose.c:5272 src/compose.c:5332
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -2126,7 +2062,7 @@ msgstr ""
 "Správa bola zaradená do fronty, ale nebolo ju možné odoslať.\n"
 "Použite „Odoslať správy vo fronte” z hlavného okna na opakovanie."
 
-#: src/compose.c:5256
+#: src/compose.c:5328
 #, c-format
 msgid ""
 "%s\n"
@@ -2135,7 +2071,7 @@ msgstr ""
 "%s\n"
 "Použite „Odoslať správy vo fronte” z hlavného okna na opakovanie."
 
-#: src/compose.c:5627
+#: src/compose.c:5714
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2146,7 +2082,7 @@ msgstr ""
 "kódovania na %s.\n"
 "Odoslať správu v kódovaní %s?"
 
-#: src/compose.c:5685
+#: src/compose.c:5776
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2159,99 +2095,103 @@ msgstr ""
 "\n"
 "Odoslať aj tak?"
 
-#: src/compose.c:5796
+#: src/compose.c:5887
 #, c-format
 msgid "Couldn't encrypt the email: %s"
 msgstr "Nemožno zašifrovať správu: %s"
 
-#: src/compose.c:5917
+#: src/compose.c:6008
 msgid "Encryption warning"
 msgstr "Upozornenie šifrovania"
 
-#: src/compose.c:5918
+#: src/compose.c:6009
 msgid "C_ontinue"
 msgstr "_Pokračovať"
 
-#: src/compose.c:5967
+#: src/compose.c:6058
 msgid "No account for sending mails available!"
 msgstr "Nie je dostupné žiadny účet na odosielanie správ!"
 
-#: src/compose.c:5976
+#: src/compose.c:6067
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "Zvolený účet nie je NNTP: Posielanie nie je možné."
 
-#: src/compose.c:6211
+#: src/compose.c:6300
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "Príloha %s už neexistuje. Ignorovať?"
 
-#: src/compose.c:6212 src/mainwindow.c:655 src/toolbar.c:231 src/toolbar.c:2167
+#: src/compose.c:6301 src/mainwindow.c:656 src/toolbar.c:274 src/toolbar.c:2466
 msgid "Cancel sending"
 msgstr "Zrušiť posielanie"
 
-#: src/compose.c:6212
+#: src/compose.c:6301
 msgid "Ignore attachment"
 msgstr "Ignorovať prílohu"
 
-#: src/compose.c:6252
+#: src/compose.c:6341
 #, c-format
 msgid "Original %s part"
 msgstr "Pôvodná časť %s"
 
-#: src/compose.c:6813
+#: src/compose.c:6941
 msgid "Add to address _book"
 msgstr "Pridať do _adresára"
 
-#: src/compose.c:6974
+#: src/compose.c:7102
 msgid "Delete entry contents"
 msgstr "Zmazať obsah položiek"
 
-#: src/compose.c:6978 src/plugins/vcalendar/vcal_meeting_gtk.c:289
+#: src/compose.c:7106 src/plugins/vcalendar/vcal_meeting_gtk.c:289
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Na automatické doplnenie z adresára použite <TAB>"
 
-#: src/compose.c:7193
+#: src/compose.c:7321
 msgid "Mime type"
 msgstr "Typ MIME"
 
-#: src/compose.c:7199 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:393
-#: src/prefs_matcher.c:630 src/prefs_summaries.c:434
+#: src/compose.c:7327 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:393
+#: src/prefs_matcher.c:630 src/prefs_summaries.c:442
 #: src/prefs_summary_column.c:85 src/summaryview.c:446
 msgid "Size"
 msgstr "Veľkosť"
 
-#: src/compose.c:7262
+#: src/compose.c:7390
 msgid "Save Message to "
 msgstr "Uložiť správu do "
 
-#: src/compose.c:7299 src/editjpilot.c:276 src/editldap.c:519
+#: src/compose.c:7427 src/editjpilot.c:276 src/editldap.c:519
 #: src/editvcard.c:192 src/export.c:164 src/import.c:163 src/importmutt.c:238
-#: src/importpine.c:237 src/plugins/archive/archiver_gtk.c:1025
+#: src/importpine.c:237 src/plugins/archive/archiver_gtk.c:1075
 #: src/plugins/bogofilter/bogofilter_gtk.c:229
 #: src/plugins/bogofilter/bogofilter_gtk.c:252
 #: src/plugins/bsfilter/bsfilter_gtk.c:181
-#: src/plugins/clamd/clamav_plugin_gtk.c:299
-#: src/plugins/spamassassin/spamassassin_gtk.c:417
+#: src/plugins/clamd/clamav_plugin_gtk.c:300
+#: src/plugins/spamassassin/spamassassin_gtk.c:418
 msgid "_Browse"
 msgstr "_Prechádzať"
 
-#: src/compose.c:7772
+#: src/compose.c:7449
+msgid "Select folder to save message to"
+msgstr "Vyberte zložku na uloženie správy"
+
+#: src/compose.c:7906
 msgid "Hea_der"
 msgstr "H_lavička"
 
-#: src/compose.c:7777
+#: src/compose.c:7911
 msgid "_Attachments"
 msgstr "_Prílohy"
 
-#: src/compose.c:7791
+#: src/compose.c:7925
 msgid "Othe_rs"
 msgstr "_Ostatné"
 
-#: src/compose.c:7806
+#: src/compose.c:7940
 msgid "S_ubject:"
 msgstr "Pre_dmet:"
 
-#: src/compose.c:8030
+#: src/compose.c:8164
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2260,19 +2200,19 @@ msgstr ""
 "Nemožno spustiť kontrolu preklepov.\n"
 "%s"
 
-#: src/compose.c:8169
+#: src/compose.c:8311
 msgid "_From:"
 msgstr "O_d:"
 
-#: src/compose.c:8186
+#: src/compose.c:8328
 msgid "Account to use for this email"
 msgstr "Účet, použitý pre tento email"
 
-#: src/compose.c:8188
+#: src/compose.c:8330
 msgid "Sender address to be used"
 msgstr "Adresa odosielateľa"
 
-#: src/compose.c:8354
+#: src/compose.c:8496
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2281,68 +2221,50 @@ msgstr ""
 "Nemožno načítať systém súkromia „%s”. Nebude možné podpísať ani zašifrovať "
 "túto správu."
 
-#: src/compose.c:8455 src/plugins/archive/archiver_gtk.c:1077
+#: src/compose.c:8597 src/plugins/archive/archiver_gtk.c:1174
 msgid "_None"
 msgstr "Žiad_na"
 
-#: src/compose.c:8556 src/prefs_template.c:760
+#: src/compose.c:8698 src/prefs_template.c:750
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "Telo šablóny má chybu v riadku %d."
 
-#: src/compose.c:8672
-msgid "Template From format error."
-msgstr "Chyba v tvare hlavičky odosielateľa v šablóne."
-
-#: src/compose.c:8690
-msgid "Template To format error."
-msgstr "Chyba v tvare hlavičky príjemcu v šablóne."
-
-#: src/compose.c:8708
-msgid "Template Cc format error."
-msgstr "Chyba v tvare hlavičky kópie v šablóne."
-
-#: src/compose.c:8726
-msgid "Template Bcc format error."
-msgstr "Chyba v tvare hlavičky slepej kópie v šablóne."
-
-#: src/compose.c:8744
-msgid "Template Reply-To format error."
-msgstr "Chyba vo formáte šablóny Odpovedať."
-
-#: src/compose.c:8763
-msgid "Template subject format error."
-msgstr "Chyba vo formáte predmetu šablóny."
+#: src/compose.c:8793
+#, c-format
+msgctxt "'%s' stands for a header name"
+msgid "Template '%s' format error."
+msgstr "Chyba formátu šablóny „%s”."
 
-#: src/compose.c:9032
+#: src/compose.c:9194
 msgid "Invalid MIME type."
 msgstr "Neplatný typ MIME."
 
-#: src/compose.c:9047
+#: src/compose.c:9209
 msgid "File doesn't exist or is empty."
 msgstr "Súbor neexistuje alebo je prázdny."
 
-#: src/compose.c:9121
+#: src/compose.c:9283
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: src/compose.c:9138
+#: src/compose.c:9300
 msgid "MIME type"
 msgstr "Typ MIME"
 
-#: src/compose.c:9179
+#: src/compose.c:9341
 msgid "Encoding"
 msgstr "Kódovanie"
 
-#: src/compose.c:9199
+#: src/compose.c:9361
 msgid "Path"
 msgstr "Cesta"
 
-#: src/compose.c:9200
+#: src/compose.c:9362
 msgid "File name"
 msgstr "Názov súboru"
 
-#: src/compose.c:9451
+#: src/compose.c:9621
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2353,15 +2275,15 @@ msgstr ""
 "Vynútiť ukončenie procesu?\n"
 "ID skupiny procesu: %d"
 
-#: src/compose.c:9940 src/messageview.c:1083
+#: src/compose.c:10088 src/messageview.c:1105
 msgid "Claws Mail needs network access in order to send this email."
 msgstr "Claws Mail potrebuje na odoslanie tejto správy pripojenie k sieti."
 
-#: src/compose.c:9966
+#: src/compose.c:10114
 msgid "Could not queue message."
 msgstr "Nemožno zaradiť správu do fronty na odoslanie."
 
-#: src/compose.c:9968
+#: src/compose.c:10116
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2372,15 +2294,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/compose.c:10146
+#: src/compose.c:10294
 msgid "Could not save draft."
 msgstr "Koncept nemožno uložiť."
 
-#: src/compose.c:10150
+#: src/compose.c:10298
 msgid "Could not save draft"
 msgstr "Koncept nemožno uložiť"
 
-#: src/compose.c:10151
+#: src/compose.c:10299
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2388,24 +2310,24 @@ msgstr ""
 "Koncept nemožno uložiť.\n"
 "Chcete pokračovať v písaní, alebo zahodiť rozpísanú správu?"
 
-#: src/compose.c:10153
+#: src/compose.c:10301
 msgid "_Cancel exit"
 msgstr "+_Zrušiť skončenie"
 
-#: src/compose.c:10153
+#: src/compose.c:10301
 msgid "_Discard email"
 msgstr "_Zahodiť správu"
 
-#: src/compose.c:10313 src/compose.c:10327
+#: src/compose.c:10461 src/compose.c:10475
 msgid "Select file"
 msgstr "Zvoľte súbor"
 
-#: src/compose.c:10341
+#: src/compose.c:10489
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Súbor „%s” nemožno čítať."
 
-#: src/compose.c:10343
+#: src/compose.c:10491
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2414,51 +2336,51 @@ msgstr ""
 "Súbor „%s” obsahuje neplatné znaky pre\n"
 "súčasné kódovanie, vloženie môže byť nepresné."
 
-#: src/compose.c:10430
+#: src/compose.c:10570
 msgid "Discard message"
 msgstr "Zahodiť správu"
 
-#: src/compose.c:10431
+#: src/compose.c:10571
 msgid "This message has been modified. Discard it?"
 msgstr "Táto správa bola zmenená. Zahodiť zmeny?"
 
-#: src/compose.c:10432 src/plugins/managesieve/sieve_editor.c:433
+#: src/compose.c:10572 src/plugins/managesieve/sieve_editor.c:433
 msgid "_Discard"
 msgstr "_Zahodiť"
 
-#: src/compose.c:10432 src/compose.c:10436
+#: src/compose.c:10572 src/compose.c:10576
 msgid "_Save to Drafts"
 msgstr "Uložiť medzi _koncepty"
 
-#: src/compose.c:10434 src/plugins/managesieve/sieve_editor.c:431
+#: src/compose.c:10574 src/plugins/managesieve/sieve_editor.c:431
 msgid "Save changes"
 msgstr "Uložiť zmeny"
 
-#: src/compose.c:10435
+#: src/compose.c:10575
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Táto správa bola zmenená. Uložiť posledné zmeny?"
 
-#: src/compose.c:10436
+#: src/compose.c:10576
 msgid "_Don't save"
 msgstr "_Neukladať"
 
-#: src/compose.c:10507
+#: src/compose.c:10647
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Chcete použiť šablónu „%s”?"
 
-#: src/compose.c:10509
+#: src/compose.c:10649
 msgid "Apply template"
 msgstr "Použiť šablónu"
 
-#: src/compose.c:10510 src/prefs_actions.c:329 src/prefs_filtering_action.c:610
-#: src/prefs_filtering.c:477 src/prefs_matcher.c:773 src/prefs_template.c:311
-#: src/prefs_toolbar.c:1050
+#: src/compose.c:10650 src/prefs_actions.c:329 src/prefs_filtering_action.c:610
+#: src/prefs_filtering.c:477 src/prefs_matcher.c:774 src/prefs_template.c:311
+#: src/prefs_toolbar.c:1063
 msgid "_Replace"
 msgstr "_Nahradiť"
 
-#: src/compose.c:11379
-#, fuzzy, c-format
+#: src/compose.c:11519
+#, c-format
 msgid ""
 "Do you want to insert the contents of the file into the message body, or "
 "attach it to the email?"
@@ -2469,26 +2391,26 @@ msgstr[0] ""
 "Chcete vložiť obsah súboru do tela správy, alebo ho chcete pripojiť k správe "
 "ako prílohu?"
 msgstr[1] ""
-"Chcete vložiť obsah súboru do tela správy, alebo ho chcete pripojiť k správe "
-"ako prílohu?"
+"Chcete vložiť obsah %d súborov do tela správy, alebo ich chcete pripojiť k "
+"správe ako prílohy?"
 msgstr[2] ""
-"Chcete vložiť obsah súboru do tela správy, alebo ho chcete pripojiť k správe "
-"ako prílohu?"
+"Chcete vložiť obsah %d súborov do tela správy, alebo ich chcete pripojiť k "
+"správe ako prílohy?"
 
-#: src/compose.c:11385
+#: src/compose.c:11525
 msgid "Insert or attach?"
 msgstr "Vložiť, alebo pripojiť ako prílohu?"
 
-#: src/compose.c:11386
+#: src/compose.c:11526
 msgid "_Attach"
 msgstr "_Pripojiť"
 
-#: src/compose.c:11604
+#: src/compose.c:11744
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Chyba v tvare citácie na riadku %d."
 
-#: src/compose.c:11899
+#: src/compose.c:12041
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2519,7 +2441,7 @@ msgstr ""
 msgid "Debug log"
 msgstr "Ladiaci záznam"
 
-#: src/crash.c:251 src/toolbar.c:422
+#: src/crash.c:251 src/toolbar.c:534
 msgid "Close"
 msgstr "Zavrieť"
 
@@ -2599,7 +2521,7 @@ msgstr "Musíte zadať emailovú adresu."
 msgid "A Name and Value must be supplied."
 msgstr "Musíte zadať názov a hodnotu."
 
-#: src/editaddress.c:675 src/prefs_folder_item.c:1679
+#: src/editaddress.c:675 src/prefs_folder_item.c:1694
 msgid "Discard"
 msgstr "Zahodiť"
 
@@ -2756,12 +2678,12 @@ msgstr "Upraviť zložku"
 msgid "Input the new name of folder:"
 msgstr "Zadajte nový názov zložky:"
 
-#: src/editgroup.c:556 src/foldersel.c:586 src/imap_gtk.c:193 src/mh_gtk.c:144
+#: src/editgroup.c:556 src/foldersel.c:594 src/imap_gtk.c:193 src/mh_gtk.c:144
 #: src/plugins/mailmbox/plugin_gtk.c:244 src/plugins/rssyl/rssyl_cb_menu.c:91
 msgid "New folder"
 msgstr "Nová zložka"
 
-#: src/editgroup.c:557 src/foldersel.c:587 src/mh_gtk.c:145
+#: src/editgroup.c:557 src/foldersel.c:595 src/mh_gtk.c:145
 #: src/plugins/mailmbox/plugin_gtk.c:245 src/plugins/rssyl/rssyl_cb_menu.c:92
 msgid "Input the name of new folder:"
 msgstr "Zadajte názov novej zložky:"
@@ -2795,7 +2717,7 @@ msgid "Hostname"
 msgstr "Meno počítača"
 
 #: src/editldap_basedn.c:166 src/editldap.c:458
-#: src/plugins/clamd/clamav_plugin_gtk.c:389 src/ssl_manager.c:108
+#: src/plugins/clamd/clamav_plugin_gtk.c:390 src/ssl_manager.c:108
 msgid "Port"
 msgstr "Port"
 
@@ -2840,48 +2762,44 @@ msgid "A name that you wish to call the server."
 msgstr "Názov, ktorý chcete priradiť serveru."
 
 #: src/editldap.c:450
-#, fuzzy
 msgid ""
 "This is the hostname of the server. For example, \"ldap.example.org\" may be "
 "appropriate for the \"example.org\" organization. An IP address may also be "
 "used. You may specify \"localhost\" if running an LDAP server on the same "
 "computer as Claws Mail."
 msgstr ""
-"Toto je názov serveru. Napríklad „ldap.mojadomena.sk” môže byť vhodné pre "
+"Toto je meno servera. Napríklad „ldap.mojadomena.sk” môže byť vhodné pre "
 "organizáciu „mojadomena.sk”. Môžete použiť aj adresu IP. Môžete zadať "
 "„localhost”, ak požadovaný server LDAP beží na rovnakom počítači ako Claws "
 "Mail."
 
 #: src/editldap.c:470
-#, fuzzy
 msgid "STARTTLS"
-msgstr "chyba pri STARTTLS"
+msgstr "STARTTLS"
 
 #: src/editldap.c:471 src/prefs_account.c:3396
 msgid "SSL/TLS"
-msgstr ""
+msgstr "SSL/TLS"
 
 #: src/editldap.c:475
-#, fuzzy
 msgid ""
 "Enable secure connection to the LDAP server via STARTTLS. Connection starts "
 "unencrypted and is secured by STARTTLS command. If connection fails, be sure "
 "to check the correct configuration in ldap.conf (TLS_CACERTDIR and "
 "TLS_REQCERT fields)."
 msgstr ""
-"Zapnúť bezpečné pripojenie k LDAP serveru pomocou TLS. Ak spojenie zlyhá, "
-"skontrolujte správne nastavenie v ldap.conf (polia TLS_CACERTDIR a "
-"TLS_REQCERT)."
+"Zapnúť bezpečné spojenie so serverom LDAP pomocou STARTTLS. Spojenie začína "
+"nešifrované a je zabezpečené príkazom STARTTLS. Ak spojenie zlyhá, overte "
+"správne nastavenie v ldap.conf (polia TLS_CACERTDIR a TLS_REQCERT)."
 
 #: src/editldap.c:480
-#, fuzzy
 msgid ""
 "Enable secure connection to the LDAP server via SSL/TLS. If connection "
 "fails, be sure to check the correct configuration in ldap.conf "
 "(TLS_CACERTDIR and TLS_REQCERT fields)."
 msgstr ""
-"Zapnúť bezpečné pripojenie k LDAP serveru pomocou TLS. Ak spojenie zlyhá, "
-"skontrolujte správne nastavenie v ldap.conf (polia TLS_CACERTDIR a "
+"Zapnúť bezpečné pripojenie k LDAP serveru pomocou SSL/TLS. Ak spojenie "
+"zlyhá, skontrolujte správne nastavenie v ldap.conf (polia TLS_CACERTDIR a "
 "TLS_REQCERT)."
 
 #: src/editldap.c:492
@@ -3041,7 +2959,7 @@ msgstr "Najväčší počet vrátených výsledkov vyhľadávania."
 msgid "Basic"
 msgstr "Základné"
 
-#: src/editldap.c:782 src/gtk/quicksearch.c:680
+#: src/editldap.c:782 src/gtk/quicksearch.c:708
 msgid "Extended"
 msgstr "Rozšírené"
 
@@ -3049,8 +2967,8 @@ msgstr "Rozšírené"
 msgid "Add New LDAP Server"
 msgstr "Pridať nový LDAP server"
 
-#: src/edittags.c:187 src/prefs_filtering_action.c:1446
-#: src/prefs_summaries.c:441
+#: src/edittags.c:187 src/prefs_filtering_action.c:1447
+#: src/prefs_summaries.c:449
 msgid "Tag"
 msgstr "Značka"
 
@@ -3171,10 +3089,10 @@ msgid "Stylesheet"
 msgstr "Štýlopis"
 
 #: src/exphtmldlg.c:453 src/gtk/colorlabel.c:387 src/gtk/gtkaspell.c:1571
-#: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:125 src/mainwindow.c:1188
-#: src/plugins/archive/archiver_prefs.c:235
+#: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:125 src/mainwindow.c:1190
+#: src/plugins/archive/archiver_prefs.c:313
 #: src/plugins/libravatar/libravatar_prefs.c:304 src/prefs_account.c:941
-#: src/prefs_toolbar.c:780 src/prefs_toolbar.c:1466 src/summaryview.c:5977
+#: src/prefs_toolbar.c:790 src/prefs_toolbar.c:1479 src/summaryview.c:6019
 msgid "None"
 msgstr "Žiadna"
 
@@ -3411,7 +3329,7 @@ msgstr "Exportovať adresár do súboru LDIF"
 msgid "Distinguished Name"
 msgstr "Distguished Name"
 
-#: src/export.c:113 src/summaryview.c:8124
+#: src/export.c:113 src/summaryview.c:8177
 msgid "Export to mbox file"
 msgstr "Exportovať do súboru mbox"
 
@@ -3443,12 +3361,16 @@ msgstr "Nemožno nájsť zadanú zdrojovú zložku."
 msgid "Select exporting file"
 msgstr "Zvoľte súbor na exportovanie"
 
+#: src/export.c:268
+msgid "Select folder to export"
+msgstr "Zvoľte zložku na export"
+
 #: src/exporthtml.c:767
 msgid "Full Name"
 msgstr "Celé meno"
 
 #: src/exporthtml.c:771 src/importldif.c:1021
-#: src/plugins/archive/archiver_gtk.c:735
+#: src/plugins/archive/archiver_gtk.c:769
 msgid "Attributes"
 msgstr "Atribúty"
 
@@ -3662,23 +3584,23 @@ msgstr ""
 "filtrovanie správy (%s%s%s)\n"
 "%ssúbor správy: %s\n"
 
-#: src/folder.c:1570 src/foldersel.c:404 src/prefs_folder_item.c:315
+#: src/folder.c:1570 src/foldersel.c:412 src/prefs_folder_item.c:315
 msgid "Inbox"
 msgstr "Prijaté"
 
-#: src/folder.c:1574 src/foldersel.c:408
+#: src/folder.c:1574 src/foldersel.c:416
 msgid "Sent"
 msgstr "Odoslané"
 
-#: src/folder.c:1578 src/foldersel.c:412 src/prefs_folder_item.c:318
+#: src/folder.c:1578 src/foldersel.c:420 src/prefs_folder_item.c:318
 msgid "Queue"
 msgstr "Front"
 
-#: src/folder.c:1582 src/foldersel.c:416 src/prefs_folder_item.c:319
+#: src/folder.c:1582 src/foldersel.c:424 src/prefs_folder_item.c:319
 msgid "Trash"
 msgstr "Kôš"
 
-#: src/folder.c:1586 src/foldersel.c:420 src/prefs_folder_item.c:317
+#: src/folder.c:1586 src/foldersel.c:428 src/prefs_folder_item.c:317
 msgid "Drafts"
 msgstr "Koncepty"
 
@@ -3697,116 +3619,129 @@ msgstr "Kopírujem %s do %s…\n"
 msgid "Moving %s to %s...\n"
 msgstr "Presúvam %s do %s…\n"
 
-#: src/folder.c:3568
+#: src/folder.c:3572
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Aktualizujem vyrovnávaciu pamäť zložky %s…"
 
-#: src/folder.c:4430
+#: src/folder.c:4434
 msgid "Processing messages..."
 msgstr "Spracúvam správy…"
 
-#: src/folder.c:4565
+#: src/folder.c:4569
 #, c-format
 msgid "Synchronising %s for offline use...\n"
 msgstr "Synchronizujem %s na použitie pri odpojení…\n"
 
-#: src/folder.c:4822
+#: src/folder.c:4828
 msgid "A folder name cannot begin or end with a dot."
 msgstr "Názov zložky nemôže začínať alebo končiť bodkou."
 
-#: src/folder.c:4826
+#: src/folder.c:4832
 msgid "A folder name can not end with a space."
 msgstr "Názov zložky nemôže končiť bodkou."
 
-#: src/foldersel.c:248
+#: src/foldersel.c:250
 msgid "Select folder"
 msgstr "Zvoľte zložku"
 
-#: src/foldersel.c:588 src/imap_gtk.c:197 src/mh_gtk.c:146
+#: src/foldersel.c:596 src/imap_gtk.c:197 src/mh_gtk.c:146
 #: src/plugins/mailmbox/plugin_gtk.c:246 src/plugins/rssyl/rssyl_cb_menu.c:93
 msgid "NewFolder"
 msgstr "Nová zložka"
 
-#: src/foldersel.c:596 src/imap_gtk.c:208 src/imap_gtk.c:214 src/imap_gtk.c:270
+#: src/foldersel.c:604 src/imap_gtk.c:208 src/imap_gtk.c:214 src/imap_gtk.c:270
 #: src/imap_gtk.c:275 src/mh_gtk.c:154 src/mh_gtk.c:262 src/news_gtk.c:299
-#: src/plugins/mailmbox/plugin_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:422
+#: src/plugins/mailmbox/plugin_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:432
 #: src/plugins/rssyl/rssyl_cb_menu.c:204
-#: src/plugins/vcalendar/vcal_folder.c:2052
+#: src/plugins/vcalendar/vcal_folder.c:2063
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "Názov zložky nemôže obsahovať „%c”."
 
-#: src/foldersel.c:611 src/imap_gtk.c:224 src/imap_gtk.c:282 src/mh_gtk.c:167
+#: src/foldersel.c:619 src/imap_gtk.c:224 src/imap_gtk.c:282 src/mh_gtk.c:167
 #: src/mh_gtk.c:272 src/news_gtk.c:306 src/plugins/mailmbox/plugin_gtk.c:269
-#: src/plugins/mailmbox/plugin_gtk.c:434 src/plugins/rssyl/rssyl_cb_menu.c:217
-#: src/plugins/vcalendar/vcal_folder.c:2059
+#: src/plugins/mailmbox/plugin_gtk.c:444 src/plugins/rssyl/rssyl_cb_menu.c:217
+#: src/plugins/vcalendar/vcal_folder.c:2070
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "Zložka „%s” už existuje."
 
-#: src/foldersel.c:618 src/imap_gtk.c:230 src/mh_gtk.c:173
+#: src/foldersel.c:626 src/imap_gtk.c:230 src/mh_gtk.c:173
 #: src/plugins/mailmbox/plugin_gtk.c:276 src/plugins/rssyl/opml_import.c:91
 #: src/plugins/rssyl/rssyl_cb_menu.c:124
 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr "Nemožno vytvoriť zložku „%s”."
 
-#: src/folderview.c:242
+#: src/folderview.c:247
 msgid "Mark all re_ad"
 msgstr "Označiť _všetky ako prečítané"
 
-#: src/folderview.c:243
+#: src/folderview.c:248
+msgid "Mark all u_nread"
+msgstr "Označiť všetky ako _neprečítané"
+
+#: src/folderview.c:249
 msgid "Mark all read recursi_vely"
-msgstr "Označiť _všetky ako prečítané rekurzívne"
+msgstr "Označiť všetky ako prečítané _rekurzívne"
+
+#: src/folderview.c:250
+msgid "Mark all unread recursi_vely"
+msgstr "Označiť všetky ako neprečítané _rekurzívne"
 
-#: src/folderview.c:245
+#: src/folderview.c:252
 msgid "R_un processing rules"
 msgstr "Sp_ustiť pravidlá spracovania"
 
-#: src/folderview.c:246 src/mainwindow.c:551
+#: src/folderview.c:253 src/mainwindow.c:553
 msgid "_Search folder..."
 msgstr "Pre_hľadať zložku…"
 
-#: src/folderview.c:248
+#: src/folderview.c:255
 msgid "Process_ing..."
 msgstr "Spracovan_ie…"
 
-#: src/folderview.c:249
+#: src/folderview.c:256
 msgid "Empty _trash..."
 msgstr "V_yprázdniť kôš…"
 
-#: src/folderview.c:250
+#: src/folderview.c:257
 msgid "Send _queue..."
 msgstr "Odoslať _front…"
 
-#: src/folderview.c:390 src/folderview.c:437
+#: src/folderview.c:397 src/folderview.c:444
 #: src/plugins/notification/notification_lcdproc.c:141
-#: src/prefs_folder_column.c:79 src/prefs_matcher.c:393 src/summaryview.c:6251
+#: src/prefs_folder_column.c:79 src/prefs_matcher.c:393 src/summaryview.c:6293
 msgid "New"
 msgstr "Nový"
 
-#: src/folderview.c:391 src/folderview.c:438
+#: src/folderview.c:398 src/folderview.c:445
 #: src/plugins/notification/notification_lcdproc.c:145
-#: src/prefs_folder_column.c:80 src/prefs_matcher.c:392 src/summaryview.c:6253
+#: src/prefs_folder_column.c:80 src/prefs_matcher.c:392 src/summaryview.c:6295
+#: src/toolbar.c:509
 msgid "Unread"
 msgstr "Neprečítané"
 
-#: src/folderview.c:392 src/plugins/notification/notification_lcdproc.c:149
+#: src/folderview.c:399 src/plugins/notification/notification_lcdproc.c:149
 #: src/prefs_folder_column.c:81
 msgid "Total"
 msgstr "Celkom"
 
 #. TRANSLATORS: This in Number sign in American style
-#: src/folderview.c:440 src/summaryview.c:447
+#: src/folderview.c:447 src/summaryview.c:447
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:775
+#: src/folderview.c:782
 msgid "Setting folder info..."
 msgstr "Nastavujem informácie zložky…"
 
-#: src/folderview.c:847
+#: src/folderview.c:867 src/summaryview.c:4140
+msgid "Mark all as read"
+msgstr "Označiť všetky ako prečítané"
+
+#: src/folderview.c:868
 msgid ""
 "Do you really want to mark all mails in this folder and its sub-folders as "
 "read?"
@@ -3814,99 +3749,111 @@ msgstr ""
 "Naozaj chcete označiť všetky správy tejto zložky a jej podzložiek ako "
 "prečítané?"
 
-#: src/folderview.c:849 src/summaryview.c:4104
+#: src/folderview.c:870 src/summaryview.c:4141
 msgid "Do you really want to mark all mails in this folder as read?"
 msgstr "Naozaj chcete označiť všetky správy tejto zložky ako prečítané?"
 
-#: src/folderview.c:853 src/summaryview.c:4103
-msgid "Mark all as read"
-msgstr "Označiť všetky ako prečítané"
+#: src/folderview.c:873 src/summaryview.c:4179
+msgid "Mark all as unread"
+msgstr "Označiť všetky ako neprečítané"
 
-#: src/folderview.c:1032 src/imap.c:4636
+#: src/folderview.c:874
+msgid ""
+"Do you really want to mark all mails in this folder and its sub-folders as "
+"unread?"
+msgstr ""
+"Naozaj chcete označiť všetky správy tejto zložky a jej podzložiek ako "
+"neprečítané?"
+
+#: src/folderview.c:876 src/summaryview.c:4180
+msgid "Do you really want to mark all mails in this folder as unread?"
+msgstr "Naozaj chcete označiť všetky správy tejto zložky ako neprečítané?"
+
+#: src/folderview.c:1066 src/imap.c:4605
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "Prehľadávanie zložky %s/%s…"
 
-#: src/folderview.c:1035 src/imap.c:4640 src/mainwindow.c:5197 src/setup.c:96
+#: src/folderview.c:1069 src/imap.c:4609 src/mainwindow.c:5249 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Prehľadávanie zložky %s…"
 
-#: src/folderview.c:1066
+#: src/folderview.c:1100
 msgid "Rebuild folder tree"
 msgstr "Obnoviť strom zložiek"
 
-#: src/folderview.c:1067
+#: src/folderview.c:1101
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr ""
 "Obnovenie stromu zložiek spôsobí vymazanie lokálnych vyrovnávacích pamätí. "
 "Chcete pokračovať?"
 
-#: src/folderview.c:1077
+#: src/folderview.c:1111
 msgid "Rebuilding folder tree..."
 msgstr "Obnovujem strom zložiek…"
 
-#: src/folderview.c:1079
+#: src/folderview.c:1113
 msgid "Scanning folder tree..."
 msgstr "Skenujem strom zložiek…"
 
-#: src/folderview.c:1170
+#: src/folderview.c:1204
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "Nemožno skenovať obsah zložky %s\n"
 
-#: src/folderview.c:1224
+#: src/folderview.c:1258
 msgid "Checking for new messages in all folders..."
 msgstr "Kontrolujem nové správy vo všetkých zložkách…"
 
-#: src/folderview.c:2148
+#: src/folderview.c:2229
 #, c-format
 msgid "Closing folder %s..."
 msgstr "Zatváram zložku %s…"
 
-#: src/folderview.c:2243
+#: src/folderview.c:2324
 #, c-format
 msgid "Opening folder %s..."
 msgstr "Otváram zložku %s…"
 
-#: src/folderview.c:2261
+#: src/folderview.c:2342
 msgid "Folder could not be opened."
 msgstr "Zložku nemožno otvoriť."
 
-#: src/folderview.c:2403 src/mainwindow.c:2903 src/mainwindow.c:2907
+#: src/folderview.c:2484 src/mainwindow.c:2906 src/mainwindow.c:2910
 msgid "Empty trash"
 msgstr "Vyprázdniť kôš"
 
-#: src/folderview.c:2404
+#: src/folderview.c:2485
 msgid "Delete all messages in trash?"
 msgstr "Vymazať všetky správy z koša?"
 
-#: src/folderview.c:2405
+#: src/folderview.c:2486
 msgid "_Empty trash"
 msgstr "_Vyprázdniť kôš"
 
-#: src/folderview.c:2448 src/inc.c:1533 src/toolbar.c:2607
+#: src/folderview.c:2529 src/inc.c:1533 src/toolbar.c:2911
 msgid "Offline warning"
 msgstr "Varovanie odpojenia"
 
-#: src/folderview.c:2449 src/toolbar.c:2608
+#: src/folderview.c:2530 src/toolbar.c:2912
 msgid "You're working offline. Override?"
 msgstr "Pracujete odpojený. Pripojiť?"
 
-#: src/folderview.c:2460 src/toolbar.c:2627
+#: src/folderview.c:2541 src/toolbar.c:2931
 msgid "Send queued messages"
 msgstr "Odoslať správy vo fronte"
 
-#: src/folderview.c:2461 src/toolbar.c:2628
+#: src/folderview.c:2542 src/toolbar.c:2932
 msgid "Send all queued messages?"
 msgstr "Odoslať všetky správy vo fronte?"
 
-#: src/folderview.c:2470 src/toolbar.c:2647
+#: src/folderview.c:2551 src/toolbar.c:2951
 msgid "Some errors occurred while sending queued messages."
 msgstr "Pri odosielaní správ vo fronte nastali chyby."
 
-#: src/folderview.c:2473 src/main.c:2744 src/toolbar.c:2650
+#: src/folderview.c:2554 src/main.c:2752 src/toolbar.c:2954
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -3915,64 +3862,64 @@ msgstr ""
 "Pri odosielaní správ vo fronte nastali chyby:\n"
 "%s"
 
-#: src/folderview.c:2548
+#: src/folderview.c:2629
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr "Naozaj chcete kopírovať zložku „%s” do „%s”?"
 
-#: src/folderview.c:2549
+#: src/folderview.c:2630
 #, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
 msgstr "Naozaj chcete presunúť zložku „%s” ako podzložku „%s”?"
 
-#: src/folderview.c:2551
+#: src/folderview.c:2632
 msgid "Copy folder"
 msgstr "Kopírovať zložku"
 
-#: src/folderview.c:2551
+#: src/folderview.c:2632
 msgid "Move folder"
 msgstr "Presunúť zložku"
 
-#: src/folderview.c:2562
+#: src/folderview.c:2643
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Kopírujem %s do %s…"
 
-#: src/folderview.c:2562
+#: src/folderview.c:2643
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Presúvam %s do %s…"
 
-#: src/folderview.c:2596
+#: src/folderview.c:2677
 msgid "Source and destination are the same."
 msgstr "Zdroj je identický s cieľom."
 
-#: src/folderview.c:2599
+#: src/folderview.c:2680
 msgid "Can't copy a folder to one of its children."
 msgstr "Nie je možné skopírovať zložku do jeho potomka."
 
-#: src/folderview.c:2600
+#: src/folderview.c:2681
 msgid "Can't move a folder to one of its children."
 msgstr "Nie je možné presunúť zložku do jeho potomka."
 
-#: src/folderview.c:2603
+#: src/folderview.c:2684
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "Zložky nemožno presúvať medzi rôznymi schránkami."
 
-#: src/folderview.c:2606
+#: src/folderview.c:2687
 msgid "Copy failed!"
 msgstr "Kopírovanie zlyhalo!"
 
-#: src/folderview.c:2606
+#: src/folderview.c:2687
 msgid "Move failed!"
 msgstr "Presun zlyhal!"
 
-#: src/folderview.c:2656
+#: src/folderview.c:2737
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Nastavenie spracovania zložky %s"
 
-#: src/folderview.c:3096 src/summaryview.c:4542 src/summaryview.c:4643
+#: src/folderview.c:3177 src/summaryview.c:4576 src/summaryview.c:4682
 msgid "The destination folder can only be used to store subfolders."
 msgstr "Zvolená cieľová zložka môže obsahovať len podzložky."
 
@@ -4013,8 +3960,8 @@ msgid "readonly"
 msgstr "len na čítanie"
 
 #: src/grouplistdialog.c:351 src/plugins/att_remover/att_remover.c:297
-#: src/plugins/vcalendar/vcal_manager.c:113
-#: src/plugins/vcalendar/vcal_manager.c:146
+#: src/plugins/vcalendar/vcal_manager.c:114
+#: src/plugins/vcalendar/vcal_manager.c:148
 msgid "unknown"
 msgstr "neznáme"
 
@@ -4022,7 +3969,7 @@ msgstr "neznáme"
 msgid "Can't retrieve newsgroup list."
 msgstr "Nemožno získať zoznam diskusných skupín."
 
-#: src/grouplistdialog.c:459 src/gtk/gtkutils.c:1922 src/summaryview.c:1564
+#: src/grouplistdialog.c:459 src/gtk/gtkutils.c:1922 src/summaryview.c:1587
 msgid "Done."
 msgstr "Hotovo."
 
@@ -4031,64 +3978,44 @@ msgstr "Hotovo."
 msgid "%d newsgroups received (%s read)"
 msgstr "Prijatých %d diskusných skupín (prečítaných %s)"
 
-#: src/gtk/about.c:131
-msgid ""
-"Claws Mail is a lightweight, fast and highly-configurable email client.\n"
-"\n"
-"For further information visit the Claws Mail website:\n"
-msgstr ""
-"Claws Mail je ľahký, rýchly a vysoko konfigurovateľný emailový klient.\n"
-"\n"
-"Ďalšie informácie nájdete na webovej stránke Claws Mail:\n"
+#: src/gtk/about.c:132
+msgid "Claws Mail is a lightweight, fast and highly-configurable email client."
+msgstr "Claws Mail je ľahký, rýchly a vysoko konfigurovateľný emailový klient."
 
-#: src/gtk/about.c:137
+#: src/gtk/about.c:135
+msgid "For further information visit the Claws Mail website:"
+msgstr "Ďalšie informácie nájdete na webovej stránke Claws Mail:"
+
+#: src/gtk/about.c:140
 msgid ""
-"\n"
-"\n"
-"For support and discussion subscribe to the Claws Mail users' mailing list:\n"
+"For support and discussion subscribe to the Claws Mail users' mailing list:"
 msgstr ""
-"\n"
-"\n"
 "Na prístup k podpore a diskusii sa prihláste do emailovej konferencie "
-"používateľov Claws Mail:\n"
+"používateľov Claws Mail:"
 
-#: src/gtk/about.c:142
+#: src/gtk/about.c:146
 msgid ""
-"\n"
-"\n"
 "Claws Mail is free software released under the GPL. If you wish to donate to "
-"the Claws Mail project you can do so at:\n"
+"the Claws Mail project you can do so at:"
 msgstr ""
-"\n"
-"\n"
 "Claws Mail je slobodný softvér vydaný pod licenciou GPL. Ak si prajete "
-"prispieť na projekt Claws Mail, môžete tak učiniť na:\n"
+"prispieť na projekt Claws Mail, môžete tak učiniť na:"
 
-#: src/gtk/about.c:158
+#: src/gtk/about.c:162
 msgid ""
-"\n"
-"\n"
-"Copyright (C) 1999-2016\n"
+"Copyright (C) 1999-2017\n"
 "The Claws Mail Team\n"
 " and Hiroyuki Yamamoto"
 msgstr ""
-"\n"
-"\n"
-"Copyright (C) 1999 – 2016\n"
-"Tím Claws Mail\n"
+"Copyright (C) 1999 – 2017\n"
+"Tím Claws Mail\n"
 " a Hiroyuki Yamamoto"
 
-#: src/gtk/about.c:161
-msgid ""
-"\n"
-"\n"
-"System Information\n"
-msgstr ""
-"\n"
-"\n"
-"Informácie o systéme\n"
+#: src/gtk/about.c:167
+msgid "System Information\n"
+msgstr "Informácie o systéme\n"
 
-#: src/gtk/about.c:168
+#: src/gtk/about.c:173
 #, c-format
 msgid ""
 "Locale: %s (charset: %s)\n"
@@ -4097,7 +4024,7 @@ msgstr ""
 "Jazyk: %s (kódovanie: %s)\n"
 "Operačný systém: %s %s (%s)"
 
-#: src/gtk/about.c:177
+#: src/gtk/about.c:182
 #, c-format
 msgid ""
 "Locale: %s (charset: %s)\n"
@@ -4106,7 +4033,7 @@ msgstr ""
 "Jazyk: %s (kódovanie: %s)\n"
 "Operačný systém: %s"
 
-#: src/gtk/about.c:186
+#: src/gtk/about.c:191
 #, c-format
 msgid ""
 "Locale: %s (charset: %s)\n"
@@ -4115,115 +4042,116 @@ msgstr ""
 "Jazyk: %s (kódovanie: %s)\n"
 "Operačný systém: neznámy"
 
-#: src/gtk/about.c:242 src/prefs_themes.c:705 src/wizard.c:527
+#: src/gtk/about.c:247 src/prefs_themes.c:805 src/wizard.c:527
 msgid "The Claws Mail Team"
 msgstr "Tím Claws Mail"
 
-#: src/gtk/about.c:261
+#: src/gtk/about.c:266
 msgid "Previous team members"
 msgstr "Bývalí členovia tímu"
 
-#: src/gtk/about.c:280
+#: src/gtk/about.c:285
 msgid "The translation team"
 msgstr "Prekladateľský tím"
 
-#: src/gtk/about.c:299
+#: src/gtk/about.c:304
 msgid "Documentation team"
 msgstr "Dokumentačný tím"
 
-#: src/gtk/about.c:318
+#: src/gtk/about.c:322
 msgid "Logo"
 msgstr "Logo"
 
-#: src/gtk/about.c:337
+#: src/gtk/about.c:341
 msgid "Icons"
 msgstr "Ikony"
 
-#: src/gtk/about.c:356
+#: src/gtk/about.c:360
 msgid "Contributors"
 msgstr "Prispievatelia"
 
-#: src/gtk/about.c:404
-msgid "Compiled-in Features\n"
-msgstr "Zabudované funkcie\n"
+#: src/gtk/about.c:408
+msgid "Compiled-in Features"
+msgstr "Zabudované funkcie"
 
-#: src/gtk/about.c:420
+#: src/gtk/about.c:425
 msgctxt "compface"
 msgid "adds support for the X-Face header\n"
 msgstr "pridáva podporu hlavičky X-Face\n"
 
-#: src/gtk/about.c:430
+#: src/gtk/about.c:435
 msgctxt "Enchant"
 msgid "adds support for spell checking\n"
 msgstr "pridáva podporu kontroly preklepov\n"
 
-#: src/gtk/about.c:440
+#: src/gtk/about.c:445
 msgctxt "GnuTLS"
 msgid "adds support for encrypted connections to servers\n"
 msgstr "pridáva podporu šifrovaných spojení so serverom\n"
 
-#: src/gtk/about.c:450
+#: src/gtk/about.c:455
 msgctxt "IPv6"
 msgid "adds support for IPv6 addresses, the new Internet addressing protocol\n"
 msgstr "pridáva podporu adries IPv6, novej verzie protokolu IP\n"
 
-#: src/gtk/about.c:461
+#: src/gtk/about.c:466
 msgctxt "iconv"
 msgid "allows converting to and from different character sets\n"
 msgstr "umožňuje konverziu znakov medzi rôznymi kódovaniami\n"
 
-#: src/gtk/about.c:471
+#: src/gtk/about.c:476
 msgctxt "JPilot"
 msgid "adds support for PalmOS addressbooks\n"
 msgstr "pridáva podporu adresárov PalmOS\n"
 
-#: src/gtk/about.c:481
+#: src/gtk/about.c:486
 msgctxt "LDAP"
 msgid "adds support for LDAP shared addressbooks\n"
 msgstr "pridáva podporu zdieľaných adresárov LDAP\n"
 
-#: src/gtk/about.c:491
+#: src/gtk/about.c:496
 msgctxt "libetpan"
 msgid "adds support for IMAP and NNTP servers\n"
 msgstr "pridáva podporu protokolu serverov IMAP a NNTP\n"
 
-#: src/gtk/about.c:501
+#: src/gtk/about.c:506
 msgctxt "libSM"
 msgid "adds support for session handling\n"
 msgstr "pridáva podporu správy relácií\n"
 
-#: src/gtk/about.c:511
+#: src/gtk/about.c:516
 msgctxt "NetworkManager"
 msgid "adds support for detection of network connection changes\n"
 msgstr "pridáva podporu detekcie zmien sieťového pripojenia\n"
 
-#: src/gtk/about.c:543
+#: src/gtk/about.c:526
+msgctxt "librSVG"
+msgid "adds support for SVG themes\n"
+msgstr "pridáva podporu tém SVG\n"
+
+#: src/gtk/about.c:558
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 3, or (at your option) any later "
-"version.\n"
-"\n"
+"Software Foundation; either version 3, or (at your option) any later version."
 msgstr ""
-"Tento program je voľne šíriteľný; Môžete ho šíriť (a)lebo ho upravovať tak "
+"Tento program je voľne šíriteľný; môžete ho šíriť a/alebo ho upravovať tak, "
 "ako to popisuje GNU General Public License, licencia vydaná organizáciou "
-"Free Software Foundation, a to vo verzii 2, alebo, podľa vášho rozhodnutia, "
-"v akejkoľvek ďalšej verzii.\n"
-"\n"
+"Free Software Foundation, a to vo verzii 3 alebo (podľa svojho rozhodnutia) "
+"v akejkoľvek ďalšej verzii."
 
-#: src/gtk/about.c:549
+#: src/gtk/about.c:565
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
 "FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
-"more details.\n"
-"\n"
+"more details."
 msgstr ""
 "Tento program je šírený vo viere v jeho užitočnosť, ale BEZ AKEJKOĽVEK "
-"ZÁRUKY. Viac detailov nájdete v GNU General Public License.\n"
-"\n"
+"ZÁRUKY; a to i bez predpokladanej záruky PREDAJNOSTI, či VHODNOSTI NA URČITÝ "
+"ÚČEL. Ďalšie podrobnosti nájdete v GNU General Public License."
 
-#: src/gtk/about.c:567
+#: src/gtk/about.c:584
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program. If not, see "
@@ -4231,83 +4159,83 @@ msgstr ""
 "Kópiu GNU General Public License by ste mali získať spoločne s týmto "
 "programom; ak to tak nie je, navštívte"
 
-#: src/gtk/about.c:698 src/main.c:2568
+#: src/gtk/about.c:717 src/main.c:2576
 msgid "Session statistics\n"
 msgstr "Štatistiky relácie\n"
 
-#: src/gtk/about.c:708 src/gtk/about.c:711 src/main.c:2578 src/main.c:2581
+#: src/gtk/about.c:727 src/gtk/about.c:730 src/main.c:2586 src/main.c:2589
 #, c-format
 msgid "Started: %s\n"
 msgstr "Začatá: %s\n"
 
-#: src/gtk/about.c:718 src/main.c:2587
+#: src/gtk/about.c:737 src/main.c:2595
 msgid "Incoming traffic\n"
 msgstr "Došlá komunikácia\n"
 
-#: src/gtk/about.c:721 src/main.c:2590
+#: src/gtk/about.c:740 src/main.c:2598
 #, c-format
 msgid "Received messages: %d\n"
 msgstr "Prijaté správy: %d\n"
 
-#: src/gtk/about.c:728 src/main.c:2596
+#: src/gtk/about.c:747 src/main.c:2604
 msgid "Outgoing traffic\n"
 msgstr "Odoslaná komunikácia\n"
 
-#: src/gtk/about.c:731 src/main.c:2599
+#: src/gtk/about.c:750 src/main.c:2607
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr "Nové/presmerované správy: %d\n"
 
-#: src/gtk/about.c:736 src/main.c:2603
+#: src/gtk/about.c:755 src/main.c:2611
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr "Odpovede na správy: %d\n"
 
-#: src/gtk/about.c:741 src/main.c:2607
+#: src/gtk/about.c:760 src/main.c:2615
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr "Presmerované správy: %d\n"
 
-#: src/gtk/about.c:746 src/main.c:2611
+#: src/gtk/about.c:765 src/main.c:2619
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr "Odoslané správy celkom: %d\n"
 
-#: src/gtk/about.c:773
+#: src/gtk/about.c:792
 msgid "About Claws Mail"
 msgstr "O programe Claws Mail"
 
-#: src/gtk/about.c:831
+#: src/gtk/about.c:850
 msgid ""
-"Copyright (C) 1999-2016\n"
+"Copyright (C) 1999-2017\n"
 "The Claws Mail Team\n"
 "and Hiroyuki Yamamoto"
 msgstr ""
-"Copyright (C) 1999 – 2016\n"
+"Copyright (C) 1999 – 2107\n"
 "Tím Claws Mail\n"
 "a Hiroyuki Yamamoto"
 
-#: src/gtk/about.c:845
+#: src/gtk/about.c:864
 msgid "_Info"
 msgstr "_Informácie"
 
-#: src/gtk/about.c:851
+#: src/gtk/about.c:870
 msgid "_Authors"
 msgstr "_Autori"
 
-#: src/gtk/about.c:857
+#: src/gtk/about.c:876
 msgid "_Features"
 msgstr "_Vlastnosti"
 
-#: src/gtk/about.c:863
+#: src/gtk/about.c:882
 msgid "_License"
 msgstr "_Licencia"
 
-#: src/gtk/about.c:871
+#: src/gtk/about.c:890
 msgid "_Release Notes"
 msgstr "_Poznámky k verzii"
 
-#: src/gtk/about.c:877
+#: src/gtk/about.c:896
 msgid "_Statistics"
 msgstr "Štati_stiky"
 
@@ -4510,7 +4438,7 @@ msgid "Configuring..."
 msgstr "Nastavovanie…"
 
 #: src/gtk/headers.h:9 src/prefs_filtering_action.c:1259
-#: src/prefs_matcher.c:2165 src/prefs_summaries.c:435
+#: src/prefs_matcher.c:2166 src/prefs_summaries.c:443
 #: src/prefs_summary_column.c:84 src/quote_fmt.c:49 src/summaryview.c:445
 msgid "Date"
 msgstr "Dátum"
@@ -4520,12 +4448,12 @@ msgid "Date:"
 msgstr "Dátum:"
 
 #: src/gtk/headers.h:10 src/prefs_filtering_action.c:1256
-#: src/prefs_matcher.c:2162 src/prefs_summaries.c:437
+#: src/prefs_matcher.c:2163 src/prefs_summaries.c:445
 #: src/prefs_summary_column.c:82 src/quote_fmt.c:50 src/summaryview.c:443
 msgid "From"
 msgstr "Od"
 
-#: src/gtk/headers.h:10 src/summary_search.c:426
+#: src/gtk/headers.h:10 src/summary_search.c:474
 msgid "From:"
 msgstr "Od:"
 
@@ -4541,25 +4469,23 @@ msgstr "Odosielateľ:"
 msgid "Reply-To"
 msgstr "Odpovedať komu"
 
-#: src/gtk/headers.h:13 src/plugins/address_keeper/address_keeper_prefs.c:140
-#: src/prefs_filtering_action.c:1257 src/prefs_matcher.c:2163
-#: src/prefs_summaries.c:438 src/prefs_summary_column.c:83 src/quote_fmt.c:57
-#: src/summaryview.c:444
+#: src/gtk/headers.h:13 src/prefs_filtering_action.c:1257
+#: src/prefs_matcher.c:2164 src/prefs_summaries.c:446
+#: src/prefs_summary_column.c:83 src/quote_fmt.c:57 src/summaryview.c:444
 msgid "To"
 msgstr "Komu"
 
-#: src/gtk/headers.h:14 src/plugins/address_keeper/address_keeper_prefs.c:149
-#: src/prefs_filtering_action.c:1258 src/prefs_matcher.c:2164
-#: src/quote_fmt.c:58
+#: src/gtk/headers.h:14 src/prefs_filtering_action.c:1258
+#: src/prefs_matcher.c:2165 src/quote_fmt.c:58
 msgid "Cc"
 msgstr "Kópia"
 
-#: src/gtk/headers.h:15 src/plugins/address_keeper/address_keeper_prefs.c:158
+#: src/gtk/headers.h:15
 msgid "Bcc"
 msgstr "Slepá kópia"
 
 #: src/gtk/headers.h:16 src/prefs_filtering_action.c:1260
-#: src/prefs_matcher.c:2166 src/quote_fmt.c:61
+#: src/prefs_matcher.c:2167 src/quote_fmt.c:61
 msgid "Message-ID"
 msgstr "Message-ID"
 
@@ -4572,7 +4498,7 @@ msgid "In-Reply-To"
 msgstr "In-Reply-To"
 
 #: src/gtk/headers.h:18 src/prefs_filtering_action.c:1262
-#: src/prefs_matcher.c:2168 src/quote_fmt.c:60
+#: src/prefs_matcher.c:2169 src/quote_fmt.c:60
 msgid "References"
 msgstr "Odkazy"
 
@@ -4581,17 +4507,17 @@ msgid "References:"
 msgstr "Odkazy:"
 
 #: src/gtk/headers.h:19 src/prefs_filtering_action.c:1255
-#: src/prefs_matcher.c:2161 src/prefs_summaries.c:439
+#: src/prefs_matcher.c:2162 src/prefs_summaries.c:447
 #: src/prefs_summary_column.c:81 src/quote_fmt.c:56 src/summaryview.c:442
 msgid "Subject"
 msgstr "Predmet"
 
 #: src/gtk/headers.h:19 src/plugins/pdf_viewer/poppler_viewer.c:700
-#: src/summary_search.c:440
+#: src/summary_search.c:488
 msgid "Subject:"
 msgstr "Predmet:"
 
-#: src/gtk/headers.h:20 src/plugins/rssyl/rssyl_feed_props.c:433
+#: src/gtk/headers.h:20 src/plugins/rssyl/rssyl_feed_props.c:431
 msgid "Comments"
 msgstr "Komentáre"
 
@@ -4680,7 +4606,7 @@ msgid "Received:"
 msgstr "Received:"
 
 #: src/gtk/headers.h:33 src/prefs_filtering_action.c:1261
-#: src/prefs_matcher.c:2167 src/quote_fmt.c:59
+#: src/prefs_matcher.c:2168 src/quote_fmt.c:59
 msgid "Newsgroups"
 msgstr "Diskusné skupiny"
 
@@ -4705,12 +4631,12 @@ msgid "Seen:"
 msgstr "Seen:"
 
 #: src/gtk/headers.h:37 src/gtk/progressdialog.c:149
-#: src/gtk/sslcertwindow.c:164 src/prefs_summaries.c:443
-#: src/prefs_summary_column.c:79 src/summaryview.c:2812
+#: src/gtk/sslcertwindow.c:164 src/prefs_summaries.c:451
+#: src/prefs_summary_column.c:79 src/summaryview.c:2810
 msgid "Status"
 msgstr "Status"
 
-#: src/gtk/headers.h:37 src/prefs_themes.c:880
+#: src/gtk/headers.h:37 src/prefs_themes.c:996
 msgid "Status:"
 msgstr "Status:"
 
@@ -4992,12 +4918,11 @@ msgstr "Zložka obsahuje označené správy"
 
 #: src/gtk/icon_legend.c:92
 msgid "IMAP folder which contains sub-folders only"
-msgstr ""
+msgstr "Zložka IMAP, ktorá obsahuje len podzložky"
 
 #: src/gtk/icon_legend.c:93
-#, fuzzy
 msgid "IMAP mailbox showing only subscribed folders"
-msgstr "Zobraziť len odoberané zložky"
+msgstr "Poštová schránka IMAP zobrazujúca len vyžiadané zložky"
 
 #: src/gtk/icon_legend.c:127
 msgid "Icon Legend"
@@ -5088,12 +5013,12 @@ msgstr ""
 "%s\n"
 
 #: src/gtk/pluginwindow.c:303 src/plugins/acpi_notifier/acpi_notifier.c:790
-#: src/plugins/address_keeper/address_keeper_prefs.c:256
-#: src/plugins/archive/archiver_prefs.c:90
+#: src/plugins/address_keeper/address_keeper_prefs.c:273
+#: src/plugins/archive/archiver_prefs.c:106
 #: src/plugins/attachwarner/attachwarner_prefs.c:229
 #: src/plugins/bogofilter/bogofilter_gtk.c:498
 #: src/plugins/bsfilter/bsfilter_gtk.c:400
-#: src/plugins/clamd/clamav_plugin_gtk.c:548
+#: src/plugins/clamd/clamav_plugin_gtk.c:549
 #: src/plugins/fancy/fancy_prefs.c:114
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:181
 #: src/plugins/gdata/cm_gdata_prefs.c:137
@@ -5109,8 +5034,8 @@ msgstr ""
 #: src/plugins/notification/notification_prefs.c:522
 #: src/plugins/pgpcore/prefs_gpg.c:617 src/plugins/rssyl/rssyl_prefs.c:70
 #: src/plugins/spam_report/spam_report_prefs.c:82
-#: src/plugins/spamassassin/spamassassin_gtk.c:647
-#: src/plugins/vcalendar/vcal_prefs.c:774 src/prefs_toolbar.c:944
+#: src/plugins/spamassassin/spamassassin_gtk.c:648
+#: src/plugins/vcalendar/vcal_prefs.c:774 src/prefs_toolbar.c:957
 msgid "Plugins"
 msgstr "Zásuvné moduly"
 
@@ -5122,7 +5047,7 @@ msgstr "Načítať…"
 msgid "Unload"
 msgstr "Odobrať"
 
-#: src/gtk/pluginwindow.c:350 src/prefs_summaries.c:222
+#: src/gtk/pluginwindow.c:350 src/prefs_summaries.c:229
 msgid "Description"
 msgstr "Popis"
 
@@ -5149,7 +5074,7 @@ msgstr "Načítané zásuvné moduly"
 msgid "Page Index"
 msgstr "Obsah Stránky"
 
-#: src/gtk/progressdialog.c:91 src/mainwindow.c:841
+#: src/gtk/progressdialog.c:91 src/mainwindow.c:843
 msgid "_Hide"
 msgstr "_Skryť"
 
@@ -5157,209 +5082,213 @@ msgstr "_Skryť"
 #: src/prefs_account.c:3286 src/prefs_account.c:3304 src/prefs_account.c:3322
 #: src/prefs_account.c:3340 src/prefs_account.c:3358 src/prefs_account.c:3376
 #: src/prefs_account.c:3395 src/prefs_account.c:3488
-#: src/prefs_filtering_action.c:1421 src/prefs_filtering.c:397
-#: src/prefs_filtering.c:1875
+#: src/prefs_filtering_action.c:1422 src/prefs_filtering.c:397
+#: src/prefs_filtering.c:1877
 msgid "Account"
 msgstr "Účet"
 
-#: src/gtk/quicksearch.c:451
+#: src/gtk/quicksearch.c:478
 msgid "all messages"
 msgstr "všetky správy"
 
-#: src/gtk/quicksearch.c:452
+#: src/gtk/quicksearch.c:479
 msgid "messages whose age is greater than # days"
 msgstr "správy, ktoré sú staršie ako # dní"
 
-#: src/gtk/quicksearch.c:453
+#: src/gtk/quicksearch.c:480
 msgid "messages whose age is less than # days"
 msgstr "správy, ktoré sú novšie ako # dní"
 
-#: src/gtk/quicksearch.c:454
+#: src/gtk/quicksearch.c:481
 msgid "messages whose age is greater than # hours"
 msgstr "správy, ktoré sú staršie ako # hodín"
 
-#: src/gtk/quicksearch.c:455
+#: src/gtk/quicksearch.c:482
 msgid "messages whose age is less than # hours"
 msgstr "správy, ktoré sú novšie ako # hodín"
 
-#: src/gtk/quicksearch.c:456
+#: src/gtk/quicksearch.c:483
 msgid "messages which contain S in the message body"
 msgstr "správy, ktorých telo obsahuje S"
 
-#: src/gtk/quicksearch.c:457
+#: src/gtk/quicksearch.c:484
 msgid "messages which contain S in the whole message"
 msgstr "správy, ktoré obsahujú S kdekoľvek"
 
-#: src/gtk/quicksearch.c:458
+#: src/gtk/quicksearch.c:485
 msgid "messages carbon-copied to S"
 msgstr "správy s kópiou v S"
 
-#: src/gtk/quicksearch.c:459
-msgid "message is either to: or cc: to S"
-msgstr "správa je buď to: alebo cc: S"
+#: src/gtk/quicksearch.c:486
+msgid "message is either To: or Cc: to S"
+msgstr "správa je buď To: alebo Cc: pre S"
 
-#: src/gtk/quicksearch.c:460
+#: src/gtk/quicksearch.c:487
 msgid "deleted messages"
 msgstr "vymazané správy"
 
-#: src/gtk/quicksearch.c:461
+#: src/gtk/quicksearch.c:488
 msgid "messages which contain S in the Sender field"
 msgstr "správy, ktoré obsahujú S v hlavičke Sender"
 
-#: src/gtk/quicksearch.c:462
+#: src/gtk/quicksearch.c:489
 msgid "true if execute \"S\" succeeds"
 msgstr "pravda, ak je „S” vykonané úspešne"
 
-#: src/gtk/quicksearch.c:463
+#: src/gtk/quicksearch.c:490
 msgid "messages originating from user S"
 msgstr "správy pochádzajúce od používateľa S"
 
-#: src/gtk/quicksearch.c:464
+#: src/gtk/quicksearch.c:491
 msgid "forwarded messages"
 msgstr "správy poslané ďalej"
 
-#: src/gtk/quicksearch.c:465
+#: src/gtk/quicksearch.c:492
 msgid "messages which have attachments"
 msgstr "správy s prílohami"
 
-#: src/gtk/quicksearch.c:466
+#: src/gtk/quicksearch.c:493
 msgid "messages which contain S in any header name or value"
 msgstr "správy, ktoré obsahujú S v hociktorej hodnote alebo názve hlavičke"
 
-#: src/gtk/quicksearch.c:467
+#: src/gtk/quicksearch.c:494
 msgid "messages which contain S in the value of any header"
 msgstr "správy, ktoré obsahujú S v hodnote akejkoľvek hlavičky"
 
-#: src/gtk/quicksearch.c:468
+#: src/gtk/quicksearch.c:495
 msgid "messages which contain S in Message-ID header"
 msgstr "správy, ktoré obsahujú S v hlavičke Message-ID"
 
-#: src/gtk/quicksearch.c:469
+#: src/gtk/quicksearch.c:496
 msgid "messages which contain S in In-Reply-To header"
 msgstr "správy, ktoré obsahujú S v hlavičke In-Reply-To"
 
-#: src/gtk/quicksearch.c:470
+#: src/gtk/quicksearch.c:497
 msgid "messages which are marked with color #"
 msgstr "správy, ktoré sú označené farbou #"
 
-#: src/gtk/quicksearch.c:471
+#: src/gtk/quicksearch.c:498
 msgid "locked messages"
 msgstr "zamknuté správy"
 
-#: src/gtk/quicksearch.c:472
+#: src/gtk/quicksearch.c:499
 msgid "messages which are in newsgroup S"
 msgstr "správy, ktoré sú v diskusnej skupine S"
 
-#: src/gtk/quicksearch.c:473
+#: src/gtk/quicksearch.c:500
 msgid "new messages"
 msgstr "nové správy"
 
-#: src/gtk/quicksearch.c:474
+#: src/gtk/quicksearch.c:501
 msgid "old messages"
 msgstr "staré správy"
 
-#: src/gtk/quicksearch.c:475
+#: src/gtk/quicksearch.c:502
 msgid "incomplete messages (not entirely downloaded)"
 msgstr "neúplné správy (nestiahnuté úplne)"
 
-#: src/gtk/quicksearch.c:476
+#: src/gtk/quicksearch.c:503
 msgid "messages which you have replied to"
 msgstr "správy, na ktoré ste odpovedali"
 
-#: src/gtk/quicksearch.c:477
+#: src/gtk/quicksearch.c:504
 msgid "read messages"
 msgstr "prečítané správy"
 
-#: src/gtk/quicksearch.c:478
+#: src/gtk/quicksearch.c:505
 msgid "messages which contain S in subject"
 msgstr "správy, ktoré obsahujú S v názve"
 
-#: src/gtk/quicksearch.c:479
+#: src/gtk/quicksearch.c:506
 msgid "messages whose score is equal to # points"
 msgstr "správy, ktorých ohodnotenie je rovné # bodov"
 
-#: src/gtk/quicksearch.c:480
+#: src/gtk/quicksearch.c:507
 msgid "messages whose score is greater than # points"
 msgstr "správy, ktorých ohodnotenie je väčšie ako # bodov"
 
-#: src/gtk/quicksearch.c:481
+#: src/gtk/quicksearch.c:508
 msgid "messages whose score is lower than # points"
 msgstr "správy, ktorých ohodnotenie je menšie ako # bodov"
 
-#: src/gtk/quicksearch.c:482
+#: src/gtk/quicksearch.c:509
 msgid "messages whose size is equal to # bytes"
 msgstr "správy, ktorých veľkosť je rovná # bajtov"
 
-#: src/gtk/quicksearch.c:483
+#: src/gtk/quicksearch.c:510
 msgid "messages whose size is greater than # bytes"
 msgstr "správy, ktorých veľkosť je väčšia ako # bajtov"
 
-#: src/gtk/quicksearch.c:484
+#: src/gtk/quicksearch.c:511
 msgid "messages whose size is smaller than # bytes"
 msgstr "správy, ktorých veľkosť je menšia ako # bajtov"
 
-#: src/gtk/quicksearch.c:485
+#: src/gtk/quicksearch.c:512
 msgid "messages which have been sent to S"
 msgstr "správy, odoslané S"
 
-#: src/gtk/quicksearch.c:486
+#: src/gtk/quicksearch.c:513
 msgid "messages which tags contain S"
 msgstr "správy, ktorých značky obsahujú S"
 
-#: src/gtk/quicksearch.c:487
+#: src/gtk/quicksearch.c:514
 msgid "messages which have tag(s)"
 msgstr "správy so značkami S"
 
-#: src/gtk/quicksearch.c:488
+#: src/gtk/quicksearch.c:515
 msgid "marked messages"
 msgstr "označené správy"
 
-#: src/gtk/quicksearch.c:489
+#: src/gtk/quicksearch.c:516
 msgid "unread messages"
 msgstr "neprečítané správy"
 
-#: src/gtk/quicksearch.c:490
+#: src/gtk/quicksearch.c:517
 msgid "messages which contain S in References header"
 msgstr "správy, ktoré obsahujú S v hlavičke References"
 
-#: src/gtk/quicksearch.c:491
+#: src/gtk/quicksearch.c:518
 #, c-format
 msgid "messages returning 0 when passed to command - %F is message file"
 msgstr "správy, ktoré vracajú 0 po odovzdaní do príkazu – %F je súbor správy"
 
-#: src/gtk/quicksearch.c:492
+#: src/gtk/quicksearch.c:519
 msgid "messages which contain S in X-Label header"
 msgstr "správy, ktoré obsahujú S v hlavičke X-Label"
 
-#: src/gtk/quicksearch.c:494
+#: src/gtk/quicksearch.c:521
 msgid "logical AND operator"
 msgstr "logický operátor AND"
 
-#: src/gtk/quicksearch.c:495
+#: src/gtk/quicksearch.c:522
 msgid "logical OR operator"
 msgstr "logický operátor OR"
 
-#: src/gtk/quicksearch.c:496
+#: src/gtk/quicksearch.c:523
 msgid "logical NOT operator"
 msgstr "logický operátor NOT"
 
-#: src/gtk/quicksearch.c:497
+#: src/gtk/quicksearch.c:524
 msgid "case sensitive search"
 msgstr "záleží na veľkosti písmen"
 
-#: src/gtk/quicksearch.c:498
+#: src/gtk/quicksearch.c:525
 msgid "match using regular expressions instead of substring search"
 msgstr "zhoda pomocou regulárnych výrazov namiesto hľadania podreťazca"
 
-#: src/gtk/quicksearch.c:500
-msgid "all filtering expressions are allowed"
-msgstr "všetky filtrovacie výrazy sú povolené"
+#: src/gtk/quicksearch.c:527
+msgid ""
+"all filtering expressions are allowed, but cannot be mixed through logical "
+"operators with the expressions above"
+msgstr ""
+"povolené sú všetky filtrovacie výrazy, ale nemožno ich kombinovať pomocou "
+"logických operátorov s výrazmi vyššie"
 
-#: src/gtk/quicksearch.c:509 src/summary_search.c:471
+#: src/gtk/quicksearch.c:537 src/summary_search.c:521
 msgid "Extended Search"
 msgstr "Rozšírené vyhľadávanie"
 
-#: src/gtk/quicksearch.c:510
+#: src/gtk/quicksearch.c:538
 msgid ""
 "Extended Search allows the user to define criteria that messages must have "
 "in order to match and be displayed in the message list.\n"
@@ -5369,52 +5298,52 @@ msgstr ""
 "musia správy spĺňať, aby boli zobrazené v zozname správ.\n"
 "Môžu byť použité tieto symboly:"
 
-#: src/gtk/quicksearch.c:610
+#: src/gtk/quicksearch.c:638
 msgid "Something went wrong during search. Please check your logs."
 msgstr ""
 "Počas hľadania sa prihodilo niečo zlé. Prosím, skontrolujte svoje záznamy."
 
-#: src/gtk/quicksearch.c:676
+#: src/gtk/quicksearch.c:704
 msgid "From/To/Cc/Subject/Tag"
 msgstr "Od/Komu/Kópia/Predmet/Značka"
 
-#: src/gtk/quicksearch.c:687 src/plugins/archive/archiver_prefs.c:314
+#: src/gtk/quicksearch.c:715 src/plugins/archive/archiver_prefs.c:416
 msgid "Recursive"
 msgstr "Rekurzívne"
 
-#: src/gtk/quicksearch.c:696
+#: src/gtk/quicksearch.c:724
 msgid "Sticky"
 msgstr "Trvalé"
 
-#: src/gtk/quicksearch.c:706
+#: src/gtk/quicksearch.c:734
 msgid "Type-ahead"
 msgstr "Dynamické"
 
-#: src/gtk/quicksearch.c:718
+#: src/gtk/quicksearch.c:746
 msgid "Run on select"
 msgstr "Spustiť pri zvolení"
 
-#: src/gtk/quicksearch.c:760
+#: src/gtk/quicksearch.c:788
 msgid "Clear the current search"
 msgstr "Zrušiť súčasné vyhľadávanie"
 
-#: src/gtk/quicksearch.c:770 src/summary_search.c:424
+#: src/gtk/quicksearch.c:798 src/summary_search.c:472
 msgid "Edit search criteria"
 msgstr "Upraviť vyhľadávacie kritériá"
 
-#: src/gtk/quicksearch.c:779
+#: src/gtk/quicksearch.c:807
 msgid "Information about extended symbols"
 msgstr "Informácie o rozšírených symboloch"
 
-#: src/gtk/quicksearch.c:817 src/gtk/quicksearch.c:832
+#: src/gtk/quicksearch.c:845 src/gtk/quicksearch.c:869
 msgid "_Information"
 msgstr "_Informácia"
 
-#: src/gtk/quicksearch.c:818 src/gtk/quicksearch.c:833
+#: src/gtk/quicksearch.c:846 src/gtk/quicksearch.c:870
 msgid "E_dit"
 msgstr "_Upraviť"
 
-#: src/gtk/quicksearch.c:819 src/gtk/quicksearch.c:834 src/prefs_actions.c:347
+#: src/gtk/quicksearch.c:847 src/gtk/quicksearch.c:871 src/prefs_actions.c:347
 #: src/prefs_filtering.c:495 src/prefs_template.c:330
 msgid "C_lear"
 msgstr "Vy_mazať"
@@ -5433,7 +5362,7 @@ msgid "Signer"
 msgstr "Podpisovateľ"
 
 #: src/gtk/sslcertwindow.c:170 src/gtk/sslcertwindow.c:194
-#: src/prefs_themes.c:836
+#: src/prefs_themes.c:952
 msgid "Name: "
 msgstr "Meno: "
 
@@ -5458,9 +5387,9 @@ msgid "Expires on: "
 msgstr "Dátum skončenia platnosti: "
 
 #: src/gtk/sslcertwindow.c:302
-#, fuzzy, c-format
+#, c-format
 msgid "SSL/TLS certificate for %s"
-msgstr "SSL certifikát pre %s"
+msgstr "Certifikát SSL/TLS pre %s"
 
 #: src/gtk/sslcertwindow.c:318
 #, c-format
@@ -5493,14 +5422,12 @@ msgid "_View certificate"
 msgstr "_Zobraziť certifikát"
 
 #: src/gtk/sslcertwindow.c:364
-#, fuzzy
 msgid "SSL/TLS certificate is invalid"
-msgstr "Certifikát SSL nie je platný"
+msgstr "Certifikát SSL/TLS je neplatný"
 
 #: src/gtk/sslcertwindow.c:366
-#, fuzzy
 msgid "SSL/TLS certificate is unknown"
-msgstr "Certifikát SSL je neznámy"
+msgstr "Certifikát SSL/TLS je neznámy"
 
 #: src/gtk/sslcertwindow.c:369 src/gtk/sslcertwindow.c:419
 #: src/gtk/sslcertwindow.c:481
@@ -5521,14 +5448,12 @@ msgstr ""
 "%s Chcete ho prijať?"
 
 #: src/gtk/sslcertwindow.c:414
-#, fuzzy
 msgid "SSL/TLS certificate is invalid and expired"
-msgstr "Certifikát SSL nie je platný a vypršal"
+msgstr "Certifikát SSL/TLS je neplatný a vypršal"
 
 #: src/gtk/sslcertwindow.c:416
-#, fuzzy
 msgid "SSL/TLS certificate is expired"
-msgstr "_Prijať"
+msgstr "Certifikát SSL/TLS vypršal"
 
 #: src/gtk/sslcertwindow.c:419
 msgid "_Accept"
@@ -5556,14 +5481,12 @@ msgid "_View certificates"
 msgstr "_Zobraziť certifikáty"
 
 #: src/gtk/sslcertwindow.c:477
-#, fuzzy
 msgid "SSL/TLS certificate changed and is invalid"
-msgstr "Certifikát SSL sa zmenil"
+msgstr "Certifikát SSL/TLS sa zmenil a je neplatný"
 
 #: src/gtk/sslcertwindow.c:479
-#, fuzzy
 msgid "SSL/TLS certificate changed"
-msgstr "Certifikát SSL sa zmenil"
+msgstr "Certifikát SSL/TLS sa zmenil"
 
 #: src/headerview.c:94
 msgid "Tags:"
@@ -5571,15 +5494,15 @@ msgstr "Značky:"
 
 #: src/headerview.c:192 src/plugins/notification/notification_popup.c:313
 #: src/plugins/notification/notification_popup.c:620
-#: src/plugins/notification/notification_trayicon.c:884 src/summaryview.c:3383
-#: src/summaryview.c:3401 src/summaryview.c:3422
+#: src/plugins/notification/notification_trayicon.c:886 src/summaryview.c:3381
+#: src/summaryview.c:3399 src/summaryview.c:3420
 msgid "(No From)"
 msgstr "(bez Odosielateľa)"
 
 #: src/headerview.c:207 src/plugins/notification/notification_popup.c:315
 #: src/plugins/notification/notification_popup.c:624
-#: src/plugins/notification/notification_trayicon.c:887 src/summaryview.c:3434
-#: src/summaryview.c:3437
+#: src/plugins/notification/notification_trayicon.c:889 src/summaryview.c:3432
+#: src/summaryview.c:3435
 msgid "(No Subject)"
 msgstr "(bez Predmetu)"
 
@@ -5587,7 +5510,7 @@ msgstr "(bez Predmetu)"
 msgid "Error:"
 msgstr "Chyba:"
 
-#: src/image_viewer.c:299 src/mimeview.c:2558
+#: src/image_viewer.c:299 src/mimeview.c:2611
 #: src/plugins/att_remover/att_remover.c:301
 #: src/plugins/pdf_viewer/poppler_viewer.c:696
 msgid "Filename:"
@@ -5601,196 +5524,194 @@ msgstr "Veľkosť súboru:"
 msgid "Load Image"
 msgstr "Načítať obrázok"
 
-#: src/imap.c:579
-#, fuzzy
+#: src/imap.c:576
 msgid "IMAP connection broken\n"
-msgstr "IMAP4 spojenie prerušené\n"
-
-#: src/imap.c:618 src/imap.c:621 src/imap.c:624 src/imap.c:627 src/imap.c:630
-#: src/imap.c:634 src/imap.c:637 src/imap.c:640 src/imap.c:643 src/imap.c:647
-#: src/imap.c:650 src/imap.c:653 src/imap.c:656 src/imap.c:659 src/imap.c:662
-#: src/imap.c:665 src/imap.c:668 src/imap.c:671 src/imap.c:674 src/imap.c:677
-#: src/imap.c:680 src/imap.c:683 src/imap.c:686 src/imap.c:689 src/imap.c:692
-#: src/imap.c:695 src/imap.c:698 src/imap.c:701 src/imap.c:704 src/imap.c:707
-#: src/imap.c:710 src/imap.c:713 src/imap.c:716 src/imap.c:719 src/imap.c:722
-#: src/imap.c:725 src/imap.c:728 src/imap.c:731 src/imap.c:734 src/imap.c:737
-#: src/imap.c:741 src/imap.c:745
+msgstr "Spojenie IMAP poškodené\n"
+
+#: src/imap.c:615 src/imap.c:618 src/imap.c:621 src/imap.c:624 src/imap.c:627
+#: src/imap.c:631 src/imap.c:634 src/imap.c:637 src/imap.c:640 src/imap.c:644
+#: src/imap.c:647 src/imap.c:650 src/imap.c:653 src/imap.c:656 src/imap.c:659
+#: src/imap.c:662 src/imap.c:665 src/imap.c:668 src/imap.c:671 src/imap.c:674
+#: src/imap.c:677 src/imap.c:680 src/imap.c:683 src/imap.c:686 src/imap.c:689
+#: src/imap.c:692 src/imap.c:695 src/imap.c:698 src/imap.c:701 src/imap.c:704
+#: src/imap.c:707 src/imap.c:710 src/imap.c:713 src/imap.c:716 src/imap.c:719
+#: src/imap.c:722 src/imap.c:725 src/imap.c:728 src/imap.c:731 src/imap.c:734
+#: src/imap.c:738 src/imap.c:742
 #, c-format
 msgid "IMAP error on %s:"
 msgstr "Chyba IMAP na %s:"
 
-#: src/imap.c:618
+#: src/imap.c:615
 msgid "authenticated"
 msgstr "autentifikovaný"
 
-#: src/imap.c:621
+#: src/imap.c:618
 msgid "not authenticated"
 msgstr "neautentifikovaný"
 
-#: src/imap.c:624
+#: src/imap.c:621
 msgid "bad state"
 msgstr "zlý stav"
 
-#: src/imap.c:627
+#: src/imap.c:624
 msgid "stream error"
 msgstr "chyba streamu"
 
-#: src/imap.c:630
+#: src/imap.c:627
 msgid "parse error (very probably non-RFC compliance from the server)"
 msgstr ""
 "chyba spracovania (pravdepodobne server, ktorý nedodržiava štandard RFC)"
 
-#: src/imap.c:634
+#: src/imap.c:631
 msgid "connection refused"
 msgstr "spojenie odmietnuté"
 
-#: src/imap.c:637
+#: src/imap.c:634
 msgid "memory error"
 msgstr "chyba pamäte"
 
-#: src/imap.c:640
+#: src/imap.c:637
 msgid "fatal error"
 msgstr "fatálna chyba"
 
-#: src/imap.c:643
+#: src/imap.c:640
 msgid "protocol error (very probably non-RFC compliance from the server)"
 msgstr "chyba protokolu (pravdepodobne server, ktorý nedodržiava štandard RFC)"
 
-#: src/imap.c:647
+#: src/imap.c:644
 msgid "connection not accepted"
 msgstr "spojenie nebolo prijaté"
 
-#: src/imap.c:650
+#: src/imap.c:647
 msgid "APPEND error"
 msgstr "chyba pri APPEND"
 
-#: src/imap.c:653
+#: src/imap.c:650
 msgid "NOOP error"
 msgstr "chyba pri NOOP"
 
-#: src/imap.c:656
+#: src/imap.c:653
 msgid "LOGOUT error"
 msgstr "chyba pri LOGOUT"
 
-#: src/imap.c:659
+#: src/imap.c:656
 msgid "CAPABILITY error"
 msgstr "chyba pri CAPABILITY"
 
-#: src/imap.c:662
+#: src/imap.c:659
 msgid "CHECK error"
 msgstr "chyba pri CHECK"
 
-#: src/imap.c:665
+#: src/imap.c:662
 msgid "CLOSE error"
 msgstr "chyba pri CLOSE"
 
-#: src/imap.c:668
+#: src/imap.c:665
 msgid "EXPUNGE error"
 msgstr "chyba pri EXPUNGE"
 
-#: src/imap.c:671
+#: src/imap.c:668
 msgid "COPY error"
 msgstr "chyba pri COPY"
 
-#: src/imap.c:674
+#: src/imap.c:671
 msgid "UID COPY error"
 msgstr "chyba pri UID COPY"
 
-#: src/imap.c:677
+#: src/imap.c:674
 msgid "CREATE error"
 msgstr "chyba pri CREATE"
 
-#: src/imap.c:680
+#: src/imap.c:677
 msgid "DELETE error"
 msgstr "chyba pri DELETE"
 
-#: src/imap.c:683
+#: src/imap.c:680
 msgid "EXAMINE error"
 msgstr "chyba pri EXAMINE"
 
-#: src/imap.c:686
+#: src/imap.c:683
 msgid "FETCH error"
 msgstr "chyba pri FETCH"
 
-#: src/imap.c:689
+#: src/imap.c:686
 msgid "UID FETCH error"
 msgstr "chyba pri UID FETCH"
 
-#: src/imap.c:692
+#: src/imap.c:689
 msgid "LIST error"
 msgstr "chyba pri LIST"
 
-#: src/imap.c:695
+#: src/imap.c:692
 msgid "LOGIN error"
 msgstr "chyba pri LOGIN"
 
-#: src/imap.c:698
+#: src/imap.c:695
 msgid "LSUB error"
 msgstr "chyba pri LSUB"
 
-#: src/imap.c:701
+#: src/imap.c:698
 msgid "RENAME error"
 msgstr "chyba pri RENAME"
 
-#: src/imap.c:704
+#: src/imap.c:701
 msgid "SEARCH error"
 msgstr "chyba pri SEARCH"
 
-#: src/imap.c:707
+#: src/imap.c:704
 msgid "UID SEARCH error"
 msgstr "chyba pri UID SEARCH"
 
-#: src/imap.c:710
+#: src/imap.c:707
 msgid "SELECT error"
 msgstr "chyba pri SELECT"
 
-#: src/imap.c:713
+#: src/imap.c:710
 msgid "STATUS error"
 msgstr "chyba pri STATUS"
 
-#: src/imap.c:716
+#: src/imap.c:713
 msgid "STORE error"
 msgstr "chyba pri STORE"
 
-#: src/imap.c:719
+#: src/imap.c:716
 msgid "UID STORE error"
 msgstr "chyba pri UID STORE"
 
-#: src/imap.c:722
+#: src/imap.c:719
 msgid "SUBSCRIBE error"
 msgstr "chyba pri SUBSCRIBE"
 
-#: src/imap.c:725
+#: src/imap.c:722
 msgid "UNSUBSCRIBE error"
 msgstr "chyba pri UNSUBSCRIBE"
 
-#: src/imap.c:728
+#: src/imap.c:725
 msgid "STARTTLS error"
 msgstr "chyba pri STARTTLS"
 
-#: src/imap.c:731
+#: src/imap.c:728
 msgid "INVAL error"
 msgstr "chyba pri INVAL"
 
-#: src/imap.c:734
+#: src/imap.c:731
 msgid "EXTENSION error"
 msgstr "chyba pri EXTENSION"
 
-#: src/imap.c:737
+#: src/imap.c:734
 msgid "SASL error"
 msgstr "chyba pri SASL"
 
-#: src/imap.c:741
-#, fuzzy
+#: src/imap.c:738
 msgid "SSL/TLS error"
-msgstr "chyba pri SSL"
+msgstr "Chyba pri SSL/TLS"
 
-#: src/imap.c:745
+#: src/imap.c:742
 #, c-format
 msgid "Unknown error [%d]"
 msgstr "Neznáma chyba [%d]"
 
-#: src/imap.c:949
+#: src/imap.c:946
 msgid ""
 "\n"
 "\n"
@@ -5802,7 +5723,7 @@ msgstr ""
 "Prihlásenie CRAM-MD5 funguje, len ak bola knižnica libetpan zostavená s "
 "podporou SASL, a je nainštalovaný zásuvný modul CRAM-MD5 SASL."
 
-#: src/imap.c:955
+#: src/imap.c:952
 msgid ""
 "\n"
 "\n"
@@ -5814,7 +5735,7 @@ msgstr ""
 "Prihlásenie DIGEST-MD5 funguje, len ak bola knižnica libetpan zostavená s "
 "podporou SASL, a je nainštalovaný zásuvný modul DIGEST-MD5 SASL."
 
-#: src/imap.c:961
+#: src/imap.c:958
 msgid ""
 "\n"
 "\n"
@@ -5826,7 +5747,7 @@ msgstr ""
 "Prihlásenie CRAM-SHA-1 funguje, len ak bola knižnica libetpan zostavená s "
 "podporou SASL, a je nainštalovaný zásuvný modul SCRAM SASL."
 
-#: src/imap.c:967
+#: src/imap.c:964
 msgid ""
 "\n"
 "\n"
@@ -5838,7 +5759,7 @@ msgstr ""
 "Prihlásenie PLAIN funguje, len ak bola knižnica libetpan zostavená s "
 "podporou SASL, a je nainštalovaný zásuvný modul PLAIN SASL."
 
-#: src/imap.c:973
+#: src/imap.c:970
 msgid ""
 "\n"
 "\n"
@@ -5850,37 +5771,36 @@ msgstr ""
 "Prihlásenie LOGIN funguje, len ak bola knižnica libetpan zostavená s "
 "podporou SASL, a je nainštalovaný zásuvný modul LOGIN SASL."
 
-#: src/imap.c:980
+#: src/imap.c:977
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Spojenie k %s zlyhalo: prihlásenie odmietnuté.%s"
 
-#: src/imap.c:984
+#: src/imap.c:981
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "Spojenie k %s zlyhalo: prihlásenie odmietnuté.%s\n"
 
-#: src/imap.c:1002
+#: src/imap.c:999
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Spojenie k %s zlyhalo"
 
-#: src/imap.c:1009 src/imap.c:1012
-#, fuzzy, c-format
+#: src/imap.c:1006 src/imap.c:1009
+#, c-format
 msgid "IMAP connection to %s has been disconnected. Reconnecting...\n"
-msgstr "IMAP4 spojenie k %s bolo prerušené. Obnovujem…\n"
+msgstr "Spojenie IMAP k %s bolo prerušené. Obnovujem…\n"
 
-#: src/imap.c:1042 src/imap.c:3686 src/imap.c:4345 src/imap.c:4439
-#: src/imap.c:4617 src/imap.c:5428
+#: src/imap.c:1039 src/imap.c:3655 src/imap.c:4314 src/imap.c:4408
+#: src/imap.c:4586 src/imap.c:5397
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr "Na prístup k serveru IMAP potrebuje Claws Mail pripojenie k sieti."
 
-#: src/imap.c:1151 src/inc.c:811 src/news.c:388 src/send_message.c:282
+#: src/imap.c:1148 src/inc.c:811 src/news.c:388 src/send_message.c:282
 msgid "Insecure connection"
 msgstr "Nezabezpečené spojenie"
 
-#: src/imap.c:1152 src/inc.c:812 src/news.c:389 src/send_message.c:283
-#, fuzzy
+#: src/imap.c:1149 src/inc.c:812 src/news.c:389 src/send_message.c:283
 msgid ""
 "This connection is configured to be secured using SSL/TLS, but SSL/TLS is "
 "not available in this build of Claws Mail. \n"
@@ -5888,134 +5808,132 @@ msgid ""
 "Do you want to continue connecting to this server? The communication would "
 "not be secure."
 msgstr ""
-"Toto spojenie je nastavené tak, aby na zabezpečenie používalo  SSL, ale v "
-"tomto zostavení Claws Mail nie je SSL dostupné. \n"
+"Toto spojenie je nastavené tak, aby na zabezpečenie používalo SSL/TLS, ale v "
+"tomto zostavení Claws Mail nie je SSL/TLS dostupné. \n"
 "\n"
 "Chcete pokračovať v pripájaní na tento server? Komunikácia nebude "
 "zabezpečená."
 
-#: src/imap.c:1158 src/inc.c:818 src/news.c:395 src/send_message.c:289
+#: src/imap.c:1155 src/inc.c:818 src/news.c:395 src/send_message.c:289
 msgid "Con_tinue connecting"
 msgstr "Po_kračovať v pripájaní"
 
-#: src/imap.c:1168
-#, fuzzy, c-format
+#: src/imap.c:1165
+#, c-format
 msgid "Account '%s': Connecting to IMAP server: %s:%d..."
-msgstr "Účet „%s”: Pripájanie k serveru IMAP4: %s: %d…"
+msgstr "Účet „%s”: Pripájanie k serveru IMAP: %s: %d…"
 
-#: src/imap.c:1216
-#, fuzzy, c-format
+#: src/imap.c:1213
+#, c-format
 msgid "Can't connect to IMAP server: %s:%d"
-msgstr "Nepodarilo sa pripojiť k serveru IMAP4: %s:%d"
+msgstr "Nemožno sa pripojiť k serveru IMAP: %s:%d"
 
-#: src/imap.c:1219
-#, fuzzy, c-format
+#: src/imap.c:1216
+#, c-format
 msgid "Can't connect to IMAP server: %s:%d\n"
-msgstr "Nepodarilo sa pripojiť k serveru IMAP4: %s:%d\n"
+msgstr "Nemožno sa pripojiť k serveru IMAP: %s:%d\n"
 
-#: src/imap.c:1252 src/imap.c:4107
-#, fuzzy
+#: src/imap.c:1249 src/imap.c:4076
 msgid "Can't start STARTTLS session.\n"
-msgstr "Nemožno vytvoriť TLS spojenie.\n"
+msgstr "Nemožno vytvoriť reláciu STARTTLS.\n"
 
-#: src/imap.c:1319
+#: src/imap.c:1316
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Nepodarilo sa pripojiť k IMAP serveru %s.\n"
 
-#: src/imap.c:1322
+#: src/imap.c:1319
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Nepodarilo sa pripojiť k IMAP serveru %s."
 
-#: src/imap.c:1749
+#: src/imap.c:1746
 msgid "Adding messages..."
 msgstr "Pridávam správy…"
 
-#: src/imap.c:1954 src/mh.c:529
+#: src/imap.c:1951 src/mh.c:529
 msgid "Copying messages..."
 msgstr "Kopírujem správy…"
 
-#: src/imap.c:2547
+#: src/imap.c:2544
 msgid "can't set deleted flags\n"
 msgstr "nemožno nastaviť príznak zmazania\n"
 
-#: src/imap.c:2554 src/imap.c:5058
+#: src/imap.c:2551 src/imap.c:5027
 msgid "can't expunge\n"
 msgstr "nemožno odstrániť\n"
 
-#: src/imap.c:2905
+#: src/imap.c:2902
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Hľadám neodoberané zložky v %s…"
 
-#: src/imap.c:2908
+#: src/imap.c:2905
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Hľadám podzložky %s…"
 
-#: src/imap.c:3226
+#: src/imap.c:3195
 msgid "can't create mailbox: LIST failed\n"
 msgstr "nemožno vytvoriť schránku: príkaz LIST zlyhal\n"
 
-#: src/imap.c:3241
+#: src/imap.c:3210
 msgid "can't create mailbox\n"
 msgstr "nemožno vytvoriť schránku\n"
 
-#: src/imap.c:3372
+#: src/imap.c:3341
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "nemožno premenovať schránku: %s na %s\n"
 
-#: src/imap.c:3485
+#: src/imap.c:3454
 msgid "can't delete mailbox\n"
 msgstr "nemožno odstrániť schránku \n"
 
-#: src/imap.c:3764
+#: src/imap.c:3733
 msgid "LIST failed\n"
 msgstr "LIST zlyhal\n"
 
-#: src/imap.c:3849
+#: src/imap.c:3818
 msgid "Flagging messages..."
 msgstr "Označujem správy…"
 
-#: src/imap.c:3952
+#: src/imap.c:3921
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "nemožno vybrať zložku: %s\n"
 
-#: src/imap.c:4104
-#, fuzzy
+#: src/imap.c:4073
 msgid "Server requires STARTTLS to log in.\n"
-msgstr "Server na prihlásenie vyžaduje TLS.\n"
+msgstr "Server na prihlásenie vyžaduje STARTTLS.\n"
 
-#: src/imap.c:4114
+#: src/imap.c:4083
 msgid "Can't refresh capabilities.\n"
 msgstr "Nepodarilo  sa obnoviť možnosti servera.\n"
 
-#: src/imap.c:4119
-#, fuzzy, c-format
+#: src/imap.c:4088
+#, c-format
 msgid ""
 "Connection to %s failed: server requires STARTTLS, but Claws Mail has been "
 "compiled without STARTTLS support.\n"
 msgstr ""
-"Pripojenie k %s zlyhalo: server vyžaduje TLS, ale Claws Mail bol zostavený "
-"bez podpory TLS.\n"
+"Pripojenie k %s zlyhalo: server vyžaduje STARTTLS, ale Claws Mail bol "
+"zostavený bez podpory STARTTLS.\n"
 
-#: src/imap.c:4127
+#: src/imap.c:4096
 msgid "Server logins are disabled.\n"
 msgstr "Tento server neumožňuje prihlásenie.\n"
 
-#: src/imap.c:4350
+#: src/imap.c:4319
 msgid "Fetching message..."
 msgstr "Sťahujem správu…"
 
-#: src/imap.c:5051
+#: src/imap.c:5020
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "nemožno nastaviť príznaky zmazania: %d\n"
 
-#: src/imap.c:6086
+#: src/imap.c:6055
 msgid ""
 "You have one or more IMAP accounts defined. However this version of Claws "
 "Mail has been built without IMAP support; your IMAP accounts are disabled.\n"
@@ -6066,7 +5984,7 @@ msgstr "_Odoberané zložky"
 msgid "_Subscribe..."
 msgstr "O_doberať…"
 
-#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:168
+#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:169
 msgid "_Unsubscribe..."
 msgstr "_Odhlásiť sa…"
 
@@ -6102,21 +6020,21 @@ msgid "Inherit properties from parent folder"
 msgstr "Zdediť vlastnosti z rodičovskej zložky"
 
 #: src/imap_gtk.c:259 src/mh_gtk.c:252 src/news_gtk.c:290
-#: src/plugins/mailmbox/plugin_gtk.c:411 src/plugins/rssyl/rssyl_cb_menu.c:197
-#: src/plugins/vcalendar/vcal_folder.c:2044
+#: src/plugins/mailmbox/plugin_gtk.c:421 src/plugins/rssyl/rssyl_cb_menu.c:197
+#: src/plugins/vcalendar/vcal_folder.c:2055
 #, c-format
 msgid "Input new name for '%s':"
 msgstr "Zadajte nový názov pre „%s”:"
 
-#: src/imap_gtk.c:261 src/mh_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:412
+#: src/imap_gtk.c:261 src/mh_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:422
 #: src/plugins/rssyl/rssyl_cb_menu.c:198
-#: src/plugins/vcalendar/vcal_folder.c:2045
+#: src/plugins/vcalendar/vcal_folder.c:2056
 msgid "Rename folder"
 msgstr "Premenovať zložku"
 
 #: src/imap_gtk.c:290 src/mh_gtk.c:280 src/news_gtk.c:312
-#: src/plugins/mailmbox/plugin_gtk.c:442 src/plugins/rssyl/rssyl_cb_menu.c:224
-#: src/plugins/vcalendar/vcal_folder.c:2065
+#: src/plugins/mailmbox/plugin_gtk.c:452 src/plugins/rssyl/rssyl_cb_menu.c:224
+#: src/plugins/vcalendar/vcal_folder.c:2076
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -6124,7 +6042,23 @@ msgstr ""
 "Nemožno premenovať zložku.\n"
 "Nový názov je neprípustný."
 
-#: src/imap_gtk.c:357 src/mh_gtk.c:203 src/plugins/rssyl/rssyl_cb_menu.c:152
+#: src/imap_gtk.c:318 src/mh_gtk.c:308 src/plugins/mailmbox/plugin_gtk.c:373
+#: src/summaryview.c:4626
+msgid "Select folder to move selected message to"
+msgid_plural "Select folder to move selected messages to"
+msgstr[0] "Zvoľte zložku na presun správy"
+msgstr[1] "Zvoľte zložku na presun správ"
+msgstr[2] "Zvoľte zložku na presun správ"
+
+#: src/imap_gtk.c:339 src/mh_gtk.c:329 src/plugins/mailmbox/plugin_gtk.c:394
+#: src/summaryview.c:4711
+msgid "Select folder to copy selected message to"
+msgid_plural "Select folder to copy selected messages to"
+msgstr[0] "Zvoľte zložku na kopírovanie správy"
+msgstr[1] "Zvoľte zložku na kopírovanie správ"
+msgstr[2] "Zvoľte zložku na kopírovanie správ"
+
+#: src/imap_gtk.c:367 src/mh_gtk.c:203 src/plugins/rssyl/rssyl_cb_menu.c:152
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted. Recovery "
@@ -6137,44 +6071,44 @@ msgstr ""
 "\n"
 "Naozaj chcete pokračovať?"
 
-#: src/imap_gtk.c:376 src/news_gtk.c:265 src/plugins/mailmbox/plugin_gtk.c:347
+#: src/imap_gtk.c:386 src/news_gtk.c:265 src/plugins/mailmbox/plugin_gtk.c:347
 #: src/plugins/rssyl/rssyl_cb_menu.c:171
-#: src/plugins/vcalendar/vcal_folder.c:1998
+#: src/plugins/vcalendar/vcal_folder.c:2009
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Nemožno odstrániť zložku „%s”."
 
-#: src/imap_gtk.c:498
+#: src/imap_gtk.c:508
 #, c-format
 msgid "Do you want to search for unsubscribed subfolders of '%s'?"
 msgstr "Naozaj chcete vyhľadať neodoberané podzložky „%s”?"
 
-#: src/imap_gtk.c:501
+#: src/imap_gtk.c:511
 msgid "Search recursively"
 msgstr "Hľadať rekurzívne"
 
-#: src/imap_gtk.c:506 src/imap_gtk.c:565
+#: src/imap_gtk.c:516 src/imap_gtk.c:575
 msgid "Subscriptions"
 msgstr "Odoberané zložky"
 
-#: src/imap_gtk.c:507
+#: src/imap_gtk.c:517
 msgid "_Search"
 msgstr "_Hľadať"
 
-#: src/imap_gtk.c:517
+#: src/imap_gtk.c:527
 #, c-format
 msgid "Choose a subfolder of %s to subscribe to: "
 msgstr "Zvoľte podzložku %s, ktorú chcete odoberať: "
 
-#: src/imap_gtk.c:528 src/mainwindow.c:679
+#: src/imap_gtk.c:538 src/mainwindow.c:680
 msgid "Subscribe"
 msgstr "Odoberať"
 
-#: src/imap_gtk.c:530 src/imap_gtk.c:532
+#: src/imap_gtk.c:540 src/imap_gtk.c:542
 msgid "All of them"
 msgstr "Všetky"
 
-#: src/imap_gtk.c:548
+#: src/imap_gtk.c:558
 msgid ""
 "This folder is already subscribed and has no unsubscribed subfolders.\n"
 "\n"
@@ -6187,29 +6121,29 @@ msgstr ""
 "poštového klienta, použite voľbu „Skontrolovať nové zložky” koreňovej zložky "
 "poštovej schránky."
 
-#: src/imap_gtk.c:557
+#: src/imap_gtk.c:567
 #, c-format
 msgid "Do you want to %s the '%s' folder?"
 msgstr "Naozaj chcete %s zložku „%s”?"
 
-#: src/imap_gtk.c:558
+#: src/imap_gtk.c:568
 msgid "subscribe"
 msgstr "odoberať"
 
-#: src/imap_gtk.c:558
+#: src/imap_gtk.c:568
 msgid "unsubscribe"
 msgstr "odhlásiť"
 
-#: src/imap_gtk.c:560 src/prefs_folder_item.c:1432 src/prefs_folder_item.c:1460
-#: src/prefs_folder_item.c:1488
+#: src/imap_gtk.c:570 src/prefs_folder_item.c:1447 src/prefs_folder_item.c:1475
+#: src/prefs_folder_item.c:1503
 msgid "Apply to subfolders"
 msgstr "Použiť aj na podzložky"
 
-#: src/imap_gtk.c:566
+#: src/imap_gtk.c:576
 msgid "_Subscribe"
 msgstr "_Odoberať"
 
-#: src/imap_gtk.c:567 src/news_gtk.c:252
+#: src/imap_gtk.c:577 src/news_gtk.c:252
 msgid "_Unsubscribe"
 msgstr "_Odhlásiť sa"
 
@@ -6245,6 +6179,10 @@ msgstr "Nemožno nájsť cieľovú zložku."
 msgid "Select importing file"
 msgstr "Zvoľte súbor na importovanie"
 
+#: src/import.c:272
+msgid "Select folder to import to"
+msgstr "Zvoľte zložku na import"
+
 #: src/importldif.c:185
 msgid "Please specify address book name and file to import."
 msgstr "Prosím zvoľte názov adresára a súboru na import."
@@ -6433,16 +6371,16 @@ msgstr "Hotovo (žiadne nové správy)"
 msgid "Connection failed"
 msgstr "Spojenie zlyhalo"
 
-#: src/inc.c:649 src/plugins/managesieve/managesieve.c:886
+#: src/inc.c:649 src/plugins/managesieve/managesieve.c:887
 msgid "Auth failed"
 msgstr "Autentifikácia zlyhala"
 
-#: src/inc.c:656 src/prefs_matcher.c:398 src/prefs_summaries.c:446
-#: src/prefs_summary_column.c:88 src/summaryview.c:2808 src/summaryview.c:6277
+#: src/inc.c:656 src/prefs_matcher.c:398 src/prefs_summaries.c:454
+#: src/prefs_summary_column.c:88 src/summaryview.c:2806 src/summaryview.c:6319
 msgid "Locked"
 msgstr "Správa je zamknutá"
 
-#: src/inc.c:666 src/plugins/spamassassin/spamassassin_gtk.c:377
+#: src/inc.c:666 src/plugins/spamassassin/spamassassin_gtk.c:378
 msgid "Timeout"
 msgstr "Časový limit"
 
@@ -6630,7 +6568,7 @@ msgstr "Niektoré SN"
 msgid "Nick Name"
 msgstr "Prezývka"
 
-#: src/main.c:244
+#: src/main.c:246
 #, c-format
 msgid ""
 "File '%s' already exists.\n"
@@ -6639,7 +6577,7 @@ msgstr ""
 "Súbor „%s” už existuje.\n"
 "Zložku nemožno vytvoriť."
 
-#: src/main.c:365
+#: src/main.c:367
 #, c-format
 msgid ""
 "Configuration for %s found.\n"
@@ -6648,7 +6586,7 @@ msgstr ""
 "Bolo nájdené nastavenie pre %s.\n"
 "Chcete konvertovať toto nastavenie?"
 
-#: src/main.c:367
+#: src/main.c:369
 #, c-format
 msgid ""
 "\n"
@@ -6662,11 +6600,11 @@ msgstr ""
 "previesť do Claws Mail pomocou skriptu dostupného na\n"
 "%s."
 
-#: src/main.c:379
+#: src/main.c:381
 msgid "Keep old configuration"
 msgstr "Zachovať pôvodné nastavenie"
 
-#: src/main.c:382
+#: src/main.c:384
 msgid ""
 "Keeping a backup will allow you to go back to an older version, but may take "
 "a while if you have cached IMAP or News data, and will take some extra room "
@@ -6676,31 +6614,31 @@ msgstr ""
 "môže chvíľu trvať, najmä ak máte viacero dočasných súborov pre údaje IMAP "
 "alebo NNTP, a zaberie viac miesta na disku."
 
-#: src/main.c:390
+#: src/main.c:392
 msgid "Migration of configuration"
 msgstr "Migrácia konfigurácie"
 
-#: src/main.c:401
+#: src/main.c:403
 msgid "Copying configuration... This may take a while..."
 msgstr "Kopírujem konfiguráciu… Môže to nejakú dobu trvať…"
 
-#: src/main.c:410
+#: src/main.c:412
 msgid "Migration failed!"
 msgstr "Migrácia zlyhala!"
 
-#: src/main.c:419
+#: src/main.c:421
 msgid "Migrating configuration..."
 msgstr "Migrujem konfiguráciu…"
 
-#: src/main.c:1120
+#: src/main.c:1128
 msgid "g_thread is not supported by glib.\n"
 msgstr "glib nepodporuje g_thread.\n"
 
-#: src/main.c:1140 src/main.c:1144 src/main.c:1148
+#: src/main.c:1148 src/main.c:1152 src/main.c:1156
 msgid "(or older)"
 msgstr "(alebo staršia)"
 
-#: src/main.c:1449
+#: src/main.c:1457
 #, c-format
 msgid ""
 "The following plugin failed to load. Check the Plugins configuration for "
@@ -6723,7 +6661,7 @@ msgstr[2] ""
 "nastavení zásuvných modulov.\n"
 "%s"
 
-#: src/main.c:1500
+#: src/main.c:1508
 msgid ""
 "Claws Mail has detected a configured mailbox, but it is incomplete. It is "
 "possibly due to a failing IMAP account. Use \"Rebuild folder tree\" on the "
@@ -6733,7 +6671,7 @@ msgstr ""
 "pravdepodobne spôsobené zlyhávajúcim účtom IMAP. Na pokus o jej opravu "
 "použite voľbu „Obnoviť strom zložiek” z kontextového menu koreňovej zložky."
 
-#: src/main.c:1506
+#: src/main.c:1514
 msgid ""
 "Claws Mail has detected a configured mailbox, but could not load it. It is "
 "probably provided by an out-of-date external plugin. Please reinstall the "
@@ -6743,36 +6681,36 @@ msgstr ""
 "Pravdepodobne je vytvorená zastaralým zásuvným modulom. Prosím, znova "
 "nainštalujte zásuvný modul a skúste znova."
 
-#: src/main.c:1751
+#: src/main.c:1759
 msgid "Missing filename\n"
 msgstr "Chýba meno súboru\n"
 
-#: src/main.c:1758
+#: src/main.c:1766
 msgid "Cannot open filename for reading\n"
 msgstr "Súbor nemožno otvoriť na čítanie\n"
 
-#: src/main.c:1769
+#: src/main.c:1777
 msgid "Malformed header\n"
 msgstr "Nesprávny formát hlavičky\n"
 
-#: src/main.c:1776
+#: src/main.c:1784
 msgid "Duplicated 'To:' header\n"
 msgstr "Duplikovaná hlavička „To:”\n"
 
-#: src/main.c:1787
+#: src/main.c:1795
 msgid "Missing required 'To:' header\n"
 msgstr "Chýba vyžadovaná hlavička „To:”\n"
 
-#: src/main.c:1930
+#: src/main.c:1938
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Použitie: %s [VOĽBY]…\n"
 
-#: src/main.c:1932
+#: src/main.c:1940
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adresa]     otvorí okno na písanie novej správy"
 
-#: src/main.c:1933
+#: src/main.c:1941
 msgid ""
 "  --compose-from-file file\n"
 "                         open composition window with data from given file;\n"
@@ -6791,11 +6729,11 @@ msgstr ""
 "po prázdny\n"
 "                         riadok, potom telo správy – až do konca súboru."
 
-#: src/main.c:1938
+#: src/main.c:1946
 msgid "  --subscribe [uri]      subscribe to the given URI if possible"
 msgstr "  --subscribe [uri]      prihlási k odberu zadanej URI, ak je to možné"
 
-#: src/main.c:1939
+#: src/main.c:1947
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -6805,23 +6743,23 @@ msgstr ""
 "                         otvorí okno na písanie novej správy s pripojenými\n"
 "                         zadanými súbormi"
 
-#: src/main.c:1942
+#: src/main.c:1950
 msgid "  --receive              receive new messages"
 msgstr "  --receive              prijme nové správy"
 
-#: src/main.c:1943
+#: src/main.c:1951
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          prijme nové správy zo všetkých účtov"
 
-#: src/main.c:1944
+#: src/main.c:1952
 msgid "  --cancel-receiving     cancel receiving of messages"
 msgstr "  --cancel-receiving     zruší prijímanie nových správ"
 
-#: src/main.c:1945
+#: src/main.c:1953
 msgid "  --cancel-sending       cancel sending of messages"
 msgstr "  --cancel-sending       zruší odosielanie správ"
 
-#: src/main.c:1946
+#: src/main.c:1954
 msgid ""
 "  --search folder type request [recursive]\n"
 "                         searches mail\n"
@@ -6840,15 +6778,15 @@ msgstr ""
 "                         rekurzívne: nepravda, ak arg. začína 0, n, N, f "
 "alebo F"
 
-#: src/main.c:1953
+#: src/main.c:1961
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 pošle všetky správy vo výstupnej fronte"
 
-#: src/main.c:1954
+#: src/main.c:1962
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [zložka]…   zobrazí celkový počet správ"
 
-#: src/main.c:1955
+#: src/main.c:1963
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -6856,15 +6794,15 @@ msgstr ""
 "  --status-full [zložka]…\n"
 "                         zobrazí stav každej zložky"
 
-#: src/main.c:1957
+#: src/main.c:1965
 msgid "  --statistics           show session statistics"
 msgstr "  --statistics           zobrazí štatistiky relácie"
 
-#: src/main.c:1958
+#: src/main.c:1966
 msgid "  --reset-statistics     reset session statistics"
 msgstr "  --reset-statistics     vymaže štatistiky relácie"
 
-#: src/main.c:1959
+#: src/main.c:1967
 msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"
 "                         folder is a folder id like 'folder/sub_folder'"
@@ -6874,35 +6812,35 @@ msgstr ""
 "                         zložka je identifikátor zložky, napr. „zložka/"
 "pod_zložka”"
 
-#: src/main.c:1961
+#: src/main.c:1969
 msgid "  --online               switch to online mode"
 msgstr "  --online               prepne do online režimu"
 
-#: src/main.c:1962
+#: src/main.c:1970
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              prepne do odpojeného režimu"
 
-#: src/main.c:1963
+#: src/main.c:1971
 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr "  --exit --quit -q       ukončí Claws Mail"
 
-#: src/main.c:1964
+#: src/main.c:1972
 msgid "  --debug                debug mode"
 msgstr "  --debug                ladiaci mód"
 
-#: src/main.c:1965
+#: src/main.c:1973
 msgid "  --toggle-debug         toggle debug mode"
 msgstr "  --toggle-debug         prepne ladiaci mód"
 
-#: src/main.c:1966
+#: src/main.c:1974
 msgid "  --help -h              display this help and exit"
 msgstr "  --help -h              zobrazí tohoto pomocníka a ukončí program"
 
-#: src/main.c:1967
+#: src/main.c:1975
 msgid "  --version -v           output version information and exit"
 msgstr "  --version -v           zobrazí informácie o verzii a ukončí program"
 
-#: src/main.c:1968
+#: src/main.c:1976
 msgid ""
 "  --version-full -V      output version and built-in features information "
 "and exit"
@@ -6910,11 +6848,11 @@ msgstr ""
 "  --version-full -V      zobrazí informácie o verzii, zabudovaných "
 "vlastnostiach a ukončí program"
 
-#: src/main.c:1969
+#: src/main.c:1977
 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           výstupný konfiguračný adresár"
 
-#: src/main.c:1970
+#: src/main.c:1978
 msgid ""
 "  --alternate-config-dir [dir]\n"
 "                         use specified configuration directory"
@@ -6922,7 +6860,7 @@ msgstr ""
 "  --alternate-config-dir [adresár]\n"
 "                         použiť iný konfiguračný adresár"
 
-#: src/main.c:1972
+#: src/main.c:1980
 msgid ""
 "  --geometry -geometry WxH+X+Y\n"
 "                         set geometry for main window"
@@ -6930,843 +6868,846 @@ msgstr ""
 "  --geometry -geometry WxH+X+Y\n"
 "                         nastaví geometriu hlavného okna"
 
-#: src/main.c:2025
+#: src/main.c:2033
 msgid "Unknown option\n"
 msgstr "Neznáma voľba\n"
 
-#: src/main.c:2043
+#: src/main.c:2051
 #, c-format
 msgid "Processing (%s)..."
 msgstr "Spracovanie (%s)…"
 
-#: src/main.c:2046
+#: src/main.c:2054
 msgid "top level folder"
 msgstr "zložka najvyššej úrovne"
 
-#: src/main.c:2129
+#: src/main.c:2137
 msgid "Queued messages"
 msgstr "Správy vo fronte"
 
-#: src/main.c:2130
+#: src/main.c:2138
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Vo fronte sú neodoslané správy. Ukončiť program?"
 
-#: src/main.c:2872
+#: src/main.c:2880
 msgid "NetworkManager: network is online.\n"
 msgstr "NetworkManager: sieť je pripojená.\n"
 
-#: src/main.c:2878
+#: src/main.c:2886
 msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: sieť nie je pripojená.\n"
 
-#: src/mainwindow.c:511 src/messageview.c:208
+#: src/mainwindow.c:513 src/messageview.c:208
 msgid "_File"
 msgstr "_Súbor"
 
-#: src/mainwindow.c:513 src/messageview.c:210 src/summaryview.c:435
+#: src/mainwindow.c:515 src/messageview.c:210 src/summaryview.c:435
 msgid "_View"
 msgstr "Zo_braziť"
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:518
 msgid "_Configuration"
 msgstr "Nastav_enie"
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:522
 msgid "_Add mailbox"
 msgstr "Pridať m_ailbox"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:523
 msgid "MH..."
 msgstr "MH…"
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:526
 msgid "Change mailbox order..."
 msgstr "Zmeniť poradie schránok…"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:529
 msgid "_Import mbox file..."
 msgstr "_Importovať súbor mbox"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:530
 msgid "_Export to mbox file..."
 msgstr "_Exportovať do súboru mbox"
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:531
 msgid "_Export selected to mbox file..."
 msgstr "Exportovať _výber do súboru mbox…"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:533
 msgid "Empty all _Trash folders"
 msgstr "Vyčistiť všetky _koše"
 
-#: src/mainwindow.c:534 src/messageview.c:217
+#: src/mainwindow.c:536 src/messageview.c:217
 msgid "_Save email as..."
 msgstr "_Uložiť email ako…"
 
-#: src/mainwindow.c:535 src/messageview.c:218
+#: src/mainwindow.c:537 src/messageview.c:218
 msgid "_Save part as..."
 msgstr "_Uložiť časť ako…"
 
-#: src/mainwindow.c:538 src/messageview.c:219
+#: src/mainwindow.c:540 src/messageview.c:219
 msgid "Page setup..."
 msgstr "Nastavenie strany…"
 
-#: src/mainwindow.c:539 src/messageview.c:220
+#: src/mainwindow.c:541 src/messageview.c:220
 msgid "_Print..."
 msgstr "_Tlačiť…"
 
-#: src/mainwindow.c:541
+#: src/mainwindow.c:543
 msgid "Synchronise folders"
 msgstr "S_ynchronizovať zložky"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:545
 msgid "E_xit"
 msgstr "_Skončiť"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:550
 msgid "Select _thread"
 msgstr "Zvoliť _vlákno"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:552
 msgid "_Find in current message..."
 msgstr "_Nájsť v aktuálnej správe"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:554
 msgid "_Quick search"
 msgstr "_Rýchle vyhľadanie"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:557
 msgid "Show or hi_de"
 msgstr "_Ukázať alebo skryť"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:558
 msgid "_Toolbar"
 msgstr "Panel nás_trojov"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:560
 msgid "Set displayed _columns"
 msgstr "Nastav_iť zobrazované stĺpce"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:561
 msgid "In _folder list..."
 msgstr "V _zozname zložiek…"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:562
 msgid "In _message list..."
 msgstr "V zozname _správ.."
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:567
 msgid "La_yout"
 msgstr "Rozmiestnenie _okien"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:569
 msgid "_Sort"
 msgstr "_Radiť"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:571
 msgid "_Attract by subject"
 msgstr "Zos_kupiť podľa predmetu"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:573
 msgid "E_xpand all threads"
 msgstr "_Rozbaliť všetky vlákna"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:574
 msgid "Co_llapse all threads"
 msgstr "Zba_liť všetky vlákna"
 
-#: src/mainwindow.c:575 src/messageview.c:231
+#: src/mainwindow.c:576 src/messageview.c:231
 msgid "_Go to"
 msgstr "Pre_jsť na"
 
-#: src/mainwindow.c:576 src/messageview.c:232
+#: src/mainwindow.c:577 src/messageview.c:232
 msgid "_Previous message"
 msgstr "_Predošlá správa"
 
-#: src/mainwindow.c:577 src/messageview.c:233
+#: src/mainwindow.c:578 src/messageview.c:233
 msgid "_Next message"
 msgstr "Ďa_lšia správa"
 
-#: src/mainwindow.c:579 src/messageview.c:235
+#: src/mainwindow.c:580 src/messageview.c:235
 msgid "P_revious unread message"
 msgstr "P_redchádzajúca neprečítaná správa"
 
-#: src/mainwindow.c:580 src/messageview.c:236
+#: src/mainwindow.c:581 src/messageview.c:236
 msgid "N_ext unread message"
 msgstr "Ďalšia _neprečítaná správa."
 
-#: src/mainwindow.c:582 src/messageview.c:238
+#: src/mainwindow.c:583 src/messageview.c:238
 msgid "Previous ne_w message"
 msgstr "Predchádzajúca no_vá správa"
 
-#: src/mainwindow.c:583 src/messageview.c:239
+#: src/mainwindow.c:584 src/messageview.c:239
 msgid "Ne_xt new message"
 msgstr "Ďalšia no_vá správa"
 
-#: src/mainwindow.c:585 src/messageview.c:241
+#: src/mainwindow.c:586 src/messageview.c:241
 msgid "Previous _marked message"
 msgstr "Predchádzajúca _označená správa"
 
-#: src/mainwindow.c:586 src/messageview.c:242
+#: src/mainwindow.c:587 src/messageview.c:242
 msgid "Next m_arked message"
 msgstr "Ďalšia _označená správa"
 
-#: src/mainwindow.c:588 src/messageview.c:244
+#: src/mainwindow.c:589 src/messageview.c:244
 msgid "Previous _labeled message"
 msgstr "Predchádzajúca správa s návestí_m"
 
-#: src/mainwindow.c:589 src/messageview.c:245
+#: src/mainwindow.c:590 src/messageview.c:245
 msgid "Next la_beled message"
 msgstr "Ďalšia správa s návestí_m"
 
-#: src/mainwindow.c:591 src/messageview.c:247
+#: src/mainwindow.c:592 src/messageview.c:247
 msgid "Previous opened message"
 msgstr "Naposledy ot_vorená správa"
 
-#: src/mainwindow.c:592 src/messageview.c:248
+#: src/mainwindow.c:593 src/messageview.c:248
 msgid "Next opened message"
 msgstr "Ďalšia o_tvorená správa"
 
-#: src/mainwindow.c:594 src/messageview.c:250
+#: src/mainwindow.c:595 src/messageview.c:250
 msgid "Parent message"
 msgstr "Rodičovská správa"
 
-#: src/mainwindow.c:596 src/messageview.c:252
+#: src/mainwindow.c:597 src/messageview.c:252
 msgid "Next unread _folder"
 msgstr "Ďalšia nepr_ečítaná zložka"
 
-#: src/mainwindow.c:597 src/messageview.c:253
+#: src/mainwindow.c:598 src/messageview.c:253
 msgid "F_older..."
 msgstr "_Zložka..."
 
-#: src/mainwindow.c:599 src/messageview.c:255 src/mimeview.c:200
+#: src/mainwindow.c:600 src/messageview.c:255 src/mimeview.c:200
 msgid "Next part"
 msgstr "Ďalšia časť"
 
-#: src/mainwindow.c:600 src/messageview.c:256 src/mimeview.c:201
+#: src/mainwindow.c:601 src/messageview.c:256 src/mimeview.c:201
 msgid "Previous part"
 msgstr "Predošlá časť"
 
-#: src/mainwindow.c:603 src/messageview.c:257
+#: src/mainwindow.c:604 src/messageview.c:257
 msgid "Message scroll"
 msgstr "Posúvanie správy"
 
-#: src/mainwindow.c:604 src/messageview.c:258
+#: src/mainwindow.c:605 src/messageview.c:258
 msgid "Previous line"
 msgstr "Predošlý riadok"
 
-#: src/mainwindow.c:605 src/messageview.c:259
+#: src/mainwindow.c:606 src/messageview.c:259
 msgid "Next line"
 msgstr "Ďalší riadok"
 
-#: src/mainwindow.c:606 src/messageview.c:260 src/printing.c:481
+#: src/mainwindow.c:607 src/messageview.c:260 src/printing.c:481
 msgid "Previous page"
 msgstr "Predošlá strana"
 
-#: src/mainwindow.c:607 src/messageview.c:261 src/printing.c:488
+#: src/mainwindow.c:608 src/messageview.c:261 src/printing.c:488
 msgid "Next page"
 msgstr "Ďalšia strana"
 
-#: src/mainwindow.c:625 src/messageview.c:279
+#: src/mainwindow.c:626 src/messageview.c:279
 msgid "Decode"
 msgstr "Dekódovať"
 
-#: src/mainwindow.c:632
+#: src/mainwindow.c:633
 msgid "Open in new _window"
 msgstr "Otvoriť v _novom okne"
 
-#: src/mainwindow.c:633 src/messageview.c:286
+#: src/mainwindow.c:634 src/messageview.c:286
 msgid "Mess_age source"
 msgstr "Zdrojový kód správ_y"
 
-#: src/mainwindow.c:635 src/messageview.c:287
+#: src/mainwindow.c:636 src/messageview.c:287
 msgid "Message part"
 msgstr "Správová časť"
 
-#: src/mainwindow.c:636 src/messageview.c:288
+#: src/mainwindow.c:637 src/messageview.c:288
 msgid "View as text"
 msgstr "Zobraziť ako text"
 
-#: src/mainwindow.c:637 src/messageview.c:289 src/toolbar.c:403
+#: src/mainwindow.c:638 src/messageview.c:289 src/toolbar.c:491
 msgid "Open"
 msgstr "Otvoriť"
 
-#: src/mainwindow.c:639 src/messageview.c:291
+#: src/mainwindow.c:640 src/messageview.c:291
 msgid "Open with..."
 msgstr "Otvoriť pomocou…"
 
-#: src/mainwindow.c:643 src/messageview.c:294
+#: src/mainwindow.c:644 src/messageview.c:294
 msgid "Quotes"
 msgstr "Citácia"
 
-#: src/mainwindow.c:645
+#: src/mainwindow.c:646
 msgid "_Update summary"
 msgstr "_Aktualizovať sumár"
 
-#: src/mainwindow.c:648
+#: src/mainwindow.c:649
 msgid "Recei_ve"
 msgstr "P_rijať"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:650
 msgid "Get from _current account"
 msgstr "Prijať z _aktuálneho účtu"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:651
 msgid "Get from _all accounts"
 msgstr "Prijať zo _všetkých účtov"
 
-#: src/mainwindow.c:651
+#: src/mainwindow.c:652
 msgid "Cancel receivin_g"
 msgstr "_Zrušiť prijímanie"
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:655
 msgid "_Send queued messages"
 msgstr "Odoslať _správy z fronty"
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:660
 msgid "Compose a_n email message"
 msgstr "_Napísať novú správu"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:661
 msgid "Compose a news message"
 msgstr "Napísať nový príspevok"
 
-#: src/mainwindow.c:662 src/messageview.c:300
+#: src/mainwindow.c:663 src/messageview.c:300
 #: src/plugins/notification/notification_banner.c:95
 msgid "_Reply"
 msgstr "_Odpovedať"
 
-#: src/mainwindow.c:663 src/messageview.c:301 src/summaryview.c:427
+#: src/mainwindow.c:664 src/messageview.c:301 src/summaryview.c:427
 msgid "Repl_y to"
 msgstr "O_dpovedať komu"
 
-#: src/mainwindow.c:666 src/messageview.c:304
+#: src/mainwindow.c:667 src/messageview.c:304
 msgid "Mailing _list"
 msgstr "Emai_lová konferencia"
 
-#: src/mainwindow.c:667
+#: src/mainwindow.c:668
 msgid "Follow-up and reply to"
 msgstr "Sledovať a odpovedať na"
 
-#: src/mainwindow.c:670 src/messageview.c:307 src/toolbar.c:2069
+#: src/mainwindow.c:671 src/messageview.c:307 src/toolbar.c:2368
 msgid "_Forward"
 msgstr "_Poslať ďalej"
 
-#: src/mainwindow.c:671 src/messageview.c:308 src/toolbar.c:2070
+#: src/mainwindow.c:672 src/messageview.c:308 src/toolbar.c:2369
 msgid "For_ward as attachment"
 msgstr "Poslať ďale_j ako prílohu"
 
-#: src/mainwindow.c:672 src/messageview.c:309 src/toolbar.c:2071
+#: src/mainwindow.c:673 src/messageview.c:309 src/toolbar.c:2370
 msgid "Redirec_t"
 msgstr "P_resmerovať"
 
-#: src/mainwindow.c:674
+#: src/mainwindow.c:675
 msgid "Mailing-_List"
 msgstr "Emai_lová-Konferencia"
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:676
 msgid "Post"
 msgstr "Pošta"
 
-#: src/mainwindow.c:677
+#: src/mainwindow.c:678
 msgid "Help"
 msgstr "_Pomocník"
 
-#: src/mainwindow.c:681
+#: src/mainwindow.c:682
 msgid "Unsubscribe"
 msgstr "_Odhlásiť sa"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:684
 msgid "View archive"
 msgstr "Zobraziť archív"
 
-#: src/mainwindow.c:685
+#: src/mainwindow.c:686
 msgid "Contact owner"
 msgstr "kontaktovať vlastníka"
 
-#: src/mainwindow.c:689
+#: src/mainwindow.c:690
 msgid "M_ove..."
 msgstr "Pre_sunúť…"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:691
 msgid "_Copy..."
 msgstr "_Kopírovať…"
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:692
 msgid "Move to _trash"
 msgstr "Presunúť _do koša"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:693
 msgid "_Delete..."
 msgstr "Z_mazať…"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:694
 msgid "Move thread to tr_ash"
 msgstr "Presunúť vlákno do _koša"
 
-#: src/mainwindow.c:694
+#: src/mainwindow.c:695
 msgid "Delete t_hread"
 msgstr "_Zmazať vlákno"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:696
 msgid "Cancel a news message"
 msgstr "Zrušiť príspevo_k"
 
-#: src/mainwindow.c:698 src/mainwindow.c:699 src/summaryview.c:428
+#: src/mainwindow.c:699 src/mainwindow.c:700 src/summaryview.c:428
 msgid "_Mark"
 msgstr "O_značiť"
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:701
 msgid "_Unmark"
 msgstr "O_dznačiť"
 
-#: src/mainwindow.c:703
-msgid "Mark as unr_ead"
-msgstr "Označiť ako n_eprečítané"
-
 #: src/mainwindow.c:704
 msgid "Mark as rea_d"
 msgstr "Označiť ako _prečítané"
 
-#: src/mainwindow.c:706
+#: src/mainwindow.c:705
+msgid "Mark as unr_ead"
+msgstr "Označiť ako n_eprečítané"
+
+#: src/mainwindow.c:707
 msgid "Mark all read"
 msgstr "Označiť _všetky ako prečítané"
 
-#: src/mainwindow.c:708 src/prefs_filtering_action.c:199 src/toolbar.c:208
-#: src/toolbar.c:419
+#: src/mainwindow.c:708
+msgid "Mark all unread"
+msgstr "Označiť všetky ako nprečítané"
+
+#: src/mainwindow.c:710 src/prefs_filtering_action.c:199 src/toolbar.c:242
+#: src/toolbar.c:500
 msgid "Ignore thread"
 msgstr "Ignorovať vlákno"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:711
 msgid "Unignore thread"
 msgstr "Zrušiť ignorovanie vlákna"
 
-#: src/mainwindow.c:710 src/prefs_filtering_action.c:200 src/toolbar.c:209
-#: src/toolbar.c:420
+#: src/mainwindow.c:712 src/prefs_filtering_action.c:200 src/toolbar.c:243
+#: src/toolbar.c:501
 msgid "Watch thread"
 msgstr "Sledovať vlákno"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:713
 msgid "Unwatch thread"
 msgstr "Zrušiť sledovanie vlákna"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:716
 msgid "Mark as _spam"
 msgstr "Označiť ako _spam"
 
-#: src/mainwindow.c:715
+#: src/mainwindow.c:717
 msgid "Mark as _ham"
 msgstr "Označiť ako _nie spam"
 
-#: src/mainwindow.c:718 src/prefs_filtering_action.c:181
+#: src/mainwindow.c:720 src/prefs_filtering_action.c:181 src/toolbar.c:504
 msgid "Lock"
 msgstr "Zamknúť"
 
-#: src/mainwindow.c:719 src/prefs_filtering_action.c:182
+#: src/mainwindow.c:721 src/prefs_filtering_action.c:182 src/toolbar.c:505
 msgid "Unlock"
 msgstr "Odomknúť"
 
-#: src/mainwindow.c:721 src/summaryview.c:429
+#: src/mainwindow.c:723 src/summaryview.c:429
 msgid "Color la_bel"
 msgstr "_Farebné označenie"
 
-#: src/mainwindow.c:722 src/summaryview.c:430
+#: src/mainwindow.c:724 src/summaryview.c:430
 msgid "Ta_gs"
 msgstr "Z_načky"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:727
 msgid "Re-_edit"
 msgstr "Znova _upraviť"
 
-#: src/mainwindow.c:728 src/messageview.c:310 src/mimeview.c:1021
+#: src/mainwindow.c:730 src/messageview.c:310 src/mimeview.c:1021
 msgid "Check signature"
 msgstr "Overiť podpis"
 
-#: src/mainwindow.c:733 src/messageview.c:314
+#: src/mainwindow.c:735 src/messageview.c:314
 msgid "Add sender to address boo_k"
 msgstr "Pridať odosielateľa _do adresára"
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:737
 msgid "C_ollect addresses"
 msgstr "Zoz_bierať adresy"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:738
 msgid "From current _folder..."
 msgstr "Z aktuálnej _zložky…"
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:739
 msgid "From selected _messages..."
 msgstr "Z vybraných _správ…"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:742
 msgid "_Filter all messages in folder"
 msgstr "Filtrovať _všetky správy v zložke"
 
-#: src/mainwindow.c:741
+#: src/mainwindow.c:743
 msgid "Filter _selected messages"
 msgstr "Filtrovať _zvolené správy"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:744
 msgid "Run folder pr_ocessing rules"
 msgstr "Spustiť sprac_ovanie pravidiel"
 
-#: src/mainwindow.c:744 src/messageview.c:317
+#: src/mainwindow.c:746 src/messageview.c:317
 msgid "_Create filter rule"
 msgstr "Vytvor_iť pravidlo filtra"
 
-#: src/mainwindow.c:745 src/mainwindow.c:751 src/messageview.c:318
+#: src/mainwindow.c:747 src/mainwindow.c:753 src/messageview.c:318
 #: src/messageview.c:324
 msgid "_Automatically"
 msgstr "_Automaticky"
 
-#: src/mainwindow.c:746 src/mainwindow.c:752 src/mainwindow.c:858
+#: src/mainwindow.c:748 src/mainwindow.c:754 src/mainwindow.c:860
 #: src/messageview.c:319 src/messageview.c:325
 msgid "By _From"
 msgstr "Podľa _odosielateľa"
 
-#: src/mainwindow.c:747 src/mainwindow.c:753 src/mainwindow.c:859
+#: src/mainwindow.c:749 src/mainwindow.c:755 src/mainwindow.c:861
 #: src/messageview.c:320 src/messageview.c:326
 msgid "By _To"
 msgstr "Podľa _adresáta"
 
-#: src/mainwindow.c:748 src/mainwindow.c:754 src/messageview.c:321
+#: src/mainwindow.c:750 src/mainwindow.c:756 src/messageview.c:321
 #: src/messageview.c:327
 msgid "By _Subject"
 msgstr "Podľa _predmetu"
 
-#: src/mainwindow.c:750 src/messageview.c:323 src/summaryview.c:433
+#: src/mainwindow.c:752 src/messageview.c:323 src/summaryview.c:433
 msgid "Create processing rule"
 msgstr "Vytvoriť pravidlo spracovania"
 
-#: src/mainwindow.c:757 src/messageview.c:331
+#: src/mainwindow.c:759 src/messageview.c:330
 msgid "List _URLs..."
 msgstr "Zobraziť všetky _URL…"
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:766
 msgid "Ch_eck for new messages in all folders"
 msgstr "Skontrolovať nové správy vo všetkých pri_ečinkoch…"
 
-#: src/mainwindow.c:765
+#: src/mainwindow.c:767
 msgid "Delete du_plicated messages"
 msgstr "Zmazať du_plikované správy"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:768
 msgid "In selected folder"
 msgstr "V zvolenej zložke"
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:769
 msgid "In all folders"
 msgstr "Vo všetkých zložkách"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:772
 msgid "E_xecute"
 msgstr "Vyko_nať"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:773
 msgid "Exp_unge"
 msgstr "V_ymazať"
 
-#: src/mainwindow.c:774
-#, fuzzy
+#: src/mainwindow.c:776
 msgid "SSL/TLS cer_tificates"
-msgstr "SSL cer_tifikáty"
+msgstr "Cer_tifikáty SSL/TLS"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:780
 msgid "Filtering Lo_g"
 msgstr "Záznam _filtra"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "Network _Log"
 msgstr "Záznam _siete"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:784
 msgid "_Forget all session passwords"
 msgstr "_Zabudnúť všetky heslá relácie"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:786
 msgid "Forget _master passphrase"
 msgstr "Zabudnúť _hlavnú tajnú vetu"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:790
 msgid "C_hange current account"
 msgstr "Z_meniť aktívny účet"
 
-#: src/mainwindow.c:790
+#: src/mainwindow.c:792
 msgid "_Preferences for current account..."
 msgstr "Nastavenie aktívneho _účtu…"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:793
 msgid "Create _new account..."
 msgstr "Vytvoriť _nový účet…"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:794
 msgid "_Edit accounts..."
 msgstr "_Upraviť účty…"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:797
 msgid "P_references..."
 msgstr "Nas_tavenia…"
 
-#: src/mainwindow.c:796
+#: src/mainwindow.c:798
 msgid "Pre-pr_ocessing..."
 msgstr "Pred-sprac_ovanie…"
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:799
 msgid "Post-pro_cessing..."
 msgstr "Po-spra_covanie…"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:800
 msgid "_Filtering..."
 msgstr "_Filtrovanie…"
 
-#: src/mainwindow.c:799
+#: src/mainwindow.c:801
 msgid "_Templates..."
 msgstr "Ša_blóny…"
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:802
 msgid "_Actions..."
 msgstr "_Akcie…"
 
-#: src/mainwindow.c:801
+#: src/mainwindow.c:803
 msgid "Tag_s..."
 msgstr "Z_načky…"
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:805
 msgid "Plu_gins..."
 msgstr "Zásuvné _moduly…"
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:808
 msgid "_Manual"
 msgstr "_Manuál"
 
-#: src/mainwindow.c:807
+#: src/mainwindow.c:809
 msgid "_Online User-contributed FAQ"
 msgstr "_Online používateľské FAQ"
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:810
 msgid "Icon _Legend"
 msgstr "_Legenda k ikonám"
 
-#: src/mainwindow.c:810
+#: src/mainwindow.c:812
 msgid "Set as default client"
 msgstr "Nastaviť ako predvoleného klienta"
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:819
 msgid "Offline _mode"
 msgstr "Odpojený reži_m"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:820
 msgid "Men_ubar"
 msgstr "Panel nástr_ojov"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:821
 msgid "_Message view"
 msgstr "Zobraze_nie správy"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:823
 msgid "Status _bar"
 msgstr "Stavový ria_dok"
 
-#: src/mainwindow.c:823
+#: src/mainwindow.c:825
 msgid "Column headers"
 msgstr "Hlavičky stĺpcov"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:826
 msgid "Th_read view"
 msgstr "Zobraziť _vlákna"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:827
 msgid "Hide read threads"
 msgstr "Skryť prečítané vlákna"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:828
 msgid "_Hide read messages"
 msgstr "S_kryť prečítané správy"
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:829
 msgid "Hide deleted messages"
 msgstr "Skryť vymazané správy"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:830
 msgid "_Fullscreen"
 msgstr "_Celá obrazovka"
 
-#: src/mainwindow.c:829 src/messageview.c:343
+#: src/mainwindow.c:831 src/messageview.c:342
 msgid "Show all _headers"
 msgstr "Zobraziť všetky _hlavičky"
 
-#: src/mainwindow.c:830 src/messageview.c:344
+#: src/mainwindow.c:832 src/messageview.c:343
 msgid "_Collapse all"
 msgstr "Zba_liť všetky"
 
-#: src/mainwindow.c:831 src/messageview.c:345
+#: src/mainwindow.c:833 src/messageview.c:344
 msgid "Collapse from level _2"
 msgstr "Zbaliť od úrovne _2"
 
-#: src/mainwindow.c:832 src/messageview.c:346
+#: src/mainwindow.c:834 src/messageview.c:345
 msgid "Collapse from level _3"
 msgstr "Zbaliť od úrovne _3"
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:838
 msgid "Text _below icons"
 msgstr "Text _pod ikonami"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:839
 msgid "Text be_side icons"
 msgstr "Text _vedľa ikon"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:840
 msgid "_Icons only"
 msgstr "Len _ikony"
 
-#: src/mainwindow.c:839
+#: src/mainwindow.c:841
 msgid "_Text only"
 msgstr "Len _text"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:848
 msgid "_Standard"
 msgstr "Šta_ndardný"
 
-#: src/mainwindow.c:847
+#: src/mainwindow.c:849
 msgid "_Three columns"
 msgstr "_Tri stĺpce"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:850
 msgid "_Wide message"
 msgstr "Š_iroká správa"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:851
 msgid "W_ide message list"
 msgstr "Široký _zoznam správ"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:852
 msgid "S_mall screen"
 msgstr "_Malá obrazovka"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:856
 msgid "By _number"
 msgstr "Podľa _čísla"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:857
 msgid "By s_ize"
 msgstr "Podľa _veľkosti"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:858
 msgid "By _date"
 msgstr "Podľa _dátumu"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:859
 msgid "By thread date"
 msgstr "Podľa dátumu v_lákna"
 
-#: src/mainwindow.c:860
+#: src/mainwindow.c:862
 msgid "By s_ubject"
 msgstr "Podľa _predmetu"
 
-#: src/mainwindow.c:861
+#: src/mainwindow.c:863
 msgid "By _color label"
 msgstr "Podľa _farebnej menovky"
 
-#: src/mainwindow.c:862
+#: src/mainwindow.c:864
 msgid "By tag"
 msgstr "Podľa _značky"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:865
 msgid "By _mark"
 msgstr "Podľa _označenia"
 
-#: src/mainwindow.c:864
+#: src/mainwindow.c:866
 msgid "By _status"
 msgstr "Podľa _stavu"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:867
 msgid "By a_ttachment"
 msgstr "Podľa _prílohy"
 
-#: src/mainwindow.c:866
+#: src/mainwindow.c:868
 msgid "By score"
 msgstr "Podľa s_kóre"
 
-#: src/mainwindow.c:867
+#: src/mainwindow.c:869
 msgid "By locked"
 msgstr "Podľa _zamknutia"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:870
 msgid "D_on't sort"
 msgstr "_Neradiť"
 
-#: src/mainwindow.c:872 src/prefs_summaries.c:455
+#: src/mainwindow.c:874 src/prefs_summaries.c:463
 msgid "Ascending"
 msgstr "Vzostupne"
 
-#: src/mainwindow.c:873 src/prefs_summaries.c:456
+#: src/mainwindow.c:875 src/prefs_summaries.c:464
 msgid "Descending"
 msgstr "Zostupne"
 
-#: src/mainwindow.c:915 src/messageview.c:388
+#: src/mainwindow.c:917 src/messageview.c:387
 msgid "_Auto detect"
 msgstr "_Automaticky zistiť"
 
-#: src/mainwindow.c:1312 src/summaryview.c:6203
+#: src/mainwindow.c:1314 src/summaryview.c:6245
 msgid "Apply tags..."
 msgstr "Použiť značky…"
 
-#: src/mainwindow.c:1959
+#: src/mainwindow.c:1962
 msgid "Some error(s) happened. Click here to view log."
 msgstr "Nastala chyba(y). Kliknite tu na zobrazenie okna so záznamom."
 
-#: src/mainwindow.c:1974
+#: src/mainwindow.c:1977
 msgid "You are online. Click the icon to go offline"
 msgstr "Ste pripojený. Kliknite na ikonu ak sa chcete odpojiť"
 
-#: src/mainwindow.c:1977
+#: src/mainwindow.c:1980
 msgid "You are offline. Click the icon to go online"
 msgstr "Ste odpojený. Kliknite na ikonu ak sa chcete pripojiť"
 
-#: src/mainwindow.c:1991
+#: src/mainwindow.c:1994
 msgid "Select account"
 msgstr "Zvoliť účet"
 
-#: src/mainwindow.c:2018 src/prefs_logging.c:140
+#: src/mainwindow.c:2021 src/prefs_logging.c:140
 msgid "Network log"
 msgstr "Záznam komunikácie"
 
-#: src/mainwindow.c:2022
+#: src/mainwindow.c:2025
 msgid "Filtering/Processing debug log"
 msgstr "Záznam ladenia filtrovania/spracovania"
 
-#: src/mainwindow.c:2041 src/prefs_logging.c:392
+#: src/mainwindow.c:2044 src/prefs_logging.c:392
 msgid "filtering log enabled\n"
 msgstr "záznam filtrovania zapnutý\n"
 
-#: src/mainwindow.c:2043 src/prefs_logging.c:394
+#: src/mainwindow.c:2046 src/prefs_logging.c:394
 msgid "filtering log disabled\n"
 msgstr "záznam filtrovania vypnutý\n"
 
-#: src/mainwindow.c:2486 src/mainwindow.c:2493 src/mainwindow.c:2536
-#: src/mainwindow.c:2569 src/mainwindow.c:2601 src/mainwindow.c:2646
+#: src/mainwindow.c:2489 src/mainwindow.c:2496 src/mainwindow.c:2539
+#: src/mainwindow.c:2572 src/mainwindow.c:2604 src/mainwindow.c:2649
 #: src/plugins/notification/notification_trayicon.c:372
-#: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1062
+#: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1077
 msgid "Untitled"
 msgstr "Bez názvu"
 
-#: src/mainwindow.c:2647 src/prefs_summary_open.c:114
+#: src/mainwindow.c:2650 src/prefs_summary_open.c:114
 msgid "none"
 msgstr "žiadny"
 
-#: src/mainwindow.c:2904 src/mainwindow.c:2908
+#: src/mainwindow.c:2907 src/mainwindow.c:2911
 msgid "Delete all messages in trash folders?"
 msgstr "Zmazať všetky správy v košoch?"
 
-#: src/mainwindow.c:2905
+#: src/mainwindow.c:2908
 msgid "Don't quit"
 msgstr "Neskončiť"
 
-#: src/mainwindow.c:2934 src/plugins/mailmbox/plugin_gtk.c:189
+#: src/mainwindow.c:2937 src/plugins/mailmbox/plugin_gtk.c:189
 msgid "Add mailbox"
 msgstr "Pridať poštovú schránku"
 
-#: src/mainwindow.c:2935
+#: src/mainwindow.c:2938
 msgid ""
 "Input the location of mailbox.\n"
 "If an existing mailbox is specified, it will be\n"
@@ -7776,18 +7717,18 @@ msgstr ""
 "Ak zadáte názov existujúcej schránky, bude\n"
 "táto automaticky prehľadaná."
 
-#: src/mainwindow.c:2941 src/plugins/mailmbox/plugin_gtk.c:196
+#: src/mainwindow.c:2944 src/plugins/mailmbox/plugin_gtk.c:196
 #: src/plugins/rssyl/rssyl_gtk.c:132
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Schránka „%s” už existuje."
 
-#: src/mainwindow.c:2946 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
+#: src/mainwindow.c:2949 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
 #: src/wizard.c:740
 msgid "Mailbox"
 msgstr "Schránka"
 
-#: src/mainwindow.c:2951 src/plugins/mailmbox/plugin_gtk.c:215 src/setup.c:55
+#: src/mainwindow.c:2954 src/plugins/mailmbox/plugin_gtk.c:215 src/setup.c:55
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -7796,43 +7737,67 @@ msgstr ""
 "Nemožno vytvoriť schránku.\n"
 "Pravdepodobne už niektoré súbory existujú, alebo tam nemáte právo zápisu."
 
-#: src/mainwindow.c:3417
+#: src/mainwindow.c:3423
 msgid "No posting allowed"
 msgstr "Prispievanie nie je povolené"
 
-#: src/mainwindow.c:4000
+#: src/mainwindow.c:4006
 msgid "Mbox import has failed."
 msgstr "Zlyhal import súboru mbox."
 
-#: src/mainwindow.c:4009 src/mainwindow.c:4018
+#: src/mainwindow.c:4015 src/mainwindow.c:4024
 msgid "Export to mbox has failed."
 msgstr "Zlyhal export do mbox."
 
-#: src/mainwindow.c:4059 src/plugins/notification/notification_trayicon.c:548
+#: src/mainwindow.c:4065 src/plugins/notification/notification_trayicon.c:550
 msgid "Exit"
 msgstr "Skončiť"
 
-#: src/mainwindow.c:4059 src/plugins/notification/notification_trayicon.c:548
+#: src/mainwindow.c:4065 src/plugins/notification/notification_trayicon.c:550
 msgid "Exit Claws Mail?"
 msgstr "Skončiť Claws Mail?"
 
-#: src/mainwindow.c:4250
+#: src/mainwindow.c:4256
 msgid "Folder synchronisation"
 msgstr "Synchronizácia zložiek"
 
-#: src/mainwindow.c:4251
+#: src/mainwindow.c:4257
 msgid "Do you want to synchronise your folders now?"
 msgstr "Chcete teraz synchronizovať svoje zložky?"
 
-#: src/mainwindow.c:4252
+#: src/mainwindow.c:4258
 msgid "_Synchronise"
 msgstr "_Synchronizovať"
 
-#: src/mainwindow.c:4693
+#: src/mainwindow.c:4706
 msgid "Deleting duplicated messages..."
 msgstr "Mažem duplicitné správy…"
 
-#: src/mainwindow.c:4730
+#: src/mainwindow.c:4716
+msgid "No duplicate message found in selected folder.\n"
+msgstr "V zvolenej zložke neboli nájdené žiadne duplicitné správy.\n"
+
+#: src/mainwindow.c:4722
+#, c-format
+msgid "Deleted %d duplicate message in selected folder.\n"
+msgid_plural "Deleted %d duplicate messages in selected folder.\n"
+msgstr[0] "Zmazaná %d duplicitná správa v zvolenej zložke.\n"
+msgstr[1] "Zmazané %d duplicitné správy v zvolenej zložke.\n"
+msgstr[2] "Zmazaných %d duplicitných správ v zvolenej zložke.\n"
+
+#: src/mainwindow.c:4726
+#, c-format
+msgid "Marked %d duplicate message for deletion in selected folder.\n"
+msgid_plural "Marked %d duplicate messages for deletion in selected folder.\n"
+msgstr[0] "Označená %d duplicitná správa v zvolenej zložke.\n"
+msgstr[1] "Označené %d duplicitné správy v zvolenej zložke.\n"
+msgstr[2] "Označených %d duplicitných správ v zvolenej zložke.\n"
+
+#: src/mainwindow.c:4764
+msgid "Deleting duplicated messages in all folders..."
+msgstr "Mažem duplicitné správy vo všetkých zložkách…"
+
+#: src/mainwindow.c:4770
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
@@ -7840,39 +7805,48 @@ msgstr[0] "Zmazaná %d duplicitná správa v %d zložkách.\n"
 msgstr[1] "Zmazané %d duplicitné správy v %d zložkách.\n"
 msgstr[2] "Zmazaných %d duplicitných správ v %d zložkách.\n"
 
-#: src/mainwindow.c:4986 src/summaryview.c:5694
+#: src/mainwindow.c:4775
+#, c-format
+msgid "No duplicate message found in %d folders.\n"
+msgstr "Žiadne duplicitné správy v %d zložkách.\n"
+
+#: src/mainwindow.c:4937 src/messageview.c:2657
+msgid "Select folder to go to"
+msgstr "Zvoľte zložku na prechod"
+
+#: src/mainwindow.c:5038 src/summaryview.c:5736
 msgid "Processing rules to apply before folder rules"
 msgstr "Pravidlá spracovania použité pred pravidlami zložky"
 
-#: src/mainwindow.c:4994
+#: src/mainwindow.c:5046
 msgid "Processing rules to apply after folder rules"
 msgstr "Pravidlá spracovania použité po pravidlách zložky"
 
-#: src/mainwindow.c:5002 src/summaryview.c:5705
+#: src/mainwindow.c:5054 src/summaryview.c:5747
 msgid "Filtering configuration"
 msgstr "Nastavenie filtrovania"
 
-#: src/mainwindow.c:5117
+#: src/mainwindow.c:5169
 msgid "Can not register as default client: impossible to get executable path."
 msgstr ""
 "Nemožno registrovať ako predvoleného klienta: nemožné nájsť cestu programu."
 
-#: src/mainwindow.c:5176
+#: src/mainwindow.c:5228
 msgid "Claws Mail has been registered as default client."
 msgstr "Claws Mail bol zaregistrovaný ako predvolený klient."
 
-#: src/mainwindow.c:5178
+#: src/mainwindow.c:5230
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr ""
 "Nemožno registrovať ako predvolený klient: nemožné zapisovať do registra."
 
-#: src/mainwindow.c:5192 src/setup.c:91
+#: src/mainwindow.c:5244 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Prehľadávanie zložky %s%c%s…"
 
-#: src/mainwindow.c:5336
+#: src/mainwindow.c:5388
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
@@ -7903,7 +7877,7 @@ msgid "tag"
 msgstr "značka"
 
 #: src/matcher.c:528 src/matcher.c:533 src/matcher.c:552 src/matcher.c:557
-#: src/message_search.c:212 src/prefs_matcher.c:742 src/summary_search.c:466
+#: src/message_search.c:212 src/prefs_matcher.c:743 src/summary_search.c:514
 msgid "Case sensitive"
 msgstr "Záleží na veľkosti písmen"
 
@@ -7911,21 +7885,21 @@ msgstr "Záleží na veľkosti písmen"
 msgid "Case insensitive"
 msgstr "Nezáleží na veľkosti"
 
-#: src/matcher.c:1849
+#: src/matcher.c:1862
 #, c-format
 msgid "checking if message matches [ %s ]\n"
 msgstr "zisťujem či správa vyhovuje [ %s ]\n"
 
-#: src/matcher.c:1920 src/matcher.c:1939 src/matcher.c:1952
+#: src/matcher.c:1933 src/matcher.c:1952 src/matcher.c:1965
 msgid "message matches\n"
 msgstr "správa vyhovuje\n"
 
-#: src/matcher.c:1927 src/matcher.c:1945 src/matcher.c:1954
+#: src/matcher.c:1940 src/matcher.c:1958 src/matcher.c:1967
 msgid "message does not match\n"
 msgstr "správa nevyhovuje\n"
 
-#: src/matcher.c:2217 src/matcher.c:2218 src/matcher.c:2219 src/matcher.c:2220
-#: src/matcher.c:2221 src/matcher.c:2222 src/matcher.c:2223 src/matcher.c:2224
+#: src/matcher.c:2230 src/matcher.c:2231 src/matcher.c:2232 src/matcher.c:2233
+#: src/matcher.c:2234 src/matcher.c:2235 src/matcher.c:2236 src/matcher.c:2237
 msgid "(none)"
 msgstr "(žiadna)"
 
@@ -7954,8 +7928,8 @@ msgstr "Prepísať súbor mbox"
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Tento súbor už existuje. Chcete ho prepísať?"
 
-#: src/mbox.c:551 src/messageview.c:1842 src/mimeview.c:1842
-#: src/prefs_themes.c:533 src/textview.c:3076
+#: src/mbox.c:551 src/messageview.c:1864 src/mimeview.c:1843
+#: src/prefs_themes.c:561 src/textview.c:3086
 msgid "Overwrite"
 msgstr "Prepísať"
 
@@ -7980,11 +7954,11 @@ msgstr "Nájsť v aktuálnej správe"
 msgid "Find text:"
 msgstr "Hľadaný text:"
 
-#: src/message_search.c:328 src/summary_search.c:779
+#: src/message_search.c:328 src/summary_search.c:838
 msgid "Search failed"
 msgstr "Hľadanie zlyhalo"
 
-#: src/message_search.c:329 src/summary_search.c:780
+#: src/message_search.c:329 src/summary_search.c:839
 msgid "Search string not found."
 msgstr "Hľadaný reťazec nenájdený."
 
@@ -7996,30 +7970,30 @@ msgstr "Dosiahnutý začiatok správy; pokračovať od konca?"
 msgid "End of message reached; continue from beginning?"
 msgstr "Dosiahnutý koniec správy; pokračovať od začiatku?"
 
-#: src/message_search.c:344 src/summary_search.c:791
+#: src/message_search.c:344 src/summary_search.c:850
 msgid "Search finished"
 msgstr "Hľadanie dokončené"
 
-#: src/messageview.c:297 src/textview.c:238
+#: src/messageview.c:297 src/textview.c:252
 msgid "Compose _new message"
 msgstr "Napísať _novú správu"
 
-#: src/messageview.c:713 src/messageview.c:1433 src/messageview.c:1584
+#: src/messageview.c:712 src/messageview.c:1455 src/messageview.c:1606
 msgid "Claws Mail - Message View"
 msgstr "Claws Mail - Zobrazenie správy"
 
-#: src/messageview.c:840
+#: src/messageview.c:842
 msgid "<No Return-Path found>"
 msgstr "<Nenájdená adresa pre odpoveď>"
 
-#: src/messageview.c:848
+#: src/messageview.c:849
 #, c-format
 msgid ""
 "The notification address to which the return receipt is\n"
 "to be sent does not correspond to the return path:\n"
 "Notification address: %s\n"
 "Return path: %s\n"
-"It is advised to not to send the return receipt."
+"It is advised to not send the return receipt."
 msgstr ""
 "Oznamovacia adresa, na ktorú má byť odoslané potvrdenie\n"
 "o prijatí sa nezhoduje s návratovou cestou:\n"
@@ -8027,80 +8001,82 @@ msgstr ""
 "Návratová cesta: %s\n"
 "Odporúčame toto potvrdenie neodoslať."
 
-#: src/messageview.c:855 src/messageview.c:872
+#: src/messageview.c:856 src/messageview.c:884
 msgid "_Don't Send"
 msgstr "_Neodoslať"
 
-#: src/messageview.c:868
+#: src/messageview.c:875
+#, c-format
+msgctxt "'%s' stands for 'To' then 'Cc'"
 msgid ""
 "This message is asking for a return receipt notification\n"
-"but according to its 'To:' and 'CC:' headers it was not\n"
+"but according to its '%s' and '%s' headers it was not\n"
 "officially addressed to you.\n"
-"It is advised to not to send the return receipt."
+"It is advised to not send the return receipt."
 msgstr ""
 "Táto správa žiada o zaslanie potvrdenia o jej prijatí,\n"
-"ale podľa jej hlavičiek „Komu:” a „Kópia:” nebola \n"
+"ale podľa jej hlavičiek „'%s'” a „'%s'” nebola \n"
 "oficiálne adresovaná vám.\n"
 "Neodporúčame toto potvrdenie odoslať."
 
-#: src/messageview.c:1363
+#: src/messageview.c:1385
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "Sťahovanie správy (%s)…"
 
-#: src/messageview.c:1399 src/procmime.c:1008
+#: src/messageview.c:1421 src/procmime.c:1008
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Nemožno dešifrovať: %s"
 
-#: src/messageview.c:1480 src/messageview.c:1488
+#: src/messageview.c:1502 src/messageview.c:1510
 msgid "Message doesn't conform to MIME standard. It may render wrongly."
 msgstr "Správa nezodpovedá štandardu MIME. Môže byť zle zobrazená."
 
-#: src/messageview.c:1834 src/messageview.c:1837 src/mimeview.c:1995
-#: src/plugins/fancy/fancy_viewer.c:663 src/summaryview.c:4796
-#: src/summaryview.c:4799 src/textview.c:3064
+#: src/messageview.c:1856 src/messageview.c:1859 src/mimeview.c:2048
+#: src/plugins/fancy/fancy_viewer.c:663 src/summaryview.c:4840
+#: src/summaryview.c:4843 src/textview.c:3074
 msgid "Save as"
 msgstr "Uložiť ako"
 
-#: src/messageview.c:1843
+#: src/messageview.c:1865
 msgid "Overwrite existing file?"
 msgstr "Prepísať existujúci súbor?"
 
-#: src/messageview.c:1851 src/summaryview.c:4816 src/summaryview.c:4819
-#: src/summaryview.c:4834
+#: src/messageview.c:1873 src/summaryview.c:4860 src/summaryview.c:4863
+#: src/summaryview.c:4878
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "Nemožno uložiť súbor „%s”."
 
-#: src/messageview.c:1904
+#: src/messageview.c:1926
 #, c-format
 msgid "Show all %s."
 msgstr "Zobraziť všetky %s."
 
-#: src/messageview.c:1906
+#: src/messageview.c:1928
 msgid "Only the first megabyte of text is shown."
 msgstr "Zobrazený je len prvý megabajt textu."
 
-#: src/messageview.c:1937
+#: src/messageview.c:1959
 msgid ""
 "You got a return receipt for this message: it has been displayed by the "
 "recipient."
 msgstr "Dostali ste potvrdenie tejto správy: správa bola zobrazená príjemcom."
 
-#: src/messageview.c:1940
+#: src/messageview.c:1962
 msgid "You asked for a return receipt in this message."
 msgstr "Vyžiadali ste si potvrdenie o prijatí tejto správy."
 
-#: src/messageview.c:1946
+#: src/messageview.c:1968
 msgid "This message asks for a return receipt."
 msgstr "Táto správa chce aby ste odoslali potvrdenie o prijatí."
 
-#: src/messageview.c:1947
+#: src/messageview.c:1969
 msgid "Send receipt"
 msgstr "Odoslať potvrdenie"
 
-#: src/messageview.c:1990
+#: src/messageview.c:2012
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -8108,7 +8084,7 @@ msgstr ""
 "Táto správa bola čiastočne prijatá,\n"
 "a bola zmazaná zo servera."
 
-#: src/messageview.c:1996
+#: src/messageview.c:2018
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8117,15 +8093,15 @@ msgstr ""
 "Táto správa vola čiastočne prijatá;\n"
 "je %s."
 
-#: src/messageview.c:2000 src/messageview.c:2022
+#: src/messageview.c:2022 src/messageview.c:2044
 msgid "Mark for download"
 msgstr "Označiť na stiahnutie"
 
-#: src/messageview.c:2001 src/messageview.c:2013
+#: src/messageview.c:2023 src/messageview.c:2035
 msgid "Mark for deletion"
 msgstr "Označiť na odstránenie"
 
-#: src/messageview.c:2006
+#: src/messageview.c:2028
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8134,12 +8110,12 @@ msgstr ""
 "Táto správa vola čiastočne prijatá;\n"
 "je %s a bude stiahnutá."
 
-#: src/messageview.c:2011 src/messageview.c:2024
-#: src/prefs_filtering_action.c:180
+#: src/messageview.c:2033 src/messageview.c:2046
+#: src/prefs_filtering_action.c:180 src/toolbar.c:503
 msgid "Unmark"
 msgstr "Odznačiť"
 
-#: src/messageview.c:2017
+#: src/messageview.c:2039
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8148,11 +8124,11 @@ msgstr ""
 "Táto správa vola čiastočne prijatá;\n"
 "je %s a bude zmazaná."
 
-#: src/messageview.c:2090
+#: src/messageview.c:2112
 msgid "Return Receipt Notification"
 msgstr "Potvrdenie o príjme"
 
-#: src/messageview.c:2091
+#: src/messageview.c:2113
 msgid ""
 "More than one of your accounts uses the address that this message was sent "
 "to.\n"
@@ -8162,19 +8138,19 @@ msgstr ""
 "Viac ako jeden účet používa adresu, na ktorú bola táto správa odoslaná.\n"
 "Prosím vyberte účet, ktorý chcete použiť na odoslanie potvrdenia o príjme:"
 
-#: src/messageview.c:2095 src/plugins/rssyl/rssyl_feed_props.c:508
+#: src/messageview.c:2117 src/plugins/rssyl/rssyl_feed_props.c:506
 msgid "_Cancel"
 msgstr "_Zrušiť"
 
-#: src/messageview.c:2095
+#: src/messageview.c:2117
 msgid "_Send Notification"
 msgstr "Odo_slať potvrdenie"
 
-#: src/messageview.c:2184
+#: src/messageview.c:2206
 msgid "Cannot print: the message doesn't contain text."
 msgstr "Nemožno tlačiť: správa neobsahuje text."
 
-#: src/messageview.c:2944
+#: src/messageview.c:2967
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -8182,7 +8158,7 @@ msgstr ""
 "\n"
 "  V tejto zložke nie sú správy"
 
-#: src/messageview.c:2952
+#: src/messageview.c:2975
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -8190,7 +8166,7 @@ msgstr ""
 "\n"
 "  Správa bola odstránená"
 
-#: src/messageview.c:2953
+#: src/messageview.c:2976
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -8198,8 +8174,8 @@ msgstr ""
 "\n"
 "  Správa bola odstránená alebo presunutá do inej zložky"
 
-#: src/messageview.c:2986 src/messageview.c:2992 src/summaryview.c:4177
-#: src/summaryview.c:6972
+#: src/messageview.c:3009 src/messageview.c:3015 src/summaryview.c:4253
+#: src/summaryview.c:7012
 msgid "An error happened while learning.\n"
 msgstr "Nastala chyba pri učení.\n"
 
@@ -8207,7 +8183,7 @@ msgstr "Nastala chyba pri učení.\n"
 msgid "Moving messages..."
 msgstr "Presúvam správy…"
 
-#: src/mh.c:671 src/plugins/mailmbox/mailmbox_folder.c:839
+#: src/mh.c:671 src/plugins/mailmbox/mailmbox_folder.c:838
 msgid "Deleting messages..."
 msgstr "Mažem správy…"
 
@@ -8226,7 +8202,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/mh_gtk.c:364 src/plugins/mailmbox/plugin_gtk.c:298
+#: src/mh_gtk.c:374 src/plugins/mailmbox/plugin_gtk.c:298
 #, c-format
 msgid ""
 "Really remove the mailbox '%s'?\n"
@@ -8235,7 +8211,7 @@ msgstr ""
 "Naozaj chcete odstrániť schránku „%s”?\n"
 "(Správy NEBUDÚ z disku odstránené)"
 
-#: src/mh_gtk.c:366 src/plugins/mailmbox/plugin_gtk.c:300
+#: src/mh_gtk.c:376 src/plugins/mailmbox/plugin_gtk.c:300
 msgid "Remove mailbox"
 msgstr "Odstrániť schránku"
 
@@ -8306,31 +8282,77 @@ msgstr "Overovanie podpisu…"
 msgid "Go back to email"
 msgstr "Naspäť na správu"
 
-#: src/mimeview.c:1761 src/mimeview.c:1850 src/mimeview.c:2042
-#: src/mimeview.c:2078 src/mimeview.c:2190 src/plugins/fancy/fancy_viewer.c:416
+#: src/mimeview.c:1761 src/mimeview.c:1853 src/mimeview.c:2095
+#: src/mimeview.c:2131 src/mimeview.c:2243 src/plugins/fancy/fancy_viewer.c:416
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "Nemožno uložiť časť viacdielnej správy: %s"
 
-#: src/mimeview.c:1839 src/textview.c:3074
+#: src/mimeview.c:1840 src/textview.c:3084
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "Prepísať existujúci súbor „%s”?"
 
-#: src/mimeview.c:1881 src/plugins/archive/archiver_prefs.c:126
+#: src/mimeview.c:1864
+#, c-format
+msgid ""
+"An error has occurred while saving message part #%d. Do you want to cancel "
+"operation or skip error and continue?"
+msgstr ""
+"Pri ukladaní časti správy #%d nastala chyba. Chcete zrušiť operáciu alebo "
+"preskočiť chybu a pokračovať?"
+
+#: src/mimeview.c:1867
+msgid "Error saving all message parts"
+msgstr "Chyba pri ukladaní všetkých častí správy"
+
+#: src/mimeview.c:1868
+msgid "Skip"
+msgstr "Preskočiť"
+
+#: src/mimeview.c:1868
+msgid "Skip all"
+msgstr "Preskočiť všetko"
+
+#: src/mimeview.c:1878
+#, c-format
+msgid "%d file saved successfully."
+msgid_plural "%d files saved successfully."
+msgstr[0] "Súbor úspešne uložený."
+msgstr[1] "%d súbory úspešne uložené."
+msgstr[2] "%d súborov úspešne uložených."
+
+#: src/mimeview.c:1886
+#, c-format
+msgid "%d file saved successfully"
+msgid_plural "%d files saved successfully"
+msgstr[0] "Súbor úspešne uložený"
+msgstr[1] "%d súbory úspešne uložené"
+msgstr[2] "%d súborov úspešne uložených"
+
+#: src/mimeview.c:1891
+#, c-format
+msgid "%s, %d file failed."
+msgid_plural "%s, %d files failed."
+msgstr[0] "%s, súbor zlyhal."
+msgstr[1] "%s, %d súbory zlyhali."
+msgstr[2] "%s, %d súborov zlyhalo."
+
+#: src/mimeview.c:1924 src/plugins/archive/archiver_prefs.c:142
+#: src/prefs_filtering_action.c:1297
 msgid "Select destination folder"
 msgstr "Zvoľte cieľovú zložku"
 
-#: src/mimeview.c:1888 src/plugins/archive/archiver_prefs.c:132
+#: src/mimeview.c:1931 src/plugins/archive/archiver_prefs.c:148
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "„%s” nie je zložka."
 
-#: src/mimeview.c:2125 src/mimeview.c:2132 src/textview.c:2991
+#: src/mimeview.c:2178 src/mimeview.c:2185 src/textview.c:3001
 msgid "Open with"
 msgstr "Otvoriť čím"
 
-#: src/mimeview.c:2126 src/mimeview.c:2133 src/textview.c:2992
+#: src/mimeview.c:2179 src/mimeview.c:2186 src/textview.c:3002
 #, c-format
 msgid ""
 "Enter the command-line to open file:\n"
@@ -8339,7 +8361,7 @@ msgstr ""
 "Zadajte príkazový na otvorenie súboru:\n"
 "(„%s” bude nahradené názvom súboru)"
 
-#: src/mimeview.c:2228
+#: src/mimeview.c:2281
 #, c-format
 msgid ""
 "Could not convert attachment name to UTF-16:\n"
@@ -8350,11 +8372,11 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/mimeview.c:2236
+#: src/mimeview.c:2289
 msgid "Execute untrusted binary?"
 msgstr "Spustiť neznámy binárny súbor?"
 
-#: src/mimeview.c:2237
+#: src/mimeview.c:2290
 msgid ""
 "This attachment is an executable file. Executing untrusted binaries is "
 "dangerous and could probably lead to compromission of your computer.\n"
@@ -8366,20 +8388,20 @@ msgstr ""
 "\n"
 "Naozaj chcete spustiť tento súbor?"
 
-#: src/mimeview.c:2241
+#: src/mimeview.c:2294
 msgid "Run binary"
 msgstr "Spustiť binárny súbor"
 
-#: src/mimeview.c:2543 src/plugins/att_remover/att_remover.c:299
+#: src/mimeview.c:2596 src/plugins/att_remover/att_remover.c:299
 msgid "Type:"
 msgstr "Typ:"
 
-#: src/mimeview.c:2544 src/plugins/att_remover/att_remover.c:300
-#: src/plugins/pdf_viewer/poppler_viewer.c:697 src/summaryview.c:2702
+#: src/mimeview.c:2597 src/plugins/att_remover/att_remover.c:300
+#: src/plugins/pdf_viewer/poppler_viewer.c:697 src/summaryview.c:2700
 msgid "Size:"
 msgstr "Veľkosť:"
 
-#: src/mimeview.c:2558 src/plugins/vcalendar/vcalendar.c:1265
+#: src/mimeview.c:2611 src/plugins/vcalendar/vcalendar.c:1265
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1709
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1719
 msgid "Description:"
@@ -8641,7 +8663,7 @@ msgid "Laptop LED"
 msgstr "LED notebooka"
 
 #: src/plugins/address_keeper/address_keeper.c:252
-#: src/plugins/attachwarner/attachwarner.c:256
+#: src/plugins/attachwarner/attachwarner.c:257
 msgid "Failed to register check before send hook"
 msgstr "Zlyhala registrácia obsluhy udalosti „check before send”"
 
@@ -8651,63 +8673,59 @@ msgstr "Uchováva adresy všetkých adresátov v zložke adresára."
 
 #: src/plugins/address_keeper/address_keeper.c:333
 #: src/plugins/address_keeper/address_keeper.h:32
-#: src/plugins/address_keeper/address_keeper_prefs.c:257
+#: src/plugins/address_keeper/address_keeper_prefs.c:274
 msgid "Address Keeper"
 msgstr "Uchovávanie adries"
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:106
+#: src/plugins/address_keeper/address_keeper_prefs.c:108
 msgid "Address book location"
 msgstr "Umiestnenie adresára"
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:111
+#: src/plugins/address_keeper/address_keeper_prefs.c:113
 msgid "Keep to folder"
 msgstr "Uchovať v zložke"
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:119
+#: src/plugins/address_keeper/address_keeper_prefs.c:121
 msgid "Address book path where addresses are kept"
 msgstr "Cesta k Adresáru, kde majú byť uchované adresy"
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:121
+#: src/plugins/address_keeper/address_keeper_prefs.c:123
 #: src/plugins/bogofilter/bogofilter_gtk.c:278
 #: src/plugins/bsfilter/bsfilter_gtk.c:201
-#: src/plugins/spamassassin/spamassassin_gtk.c:446
+#: src/plugins/spamassassin/spamassassin_gtk.c:447
 #: src/prefs_filtering_action.c:573 src/prefs_filtering_action.c:580
 #: src/prefs_matcher.c:679
 msgid "Select..."
 msgstr "Vybrať…"
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:137
+#: src/plugins/address_keeper/address_keeper_prefs.c:139
 msgid "Fields to keep addresses from"
 msgstr "Polia, z ktorých zachovať adresy"
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:144
-msgid "Keep addresses which appear in 'To' headers"
-msgstr "Uchovávať adresy, ktoré sa objavia v hlavičkách „Komu”"
-
-#: src/plugins/address_keeper/address_keeper_prefs.c:153
-msgid "Keep addresses which appear in 'Cc' headers"
-msgstr "Uchovávať adresy, ktoré sa objavia v hlavičkách „Kópia”"
-
-#: src/plugins/address_keeper/address_keeper_prefs.c:162
-msgid "Keep addresses which appear in 'Bcc' headers"
-msgstr "Uchovávať adresy, ktoré sa objavia v hlavičkách „Slepá kópia”"
+#: src/plugins/address_keeper/address_keeper_prefs.c:147
+#: src/plugins/address_keeper/address_keeper_prefs.c:161
+#: src/plugins/address_keeper/address_keeper_prefs.c:175
+#, c-format
+msgctxt "address keeper: %s stands for a header name"
+msgid "Keep addresses which appear in '%s' headers"
+msgstr "Uchovávať adresy, ktoré sú v hlavičkách „%s”"
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:168
+#: src/plugins/address_keeper/address_keeper_prefs.c:185
 msgid ""
 "Exclude addresses matching the following regular expressions (one per line)"
 msgstr ""
 "Vynechať adresy, ktoré vyhovujú nasledujúcim regulárnym výrazom (jeden na "
 "riadok):"
 
-#: src/plugins/archive/archiver.c:43 src/plugins/archive/archiver_prefs.c:91
+#: src/plugins/archive/archiver.c:45 src/plugins/archive/archiver_prefs.c:107
 msgid "Mail Archiver"
 msgstr "Archivácia pošty"
 
-#: src/plugins/archive/archiver.c:54
+#: src/plugins/archive/archiver.c:56
 msgid "Create Archive..."
 msgstr "Vytvoriť archív…"
 
-#: src/plugins/archive/archiver.c:122
+#: src/plugins/archive/archiver.c:123
 #, c-format
 msgid ""
 "This plugin adds archiving features to Claws Mail.\n"
@@ -8718,11 +8736,7 @@ msgid ""
 "Several archiving options are also available.\n"
 "\n"
 "The archive can be stored as:\n"
-"\tTAR\n"
-"\tPAX\n"
-"\tSHAR\n"
-"\tCPIO\n"
-"\n"
+"%s\n"
 "The archive can be compressed using:\n"
 "%s\n"
 "The archives can be restored with any standard tool that supports the chosen "
@@ -8742,11 +8756,7 @@ msgstr ""
 "súčet MD5 každého súboru v archíve. Dostupné sú viaceré voľby archivácie.\n"
 "\n"
 "Archív môže byť vytvorený ako:\n"
-"\tTAR\n"
-"\tPAX\n"
-"\tSHAR\n"
-"\tCPIO\n"
-"\n"
+"%s\n"
 "Archív môže byť komprimovaný pomocou:\n"
 "%s\n"
 "Archívy môžu byť obnovené pomocou štandardných nástrojov, ktoré podporujú "
@@ -8759,52 +8769,80 @@ msgstr ""
 "Predvolené voľby možno nastaviť v menu Nastavenie/Nastavenia/Zásuvné moduly/"
 "Archivácia pošty"
 
-#: src/plugins/archive/archiver.c:152
+#: src/plugins/archive/archiver.c:170
 msgid "Archiver"
 msgstr "Archivácia"
 
-#: src/plugins/archive/archiver_gtk.c:104
+#: src/plugins/archive/archiver_gtk.c:107
 msgid "Archiving"
 msgstr "Archivácia"
 
-#: src/plugins/archive/archiver_gtk.c:122
+#: src/plugins/archive/archiver_gtk.c:125
 msgid "Press Cancel button to stop archiving"
 msgstr "Na zastavenie archivácie stlačte tlačidlo Zrušiť"
 
-#: src/plugins/archive/archiver_gtk.c:138
+#: src/plugins/archive/archiver_gtk.c:141
 msgid "Archiving:"
 msgstr "Archivácia:"
 
-#: src/plugins/archive/archiver_gtk.c:507
-msgid "Folder and archive must be selected"
-msgstr "Musíte vybrať zložku a archív"
+#: src/plugins/archive/archiver_gtk.c:525
+#, c-format
+msgid ""
+"Some uninitialized data prevents from starting\n"
+"the archiving process:\n"
+"%s%s"
+msgstr ""
+"Niektoré neinicializované dáta bránia spusteniu\n"
+"procesu archivácie:\n"
+"%s%s"
+
+#: src/plugins/archive/archiver_gtk.c:528
+msgid ""
+"\n"
+"- the folder to archive is not set"
+msgstr ""
+"\n"
+"- nie je nastavená zložka archívu"
 
-#: src/plugins/archive/archiver_gtk.c:516
+#: src/plugins/archive/archiver_gtk.c:529
+msgid ""
+"\n"
+"- the name for archive is not set"
+msgstr ""
+"\n"
+"- nie je nastavený názov archívu"
+
+#: src/plugins/archive/archiver_gtk.c:552
 #, c-format
 msgid "%s: Exists. Continue anyway?"
 msgstr "%s: existuje. Pokračovať i tak?"
 
-#: src/plugins/archive/archiver_gtk.c:519
+#: src/plugins/archive/archiver_gtk.c:555
 #, c-format
 msgid "%s: Is a link. Cannot continue"
 msgstr "%s: je odkaz. Nemožno pokračovať"
 
-#: src/plugins/archive/archiver_gtk.c:522
+#: src/plugins/archive/archiver_gtk.c:558
 #, c-format
 msgid "%s: Is a directory. Cannot continue"
 msgstr "%s: je adresár. Nemožno pokračovať"
 
-#: src/plugins/archive/archiver_gtk.c:525
+#: src/plugins/archive/archiver_gtk.c:561
 #, c-format
 msgid "%s: Missing permissions. Cannot continue"
 msgstr "%s: Nedostatočné práva. Nemožno pokračovať"
 
-#: src/plugins/archive/archiver_gtk.c:528
+#: src/plugins/archive/archiver_gtk.c:564
 #, c-format
 msgid "%s: Unknown error. Cannot continue"
 msgstr "%s: Neznáma chyba. Nemožno pokračovať"
 
-#: src/plugins/archive/archiver_gtk.c:565
+#: src/plugins/archive/archiver_gtk.c:572
+#: src/plugins/archive/archiver_gtk.c:619
+msgid "Creating archive"
+msgstr "Vytváranie archívu"
+
+#: src/plugins/archive/archiver_gtk.c:585
 #, c-format
 msgid ""
 "Not a valid file name:\n"
@@ -8813,7 +8851,7 @@ msgstr ""
 "Neplatné meno súboru:\n"
 "%s."
 
-#: src/plugins/archive/archiver_gtk.c:578
+#: src/plugins/archive/archiver_gtk.c:590
 #, c-format
 msgid ""
 "Not a valid Claws Mail folder:\n"
@@ -8822,7 +8860,7 @@ msgstr ""
 "Neplatná zložka Claws Mail:\n"
 "%s."
 
-#: src/plugins/archive/archiver_gtk.c:607
+#: src/plugins/archive/archiver_gtk.c:614
 #, c-format
 msgid ""
 "Adding files in folder failed\n"
@@ -8837,179 +8875,183 @@ msgstr ""
 "\n"
 "Pokračovať?"
 
-#: src/plugins/archive/archiver_gtk.c:709
+#: src/plugins/archive/archiver_gtk.c:631
+#, c-format
+msgid ""
+"Archive creation error:\n"
+"%s"
+msgstr ""
+"Chyba vytvorenia archívu:\n"
+"%s"
+
+#: src/plugins/archive/archiver_gtk.c:743
 msgid "Archive result"
 msgstr "Výsledok archívu"
 
-#: src/plugins/archive/archiver_gtk.c:739
+#: src/plugins/archive/archiver_gtk.c:773
 msgid "Values"
 msgstr "Hodnoty"
 
-#: src/plugins/archive/archiver_gtk.c:748
+#: src/plugins/archive/archiver_gtk.c:782
 msgid "Archive"
 msgstr "Archív"
 
-#: src/plugins/archive/archiver_gtk.c:754
+#: src/plugins/archive/archiver_gtk.c:788
 msgid "Archive format"
 msgstr "Formát archívu"
 
-#: src/plugins/archive/archiver_gtk.c:761
+#: src/plugins/archive/archiver_gtk.c:795
 msgid "Compression method"
 msgstr "Kompresná metóda"
 
-#: src/plugins/archive/archiver_gtk.c:769
+#: src/plugins/archive/archiver_gtk.c:803
 msgid "Number of files"
 msgstr "Počet súborov"
 
-#: src/plugins/archive/archiver_gtk.c:777
+#: src/plugins/archive/archiver_gtk.c:811
 msgid "Archive Size"
 msgstr "Veľkosť archívu"
 
-#: src/plugins/archive/archiver_gtk.c:785
+#: src/plugins/archive/archiver_gtk.c:819
 msgid "Folder Size"
 msgstr "Veľkosť zložky"
 
-#: src/plugins/archive/archiver_gtk.c:794
+#: src/plugins/archive/archiver_gtk.c:828
 msgid "Compression level"
 msgstr "Úroveň kompresie"
 
-#: src/plugins/archive/archiver_gtk.c:799
-#: src/plugins/archive/archiver_gtk.c:807
-#: src/plugins/archive/archiver_gtk.c:815
+#: src/plugins/archive/archiver_gtk.c:833
+#: src/plugins/archive/archiver_gtk.c:841
+#: src/plugins/archive/archiver_gtk.c:849
 #: src/plugins/pdf_viewer/poppler_viewer.c:716 src/prefs_folder_item.c:522
 msgid "Yes"
 msgstr "Áno"
 
-#: src/plugins/archive/archiver_gtk.c:799
-#: src/plugins/archive/archiver_gtk.c:807
-#: src/plugins/archive/archiver_gtk.c:815
+#: src/plugins/archive/archiver_gtk.c:833
+#: src/plugins/archive/archiver_gtk.c:841
+#: src/plugins/archive/archiver_gtk.c:849
 #: src/plugins/pdf_viewer/poppler_viewer.c:719 src/prefs_folder_item.c:521
-#: src/prefs_summaries.c:372
+#: src/prefs_summaries.c:380
 msgid "No"
 msgstr "Nie"
 
-#: src/plugins/archive/archiver_gtk.c:802
+#: src/plugins/archive/archiver_gtk.c:836
 msgid "MD5 checksum"
 msgstr "Kontrolný súčet MD5"
 
-#: src/plugins/archive/archiver_gtk.c:810
+#: src/plugins/archive/archiver_gtk.c:844
 msgid "Descriptive names"
 msgstr "Popisné mená"
 
-#: src/plugins/archive/archiver_gtk.c:818
+#: src/plugins/archive/archiver_gtk.c:852
 msgid "Delete selected files"
 msgstr "Zmazať zvolené súbory"
 
-#: src/plugins/archive/archiver_gtk.c:827
-#: src/plugins/archive/archiver_gtk.c:1203
+#: src/plugins/archive/archiver_gtk.c:861
+#: src/plugins/archive/archiver_gtk.c:1324
 msgid "Select mails before"
 msgstr "Najprv vyberať správy"
 
-#: src/plugins/archive/archiver_gtk.c:903
+#: src/plugins/archive/archiver_gtk.c:917
+msgid "Select folder to archive"
+msgstr "Zvoľte zložka na archiváciu"
+
+#: src/plugins/archive/archiver_gtk.c:938
 msgid "Select file name for archive [suffix should reflect archive like .tgz]"
 msgstr ""
 "Vyberte meno súboru archívu [prípona musí zodpovedať archívu, napr. .tgz]"
 
-#: src/plugins/archive/archiver_gtk.c:951
+#: src/plugins/archive/archiver_gtk.c:986
 #, c-format
 msgid "%ld of %ld"
 msgstr "%ld z %ld"
 
-#: src/plugins/archive/archiver_gtk.c:988
+#: src/plugins/archive/archiver_gtk.c:1038
 msgid "Create Archive"
 msgstr "Vytvoriť archív"
 
-#: src/plugins/archive/archiver_gtk.c:1003
+#: src/plugins/archive/archiver_gtk.c:1053
 msgid "Enter Archiver arguments"
 msgstr "Zadajte argumenty archivácie"
 
-#: src/plugins/archive/archiver_gtk.c:1016
+#: src/plugins/archive/archiver_gtk.c:1066
 msgid "Folder to archive"
 msgstr "Zložka na archiváciu"
 
-#: src/plugins/archive/archiver_gtk.c:1023
+#: src/plugins/archive/archiver_gtk.c:1073
 msgid "Folder which is the root of the archive"
 msgstr "Zložka, ktorá je koreňom archívu"
 
-#: src/plugins/archive/archiver_gtk.c:1028
+#: src/plugins/archive/archiver_gtk.c:1078
 msgid "Click this button to select a folder which is to be root of the archive"
 msgstr "Týmto tlačidlom vyberiete zložku, ktorá je koreňom archívu"
 
-#: src/plugins/archive/archiver_gtk.c:1034
+#: src/plugins/archive/archiver_gtk.c:1084
 msgid "Name for archive"
 msgstr "Meno archívu"
 
-#: src/plugins/archive/archiver_gtk.c:1040
+#: src/plugins/archive/archiver_gtk.c:1090
 msgid "Archive location and name"
 msgstr "Umiestnenie a meno archívu"
 
-#: src/plugins/archive/archiver_gtk.c:1042
-#: src/plugins/archive/archiver_prefs.c:194
+#: src/plugins/archive/archiver_gtk.c:1092
+#: src/plugins/archive/archiver_prefs.c:225
 #: src/plugins/pgpcore/select-keys.c:421
 msgid "_Select"
 msgstr "_Zvoliť"
 
-#: src/plugins/archive/archiver_gtk.c:1045
+#: src/plugins/archive/archiver_gtk.c:1095
 msgid "Click this button to select a name and location for the archive"
 msgstr "Týmto tlačidlom vyberiete zložku meno a umiestnenie archívu"
 
-#: src/plugins/archive/archiver_gtk.c:1047
+#: src/plugins/archive/archiver_gtk.c:1097
 msgid "Choose compression"
 msgstr "Zvoľte kompresiu"
 
-#: src/plugins/archive/archiver_gtk.c:1060
-msgid "Choose this option to use ZIP compression for the archive"
-msgstr "Zvoľte túto možnosť na komprimáciu archívu vo formáte ZIP"
-
-#: src/plugins/archive/archiver_gtk.c:1067
-msgid "Choose this option to use BZIP2 compression for the archive"
-msgstr "Zvoľte túto možnosť na komprimáciu archívu vo formáte BZIP2"
-
-#: src/plugins/archive/archiver_gtk.c:1074
-msgid "Choose this to use Compress compression for your archive"
-msgstr "Zvoľte túto možnosť na komprimáciu archívu vo formáte Compress"
-
-#: src/plugins/archive/archiver_gtk.c:1081
-msgid "Choose this option to disable compression for the archive"
-msgstr "Zvoľte túto možnosť na vypnutie komprimácie archívu"
+#: src/plugins/archive/archiver_gtk.c:1109
+#: src/plugins/archive/archiver_gtk.c:1115
+#: src/plugins/archive/archiver_gtk.c:1121
+#: src/plugins/archive/archiver_gtk.c:1128
+#: src/plugins/archive/archiver_gtk.c:1134
+#: src/plugins/archive/archiver_gtk.c:1142
+#: src/plugins/archive/archiver_gtk.c:1150
+#: src/plugins/archive/archiver_gtk.c:1156
+#: src/plugins/archive/archiver_gtk.c:1162
+#: src/plugins/archive/archiver_gtk.c:1170
+#: src/plugins/archive/archiver_gtk.c:1177
+#, c-format
+msgid "Choose this option to use %s compression for the archive"
+msgstr "Zvoľte túto možnosť na použitie komprimácie %s archívu"
 
-#: src/plugins/archive/archiver_gtk.c:1101
+#: src/plugins/archive/archiver_gtk.c:1226
 msgid "Choose format"
 msgstr "Zvoľte formát"
 
-#: src/plugins/archive/archiver_gtk.c:1114
-msgid "Choose this option to use TAR as format for the archive"
-msgstr "Zvoľte túto možnosť na použitie formátu archívu TAR"
-
-#: src/plugins/archive/archiver_gtk.c:1121
-msgid "Choose this to use SHAR as format for the archive"
-msgstr "Zvoľte túto možnosť na použitie formátu archívu SHAR"
-
-#: src/plugins/archive/archiver_gtk.c:1128
-msgid "Choose this option to use CPIO as format for the archive"
-msgstr "Zvoľte túto možnosť na použitie formátu archívu CPIO"
-
-#: src/plugins/archive/archiver_gtk.c:1135
-msgid "Choose this option to use PAX as format for the archive"
-msgstr "Zvoľte túto možnosť na použitie formátu archívu PAX"
+#: src/plugins/archive/archiver_gtk.c:1238
+#: src/plugins/archive/archiver_gtk.c:1244
+#: src/plugins/archive/archiver_gtk.c:1250
+#: src/plugins/archive/archiver_gtk.c:1256
+#, c-format
+msgid "Choose this to use %s as format for the archive"
+msgstr "Zvoľte túto možnosť na použitie formátu archívu %s"
 
-#: src/plugins/archive/archiver_gtk.c:1155
+#: src/plugins/archive/archiver_gtk.c:1276
 msgid "Miscellaneous options"
 msgstr "Rôzne voľby"
 
-#: src/plugins/archive/archiver_gtk.c:1164
+#: src/plugins/archive/archiver_gtk.c:1285
 msgid "_Recursive"
 msgstr "_Rekurzívne"
 
-#: src/plugins/archive/archiver_gtk.c:1168
+#: src/plugins/archive/archiver_gtk.c:1289
 msgid "Choose this option to include subfolders in the archive"
 msgstr "Zvoľte túto možnosť na zahrnutie podzložiek do archívu"
 
-#: src/plugins/archive/archiver_gtk.c:1170
+#: src/plugins/archive/archiver_gtk.c:1291
 msgid "_MD5sum"
 msgstr "_MD5sum"
 
-#: src/plugins/archive/archiver_gtk.c:1174
+#: src/plugins/archive/archiver_gtk.c:1295
 msgid ""
 "Choose this option to add MD5 checksums for each file in the archive.\n"
 "Be aware though, that this dramatically increases the time it\n"
@@ -9020,12 +9062,12 @@ msgstr ""
 "Používajte s rozvahou, pretože dramaticky zvyšuje čas potrebný \n"
 "na vytvorenie archívu"
 
-#: src/plugins/archive/archiver_gtk.c:1178
+#: src/plugins/archive/archiver_gtk.c:1299
 msgid "R_ename"
 msgstr "Pr_emenovať"
 
-#: src/plugins/archive/archiver_gtk.c:1182
-#: src/plugins/archive/archiver_prefs.c:325
+#: src/plugins/archive/archiver_gtk.c:1303
+#: src/plugins/archive/archiver_prefs.c:427
 msgid ""
 "Choose this option to use descriptive names for each file in the archive.\n"
 "The naming scheme: date_from@to@subject.\n"
@@ -9035,7 +9077,7 @@ msgstr ""
 "Súbory budú pomenované v tvare: dátum_od@komu@predmet.\n"
 "Mená budú skrátené na maximálne 96 znakov"
 
-#: src/plugins/archive/archiver_gtk.c:1190
+#: src/plugins/archive/archiver_gtk.c:1311
 msgid ""
 "Choose this option to delete mails after archiving\n"
 "At this point only handles IMAP4, Local mbox and POP3"
@@ -9043,11 +9085,11 @@ msgstr ""
 "Zvoľte túto možnosť na zmazanie správ po ich archivácii\n"
 "Momentálne pracuje len s IMAP4, lokálnym mbox a POP3"
 
-#: src/plugins/archive/archiver_gtk.c:1194
+#: src/plugins/archive/archiver_gtk.c:1315
 msgid "Selection options"
 msgstr "Voľby výberu"
 
-#: src/plugins/archive/archiver_gtk.c:1210
+#: src/plugins/archive/archiver_gtk.c:1331
 msgid ""
 "Select emails before a certain date\n"
 "Date must comply to ISO-8601 [YYYY-MM-DD]"
@@ -9055,67 +9097,58 @@ msgstr ""
 "Vybrať emaily pred daným dátumom\n"
 "Dátum musí vyhovovať ISO-8601 [RRRR-MM-DD]"
 
-#: src/plugins/archive/archiver_prefs.c:186
+#: src/plugins/archive/archiver_prefs.c:217
 msgid "Default save folder"
 msgstr "Predvolený adresár uloženia"
 
-#: src/plugins/archive/archiver_prefs.c:198
+#: src/plugins/archive/archiver_prefs.c:229
 msgid "Click this button to select the default location for saving archives"
 msgstr "Týmto tlačidlom vyberiete predvolené umiestnenie na ukladanie archívov"
 
-#: src/plugins/archive/archiver_prefs.c:207
+#: src/plugins/archive/archiver_prefs.c:238
 msgid "Default compression"
 msgstr "Predvolená kompresia"
 
-#: src/plugins/archive/archiver_prefs.c:219
-msgid "Choose this option to use ZIP compression by default"
-msgstr "Zvoľte túto možnosť na predvolené použitie komprimácie ZIP"
-
-#: src/plugins/archive/archiver_prefs.c:226
-msgid "Choose this option to use BZIP2 compression by default"
-msgstr "Zvoľte túto možnosť na predvolené použitie komprimácie BZIP2"
-
-#: src/plugins/archive/archiver_prefs.c:233
-msgid "Choose this option to use COMPRESS compression by default"
-msgstr "Zvoľte túto možnosť na predvolené použitie komprimácie COMPRESS"
-
-#: src/plugins/archive/archiver_prefs.c:240
-msgid "Choose this option to disable compression by default"
-msgstr "Zvoľte túto možnosť na predvolené zakázanie komprimácie."
+#: src/plugins/archive/archiver_prefs.c:249
+#: src/plugins/archive/archiver_prefs.c:255
+#: src/plugins/archive/archiver_prefs.c:261
+#: src/plugins/archive/archiver_prefs.c:268
+#: src/plugins/archive/archiver_prefs.c:274
+#: src/plugins/archive/archiver_prefs.c:282
+#: src/plugins/archive/archiver_prefs.c:290
+#: src/plugins/archive/archiver_prefs.c:296
+#: src/plugins/archive/archiver_prefs.c:302
+#: src/plugins/archive/archiver_prefs.c:310
+#: src/plugins/archive/archiver_prefs.c:317
+#, c-format
+msgid "Choose this option to use %s compression by default"
+msgstr "Zvoľte túto možnosť na predvolené použitie komprimácie %s"
 
-#: src/plugins/archive/archiver_prefs.c:257
+#: src/plugins/archive/archiver_prefs.c:363
 msgid "Default format"
 msgstr "Predvolený formát"
 
-#: src/plugins/archive/archiver_prefs.c:269
-msgid "Choose this option to use the TAR format by default"
-msgstr "Zvoľte túto možnosť na predvolené použitie formátu TAR"
-
-#: src/plugins/archive/archiver_prefs.c:276
-msgid "Choose this option to use the SHAR format by default"
-msgstr "Zvoľte túto možnosť na predvolené použitie formátu SHAR"
-
-#: src/plugins/archive/archiver_prefs.c:283
-msgid "Choose this option to use the CPIO format by default"
-msgstr "Zvoľte túto možnosť na predvolené použitie formátu CPIO"
-
-#: src/plugins/archive/archiver_prefs.c:290
-msgid "Choose this option to use the PAX format by default"
-msgstr "Zvoľte túto možnosť na predvolené použitie formátu PAX"
+#: src/plugins/archive/archiver_prefs.c:374
+#: src/plugins/archive/archiver_prefs.c:380
+#: src/plugins/archive/archiver_prefs.c:386
+#: src/plugins/archive/archiver_prefs.c:392
+#, c-format
+msgid "Choose this option to use the %s as format by default"
+msgstr "Zvoľte túto možnosť na predvolené použitie formátu %s"
 
-#: src/plugins/archive/archiver_prefs.c:307
+#: src/plugins/archive/archiver_prefs.c:409
 msgid "Default miscellaneous options"
 msgstr "Rôzne predvolené možnosti"
 
-#: src/plugins/archive/archiver_prefs.c:316
+#: src/plugins/archive/archiver_prefs.c:418
 msgid "Choose this option to include subfolders in the archives by default"
 msgstr "Zvoľte túto možnosť na predvolené zahrnutie podzložiek do archívu"
 
-#: src/plugins/archive/archiver_prefs.c:317
+#: src/plugins/archive/archiver_prefs.c:419
 msgid "MD5sum"
 msgstr "MD5sum"
 
-#: src/plugins/archive/archiver_prefs.c:319
+#: src/plugins/archive/archiver_prefs.c:421
 msgid ""
 "Choose this option to add MD5 checksums for each file in the archives by "
 "default.\n"
@@ -9127,12 +9160,12 @@ msgstr ""
 "Používajte s rozvahou, pretože dramaticky zvyšuje čas potrebný \n"
 "na vytvorenie archívov"
 
-#: src/plugins/archive/archiver_prefs.c:323
+#: src/plugins/archive/archiver_prefs.c:425
 #: src/plugins/managesieve/sieve_manager.c:761
 msgid "Rename"
 msgstr "Premenovať"
 
-#: src/plugins/archive/archiver_prefs.c:331
+#: src/plugins/archive/archiver_prefs.c:433
 msgid "Choose this option to delete mails after archiving"
 msgstr "Zvoľte túto možnosť na zmazanie správ po archivácii"
 
@@ -9141,12 +9174,12 @@ msgid "Remove attachments"
 msgstr "Odstrániť prílohy"
 
 #: src/plugins/att_remover/att_remover.c:357
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:324 src/prefs_themes.c:944
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:324 src/prefs_themes.c:1060
 msgid "Remove"
 msgstr "Odstrániť"
 
-#: src/plugins/att_remover/att_remover.c:365 src/prefs_summaries.c:444
-#: src/prefs_summary_column.c:80 src/summaryview.c:2796
+#: src/plugins/att_remover/att_remover.c:365 src/prefs_summaries.c:452
+#: src/prefs_summary_column.c:80 src/summaryview.c:2794
 msgid "Attachment"
 msgstr "Príloha"
 
@@ -9210,13 +9243,13 @@ msgstr ""
 msgid "Attachment warning"
 msgstr "Upozornenie na prílohu"
 
-#: src/plugins/attachwarner/attachwarner.c:249
-#: src/plugins/attachwarner/attachwarner.c:286
-#: src/plugins/attachwarner/attachwarner.c:338
+#: src/plugins/attachwarner/attachwarner.c:250
+#: src/plugins/attachwarner/attachwarner.c:287
+#: src/plugins/attachwarner/attachwarner.c:339
 msgid "Attach warner"
 msgstr "Upozornenie na prílohu"
 
-#: src/plugins/attachwarner/attachwarner.c:296
+#: src/plugins/attachwarner/attachwarner.c:297
 msgid ""
 "Warns user if some reference to attachments is found in the message text and "
 "no file is attached."
@@ -9294,15 +9327,15 @@ msgstr "Upozornenie na prílohu"
 msgid "Bogofilter"
 msgstr "Bogofilter"
 
-#: src/plugins/bogofilter/bogofilter.c:483
+#: src/plugins/bogofilter/bogofilter.c:456
 msgid "Bogofilter: fetching bodies..."
 msgstr "Bogofilter: sťahujem správy…"
 
-#: src/plugins/bogofilter/bogofilter.c:496
+#: src/plugins/bogofilter/bogofilter.c:469
 msgid "Bogofilter: filtering messages..."
 msgstr "Bogofilter: filtrujem správy…"
 
-#: src/plugins/bogofilter/bogofilter.c:612
+#: src/plugins/bogofilter/bogofilter.c:585
 msgid ""
 "The Bogofilter plugin couldn't filter a message. The probable cause of the "
 "error is that it didn't learn from any mail.\n"
@@ -9314,7 +9347,7 @@ msgstr ""
 "Použite voľby „/Označiť/Označiť ako spam„ a „/Označiť/Označiť ako nie spam” "
 "na naplnenie databázy čo najväčším počtom nevyžiadaných aj legitímnych správ."
 
-#: src/plugins/bogofilter/bogofilter.c:619
+#: src/plugins/bogofilter/bogofilter.c:592
 #, c-format
 msgid ""
 "The Bogofilter plugin couldn't filter a message. The command `%s %s %s` "
@@ -9323,21 +9356,21 @@ msgstr ""
 "Zásuvný modul Bogofilter nemohol filtrovať správu. Nemožno spustiť príkaz `"
 "%s %s %s`."
 
-#: src/plugins/bogofilter/bogofilter.c:766
+#: src/plugins/bogofilter/bogofilter.c:739
 msgid "Bogofilter: learning from message..."
 msgstr "Bogofilter: analyzujem správu…"
 
-#: src/plugins/bogofilter/bogofilter.c:779
-#: src/plugins/bogofilter/bogofilter.c:826 src/plugins/bsfilter/bsfilter.c:513
+#: src/plugins/bogofilter/bogofilter.c:752
+#: src/plugins/bogofilter/bogofilter.c:799 src/plugins/bsfilter/bsfilter.c:486
 #, c-format
 msgid "Learning failed; `%s` returned with status %d."
 msgstr "Učenie zlyhalo; „%s” skončil so stavom %d."
 
-#: src/plugins/bogofilter/bogofilter.c:794
+#: src/plugins/bogofilter/bogofilter.c:767
 msgid "Bogofilter: learning from messages..."
 msgstr "Bogofilter: analyzujem správy…"
 
-#: src/plugins/bogofilter/bogofilter.c:882
+#: src/plugins/bogofilter/bogofilter.c:855
 #, c-format
 msgid ""
 "Learning failed; `%s %s %s` returned with error:\n"
@@ -9346,7 +9379,7 @@ msgstr ""
 "Analýza zlyhala; `%s %s %s` vrátilo chybu:\n"
 "%s"
 
-#: src/plugins/bogofilter/bogofilter.c:1010
+#: src/plugins/bogofilter/bogofilter.c:983
 msgid ""
 "This plugin can check all messages that are received from an IMAP, LOCAL or "
 "POP account for spam using Bogofilter. You will need Bogofilter installed "
@@ -9375,37 +9408,37 @@ msgstr ""
 "\n"
 "Nastavenia nájdete v menu Nastavenie/Nastavenia/Zásuvné moduly/Bogofilter"
 
-#: src/plugins/bogofilter/bogofilter.c:1043 src/plugins/bsfilter/bsfilter.c:676
-#: src/plugins/spamassassin/spamassassin.c:651
+#: src/plugins/bogofilter/bogofilter.c:1016 src/plugins/bsfilter/bsfilter.c:649
+#: src/plugins/spamassassin/spamassassin.c:624
 msgid "Spam detection"
 msgstr "Detekcia spamu"
 
-#: src/plugins/bogofilter/bogofilter.c:1044 src/plugins/bsfilter/bsfilter.c:677
-#: src/plugins/spamassassin/spamassassin.c:652
+#: src/plugins/bogofilter/bogofilter.c:1017 src/plugins/bsfilter/bsfilter.c:650
+#: src/plugins/spamassassin/spamassassin.c:625
 msgid "Spam learning"
 msgstr "Učenie spamu"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:161
 #: src/plugins/bsfilter/bsfilter_gtk.c:143
-#: src/plugins/spamassassin/spamassassin_gtk.c:399
+#: src/plugins/spamassassin/spamassassin_gtk.c:400
 msgid "Process messages on receiving"
 msgstr "Spracovať správy pri prijímaní"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:169
 #: src/plugins/bsfilter/bsfilter_gtk.c:151
-#: src/plugins/spamassassin/spamassassin_gtk.c:357
+#: src/plugins/spamassassin/spamassassin_gtk.c:358
 msgid "Maximum size"
 msgstr "Maximálna veľkosť"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:178
 #: src/plugins/bsfilter/bsfilter_gtk.c:160
-#: src/plugins/spamassassin/spamassassin_gtk.c:366
+#: src/plugins/spamassassin/spamassassin_gtk.c:367
 msgid "Messages larger than this will not be checked"
 msgstr "Správy väčšie ako táto hodnota nebudú kontrolované"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:181
 #: src/plugins/bsfilter/bsfilter_gtk.c:163
-#: src/plugins/spamassassin/spamassassin_gtk.c:369 src/prefs_account.c:1511
+#: src/plugins/spamassassin/spamassassin_gtk.c:370 src/prefs_account.c:1511
 msgid "KB"
 msgstr "kB"
 
@@ -9423,7 +9456,7 @@ msgstr "Len označiť ako spam"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:227
 #: src/plugins/bsfilter/bsfilter_gtk.c:179
-#: src/plugins/spamassassin/spamassassin_gtk.c:415
+#: src/plugins/spamassassin/spamassassin_gtk.c:416
 msgid ""
 "Folder for storing identified spam. Leave empty to use the trash folder."
 msgstr ""
@@ -9432,7 +9465,7 @@ msgstr ""
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:233
 #: src/plugins/bsfilter/bsfilter_gtk.c:185
-#: src/plugins/spamassassin/spamassassin_gtk.c:421
+#: src/plugins/spamassassin/spamassassin_gtk.c:422
 msgid "Click this button to select a folder for storing spam"
 msgstr "Pomocou tohoto tlačidla vyberte zložku na ukladanie spamu"
 
@@ -9462,14 +9495,14 @@ msgstr "Toto je možné len so správami v zložkách MH"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:268
 #: src/plugins/bsfilter/bsfilter_gtk.c:191
-#: src/plugins/spamassassin/spamassassin_gtk.c:436
+#: src/plugins/spamassassin/spamassassin_gtk.c:437
 msgid "Whitelist senders found in address book/folder"
 msgstr ""
 "Správy pochádzajúce od odosielateľov v adresári/zložke nepovažovať za spam"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:272
 #: src/plugins/bsfilter/bsfilter_gtk.c:195
-#: src/plugins/spamassassin/spamassassin_gtk.c:440
+#: src/plugins/spamassassin/spamassassin_gtk.c:441
 msgid ""
 "Messages coming from your address book contacts will be received in the "
 "normal folder even if detected as spam"
@@ -9479,7 +9512,7 @@ msgstr ""
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:282
 #: src/plugins/bsfilter/bsfilter_gtk.c:205
-#: src/plugins/spamassassin/spamassassin_gtk.c:450
+#: src/plugins/spamassassin/spamassassin_gtk.c:451
 msgid "Click this button to select a book or folder in the address book"
 msgstr "Toto tlačidlo vám umožní zvoliť adresár, alebo zložku adresára"
 
@@ -9506,7 +9539,7 @@ msgstr "Cesta k programu bogofilter"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:309
 #: src/plugins/bsfilter/bsfilter_gtk.c:232
-#: src/plugins/spamassassin/spamassassin_gtk.c:428
+#: src/plugins/spamassassin/spamassassin_gtk.c:429
 msgid "Mark spam as read"
 msgstr "Označiť všetok spam ako prečítaný"
 
@@ -9514,15 +9547,15 @@ msgstr "Označiť všetok spam ako prečítaný"
 msgid "Bsfilter"
 msgstr "Bsfilter"
 
-#: src/plugins/bsfilter/bsfilter.c:300
+#: src/plugins/bsfilter/bsfilter.c:273
 msgid "Bsfilter: fetching body..."
 msgstr "Bsfilter: vyberanie tela…"
 
-#: src/plugins/bsfilter/bsfilter.c:309
+#: src/plugins/bsfilter/bsfilter.c:282
 msgid "Bsfilter: filtering message..."
 msgstr "Bsfilter: filtrovanie správy…"
 
-#: src/plugins/bsfilter/bsfilter.c:394
+#: src/plugins/bsfilter/bsfilter.c:367
 msgid ""
 "The Bsfilter plugin couldn't filter a message. The probable cause of the "
 "error is that it didn't learn from any mail.\n"
@@ -9534,7 +9567,7 @@ msgstr ""
 "Použite „/Označiť/Označiť ako spam” a „/Označiť/Označiť ako nie spam” na "
 "naplnenie Bsfilter niekoľko sto správami SPAM a nie SPAM."
 
-#: src/plugins/bsfilter/bsfilter.c:401
+#: src/plugins/bsfilter/bsfilter.c:374
 #, c-format
 msgid ""
 "The Bsfilter plugin couldn't filter a message. The command `%s` couldn't be "
@@ -9542,11 +9575,11 @@ msgid ""
 msgstr ""
 "Zásuvný modul Bsfilter nemôže filtrovať správu. Nemožno spustiť príkaz `%s`."
 
-#: src/plugins/bsfilter/bsfilter.c:502
+#: src/plugins/bsfilter/bsfilter.c:475
 msgid "Bsfilter: learning from message..."
 msgstr "Bsfilter: učenie zo správy…"
 
-#: src/plugins/bsfilter/bsfilter.c:643
+#: src/plugins/bsfilter/bsfilter.c:616
 msgid ""
 "This plugin can check all messages that are received from an IMAP, LOCAL or "
 "POP account for spam using Bsfilter. You will need Bsfilter installed "
@@ -9570,12 +9603,12 @@ msgstr ""
 "Označiť/Označiť ako nie spam”.\n"
 "\n"
 "Keď je správa identifikovaná ako SPAM, môže byť zmazaná alebo uložená do "
-"určeného priečinka.\n"
+"určenej zložky.\n"
 "\n"
 "Voľby môžete nájsť v /Nastavenie/Nastavenia/Zásuvné moduly/Bsfilter"
 
 #: src/plugins/bsfilter/bsfilter_gtk.c:171
-#: src/plugins/spamassassin/spamassassin_gtk.c:407
+#: src/plugins/spamassassin/spamassassin_gtk.c:408
 msgid "Save spam in"
 msgstr "Uložiť spam v"
 
@@ -9596,7 +9629,7 @@ msgid "Path to bsfilter executable"
 msgstr "Cesta k bsfilter"
 
 #: src/plugins/clamd/clamav_plugin.c:47
-#: src/plugins/clamd/clamav_plugin_gtk.c:549
+#: src/plugins/clamd/clamav_plugin_gtk.c:550
 msgid "Clam AntiVirus"
 msgstr "Clam AntiVirus"
 
@@ -9715,55 +9748,59 @@ msgstr ""
 msgid "Virus detection"
 msgstr "Detekcia vírusu"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:249
+#: src/plugins/clamd/clamav_plugin_gtk.c:72
+msgid "Select folder to store infected messages in"
+msgstr "Vyberte zložku na ukladanie infikovaných správ"
+
+#: src/plugins/clamd/clamav_plugin_gtk.c:250
 msgid "Enable virus scanning"
 msgstr "Zapnúť skenovanie vírusov"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:259
+#: src/plugins/clamd/clamav_plugin_gtk.c:260
 msgid "Maximum attachment size"
 msgstr "Maximálna veľkosť prílohy"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:270
+#: src/plugins/clamd/clamav_plugin_gtk.c:271
 msgid "Message attachments larger than this will not be scanned"
 msgstr "Prílohy správy, ktoré sú väčšie ako táto hodnota, nebudú skenované"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:274
+#: src/plugins/clamd/clamav_plugin_gtk.c:275
 msgid "MB"
 msgstr "MB"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:283
+#: src/plugins/clamd/clamav_plugin_gtk.c:284
 msgid "Save infected mail in"
 msgstr "Uložiť nakazené emaily v"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:287
+#: src/plugins/clamd/clamav_plugin_gtk.c:288
 msgid "Save mail that contains viruses"
 msgstr "Uložiť emaily, ktoré obsahujú vírusy"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:295
+#: src/plugins/clamd/clamav_plugin_gtk.c:296
 msgid ""
 "Folder for storing infected mail. Leave empty to use the default trash folder"
 msgstr ""
 "Zložka na uchovávanie nakazených emailov. Nechajte prázdne, ak chcete použiť "
 "predvolenú zložku koša"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:303
+#: src/plugins/clamd/clamav_plugin_gtk.c:304
 msgid "Click this button to select a folder for storing infected mail"
 msgstr ""
 "Kliknite na toto tlačidlo a vyberte zložku na uloženie nakazených emailov"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:311
+#: src/plugins/clamd/clamav_plugin_gtk.c:312
 msgid "Automatic configuration"
 msgstr "Automatická konfigurácia"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:316
+#: src/plugins/clamd/clamav_plugin_gtk.c:317
 msgid "Should configuration be done automatic or manual"
 msgstr "Či má byť konfigurácia robená automaticky alebo manuálne"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:324
+#: src/plugins/clamd/clamav_plugin_gtk.c:325
 msgid "Where is clamd.conf"
 msgstr "Kde sa nachádza clamd.conf"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:332
+#: src/plugins/clamd/clamav_plugin_gtk.c:333
 msgid ""
 "Full path to clamd.conf. If this field is not empty then the plugin has been "
 "able to locate the file automatically"
@@ -9771,36 +9808,36 @@ msgstr ""
 "Úplná cesta ku clamd.conf. Ak toto pole nie je prázdne, potom zásuvný modul "
 "dokázal nájsť súbor automaticky"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:336
+#: src/plugins/clamd/clamav_plugin_gtk.c:337
 msgid "Br_owse"
 msgstr "Pr_echádzať"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:340
+#: src/plugins/clamd/clamav_plugin_gtk.c:341
 msgid "Click this button to select full path to clamd.conf"
 msgstr "Kliknite na toto tlačidlo a vyberte úplnú cestu ku clamd.conf"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:348
+#: src/plugins/clamd/clamav_plugin_gtk.c:349
 msgid "Check permission for folders and adjust if necessary"
 msgstr "Skontrolovať práva zložiek a ak je to potrebné, upraviť ich"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:361
+#: src/plugins/clamd/clamav_plugin_gtk.c:362
 msgid "Click this button to check and adjust folder permissions"
 msgstr "Kliknite na toto tlačidlo na kontrolu a úpravu práv zložky"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:369
+#: src/plugins/clamd/clamav_plugin_gtk.c:370
 msgid "Remote Host"
 msgstr "Vzdialený hostiteľ"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:377
+#: src/plugins/clamd/clamav_plugin_gtk.c:378
 msgid "Hostname or IP for remote host running clamav daemon"
 msgstr ""
 "Meno stroja alebo IP adresa hostiteľa, na ktorom je spustený démon clamav"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:397
+#: src/plugins/clamd/clamav_plugin_gtk.c:398
 msgid "Port number where clamav daemon is listening"
 msgstr "Číslo portu, na ktorom démon clamav prijíma požiadavky"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:524
+#: src/plugins/clamd/clamav_plugin_gtk.c:525
 msgid ""
 "New config\n"
 "No socket information.\n"
@@ -9810,7 +9847,7 @@ msgstr ""
 "Chýbajú informácie o sokete.\n"
 "Antivírus vypnutý."
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:528
+#: src/plugins/clamd/clamav_plugin_gtk.c:529
 msgid ""
 "New config\n"
 "Clamd does not respond to ping.\n"
@@ -9820,7 +9857,7 @@ msgstr ""
 "Clamd neodpovedá na ping.\n"
 "Je clamd spustený?"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:117
+#: src/plugins/clamd/libclamd/clamd-plugin.c:121
 #, c-format
 msgid ""
 "%s: Unable to open\n"
@@ -9829,7 +9866,7 @@ msgstr ""
 "%s: Nemožno otvoriť\n"
 "clamd bude vypnutý"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:215
+#: src/plugins/clamd/libclamd/clamd-plugin.c:216
 #, c-format
 msgid ""
 "%s: Not able to find required information\n"
@@ -9838,30 +9875,30 @@ msgstr ""
 "%s: Nemožno nájsť požadované informácie\n"
 "clamd bude vypnutý"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:249
+#: src/plugins/clamd/libclamd/clamd-plugin.c:250
 msgid "Could not create socket"
 msgstr "Nemožno vytvoriť soket"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:422
+#: src/plugins/clamd/libclamd/clamd-plugin.c:437
 msgid ": File does not exist"
 msgstr ": Súbor neexistuje"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:435
+#: src/plugins/clamd/libclamd/clamd-plugin.c:450
 msgid ": Unable to open"
 msgstr ": Nemožno otvoriť"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:455
-#: src/plugins/clamd/libclamd/clamd-plugin.c:460
-#: src/plugins/clamd/libclamd/clamd-plugin.c:474
+#: src/plugins/clamd/libclamd/clamd-plugin.c:470
+#: src/plugins/clamd/libclamd/clamd-plugin.c:475
+#: src/plugins/clamd/libclamd/clamd-plugin.c:489
 msgid "Socket write error"
 msgstr "Chyba zápisu soketu"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:467
+#: src/plugins/clamd/libclamd/clamd-plugin.c:482
 #, c-format
 msgid "%s: Error reading"
 msgstr "%s: Chyba čítania"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:481
+#: src/plugins/clamd/libclamd/clamd-plugin.c:496
 msgid "Socket read error"
 msgstr "Chyba čítania soketu"
 
@@ -10082,17 +10119,17 @@ msgstr ""
 "Predvolene je všetok vzdialený obsah blokovaný. Voľby môžete nájsť v menu "
 "„Nastavenie/Nastavenia/Zásuvné moduly/Fancy”"
 
-#: src/plugins/fetchinfo/fetchinfo_plugin.c:167
-#: src/plugins/fetchinfo/fetchinfo_plugin.c:200
+#: src/plugins/fetchinfo/fetchinfo_plugin.c:161
+#: src/plugins/fetchinfo/fetchinfo_plugin.c:194
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:182
 msgid "Fetchinfo"
 msgstr "Fetchinfo"
 
-#: src/plugins/fetchinfo/fetchinfo_plugin.c:173
+#: src/plugins/fetchinfo/fetchinfo_plugin.c:167
 msgid "Failed to register mail receive hook"
 msgstr "Zlyhala registrácia obsluhy udalosti „mail receive”"
 
-#: src/plugins/fetchinfo/fetchinfo_plugin.c:209
+#: src/plugins/fetchinfo/fetchinfo_plugin.c:203
 msgid ""
 "This plugin modifies the downloaded messages. It inserts headers containing "
 "some download information: UIDL, Claws Mail account name, POP server, user "
@@ -10106,7 +10143,7 @@ msgstr ""
 "\n"
 "Nastavenia môžete nájsť v /Nastavenie/Nastavenia/Zásuvné moduly/Fetchinfo"
 
-#: src/plugins/fetchinfo/fetchinfo_plugin.c:236
+#: src/plugins/fetchinfo/fetchinfo_plugin.c:230
 msgid "Mail marking"
 msgstr "Označenie emailu"
 
@@ -10266,22 +10303,24 @@ msgstr ""
 "Zásuvný modul GData: Nebol získaný autorizačný kód, požiadavka autorizácie "
 "zrušená\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:498
+#: src/plugins/gdata/cm_gdata_contacts.c:497
 #, c-format
 msgid "GData plugin: Authorization refresh error: %s\n"
 msgstr "Zásuvný modul GData: Chyba obnovenia autorizácie: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:507
+#: src/plugins/gdata/cm_gdata_contacts.c:506
 msgid "GData plugin: Authorization refresh successful\n"
 msgstr "Zásuvný modul GData: Obnovenie autorizácie úspešné: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:568
+#: src/plugins/gdata/cm_gdata_contacts.c:566
 #, c-format
 msgid ""
 "GData plugin: Elapsed time since last refresh: %d minutes, refreshing now\n"
 msgstr ""
+"Zásuvný modul GData: Od posledného obnovenia uplynulo: %d min, obnovujem "
+"teraz\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:577
+#: src/plugins/gdata/cm_gdata_contacts.c:574
 msgid "GData plugin: Trying to refresh authorization\n"
 msgstr "Zásuvný modul GData: Pokus o obnovenie autorizácie\n"
 
@@ -10629,44 +10668,48 @@ msgstr "Odpojené"
 msgid "Disconnected: %s"
 msgstr "Odpojené: %s"
 
-#: src/plugins/managesieve/managesieve.c:724
-#: src/plugins/managesieve/managesieve.c:869
+#: src/plugins/managesieve/managesieve.c:725
+#: src/plugins/managesieve/managesieve.c:870
 #, c-format
 msgid "unhandled message on Sieve session: %s\n"
 msgstr "nespracovaná správa v relácii Sieve: %s\n"
 
-#: src/plugins/managesieve/managesieve.c:731
-#, fuzzy
+#: src/plugins/managesieve/managesieve.c:732
 msgid "STARTTLS failed"
-msgstr "TLS zlyhalo"
+msgstr "STARTTLS zlyhalo"
 
-#: src/plugins/managesieve/managesieve.c:796
-#: src/plugins/managesieve/managesieve.c:812
-#: src/plugins/managesieve/managesieve.c:839
-#: src/plugins/managesieve/managesieve.c:921
-#: src/plugins/managesieve/managesieve.c:939
+#: src/plugins/managesieve/managesieve.c:797
+#: src/plugins/managesieve/managesieve.c:813
+#: src/plugins/managesieve/managesieve.c:840
+#: src/plugins/managesieve/managesieve.c:922
+#: src/plugins/managesieve/managesieve.c:940
 msgid "error occurred on SIEVE session\n"
 msgstr "nastala chyba relácie SIEVE\n"
 
-#: src/plugins/managesieve/managesieve.c:865
+#: src/plugins/managesieve/managesieve.c:866
 #, c-format
 msgid "error occurred on Sieve session. data: %s\n"
 msgstr "nastala chyba relácie Sieve. Dáta: %s\n"
 
-#: src/plugins/managesieve/managesieve.c:874
+#: src/plugins/managesieve/managesieve.c:875
 #, c-format
 msgid "unhandled message on Sieve session: %d\n"
 msgstr "nespracovaná správa v relácii Sieve: %d\n"
 
-#: src/plugins/managesieve/managesieve.c:1131
+#: src/plugins/managesieve/managesieve.c:1132
 msgid "Sieve: retrying auth\n"
 msgstr "Sieve: opakovanie auth\n"
 
-#: src/plugins/managesieve/managesieve.c:1133
+#: src/plugins/managesieve/managesieve.c:1134
 msgid "Auth method not available"
 msgstr "Metóda auth nie je dostupná"
 
-#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5592
+#: src/plugins/managesieve/managesieve.c:1151
+#, c-format
+msgid "sending error on Sieve session: %s\n"
+msgstr "chyba odoslania v relácii Sieve: %s\n"
+
+#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5634
 msgid "_Filter"
 msgstr "_Filtrovať"
 
@@ -10738,7 +10781,7 @@ msgstr "Zadajte meno nového skriptu Sieve."
 
 #: src/plugins/managesieve/sieve_manager.c:242
 msgid "Enter new name for the script."
-msgstr "zadajte nové meno skriptu."
+msgstr "Zadajte nové meno skriptu."
 
 #: src/plugins/managesieve/sieve_manager.c:323
 #, c-format
@@ -10820,22 +10863,19 @@ msgid "Encryption"
 msgstr "Šifrovanie"
 
 #: src/plugins/managesieve/sieve_prefs.c:194
-#, fuzzy
 msgid "No encryption"
-msgstr "Šifrovanie"
+msgstr "Bez šifrovania"
 
 #: src/plugins/managesieve/sieve_prefs.c:196
-#, fuzzy
 msgid "Use STARTTLS when available"
-msgstr "Použiť TLS, keď je dostupné"
+msgstr "Použiť STARTTLS, keď je dostupné"
 
 #: src/plugins/managesieve/sieve_prefs.c:198
-#, fuzzy
 msgid "Require STARTTLS"
-msgstr "Vyžadovať TLS"
+msgstr "Vyžadovať STARTTLS"
 
 #: src/plugins/managesieve/sieve_prefs.c:206
-#: src/plugins/rssyl/rssyl_feed_props.c:264
+#: src/plugins/rssyl/rssyl_feed_props.c:262
 msgid "No authentication"
 msgstr "Bez autentifikácie"
 
@@ -10855,7 +10895,7 @@ msgid "User ID"
 msgstr "Prihlasovacie meno"
 
 #: src/plugins/managesieve/sieve_prefs.c:250
-#: src/plugins/rssyl/rssyl_feed_props.c:395
+#: src/plugins/rssyl/rssyl_feed_props.c:393
 #: src/plugins/vcalendar/vcal_prefs.c:399
 #: src/plugins/vcalendar/vcal_prefs.c:518 src/prefs_account.c:1281
 #: src/prefs_account.c:1818 src/prefs_account.c:2535 src/prefs_account.c:2557
@@ -10870,6 +10910,7 @@ msgstr "Metóda autentifikácie"
 
 #: src/plugins/managesieve/sieve_prefs.c:275 src/prefs_account.c:1583
 #: src/prefs_account.c:1779 src/prefs_send.c:233 src/prefs_send.c:304
+#: src/prefs_themes.c:1075
 msgid "Automatic"
 msgstr "Automatické"
 
@@ -11037,7 +11078,7 @@ msgid "New Calendar message"
 msgstr "Nová správa kalendára"
 
 #: src/plugins/notification/notification_popup.c:337
-#: src/plugins/notification/notification_trayicon.c:905
+#: src/plugins/notification/notification_trayicon.c:907
 msgid "A new calendar message arrived"
 msgstr "Prišla nová správa kalendára"
 
@@ -11046,7 +11087,7 @@ msgid "New RSS feed article"
 msgstr "Nový článok kanála RSS"
 
 #: src/plugins/notification/notification_popup.c:341
-#: src/plugins/notification/notification_trayicon.c:908
+#: src/plugins/notification/notification_trayicon.c:910
 msgid "A new article in a RSS feed arrived"
 msgstr "Prišiel nový článok kanála RSS"
 
@@ -11059,7 +11100,7 @@ msgid "Unknown message type arrived"
 msgstr "Prišla nová neznáma správa"
 
 #: src/plugins/notification/notification_popup.c:378
-#: src/plugins/notification/notification_trayicon.c:677
+#: src/plugins/notification/notification_trayicon.c:679
 msgid "Present main window"
 msgstr "Zobraziť hlavné okno"
 
@@ -11085,7 +11126,7 @@ msgid "Calendar message"
 msgstr "Správa kalendára"
 
 #: src/plugins/notification/notification_popup.c:501
-#: src/plugins/notification/notification_trayicon.c:942
+#: src/plugins/notification/notification_trayicon.c:944
 #, c-format
 msgid "%d new calendar message arrived"
 msgid_plural "%d new calendar messages arrived"
@@ -11192,12 +11233,12 @@ msgstr "Zobraziť titulkový pruh"
 
 #: src/plugins/notification/notification_prefs.c:766
 #: src/plugins/pgpcore/select-keys.c:237 src/plugins/pgpcore/sgpgme.c:147
-#: src/prefs_receive.c:231 src/prefs_summaries.c:504
+#: src/prefs_receive.c:231
 msgid "Never"
 msgstr "Nikdy"
 
 #: src/plugins/notification/notification_prefs.c:768 src/prefs_receive.c:229
-#: src/prefs_summaries.c:486 src/prefs_summaries.c:505
+#: src/prefs_summaries.c:494 src/prefs_summaries.c:504
 msgid "Always"
 msgstr "Vždy"
 
@@ -11295,8 +11336,8 @@ msgstr "Časový limit zobrazenia okna"
 #: src/plugins/notification/notification_prefs.c:1072
 #: src/plugins/notification/notification_prefs.c:1367
 #: src/plugins/notification/notification_prefs.c:1673
-#: src/plugins/spamassassin/spamassassin_gtk.c:390 src/prefs_other.c:575
-#: src/prefs_receive.c:203 src/prefs_summaries.c:538
+#: src/plugins/spamassassin/spamassassin_gtk.c:391 src/prefs_other.c:575
+#: src/prefs_receive.c:203 src/prefs_summaries.c:544
 msgid "seconds"
 msgstr "sekúnd"
 
@@ -11441,27 +11482,27 @@ msgstr "Zobraziť upozornenia ikony"
 msgid "New %d, Unread: %d, Total: %d"
 msgstr "Nové %d, Neprečítané: %d, Celkom: %d"
 
-#: src/plugins/notification/notification_trayicon.c:855
+#: src/plugins/notification/notification_trayicon.c:857
 msgid "New mail message"
 msgstr "Nová poštová správa"
 
-#: src/plugins/notification/notification_trayicon.c:857
+#: src/plugins/notification/notification_trayicon.c:859
 msgid "New news post"
 msgstr "Nová diskusná správa"
 
-#: src/plugins/notification/notification_trayicon.c:859
+#: src/plugins/notification/notification_trayicon.c:861
 msgid "New calendar message"
 msgstr "Nová správa kalendára"
 
-#: src/plugins/notification/notification_trayicon.c:861
+#: src/plugins/notification/notification_trayicon.c:863
 msgid "New article in RSS feed"
 msgstr "Nový článok kanála RSS"
 
-#: src/plugins/notification/notification_trayicon.c:864
+#: src/plugins/notification/notification_trayicon.c:866
 msgid "New messages arrived"
 msgstr "Prišla nová správa"
 
-#: src/plugins/notification/notification_trayicon.c:920
+#: src/plugins/notification/notification_trayicon.c:922
 #, c-format
 msgid "%d new mail message arrived"
 msgid_plural "%d new mail messages arrived"
@@ -11469,7 +11510,7 @@ msgstr[0] "Prišla %d nová poštová správa"
 msgstr[1] "Prišli %d nové poštové správy"
 msgstr[2] "Prišlo %d nových poštových správ"
 
-#: src/plugins/notification/notification_trayicon.c:931
+#: src/plugins/notification/notification_trayicon.c:933
 #, c-format
 msgid "%d new news post arrived"
 msgid_plural "%d new news posts arrived"
@@ -11477,7 +11518,7 @@ msgstr[0] "Prišla %d nová diskusná správa"
 msgstr[1] "Prišli %d nové diskusné správy"
 msgstr[2] "Prišlo %d nových diskusných správ"
 
-#: src/plugins/notification/notification_trayicon.c:953
+#: src/plugins/notification/notification_trayicon.c:955
 #, c-format
 msgid "%d new article in RSS feeds arrived"
 msgid_plural "%d new articles in RSS feeds arrived"
@@ -11546,63 +11587,63 @@ msgid "PDF rendering failed for an unknown reason."
 msgstr "Spracovanie PDF zlyhalo z neznámeho dôvodu."
 
 #: src/plugins/pdf_viewer/poppler_viewer.c:1725
-#: src/plugins/pdf_viewer/poppler_viewer.c:1942
+#: src/plugins/pdf_viewer/poppler_viewer.c:1934
 msgid "Document Index"
 msgstr "Obsah dokumentu"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1910
+#: src/plugins/pdf_viewer/poppler_viewer.c:1902
 msgid "First Page"
 msgstr "Prvá strana"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1913
+#: src/plugins/pdf_viewer/poppler_viewer.c:1905
 msgid "Previous Page"
 msgstr "Predošlá strana"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1916
+#: src/plugins/pdf_viewer/poppler_viewer.c:1908
 msgid "Next Page"
 msgstr "Ďalšia strana"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1919
+#: src/plugins/pdf_viewer/poppler_viewer.c:1911
 msgid "Last Page"
 msgstr "Posledná strana"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1922
+#: src/plugins/pdf_viewer/poppler_viewer.c:1914
 msgid "Zoom In"
 msgstr "Zväčšiť"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1924
+#: src/plugins/pdf_viewer/poppler_viewer.c:1916
 msgid "Zoom Out"
 msgstr "Zmenšiť"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1927
+#: src/plugins/pdf_viewer/poppler_viewer.c:1919
 msgid "Fit Page"
 msgstr "Celá strana"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1930
+#: src/plugins/pdf_viewer/poppler_viewer.c:1922
 msgid "Fit Page Width"
 msgstr "Celá šírka"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1933
+#: src/plugins/pdf_viewer/poppler_viewer.c:1925
 msgid "Rotate Left"
 msgstr "Otočiť vľavo"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1936
+#: src/plugins/pdf_viewer/poppler_viewer.c:1928
 msgid "Rotate Right"
 msgstr "Otočiť vpravo"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1939
+#: src/plugins/pdf_viewer/poppler_viewer.c:1931
 msgid "Document Info"
 msgstr "Informácie o dokumente"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1944
+#: src/plugins/pdf_viewer/poppler_viewer.c:1936
 msgid "Page Number"
 msgstr "Číslo strany"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1946
+#: src/plugins/pdf_viewer/poppler_viewer.c:1938
 msgid "Zoom Factor"
 msgstr "Mierka"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2051
+#: src/plugins/pdf_viewer/poppler_viewer.c:2043
 #, c-format
 msgid ""
 "This plugin enables the viewing of PDF and PostScript attachments using the "
@@ -11615,13 +11656,13 @@ msgstr ""
 "\n"
 "Akákoľvek spätná väzba je vítaná: iwkse@claws-mail.org"
 
+#: src/plugins/pdf_viewer/poppler_viewer.c:2049
 #: src/plugins/pdf_viewer/poppler_viewer.c:2057
-#: src/plugins/pdf_viewer/poppler_viewer.c:2065
-#: src/plugins/pdf_viewer/poppler_viewer.c:2085
+#: src/plugins/pdf_viewer/poppler_viewer.c:2077
 msgid "PDF Viewer"
 msgstr "Zobrazovať PDF"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2061
+#: src/plugins/pdf_viewer/poppler_viewer.c:2053
 #, c-format
 msgid ""
 "Warning: could not find ghostscript binary (gs) required for %s plugin to "
@@ -11685,7 +11726,7 @@ msgstr ""
 "Tento kľúč nie je vo vašom zväzku kľúčov. Chcete, aby sa Claws Mail pokúsil "
 "importovať ho z kľúčového serveru?"
 
-#: src/plugins/pgpcore/pgp_viewer.c:181 src/plugins/pgpcore/pgp_viewer.c:279
+#: src/plugins/pgpcore/pgp_viewer.c:181 src/plugins/pgpcore/pgp_viewer.c:280
 msgid ""
 "\n"
 "  Key ID "
@@ -11727,19 +11768,19 @@ msgstr ""
 "\n"
 "  Importujem ID kľúča "
 
-#: src/plugins/pgpcore/pgp_viewer.c:268
+#: src/plugins/pgpcore/pgp_viewer.c:269
 msgid "   This key has been imported to your keyring.\n"
 msgstr "   Tento kľúč bol naimportovaný do vášho zväzku.\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:270
+#: src/plugins/pgpcore/pgp_viewer.c:271
 msgid "   This key couldn't be imported to your keyring.\n"
 msgstr "   Tento kľúč nebol importovaný do vášho zväzku.\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:271
+#: src/plugins/pgpcore/pgp_viewer.c:272
 msgid "   Key servers are sometimes slow.\n"
 msgstr "   Kľúčové servery môžu niekedy byť pomalé.\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:272
+#: src/plugins/pgpcore/pgp_viewer.c:273
 msgid ""
 "   You can try to import it manually with the command:\n"
 "\n"
@@ -11749,7 +11790,7 @@ msgstr ""
 "\n"
 "     "
 
-#: src/plugins/pgpcore/pgp_viewer.c:282
+#: src/plugins/pgpcore/pgp_viewer.c:283
 msgid "   This key is in your keyring.\n"
 msgstr "   Tento kľúč je vo vašom zväzku kľúčov.\n"
 
@@ -11808,7 +11849,7 @@ msgstr "Vymazať z pamäte po"
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "Nastavenie na „0” (nula) bude uchovávať heslo počas celej relácie"
 
-#: src/plugins/pgpcore/prefs_gpg.c:163 src/plugins/rssyl/rssyl_feed_props.c:476
+#: src/plugins/pgpcore/prefs_gpg.c:163 src/plugins/rssyl/rssyl_feed_props.c:474
 #: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1874
 #: src/prefs_receive.c:187
 msgid "minutes"
@@ -12221,7 +12262,7 @@ msgstr "Nemožno konvertovať textové dáta do žiadneho známeho kódovania."
 #: src/plugins/pgpinline/pgpinline.c:196 src/plugins/pgpinline/pgpinline.c:518
 #: src/plugins/pgpinline/pgpinline.c:657 src/plugins/pgpinline/pgpinline.c:713
 #: src/plugins/pgpmime/pgpmime.c:183 src/plugins/pgpmime/pgpmime.c:329
-#: src/plugins/pgpmime/pgpmime.c:509 src/plugins/pgpmime/pgpmime.c:652
+#: src/plugins/pgpmime/pgpmime.c:510 src/plugins/pgpmime/pgpmime.c:653
 #: src/plugins/smime/smime.c:413
 #, c-format
 msgid "Couldn't initialize GPG context, %s"
@@ -12275,25 +12316,27 @@ msgstr "Nemožno prečítať dešifrované časti súboru."
 msgid "Malformed message"
 msgstr "Nesprávny formát správy"
 
-#: src/plugins/pgpinline/pgpinline.c:503
-msgid "Couldn't create temporary file."
-msgstr "Nemožno vytvoriť dočasný súbor."
+#: src/plugins/pgpinline/pgpinline.c:503 src/plugins/pgpinline/pgpinline.c:695
+#: src/plugins/pgpmime/pgpmime.c:693
+#, c-format
+msgid "Couldn't create temporary file, %s"
+msgstr "Nemožno vytvoriť dočasný súbor, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:542 src/plugins/pgpmime/pgpmime.c:536
+#: src/plugins/pgpinline/pgpinline.c:542 src/plugins/pgpmime/pgpmime.c:537
 #, c-format
 msgid "Data signing failed, %s"
 msgstr "Podpísanie dát zlyhalo, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:560 src/plugins/pgpmime/pgpmime.c:563
+#: src/plugins/pgpinline/pgpinline.c:560 src/plugins/pgpmime/pgpmime.c:564
 #, c-format
 msgid "Data signing failed due to invalid signer: %s"
 msgstr "Podpísanie dát zlyhalo kvôli neplatnému podpisu: %s"
 
-#: src/plugins/pgpinline/pgpinline.c:569 src/plugins/pgpmime/pgpmime.c:572
+#: src/plugins/pgpinline/pgpinline.c:569 src/plugins/pgpmime/pgpmime.c:573
 msgid "Data signing failed, no results."
 msgstr "Podpísanie dát zlyhalo, žiadne výsledky."
 
-#: src/plugins/pgpinline/pgpinline.c:579 src/plugins/pgpmime/pgpmime.c:583
+#: src/plugins/pgpinline/pgpinline.c:579 src/plugins/pgpmime/pgpmime.c:584
 msgid "Data signing failed, no contents."
 msgstr "Podpísanie dát zlyhalo, žiadny obsah."
 
@@ -12305,17 +12348,12 @@ msgstr ""
 "Prosím, pamätajte, že pri použití systému PGP/Inline nebudú šifrované "
 "prílohy ani hlavičky správy (napr. Predmet)."
 
-#: src/plugins/pgpinline/pgpinline.c:667 src/plugins/pgpmime/pgpmime.c:662
+#: src/plugins/pgpinline/pgpinline.c:667 src/plugins/pgpmime/pgpmime.c:663
 #, c-format
 msgid "Couldn't add GPG key %s, %s"
 msgstr "Nemožno pridať GPG kľúč %s, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:695 src/plugins/pgpmime/pgpmime.c:691
-#, c-format
-msgid "Couldn't create temporary file, %s"
-msgstr "Nemožno vytvoriť dočasný súbor, %s"
-
-#: src/plugins/pgpinline/pgpinline.c:726 src/plugins/pgpmime/pgpmime.c:718
+#: src/plugins/pgpinline/pgpinline.c:726 src/plugins/pgpmime/pgpmime.c:720
 #, c-format
 msgid "Encryption failed, %s"
 msgstr "Šifrovanie zlyhalo, %s"
@@ -12366,22 +12404,22 @@ msgstr "Nemožno spracovať dešifrovaný súbor."
 msgid "Couldn't parse decrypted file parts."
 msgstr "Nemožno spracovať dešifrované časti súboru."
 
-#: src/plugins/pgpmime/pgpmime.c:455 src/plugins/pgpmime/pgpmime.c:494
+#: src/plugins/pgpmime/pgpmime.c:456 src/plugins/pgpmime/pgpmime.c:495
 #, c-format
 msgid "Couldn't create temporary file: %s"
 msgstr "Nemožno vytvoriť dočasný súbor: %s"
 
-#: src/plugins/pgpmime/pgpmime.c:596
+#: src/plugins/pgpmime/pgpmime.c:597
 msgid "OpenPGP digital signature"
 msgstr "Digitálny podpis OpenPGP"
 
-#: src/plugins/pgpmime/pgpmime.c:618
+#: src/plugins/pgpmime/pgpmime.c:619
 msgid ""
 "Please note that email headers, like Subject, are not encrypted by the PGP/"
 "Mime system."
 msgstr "Pozor, pri použití PGP/Mime systému nebudú šifrované hlavičky správy."
 
-#: src/plugins/pgpmime/pgpmime.c:790
+#: src/plugins/pgpmime/pgpmime.c:792
 msgid "PGP/Mime"
 msgstr "PGP/Mime"
 
@@ -12424,7 +12462,7 @@ msgid "Show Python console..."
 msgstr "Zobraziť konzolu Python…"
 
 #: src/plugins/python/python_plugin.c:503
-#: src/plugins/rssyl/rssyl_feed_props.c:483
+#: src/plugins/rssyl/rssyl_feed_props.c:481
 msgid "Refresh"
 msgstr "Obnoviť"
 
@@ -12604,7 +12642,7 @@ msgctxt "Empty RSS feed title placeholder"
 msgid "(empty)"
 msgstr "(prázdne)"
 
-#: src/plugins/rssyl/rssyl.c:155 src/plugins/rssyl/rssyl.c:166
+#: src/plugins/rssyl/rssyl.c:156 src/plugins/rssyl/rssyl.c:167
 msgid "Refresh all feeds"
 msgstr "Obnoviť všetky kanály"
 
@@ -12641,11 +12679,6 @@ msgstr "Odstráni strom kanálov"
 msgid "Select an OPML file"
 msgstr "Vybrať súbor OPML"
 
-#: src/plugins/rssyl/rssyl_feed.c:75 src/plugins/rssyl/rssyl_subscribe.c:158
-#, c-format
-msgid "Couldn't create folder for new feed '%s'."
-msgstr "Nemožno vytvoriť zložku nového kanála „%s”."
-
 #: src/plugins/rssyl/rssyl_feed.h:10
 #, c-format
 msgid "RSSyl: Subscribing new feed: %s\n"
@@ -12686,106 +12719,105 @@ msgstr "RSSyl: Nemožno spracovať kanál na „%s”\n"
 msgid "RSSyl: Application is exiting, couldn't finish updating feed at '%s'\n"
 msgstr "RSSyl: Aplikácia končí, nemožno dokončiť aktualizáciu kanála na „%s”\n"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:270
+#: src/plugins/rssyl/rssyl_feed_props.c:268
 msgid "HTTP Basic authentication"
 msgstr "Základná autentifikácia HTTP"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:291
+#: src/plugins/rssyl/rssyl_feed_props.c:289
 msgid "Use default refresh interval"
 msgstr "Použiť predvolený interval aktualizácie"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:303
+#: src/plugins/rssyl/rssyl_feed_props.c:301
 msgid "Keep old items"
 msgstr "Zachovať staré položky"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:309
+#: src/plugins/rssyl/rssyl_feed_props.c:307
 msgid "_Trim"
 msgstr "_Orezať"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:311
+#: src/plugins/rssyl/rssyl_feed_props.c:309
 msgid "Update feed, deleting items which are no longer in the source feed"
 msgstr "Aktualizuje kanál, odstráni položky, ktoré už v zdroji kanála nie sú"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:314
+#: src/plugins/rssyl/rssyl_feed_props.c:312
 msgid "Fetch comments if possible"
 msgstr "Sťahovať komentáre, ak je to možné"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:339
+#: src/plugins/rssyl/rssyl_feed_props.c:337
 msgid "Always mark it as new"
 msgstr "Vždy označiť ako novú"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:345
+#: src/plugins/rssyl/rssyl_feed_props.c:343
 msgid "Only mark it as new if its text has changed"
 msgstr "Označiť ako novú, len ak sa zmenil text"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:351
+#: src/plugins/rssyl/rssyl_feed_props.c:349
 msgid "Never mark it as new"
 msgstr "Nikdy neoznačovať ako novú"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:356
+#: src/plugins/rssyl/rssyl_feed_props.c:354
 msgid "Add item title to the top of message"
 msgstr "Pridať nadpis položky na začiatok správy"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:363
+#: src/plugins/rssyl/rssyl_feed_props.c:361
 msgid "Ignore title rename"
 msgstr "Ignorovať zmenu nadpisu"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:368
+#: src/plugins/rssyl/rssyl_feed_props.c:366
 msgid ""
 "Enable this to keep current folder name, even if feed author changes title "
 "of the feed."
 msgstr ""
 "Táto možnosť zachová aktuálne meno zložky, hoci autor zmení nadpis kanála."
 
-#: src/plugins/rssyl/rssyl_feed_props.c:372
+#: src/plugins/rssyl/rssyl_feed_props.c:370
 #: src/plugins/vcalendar/vcal_prefs.c:593
-#, fuzzy
 msgid "Verify SSL/TLS certificate validity"
-msgstr "Overiť platnosť certifikátu SSL"
+msgstr "Overiť platnosť certifikátu SSL/TLS"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:392
+#: src/plugins/rssyl/rssyl_feed_props.c:390
 msgid "User name"
 msgstr "Meno používateľa"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:405
+#: src/plugins/rssyl/rssyl_feed_props.c:403
 msgid "Source URL"
 msgstr "Zdrojová URL:"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:418
+#: src/plugins/rssyl/rssyl_feed_props.c:416
 msgid "Fetch comments on posts aged less than"
 msgstr "Sťahovať komentáre príspevkov novšie ako"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:426
+#: src/plugins/rssyl/rssyl_feed_props.c:424
 #: src/plugins/vcalendar/day-view.c:614 src/plugins/vcalendar/month-view.c:711
 #: src/prefs_account.c:1480 src/prefs_folder_item.c:568 src/prefs_matcher.c:337
 msgid "days"
 msgstr "dní"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:427
+#: src/plugins/rssyl/rssyl_feed_props.c:425
 msgid "Set to -1 to fetch all comments"
 msgstr "Nastavte na -1 na prijatie všetkých komentárov"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:451
+#: src/plugins/rssyl/rssyl_feed_props.c:449
 msgid "If an item changes"
 msgstr "Ak sa položka zmení"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:456
+#: src/plugins/rssyl/rssyl_feed_props.c:454
 msgid "Items"
 msgstr "Položiek"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:469
+#: src/plugins/rssyl/rssyl_feed_props.c:467
 msgid "Refresh interval"
 msgstr "Interval obnovenia"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:477
+#: src/plugins/rssyl/rssyl_feed_props.c:475
 msgid "Set to 0 to disable automatic refreshing for this feed"
 msgstr "Nastavte na 0 na vypnutie automatického obnovovania tohoto kanála"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:529
+#: src/plugins/rssyl/rssyl_feed_props.c:527
 msgid "_OK"
 msgstr "_OK"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:537
+#: src/plugins/rssyl/rssyl_feed_props.c:535
 msgid "Set feed properties"
 msgstr "Nastaviť vlastnosti kanála"
 
@@ -12855,9 +12887,8 @@ msgid "Refresh all feeds on application start"
 msgstr "Obnoviť všetky kanály pri spustení aplikácie"
 
 #: src/plugins/rssyl/rssyl_prefs.c:170
-#, fuzzy
 msgid "Verify SSL/TLS certificates validity for new feeds"
-msgstr "Overiť platnosť certifikátu SSL nových kanálov"
+msgstr "Overiť platnosť certifikátu SSL/TLS nových kanálov"
 
 #: src/plugins/rssyl/rssyl_prefs.c:177
 msgid "Path to cookies file"
@@ -12875,6 +12906,11 @@ msgstr "Obnovovanie"
 msgid "Security and privacy"
 msgstr "Bezpečnosť a súkromie"
 
+#: src/plugins/rssyl/rssyl_subscribe.c:158
+#, c-format
+msgid "Couldn't create folder for new feed '%s'."
+msgstr "Nemožno vytvoriť zložku nového kanála „%s”."
+
 #: src/plugins/rssyl/rssyl_subscribe_gtk.c:47
 msgid "Subscribe new feed?"
 msgstr "Prihlásiť _nový kanál?"
@@ -12899,17 +12935,17 @@ msgid "Updating comments for '%s'..."
 msgstr "Aktualizácia komentárov pre „%s”…"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:105
-#: src/plugins/vcalendar/vcal_folder.c:1614
+#: src/plugins/vcalendar/vcal_folder.c:1620
 msgid "401 (Authorisation required)"
 msgstr "401 (Vyžadovaná autorizácia)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:108
-#: src/plugins/vcalendar/vcal_folder.c:1617
+#: src/plugins/vcalendar/vcal_folder.c:1623
 msgid "403 (Unauthorised)"
 msgstr "403 (Neautorizované)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:111
-#: src/plugins/vcalendar/vcal_folder.c:1620
+#: src/plugins/vcalendar/vcal_folder.c:1626
 msgid "404 (Not found)"
 msgstr "404 (Nenájdené)"
 
@@ -13045,21 +13081,21 @@ msgstr ""
 "prosím dajte pozor na to, že hlavičky emailu, ako predmet, nie sú systémom S/"
 "MIME šifrované."
 
-#: src/plugins/spam_report/spam_report.c:299
+#: src/plugins/spam_report/spam_report.c:301
 msgid "Reporting spam..."
 msgstr "Ohlasovanie SPAM…"
 
-#: src/plugins/spam_report/spam_report.c:334
+#: src/plugins/spam_report/spam_report.c:336
 msgid "Report spam online..."
 msgstr "Ohlásiť SPAM online…"
 
-#: src/plugins/spam_report/spam_report.c:345
-#: src/plugins/spam_report/spam_report.c:383
+#: src/plugins/spam_report/spam_report.c:347
+#: src/plugins/spam_report/spam_report.c:385
 #: src/plugins/spam_report/spam_report_prefs.c:83
 msgid "SpamReport"
 msgstr "Hlásenie SPAM"
 
-#: src/plugins/spam_report/spam_report.c:388
+#: src/plugins/spam_report/spam_report.c:390
 msgid ""
 "This plugin reports spam to various places.\n"
 "Currently the following sites or methods are supported:\n"
@@ -13075,7 +13111,7 @@ msgstr ""
 " * spamcop.net\n"
 " * nominačný systém lists.debian.org"
 
-#: src/plugins/spam_report/spam_report.c:413
+#: src/plugins/spam_report/spam_report.c:415
 msgid "Spam reporting"
 msgstr "Hlásenie SPAM"
 
@@ -13092,7 +13128,7 @@ msgid "Password:"
 msgstr "Heslo:"
 
 #: src/plugins/spamassassin/spamassassin.c:77
-#: src/plugins/spamassassin/spamassassin_gtk.c:648
+#: src/plugins/spamassassin/spamassassin_gtk.c:649
 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 
@@ -13104,15 +13140,15 @@ msgstr "Zlyhalo pripojenie zásuvného modulu SpamAssassin k serveru spamd.\n"
 msgid "SpamAssassin plugin filtering failed.\n"
 msgstr "Filtrovanie zásuvného modulu SpamAssassin zlyhalo.\n"
 
-#: src/plugins/spamassassin/spamassassin.c:238
+#: src/plugins/spamassassin/spamassassin.c:211
 msgid "SpamAssassin plugin is disabled by its preferences.\n"
 msgstr "Zásuvný modul SpamAssassin je vo svojich nastaveniach vypnutý.\n"
 
-#: src/plugins/spamassassin/spamassassin.c:243
+#: src/plugins/spamassassin/spamassassin.c:216
 msgid "SpamAssassin: filtering message..."
 msgstr "SpamAssassin: filtrujem správu…"
 
-#: src/plugins/spamassassin/spamassassin.c:372
+#: src/plugins/spamassassin/spamassassin.c:345
 msgid ""
 "The SpamAssassin plugin couldn't filter a message. The probable cause of the "
 "error is an unreachable spamd daemon. Please make sure spamd is running and "
@@ -13122,7 +13158,7 @@ msgstr ""
 "príčina je nedostupnosť servera spamd. Uistite sa, že server spamd beží a je "
 "dostupný."
 
-#: src/plugins/spamassassin/spamassassin.c:429
+#: src/plugins/spamassassin/spamassassin.c:402
 msgid ""
 "Claws Mail needs network access in order to feed the mail to the remote "
 "learner."
@@ -13130,17 +13166,17 @@ msgstr ""
 "Claws Mail potrebuje sieťové pripojenie, aby mohol dodať správu vzdialenému "
 "učiacemu sa."
 
-#: src/plugins/spamassassin/spamassassin.c:574
+#: src/plugins/spamassassin/spamassassin.c:547
 msgid "Failed to get username"
 msgstr "Zlyhalo získanie mena používateľa"
 
-#: src/plugins/spamassassin/spamassassin.c:586
+#: src/plugins/spamassassin/spamassassin.c:559
 msgid "SpamAssassin plugin is loaded but disabled by its preferences.\n"
 msgstr ""
 "Zásuvný modul SpamAssassin je načítaný, ale je vo svojich nastaveniach "
 "vypnutý.\n"
 
-#: src/plugins/spamassassin/spamassassin.c:620
+#: src/plugins/spamassassin/spamassassin.c:593
 msgid ""
 "This plugin can check all messages that are received from an IMAP, LOCAL or "
 "POP account for spam using a SpamAssassin server. You will need a "
@@ -13176,50 +13212,54 @@ msgstr "TCP"
 msgid "Unix Socket"
 msgstr "Unixový soket"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:268
+#: src/plugins/spamassassin/spamassassin_gtk.c:119
+msgid "Select folder to save spam to"
+msgstr "Vyberte zložku na uloženie SPAMu"
+
+#: src/plugins/spamassassin/spamassassin_gtk.c:269
 msgid "Enable SpamAssassin plugin"
 msgstr "Aktivovať zásuvný modul SpamAssassin"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:272
+#: src/plugins/spamassassin/spamassassin_gtk.c:273
 msgid "Transport"
 msgstr "Prenos"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:280
+#: src/plugins/spamassassin/spamassassin_gtk.c:281
 msgid "Type of transport"
 msgstr "Typ prenosu"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:301
+#: src/plugins/spamassassin/spamassassin_gtk.c:302
 msgid "User"
 msgstr "Meno používateľa"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:314
+#: src/plugins/spamassassin/spamassassin_gtk.c:315
 msgid "User to use with spamd server"
 msgstr "Používateľ na spamd servere"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:316
+#: src/plugins/spamassassin/spamassassin_gtk.c:317
 msgid "spamd"
 msgstr "spamd"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:334
+#: src/plugins/spamassassin/spamassassin_gtk.c:335
 msgid "Hostname or IP address of spamd server"
 msgstr "Názov hostiteľa alebo IP adresa servera spamd"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:345
+#: src/plugins/spamassassin/spamassassin_gtk.c:346
 msgid "Port of spamd server"
 msgstr "Port serveru spamd"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:351
+#: src/plugins/spamassassin/spamassassin_gtk.c:352
 msgid "Path of Unix socket"
 msgstr "Cesta k unixovému soketu"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:386
+#: src/plugins/spamassassin/spamassassin_gtk.c:387
 msgid ""
 "Maximum time allowed for checking. If the check takes longer it will be "
 "aborted."
 msgstr ""
 "Maximálny čas povolený na kontrolu. Ak kontrola trvá dlhšie, bude prerušená."
 
-#: src/plugins/tnef_parse/tnef_parse.c:65
+#: src/plugins/tnef_parse/tnef_parse.c:73
 #, c-format
 msgid ""
 "\n"
@@ -13232,29 +13272,29 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: src/plugins/tnef_parse/tnef_parse.c:122
-#: src/plugins/tnef_parse/tnef_parse.c:129
+#: src/plugins/tnef_parse/tnef_parse.c:130
+#: src/plugins/tnef_parse/tnef_parse.c:137
 msgid "Failed to write the part data."
 msgstr "Zlyhal zápis časti dát."
 
-#: src/plugins/tnef_parse/tnef_parse.c:174
+#: src/plugins/tnef_parse/tnef_parse.c:182
 msgid "Failed to parse VCalendar data."
 msgstr "Zlyhalo spracovanie dát VCalendar."
 
-#: src/plugins/tnef_parse/tnef_parse.c:213
+#: src/plugins/tnef_parse/tnef_parse.c:221
 msgid "Failed to parse VTask data."
 msgstr "Zlyhalo spracovanie dát VTask."
 
-#: src/plugins/tnef_parse/tnef_parse.c:263
+#: src/plugins/tnef_parse/tnef_parse.c:273
 msgid "Failed to parse VCard data."
 msgstr "Zlyhalo spracovanie dát VCard."
 
-#: src/plugins/tnef_parse/tnef_parse.c:399
-#: src/plugins/tnef_parse/tnef_parse.c:423
+#: src/plugins/tnef_parse/tnef_parse.c:413
+#: src/plugins/tnef_parse/tnef_parse.c:437
 msgid "TNEF Parser"
 msgstr "TNEF Analyzátor"
 
-#: src/plugins/tnef_parse/tnef_parse.c:428
+#: src/plugins/tnef_parse/tnef_parse.c:442
 msgid ""
 "This Claws Mail plugin allows you to read application/ms-tnef attachments.\n"
 "\n"
@@ -13370,21 +13410,15 @@ msgstr "December"
 msgid "Week number"
 msgstr "Číslo týždňa"
 
-#: src/plugins/vcalendar/month-view.c:887
+#: src/plugins/vcalendar/month-view.c:886
 msgid "Previous month"
 msgstr "Minulý mesiac"
 
-#: src/plugins/vcalendar/month-view.c:907
+#: src/plugins/vcalendar/month-view.c:906
 msgid "Next month"
 msgstr "Ďalší mesiac"
 
-#: src/plugins/vcalendar/plugin.c:44 src/plugins/vcalendar/plugin.c:68
-#: src/plugins/vcalendar/vcal_prefs.c:775
-msgid "vCalendar"
-msgstr "vCalendar"
-
 #: src/plugins/vcalendar/plugin.c:73
-#, fuzzy
 msgid ""
 "This plugin enables vCalendar message handling like that produced by "
 "Evolution or Outlook.\n"
@@ -13396,17 +13430,17 @@ msgid ""
 "To create a meeting right-click on the vCalendar or Meetings folder and "
 "choose \"New meeting...\".\n"
 "\n"
-"You will also be able to subscribe to remote Webcal feeds,export your "
+"You will also be able to subscribe to remote Webcal feeds, export your "
 "meetings and calendars, publish your free/busy information and retrieve that "
 "information from others."
 msgstr ""
-"Tento zásuvný modul zapína obsluhu správ vCalendar podobným spôsobom ako to "
-"poskytuje Evolution alebo Outlook.\n"
+"Tento zásuvný modul zapína obsluhu správ vCalendar podobným spôsobom, ako to "
+"umožňuje Evolution alebo Outlook.\n"
 "\n"
 "Keď je načítaný, vytvorí v zozname zložiek schránku vCalendar, v ktorej budú "
 "stretnutia, ktoré ste prijali alebo vytvorili.\n"
-"Požiadavky na stretnutie, ktoré prijmete, budú zobrazené v príslušnej podobe "
-"a Vy ich budete môcť prijať alebo odmietnuť.\n"
+"Požiadavky na stretnutie, ktoré prijmete, budú zobrazené vo vhodnej forme a "
+"Vy ich budete môcť prijať alebo odmietnuť.\n"
 "Na vytvorenie stretnutia kliknite pravým tlačidlom na zložku vCalendar alebo "
 "Stretnutia a zvoľte „Nové stretnutie…”.\n"
 "\n"
@@ -13596,64 +13630,63 @@ msgstr "Účastníci:"
 msgid "Action:"
 msgstr "Akcia:"
 
-#: src/plugins/vcalendar/vcal_folder.c:165
+#: src/plugins/vcalendar/vcal_folder.c:166
 msgid "_New meeting..."
 msgstr "_Nové stretnutie…"
 
-#: src/plugins/vcalendar/vcal_folder.c:166
+#: src/plugins/vcalendar/vcal_folder.c:167
 msgid "_Export calendar..."
 msgstr "_Exportovať kalendár…"
 
-#: src/plugins/vcalendar/vcal_folder.c:167
-#, fuzzy
+#: src/plugins/vcalendar/vcal_folder.c:168
 msgid "_Subscribe to Webcal..."
-msgstr "Prihlá_siť sa do webCal…"
+msgstr "Prihlá_siť sa do Webcal…"
 
-#: src/plugins/vcalendar/vcal_folder.c:169
+#: src/plugins/vcalendar/vcal_folder.c:170
 msgid "_Rename..."
 msgstr "P_remenovať…"
 
-#: src/plugins/vcalendar/vcal_folder.c:170
+#: src/plugins/vcalendar/vcal_folder.c:171
 msgid "U_pdate subscriptions"
 msgstr "Aktualizovať _prihlásenia"
 
-#: src/plugins/vcalendar/vcal_folder.c:171
+#: src/plugins/vcalendar/vcal_folder.c:172
 msgid "_List view"
 msgstr "Zobrazenie _zoznamu"
 
-#: src/plugins/vcalendar/vcal_folder.c:172
+#: src/plugins/vcalendar/vcal_folder.c:173
 msgid "_Week view"
 msgstr "_Týždenný pohľad"
 
-#: src/plugins/vcalendar/vcal_folder.c:173
+#: src/plugins/vcalendar/vcal_folder.c:174
 msgid "_Month view"
 msgstr "_Mesačný pohľad"
 
-#: src/plugins/vcalendar/vcal_folder.c:1095
+#: src/plugins/vcalendar/vcal_folder.c:1101
 msgid "Meetings"
 msgstr "Stretnutia"
 
-#: src/plugins/vcalendar/vcal_folder.c:1494
+#: src/plugins/vcalendar/vcal_folder.c:1500
 msgid "in the past"
 msgstr "v minulosti"
 
-#: src/plugins/vcalendar/vcal_folder.c:1497
+#: src/plugins/vcalendar/vcal_folder.c:1503
 msgid "today"
 msgstr "dnes"
 
-#: src/plugins/vcalendar/vcal_folder.c:1500
+#: src/plugins/vcalendar/vcal_folder.c:1506
 msgid "tomorrow"
 msgstr "zajtra"
 
-#: src/plugins/vcalendar/vcal_folder.c:1503
+#: src/plugins/vcalendar/vcal_folder.c:1509
 msgid "this week"
 msgstr "tento týždeň"
 
-#: src/plugins/vcalendar/vcal_folder.c:1506
+#: src/plugins/vcalendar/vcal_folder.c:1512
 msgid "later"
 msgstr "neskôr"
 
-#: src/plugins/vcalendar/vcal_folder.c:1510
+#: src/plugins/vcalendar/vcal_folder.c:1516
 #, c-format
 msgid ""
 "\n"
@@ -13662,17 +13695,17 @@ msgstr ""
 "\n"
 "Toto sú plánované udalosti %s:\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1605
+#: src/plugins/vcalendar/vcal_folder.c:1611
 #, c-format
 msgid "Timeout (%d seconds) connecting to %s\n"
 msgstr "Časový limit (%d sekúnd) pripojenia k %s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1623
+#: src/plugins/vcalendar/vcal_folder.c:1629
 #, c-format
 msgid "Error %ld"
 msgstr "Chyba %ld"
 
-#: src/plugins/vcalendar/vcal_folder.c:1820
+#: src/plugins/vcalendar/vcal_folder.c:1815
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -13685,147 +13718,121 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1824
+#: src/plugins/vcalendar/vcal_folder.c:1841
 #, c-format
 msgid ""
-"Could not retrieve the Webcal URL:\n"
-"%s:\n"
-"\n"
-"%s\n"
-msgstr ""
-"Nemožno pristupovať k URL Webcal:\n"
-"%s:\n"
-"\n"
-"%s\n"
-
-#: src/plugins/vcalendar/vcal_folder.c:1835
-#, fuzzy, c-format
-msgid ""
 "This URL does not look like a Webcal URL:\n"
 "%s\n"
 "%s"
 msgstr ""
-"Táto URL nevyzerá ako URL WebCal:\n"
+"Táto URL nevyzerá ako URL Webcal:\n"
 "%s\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1838
-#, fuzzy, c-format
-msgid ""
-"This URL does not look like a Webcal URL:\n"
-"%s\n"
-"%s\n"
-msgstr ""
-"Táto URL nevyzerá ako URL WebCal:\n"
-"%s\n"
-"%s\n"
-
-#: src/plugins/vcalendar/vcal_folder.c:1863
-#: src/plugins/vcalendar/vcal_folder.c:1866
+#: src/plugins/vcalendar/vcal_folder.c:1872
+#: src/plugins/vcalendar/vcal_folder.c:1875
 #, c-format
 msgid "Could not create directory %s"
 msgstr "Nemožno vytvoriť adresár %s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1904
+#: src/plugins/vcalendar/vcal_folder.c:1915
 msgid "Claws Mail needs network access in order to update the Webcal feed."
 msgstr "Claws Mail potrebuje na aktualizáciu kanála Webcal prístup k sieti."
 
-#: src/plugins/vcalendar/vcal_folder.c:1915
+#: src/plugins/vcalendar/vcal_folder.c:1926
 #, c-format
 msgid "Fetching calendar for %s..."
 msgstr "Prijímanie kalendára pre %s…"
 
-#: src/plugins/vcalendar/vcal_folder.c:1916
+#: src/plugins/vcalendar/vcal_folder.c:1927
 msgid "new subscription"
 msgstr "nové prihlásenie"
 
-#: src/plugins/vcalendar/vcal_folder.c:1927
+#: src/plugins/vcalendar/vcal_folder.c:1938
 msgid "Claws Mail needs network access in order to update the subscription."
 msgstr "Claws Mail potrebuje sieťový prístup na aktualizáciu prihlásenia."
 
-#: src/plugins/vcalendar/vcal_folder.c:1939
-#, fuzzy
+#: src/plugins/vcalendar/vcal_folder.c:1950
 msgid "Subscribe to Webcal"
-msgstr "Prihlásiť sa do WebCal"
+msgstr "Prihlásiť sa do Webcal"
 
-#: src/plugins/vcalendar/vcal_folder.c:1939
+#: src/plugins/vcalendar/vcal_folder.c:1950
 msgid "Enter the WebCal URL:"
 msgstr "Zadajte WebCal URL:"
 
-#: src/plugins/vcalendar/vcal_folder.c:1951
+#: src/plugins/vcalendar/vcal_folder.c:1962
 msgid "Could not parse the URL."
 msgstr "Nemožno spracovať URL."
 
-#: src/plugins/vcalendar/vcal_folder.c:1979
+#: src/plugins/vcalendar/vcal_folder.c:1990
 msgid "Do you really want to unsubscribe?"
 msgstr "Naozaj sa chcete odhlásiť?"
 
-#: src/plugins/vcalendar/vcal_folder.c:1980
-#, fuzzy
+#: src/plugins/vcalendar/vcal_folder.c:1991
 msgid "Delete subscription"
-msgstr "nové prihlásenie"
+msgstr "Odstrániť prihlásenie"
 
-#: src/plugins/vcalendar/vcal_manager.c:109
+#: src/plugins/vcalendar/vcal_manager.c:110
 msgid "accepted"
 msgstr "prijaté"
 
-#: src/plugins/vcalendar/vcal_manager.c:110
+#: src/plugins/vcalendar/vcal_manager.c:111
 msgid "tentatively accepted"
 msgstr "nezáväzne prijaté"
 
-#: src/plugins/vcalendar/vcal_manager.c:111
+#: src/plugins/vcalendar/vcal_manager.c:112
 msgid "declined"
 msgstr "odmietnuté"
 
-#: src/plugins/vcalendar/vcal_manager.c:112
+#: src/plugins/vcalendar/vcal_manager.c:113
 msgid "did not answer"
 msgstr "neodpovedal"
 
-#: src/plugins/vcalendar/vcal_manager.c:142
+#: src/plugins/vcalendar/vcal_manager.c:144
 msgid "individual"
 msgstr "individuálne"
 
-#: src/plugins/vcalendar/vcal_manager.c:143
+#: src/plugins/vcalendar/vcal_manager.c:145
 msgid "group"
 msgstr "skupina"
 
-#: src/plugins/vcalendar/vcal_manager.c:144
+#: src/plugins/vcalendar/vcal_manager.c:146
 msgid "resource"
 msgstr "zdroj"
 
-#: src/plugins/vcalendar/vcal_manager.c:145
+#: src/plugins/vcalendar/vcal_manager.c:147
 msgid "room"
 msgstr "miestnosť"
 
-#: src/plugins/vcalendar/vcal_manager.c:556
+#: src/plugins/vcalendar/vcal_manager.c:558
 msgid "Past"
 msgstr "V minulosti"
 
-#: src/plugins/vcalendar/vcal_manager.c:559
+#: src/plugins/vcalendar/vcal_manager.c:561
 msgid "Today"
 msgstr "Dnes"
 
-#: src/plugins/vcalendar/vcal_manager.c:562
+#: src/plugins/vcalendar/vcal_manager.c:564
 msgid "Tomorrow"
 msgstr "Zajtra"
 
-#: src/plugins/vcalendar/vcal_manager.c:565
+#: src/plugins/vcalendar/vcal_manager.c:567
 msgid "This week"
 msgstr "Tento týždeň"
 
-#: src/plugins/vcalendar/vcal_manager.c:568
+#: src/plugins/vcalendar/vcal_manager.c:570
 msgid "Later"
 msgstr "Neskôr"
 
-#: src/plugins/vcalendar/vcal_manager.c:1256
+#: src/plugins/vcalendar/vcal_manager.c:1246
 msgid "Accepted: "
 msgstr "Prijaté:"
 
-#: src/plugins/vcalendar/vcal_manager.c:1258
+#: src/plugins/vcalendar/vcal_manager.c:1248
 msgid "Declined: "
 msgstr "Odmietnuté:"
 
-#: src/plugins/vcalendar/vcal_manager.c:1260
+#: src/plugins/vcalendar/vcal_manager.c:1250
 msgid "Tentatively Accepted: "
 msgstr "Nezáväzne prijaté:"
 
@@ -14166,9 +14173,8 @@ msgid "Specify a local file or URL (http://server/path/file.ics)"
 msgstr "Zadajte umiestnenie súboru alebo URL (http://server/cesta/súbor.ics)"
 
 #: src/plugins/vcalendar/vcal_prefs.c:413
-#, fuzzy
 msgid "Include Webcal subscriptions in export"
-msgstr "V exporte zahrnúť webcal prihlásenia"
+msgstr "V exporte zahrnúť prihlásenia Webcal"
 
 #: src/plugins/vcalendar/vcal_prefs.c:423
 msgid "Command to run after calendar export"
@@ -14223,9 +14229,8 @@ msgstr ""
 "pre ľavú časť emailovej adresy, %d pre doménu"
 
 #: src/plugins/vcalendar/vcal_prefs.c:581
-#, fuzzy
 msgid "SSL/TLS options"
-msgstr "Voľby SSL"
+msgstr "Voľby SSL/TLS"
 
 #: src/pop.c:152
 msgid "Required APOP timestamp not found in greeting\n"
@@ -14240,9 +14245,8 @@ msgid "Timestamp syntax error in greeting (not ASCII)\n"
 msgstr "Chybná časová značka v pozdrave (nie ascii)\n"
 
 #: src/pop.c:190 src/pop.c:217
-#, fuzzy
 msgid "POP protocol error\n"
-msgstr "Chyba protokolu POP3\n"
+msgstr "Chyba protokolu POP\n"
 
 #: src/pop.c:263
 #, c-format
@@ -14250,14 +14254,14 @@ msgid "invalid UIDL response: %s\n"
 msgstr "neplatná UIDL odpoveď: %s\n"
 
 #: src/pop.c:841
-#, fuzzy, c-format
+#, c-format
 msgid "POP: Deleting expired message %d [%s]\n"
-msgstr "POP3: Odstraňujem starú správu %d [%s]\n"
+msgstr "POP: Odstraňujem starú správu %d [%s]\n"
 
 #: src/pop.c:857
-#, fuzzy, c-format
+#, c-format
 msgid "POP: Skipping message %d [%s] (%d bytes)\n"
-msgstr "POP3: Preskakujem správu %d [%s] (%d bajtov)\n"
+msgstr "POP: Preskakujem správu %d [%s] (%d B)\n"
 
 #: src/pop.c:889
 msgid "mailbox is locked\n"
@@ -14272,18 +14276,16 @@ msgid "command not supported\n"
 msgstr "príkaz nie je podporovaný\n"
 
 #: src/pop.c:916
-#, fuzzy
 msgid "error occurred on POP session\n"
-msgstr "nastala chyba relácie POP3\n"
+msgstr "nastala chyba relácie POP\n"
 
 #: src/pop.c:1111
 msgid "TOP command unsupported\n"
 msgstr "príkaz TOP nie je podporovaný\n"
 
 #: src/prefs_account.c:334 src/prefs_account.c:1454 src/prefs_account.c:2452
-#, fuzzy
 msgid "POP"
-msgstr "POP3"
+msgstr "POP"
 
 #: src/prefs_account.c:335 src/prefs_account.c:1567 src/prefs_account.c:2467
 #: src/wizard.c:1499
@@ -14467,7 +14469,7 @@ msgid "'Get Mail' checks for new messages on this account"
 msgstr "„Prijať poštu” kontroluje nové správy v tomto účte"
 
 #: src/prefs_account.c:1725 src/prefs_customheader.c:208
-#: src/prefs_matcher.c:623 src/prefs_matcher.c:1967 src/prefs_matcher.c:1989
+#: src/prefs_matcher.c:623 src/prefs_matcher.c:1968 src/prefs_matcher.c:1990
 msgid "Header"
 msgstr "Hlavička"
 
@@ -14500,9 +14502,8 @@ msgstr ""
 "heslo ako pri prijímaní."
 
 #: src/prefs_account.c:1851
-#, fuzzy
 msgid "Authenticate with POP before sending"
-msgstr "Autentifikovať cez POP3 pred odosielaním"
+msgstr "Autentifikovať cez POP pred odosielaním"
 
 #: src/prefs_account.c:1866
 msgid "POP authentication timeout: "
@@ -14532,30 +14533,30 @@ msgstr "Automaticky nastaviť nasledujúce adresy"
 msgid "Spell check dictionaries"
 msgstr "Slovníky kontroly preklepov"
 
-#: src/prefs_account.c:2082 src/prefs_folder_item.c:1089
+#: src/prefs_account.c:2082 src/prefs_folder_item.c:1104
 #: src/prefs_spelling.c:163
 msgid "Default dictionary"
 msgstr "Predvolený slovník"
 
-#: src/prefs_account.c:2095 src/prefs_folder_item.c:1123
+#: src/prefs_account.c:2095 src/prefs_folder_item.c:1138
 #: src/prefs_spelling.c:176
 msgid "Default alternate dictionary"
 msgstr "Prednastavený alternatívny slovník"
 
 #: src/prefs_account.c:2181 src/prefs_account.c:3341
-#: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1434
-#: src/prefs_folder_item.c:1824 src/prefs_quote.c:119 src/prefs_quote.c:237
+#: src/prefs_compose_writing.c:373 src/prefs_folder_item.c:1449
+#: src/prefs_folder_item.c:1841 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:336 src/prefs_wrapping.c:153
 msgid "Compose"
 msgstr "Nová"
 
-#: src/prefs_account.c:2196 src/prefs_folder_item.c:1462 src/prefs_quote.c:134
-#: src/toolbar.c:409
+#: src/prefs_account.c:2196 src/prefs_folder_item.c:1477 src/prefs_quote.c:134
+#: src/toolbar.c:487
 msgid "Reply"
 msgstr "Odpovedať"
 
 #: src/prefs_account.c:2211 src/prefs_filtering_action.c:191
-#: src/prefs_folder_item.c:1490 src/prefs_quote.c:149 src/toolbar.c:413
+#: src/prefs_folder_item.c:1505 src/prefs_quote.c:149 src/toolbar.c:492
 msgid "Forward"
 msgstr "Poslať ďalej"
 
@@ -14588,29 +14589,25 @@ msgid "Save sent encrypted messages as clear text"
 msgstr "Uložiť odoslané zašifrované správy ako prostý text"
 
 #: src/prefs_account.c:2456 src/prefs_account.c:2471 src/prefs_account.c:2485
-#, fuzzy
 msgid "Don't use SSL/TLS"
-msgstr "Nepoužívať SSL"
+msgstr "Nepoužívať SSL/TLS"
 
 #: src/prefs_account.c:2459 src/prefs_account.c:2474 src/prefs_account.c:2494
 #: src/prefs_account.c:2505
-#, fuzzy
 msgid "Use SSL/TLS"
-msgstr "Použiť SSL pomocou STARTTLS"
+msgstr "Použiť SSL/TLS"
 
 #: src/prefs_account.c:2462 src/prefs_account.c:2477 src/prefs_account.c:2508
-#, fuzzy
 msgid "Use STARTTLS command to start encrypted session"
-msgstr "Použiť príkaz STARTTLS na nadviazanie relácie SSL"
+msgstr "Použiť príkaz STARTTLS na vytvorenie šifrovanej relácie"
 
 #: src/prefs_account.c:2498
 msgid "Send (SMTP)"
 msgstr "Odoslať (SMTP)"
 
 #: src/prefs_account.c:2502
-#, fuzzy
 msgid "Don't use SSL/TLS (but, if necessary, use STARTTLS)"
-msgstr "Nepoužívať SSL (v prípade potreby použiť STARTTLS)"
+msgstr "Nepoužívať SSL/TLS (v prípade potreby použiť STARTTLS)"
 
 #: src/prefs_account.c:2513
 msgid "Client certificates"
@@ -14630,33 +14627,28 @@ msgid "Certificate for sending"
 msgstr "Certifikát na odosielanie"
 
 #: src/prefs_account.c:2576
-#, fuzzy
 msgid "Automatically accept valid SSL/TLS certificates"
-msgstr "Automaticky akceptovať platné certifikáty SSL"
+msgstr "Automaticky akceptovať platné certifikáty SSL/TLS"
 
 #: src/prefs_account.c:2579
-#, fuzzy
 msgid "Use non-blocking SSL/TLS"
-msgstr "Použiť neblokujúce SSL"
+msgstr "Použiť neblokujúce SSL/TLS"
 
 #: src/prefs_account.c:2591
-#, fuzzy
 msgid "Turn this off if you have SSL/TLS connection problems"
-msgstr "Vypnite túto voľbu ak máte problémy pri SSL spojeniach"
+msgstr "Vypnite túto voľbu ak máte problémy pri spojeniach SSL/TLS"
 
 #: src/prefs_account.c:2726
 msgid "SMTP port"
 msgstr "SMTP port"
 
 #: src/prefs_account.c:2733
-#, fuzzy
 msgid "POP port"
-msgstr "POP3 port"
+msgstr "POP port"
 
 #: src/prefs_account.c:2740
-#, fuzzy
 msgid "IMAP port"
-msgstr "IMAP4 port"
+msgstr "IMAP port"
 
 #: src/prefs_account.c:2747
 msgid "NNTP port"
@@ -14664,7 +14656,7 @@ msgstr "NNTP port"
 
 #: src/prefs_account.c:2753
 msgid "Domain name"
-msgstr "Názov domény"
+msgstr "Doménové meno"
 
 #: src/prefs_account.c:2756
 msgid ""
@@ -14715,18 +14707,16 @@ msgid "User ID is not entered."
 msgstr "Nebolo zadané ID používateľa."
 
 #: src/prefs_account.c:2921
-#, fuzzy
 msgid "POP server is not entered."
-msgstr "Nebol zadaný POP3 server."
+msgstr "Nebol zadaný POP server."
 
 #: src/prefs_account.c:2941
 msgid "The default Inbox folder doesn't exist."
 msgstr "Predvolená zložka doručených správ neexistuje."
 
 #: src/prefs_account.c:2947
-#, fuzzy
 msgid "IMAP server is not entered."
-msgstr "Nebol zadaný IMAP4 server."
+msgstr "Nebol zadaný IMAP server."
 
 #: src/prefs_account.c:2952
 msgid "NNTP server is not entered."
@@ -14744,7 +14734,7 @@ msgstr "Nebol zadaný príkaz na odosielanie pošty."
 msgid "Receive"
 msgstr "Prijať"
 
-#: src/prefs_account.c:3359 src/prefs_folder_item.c:1840 src/prefs_quote.c:238
+#: src/prefs_account.c:3359 src/prefs_folder_item.c:1857 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Šablóny"
 
@@ -14815,11 +14805,10 @@ msgid "Replace the selected action in list with the action above"
 msgstr "Nahradiť zvolenú akciu v zozname akciou vyššie"
 
 #: src/prefs_actions.c:337 src/prefs_filtering_action.c:616
-#: src/prefs_filtering.c:486 src/prefs_matcher.c:779 src/prefs_template.c:320
-#: src/prefs_toolbar.c:1056
-#, fuzzy
+#: src/prefs_filtering.c:486 src/prefs_matcher.c:780 src/prefs_template.c:320
+#: src/prefs_toolbar.c:1069
 msgid "D_elete"
-msgstr "Odstrániť"
+msgstr "O_dstrániť"
 
 #: src/prefs_actions.c:345
 msgid "Delete the selected action from the list"
@@ -14842,8 +14831,8 @@ msgid "Move selected action down"
 msgstr "Posunúť zvolenú akciu nižšie"
 
 #: src/prefs_actions.c:535 src/prefs_filtering_action.c:704
-#: src/prefs_filtering.c:836 src/prefs_filtering.c:838
-#: src/prefs_filtering.c:839 src/prefs_filtering.c:949 src/prefs_matcher.c:896
+#: src/prefs_filtering.c:838 src/prefs_filtering.c:840
+#: src/prefs_filtering.c:841 src/prefs_filtering.c:951 src/prefs_matcher.c:897
 #: src/prefs_template.c:472
 msgid "(New)"
 msgstr "(Nová)"
@@ -14860,23 +14849,19 @@ msgstr "Lomka „/” nie je na začiatku názvu položky menu povolená."
 msgid "Colon ':' is not allowed in the menu name."
 msgstr "Dvojbodka „:” nie je v názve menu povolená."
 
-#: src/prefs_actions.c:616
-msgid "There is an action with this name already."
-msgstr "Akcia s rovnakým menom už existuje."
-
-#: src/prefs_actions.c:635
+#: src/prefs_actions.c:629
 msgid "Menu name is too long."
 msgstr "Názov menu je príliš dlhý."
 
-#: src/prefs_actions.c:644
+#: src/prefs_actions.c:638
 msgid "Command-line not set."
 msgstr "Nebol zadaný príkazový riadok."
 
-#: src/prefs_actions.c:649
+#: src/prefs_actions.c:643
 msgid "Menu name and command are too long."
 msgstr "Názov menu a príkazový riadok sú príliš dlhé."
 
-#: src/prefs_actions.c:655
+#: src/prefs_actions.c:649
 #, c-format
 msgid ""
 "The command\n"
@@ -14887,136 +14872,136 @@ msgstr ""
 "%s\n"
 "má syntaktickú chybu."
 
-#: src/prefs_actions.c:713
+#: src/prefs_actions.c:707
 msgid "Delete action"
 msgstr "Zmazať akciu"
 
-#: src/prefs_actions.c:714
+#: src/prefs_actions.c:708
 msgid "Do you really want to delete this action?"
 msgstr "Naozaj chcete zmazať túto akciu?"
 
-#: src/prefs_actions.c:734
+#: src/prefs_actions.c:728
 msgid "Delete all actions"
 msgstr "Zmazať všetky akcie"
 
-#: src/prefs_actions.c:735
+#: src/prefs_actions.c:729
 msgid "Do you really want to delete all the actions?"
 msgstr "Naozaj chcete zmazať všetky akcie?"
 
-#: src/prefs_actions.c:898 src/prefs_actions.c:929 src/prefs_filtering.c:1497
-#: src/prefs_filtering.c:1519 src/prefs_matcher.c:2114 src/prefs_template.c:572
+#: src/prefs_actions.c:892 src/prefs_actions.c:923 src/prefs_filtering.c:1499
+#: src/prefs_filtering.c:1521 src/prefs_matcher.c:2115 src/prefs_template.c:572
 #: src/prefs_template.c:597
 msgid "Entry not saved"
 msgstr "Záznam nebol uložený"
 
-#: src/prefs_actions.c:899 src/prefs_actions.c:930 src/prefs_filtering.c:1498
-#: src/prefs_filtering.c:1520 src/prefs_template.c:573 src/prefs_template.c:598
+#: src/prefs_actions.c:893 src/prefs_actions.c:924 src/prefs_filtering.c:1500
+#: src/prefs_filtering.c:1522 src/prefs_template.c:573 src/prefs_template.c:598
 msgid "The entry was not saved. Close anyway?"
 msgstr "Záznam nebol uložený. Zavrieť napriek tomu?"
 
-#: src/prefs_actions.c:900 src/prefs_actions.c:905 src/prefs_actions.c:931
-#: src/prefs_filtering.c:1477 src/prefs_filtering.c:1499
-#: src/prefs_filtering.c:1521 src/prefs_matcher.c:2117 src/prefs_template.c:574
+#: src/prefs_actions.c:894 src/prefs_actions.c:899 src/prefs_actions.c:925
+#: src/prefs_filtering.c:1479 src/prefs_filtering.c:1501
+#: src/prefs_filtering.c:1523 src/prefs_matcher.c:2118 src/prefs_template.c:574
 #: src/prefs_template.c:599 src/prefs_template.c:604
 msgid "_Continue editing"
 msgstr "_Pokračovať v úprave"
 
-#: src/prefs_actions.c:903
+#: src/prefs_actions.c:897
 msgid "Actions list not saved"
 msgstr "Zoznam akcií nebol uložený"
 
-#: src/prefs_actions.c:904
+#: src/prefs_actions.c:898
 msgid "The actions list has been modified. Close anyway?"
 msgstr "Zoznam akcií bol zmenený. Zavrieť napriek tomu?"
 
-#: src/prefs_actions.c:974
+#: src/prefs_actions.c:968
 msgid "<span weight=\"bold\" underline=\"single\">Menu name:</span>"
 msgstr "<span weight=\"bold\" underline=\"single\">Názov menu:</span>"
 
-#: src/prefs_actions.c:975
+#: src/prefs_actions.c:969
 msgid "Use / in menu name to make submenus."
 msgstr "Použite „/” v názve menu na tvorbu podmenu."
 
-#: src/prefs_actions.c:977
+#: src/prefs_actions.c:971
 msgid "<span weight=\"bold\" underline=\"single\">Command-line:</span>"
 msgstr "<span weight=\"bold\" underline=\"single\">Príkazový riadok:</span>"
 
-#: src/prefs_actions.c:978
+#: src/prefs_actions.c:972
 msgid "<span weight=\"bold\">Begin with:</span>"
 msgstr "<span weight=\"bold\">Začať s:</span>"
 
-#: src/prefs_actions.c:979
+#: src/prefs_actions.c:973
 msgid "to send message body or selection to command's standard input"
 msgstr "na odoslanie tela správy alebo výberu na štandardný vstup príkazu"
 
-#: src/prefs_actions.c:980
+#: src/prefs_actions.c:974
 msgid "to send user provided text to command's standard input"
 msgstr "na odoslanie textu zadaného používateľom na štandardný vstup príkazu"
 
-#: src/prefs_actions.c:981
+#: src/prefs_actions.c:975
 msgid "to send user provided hidden text to command's standard input"
 msgstr ""
 "na odoslanie skrytého textu zadaného používateľom na štandardný vstup príkazu"
 
-#: src/prefs_actions.c:982
+#: src/prefs_actions.c:976
 msgid "<span weight=\"bold\">End with:</span>"
 msgstr "<span weight=\"bold\">Skončiť s:</span>"
 
-#: src/prefs_actions.c:983
+#: src/prefs_actions.c:977
 msgid "to replace message body or selection with command's standard output"
 msgstr "na nahradenie tela správy alebo výberu štandardným výstupom príkazu"
 
-#: src/prefs_actions.c:984
+#: src/prefs_actions.c:978
 msgid "to insert command's standard output without replacing old text"
 msgstr ""
 "na vloženie štandardného výstupu príkazu bez odstránenia pôvodného textu"
 
-#: src/prefs_actions.c:985
+#: src/prefs_actions.c:979
 msgid "to run command asynchronously"
 msgstr "na asynchrónne vykonanie príkazu"
 
-#: src/prefs_actions.c:986
+#: src/prefs_actions.c:980
 msgid "<span weight=\"bold\">Use:</span>"
 msgstr "<span weight=\"bold\">Použiť:</span>"
 
-#: src/prefs_actions.c:987
+#: src/prefs_actions.c:981
 msgid "for the file of the selected message in RFC822/2822 format "
 msgstr "pre súbor zvolenej správy vo formáte RFC822/2822 "
 
-#: src/prefs_actions.c:988
+#: src/prefs_actions.c:982
 msgid ""
 "for the list of the files of the selected messages in RFC822/2822 format"
 msgstr "pre zoznam súborov zvolených správ vo formáte RFC822/2822"
 
-#: src/prefs_actions.c:989
+#: src/prefs_actions.c:983
 msgid "for the file of the selected decoded message MIME part"
 msgstr "pre súbor dekódovanej zvolenej časti MIME správy"
 
-#: src/prefs_actions.c:990
+#: src/prefs_actions.c:984
 msgid "for a user provided argument"
 msgstr "pre parameter zadaný používateľom"
 
-#: src/prefs_actions.c:991
+#: src/prefs_actions.c:985
 msgid "for a user provided hidden argument (e.g. password)"
 msgstr "pre skrytý parameter zadaný používateľom (napr. heslo)"
 
-#: src/prefs_actions.c:992
+#: src/prefs_actions.c:986
 msgid "for the text selection"
 msgstr "pre textový výber"
 
-#: src/prefs_actions.c:993
+#: src/prefs_actions.c:987
 msgid "apply filtering actions between {} to selected messages"
 msgstr "aplikuje akcie medzi {} na zvolené správy"
 
-#: src/prefs_actions.c:994
+#: src/prefs_actions.c:988
 msgid "for a literal %"
 msgstr "pre znak %"
 
-#: src/prefs_actions.c:1004 src/prefs_themes.c:935
+#: src/prefs_actions.c:998 src/prefs_themes.c:1051
 msgid "Actions"
 msgstr "Akcie"
 
-#: src/prefs_actions.c:1005
+#: src/prefs_actions.c:999
 msgid ""
 "The Actions feature is a way for the user to launch external commands to "
 "process a complete message file or just one of its parts."
@@ -15024,29 +15009,29 @@ msgstr ""
 "Akcie umožňujú používateľovi spúšťať, na prácu so súborom správy alebo s jej "
 "časťou, externé programy."
 
-#: src/prefs_actions.c:1092 src/prefs_filtering.c:1695
-#: src/prefs_template.c:1121
+#: src/prefs_actions.c:1086 src/prefs_filtering.c:1697
+#: src/prefs_template.c:1111
 msgid "D_uplicate"
 msgstr "D_uplikovať"
 
-#: src/prefs_actions.c:1212
+#: src/prefs_actions.c:1206
 msgid "Current actions"
 msgstr "Aktuálne akcie"
 
-#: src/prefs_actions.c:1311 src/prefs_filtering.c:1074
-#: src/prefs_filtering.c:1132
+#: src/prefs_actions.c:1305 src/prefs_filtering.c:1076
+#: src/prefs_filtering.c:1134
 msgid "Action string is not valid."
 msgstr "Reťazec akcie je neplatný."
 
-#: src/prefs_common.c:225 src/prefs_quote.c:69
+#: src/prefs_common.c:237 src/prefs_quote.c:69
 msgid "Hello,\\n"
 msgstr "Dobrý deň,\\n"
 
-#: src/prefs_common.c:303
+#: src/prefs_common.c:315
 msgid "On %d\\n%f wrote:\\n\\n%q\\n%X"
 msgstr "Dňa %d\\n%f napísal:\\n\\n%q\\n%X"
 
-#: src/prefs_common.c:309 src/prefs_quote.c:85
+#: src/prefs_common.c:321 src/prefs_quote.c:85
 msgid ""
 "\\n\\nBegin forwarded message:\\n\\n?d{Date: %d\\n}?f{From: %f\\n}?t{To: %t"
 "\\n}?c{Cc: %c\\n}?n{Newsgroups: %n\\n}?s{Subject: %s\\n}\\n\\n%M"
@@ -15059,95 +15044,96 @@ msgstr ""
 msgid "%x(%a) %H:%M"
 msgstr "%x(%a) %H:%M"
 
-#: src/prefs_compose_writing.c:125
+#: src/prefs_compose_writing.c:126
 msgid "Automatic account selection"
 msgstr "Automatická voľba účtu"
 
-#: src/prefs_compose_writing.c:133
+#: src/prefs_compose_writing.c:134
 msgid "when replying"
 msgstr "pri odpovedaní"
 
-#: src/prefs_compose_writing.c:135
+#: src/prefs_compose_writing.c:136
 msgid "when forwarding"
 msgstr "pri posielaní ďalej"
 
-#: src/prefs_compose_writing.c:137
+#: src/prefs_compose_writing.c:138
 msgid "when re-editing"
 msgstr "pri opätovnej úprave"
 
-#: src/prefs_compose_writing.c:140
+#: src/prefs_compose_writing.c:141
 msgid "Editing"
 msgstr "Písanie"
 
-#: src/prefs_compose_writing.c:144
+#: src/prefs_compose_writing.c:145
 msgid "Automatically launch the external editor"
 msgstr "Automaticky spustiť externý editor"
 
-#: src/prefs_compose_writing.c:152
+#: src/prefs_compose_writing.c:153
 msgid "Automatically save message to Drafts folder every"
 msgstr "Automaticky ukladať text správy medzi Koncepty každých "
 
-#: src/prefs_compose_writing.c:162 src/prefs_wrapping.c:101
+#: src/prefs_compose_writing.c:163 src/prefs_wrapping.c:101
 msgid "characters"
 msgstr "znakoch"
 
-#: src/prefs_compose_writing.c:173
+#: src/prefs_compose_writing.c:174
 msgid "Even if message is to be encrypted"
 msgstr "Hoci má byť správa šifrovaná"
 
-#: src/prefs_compose_writing.c:180
+#: src/prefs_compose_writing.c:181
 msgid "Undo level"
 msgstr "Počet krokov späť"
 
-#: src/prefs_compose_writing.c:198
+#: src/prefs_compose_writing.c:199
 msgid "Warn when inserting a file larger than"
 msgstr "Upozorniť pri vložení súboru väčšieho ako"
 
-#: src/prefs_compose_writing.c:210
+#: src/prefs_compose_writing.c:211
 msgid "KB into message body "
 msgstr "kB do tela správy."
 
-#: src/prefs_compose_writing.c:216
+#: src/prefs_compose_writing.c:217
 msgid "Replying"
 msgstr "Odpovedanie"
 
-#: src/prefs_compose_writing.c:219
+#: src/prefs_compose_writing.c:220
 msgid "Reply will quote by default"
 msgstr "Pri odpovedaní implicitne citovať"
 
-#: src/prefs_compose_writing.c:222
+#: src/prefs_compose_writing.c:223
 msgid "Reply button invokes mailing list reply"
 msgstr "Tlačidlo Odpovedať zvolí odpoveď do emailovej konferencie"
 
-#: src/prefs_compose_writing.c:224
+#: src/prefs_compose_writing.c:225
 msgid "Forwarding"
 msgstr "Posielanie ďalej"
 
-#: src/prefs_compose_writing.c:227 src/prefs_filtering_action.c:192
+#: src/prefs_compose_writing.c:228 src/prefs_filtering_action.c:192
 msgid "Forward as attachment"
 msgstr "Poslať ďalej ako prílohu"
 
 #: src/prefs_compose_writing.c:230
-msgid "Keep the original 'From' header when redirecting"
-msgstr "Zachovať pôvodnú hlavičku Od pri presmerovaní"
+#, c-format
+msgid "Keep the original '%s' header when redirecting"
+msgstr "Pri presmerovaní zachovať pôvodnú hlavičku „%s”"
 
-#: src/prefs_compose_writing.c:233
+#: src/prefs_compose_writing.c:236
 msgid "When dropping files into the Compose window"
 msgstr "Pri presune súborov do okna s novou správou"
 
-#: src/prefs_compose_writing.c:242
+#: src/prefs_compose_writing.c:245
 msgid "Ask"
 msgstr "Spýtať sa"
 
-#: src/prefs_compose_writing.c:243 src/toolbar.c:427
+#: src/prefs_compose_writing.c:246 src/toolbar.c:519
 msgid "Insert"
 msgstr "Vložiť"
 
-#: src/prefs_compose_writing.c:244 src/toolbar.c:428
+#: src/prefs_compose_writing.c:247 src/toolbar.c:520
 msgid "Attach"
 msgstr "Pripojiť"
 
-#: src/prefs_compose_writing.c:371
+#: src/prefs_compose_writing.c:374
 msgid "Writing"
 msgstr "Písanie"
 
@@ -15155,8 +15141,8 @@ msgstr "Písanie"
 msgid "Custom header configuration"
 msgstr "Nastavenie dodatočných hlavičiek"
 
-#: src/prefs_customheader.c:506 src/prefs_display_header.c:599
-#: src/prefs_matcher.c:1594 src/prefs_matcher.c:1609
+#: src/prefs_customheader.c:506 src/prefs_display_header.c:601
+#: src/prefs_matcher.c:1595 src/prefs_matcher.c:1610
 msgid "Header name is not set."
 msgstr "Nebol zadaný názov hlavičky."
 
@@ -15221,27 +15207,27 @@ msgstr "Naozaj chcete zmazať túto hlavičku?"
 msgid "Current custom headers"
 msgstr "Aktuálne dodatočné hlavičky"
 
-#: src/prefs_display_header.c:250
+#: src/prefs_display_header.c:252
 msgid "Displayed header configuration"
 msgstr "Nastavenie zobrazovaných hlavičiek"
 
-#: src/prefs_display_header.c:274
+#: src/prefs_display_header.c:276
 msgid "Header name"
 msgstr "Názov hlavičky"
 
-#: src/prefs_display_header.c:317
+#: src/prefs_display_header.c:319
 msgid "Displayed Headers"
 msgstr "Zobrazované hlavičky"
 
-#: src/prefs_display_header.c:379
+#: src/prefs_display_header.c:381
 msgid "Hidden headers"
 msgstr "Skryté hlavičky"
 
-#: src/prefs_display_header.c:405
+#: src/prefs_display_header.c:407
 msgid "Show all unspecified headers"
 msgstr "Zobraziť všetky neurčené hlavičky"
 
-#: src/prefs_display_header.c:609
+#: src/prefs_display_header.c:611
 msgid "This header is already in the list."
 msgstr "Táto hlavička už je v zozname."
 
@@ -15306,8 +15292,8 @@ msgstr "Skryť"
 msgid "Message flags"
 msgstr "Príznaky správy"
 
-#: src/prefs_filtering_action.c:179 src/prefs_summaries.c:442
-#: src/prefs_summary_column.c:78 src/summaryview.c:2802
+#: src/prefs_filtering_action.c:179 src/prefs_summaries.c:450
+#: src/prefs_summary_column.c:78 src/summaryview.c:2800 src/toolbar.c:502
 msgid "Mark"
 msgstr "Označiť"
 
@@ -15327,12 +15313,12 @@ msgstr "Označiť ako spam"
 msgid "Mark as ham"
 msgstr "Označiť ako nie spam"
 
-#: src/prefs_filtering_action.c:187 src/prefs_filtering_action.c:1438
-#: src/toolbar.c:205 src/toolbar.c:438 src/toolbar.c:2088
+#: src/prefs_filtering_action.c:187 src/prefs_filtering_action.c:1439
+#: src/toolbar.c:238 src/toolbar.c:496 src/toolbar.c:2387
 msgid "Execute"
 msgstr "Vykonať"
 
-#: src/prefs_filtering_action.c:189 src/prefs_summaries.c:440
+#: src/prefs_filtering_action.c:189 src/prefs_summaries.c:448
 msgid "Color label"
 msgstr "Farebná menovka"
 
@@ -15346,8 +15332,8 @@ msgid "Redirect"
 msgstr "Presmerovať"
 
 #: src/prefs_filtering_action.c:194 src/prefs_filtering_action.c:195
-#: src/prefs_filtering_action.c:1442 src/prefs_matcher.c:629
-#: src/prefs_summaries.c:445 src/prefs_summary_column.c:87
+#: src/prefs_filtering_action.c:1443 src/prefs_matcher.c:629
+#: src/prefs_summaries.c:453 src/prefs_summary_column.c:87
 #: src/summaryview.c:448
 msgid "Score"
 msgstr "Ohodnotenie"
@@ -15390,7 +15376,7 @@ msgstr "Zastaviť filtrovanie"
 msgid "Action configuration"
 msgstr "Nastavenie akcie"
 
-#: src/prefs_filtering_action.c:427 src/prefs_filtering.c:1886
+#: src/prefs_filtering_action.c:427 src/prefs_filtering.c:1888
 #: src/prefs_matcher.c:586
 msgid "Rule"
 msgstr "Pravidlo"
@@ -15431,25 +15417,25 @@ msgstr "Meno značky je prázdne."
 msgid "No action was defined."
 msgstr "Nebola definovaná žiadna akcia."
 
-#: src/prefs_filtering_action.c:1254 src/prefs_matcher.c:2160
+#: src/prefs_filtering_action.c:1254 src/prefs_matcher.c:2161
 #: src/quote_fmt.c:79
 msgid "literal %"
 msgstr "Znak %"
 
-#: src/prefs_filtering_action.c:1263 src/prefs_matcher.c:2169
+#: src/prefs_filtering_action.c:1263 src/prefs_matcher.c:2170
 msgid "filename (should not be modified)"
 msgstr "názov súboru (nemal by byť menený)"
 
-#: src/prefs_filtering_action.c:1264 src/prefs_matcher.c:2170
+#: src/prefs_filtering_action.c:1264 src/prefs_matcher.c:2171
 #: src/quote_fmt.c:87
 msgid "new line"
 msgstr "nový riadok"
 
-#: src/prefs_filtering_action.c:1265 src/prefs_matcher.c:2171
+#: src/prefs_filtering_action.c:1265 src/prefs_matcher.c:2172
 msgid "escape character for quotes"
 msgstr "únikový znak citácie"
 
-#: src/prefs_filtering_action.c:1266 src/prefs_matcher.c:2172
+#: src/prefs_filtering_action.c:1266 src/prefs_matcher.c:2173
 msgid "quote character"
 msgstr "znak úvodzoviek"
 
@@ -15467,23 +15453,23 @@ msgstr ""
 "programu, alebo skriptu.\n"
 "Môžete použiť tieto symboly:"
 
-#: src/prefs_filtering_action.c:1422
+#: src/prefs_filtering_action.c:1423
 msgid "Recipient"
 msgstr "Príjemca"
 
-#: src/prefs_filtering_action.c:1426
+#: src/prefs_filtering_action.c:1427
 msgid "Book/Folder"
 msgstr "_Adresár/Zložka"
 
-#: src/prefs_filtering_action.c:1430
+#: src/prefs_filtering_action.c:1431
 msgid "Destination"
 msgstr "Cieľ"
 
-#: src/prefs_filtering_action.c:1434
+#: src/prefs_filtering_action.c:1435
 msgid "Color"
 msgstr "Zafarbiť"
 
-#: src/prefs_filtering_action.c:1520
+#: src/prefs_filtering_action.c:1521
 msgid "Current action list"
 msgstr "Zoznam aktuálnych akcií"
 
@@ -15491,8 +15477,8 @@ msgstr "Zoznam aktuálnych akcií"
 msgid "Filtering/Processing configuration"
 msgstr "Nastavenie filtrovania"
 
-#: src/prefs_filtering.c:266 src/prefs_filtering.c:867
-#: src/prefs_filtering.c:981
+#: src/prefs_filtering.c:266 src/prefs_filtering.c:869
+#: src/prefs_filtering.c:983
 msgctxt "Filtering Account Menu"
 msgid "All"
 msgstr "Všetky"
@@ -15502,7 +15488,6 @@ msgid "Condition"
 msgstr "Podmienka"
 
 #: src/prefs_filtering.c:424
-#, fuzzy
 msgid " Def_ine... "
 msgstr " D_efinovať… "
 
@@ -15522,83 +15507,83 @@ msgstr "Nahradiť zvolené pravidlo v zozname pravidlom vyššie"
 msgid "Delete the selected rule from the list"
 msgstr "Zmazať zvolené pravidlo zo zoznamu"
 
-#: src/prefs_filtering.c:532
+#: src/prefs_filtering.c:534
 msgid "Move the selected rule to the top"
 msgstr "Presunúť zvolené pravidlo na začiatok"
 
-#: src/prefs_filtering.c:535
+#: src/prefs_filtering.c:537
 msgid "Page u_p"
 msgstr "O stranu _vyššie"
 
-#: src/prefs_filtering.c:543
+#: src/prefs_filtering.c:545
 msgid "Move the selected rule one page up"
 msgstr "Presunúť zvolené pravidlo na začiatok strany"
 
-#: src/prefs_filtering.c:552
+#: src/prefs_filtering.c:554
 msgid "Move the selected rule up"
 msgstr "Posunúť zvolené pravidlo vyššie"
 
-#: src/prefs_filtering.c:560
+#: src/prefs_filtering.c:562
 msgid "Move the selected rule down"
 msgstr "Posunúť zvolené pravidlo nižšie"
 
-#: src/prefs_filtering.c:563
+#: src/prefs_filtering.c:565
 msgid "Page dow_n"
 msgstr "O stranu _nižšie"
 
-#: src/prefs_filtering.c:571
+#: src/prefs_filtering.c:573
 msgid "Move the selected rule one page down"
 msgstr "Presunúť zvolené pravidlo na koniec strany"
 
-#: src/prefs_filtering.c:580
+#: src/prefs_filtering.c:582
 msgid "Move the selected rule to the bottom"
 msgstr "Presunúť zvolené pravidlo na koniec"
 
-#: src/prefs_filtering.c:1038 src/prefs_filtering.c:1124
+#: src/prefs_filtering.c:1040 src/prefs_filtering.c:1126
 msgid "Condition string is not valid."
 msgstr "Reťazec podmienky je neplatný."
 
-#: src/prefs_filtering.c:1111
+#: src/prefs_filtering.c:1113
 msgid "Condition string is empty."
 msgstr "Reťazec podmienky je prázdny."
 
-#: src/prefs_filtering.c:1117
+#: src/prefs_filtering.c:1119
 msgid "Action string is empty."
 msgstr "Reťazec akcie je prázdny."
 
-#: src/prefs_filtering.c:1205
+#: src/prefs_filtering.c:1207
 msgid "Delete rule"
 msgstr "Odstrániť pravidlo"
 
-#: src/prefs_filtering.c:1206
+#: src/prefs_filtering.c:1208
 msgid "Do you really want to delete this rule?"
 msgstr "Naozaj chcete odstrániť toto pravidlo?"
 
-#: src/prefs_filtering.c:1224
+#: src/prefs_filtering.c:1226
 msgid "Delete all rules"
 msgstr "Zmazať všetky pravidlá"
 
-#: src/prefs_filtering.c:1225
+#: src/prefs_filtering.c:1227
 msgid "Do you really want to delete all the rules?"
 msgstr "Naozaj chcete odstrániť všetky pravidlá?"
 
-#: src/prefs_filtering.c:1475
+#: src/prefs_filtering.c:1477
 msgid "Filtering rules not saved"
 msgstr "Pravidlá filtrovania neboli uložené"
 
-#: src/prefs_filtering.c:1476
+#: src/prefs_filtering.c:1478
 msgid "The list of filtering rules have been modified. Close anyway?"
 msgstr "Zoznam filtrovacích pravidiel bol zmenený. Zavrieť aj napriek tomu?"
 
-#: src/prefs_filtering.c:1698
+#: src/prefs_filtering.c:1700
 msgid "Move one page up"
 msgstr "Posunúť o stranu vyššie"
 
-#: src/prefs_filtering.c:1699
+#: src/prefs_filtering.c:1701
 msgid "Move one page down"
 msgstr "Posunúť o stranu nižšie"
 
-#: src/prefs_filtering.c:1854
+#: src/prefs_filtering.c:1856
 msgid "Enable"
 msgstr "Povoliť"
 
@@ -15618,18 +15603,17 @@ msgstr ""
 msgid "Hidden columns"
 msgstr "Skryté položky"
 
-#: src/prefs_folder_column.c:290 src/prefs_summaries.c:409
-#: src/prefs_summaries.c:587 src/prefs_summary_column.c:304
+#: src/prefs_folder_column.c:290 src/prefs_summaries.c:417
+#: src/prefs_summaries.c:593 src/prefs_summary_column.c:304
 msgid "Displayed columns"
 msgstr "Zobrazené položky"
 
 #: src/prefs_folder_column.c:329 src/prefs_msg_colors.c:494
-#: src/prefs_summary_column.c:343 src/prefs_toolbar.c:1064
+#: src/prefs_summary_column.c:343 src/prefs_toolbar.c:1077
 msgid " Use default "
 msgstr " Použiť predvolené "
 
 #: src/prefs_folder_item.c:210
-#, fuzzy
 msgid ""
 "These preferences will not be saved as this folder is a top-level folder.\n"
 "However, you can set them for the whole mailbox tree by using \"Apply to "
@@ -15638,7 +15622,7 @@ msgstr ""
 "Tieto nastavenia nebudú uložené, pretože toto je koreňová zložka. Môžete ich "
 "ale nastaviť na celú poštovú schránku pomocou „Použiť na podzložky”."
 
-#: src/prefs_folder_item.c:289 src/prefs_folder_item.c:885
+#: src/prefs_folder_item.c:289 src/prefs_folder_item.c:886
 msgid ""
 "Apply to\n"
 "subfolders"
@@ -15678,7 +15662,7 @@ msgstr "Chmod zložky"
 msgid "Folder color"
 msgstr "Farba zložky"
 
-#: src/prefs_folder_item.c:441 src/prefs_folder_item.c:1663
+#: src/prefs_folder_item.c:441 src/prefs_folder_item.c:1678
 msgid "Pick color for folder"
 msgstr "Vyberte farbu zložky"
 
@@ -15734,42 +15718,45 @@ msgstr "Odstrániť telá starších správ"
 msgid "Discard folder cache"
 msgstr "Vymazať vyrovnávaciu pamäť zložky"
 
-#: src/prefs_folder_item.c:894
+#: src/prefs_folder_item.c:895
 msgid "Request Return Receipt"
 msgstr "Vyžiadať potvrdenie o príjme"
 
-#: src/prefs_folder_item.c:909
+#: src/prefs_folder_item.c:910
 msgid "Save copy of outgoing messages to this folder instead of Sent"
 msgstr ""
 "Uložiť kópiu odoslaných správ do tejto zložky namiesto do zložky Odoslané"
 
-#: src/prefs_folder_item.c:922 src/prefs_folder_item.c:945
-#: src/prefs_folder_item.c:969 src/prefs_folder_item.c:992
-#: src/prefs_folder_item.c:1015
-msgid "Default "
-msgstr "Predvolene "
+#: src/prefs_folder_item.c:924 src/prefs_folder_item.c:976
+#: src/prefs_folder_item.c:1002 src/prefs_folder_item.c:1028
+#, c-format
+msgctxt "folder properties: %s stands for a header name"
+msgid "Default %s"
+msgstr "Predvolene %s"
 
-#: src/prefs_folder_item.c:946
-msgid " for replies"
-msgstr " na odpovede"
+#: src/prefs_folder_item.c:950
+#, c-format
+msgctxt "folder properties: %s stands for a header name"
+msgid "Default %s for replies"
+msgstr "Predvolené %s na odpovede"
 
-#: src/prefs_folder_item.c:1038
+#: src/prefs_folder_item.c:1053
 msgid "Default account"
 msgstr "Predvolený účet"
 
-#: src/prefs_folder_item.c:1676
+#: src/prefs_folder_item.c:1691
 msgid "Discard cache"
 msgstr "Zrušiť lokálne uložené dáta"
 
-#: src/prefs_folder_item.c:1677
+#: src/prefs_folder_item.c:1692
 msgid "Do you really want to discard the local cached data for this folder?"
 msgstr "Naozaj chcete zmazať vyrovnávaciu pamäť tejto zložky?"
 
-#: src/prefs_folder_item.c:1807
+#: src/prefs_folder_item.c:1824
 msgid "General"
 msgstr "Všeobecné"
 
-#: src/prefs_folder_item.c:1886
+#: src/prefs_folder_item.c:1903
 #, c-format
 msgid "Properties for folder %s"
 msgstr "Vlastnosti zložky %s"
@@ -15778,7 +15765,7 @@ msgstr "Vlastnosti zložky %s"
 msgid "Folder and Message Lists"
 msgstr "Zoznamy zložiek a správ"
 
-#: src/prefs_fonts.c:99 src/prefs_matcher.c:2035
+#: src/prefs_fonts.c:99 src/prefs_matcher.c:2036
 msgid "Message"
 msgstr "Správa"
 
@@ -15802,8 +15789,8 @@ msgstr "Použiť odlišné písmo pri tlačení"
 msgid "Message Printing"
 msgstr "Tlač správy"
 
-#: src/prefs_fonts.c:268 src/prefs_msg_colors.c:839 src/prefs_summaries.c:731
-#: src/prefs_themes.c:365
+#: src/prefs_fonts.c:268 src/prefs_msg_colors.c:839 src/prefs_summaries.c:768
+#: src/prefs_themes.c:389
 msgid "Display"
 msgstr "Zobrazenie"
 
@@ -15811,7 +15798,7 @@ msgstr "Zobrazenie"
 msgid "Fonts"
 msgstr "Písma"
 
-#: src/prefs_gtk.c:911 src/toolbar.c:213 src/toolbar.c:423
+#: src/prefs_gtk.c:908 src/toolbar.c:256 src/toolbar.c:514
 msgid "Preferences"
 msgstr "Nastavenia"
 
@@ -16031,11 +16018,11 @@ msgstr "Telo správy"
 msgid "whole message"
 msgstr "Celá správa"
 
-#: src/prefs_matcher.c:394 src/summaryview.c:6267
+#: src/prefs_matcher.c:394 src/summaryview.c:6309
 msgid "Marked"
 msgstr "Označená"
 
-#: src/prefs_matcher.c:395 src/summaryview.c:6265
+#: src/prefs_matcher.c:395 src/summaryview.c:6307
 msgid "Deleted"
 msgstr "Zmazaná"
 
@@ -16043,12 +16030,12 @@ msgstr "Zmazaná"
 msgid "Replied"
 msgstr "Odpovedaná"
 
-#: src/prefs_matcher.c:397 src/summaryview.c:6259
+#: src/prefs_matcher.c:397 src/summaryview.c:6301
 msgid "Forwarded"
 msgstr "Poslané ďalej"
 
-#: src/prefs_matcher.c:399 src/summaryview.c:6249 src/toolbar.c:416
-#: src/toolbar.c:934 src/toolbar.c:1978
+#: src/prefs_matcher.c:399 src/summaryview.c:6291 src/toolbar.c:512
+#: src/toolbar.c:981 src/toolbar.c:2261
 msgid "Spam"
 msgstr "Spam"
 
@@ -16056,7 +16043,7 @@ msgstr "Spam"
 msgid "Has attachment"
 msgstr "Má prílohu"
 
-#: src/prefs_matcher.c:401 src/summaryview.c:6285
+#: src/prefs_matcher.c:401 src/summaryview.c:6327
 msgid "Signed"
 msgstr "Podpísané"
 
@@ -16156,54 +16143,54 @@ msgstr "Čiastočne stiahnutá"
 msgid "External program test"
 msgstr "Kontrola externým programom"
 
-#: src/prefs_matcher.c:710 src/prefs_matcher.c:1615 src/prefs_matcher.c:1630
-#: src/prefs_matcher.c:2516
+#: src/prefs_matcher.c:710 src/prefs_matcher.c:1616 src/prefs_matcher.c:1631
+#: src/prefs_matcher.c:2517
 msgctxt "Filtering Matcher Menu"
 msgid "All"
 msgstr "Všetky"
 
-#: src/prefs_matcher.c:743
+#: src/prefs_matcher.c:744
 msgid "Use regexp"
 msgstr "Použiť regulárny výraz"
 
-#: src/prefs_matcher.c:819
+#: src/prefs_matcher.c:820
 msgid "Message must match"
 msgstr "Správa musí vyhovovať"
 
-#: src/prefs_matcher.c:823
+#: src/prefs_matcher.c:824
 msgid "at least one"
 msgstr "aspoň jedno"
 
-#: src/prefs_matcher.c:824
+#: src/prefs_matcher.c:825
 msgid "all"
 msgstr "všetky"
 
-#: src/prefs_matcher.c:827
+#: src/prefs_matcher.c:828
 msgid "of above rules"
 msgstr "predošlých pravidiel"
 
-#: src/prefs_matcher.c:1533 src/prefs_matcher.c:1599
+#: src/prefs_matcher.c:1534 src/prefs_matcher.c:1600
 msgid "Search pattern is not set."
 msgstr "Nebol zadaný vyhľadávací vzor."
 
-#: src/prefs_matcher.c:1542
+#: src/prefs_matcher.c:1543
 msgid "Test command is not set."
 msgstr "Nie je nastavený testovací príkaz."
 
-#: src/prefs_matcher.c:1616
+#: src/prefs_matcher.c:1617
 msgid "all addresses in all headers"
 msgstr "všetky adresy vo všetkých hlavičkách"
 
-#: src/prefs_matcher.c:1619
+#: src/prefs_matcher.c:1620
 msgid "any address in any header"
 msgstr "akákoľvek adresa v akejkoľvek hlavičke"
 
-#: src/prefs_matcher.c:1621
+#: src/prefs_matcher.c:1622
 #, c-format
 msgid "the address(es) in header '%s'"
 msgstr "adresy v hlavičke „%s”"
 
-#: src/prefs_matcher.c:1622
+#: src/prefs_matcher.c:1623
 #, c-format
 msgid ""
 "Book/folder path is not set.\n"
@@ -16216,83 +16203,83 @@ msgstr ""
 "Ak chcete overiť či %s existuje v rámci celého adresára, vyberte „%s” z "
 "rozbaľovacieho zoznamu adresára/zložky."
 
-#: src/prefs_matcher.c:1841
+#: src/prefs_matcher.c:1842
 msgid "Headers part"
 msgstr "Záhlavie správy"
 
-#: src/prefs_matcher.c:1845
+#: src/prefs_matcher.c:1846
 msgid "Headers values"
 msgstr "Hodnoty hlavičky"
 
-#: src/prefs_matcher.c:1849
+#: src/prefs_matcher.c:1850
 msgid "Body part"
 msgstr "Telo správy"
 
-#: src/prefs_matcher.c:1853
+#: src/prefs_matcher.c:1854
 msgid "Whole message"
 msgstr "Celá správa"
 
-#: src/prefs_matcher.c:1966 src/prefs_matcher.c:2008
+#: src/prefs_matcher.c:1967 src/prefs_matcher.c:2009
 msgid "in"
 msgstr "v"
 
-#: src/prefs_matcher.c:1968
+#: src/prefs_matcher.c:1969
 msgid "content is"
 msgstr "obsahuje"
 
-#: src/prefs_matcher.c:1977
+#: src/prefs_matcher.c:1978
 msgid "Age is"
 msgstr "Vek je"
 
-#: src/prefs_matcher.c:1982
+#: src/prefs_matcher.c:1983
 msgid "Flag"
 msgstr "Príznak"
 
-#: src/prefs_matcher.c:1983 src/prefs_matcher.c:1998
+#: src/prefs_matcher.c:1984 src/prefs_matcher.c:1999
 msgid "is"
 msgstr "je"
 
-#: src/prefs_matcher.c:1988
+#: src/prefs_matcher.c:1989
 msgid "Name:"
 msgstr "Meno: "
 
-#: src/prefs_matcher.c:1997
+#: src/prefs_matcher.c:1998
 msgid "Label"
 msgstr "Menovka"
 
-#: src/prefs_matcher.c:2003
+#: src/prefs_matcher.c:2004
 msgid "Value:"
 msgstr "Hodnota:"
 
-#: src/prefs_matcher.c:2018
+#: src/prefs_matcher.c:2019
 msgid "Score is"
 msgstr "Skóre je"
 
-#: src/prefs_matcher.c:2019
+#: src/prefs_matcher.c:2020
 msgid "points"
 msgstr "bodov"
 
-#: src/prefs_matcher.c:2029
+#: src/prefs_matcher.c:2030
 msgid "Size is"
 msgstr "Veľkosť je"
 
-#: src/prefs_matcher.c:2034
+#: src/prefs_matcher.c:2035
 msgid "Scope:"
 msgstr "Rozsah:"
 
-#: src/prefs_matcher.c:2036
+#: src/prefs_matcher.c:2037
 msgid "tags"
 msgstr "Značky"
 
-#: src/prefs_matcher.c:2041
+#: src/prefs_matcher.c:2042
 msgid "type is"
 msgstr "typ je"
 
-#: src/prefs_matcher.c:2045
+#: src/prefs_matcher.c:2046
 msgid "Program returns"
 msgstr "Návratová hodnota programu"
 
-#: src/prefs_matcher.c:2115
+#: src/prefs_matcher.c:2116
 msgid ""
 "The entry was not saved.\n"
 "Close anyway?"
@@ -16300,11 +16287,11 @@ msgstr ""
 "Pravidlo nebolo uložené.\n"
 "Zavrieť napriek tomu?"
 
-#: src/prefs_matcher.c:2181
+#: src/prefs_matcher.c:2182
 msgid "Match Type: 'Test'"
 msgstr "Typ zhody: „Test”"
 
-#: src/prefs_matcher.c:2182
+#: src/prefs_matcher.c:2183
 msgid ""
 "'Test' allows you to test a message or message element using an external "
 "program or script. The program will return either 0 or 1.\n"
@@ -16316,7 +16303,7 @@ msgstr ""
 "\n"
 "Môžete použiť tieto symboly:"
 
-#: src/prefs_matcher.c:2281
+#: src/prefs_matcher.c:2282
 msgid "Current condition rules"
 msgstr "Aktuálne pravidlá"
 
@@ -16510,7 +16497,7 @@ msgctxt "Tooltip"
 msgid "Pick color for signatures"
 msgstr "Vyberte farbu podpisov"
 
-#: src/prefs_msg_colors.c:367 src/prefs_summaries.c:357
+#: src/prefs_msg_colors.c:367 src/prefs_summaries.c:365
 msgid "Folder list"
 msgstr "Zoznam správ"
 
@@ -17054,172 +17041,188 @@ msgstr "Vyberte farbu nesprávneho slova. Použite čiernu na podčiarkovanie"
 msgid "Spell Checking"
 msgstr "Kontrola preklepov"
 
-#: src/prefs_summaries.c:153
+#: src/prefs_summaries.c:160
 msgid "the abbreviated weekday name"
 msgstr "skrátený názov dňa v týždni"
 
-#: src/prefs_summaries.c:154
+#: src/prefs_summaries.c:161
 msgid "the full weekday name"
 msgstr "názov dňa v týždni"
 
-#: src/prefs_summaries.c:155
+#: src/prefs_summaries.c:162
 msgid "the abbreviated month name"
 msgstr "skrátený názov mesiaca"
 
-#: src/prefs_summaries.c:156
+#: src/prefs_summaries.c:163
 msgid "the full month name"
 msgstr "názov mesiaca"
 
-#: src/prefs_summaries.c:157
+#: src/prefs_summaries.c:164
 msgid "the preferred date and time for the current locale"
 msgstr "uprednostňovaný dátum a čas aktuálnej lokalizácie"
 
-#: src/prefs_summaries.c:158
+#: src/prefs_summaries.c:165
 msgid "the century number (year/100)"
 msgstr "storočie (rok/100)"
 
-#: src/prefs_summaries.c:159
+#: src/prefs_summaries.c:166
 msgid "the day of the month as a decimal number"
 msgstr "deň v mesiaci"
 
-#: src/prefs_summaries.c:160
+#: src/prefs_summaries.c:167
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "číslo hodiny pri použití 24-hod času"
 
-#: src/prefs_summaries.c:161
+#: src/prefs_summaries.c:168
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "číslo hodiny pri použití 12-hod času"
 
-#: src/prefs_summaries.c:162
+#: src/prefs_summaries.c:169
 msgid "the day of the year as a decimal number"
 msgstr "číslo dňa v roku"
 
-#: src/prefs_summaries.c:163
+#: src/prefs_summaries.c:170
 msgid "the month as a decimal number"
 msgstr "číslo mesiaca"
 
-#: src/prefs_summaries.c:164
+#: src/prefs_summaries.c:171
 msgid "the minute as a decimal number"
 msgstr "minúty"
 
-#: src/prefs_summaries.c:165
+#: src/prefs_summaries.c:172
 msgid "either AM or PM"
 msgstr "AM alebo PM"
 
-#: src/prefs_summaries.c:166
+#: src/prefs_summaries.c:173
 msgid "the second as a decimal number"
 msgstr "sekundy"
 
-#: src/prefs_summaries.c:167
+#: src/prefs_summaries.c:174
 msgid "the day of the week as a decimal number"
 msgstr "poradie dňa v týždni"
 
-#: src/prefs_summaries.c:168
+#: src/prefs_summaries.c:175
 msgid "the preferred date for the current locale"
 msgstr "uprednostňovaný dátum aktuálnej lokalizácie"
 
-#: src/prefs_summaries.c:169
+#: src/prefs_summaries.c:176
 msgid "the last two digits of a year"
 msgstr "posledné dve číslice roku"
 
-#: src/prefs_summaries.c:170
+#: src/prefs_summaries.c:177
 msgid "the year as a decimal number"
 msgstr "rok"
 
-#: src/prefs_summaries.c:171
+#: src/prefs_summaries.c:178
 msgid "the time zone or name or abbreviation"
 msgstr "časová zóna, jej názov alebo skratka"
 
-#: src/prefs_summaries.c:192 src/prefs_summaries.c:240
-#: src/prefs_summaries.c:561
+#: src/prefs_summaries.c:199 src/prefs_summaries.c:247
+#: src/prefs_summaries.c:567
 msgid "Date format"
 msgstr "Formát dátumu"
 
-#: src/prefs_summaries.c:216
+#: src/prefs_summaries.c:223
 msgid "Specifier"
 msgstr "Symbol"
 
-#: src/prefs_summaries.c:258
+#: src/prefs_summaries.c:265
 msgid "Example"
 msgstr "Príklad"
 
-#: src/prefs_summaries.c:363
+#: src/prefs_summaries.c:371
 msgid "Display message count next to folder name"
 msgstr "Zobraziť počet správ vedľa názvu zložky"
 
-#: src/prefs_summaries.c:373
+#: src/prefs_summaries.c:381
 msgid "Unread messages"
 msgstr "Počet neprečítaných správ"
 
-#: src/prefs_summaries.c:374
+#: src/prefs_summaries.c:382
 msgid "Unread and Total messages"
 msgstr "Počet neprečítaných a všetkých správ"
 
-#: src/prefs_summaries.c:384
+#: src/prefs_summaries.c:392
 msgid "Open last opened folder at start-up"
 msgstr "Pri štarte otvoriť poslednú otvorenú zložku"
 
-#: src/prefs_summaries.c:387
+#: src/prefs_summaries.c:395
 msgid "Abbreviate newsgroup names longer than"
 msgstr "Skrátiť diskusné skupiny dlhšie ako"
 
-#: src/prefs_summaries.c:401
+#: src/prefs_summaries.c:409
 msgid "letters"
 msgstr "písmen"
 
-#: src/prefs_summaries.c:419
+#: src/prefs_summaries.c:427
 msgid "Message list"
 msgstr "Zoznam správ"
 
-#: src/prefs_summaries.c:425
+#: src/prefs_summaries.c:433
 msgid "Sort new folders by"
 msgstr "Zoradiť nové zložky podľa"
 
-#: src/prefs_summaries.c:433 src/prefs_summary_column.c:86
+#: src/prefs_summaries.c:441 src/prefs_summary_column.c:86
 msgid "Number"
 msgstr "Číslo"
 
-#: src/prefs_summaries.c:436
+#: src/prefs_summaries.c:444
 msgid "Thread date"
 msgstr "Dátumu vlákna"
 
-#: src/prefs_summaries.c:447
+#: src/prefs_summaries.c:455
 msgid "Don't sort"
 msgstr "Neradiť"
 
-#: src/prefs_summaries.c:464
+#: src/prefs_summaries.c:472
 msgid "Set default selection when entering a folder"
 msgstr "Nastaviť predvolený výber pri vstupe do zložky"
 
-#: src/prefs_summaries.c:477
+#: src/prefs_summaries.c:485
 msgid "Show \"no unread (or new) message\" dialog"
 msgstr "Zobraziť dialóg „žiadne neprečítané (alebo nové) správy”"
 
-#: src/prefs_summaries.c:487
+#: src/prefs_summaries.c:495
 msgid "Assume 'Yes'"
 msgstr "Predpokladať „Áno”"
 
-#: src/prefs_summaries.c:488
+#: src/prefs_summaries.c:496
 msgid "Assume 'No'"
 msgstr "Predpokladať „Nie”"
 
-#: src/prefs_summaries.c:496
+#: src/prefs_summaries.c:501
 msgid "Open message when selected"
 msgstr "Otvoriť správu pri vybratí"
 
 #: src/prefs_summaries.c:506
-msgid "When message view is visible"
-msgstr "Keď je zobrazenie správy viditeľné"
+msgid "When opening a folder"
+msgstr "Pri otvorení zložky"
+
+#: src/prefs_summaries.c:508
+msgid "When displaying search results"
+msgstr "Pri zobrazení výsledkov hľadania"
+
+#: src/prefs_summaries.c:510
+msgid "When selecting next or previous message using shortcuts"
+msgstr "Pri výbere ďalšej alebo predošlej správy pomocou skratiek"
 
 #: src/prefs_summaries.c:512
+msgid "When deleting or moving messages"
+msgstr "Pri mazaní alebo presúvaní správ"
+
+#: src/prefs_summaries.c:514
+msgid "When using directional keys"
+msgstr "Pri použití kláves šipiek"
+
+#: src/prefs_summaries.c:518
 msgid "Thread using subject in addition to standard headers"
 msgstr "Zaraďovať do vlákien dodatočne aj podľa názvu správy"
 
-#: src/prefs_summaries.c:516
+#: src/prefs_summaries.c:522
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Pri presúvaní alebo mazaní správ toto vykonať okamžite"
 
-#: src/prefs_summaries.c:518
+#: src/prefs_summaries.c:524
 msgid ""
 "Defers moving, copying and deleting of messages until you choose 'Tools/"
 "Execute'"
@@ -17227,46 +17230,46 @@ msgstr ""
 "Odloží presun, kopírovanie a mazanie správ do doby než zvolíte „Nástroje/"
 "Vykonať”"
 
-#: src/prefs_summaries.c:521
+#: src/prefs_summaries.c:527
 msgid "Mark message as read"
 msgstr "Označiť správu ako prečítanú"
 
-#: src/prefs_summaries.c:524
+#: src/prefs_summaries.c:530
 msgid "when selected, after"
 msgstr "keď je vybratá, za"
 
-#: src/prefs_summaries.c:544
+#: src/prefs_summaries.c:550
 msgid "only when opened in a new window, or replied to"
 msgstr "len ak je otvorená v novom okne, alebo odpovedaná"
 
-#: src/prefs_summaries.c:551
+#: src/prefs_summaries.c:557
 msgid "Display sender using address book"
 msgstr "Zobraziť odosielateľa pomocou adresára"
 
-#: src/prefs_summaries.c:555
+#: src/prefs_summaries.c:561
 msgid "Show tooltips"
 msgstr "Zobraziť nástrojové tipy"
 
-#: src/prefs_summaries.c:581
+#: src/prefs_summaries.c:587
 msgid "Date format help"
 msgstr "Pomôcka formátu dátumu"
 
-#: src/prefs_summaries.c:599
+#: src/prefs_summaries.c:605
 msgid "Confirm before marking all messages in a folder as read"
 msgstr "Potvrdiť pred označením všetkých správ v zložke ako prečítané."
 
-#: src/prefs_summaries.c:602
+#: src/prefs_summaries.c:608
 msgid "Translate header names"
 msgstr "Prekladať názvy hlavičiek"
 
-#: src/prefs_summaries.c:604
+#: src/prefs_summaries.c:610
 msgid ""
 "The display of standard headers (such as 'From:', 'Subject:') will be "
 "translated into your language."
 msgstr ""
 "Štandardné hlavičky (ako „From:”, „Subject:”) budú preložené do vášho jazyka."
 
-#: src/prefs_summaries.c:732
+#: src/prefs_summaries.c:769
 msgid "Summaries"
 msgstr "Súhrny"
 
@@ -17372,86 +17375,86 @@ msgstr "Zoznam šablón nebol uložený"
 msgid "The templates list has been modified. Close anyway?"
 msgstr "Zoznam šablón nebol uložený. Zavrieť napriek tomu?"
 
-#: src/prefs_template.c:768
+#: src/prefs_template.c:758
 msgid "The template's name is not set."
 msgstr "Nebol zadaný názov šablóny."
 
-#: src/prefs_template.c:811
+#: src/prefs_template.c:801
 msgid "The \"From\" field of the template contains an invalid email address."
 msgstr "Pole „Od” šablóny obsahuje neplatnú emailovú adresu."
 
-#: src/prefs_template.c:817
+#: src/prefs_template.c:807
 msgid "The \"To\" field of the template contains an invalid email address."
 msgstr "Pole „Komu” šablóny obsahuje neplatnú emailovú adresu."
 
-#: src/prefs_template.c:823
+#: src/prefs_template.c:813
 msgid "The \"Cc\" field of the template contains an invalid email address."
 msgstr "Pole „Kópia” šablóny obsahuje neplatnú emailovú adresu."
 
-#: src/prefs_template.c:829
+#: src/prefs_template.c:819
 msgid "The \"Bcc\" field of the template contains an invalid email address."
 msgstr "Pole „Skrytá kópia” šablóny obsahuje neplatnú emailovú adresu."
 
-#: src/prefs_template.c:835
+#: src/prefs_template.c:825
 msgid ""
 "The \"Reply-To\" field of the template contains an invalid email address."
 msgstr "Pole „Reply-To” šablóny obsahuje neplatnú emailovú adresu."
 
-#: src/prefs_template.c:841
+#: src/prefs_template.c:831
 msgid "The \"Subject\" field of the template is invalid."
 msgstr "Pole „Predmet” šablóny nie je platné."
 
-#: src/prefs_template.c:912
+#: src/prefs_template.c:902
 msgid "Delete template"
 msgstr "Zmazať šablónu"
 
-#: src/prefs_template.c:913
+#: src/prefs_template.c:903
 msgid "Do you really want to delete this template?"
 msgstr "Naozaj chcete zmazať túto šablónu?"
 
-#: src/prefs_template.c:925
+#: src/prefs_template.c:915
 msgid "Delete all templates"
 msgstr "Zmazať všetky šablóny"
 
-#: src/prefs_template.c:926
+#: src/prefs_template.c:916
 msgid "Do you really want to delete all the templates?"
 msgstr "Naozaj chcete zmazať všetky šablóny?"
 
-#: src/prefs_template.c:1241
+#: src/prefs_template.c:1231
 msgid "Current templates"
 msgstr "Aktuálne šablóny"
 
-#: src/prefs_template.c:1269
+#: src/prefs_template.c:1259
 msgid "Template"
 msgstr "Šablóna"
 
-#: src/prefs_themes.c:344 src/prefs_themes.c:704
+#: src/prefs_themes.c:368 src/prefs_themes.c:804
 msgid "Default internal theme"
 msgstr "Predvolená interná téma"
 
-#: src/prefs_themes.c:366
+#: src/prefs_themes.c:390
 msgid "Themes"
 msgstr "Témy"
 
-#: src/prefs_themes.c:436
+#: src/prefs_themes.c:464
 msgid "Only root can remove system themes"
 msgstr "Len root môže odstrániť systémové témy"
 
-#: src/prefs_themes.c:439
+#: src/prefs_themes.c:467
 #, c-format
 msgid "Remove system theme '%s'"
 msgstr "Odstrániť systémovú tému: „%s”"
 
-#: src/prefs_themes.c:442
+#: src/prefs_themes.c:470
 #, c-format
 msgid "Remove theme '%s'"
 msgstr "Odstrániť tému „%s”"
 
-#: src/prefs_themes.c:448
+#: src/prefs_themes.c:476
 msgid "Are you sure you want to remove this theme?"
 msgstr "Naozaj chcete zmazať túto tému?"
 
-#: src/prefs_themes.c:458
+#: src/prefs_themes.c:486
 #, c-format
 msgid ""
 "File %s failed\n"
@@ -17460,24 +17463,24 @@ msgstr ""
 "Chyba pri súbore %s\n"
 "počas odstraňovania témy."
 
-#: src/prefs_themes.c:462
+#: src/prefs_themes.c:490
 msgid "Removing theme directory failed."
 msgstr "Chyba pri odstraňovaní zložky témy."
 
-#: src/prefs_themes.c:465
+#: src/prefs_themes.c:493
 msgid "Theme removed successfully"
 msgstr "Téma bola úspešne odstránená"
 
-#: src/prefs_themes.c:485
+#: src/prefs_themes.c:513
 msgid "Select theme folder"
 msgstr "Zvoľte zložku témy"
 
-#: src/prefs_themes.c:500
+#: src/prefs_themes.c:528
 #, c-format
 msgid "Install theme '%s'"
 msgstr "Nainštalovať tému „%s”"
 
-#: src/prefs_themes.c:503
+#: src/prefs_themes.c:531
 msgid ""
 "This folder doesn't seem to be a theme folder.\n"
 "Install anyway?"
@@ -17485,15 +17488,15 @@ msgstr ""
 "Táto zložka nevyzerá ako zložka s témou.\n"
 "Nainštalovať aj napriek tomu?"
 
-#: src/prefs_themes.c:510
+#: src/prefs_themes.c:538
 msgid "Do you want to install theme for all users?"
 msgstr "Chcete nainštalovať tému pre všetkých používateľov?"
 
-#: src/prefs_themes.c:530
+#: src/prefs_themes.c:558
 msgid "Theme exists"
 msgstr "Téma existuje"
 
-#: src/prefs_themes.c:531
+#: src/prefs_themes.c:559
 msgid ""
 "A theme with the same name is\n"
 "already installed in this location.\n"
@@ -17505,25 +17508,25 @@ msgstr ""
 "\n"
 "Chcete ju nahradiť?"
 
-#: src/prefs_themes.c:537
+#: src/prefs_themes.c:565
 #, c-format
 msgid "Couldn't delete the old theme in %s."
 msgstr "Nemožno zmazať starú tému v %s."
 
-#: src/prefs_themes.c:545
+#: src/prefs_themes.c:573
 #, c-format
 msgid "Couldn't create destination directory %s."
 msgstr "Nemožno vytvoriť cieľový adresár %s."
 
-#: src/prefs_themes.c:558
+#: src/prefs_themes.c:586
 msgid "Theme installed successfully."
 msgstr "Téma úspešne nainštalovaná."
 
-#: src/prefs_themes.c:565
+#: src/prefs_themes.c:593
 msgid "Failed installing theme"
 msgstr "Zlyhala inštalácia témy"
 
-#: src/prefs_themes.c:568
+#: src/prefs_themes.c:596
 #, c-format
 msgid ""
 "File %s failed\n"
@@ -17532,58 +17535,74 @@ msgstr ""
 "Chyba pri súbore %s\n"
 "počas inštalácie témy."
 
-#: src/prefs_themes.c:666
+#: src/prefs_themes.c:766
 #, c-format
 msgid "%d themes available (%d user, %d system, 1 internal)"
 msgstr "Je dostupných %d tém (%d používateľských, %d systémových, 1 interná)"
 
-#: src/prefs_themes.c:707
+#: src/prefs_themes.c:807
 #, c-format
 msgid "Internal theme has %d icons"
 msgstr "Interná téma má %d ikon"
 
-#: src/prefs_themes.c:713
+#: src/prefs_themes.c:813
 msgid "No info file available for this theme"
 msgstr "O tejto téme nie sú k dispozícii žiadne informácie"
 
-#: src/prefs_themes.c:731
+#: src/prefs_themes.c:831
 msgid "Error: couldn't get theme status"
 msgstr "Chyba: nemožno zistiť stav témy"
 
-#: src/prefs_themes.c:755
+#: src/prefs_themes.c:861
 #, c-format
 msgid "%d files (%d icons), size: %s"
 msgstr "%d súborov (%d ikon), veľkosť: %s"
 
-#: src/prefs_themes.c:803
+#: src/prefs_themes.c:919
 msgid "Selector"
 msgstr "Výber"
 
-#: src/prefs_themes.c:814
+#: src/prefs_themes.c:930
 msgid "Install new..."
 msgstr "Inštalovať novú…"
 
-#: src/prefs_themes.c:819
+#: src/prefs_themes.c:935
 msgid "Get more..."
 msgstr "Získať ďalšie…"
 
-#: src/prefs_themes.c:830
+#: src/prefs_themes.c:946
 msgid "Information"
 msgstr "Informácie"
 
-#: src/prefs_themes.c:844
+#: src/prefs_themes.c:960
 msgid "Author: "
 msgstr "Autor: "
 
-#: src/prefs_themes.c:852
+#: src/prefs_themes.c:968
 msgid "URL:"
 msgstr "URL:"
 
-#: src/prefs_themes.c:894
+#: src/prefs_themes.c:1010
 msgid "Preview"
 msgstr "Náhľad"
 
-#: src/prefs_toolbar.c:176
+#: src/prefs_themes.c:1066
+msgid "SVG rendering"
+msgstr "Vykreslenie SVG"
+
+#: src/prefs_themes.c:1073
+msgid "Enable alpha channel"
+msgstr "Povoliť priehľadnosť"
+
+#: src/prefs_themes.c:1074
+msgid "Force scaling"
+msgstr "Vynútiť zväčšenie"
+
+#: src/prefs_themes.c:1080
+msgid "Pixels per inch (PPI)"
+msgstr "Pixelov na palec (PPI)"
+
+#: src/prefs_toolbar.c:186
 msgid ""
 "Selected Action already set.\n"
 "Please choose another Action from List"
@@ -17591,75 +17610,75 @@ msgstr ""
 "Zvolená akcia je už nastavená.\n"
 "Prosím, vyberte zo zoznamu inú akciu"
 
-#: src/prefs_toolbar.c:177
+#: src/prefs_toolbar.c:187
 msgid "Item has no icon defined."
 msgstr "Položka nemá určenú ikonu."
 
-#: src/prefs_toolbar.c:178
+#: src/prefs_toolbar.c:188
 msgid "Item has no text defined."
 msgstr "Položka nemá určený text."
 
-#: src/prefs_toolbar.c:916
+#: src/prefs_toolbar.c:929
 msgid "Toolbar item"
 msgstr "Položka panela nástrojov"
 
-#: src/prefs_toolbar.c:932
+#: src/prefs_toolbar.c:945
 msgid "Item type"
 msgstr "Typ položky"
 
-#: src/prefs_toolbar.c:942
+#: src/prefs_toolbar.c:955
 msgid "Internal Function"
 msgstr "Interná funkcia"
 
-#: src/prefs_toolbar.c:943
+#: src/prefs_toolbar.c:956
 msgid "User Action"
 msgstr "Akcia"
 
-#: src/prefs_toolbar.c:945 src/toolbar.c:234
+#: src/prefs_toolbar.c:958 src/toolbar.c:277
 msgid "Separator"
 msgstr "Oddeľovač"
 
-#: src/prefs_toolbar.c:952
+#: src/prefs_toolbar.c:965
 msgid "Event executed on click"
 msgstr "Vykonať pri kliknutí"
 
-#: src/prefs_toolbar.c:991
+#: src/prefs_toolbar.c:1004
 msgid "Toolbar text"
 msgstr "Text panela nástrojov"
 
-#: src/prefs_toolbar.c:1006 src/prefs_toolbar.c:1382
+#: src/prefs_toolbar.c:1019 src/prefs_toolbar.c:1395
 msgid "Icon"
 msgstr "Ikona"
 
-#: src/prefs_toolbar.c:1042
+#: src/prefs_toolbar.c:1055
 msgid "A_dd"
 msgstr "Pri_dať"
 
-#: src/prefs_toolbar.c:1262 src/prefs_toolbar.c:1276 src/prefs_toolbar.c:1290
+#: src/prefs_toolbar.c:1275 src/prefs_toolbar.c:1289 src/prefs_toolbar.c:1303
 msgid "Toolbars"
 msgstr "Panely nástrojov"
 
-#: src/prefs_toolbar.c:1263
+#: src/prefs_toolbar.c:1276
 msgid "Main Window"
 msgstr "Hlavné okno"
 
-#: src/prefs_toolbar.c:1277
+#: src/prefs_toolbar.c:1290
 msgid "Message Window"
 msgstr "Okno správy"
 
-#: src/prefs_toolbar.c:1291
+#: src/prefs_toolbar.c:1304
 msgid "Compose Window"
 msgstr "Okno písania správy"
 
-#: src/prefs_toolbar.c:1405
+#: src/prefs_toolbar.c:1418
 msgid "Icon text"
 msgstr "Text ikony"
 
-#: src/prefs_toolbar.c:1414
+#: src/prefs_toolbar.c:1427
 msgid "Mapped event"
 msgstr "Priradená udalosť"
 
-#: src/prefs_toolbar.c:1711
+#: src/prefs_toolbar.c:1724
 msgid "Toolbar item icon"
 msgstr "Ikona panela nástrojov"
 
@@ -17732,31 +17751,31 @@ msgstr "Neboli definované žiadne kľúče príjemcov."
 msgid "[Error decoding BASE64]\n"
 msgstr "[Chyba pri dekódovaní BASE64]\n"
 
-#: src/procmsg.c:936 src/procmsg.c:939
+#: src/procmsg.c:937 src/procmsg.c:940
 msgid "Already trying to send."
 msgstr "Pokus o doručenie už prebieha."
 
-#: src/procmsg.c:1557 src/procmsg.c:1616
+#: src/procmsg.c:1558 src/procmsg.c:1618
 #, c-format
 msgid "Couldn't open file %s."
 msgstr "Nemožno otvoriť súbor %s."
 
-#: src/procmsg.c:1626
+#: src/procmsg.c:1628
 msgid "Queued message header is broken."
 msgstr "Hlavička správy vo fronte je poškodená."
 
-#: src/procmsg.c:1646
+#: src/procmsg.c:1648
 msgid "An error happened during SMTP session."
 msgstr "nastala chyba počas relácie SMTP."
 
-#: src/procmsg.c:1660
+#: src/procmsg.c:1662
 msgid ""
 "No specific account has been found to send, and an error happened during "
 "SMTP session."
 msgstr ""
 "Nebol nájdený zadaný účet na odoslanie a pri relácii SMTP nastala chyba."
 
-#: src/procmsg.c:1668
+#: src/procmsg.c:1670
 msgid ""
 "Couldn't determine sending information. Maybe the email hasn't been "
 "generated by Claws Mail."
@@ -17764,20 +17783,20 @@ msgstr ""
 "Nemožno zistiť informácie na odoslanie. Správa asi nebola vygenerovaná "
 "programom Claws Mail."
 
-#: src/procmsg.c:1690
+#: src/procmsg.c:1693
 msgid "Couldn't create temporary file for news sending."
 msgstr "Nemožno vytvoriť dočasný súbor na odosielanie príspevkov news."
 
-#: src/procmsg.c:1703
+#: src/procmsg.c:1706
 msgid "Error when writing temporary file for news sending."
 msgstr "Chyba pri zápise do dočasného súboru na odosielanie príspevkov news."
 
-#: src/procmsg.c:1717
+#: src/procmsg.c:1720
 #, c-format
 msgid "Error occurred while posting the message to %s."
 msgstr "Pri odosielaní správy na %s nastala chyba."
 
-#: src/procmsg.c:2269
+#: src/procmsg.c:2272
 msgid "Filtering messages...\n"
 msgstr "Filtrujem správy…\n"
 
@@ -17975,17 +17994,15 @@ msgstr ""
 "na pripojenie"
 
 #: src/quote_fmt.c:96
-#, fuzzy
 msgid ""
 "attach file:\n"
 "<span style=\"oblique\">sub_expr</span> is evaluated as a command-line to "
 "get\n"
 "the filename from"
 msgstr ""
-"vložiť výstup z programu:\n"
-"<span style=\"oblique\">pod_výraz</span> je vyhodnotené ako príkazový "
-"riadok, \n"
-"ktorého výstup bude vložený"
+"pripojiť súbor:\n"
+"<span style=\"oblique\">pod_výraz</span> je vyhodnotený ako príkazo na, \n"
+"získanie mena súboru"
 
 #: src/quote_fmt.c:98
 msgid "<span weight=\"bold\">definition of terms:</span>"
@@ -18088,12 +18105,12 @@ msgstr "Zadajte text, ktorým má nahradiť „%s”"
 msgid "Enter variable"
 msgstr "Zadajte premennú"
 
-#: src/send_message.c:153
+#: src/send_message.c:152
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Odosielam správu pomocou príkazu: %s\n"
 
-#: src/send_message.c:167
+#: src/send_message.c:166
 #, c-format
 msgid "Couldn't execute command: %s"
 msgstr "Nemožno vykonať príkaz: %s"
@@ -18204,9 +18221,8 @@ msgid "%s - Source"
 msgstr "%s – Zdroj"
 
 #: src/ssl_manager.c:156
-#, fuzzy
 msgid "Saved SSL/TLS certificates"
-msgstr "Uložené certifikáty SSL"
+msgstr "Uložené certifikáty SSL/TLS"
 
 #: src/ssl_manager.c:436
 msgid "Delete certificate"
@@ -18216,40 +18232,40 @@ msgstr "Vymazať certifikát"
 msgid "Do you really want to delete this certificate?"
 msgstr "Naozaj chcete vymazať tento certifikát?"
 
-#: src/summary_search.c:259
+#: src/summary_search.c:305
 msgid "Search messages"
 msgstr "Vyhľadať v správach"
 
-#: src/summary_search.c:281
+#: src/summary_search.c:327
 msgid "Match any of the following"
 msgstr "Spĺňa aspoň jednu z nasledujúcich podmienok"
 
-#: src/summary_search.c:283
+#: src/summary_search.c:329
 msgid "Match all of the following"
 msgstr "Spĺňa všetky z nasledujúcich podmienok"
 
-#: src/summary_search.c:447
+#: src/summary_search.c:495
 msgid "Body:"
 msgstr "Telo:"
 
-#: src/summary_search.c:454
+#: src/summary_search.c:502
 msgid "Condition:"
 msgstr "Podmienka:"
 
-#: src/summary_search.c:484
+#: src/summary_search.c:536
 msgid "Find _all"
 msgstr "Nájsť _všetky"
 
-#: src/summary_search.c:690 src/summaryview.c:1088 src/summaryview.c:1350
+#: src/summary_search.c:751 src/summaryview.c:1089 src/summaryview.c:1351
 #, c-format
 msgid "Searching in %s... \n"
 msgstr "Hľadám v %s… \n"
 
-#: src/summary_search.c:787
+#: src/summary_search.c:846
 msgid "Beginning of list reached; continue from end?"
 msgstr "Bol dosiahnutý začiatok zoznamu; pokračovať od konca?"
 
-#: src/summary_search.c:789
+#: src/summary_search.c:848
 msgid "End of list reached; continue from beginning?"
 msgstr "Bol dosiahnutý koniec zoznamu; pokračovať od začiatku?"
 
@@ -18265,75 +18281,75 @@ msgstr "Zap/vyp. panel rýchleho vyhľadávania"
 msgid "Toggle multiple selection"
 msgstr "Prepnúť skupinovú voľbu"
 
-#: src/summaryview.c:1278
+#: src/summaryview.c:1279
 msgid "Process mark"
 msgstr "Spracovať značku"
 
-#: src/summaryview.c:1279
+#: src/summaryview.c:1280
 msgid "Some marks are left. Process them?"
 msgstr "Niektoré značky ostali. Spracovať ich?"
 
-#: src/summaryview.c:1329
+#: src/summaryview.c:1330
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Prehľadávam zložku (%s)…"
 
-#: src/summaryview.c:1843 src/summaryview.c:1894
+#: src/summaryview.c:1870 src/summaryview.c:1918
 msgid "No more unread messages"
 msgstr "Žiadne neprečítané správy"
 
-#: src/summaryview.c:1844
+#: src/summaryview.c:1871
 msgid "No unread message found. Search from the end?"
 msgstr "Neboli nájdené žiadne neprečítané správy. Hľadať od konca?"
 
-#: src/summaryview.c:1856 src/summaryview.c:1907 src/summaryview.c:1950
-#: src/summaryview.c:2001 src/summaryview.c:2079
+#: src/summaryview.c:1883 src/summaryview.c:1931 src/summaryview.c:1968
+#: src/summaryview.c:2016 src/summaryview.c:2083
 msgid ""
 "Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
 msgstr ""
 "Interná chyba: neočakávaná hodnota pre prefs_common.next_unread_msg_dialog\n"
 
-#: src/summaryview.c:1864
+#: src/summaryview.c:1895
 msgid "No unread messages."
 msgstr "Žiadne neprečítané správy."
 
-#: src/summaryview.c:1895
+#: src/summaryview.c:1919
 msgid "No unread message found. Go to next folder?"
 msgstr "Neboli nájdené žiadne neprečítané správy. Prejsť do ďalšej zložky?"
 
-#: src/summaryview.c:1937 src/summaryview.c:1988
+#: src/summaryview.c:1955 src/summaryview.c:2003
 msgid "No more new messages"
 msgstr "Žiadne nové správy"
 
-#: src/summaryview.c:1938
+#: src/summaryview.c:1956
 msgid "No new message found. Search from the end?"
 msgstr "Neboli nájdené žiadne nové správy. Hľadať od konca?"
 
-#: src/summaryview.c:1958
+#: src/summaryview.c:1980
 msgid "No new messages."
 msgstr "Žiadne nové správy."
 
-#: src/summaryview.c:1989
+#: src/summaryview.c:2004
 msgid "No new message found. Go to next folder?"
 msgstr "Neboli nájdené žiadne nové správy. Prejsť do ďalšej zložky?"
 
-#: src/summaryview.c:2026 src/summaryview.c:2066
+#: src/summaryview.c:2037 src/summaryview.c:2070
 msgid "No more marked messages"
 msgstr "Žiadne označené správy"
 
-#: src/summaryview.c:2027
+#: src/summaryview.c:2038
 msgid "No marked message found. Search from the end?"
 msgstr "Neboli nájdené žiadne označené správy. Hľadať od konca?"
 
-#: src/summaryview.c:2036
+#: src/summaryview.c:2047
 msgid "No marked messages."
 msgstr "Žiadne označené správy."
 
-#: src/summaryview.c:2067
+#: src/summaryview.c:2071
 msgid "No marked message found. Go to next folder?"
 msgstr "Neboli nájdené žiadne označené správy. Prejsť do ďalšej zložky?"
 
-#: src/summaryview.c:2104 src/summaryview.c:2129
+#: src/summaryview.c:2104 src/summaryview.c:2133
 msgid "No more labeled messages"
 msgstr "Žiadne zafarbené správy"
 
@@ -18341,125 +18357,125 @@ msgstr "Žiadne zafarbené správy"
 msgid "No labeled message found. Search from the end?"
 msgstr "Neboli nájdené žiadne zafarbené správy. Hľadať od konca?"
 
-#: src/summaryview.c:2114 src/summaryview.c:2139
+#: src/summaryview.c:2114 src/summaryview.c:2147
 msgid "No labeled messages."
 msgstr "Žiadne zafarbené správy."
 
-#: src/summaryview.c:2130
+#: src/summaryview.c:2134
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Neboli nájdené žiadne zafarbené správy. Hľadať od začiatku?"
 
-#: src/summaryview.c:2453
+#: src/summaryview.c:2451
 msgid "Attracting messages by subject..."
 msgstr "Zoskupujem správy podľa predmetu…"
 
-#: src/summaryview.c:2638
+#: src/summaryview.c:2636
 #, c-format
 msgid "%d deleted"
 msgstr "%d zmazaných"
 
-#: src/summaryview.c:2642
+#: src/summaryview.c:2640
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d presunutých"
 
-#: src/summaryview.c:2643 src/summaryview.c:2650
+#: src/summaryview.c:2641 src/summaryview.c:2648
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2648
+#: src/summaryview.c:2646
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d skopírovaných"
 
-#: src/summaryview.c:2662
+#: src/summaryview.c:2660
 msgid " item selected"
 msgid_plural " items selected"
 msgstr[0] " položka zvolená"
 msgstr[1] " položky zvolené"
 msgstr[2] " položiek zvolených"
 
-#: src/summaryview.c:2680 src/summaryview.c:2723
+#: src/summaryview.c:2678 src/summaryview.c:2721
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nových, %d neprečítaných, %d celkovo (%s)"
 
-#: src/summaryview.c:2698
+#: src/summaryview.c:2696
 msgid "Message summary"
 msgstr "Zhrnutie správy"
 
-#: src/summaryview.c:2699
+#: src/summaryview.c:2697
 msgid "New:"
 msgstr "Nové:"
 
-#: src/summaryview.c:2700
+#: src/summaryview.c:2698
 msgid "Unread:"
 msgstr "Neprečítané:"
 
-#: src/summaryview.c:2701
+#: src/summaryview.c:2699
 msgid "Total:"
 msgstr "Celkom:"
 
-#: src/summaryview.c:2703
+#: src/summaryview.c:2701
 msgid "Marked:"
 msgstr "Označené:"
 
-#: src/summaryview.c:2704
+#: src/summaryview.c:2702
 msgid "Replied:"
 msgstr "Odpovedané:"
 
-#: src/summaryview.c:2705
+#: src/summaryview.c:2703
 msgid "Forwarded:"
 msgstr "Poslané ďalej:"
 
-#: src/summaryview.c:2706
+#: src/summaryview.c:2704
 msgid "Locked:"
 msgstr "Zamknuté:"
 
-#: src/summaryview.c:2707
+#: src/summaryview.c:2705
 msgid "Ignored:"
 msgstr "Ignorované:"
 
-#: src/summaryview.c:2708
+#: src/summaryview.c:2706
 msgid "Watched:"
 msgstr "Sledované:"
 
-#: src/summaryview.c:2718
+#: src/summaryview.c:2716
 #, c-format
 msgid "%d/%d selected (%s/%s), %d unread"
 msgstr "%d/%d zvolených (%s/%s), %d neprečítaných"
 
-#: src/summaryview.c:3011
+#: src/summaryview.c:3009
 msgid "Sorting summary..."
 msgstr "Triedim zoznam správ…"
 
-#: src/summaryview.c:3150
+#: src/summaryview.c:3148
 msgid "Setting summary from message data..."
 msgstr "Vytváram zoznam správ…"
 
-#: src/summaryview.c:3355
+#: src/summaryview.c:3353
 msgid "(No Date)"
 msgstr "(Bez dátumu)"
 
-#: src/summaryview.c:3407
+#: src/summaryview.c:3405
 msgid "(No Recipient)"
 msgstr "(Žiadny príjemca)"
 
-#: src/summaryview.c:3442
+#: src/summaryview.c:3440
 #, c-format
 msgid "From: %s, on %s"
 msgstr "Od: %s, na %s"
 
-#: src/summaryview.c:3451
+#: src/summaryview.c:3449
 #, c-format
 msgid "To: %s, on %s"
 msgstr "Komu: %s, na %s"
 
-#: src/summaryview.c:4280
+#: src/summaryview.c:4314
 msgid "You're not the author of the article.\n"
 msgstr "Nie ste autorom tohoto príspevku.\n"
 
-#: src/summaryview.c:4370
+#: src/summaryview.c:4404
 #, c-format
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the %d selected messages?"
@@ -18467,64 +18483,64 @@ msgstr[0] "Naozaj chcete zmazať zvolenú správu?"
 msgstr[1] "Naozaj chcete zmazať %d zvolené správy?"
 msgstr[2] "Naozaj chcete zmazať %d zvolených správ?"
 
-#: src/summaryview.c:4373
+#: src/summaryview.c:4407
 msgid "Delete message"
 msgid_plural "Delete messages"
 msgstr[0] "Zmazať správu"
 msgstr[1] "Zmazať správy"
 msgstr[2] "Zmazať správy"
 
-#: src/summaryview.c:4537
+#: src/summaryview.c:4571
 msgid "Destination is same as current folder."
 msgstr "Cieľ je rovnaký ako aktuálna zložka."
 
-#: src/summaryview.c:4638
+#: src/summaryview.c:4677
 msgid "Destination to copy is same as current folder."
 msgstr "Cieľ kopírovania je rovnaký ako aktuálna zložka."
 
-#: src/summaryview.c:4803
+#: src/summaryview.c:4847
 msgid "Append or Overwrite"
 msgstr "Pripojiť alebo prepísať"
 
-#: src/summaryview.c:4804
+#: src/summaryview.c:4848
 msgid "Append or overwrite existing file?"
 msgstr "Pripojiť alebo prepísať existujúci súbor?"
 
-#: src/summaryview.c:4805
+#: src/summaryview.c:4849
 msgid "_Append"
 msgstr "Pri_pojiť"
 
-#: src/summaryview.c:4805
+#: src/summaryview.c:4849
 msgid "_Overwrite"
 msgstr "_Prepísať"
 
-#: src/summaryview.c:4846
+#: src/summaryview.c:4890
 #, c-format
 msgid ""
 "You are about to print %d messages, one by one. Do you want to continue?"
 msgstr "Chystáte sa vytlačiť %d správ, jednu po druhej. Prajete si pokračovať?"
 
-#: src/summaryview.c:5306
+#: src/summaryview.c:5348
 msgid "Building threads..."
 msgstr "Vytváram vlákna…"
 
-#: src/summaryview.c:5554
+#: src/summaryview.c:5596
 msgid "Skip these rules"
 msgstr "Preskočiť tieto pravidlá"
 
-#: src/summaryview.c:5557
+#: src/summaryview.c:5599
 msgid "Apply these rules regardless of the account they belong to"
 msgstr "Použiť tieto pravidlá bez ohľadu na to, ku ktorému účtu patria"
 
-#: src/summaryview.c:5560
+#: src/summaryview.c:5602
 msgid "Apply these rules if they apply to the current account"
 msgstr "Použiť tieto pravidlá bez ohľadu na to, či patria k aktívnemu účtu"
 
-#: src/summaryview.c:5589
+#: src/summaryview.c:5631
 msgid "Filtering"
 msgstr "Filtrovanie"
 
-#: src/summaryview.c:5590
+#: src/summaryview.c:5632
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
@@ -18532,55 +18548,55 @@ msgstr ""
 "Niektoré pravidlá patria konkrétnemu účtu.\n"
 "Prosím vyberte si, ako pristupovať k týmto pravidlám:"
 
-#: src/summaryview.c:5620
+#: src/summaryview.c:5662
 msgid "Filtering..."
 msgstr "Filtrujem…"
 
-#: src/summaryview.c:5699
+#: src/summaryview.c:5741
 msgid "Processing configuration"
 msgstr "Nastavenie spracovania"
 
-#: src/summaryview.c:6245
+#: src/summaryview.c:6287
 msgid "Ignored thread"
 msgstr "Ignorované vlákno"
 
-#: src/summaryview.c:6247
+#: src/summaryview.c:6289
 msgid "Watched thread"
 msgstr "Sledované vlákno"
 
-#: src/summaryview.c:6255
+#: src/summaryview.c:6297
 msgid "Replied but also forwarded - click to see reply"
 msgstr "Odpovedané, ale aj presmerované – kliknite na zobrazenie odpovede"
 
-#: src/summaryview.c:6257
+#: src/summaryview.c:6299
 msgid "Replied - click to see reply"
 msgstr "Odpovedané – kliknite na zobrazenie odpovede"
 
-#: src/summaryview.c:6269
+#: src/summaryview.c:6311
 msgid "To be moved"
 msgstr "Presunuté"
 
-#: src/summaryview.c:6271
+#: src/summaryview.c:6313
 msgid "To be copied"
 msgstr "Skopírované"
 
-#: src/summaryview.c:6283
+#: src/summaryview.c:6325
 msgid "Signed, has attachment(s)"
 msgstr "Podpísané, má prílohu(y)"
 
-#: src/summaryview.c:6287
+#: src/summaryview.c:6329
 msgid "Encrypted, has attachment(s)"
 msgstr "Zašifrované, má prílohu(y)"
 
-#: src/summaryview.c:6289
+#: src/summaryview.c:6331
 msgid "Encrypted"
 msgstr "Zašifrované"
 
-#: src/summaryview.c:6291
+#: src/summaryview.c:6333
 msgid "Has attachment(s)"
 msgstr "Má prílohu(y)"
 
-#: src/summaryview.c:7938
+#: src/summaryview.c:7990
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -18589,53 +18605,53 @@ msgstr ""
 "Chyba v regulárnom výraze:\n"
 "%s"
 
-#: src/summaryview.c:8041
+#: src/summaryview.c:8093
 msgid "Go back to the folder list (You have unread messages)"
 msgstr "Prejsť naspäť na zoznam zložiek (Máte neprečítané správy)"
 
-#: src/summaryview.c:8046
+#: src/summaryview.c:8098
 msgid "Go back to the folder list"
 msgstr "Prejsť naspäť na zoznam zložiek"
 
-#: src/textview.c:231
+#: src/textview.c:245
 msgid "_Open in web browser"
 msgstr "Otvoriť vo _webovom prehliadači"
 
-#: src/textview.c:232
+#: src/textview.c:246
 msgid "Copy this _link"
 msgstr "Kopírovať tento _odkaz"
 
-#: src/textview.c:239
+#: src/textview.c:253
 msgid "_Reply to this address"
 msgstr "_Odpovedať na túto adresu"
 
-#: src/textview.c:240
+#: src/textview.c:254
 msgid "Add to _Address book"
 msgstr "Pridať do _adresára"
 
-#: src/textview.c:241
+#: src/textview.c:255
 msgid "Copy this add_ress"
 msgstr "_Kopírovať túto adresu"
 
-#: src/textview.c:247
+#: src/textview.c:261
 msgid "_Open image"
 msgstr "_Otvoriť obrázok"
 
-#: src/textview.c:248
+#: src/textview.c:262
 msgid "_Save image..."
 msgstr "_Uložiť obrázok…"
 
-#: src/textview.c:722
+#: src/textview.c:724
 #, c-format
 msgid "[%s  %s (%d bytes)]"
 msgstr "[%s  %s (%d bajtov)]"
 
-#: src/textview.c:725
+#: src/textview.c:727
 #, c-format
 msgid "[%s (%d bytes)]"
 msgstr "[%s (%d bajtov)]"
 
-#: src/textview.c:915
+#: src/textview.c:917
 msgid ""
 "\n"
 "  This message can't be displayed.\n"
@@ -18649,68 +18665,68 @@ msgstr ""
 "\n"
 "Použite "
 
-#: src/textview.c:920
+#: src/textview.c:922
 msgid "'Network Log'"
 msgstr "„Záznam siete”"
 
-#: src/textview.c:921
+#: src/textview.c:923
 msgid " in the Tools menu for more information."
 msgstr " v menu Nástroje s ďalšími informáciami."
 
-#: src/textview.c:984
+#: src/textview.c:986
 msgid "  The following can be performed on this part\n"
 msgstr "  S touto časťou môžete urobiť\n"
 
-#: src/textview.c:986
+#: src/textview.c:988
 msgid "  by right-clicking the icon or list item:"
 msgstr "  pravým kliknutím na ikonu alebo položku zoznamu:"
 
-#: src/textview.c:990
+#: src/textview.c:992
 msgid "     - To save, select "
 msgstr "     – Ak ju chcete uložiť, zvoľte "
 
-#: src/textview.c:991
+#: src/textview.c:993
 msgid "'Save as...'"
 msgstr "„Uložiť ako…”"
 
-#: src/textview.c:993 src/textview.c:1005 src/textview.c:1017
-#: src/textview.c:1027
+#: src/textview.c:995 src/textview.c:1007 src/textview.c:1019
+#: src/textview.c:1029
 msgid " (Shortcut key: '"
 msgstr " (klávesová skratka: „"
 
-#: src/textview.c:1001
+#: src/textview.c:1003
 msgid "     - To display as text, select "
 msgstr "     – Ak ju chcete zobraziť ako text, vyberte "
 
-#: src/textview.c:1002
+#: src/textview.c:1004
 msgid "'Display as text'"
 msgstr "„Zobraziť ako text”"
 
-#: src/textview.c:1013
+#: src/textview.c:1015
 msgid "     - To open with an external program, select "
 msgstr "     – Ak ju chcete otvoriť v inej aplikácii, vyberte "
 
-#: src/textview.c:1014
+#: src/textview.c:1016
 msgid "'Open'"
 msgstr "„Otvoriť”"
 
-#: src/textview.c:1022
+#: src/textview.c:1024
 msgid "       (alternately double-click, or click the middle "
 msgstr "       (alebo dvojklik, alebo kliknutie stredným "
 
-#: src/textview.c:1023
+#: src/textview.c:1025
 msgid "mouse button)\n"
 msgstr "tlačidlom myši)\n"
 
-#: src/textview.c:1025
+#: src/textview.c:1027
 msgid "     - Or use "
 msgstr "     – Alebo použite"
 
-#: src/textview.c:1026
+#: src/textview.c:1028
 msgid "'Open with...'"
 msgstr "„Otvoriť pomocou…”"
 
-#: src/textview.c:1140
+#: src/textview.c:1146
 #, c-format
 msgid ""
 "The command to view attachment as text failed:\n"
@@ -18721,314 +18737,378 @@ msgstr ""
 "    %s\n"
 "Návratový kód %d\n"
 
-#: src/textview.c:2189
+#: src/textview.c:2197
 msgid "Tags: "
 msgstr "Značky: "
 
-#: src/textview.c:2895
+#: src/textview.c:2905
 msgid "The real URL is different from the displayed URL."
 msgstr "Skutočná URL sa líši od zobrazenej URL."
 
-#: src/textview.c:2896
+#: src/textview.c:2906
 msgid "Displayed URL:"
 msgstr "Zobrazená URL:"
 
-#: src/textview.c:2897
+#: src/textview.c:2907
 msgid "Real URL:"
 msgstr "Skutočná URL:"
 
-#: src/textview.c:2898
+#: src/textview.c:2908
 msgid "Open it anyway?"
 msgstr "Otvoriť i tak?"
 
-#: src/textview.c:2899
+#: src/textview.c:2909
 msgid "Phishing attempt warning"
 msgstr "Varovanie pred phishingovým podvodom"
 
-#: src/textview.c:2900
+#: src/textview.c:2910
 msgid "_Open URL"
 msgstr "_Otvoriť URL"
 
-#: src/toolbar.c:192 src/toolbar.c:1930
+#: src/toolbar.c:224 src/toolbar.c:2213
 msgid "Receive Mail from all Accounts"
 msgstr "Prijať správy zo všetkých účtov"
 
-#: src/toolbar.c:193 src/toolbar.c:1935
+#: src/toolbar.c:225 src/toolbar.c:2218
 msgid "Receive Mail from current Account"
 msgstr "Prijať poštu z aktuálneho účtu"
 
-#: src/toolbar.c:194 src/toolbar.c:1939
+#: src/toolbar.c:226 src/toolbar.c:2222
 msgid "Send Queued Messages"
 msgstr "Odoslať správy vo fronte"
 
-#: src/toolbar.c:195 src/toolbar.c:905 src/toolbar.c:1957 src/toolbar.c:1968
+#: src/toolbar.c:227 src/toolbar.c:952 src/toolbar.c:2240 src/toolbar.c:2251
 msgid "Compose Email"
 msgstr "Nová správa"
 
-#: src/toolbar.c:196
+#: src/toolbar.c:228
 msgid "Compose News"
 msgstr "Nový príspevok News"
 
-#: src/toolbar.c:197 src/toolbar.c:1996 src/toolbar.c:2006
+#: src/toolbar.c:229 src/toolbar.c:2295 src/toolbar.c:2305
 msgid "Reply to Message"
 msgstr "Odpovedať na správu"
 
-#: src/toolbar.c:198 src/toolbar.c:2013 src/toolbar.c:2023
+#: src/toolbar.c:230 src/toolbar.c:2312 src/toolbar.c:2322
 msgid "Reply to Sender"
 msgstr "Odpovedať odosielateľovi"
 
-#: src/toolbar.c:199 src/toolbar.c:2030 src/toolbar.c:2040
+#: src/toolbar.c:231 src/toolbar.c:2329 src/toolbar.c:2339
 msgid "Reply to All"
 msgstr "Odpovedať odosielateľovi i všetkým príjemcom"
 
-#: src/toolbar.c:200 src/toolbar.c:2047 src/toolbar.c:2057
+#: src/toolbar.c:232 src/toolbar.c:2346 src/toolbar.c:2356
 msgid "Reply to Mailing-list"
 msgstr "Odpovedať do diskusnej skupiny"
 
-#: src/toolbar.c:201 src/toolbar.c:1951
+#: src/toolbar.c:233 src/toolbar.c:2234
 msgid "Open email"
 msgstr "Otvoriť správu"
 
-#: src/toolbar.c:202 src/toolbar.c:2064 src/toolbar.c:2075
+#: src/toolbar.c:234 src/toolbar.c:2363 src/toolbar.c:2374
 msgid "Forward Message"
 msgstr "Poslať správu ďalej"
 
-#: src/toolbar.c:203 src/toolbar.c:2080
+#: src/toolbar.c:235 src/toolbar.c:2379
 msgid "Trash Message"
 msgstr "Presunúť správu do koša"
 
-#: src/toolbar.c:204 src/toolbar.c:2084
+#: src/toolbar.c:236 src/toolbar.c:2383
 msgid "Delete Message"
 msgstr "Zmazať správu"
 
-#: src/toolbar.c:206 src/toolbar.c:2092
+#: src/toolbar.c:237
+msgid "Delete duplicate messages"
+msgstr "Zmazať duplikované správy"
+
+#: src/toolbar.c:239 src/toolbar.c:2391
 msgid "Go to Previous Unread Message"
 msgstr "Prejsť na predošlú neprečítanú správu"
 
-#: src/toolbar.c:207 src/toolbar.c:2096
+#: src/toolbar.c:240 src/toolbar.c:2395
 msgid "Go to Next Unread Message"
 msgstr "Prejsť na ďalšiu neprečítanú správu"
 
-#: src/toolbar.c:210 src/toolbar.c:421
+#: src/toolbar.c:244
+msgid "Mark Message"
+msgstr "Označiť správu"
+
+#: src/toolbar.c:245
+msgid "Unmark Message"
+msgstr "Zrušiť označenie správy"
+
+#: src/toolbar.c:246
+msgid "Lock Message"
+msgstr "Zamknúť správu"
+
+#: src/toolbar.c:247
+msgid "Unlock Message"
+msgstr "Odomknúť správu"
+
+#: src/toolbar.c:248
+msgid "Mark all Messages as read"
+msgstr "Označiť všetky správy ako prečítané"
+
+#: src/toolbar.c:249
+msgid "Mark all Messages as unread"
+msgstr "Označiť všetky správy ako neprečítané"
+
+#: src/toolbar.c:250
+msgid "Mark Message as read"
+msgstr "Označiť správu ako prečítanú"
+
+#: src/toolbar.c:251
+msgid "Mark Message as unread"
+msgstr "Označiť správu ako neprečítanú"
+
+#: src/toolbar.c:253 src/toolbar.c:511
 msgid "Print"
 msgstr "Tlačiť"
 
-#: src/toolbar.c:211
+#: src/toolbar.c:254
 msgid "Learn Spam or Ham"
 msgstr "Učiť sa ako SPAM alebo nie SPAM"
 
-#: src/toolbar.c:212
+#: src/toolbar.c:255
 msgid "Open folder/Go to folder list"
 msgstr "Otvoriť zložku/Prejsť na zoznam zložiek"
 
-#: src/toolbar.c:215 src/toolbar.c:2102
+#: src/toolbar.c:258 src/toolbar.c:2401
 msgid "Send Message"
 msgstr "Odoslať správu"
 
-#: src/toolbar.c:216 src/toolbar.c:2106
+#: src/toolbar.c:259 src/toolbar.c:2405
 msgid "Put into queue folder and send later"
 msgstr "Zaradiť správu do fronty a odoslať neskôr"
 
-#: src/toolbar.c:217 src/toolbar.c:2110
+#: src/toolbar.c:260 src/toolbar.c:2409
 msgid "Save to draft folder"
 msgstr "Uložiť medzi koncepty"
 
-#: src/toolbar.c:218 src/toolbar.c:2114
+#: src/toolbar.c:261 src/toolbar.c:2413
 msgid "Insert file"
 msgstr "Vložiť súbor"
 
-#: src/toolbar.c:219 src/toolbar.c:2118
+#: src/toolbar.c:262 src/toolbar.c:2417
 msgid "Attach file"
 msgstr "Pripojiť súbor"
 
-#: src/toolbar.c:220 src/toolbar.c:2122
+#: src/toolbar.c:263 src/toolbar.c:2421
 msgid "Insert signature"
 msgstr "Vložiť podpis"
 
-#: src/toolbar.c:221 src/toolbar.c:2126
+#: src/toolbar.c:264 src/toolbar.c:2425
 msgid "Replace signature"
 msgstr "Nahradiť podpis"
 
-#: src/toolbar.c:222 src/toolbar.c:2130
+#: src/toolbar.c:265 src/toolbar.c:2429
 msgid "Edit with external editor"
 msgstr "Upraviť pomocou externého editoru"
 
-#: src/toolbar.c:223 src/toolbar.c:2134
+#: src/toolbar.c:266 src/toolbar.c:2433
 msgid "Wrap long lines of current paragraph"
 msgstr "Zalomiť dlhé riadky aktuálneho odstavca"
 
-#: src/toolbar.c:224 src/toolbar.c:2138
+#: src/toolbar.c:267 src/toolbar.c:2437
 msgid "Wrap all long lines"
 msgstr "Zalomiť všetky dlhé riadky"
 
-#: src/toolbar.c:227 src/toolbar.c:440 src/toolbar.c:2147
+#: src/toolbar.c:270 src/toolbar.c:528 src/toolbar.c:2446
 msgid "Check spelling"
 msgstr "Skontrolovať preklepy"
 
-#: src/toolbar.c:229
+#: src/toolbar.c:272
 msgid "Claws Mail Actions Feature"
 msgstr "Akcie Claws Mail"
 
-#: src/toolbar.c:230 src/toolbar.c:2163
+#: src/toolbar.c:273 src/toolbar.c:2462
 msgid "Cancel receiving"
 msgstr "Prerušiť príjem"
 
-#: src/toolbar.c:232 src/toolbar.c:2171
+#: src/toolbar.c:275 src/toolbar.c:2470
 msgid "Cancel receiving/sending"
 msgstr "Zrušiť prijímanie/odosielanie"
 
-#: src/toolbar.c:233 src/toolbar.c:1943
+#: src/toolbar.c:276 src/toolbar.c:2226
 msgid "Close window"
 msgstr "Zatvoriť okno"
 
-#: src/toolbar.c:235
+#: src/toolbar.c:278
 msgid "Claws Mail Plugins"
 msgstr "Zásuvné moduly Claws Mail"
 
-#: src/toolbar.c:379 src/toolbar.c:414
+#: src/toolbar.c:442 src/toolbar.c:493
 msgctxt "Toolbar"
 msgid "Trash"
 msgstr "Kôš"
 
-#: src/toolbar.c:402
-msgid "Folders"
-msgstr "Zložky"
-
-#: src/toolbar.c:404
+#: src/toolbar.c:482
 msgid "Get Mail"
 msgstr "Prijať poštu"
 
-#: src/toolbar.c:405
+#: src/toolbar.c:483
 msgid "Get"
 msgstr "Získať"
 
-#: src/toolbar.c:407 src/toolbar.c:408
+#: src/toolbar.c:485 src/toolbar.c:486
 msgctxt "Toolbar"
 msgid "Compose"
 msgstr "Napísať"
 
-#: src/toolbar.c:410
-msgid "All"
-msgstr "Všetkým"
-
-#: src/toolbar.c:411
+#: src/toolbar.c:488
 msgctxt "Toolbar"
 msgid "Sender"
 msgstr "Odosielateľ"
 
-#: src/toolbar.c:412
+#: src/toolbar.c:489
+msgid "All"
+msgstr "Všetkým"
+
+#: src/toolbar.c:490
 msgid "List"
 msgstr "Do diskusie"
 
-#: src/toolbar.c:417
+#: src/toolbar.c:495 src/toolbar.c:2279 src/toolbar.c:2288
+msgid "Delete duplicates"
+msgstr "Zmazať duplikáty"
+
+#: src/toolbar.c:497
 msgid "Prev"
 msgstr "Predošlá"
 
-#: src/toolbar.c:418
+#: src/toolbar.c:498
 msgid "Next"
 msgstr "Ďalšia"
 
-#: src/toolbar.c:426
+#: src/toolbar.c:506
+msgid "All read"
+msgstr "Všetky prečítané"
+
+#: src/toolbar.c:507
+msgid "All unread"
+msgstr "Všetky neprečítané"
+
+#: src/toolbar.c:508
+msgid "Read"
+msgstr "Prečítané"
+
+#: src/toolbar.c:513
+msgid "Folders"
+msgstr "Zložky"
+
+#: src/toolbar.c:518
 msgid "Draft"
 msgstr "Koncept"
 
-#: src/toolbar.c:429
+#: src/toolbar.c:521
 msgid "Insert sig."
 msgstr "Vložiť podpis"
 
-#: src/toolbar.c:430
+#: src/toolbar.c:522
 msgid "Replace sig."
 msgstr "Nahradiť podpis"
 
-#: src/toolbar.c:431
+#: src/toolbar.c:523
 msgid "Edit"
 msgstr "Upraviť"
 
-#: src/toolbar.c:432
+#: src/toolbar.c:524
 msgid "Wrap para."
 msgstr "Zalomiť odstavec"
 
-#: src/toolbar.c:433
+#: src/toolbar.c:525
 msgid "Wrap all"
 msgstr "Zalomiť"
 
-#: src/toolbar.c:435 src/toolbar.c:436
+#: src/toolbar.c:531 src/toolbar.c:532
 msgid "Stop"
 msgstr "Zastaviť"
 
-#: src/toolbar.c:437
+#: src/toolbar.c:533
 msgid "Stop all"
 msgstr "Zastaviť všetko"
 
-#: src/toolbar.c:897
+#: src/toolbar.c:944
 msgid "Compose News message"
 msgstr "Napísať príspevok"
 
-#: src/toolbar.c:936
+#: src/toolbar.c:983
 msgid "Learn spam"
 msgstr "Naučiť ako spam"
 
-#: src/toolbar.c:945
+#: src/toolbar.c:992
 msgid "Ham"
 msgstr "Nie spam"
 
-#: src/toolbar.c:947
+#: src/toolbar.c:994
 msgid "Learn ham"
 msgstr "Naučiť ako nie spam"
 
-#: src/toolbar.c:1925
+#: src/toolbar.c:2208
 msgid "Go to folder list"
 msgstr "Prejsť na zoznam zložiek"
 
-#: src/toolbar.c:1931
+#: src/toolbar.c:2214
 msgid "Receive Mail from selected Account"
 msgstr "Prijať poštu zo zvoleného účtu"
 
-#: src/toolbar.c:1947
+#: src/toolbar.c:2230
 msgid "Open preferences"
 msgstr "Otvoriť nastavenia"
 
-#: src/toolbar.c:1958
+#: src/toolbar.c:2241
 msgid "Compose with selected Account"
 msgstr "Napísať správu zo zvoleného účtu"
 
-#: src/toolbar.c:1979
+#: src/toolbar.c:2262
 msgid "Learn as..."
 msgstr "Naučiť ako…"
 
-#: src/toolbar.c:1989
+#: src/toolbar.c:2272
 msgid "Learn as _Spam"
 msgstr "Naučiť ako _spam"
 
-#: src/toolbar.c:1990
+#: src/toolbar.c:2273
 msgid "Learn as _Ham"
 msgstr "Naučiť ako _nie spam"
 
-#: src/toolbar.c:1997
+#: src/toolbar.c:2280
+msgid "Delete duplicates options"
+msgstr "Voľby mazania duplikátov"
+
+#: src/toolbar.c:2284
+msgid "Delete duplicates in selected folder"
+msgstr "Zmazať duplikáty v zvolenej zložke"
+
+#: src/toolbar.c:2285
+msgid "Delete duplicates in all folders"
+msgstr "Zmazať duplikáty vo všetkých zložkách"
+
+#: src/toolbar.c:2296
 msgid "Reply to Message options"
 msgstr "Voľby Odpovede na správu"
 
-#: src/toolbar.c:2001 src/toolbar.c:2018 src/toolbar.c:2035 src/toolbar.c:2052
+#: src/toolbar.c:2300 src/toolbar.c:2317 src/toolbar.c:2334 src/toolbar.c:2351
 msgid "_Reply with quote"
 msgstr "Odpovedať s _citáciou"
 
-#: src/toolbar.c:2002 src/toolbar.c:2019 src/toolbar.c:2036 src/toolbar.c:2053
+#: src/toolbar.c:2301 src/toolbar.c:2318 src/toolbar.c:2335 src/toolbar.c:2352
 msgid "Reply without _quote"
 msgstr "_Odpovedať bez citácie"
 
-#: src/toolbar.c:2014
+#: src/toolbar.c:2313
 msgid "Reply to Sender options"
 msgstr "Voľby Odpoveď odosielateľovi"
 
-#: src/toolbar.c:2031
+#: src/toolbar.c:2330
 msgid "Reply to All options"
 msgstr "Voľby Odpovedať všetkým"
 
-#: src/toolbar.c:2048
+#: src/toolbar.c:2347
 msgid "Reply to Mailing-list options"
 msgstr "Voľby Odpovede do emailovej konferencie"
 
-#: src/toolbar.c:2065
+#: src/toolbar.c:2364
 msgid "Forward Message options"
 msgstr "Voľby Poslania správy ďalej"
 
@@ -19059,7 +19139,7 @@ msgid "Welcome to Claws Mail"
 msgstr "Víta vás Claws Mail"
 
 #: src/wizard.c:544
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Welcome to Claws Mail\n"
@@ -19088,7 +19168,7 @@ msgid ""
 "-----------\n"
 "Homepage:      <%s>\n"
 "Manual:        <%s>\n"
-"FAQ:\t       <%s>\n"
+"FAQ:           <%s>\n"
 "Themes:        <%s>\n"
 "Mailing Lists: <%s>\n"
 "\n"
@@ -19109,17 +19189,17 @@ msgstr ""
 "Víta vás Claws Mail\n"
 "-----------------------\n"
 "\n"
-"Teraz, keď už máte nastavený svoj poštový účet, môžete prijať\n"
-"svoju poštu kliknutím na tlačidlo „Prijať poštu” na ľavej strane\n"
+"Teraz, po nastavení svojho poštového účtu, môžete prijať svoju\n"
+"poštu kliknutím na tlačidlo „Prijať poštu” na ľavej strane\n"
 "panela nástrojov.\n"
 "\n"
-"Claws Mail má množstvo dodatočných funkcií dostupných\n"
-"pomocou zásuvných modulov, napríklad kontrolu spamu (Bogofilter\n"
-"a SpamAssassin), ochranu súkromia (PGP/Mime), čítačku RSS,\n"
-"kalendár a iné. Zásuvné moduly môžete začať používať\n"
-"pomocou menu „Nastavenie/Zásuvné moduly”.\n"
+"Claws Mail má množstvo dodatočných funkcií dostupných pomocou\n"
+"zásuvných modulov, napríklad na kontrolu spamu (Bogofilter\n"
+"alebo SpamAssassin), ochranu súkromia (PGP/Mime), čítačku RSS,\n"
+"kalendár a veľa iných. Zásuvné moduly môžete načítať pomocou\n"
+"položky menu „Nastavenie/Zásuvné moduly”.\n"
 "\n"
-"Nastavenie svojho účtu môžete upraviť pomocou položky menu\n"
+"Nastavenia svojho účtu môžete upraviť pomocou položky menu\n"
 "„Nastavenie/Nastavenie aktívneho účtu” a všeobecné nastavenia\n"
 "môžete zmeniť pomocou položky „Nastavenie/Nastavenia”.\n"
 "\n"
@@ -19132,22 +19212,21 @@ msgstr ""
 "Domovská stránka: <%s>\n"
 "Manuál:           <%s>\n"
 "FAQ:              <%s>\n"
-"Témy:          <%s>\n"
+"Témy:             <%s>\n"
 "Diskusné skupiny: <%s>\n"
 "\n"
 "LICENCIA\n"
 "--------\n"
-"Claws Mail je voľne šíriteľný softvér vydaný pod podmienkami\n"
-"licencie GNU General Public License, verzia 3 alebo novšia tak,\n"
+"Claws Mail je slobodný softvér vydaný za podmienok\n"
+"GNU General Public License, verzia 3 alebo novšej tak,\n"
 "ako bola publikovaná nadáciou Free Software Foundation,\n"
-"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. Túto\n"
-"licenciu nájdete na adrese <%s>,\n"
+"Túto licenciu nájdete na adrese <%s>,\n"
 "jej Slovenský preklad na adrese <http://www.gnu.sk>.\n"
 "\n"
 "PRÍSPEVKY\n"
 "---------\n"
 "Ak si prajete finančne prispieť na projekt Claws Mail, môžete tak\n"
-" učiniť na adrese <%s>.\n"
+"učiniť na adrese <%s>.\n"
 "\n"
 
 #: src/wizard.c:619
@@ -19225,19 +19304,16 @@ msgid "SMTP password:"
 msgstr "Heslo SMTP:"
 
 #: src/wizard.c:1165
-#, fuzzy
 msgid "Use SSL/TLS to connect to SMTP server"
-msgstr "Použiť SSL na pripojenie k serveru SMTP"
+msgstr "Použiť SSL/TLS na pripojenie k serveru SMTP"
 
 #: src/wizard.c:1176 src/wizard.c:1596
-#, fuzzy
 msgid "Use STARTTLS command to start encryption"
-msgstr "Použiť príkaz STARTTLS na nadviazanie relácie SSL"
+msgstr "Použiť príkaz STARTTLS na začatie šifrovania"
 
 #: src/wizard.c:1188 src/wizard.c:1608
-#, fuzzy
 msgid "Client SSL/TLS certificate (optional)"
-msgstr "Klientský SSL certifikát (voliteľné)"
+msgstr "Certifikát SSL/TLS klienta (voliteľné)"
 
 #: src/wizard.c:1256 src/wizard.c:1288 src/wizard.c:1543
 msgid "Server address:"
@@ -19263,9 +19339,8 @@ msgstr ""
 "Číslo portu môžete zadať tak, že ho pridáte na koniec: „mail.priklad.sk:110”"
 
 #: src/wizard.c:1585
-#, fuzzy
 msgid "Use SSL/TLS to connect to receiving server"
-msgstr "Použiť SSL na pripojenie k serveru prijímania"
+msgstr "Použiť SSL/TLS na pripojenie k serveru prijímania"
 
 #: src/wizard.c:1650
 msgid "IMAP server directory:"