talons

commit ea7cdb2fcb8379290c8e7ecfc701da308a3f212c
parent 675e2663af0cbd6cc1f2a0b30ee6044bc04d4e8c
Author: Paul <paul@claws-mail.org>
Date:   Thu, 20 Feb 2020 10:58:44 +0000

updated Slovak translation by Slavko

Diffstat:
M
po/sk.po
 | 
8188
+++++++++++++++++++++++++++++++++++++++++--------------------------------------

1 file changed, 4258 insertions(+), 3930 deletions(-)
diff --git a/po/sk.po b/po/sk.po
@@ -2,24 +2,24 @@
 # 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, 2017.
+# Slavko <linux@slavino.sk>, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: claws-mail 3.15.1\n"
+"Project-Id-Version: claws-mail 3.17.0\n"
 "Report-Msgid-Bugs-To: paul@claws-mail.org\n"
-"POT-Creation-Date: 2017-12-10 00:07+0000\n"
-"PO-Revision-Date: 2017-12-10 19:12+0100\n"
+"POT-Creation-Date: 2020-02-11 15:14+0000\n"
+"PO-Revision-Date: 2020-02-19 20:29+0100\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"
-"X-Generator: Gtranslator 2.91.7\n"
+"X-Generator: Poedit 2.3\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: src/account.c:395 src/account.c:462
+#: src/account.c:402 src/account.c:469
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing accounts."
@@ -28,15 +28,15 @@ msgstr ""
 "Prosím zatvorte všetky tieto okná predtým, ako začnete meniť nastavenia "
 "účtov."
 
-#: src/account.c:440
+#: src/account.c:447
 msgid "Can't create folder."
 msgstr "Nemožno vytvoriť zložku."
 
-#: src/account.c:727
+#: src/account.c:735
 msgid "Edit accounts"
 msgstr "Upraviť účty"
 
-#: src/account.c:744
+#: src/account.c:752
 msgid ""
 "Using 'Get Mail' will retrieve messages from your Accounts in the order "
 "given, the checkbox indicates which accounts will be included. Bold text "
@@ -46,60 +46,61 @@ msgstr ""
 "zaškrtnutie poľa v stĺpci „G” určuje ktoré účty budú zahrnuté. Predvolený "
 "účet je označený tučným písmom."
 
-#: src/account.c:815
+#: src/account.c:823
 msgid " _Set as default account "
 msgstr " _Nastaviť ako predvolený účet "
 
-#: src/account.c:907
+#: src/account.c:915
 msgid "Accounts with remote folders cannot be copied."
 msgstr "Účty so vzdialenými zložkami nemožno kopírovať."
 
-#: src/account.c:914
+#: src/account.c:922
 #, c-format
 msgid "Copy of %s"
 msgstr "Kópia %s"
 
-#: src/account.c:1097
+#: src/account.c:1119
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Naozaj chcete odstrániť účet „%s”?"
 
-#: src/account.c:1099
+#: src/account.c:1121
 msgid "(Untitled)"
 msgstr "(Bez názvu)"
 
-#: src/account.c:1100
+#: src/account.c:1122
 msgid "Delete account"
 msgstr "Zmazať účet"
 
-#: src/account.c:1590
+#: src/account.c:1596
 msgctxt "Accounts List Get Column Name"
 msgid "G"
-msgstr " "
+msgstr "G"
 
-#: src/account.c:1596
+#: src/account.c:1602
 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:1603 src/addrduplicates.c:471 src/addressadd.c:215
-#: src/addressbook.c:125 src/compose.c:7424 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:1803
-#: src/plugins/pgpcore/select-keys.c:409 src/prefs_filtering.c:384
-#: src/prefs_filtering.c:1870 src/prefs_template.c:79
+#: src/account.c:1609 src/addrduplicates.c:472 src/addressadd.c:223
+#: src/addressbook.c:128 src/compose.c:7473 src/editaddress.c:1474
+#: src/editaddress.c:1503 src/editaddress.c:1519
+#: src/editaddress_other_attributes_ldap.c:371
+#: src/editaddress_other_attributes_ldap.c:392 src/editbook.c:171
+#: src/editgroup.c:290 src/editjpilot.c:257 src/editldap.c:428
+#: src/editvcard.c:174 src/importmutt.c:223 src/importpine.c:222
+#: src/mimeview.c:304 src/plugins/managesieve/sieve_manager.c:470
+#: src/plugins/pdf_viewer/poppler_viewer.c:1846
+#: src/plugins/pgpcore/select-keys.c:464 src/prefs_filtering.c:385
+#: src/prefs_filtering.c:1875 src/prefs_summaries.c:477 src/prefs_template.c:79
+#: src/prefs_themes.c:990
 msgid "Name"
 msgstr "Meno"
 
-#: src/account.c:1611 src/prefs_account.c:1108 src/prefs_account.c:4241
+#: src/account.c:1617 src/prefs_account.c:1199 src/prefs_account.c:4624
 msgid "Protocol"
 msgstr "Protokol"
 
-#: src/account.c:1619 src/ssl_manager.c:100
+#: src/account.c:1625 src/ssl_manager.c:109
 msgid "Server"
 msgstr "Server"
 
@@ -126,11 +127,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:719
+#: src/action.c:728
 msgid "There is no filtering action set"
 msgstr "Nie je nastavená žiadna akcia filtra"
 
-#: src/action.c:721
+#: src/action.c:730
 #, c-format
 msgid ""
 "Invalid filtering action(s):\n"
@@ -139,7 +140,7 @@ msgstr ""
 "Neplatné akcie filtra:\n"
 "%s"
 
-#: src/action.c:986
+#: src/action.c:997
 #, c-format
 msgid ""
 "Could not fork to execute the following command:\n"
@@ -150,34 +151,35 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: 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:1823
+#: src/action.c:999 src/compose.c:5262 src/compose.c:5267 src/ldaputil.c:333
+#: src/plugins/bogofilter/bogofilter.c:858
+#: src/plugins/tnef_parse/tnef_parse.c:76
 #: src/plugins/vcalendar/vcal_folder.c:1827
-#: src/plugins/vcalendar/vcal_folder.c:1840
-#: src/plugins/vcalendar/vcal_folder.c:1843 src/privacy.c:62
+#: src/plugins/vcalendar/vcal_folder.c:1831
+#: src/plugins/vcalendar/vcal_folder.c:1849
+#: src/plugins/vcalendar/vcal_folder.c:1852 src/privacy.c:62
 msgid "Unknown error"
 msgstr "Neznáma chyba"
 
-#: src/action.c:1206 src/action.c:1371
+#: src/action.c:1218 src/action.c:1390
 msgid "Completed"
 msgstr "Dokončené"
 
-#: src/action.c:1242
+#: src/action.c:1254
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- Bežiace: %s\n"
 
-#: src/action.c:1246
+#: src/action.c:1258
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Ukončené: %s\n"
 
-#: src/action.c:1279
+#: src/action.c:1304
 msgid "Action's input/output"
 msgstr "Akcie vstupu/výstupu"
 
-#: src/action.c:1607
+#: src/action.c:1636
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -188,11 +190,11 @@ msgstr ""
 "(„%%h” bude nahradené parametrom)\n"
 "  %s"
 
-#: src/action.c:1612
+#: src/action.c:1641
 msgid "Action's hidden user argument"
 msgstr "Skrytý používateľský parameter akcie"
 
-#: src/action.c:1616
+#: src/action.c:1645
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -203,24 +205,24 @@ msgstr ""
 "(„%%u” bude nahradené parametrom)\n"
 "  %s"
 
-#: src/action.c:1621
+#: src/action.c:1650
 msgid "Action's user argument"
 msgstr "Používateľský parameter"
 
-#: src/addrclip.c:480
+#: src/addrclip.c:481
 msgid "Cannot copy a folder to itself or to its sub-structure."
 msgstr "Nie je možné kopírovať zložku do seba samej alebo do jej potomka."
 
-#: src/addrclip.c:503
+#: src/addrclip.c:504
 msgid "Cannot copy an address book to itself."
 msgstr "Nie je možné adresár do seba samého."
 
-#: src/addrclip.c:594
+#: src/addrclip.c:595
 msgid "Cannot move a folder to itself or to its sub-structure."
 msgstr "Nie je možné presunúť zložku do so samej seba alebo jej potomka."
 
-#: src/addr_compl.c:689 src/addressbook.c:4945
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:308
+#: src/addr_compl.c:689 src/addressbook.c:5018
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:309
 msgid "Group"
 msgstr "Skupina"
 
@@ -260,31 +262,31 @@ msgstr "fax"
 msgid "website"
 msgstr "webová stránka"
 
-#: src/addrcustomattr.c:141
+#: src/addrcustomattr.c:146
 msgid "Attribute name"
 msgstr "Meno atribútu"
 
-#: src/addrcustomattr.c:156
+#: src/addrcustomattr.c:161
 msgid "Delete all attribute names"
 msgstr "Zmazať všetky mená atribútov"
 
-#: src/addrcustomattr.c:157
+#: src/addrcustomattr.c:162
 msgid "Do you really want to delete all attribute names?"
 msgstr "Naozaj chcete zmazať všetky mená atribútov?"
 
-#: src/addrcustomattr.c:181
+#: src/addrcustomattr.c:186
 msgid "Delete attribute name"
 msgstr "Zmazať meno atribútu"
 
-#: src/addrcustomattr.c:182
+#: src/addrcustomattr.c:187
 msgid "Do you really want to delete this attribute name?"
 msgstr "Naozaj chcete zmazať meno tohoto atribútu?"
 
-#: src/addrcustomattr.c:191
+#: src/addrcustomattr.c:196
 msgid "Reset to default"
 msgstr "Nastaviť na predvolené"
 
-#: src/addrcustomattr.c:192
+#: src/addrcustomattr.c:197
 msgid ""
 "Do you really want to replace all attribute names\n"
 "with the default set?"
@@ -292,36 +294,36 @@ msgstr ""
 "Naozaj chcete nahradiť všetky mená atribútov\n"
 "predvoleným nastavením?"
 
-#: src/addrcustomattr.c:212 src/addressbook.c:438 src/addressbook.c:466
-#: src/addressbook.c:483 src/edittags.c:279
-#: src/plugins/archive/archiver_gtk.c:1307 src/prefs_actions.c:1084
-#: src/prefs_filtering.c:1697 src/prefs_template.c:1111
+#: src/addrcustomattr.c:217 src/addressbook.c:438 src/addressbook.c:467
+#: src/addressbook.c:484 src/edittags.c:286
+#: src/plugins/archive/archiver_gtk.c:1313 src/prefs_actions.c:1086
+#: src/prefs_filtering.c:1700 src/prefs_template.c:1112
 msgid "_Delete"
 msgstr "O_dstrániť"
 
-#: src/addrcustomattr.c:213 src/edittags.c:280 src/prefs_actions.c:1085
-#: src/prefs_filtering.c:1698 src/prefs_template.c:1112
+#: src/addrcustomattr.c:218 src/edittags.c:287 src/prefs_actions.c:1087
+#: src/prefs_filtering.c:1701 src/prefs_template.c:1113
 msgid "Delete _all"
 msgstr "Zm_azať všetko"
 
-#: src/addrcustomattr.c:214
+#: src/addrcustomattr.c:219
 msgid "_Reset to default"
 msgstr "Nastaviť na p_redvolené"
 
-#: src/addrcustomattr.c:403
+#: src/addrcustomattr.c:410
 msgid "Attribute name is not set."
 msgstr "Nie je nastavené meno atribútu."
 
-#: src/addrcustomattr.c:462
+#: src/addrcustomattr.c:469
 msgctxt "Dialog title"
 msgid "Edit attribute names"
 msgstr "Upraviť meno atribútu"
 
-#: src/addrcustomattr.c:476
+#: src/addrcustomattr.c:483
 msgid "New attribute name:"
 msgstr "Nové meno atribútu:"
 
-#: src/addrcustomattr.c:513
+#: src/addrcustomattr.c:520
 msgid ""
 "Adding or removing attribute names won't affect attributes already set for "
 "contacts."
@@ -350,63 +352,64 @@ msgstr "Claws Mail teraz vyhľadá duplicitné emailové adresy v adresári."
 msgid "No duplicate email addresses found in the address book"
 msgstr "V adresári neboli nájdené žiadne duplicitné adresy"
 
-#: src/addrduplicates.c:346
+#: src/addrduplicates.c:347
 msgid "Duplicate email addresses"
 msgstr "Duplicitné adresy"
 
-#: src/addrduplicates.c:442 src/addressadd.c:227
-#: src/plugins/pgpcore/select-keys.c:410 src/toolbar.c:529
+#: src/addrduplicates.c:443 src/addressadd.c:235
+#: src/plugins/pgpcore/select-keys.c:470 src/prefs_summaries.c:478
+#: src/toolbar.c:529
 msgid "Address"
 msgstr "Adresa"
 
-#: src/addrduplicates.c:464
+#: src/addrduplicates.c:465
 msgid "Address book path"
 msgstr "Cesta k adresáru"
 
-#: src/addrduplicates.c:793 src/addressbook.c:1439 src/addressbook.c:1492
+#: src/addrduplicates.c:791 src/addressbook.c:1445 src/addressbook.c:1498
 msgid "Delete address(es)"
 msgstr "Zmazať adresu(y)"
 
-#: src/addrduplicates.c:794 src/addressbook.c:1493
+#: src/addrduplicates.c:792 src/addressbook.c:1499
 msgid "Really delete the address(es)?"
 msgstr "Naozaj odstrániť adresu(y)?"
 
-#: src/addrduplicates.c:842
+#: src/addrduplicates.c:841
 msgid "Delete address"
 msgstr "Zmazať adresu"
 
-#: src/addrduplicates.c:843 src/addressbook.c:1440
+#: src/addrduplicates.c:842 src/addressbook.c:1446
 msgid "This address data is readonly and cannot be deleted."
 msgstr "Tieto údaje adresy sú len na čítanie a nemožno ich odstrániť."
 
-#: src/addressadd.c:185 src/prefs_filtering_action.c:201
+#: src/addressadd.c:192 src/prefs_filtering_action.c:195
 msgid "Add to address book"
 msgstr "Pridať do adresára"
 
-#: src/addressadd.c:207
+#: src/addressadd.c:215
 msgid "Contact"
 msgstr "Kontakt"
 
-#: src/addressadd.c:238 src/addressbook.c:127 src/editaddress.c:1056
-#: src/editaddress.c:1131 src/editgroup.c:290
+#: src/addressadd.c:246 src/addressbook.c:130 src/editaddress.c:1258
+#: src/editaddress.c:1302 src/editgroup.c:292
 msgid "Remarks"
 msgstr "Poznámky"
 
-#: src/addressadd.c:257 src/addressbook_foldersel.c:158
+#: src/addressadd.c:289 src/addressbook_foldersel.c:158
 msgid "Select Address Book Folder"
 msgstr "Vyberte zložku adresára"
 
-#: src/addressadd.c:534 src/addressbook.c:3214 src/addressbook.c:3265
+#: src/addressadd.c:599 src/addressbook.c:3268 src/addressbook.c:3319
 msgid "Add address(es)"
 msgstr "Pridať adresu(y)"
 
-#: src/addressadd.c:535
+#: src/addressadd.c:600
 msgid "Can't add the specified address"
 msgstr "Nemožno pridať zadanú adresu"
 
-#: src/addressbook.c:126 src/addressbook.c:4933 src/editaddress.c:1053
-#: src/editaddress.c:1114 src/editgroup.c:289 src/expldifdlg.c:517
-#: src/exporthtml.c:600 src/exporthtml.c:764 src/ldif.c:762
+#: src/addressbook.c:129 src/addressbook.c:5006 src/editaddress.c:1247
+#: src/editaddress.c:1285 src/editgroup.c:291 src/expldifdlg.c:517
+#: src/exporthtml.c:601 src/exporthtml.c:765 src/ldif.c:763
 msgid "Email Address"
 msgstr "Emailová adresa"
 
@@ -414,27 +417,27 @@ msgstr "Emailová adresa"
 msgid "_Book"
 msgstr "_Adresár"
 
-#: src/addressbook.c:406 src/addressbook.c:437 src/addressbook.c:465
-#: src/addressbook.c:482 src/compose.c:600 src/mainwindow.c:514
-#: src/messageview.c:209 src/plugins/managesieve/sieve_editor.c:82
+#: src/addressbook.c:406 src/addressbook.c:437 src/addressbook.c:466
+#: src/addressbook.c:483 src/compose.c:607 src/mainwindow.c:523
+#: src/messageview.c:212 src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
 msgstr "_Upraviť"
 
-#: src/addressbook.c:407 src/compose.c:605 src/mainwindow.c:517
-#: src/messageview.c:212
+#: src/addressbook.c:407 src/compose.c:612 src/mainwindow.c:526
+#: src/messageview.c:215
 msgid "_Tools"
 msgstr "_Nástroje"
 
-#: src/addressbook.c:408 src/compose.c:606 src/mainwindow.c:519
-#: src/messageview.c:213
+#: src/addressbook.c:408 src/compose.c:613 src/mainwindow.c:528
+#: src/messageview.c:216
 msgid "_Help"
 msgstr "_Pomocník"
 
-#: src/addressbook.c:411 src/addressbook.c:468
+#: src/addressbook.c:411 src/addressbook.c:469
 msgid "New _Book"
 msgstr "Nový _Adresár"
 
-#: src/addressbook.c:412 src/addressbook.c:469
+#: src/addressbook.c:412 src/addressbook.c:470
 msgid "New _Folder"
 msgstr "Nová _zložka"
 
@@ -458,209 +461,213 @@ msgstr "_Upraviť adresár"
 msgid "_Delete book"
 msgstr "Z_mazať adresár"
 
-#: src/addressbook.c:427 src/compose.c:617
+#: src/addressbook.c:427 src/compose.c:624
 #: src/plugins/managesieve/sieve_editor.c:85
-#: src/plugins/managesieve/sieve_editor.c:433
-#: src/plugins/managesieve/sieve_editor.c:631
+#: src/plugins/managesieve/sieve_editor.c:434
+#: src/plugins/managesieve/sieve_editor.c:633
 msgid "_Save"
 msgstr "_Uložiť"
 
-#: src/addressbook.c:428 src/compose.c:621 src/messageview.c:222
+#: src/addressbook.c:428 src/compose.c:628 src/messageview.c:225
 #: src/plugins/managesieve/sieve_editor.c:88
-#: src/plugins/managesieve/sieve_editor.c:629
+#: src/plugins/managesieve/sieve_editor.c:631
 msgid "_Close"
 msgstr "_Zavrieť"
 
-#: src/addressbook.c:431 src/addressbook.c:480 src/messageview.c:226
+#: src/addressbook.c:431 src/addressbook.c:481 src/messageview.c:229
 msgid "_Select all"
 msgstr "Vy_brať všetko"
 
-#: src/addressbook.c:433 src/addressbook.c:472 src/addressbook.c:488
+#: src/addressbook.c:433 src/addressbook.c:473 src/addressbook.c:489
 msgid "C_ut"
 msgstr "_Vystrihnúť"
 
-#: src/addressbook.c:434 src/addressbook.c:473 src/addressbook.c:489
-#: src/compose.c:629 src/mainwindow.c:548 src/messageview.c:225
+#: src/addressbook.c:434 src/addressbook.c:474 src/addressbook.c:490
+#: src/compose.c:636 src/mainwindow.c:557 src/messageview.c:228
 #: 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:630 src/plugins/managesieve/sieve_editor.c:97
+#: src/addressbook.c:435 src/addressbook.c:475 src/addressbook.c:491
+#: src/compose.c:637 src/plugins/managesieve/sieve_editor.c:97
 msgid "_Paste"
 msgstr "V_ložiť"
 
-#: src/addressbook.c:440 src/addressbook.c:485
+#: src/addressbook.c:440 src/addressbook.c:486
 msgid "New _Address"
 msgstr "Nová _adresa"
 
-#: src/addressbook.c:441 src/addressbook.c:470 src/addressbook.c:486
+#: src/addressbook.c:441 src/addressbook.c:471 src/addressbook.c:487
 msgid "New _Group"
 msgstr "Nová _skupina"
 
-#: src/addressbook.c:443 src/addressbook.c:492
+#: src/addressbook.c:443 src/addressbook.c:493
 msgid "_Mail To"
 msgstr "Poslať _mail"
 
-#: src/addressbook.c:447
-msgid "Import _LDIF file..."
-msgstr "Importovať súbor _LDIF…"
+#: src/addressbook.c:444 src/addressbook.c:497
+msgid "_Merge"
+msgstr "_Zlúčiť"
 
 #: src/addressbook.c:448
-msgid "Import M_utt file..."
-msgstr "Importovať súbor _Mutt…"
+msgid "Import _LDIF file..."
+msgstr "Importovať súbor _LDIF..."
 
 #: src/addressbook.c:449
+msgid "Import M_utt file..."
+msgstr "Importovať súbor _Mutt..."
+
+#: src/addressbook.c:450
 msgid "Import _Pine file..."
-msgstr "Importovať súbor _Pine…"
+msgstr "Importovať súbor _Pine..."
 
-#: src/addressbook.c:451
+#: src/addressbook.c:452
 msgid "Export _HTML..."
-msgstr "Exportovať _HTML…"
+msgstr "Exportovať _HTML..."
 
-#: src/addressbook.c:452
+#: src/addressbook.c:453
 msgid "Export LDI_F..."
-msgstr "Exportovať L_DIF…"
+msgstr "Exportovať L_DIF..."
 
-#: src/addressbook.c:454
+#: src/addressbook.c:455
 msgid "Find duplicates..."
-msgstr "Nájsť duplikáty…"
+msgstr "Nájsť duplikáty..."
 
-#: src/addressbook.c:455
+#: src/addressbook.c:456
 msgid "Edit custom attributes..."
-msgstr "Upraviť vlastné atribúty…"
+msgstr "Upraviť vlastné atribúty..."
 
-#: src/addressbook.c:458 src/compose.c:707 src/mainwindow.c:813
-#: src/messageview.c:337
+#: src/addressbook.c:459 src/compose.c:714 src/mainwindow.c:825
+#: src/messageview.c:340
 msgid "_About"
 msgstr "_O programe"
 
-#: src/addressbook.c:494
+#: src/addressbook.c:495
 msgid "_Browse Entry"
 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:253 src/plugins/pgpcore/sgpgme.c:143
-#: src/plugins/pgpcore/sgpgme.c:171 src/plugins/vcalendar/day-view.c:402
+#: src/addressbook.c:509 src/crash.c:457 src/crash.c:476 src/importldif.c:114
+#: src/plugins/pgpcore/select-keys.c:247 src/plugins/pgpcore/sgpgme.c:144
+#: src/plugins/pgpcore/sgpgme.c:172 src/plugins/vcalendar/day-view.c:403
 #: src/plugins/vcalendar/month-view.c:428 src/prefs_themes.c:819
 #: src/prefs_themes.c:851 src/prefs_themes.c:852
 msgid "Unknown"
 msgstr "Neznáme"
 
-#: src/addressbook.c:514 src/addressbook.c:533 src/importldif.c:121
+#: src/addressbook.c:516 src/addressbook.c:535 src/importldif.c:121
 msgid "Success"
 msgstr "Úspech"
 
-#: src/addressbook.c:515 src/importldif.c:122
+#: src/addressbook.c:517 src/importldif.c:122
 msgid "Bad arguments"
 msgstr "Neplatné parametre"
 
-#: src/addressbook.c:516 src/importldif.c:123
+#: src/addressbook.c:518 src/importldif.c:123
 msgid "File not specified"
 msgstr "Nie je zadaný súbor"
 
-#: src/addressbook.c:517 src/importldif.c:124
+#: src/addressbook.c:519 src/importldif.c:124
 msgid "Error opening file"
 msgstr "Chyba pri otváraní súboru"
 
-#: src/addressbook.c:518 src/importldif.c:125
+#: src/addressbook.c:520 src/importldif.c:125
 msgid "Error reading file"
 msgstr "Chyba pri čítaní súboru"
 
-#: src/addressbook.c:519 src/importldif.c:126
+#: src/addressbook.c:521 src/importldif.c:126
 msgid "End of file encountered"
 msgstr "Bol nájdený koniec súboru"
 
-#: src/addressbook.c:520 src/importldif.c:127
+#: src/addressbook.c:522 src/importldif.c:127
 msgid "Error allocating memory"
 msgstr "Chyba pri alokácii pamäte"
 
-#: src/addressbook.c:521 src/importldif.c:128
+#: src/addressbook.c:523 src/importldif.c:128
 msgid "Bad file format"
 msgstr "Neplatný formát súboru"
 
-#: src/addressbook.c:522 src/importldif.c:129
+#: src/addressbook.c:524 src/importldif.c:129
 msgid "Error writing to file"
 msgstr "Chyba pri zápise do súboru"
 
-#: src/addressbook.c:523 src/importldif.c:130
+#: src/addressbook.c:525 src/importldif.c:130
 msgid "Error opening directory"
 msgstr "Chyba pri otváraní zložky"
 
-#: src/addressbook.c:524 src/importldif.c:131
+#: src/addressbook.c:526 src/importldif.c:131
 msgid "No path specified"
 msgstr "Nebola zadaná cesta"
 
-#: src/addressbook.c:534
+#: src/addressbook.c:536
 msgid "Error connecting to LDAP server"
 msgstr "Chyba pripojenia k serveru LDAP"
 
-#: src/addressbook.c:535
+#: src/addressbook.c:537
 msgid "Error initializing LDAP"
 msgstr "Chyba pri inicializácii LDAP"
 
-#: src/addressbook.c:536
+#: src/addressbook.c:538
 msgid "Error binding to LDAP server"
 msgstr "Chyba pri pripájaní LDAP serveru"
 
-#: src/addressbook.c:537
+#: src/addressbook.c:539
 msgid "Error searching LDAP database"
 msgstr "Chyba pri čítaní LDAP databázy"
 
-#: src/addressbook.c:538
+#: src/addressbook.c:540
 msgid "Timeout performing LDAP operation"
 msgstr "Pri LDAP operácii vypršal časový limit"
 
-#: src/addressbook.c:539
+#: src/addressbook.c:541
 msgid "Error in LDAP search criteria"
 msgstr "Chybné vyhľadávacie kritériá LDAP"
 
-#: src/addressbook.c:540
+#: src/addressbook.c:542
 msgid "No LDAP entries found for search criteria"
 msgstr "Neboli nájdené žiadne položky LDAP vyhovujúce kritériám"
 
-#: src/addressbook.c:541
+#: src/addressbook.c:543
 msgid "LDAP search terminated on request"
 msgstr "LDAP vyhľadávanie bolo ukončené na požiadavku používateľa"
 
-#: src/addressbook.c:542
+#: src/addressbook.c:544
 msgid "Error starting STARTTLS connection"
 msgstr "Chyba vytvorenia spojenia STARTTLS"
 
-#: src/addressbook.c:543
+#: src/addressbook.c:545
 msgid "Distinguished Name (dn) is missing"
 msgstr "Chýba Distguished Name (dn)"
 
-#: src/addressbook.c:544
+#: src/addressbook.c:546
 msgid "Missing required information"
 msgstr "Chýbajú požadované údaje"
 
-#: src/addressbook.c:545
+#: src/addressbook.c:547
 msgid "Another contact exists with that key"
 msgstr "Kontakt s takýmto kľúčom už existuje"
 
-#: src/addressbook.c:546
+#: src/addressbook.c:548
 msgid "Strong(er) authentication required"
 msgstr "Je vyžadovaná silnejšia autentifikácia"
 
-#: src/addressbook.c:914
+#: src/addressbook.c:916
 msgid "Sources"
 msgstr "Zdroje"
 
-#: src/addressbook.c:918 src/prefs_matcher.c:632 src/prefs_other.c:492
-#: src/toolbar.c:268 src/toolbar.c:2519
+#: src/addressbook.c:920 src/prefs_matcher.c:643 src/prefs_other.c:493
+#: src/toolbar.c:268 src/toolbar.c:2522
 msgid "Address book"
 msgstr "Adresár"
 
-#: src/addressbook.c:1113 src/editldap.c:798
+#: src/addressbook.c:1118 src/editldap.c:794
 msgid "Search"
 msgstr "Hľadať"
 
-#: src/addressbook.c:1484
+#: src/addressbook.c:1490
 msgid "Delete group"
 msgstr "Odstrániť skupinu"
 
-#: src/addressbook.c:1485
+#: src/addressbook.c:1491
 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."
@@ -668,26 +675,26 @@ msgstr ""
 "Naozaj chcete odstrániť skupinu(y)?\n"
 "Adresy, ktoré obsahuje, budú stratené."
 
-#: src/addressbook.c:2193
+#: src/addressbook.c:2218
 msgid "Cannot paste. Target address book is readonly."
 msgstr "Nemožno vkladať. Cieľový adresár je len na čítanie."
 
-#: src/addressbook.c:2203
+#: src/addressbook.c:2228
 msgid "Cannot paste into an address group."
 msgstr "Nemožno vkladať do skupiny adries."
 
-#: src/addressbook.c:2911
+#: src/addressbook.c:2965
 #, c-format
 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:2914 src/addressbook.c:2940 src/addressbook.c:2947
-#: src/plugins/archive/archiver_prefs.c:431 src/prefs_filtering_action.c:177
+#: src/addressbook.c:2968 src/addressbook.c:2994 src/addressbook.c:3001
+#: src/plugins/archive/archiver_prefs.c:431 src/prefs_filtering_action.c:173
 #: src/toolbar.c:497
 msgid "Delete"
 msgstr "Odstrániť"
 
-#: src/addressbook.c:2923
+#: src/addressbook.c:2977
 #, c-format
 msgid ""
 "Do you want to delete '%s'? If you delete the folder only, the addresses it "
@@ -696,20 +703,20 @@ msgstr ""
 "Chcete odstrániť „%s”? Ak odstránite len zložku, adresy, ktoré obsahuje, "
 "budú presunuté do rodičovskej zložky."
 
-#: src/addressbook.c:2926 src/imap_gtk.c:368 src/mh_gtk.c:206
-#: src/plugins/mailmbox/plugin_gtk.c:332 src/plugins/rssyl/rssyl_cb_menu.c:155
+#: src/addressbook.c:2980 src/imap_gtk.c:368 src/mh_gtk.c:206
+#: src/plugins/mailmbox/plugin_gtk.c:332 src/plugins/rssyl/rssyl_cb_menu.c:156
 msgid "Delete folder"
 msgstr "Odstrániť zložku"
 
-#: src/addressbook.c:2927
+#: src/addressbook.c:2981
 msgid "Delete _folder only"
 msgstr "Odstrániť _len zložku"
 
-#: src/addressbook.c:2927
+#: src/addressbook.c:2981
 msgid "Delete folder and _addresses"
 msgstr "Odstrániť zložku i _adresy"
 
-#: src/addressbook.c:2938
+#: src/addressbook.c:2992
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -718,7 +725,7 @@ msgstr ""
 "Chcete odstrániť „%s”?\n"
 "Adresy, ktoré obsahuje, nebudú stratené."
 
-#: src/addressbook.c:2945
+#: src/addressbook.c:2999
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -727,28 +734,28 @@ msgstr ""
 "Chcete odstrániť „%s”?\n"
 "Adresy, ktoré obsahuje, budú stratené."
 
-#: src/addressbook.c:3059
+#: src/addressbook.c:3113
 #, c-format
 msgid "Search '%s'"
 msgstr "Hľadať „%s”"
 
-#: src/addressbook.c:3197 src/addressbook.c:3246
+#: src/addressbook.c:3251 src/addressbook.c:3300
 msgid "New Contacts"
 msgstr "Nové kontakty"
 
-#: src/addressbook.c:4085
+#: src/addressbook.c:4137
 msgid "New user, could not save index file."
 msgstr "Nový používateľ, nemožno uložiť indexový súbor."
 
-#: src/addressbook.c:4089
+#: src/addressbook.c:4141
 msgid "New user, could not save address book files."
 msgstr "Nový používateľ, nemožno uložiť súbory adresára."
 
-#: src/addressbook.c:4099
+#: src/addressbook.c:4151
 msgid "Old address book converted successfully."
 msgstr "Konverzia starého adresára prebehla úspešne."
 
-#: src/addressbook.c:4104
+#: src/addressbook.c:4156
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
@@ -756,7 +763,7 @@ msgstr ""
 "Konverzia starého adresára je dokončená,\n"
 "nemožno uložiť indexový súbor nového adresára."
 
-#: src/addressbook.c:4117
+#: src/addressbook.c:4169
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -764,7 +771,7 @@ msgstr ""
 "Nemožno konvertovať starý adresár,\n"
 "ale boli vytvorené prázdne súbory nového adresára."
 
-#: src/addressbook.c:4123
+#: src/addressbook.c:4175
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
@@ -772,7 +779,7 @@ msgstr ""
 "Nemožno konvertovať starý adresár,\n"
 "nemožno an vytvoriť indexový súbor nového adresára."
 
-#: src/addressbook.c:4128
+#: src/addressbook.c:4180
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -780,256 +787,239 @@ msgstr ""
 "Nemožno konvertovať starý adresár\n"
 "a nemožno ani vytvoriť súbory nového adresára."
 
-#: src/addressbook.c:4135 src/addressbook.c:4141
+#: src/addressbook.c:4187 src/addressbook.c:4193
 msgid "Addressbook conversion error"
 msgstr "Chyba pri konverzii adresára"
 
-#: src/addressbook.c:4256
+#: src/addressbook.c:4308
 msgid "Addressbook Error"
 msgstr "Chyba v adresári"
 
-#: src/addressbook.c:4257
+#: src/addressbook.c:4309
 msgid "Could not read address index"
 msgstr "Nemožno načítať zoznam adries"
 
-#: src/addressbook.c:4588
+#: src/addressbook.c:4640
 msgid "Busy searching..."
-msgstr "Prehľadávam…"
+msgstr "Prehľadávam..."
 
-#: src/addressbook.c:4897 src/prefs_send.c:216
+#: src/addressbook.c:4970 src/prefs_send.c:220
 msgid "Interface"
 msgstr "Ovládanie"
 
-#: src/addressbook.c:4909
+#: src/addressbook.c:4982
 msgid "Address Books"
 msgstr "Adresáre"
 
-#: src/addressbook.c:4921
+#: src/addressbook.c:4994
 msgid "Person"
 msgstr "Osoba"
 
-#: src/addressbook.c:4957 src/exporthtml.c:884 src/folderview.c:355
-#: src/folderview.c:443 src/prefs_account.c:2860 src/prefs_folder_column.c:77
+#: src/addressbook.c:5030 src/exporthtml.c:885 src/folderview.c:361
+#: src/folderview.c:449 src/prefs_account.c:3149 src/prefs_folder_column.c:77
 msgid "Folder"
 msgstr "Zložka"
 
-#: src/addressbook.c:4969
+#: src/addressbook.c:5042
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4981 src/addressbook.c:4993
+#: src/addressbook.c:5054 src/addressbook.c:5066
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:5005
+#: src/addressbook.c:5078
 msgid "LDAP servers"
 msgstr "LDAP servery"
 
-#: src/addressbook.c:5017
+#: src/addressbook.c:5090
 msgid "LDAP Query"
 msgstr "LDAP požiadavka"
 
-#: src/addressbook_foldersel.c:182 src/exphtmldlg.c:371 src/expldifdlg.c:388
-#: src/exporthtml.c:984 src/importldif.c:657
+#: src/addressbook_foldersel.c:203 src/exphtmldlg.c:371 src/expldifdlg.c:388
+#: src/exporthtml.c:985 src/importldif.c:541
 msgid "Address Book"
 msgstr "Adresár"
 
-#: src/addressbook_foldersel.c:387 src/plugins/bogofilter/bogofilter.c:107
-#: src/plugins/bogofilter/bogofilter_gtk.c:274
-#: src/plugins/bogofilter/bogofilter_gtk.c:347
-#: src/plugins/bogofilter/bogofilter_gtk.c:424
-#: src/plugins/bsfilter/bsfilter.c:107 src/plugins/bsfilter/bsfilter_gtk.c:197
-#: 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: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:1621 src/prefs_matcher.c:1628
-#: src/prefs_matcher.c:1636 src/prefs_matcher.c:1638 src/prefs_matcher.c:2522
-#: src/prefs_matcher.c:2526
-msgid "Any"
-msgstr "Všetky"
-
-#: src/addrgather.c:173
+#: src/addrgather.c:179
 msgid "Please specify name for address book."
 msgstr "Prosím zvoľte názov adresára."
 
-#: src/addrgather.c:180
+#: src/addrgather.c:186
 msgid "No available address book."
 msgstr "Nedostupný adresár."
 
-#: src/addrgather.c:201
+#: src/addrgather.c:207
 msgid "Please select the mail headers to search."
 msgstr "Prosím zvoľte prehľadávané poštové hlavičky."
 
-#: src/addrgather.c:208
+#: src/addrgather.c:214
 msgid "Collecting addresses..."
-msgstr "Zhromažďujem adresy…"
+msgstr "Zhromažďujem adresy..."
 
-#: src/addrgather.c:248
-msgid "address added by claws-mail"
-msgstr "adresa pridaný z claws-mail"
+#: src/addrgather.c:254
+msgid "address added by Claws Mail"
+msgstr "adresa pridaná z claws-mail"
 
-#: src/addrgather.c:276
+#: src/addrgather.c:285
 msgid "Addresses collected successfully."
 msgstr "Adresy zozbierané úspešne."
 
-#: src/addrgather.c:351
+#: src/addrgather.c:360
 msgid "Current folder:"
 msgstr "Aktuálna zložka:"
 
-#: src/addrgather.c:362
+#: src/addrgather.c:371
 msgid "Address book name:"
 msgstr "Meno adresára:"
 
-#: src/addrgather.c:389
+#: src/addrgather.c:398
 msgid "Address book folder size:"
 msgstr "Veľkosť zložky adresára:"
 
-#: src/addrgather.c:393 src/addrgather.c:403
+#: src/addrgather.c:402 src/addrgather.c:411
 msgid ""
 "Maximum amount of entries per folder within the newly created address book"
 msgstr "Maximálny počet položiek na adresár v novovytvorenom adresári"
 
-#: src/addrgather.c:407
+#: src/addrgather.c:415
 msgid "Process these mail header fields"
 msgstr "Spracovať tieto poštové hlavičky"
 
-#: src/addrgather.c:426
+#: src/addrgather.c:434
 msgid "Include subfolders"
 msgstr "Zahrnúť podzložky"
 
-#: src/addrgather.c:450 src/prefs_filtering_action.c:1429
+#: src/addrgather.c:492 src/prefs_filtering_action.c:1384
 msgid "Header Name"
 msgstr "Názov hlavičky"
 
-#: src/addrgather.c:451
+#: src/addrgather.c:498
 msgid "Address Count"
 msgstr "Počet adries"
 
-#: src/addrgather.c:561
+#: src/addrgather.c:586
 msgid "Header Fields"
 msgstr "Polia hlavičky"
 
-#: src/addrgather.c:562 src/exphtmldlg.c:658 src/expldifdlg.c:722
-#: src/importldif.c:1022
+#: src/addrgather.c:587 src/exphtmldlg.c:659 src/expldifdlg.c:723
+#: src/importldif.c:982
 msgid "Finish"
 msgstr "Dokončiť"
 
-#: src/addrgather.c:620
+#: src/addrgather.c:645
 msgid "Collect email addresses from selected messages"
 msgstr "Zozbierať emailové adresy zvolených správ"
 
-#: src/addrgather.c:624
+#: src/addrgather.c:649
 msgid "Collect email addresses from folder"
 msgstr "Zozbierať emailové adresy zo zložky"
 
-#: src/addrindex.c:124
+#: src/addrindex.c:125
 msgid "Common addresses"
 msgstr "Spoločné adresy"
 
-#: src/addrindex.c:125
+#: src/addrindex.c:126
 msgid "Personal addresses"
 msgstr "Súkromné adresy"
 
-#: src/addrindex.c:131
+#: src/addrindex.c:132
 msgid "Common address"
 msgstr "Spoločná adresa"
 
-#: src/addrindex.c:132
+#: src/addrindex.c:133
 msgid "Personal address"
 msgstr "Súkromná adresa"
 
-#: src/addrindex.c:1829
+#: src/addrindex.c:1834
 msgid "Address(es) update"
 msgstr "Aktualizácia adries"
 
-#: src/addrindex.c:1830
+#: src/addrindex.c:1835
 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:9761
+#: src/alertpanel.c:144 src/compose.c:9795
 msgid "Notice"
 msgstr "Upozornenie"
 
-#: src/alertpanel.c:159 src/compose.c:5848 src/compose.c:6376
-#: src/compose.c:12218 src/file_checker.c:78 src/file_checker.c:100
-#: src/messageview.c:855 src/messageview.c:882 src/plugins/pgpcore/sgpgme.c:806
-#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:4937
+#: src/alertpanel.c:157 src/compose.c:5856 src/compose.c:6401
+#: src/compose.c:12258 src/file_checker.c:84 src/file_checker.c:108
+#: src/messageview.c:858 src/plugins/pgpcore/sgpgme.c:811
+#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:5091
 msgid "Warning"
 msgstr "Upozornenie"
 
-#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5785 src/inc.c:663
-#: src/plugins/pgpcore/sgpgme.c:155 src/plugins/pgpcore/sgpgme.c:310
+#: src/alertpanel.c:170 src/alertpanel.c:193 src/compose.c:5793 src/inc.c:726
+#: src/plugins/pgpcore/sgpgme.c:156 src/plugins/pgpcore/sgpgme.c:311
 msgid "Error"
 msgstr "Chyba"
 
-#: src/alertpanel.c:196 src/gtk/progressdialog.c:94
+#: src/alertpanel.c:194 src/gtk/progressdialog.c:94
 msgid "_View log"
 msgstr "_Zobraziť záznam"
 
-#: src/alertpanel.c:347
+#: src/alertpanel.c:346
 msgid "Show this message next time"
 msgstr "Zobraziť túto správu aj nabudúce"
 
-#: src/browseldap.c:218
+#: src/browseldap.c:223
 msgid "Browse Directory Entry"
 msgstr "Prechádzať zložku"
 
-#: src/browseldap.c:237
+#: src/browseldap.c:243
 msgid "Server Name:"
 msgstr "Meno servera:"
 
-#: src/browseldap.c:247
+#: src/browseldap.c:253
 msgid "Distinguished Name (dn):"
 msgstr "Rozlišovacie meno (dn):"
 
-#: src/browseldap.c:270
+#: src/browseldap.c:284
 msgid "LDAP Name"
 msgstr "LDAP meno"
 
-#: src/browseldap.c:272
+#: src/browseldap.c:290
 msgid "Attribute Value"
 msgstr "Hodnota atribútu"
 
-#: src/common/plugin.c:69
+#: src/common/plugin.c:70
 msgid "Nothing"
 msgstr "Nič"
 
-#: src/common/plugin.c:70
+#: src/common/plugin.c:71
 msgid "a viewer"
 msgstr "zobrazovač"
 
-#: src/common/plugin.c:71
+#: src/common/plugin.c:72
 msgid "a MIME parser"
 msgstr "analyzátor MIME"
 
-#: src/common/plugin.c:72
+#: src/common/plugin.c:73
 msgid "folders"
 msgstr "zložiek"
 
-#: src/common/plugin.c:73
+#: src/common/plugin.c:74
 msgid "filtering"
 msgstr "filtrovania"
 
-#: src/common/plugin.c:74
+#: src/common/plugin.c:75
 msgid "a privacy interface"
 msgstr "rozhrania zabezpečenia súkromia"
 
-#: src/common/plugin.c:75
+#: src/common/plugin.c:76
 msgid "a notifier"
 msgstr "oznamovača"
 
-#: src/common/plugin.c:76
+#: src/common/plugin.c:77
 msgid "an utility"
 msgstr "nástroje"
 
-#: src/common/plugin.c:77
+#: src/common/plugin.c:78
 msgid "things"
 msgstr "inú"
 
-#: src/common/plugin.c:334
+#: src/common/plugin.c:335
 #, c-format
 msgid ""
 "This plugin provides %s (%s), which is already provided by the %s plugin."
@@ -1037,25 +1027,25 @@ msgstr ""
 "Tento zásuvný modul poskytuje funkciu %s (%s), ktorá už je poskytovaná "
 "modulom %s."
 
-#: src/common/plugin.c:437
+#: src/common/plugin.c:438
 msgid "Plugin already loaded"
 msgstr "Zásuvný modul už je načítaný"
 
-#: src/common/plugin.c:448
+#: src/common/plugin.c:449
 msgid "Failed to allocate memory for Plugin"
 msgstr "Zlyhalo pridelenie pamäte pre zásuvný modul"
 
-#: src/common/plugin.c:482
+#: src/common/plugin.c:483
 msgid "This module is not licensed under a GPL v3 or later compatible license."
 msgstr ""
 "Tento modul nie je licencovaný pod licenciou kompatibilnou s GPL v3 alebo "
 "vyššou."
 
-#: src/common/plugin.c:491
+#: src/common/plugin.c:492
 msgid "This module is for Claws Mail GTK1."
 msgstr "Tento modul je pre Claws Mail GTK1."
 
-#: src/common/plugin.c:769
+#: src/common/plugin.c:770
 #, c-format
 msgid ""
 "Your version of Claws Mail is newer than the version the '%s' plugin was "
@@ -1064,7 +1054,7 @@ msgstr ""
 "Vaša verzia Claws Mail je novšia ako verzia, pre ktorú bol zásuvný modul "
 "„%s” zostavený."
 
-#: src/common/plugin.c:772
+#: src/common/plugin.c:773
 msgid ""
 "Your version of Claws Mail is newer than the version the plugin was built "
 "with."
@@ -1072,16 +1062,16 @@ msgstr ""
 "Vaša verzia Claws Mail je novšia ako verzia, pre ktorú bol tento zásuvný "
 "modul zostavený."
 
-#: src/common/plugin.c:781
+#: src/common/plugin.c:782
 #, c-format
 msgid "Your version of Claws Mail is too old for the '%s' plugin."
 msgstr "Vaša verzia Claws Mail je pre zásuvný modul „%s” príliš stará."
 
-#: src/common/plugin.c:783
+#: src/common/plugin.c:784
 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:1207
+#: src/common/session.c:201 src/imap.c:1233
 msgid "SSL/TLS handshake failed\n"
 msgstr "Zlyhalo vytvorenie spojenia SSL/TLS\n"
 
@@ -1101,7 +1091,7 @@ msgstr "neplatná odozva SMTP\n"
 msgid "error occurred on SMTP session\n"
 msgstr "nastala chyba relácie SMTP\n"
 
-#: src/common/smtp.c:535 src/pop.c:905
+#: src/common/smtp.c:535 src/pop.c:907
 msgid "error occurred on authentication\n"
 msgstr "nastala chyba autentifikácie\n"
 
@@ -1110,7 +1100,7 @@ msgstr "nastala chyba autentifikácie\n"
 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
+#: src/common/smtp.c:617 src/pop.c:900
 msgid "couldn't start STARTTLS session\n"
 msgstr "nemožno vytvoriť reláciu STARTTLS\n"
 
@@ -1122,104 +1112,104 @@ msgstr "Časový limit soketu IO.\n"
 msgid "Connection timed out.\n"
 msgstr "Uplynul časový limit spojenia.\n"
 
-#: src/common/socket.c:734
+#: src/common/socket.c:740
 #, c-format
 msgid "%s:%d: connection failed (%s).\n"
 msgstr "%s:%d: spojenie zlyhalo (%s).\n"
 
-#: src/common/socket.c:974
+#: src/common/socket.c:980
 #, c-format
 msgid "%s:%d: unknown host.\n"
 msgstr "%s:%d: neznámy hostiteľ.\n"
 
-#: src/common/socket.c:1066
+#: src/common/socket.c:1072
 #, c-format
 msgid "%s:%s: host lookup failed (%s).\n"
 msgstr "%s:%s: hľadanie hostiteľa zlyhalo (%s).\n"
 
-#: src/common/socket.c:1370
+#: src/common/socket.c:1385
 #, c-format
 msgid "write on fd%d: %s\n"
 msgstr "zápis na fd%d: %s\n"
 
-#: src/common/ssl_certificate.c:326
+#: src/common/ssl_certificate.c:338
 #, c-format
 msgid "Cannot stat P12 certificate file (%s)\n"
 msgstr "Nemožno získať stav súboru certifikátu P12 (%s)\n"
 
-#: src/common/ssl_certificate.c:334
+#: src/common/ssl_certificate.c:346
 #, c-format
 msgid "Cannot read P12 certificate file (%s)\n"
 msgstr "Nemožno čítať súbor certifikátu P12 %s\n"
 
-#: src/common/ssl_certificate.c:343
+#: src/common/ssl_certificate.c:355
 #, c-format
 msgid "Cannot import P12 certificate file (%s)\n"
 msgstr "Nemožno importovať súbor certifikátu P12 %s\n"
 
-#: src/common/ssl_certificate.c:628
+#: src/common/ssl_certificate.c:640
 msgid "Internal error"
 msgstr "Interná chyba"
 
-#: src/common/ssl_certificate.c:633
+#: src/common/ssl_certificate.c:645
 msgid "Uncheckable"
 msgstr "Neoveriteľný"
 
-#: src/common/ssl_certificate.c:637
+#: src/common/ssl_certificate.c:649
 msgid "Self-signed certificate"
 msgstr "Certifikát podpísaný sebou"
 
-#: src/common/ssl_certificate.c:640
+#: src/common/ssl_certificate.c:652
 msgid "Revoked certificate"
 msgstr "Odvolaný certifikát"
 
-#: src/common/ssl_certificate.c:642
+#: src/common/ssl_certificate.c:654
 msgid "No certificate issuer found"
 msgstr "Nebol nájdený vydavateľ certifikátu"
 
-#: src/common/ssl_certificate.c:644
+#: src/common/ssl_certificate.c:656
 msgid "Certificate issuer is not a CA"
 msgstr "Vydavateľ certifikátu nie je certifikačnou autoritou"
 
-#: src/common/ssl_certificate.c:869
+#: src/common/ssl_certificate.c:881
 #, c-format
 msgid "Cannot open certificate file %s: %s\n"
 msgstr "Nemožno otvoriť súbor certifikátu %s: %s\n"
 
-#: src/common/ssl_certificate.c:873
+#: src/common/ssl_certificate.c:885
 #, c-format
 msgid "Certificate file %s missing (%s)\n"
 msgstr "Súbor certifikátu %s chýba (%s)\n"
 
-#: src/common/ssl_certificate.c:892
+#: src/common/ssl_certificate.c:904
 #, c-format
 msgid "Cannot open key file %s (%s)\n"
 msgstr "Nemožno otvoriť súbor kľúča %s (%s)\n"
 
-#: src/common/ssl_certificate.c:896
+#: src/common/ssl_certificate.c:908
 #, c-format
 msgid "Key file %s missing (%s)\n"
 msgstr "Chýba súbor kľúča %s (%s)\n"
 
-#: src/common/ssl_certificate.c:1044
+#: src/common/ssl_certificate.c:1056
 #, c-format
 msgid "Failed to read P12 certificate file %s\n"
 msgstr "Zlyhalo čítanie súboru certifikátu P12 %s\n"
 
-#: src/common/ssl_certificate.c:1047
+#: src/common/ssl_certificate.c:1059
 #, c-format
 msgid "Cannot open P12 certificate file %s (%s)\n"
 msgstr "Nemožno otvoriť súbor certifikátu P12 %s (%s)\n"
 
-#: src/common/ssl_certificate.c:1051
+#: src/common/ssl_certificate.c:1063
 #, c-format
 msgid "P12 Certificate file %s missing (%s)\n"
 msgstr "Chýba súbor certifikátu P12 %s (%s)\n"
 
-#: src/common/ssl_certificate.c:1076 src/gtk/sslcertwindow.c:85
-#: src/gtk/sslcertwindow.c:92 src/gtk/sslcertwindow.c:107
-#: src/gtk/sslcertwindow.c:112 src/gtk/sslcertwindow.c:119
-#: src/gtk/sslcertwindow.c:134
+#: src/common/ssl_certificate.c:1088 src/gtk/sslcertwindow.c:87
+#: src/gtk/sslcertwindow.c:94 src/gtk/sslcertwindow.c:109
+#: src/gtk/sslcertwindow.c:114 src/gtk/sslcertwindow.c:121
+#: src/gtk/sslcertwindow.c:136
 msgid "<not in certificate>"
 msgstr "<chýba v certifikáte>"
 
@@ -1227,646 +1217,660 @@ msgstr "<chýba v certifikáte>"
 msgid "(Subject cleared by RegExp)"
 msgstr "(Predmet vymazaný regulárnym výrazom)"
 
-#: src/common/utils.c:256
+#: src/common/utils.c:200
 #, c-format
 msgid "%dB"
 msgstr "%dB"
 
-#: src/common/utils.c:257
+#: src/common/utils.c:201
 #, c-format
 msgid "%d.%02dKB"
 msgstr "%d.%02dKB"
 
-#: src/common/utils.c:258
+#: src/common/utils.c:202
 #, c-format
 msgid "%d.%02dMB"
 msgstr "%d.%02dMB"
 
-#: src/common/utils.c:259
+#: src/common/utils.c:203
 #, c-format
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: src/common/utils.c:4781
+#: src/common/utils.c:4028
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "Nedeľa"
 
-#: src/common/utils.c:4782
+#: src/common/utils.c:4029
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "Pondelok"
 
-#: src/common/utils.c:4783
+#: src/common/utils.c:4030
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "Utorok"
 
-#: src/common/utils.c:4784
+#: src/common/utils.c:4031
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "Streda"
 
-#: src/common/utils.c:4785
+#: src/common/utils.c:4032
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "Štvrtok"
 
-#: src/common/utils.c:4786
+#: src/common/utils.c:4033
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "Piatok"
 
-#: src/common/utils.c:4787
+#: src/common/utils.c:4034
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "Sobota"
 
-#: src/common/utils.c:4789
+#: src/common/utils.c:4036
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "Január"
 
-#: src/common/utils.c:4790
+#: src/common/utils.c:4037
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "Február"
 
-#: src/common/utils.c:4791
+#: src/common/utils.c:4038
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "Marec"
 
-#: src/common/utils.c:4792
+#: src/common/utils.c:4039
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "Apríl"
 
-#: src/common/utils.c:4793
+#: src/common/utils.c:4040
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "Máj"
 
-#: src/common/utils.c:4794
+#: src/common/utils.c:4041
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "Jún"
 
-#: src/common/utils.c:4795
+#: src/common/utils.c:4042
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "Júl"
 
-#: src/common/utils.c:4796
+#: src/common/utils.c:4043
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "August"
 
-#: src/common/utils.c:4797
+#: src/common/utils.c:4044
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "September"
 
-#: src/common/utils.c:4798
+#: src/common/utils.c:4045
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "Október"
 
-#: src/common/utils.c:4799
+#: src/common/utils.c:4046
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "November"
 
-#: src/common/utils.c:4800
+#: src/common/utils.c:4047
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "December"
 
-#: src/common/utils.c:4802
+#: src/common/utils.c:4049
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "Ne"
 
-#: src/common/utils.c:4803
+#: src/common/utils.c:4050
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "Po"
 
-#: src/common/utils.c:4804
+#: src/common/utils.c:4051
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "Ut"
 
-#: src/common/utils.c:4805
+#: src/common/utils.c:4052
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "St"
 
-#: src/common/utils.c:4806
+#: src/common/utils.c:4053
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "Št"
 
-#: src/common/utils.c:4807
+#: src/common/utils.c:4054
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "Pi"
 
-#: src/common/utils.c:4808
+#: src/common/utils.c:4055
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "So"
 
-#: src/common/utils.c:4810
+#: src/common/utils.c:4057
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "Jan"
 
-#: src/common/utils.c:4811
+#: src/common/utils.c:4058
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "Feb"
 
-#: src/common/utils.c:4812
+#: src/common/utils.c:4059
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "Mar"
 
-#: src/common/utils.c:4813
+#: src/common/utils.c:4060
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "Apr"
 
-#: src/common/utils.c:4814
+#: src/common/utils.c:4061
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "Máj"
 
-#: src/common/utils.c:4815
+#: src/common/utils.c:4062
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "Jún"
 
-#: src/common/utils.c:4816
+#: src/common/utils.c:4063
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "Júl"
 
-#: src/common/utils.c:4817
+#: src/common/utils.c:4064
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "Aug"
 
-#: src/common/utils.c:4818
+#: src/common/utils.c:4065
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "Sep"
 
-#: src/common/utils.c:4819
+#: src/common/utils.c:4066
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "Okt"
 
-#: src/common/utils.c:4820
+#: src/common/utils.c:4067
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "Nov"
 
-#: src/common/utils.c:4821
+#: src/common/utils.c:4068
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "Dec"
 
-#: src/common/utils.c:4832
+#: src/common/utils.c:4079
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "DOP"
 
-#: src/common/utils.c:4833
+#: src/common/utils.c:4080
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "ODP"
 
-#: src/common/utils.c:4834
+#: src/common/utils.c:4081
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
-msgstr "dop."
+msgstr "dop"
 
-#: src/common/utils.c:4835
+#: src/common/utils.c:4082
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
-msgstr "odp."
+msgstr "odp"
 
-#: src/compose.c:589
+#: src/compose.c:596
 msgid "_Add..."
-msgstr "_Pridať…"
+msgstr "_Pridať..."
 
-#: src/compose.c:590 src/mh_gtk.c:375 src/plugins/mailmbox/plugin_gtk.c:301
-#: src/plugins/rssyl/rssyl_cb_menu.c:316
+#: src/compose.c:597 src/mh_gtk.c:375 src/plugins/mailmbox/plugin_gtk.c:301
+#: src/plugins/rssyl/rssyl_cb_menu.c:323
 msgid "_Remove"
 msgstr "_Odstrániť"
 
-#: src/compose.c:592 src/folderview.c:254
+#: src/compose.c:599 src/folderview.c:254
 msgid "_Properties..."
-msgstr "_Vlastnosti…"
+msgstr "_Vlastnosti..."
 
-#: src/compose.c:599 src/mainwindow.c:516 src/messageview.c:211
+#: src/compose.c:606 src/mainwindow.c:525 src/messageview.c:214
 msgid "_Message"
 msgstr "Sp_ráva"
 
-#: src/compose.c:602
+#: src/compose.c:609
 msgid "_Spelling"
 msgstr "P_ravopis"
 
-#: src/compose.c:604 src/compose.c:671
+#: src/compose.c:611 src/compose.c:678
 msgid "_Options"
 msgstr "_Možnosti"
 
-#: src/compose.c:608
+#: src/compose.c:615
 msgid "S_end"
 msgstr "Odos_lať"
 
-#: src/compose.c:609
+#: src/compose.c:616
 msgid "Send _later"
 msgstr "Odoslať _neskôr"
 
-#: src/compose.c:612
+#: src/compose.c:619
 msgid "_Attach file"
 msgstr "Pripojiť sú_bor"
 
-#: src/compose.c:613
+#: src/compose.c:620
 msgid "_Insert file"
 msgstr "Vlož_iť súbor"
 
-#: src/compose.c:614
+#: src/compose.c:621
 msgid "Insert si_gnature"
 msgstr "Vložiť _podpis"
 
-#: src/compose.c:615
+#: src/compose.c:622
 msgid "_Replace signature"
 msgstr "Nah_radiť podpis"
 
-#: src/compose.c:619
+#: src/compose.c:626
 msgid "_Print"
 msgstr "_Tlačiť"
 
-#: src/compose.c:624 src/plugins/managesieve/sieve_editor.c:91
+#: src/compose.c:631 src/plugins/managesieve/sieve_editor.c:91
 msgid "_Undo"
 msgstr "_Späť"
 
-#: src/compose.c:625 src/plugins/managesieve/sieve_editor.c:92
+#: src/compose.c:632 src/plugins/managesieve/sieve_editor.c:92
 msgid "_Redo"
 msgstr "_Znova"
 
-#: src/compose.c:628 src/plugins/managesieve/sieve_editor.c:95
+#: src/compose.c:635 src/plugins/managesieve/sieve_editor.c:95
 msgid "Cu_t"
 msgstr "_Vystrihnúť"
 
-#: src/compose.c:632
+#: src/compose.c:639
 msgid "_Special paste"
 msgstr "Prilepiť _špeciálne"
 
-#: src/compose.c:633
+#: src/compose.c:640
 msgid "As _quotation"
 msgstr "Ako _citácia"
 
-#: src/compose.c:634
+#: src/compose.c:641
 msgid "_Wrapped"
 msgstr "_Zalomené"
 
-#: src/compose.c:635
+#: src/compose.c:642
 msgid "_Unwrapped"
 msgstr "_Nezalomené"
 
-#: src/compose.c:637 src/mainwindow.c:549
+#: src/compose.c:644 src/mainwindow.c:558
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "Vy_brať všetko"
 
-#: src/compose.c:639
+#: src/compose.c:646
 msgid "A_dvanced"
 msgstr "_Rozšírené"
 
-#: src/compose.c:640
+#: src/compose.c:647
 msgid "Move a character backward"
 msgstr "Presunúť o znak dozadu"
 
-#: src/compose.c:641
+#: src/compose.c:648
 msgid "Move a character forward"
 msgstr "Presunúť o znak dopredu"
 
-#: src/compose.c:642
+#: src/compose.c:649
 msgid "Move a word backward"
 msgstr "Presunúť o slovo dozadu"
 
-#: src/compose.c:643
+#: src/compose.c:650
 msgid "Move a word forward"
 msgstr "Presunúť o slovo dopredu"
 
-#: src/compose.c:644
+#: src/compose.c:651
 msgid "Move to beginning of line"
 msgstr "Presunúť na začiatok riadku"
 
-#: src/compose.c:645
+#: src/compose.c:652
 msgid "Move to end of line"
 msgstr "Presunúť na koniec riadku"
 
-#: src/compose.c:646
+#: src/compose.c:653
 msgid "Move to previous line"
 msgstr "Presunúť na predchádzajúci riadok"
 
-#: src/compose.c:647
+#: src/compose.c:654
 msgid "Move to next line"
 msgstr "Presunúť na ďalší riadok"
 
-#: src/compose.c:648
+#: src/compose.c:655
 msgid "Delete a character backward"
 msgstr "Zmazať znak naľavo od kurzora"
 
-#: src/compose.c:649
+#: src/compose.c:656
 msgid "Delete a character forward"
 msgstr "Zmazať znak napravo od kurzora"
 
-#: src/compose.c:650
+#: src/compose.c:657
 msgid "Delete a word backward"
 msgstr "Zmazať slovo naľavo od kurzora"
 
-#: src/compose.c:651
+#: src/compose.c:658
 msgid "Delete a word forward"
 msgstr "Zmazať slovo napravo od kurzora"
 
-#: src/compose.c:652
+#: src/compose.c:659
 msgid "Delete line"
 msgstr "Zmazať riadok"
 
-#: src/compose.c:653
+#: src/compose.c:660
 msgid "Delete to end of line"
 msgstr "Zmazať do konca riadku"
 
-#: src/compose.c:656 src/messageview.c:228
+#: src/compose.c:663 src/messageview.c:231
 #: src/plugins/managesieve/sieve_editor.c:102
 msgid "_Find"
 msgstr "_Hľadať"
 
-#: src/compose.c:659
+#: src/compose.c:666
 msgid "_Wrap current paragraph"
 msgstr "_Zalomiť aktuálny odsek"
 
-#: src/compose.c:660
+#: src/compose.c:667
 msgid "Wrap all long _lines"
 msgstr "Zalomiť všetky d_lhé riadky"
 
-#: src/compose.c:662
+#: src/compose.c:669
 msgid "Edit with e_xternal editor"
 msgstr "Upraviť pomocou e_xterného editora"
 
-#: src/compose.c:665
+#: src/compose.c:672
 msgid "_Check all or check selection"
 msgstr "_Skontrolovať všetko alebo výber"
 
-#: src/compose.c:666
+#: src/compose.c:673
 msgid "_Highlight all misspelled words"
 msgstr "_Zvýrazniť všetky nesprávne slová"
 
-#: src/compose.c:667
+#: src/compose.c:674
 msgid "Check _backwards misspelled word"
 msgstr "S_pätne skontrolovať nesprávne slovo"
 
-#: src/compose.c:668
+#: src/compose.c:675
 msgid "_Forward to next misspelled word"
 msgstr "_Dopredu na ďalšie nesprávne slovo"
 
-#: src/compose.c:675
+#: src/compose.c:682
 msgid "Reply _mode"
 msgstr "Reži_m odpovede"
 
-#: src/compose.c:677
+#: src/compose.c:684
 msgid "Privacy _System"
 msgstr "_Súkromie"
 
-#: src/compose.c:681
+#: src/compose.c:688
 msgid "_Priority"
 msgstr "Pri_orita"
 
-#: src/compose.c:683 src/mainwindow.c:611 src/messageview.c:264
+#: src/compose.c:690 src/mainwindow.c:620 src/messageview.c:267
 msgid "Character _encoding"
 msgstr "_Kódovanie znakov"
 
-#: src/compose.c:688 src/mainwindow.c:616 src/messageview.c:269
+#: src/compose.c:695 src/mainwindow.c:625 src/messageview.c:272
 msgid "Western European"
 msgstr "Západná Európa (ISO-8859-1)"
 
-#: src/compose.c:689 src/mainwindow.c:617 src/messageview.c:270
+#: src/compose.c:696 src/mainwindow.c:626 src/messageview.c:273
 msgid "Baltic"
 msgstr "Pobaltské"
 
-#: src/compose.c:690 src/mainwindow.c:618 src/messageview.c:271
+#: src/compose.c:697 src/mainwindow.c:627 src/messageview.c:274
 msgid "Hebrew"
 msgstr "Hebrejské"
 
-#: src/compose.c:691 src/mainwindow.c:619 src/messageview.c:272
+#: src/compose.c:698 src/mainwindow.c:628 src/messageview.c:275
 msgid "Arabic"
 msgstr "Arabské"
 
-#: src/compose.c:692 src/mainwindow.c:620 src/messageview.c:273
+#: src/compose.c:699 src/mainwindow.c:629 src/messageview.c:276
 msgid "Cyrillic"
 msgstr "Cyrilika"
 
-#: src/compose.c:693 src/mainwindow.c:621 src/messageview.c:274
+#: src/compose.c:700 src/mainwindow.c:630 src/messageview.c:277
 msgid "Japanese"
 msgstr "Japonské"
 
-#: src/compose.c:694 src/mainwindow.c:622 src/messageview.c:275
+#: src/compose.c:701 src/mainwindow.c:631 src/messageview.c:278
 msgid "Chinese"
 msgstr "Čínske"
 
-#: src/compose.c:695 src/mainwindow.c:623 src/messageview.c:276
+#: src/compose.c:702 src/mainwindow.c:632 src/messageview.c:279
 msgid "Korean"
 msgstr "Kórejské"
 
-#: src/compose.c:696 src/mainwindow.c:624 src/messageview.c:277
+#: src/compose.c:703 src/mainwindow.c:633 src/messageview.c:280
 msgid "Thai"
 msgstr "Thajské"
 
-#: src/compose.c:699 src/mainwindow.c:734 src/messageview.c:313
+#: src/compose.c:706 src/mainwindow.c:743 src/messageview.c:316
 msgid "_Address book"
 msgstr "_Adresár"
 
-#: src/compose.c:701
+#: src/compose.c:708
 msgid "_Template"
 msgstr "Šabló_na"
 
-#: src/compose.c:703 src/mainwindow.c:762 src/messageview.c:333
+#: src/compose.c:710 src/mainwindow.c:771 src/messageview.c:336
 msgid "Actio_ns"
 msgstr "A_kcie"
 
-#: src/compose.c:712
+#: src/compose.c:719
 msgid "Aut_o wrapping"
 msgstr "Aut_omatické zalamovanie"
 
-#: src/compose.c:713
+#: src/compose.c:720
 msgid "Auto _indent"
 msgstr "Automatické odsaden_ie"
 
-#: src/compose.c:714
+#: src/compose.c:721
 msgid "Si_gn"
 msgstr "Podpí_sať"
 
-#: src/compose.c:715
+#: src/compose.c:722
 msgid "_Encrypt"
 msgstr "_Šifrovať"
 
-#: src/compose.c:716
+#: src/compose.c:723
 msgid "_Request Return Receipt"
 msgstr "Vyžiadať potv_rdenie o prijatí"
 
-#: src/compose.c:717
+#: src/compose.c:724
 msgid "Remo_ve references"
 msgstr "_Odstrániť odkazy"
 
-#: src/compose.c:718
+#: src/compose.c:725
 msgid "Show _ruler"
 msgstr "Zobraziť p_ravítko"
 
-#: src/compose.c:723 src/compose.c:733
+#: src/compose.c:730 src/compose.c:740
 msgid "_Normal"
 msgstr "_Normálny"
 
-#: src/compose.c:724 src/mainwindow.c:665 src/messageview.c:302
+#: src/compose.c:731 src/mainwindow.c:674 src/messageview.c:305
+#: src/summaryview.c:433
 msgid "_All"
 msgstr "_Všetkým"
 
-#: src/compose.c:725 src/mainwindow.c:666 src/messageview.c:303
+#: src/compose.c:732 src/mainwindow.c:675 src/messageview.c:306
+#: src/summaryview.c:434
 msgid "_Sender"
 msgstr "Odo_sielateľ"
 
-#: src/compose.c:726
+#: src/compose.c:733
 msgid "_Mailing-list"
 msgstr "E_mailová konferencia"
 
-#: src/compose.c:731
+#: src/compose.c:738
 msgid "_Highest"
 msgstr "_Najvyššia"
 
-#: src/compose.c:732
+#: src/compose.c:739
 msgid "Hi_gh"
 msgstr "_Vysoká"
 
-#: src/compose.c:734
+#: src/compose.c:741
 msgid "Lo_w"
 msgstr "_Nízka"
 
-#: src/compose.c:735
+#: src/compose.c:742
 msgid "_Lowest"
 msgstr "Na_jnižšia"
 
-#: src/compose.c:740 src/mainwindow.c:878 src/messageview.c:350
+#: src/compose.c:747 src/mainwindow.c:890 src/messageview.c:353
 msgid "_Automatic"
 msgstr "_Automaticky"
 
-#: src/compose.c:741 src/mainwindow.c:879 src/messageview.c:351
+#: src/compose.c:748 src/mainwindow.c:891 src/messageview.c:354
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "7bit ASCII (US-ASC_II)"
 
-#: src/compose.c:742 src/mainwindow.c:880 src/messageview.c:352
+#: src/compose.c:749 src/mainwindow.c:892 src/messageview.c:355
 msgid "Unicode (_UTF-8)"
 msgstr "Unicode (_UTF-8)"
 
-#: src/compose.c:746 src/mainwindow.c:884 src/messageview.c:356
+#: src/compose.c:753 src/mainwindow.c:896 src/messageview.c:359
 msgid "Central European (ISO-8859-_2)"
 msgstr "Stredná Európa (ISO-8859-_2)"
 
-#: src/compose.c:749 src/mainwindow.c:887 src/messageview.c:359
+#: src/compose.c:756 src/mainwindow.c:899 src/messageview.c:362
 msgid "Greek (ISO-8859-_7)"
 msgstr "Grécke (ISO-8859-_7)"
 
-#: src/compose.c:754 src/mainwindow.c:892 src/messageview.c:364
+#: src/compose.c:761 src/mainwindow.c:904 src/messageview.c:367
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Turecké (ISO-8859-_9)"
 
-#: src/compose.c:1083
+#: src/compose.c:1015 src/compose.c:1697
+msgid ""
+"You have opted to sign and/or encrypt this message but have not selected a "
+"privacy system.\n"
+"\n"
+"Signing and encrypting have been disabled for this message."
+msgstr ""
+"Zvolili ste podpísať a/alebo šifrovať túto správu, ale nemáte zvolený systém "
+"súkromia.\n"
+"\n"
+"Podpisovanie a šifrovanie tejto správy bolo vpynuté."
+
+#: src/compose.c:1051
 msgid "New message From format error."
 msgstr "Chyba v tvare odosielateľa novej správy."
 
-#: src/compose.c:1176
+#: src/compose.c:1144
 msgid "New message subject format error."
 msgstr "Chyba v tvare predmetu novej správy."
 
-#: src/compose.c:1208 src/quote_fmt.c:570
+#: src/compose.c:1176 src/quote_fmt.c:563
 #, 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:1473
+#: src/compose.c:1445
 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:1656 src/quote_fmt.c:587
+#: src/compose.c:1630 src/quote_fmt.c:580
 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:1705 src/quote_fmt.c:590
+#: src/compose.c:1679 src/quote_fmt.c:583
 #, 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:1839 src/compose.c:2031 src/quote_fmt.c:607
+#: src/compose.c:1822 src/compose.c:2016 src/quote_fmt.c:600
 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:1900 src/quote_fmt.c:610
+#: src/compose.c:1883 src/quote_fmt.c:603
 #, 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:2074
+#: src/compose.c:2059
 msgid "Fw: multiple emails"
 msgstr "Fw: viacero správ"
 
-#: src/compose.c:2576
+#: src/compose.c:2566
 #, 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:2643 src/gtk/headers.h:14
+#: src/compose.c:2633 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "Kópia:"
 
-#: src/compose.c:2646 src/gtk/headers.h:15
+#: src/compose.c:2636 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "Slepá kópia:"
 
-#: src/compose.c:2649 src/gtk/headers.h:12
+#: src/compose.c:2639 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "Odpovedať komu:"
 
-#: src/compose.c:2652 src/compose.c:5019 src/compose.c:5021
+#: src/compose.c:2642 src/compose.c:5011 src/compose.c:5013
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "Diskusné skupiny:"
 
-#: src/compose.c:2655 src/gtk/headers.h:34
+#: src/compose.c:2645 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "Pokračovanie:"
 
-#: src/compose.c:2658 src/gtk/headers.h:17
+#: src/compose.c:2648 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "V odpovedi komu:"
 
-#: src/compose.c:2662 src/compose.c:5016 src/compose.c:5024
-#: src/gtk/headers.h:13 src/summary_search.c:481
+#: src/compose.c:2652 src/compose.c:5008 src/compose.c:5016
+#: src/gtk/headers.h:13 src/summary_search.c:422
 msgid "To:"
 msgstr "Komu:"
 
-#: src/compose.c:2852
+#: src/compose.c:2842
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr "Nemožno priložiť súbor (zlyhala konverzia kódovania)."
 
-#: src/compose.c:2858
+#: src/compose.c:2848
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -1884,73 +1888,73 @@ msgstr[2] ""
 "Nasledujúce súbory budú priložené:\n"
 "%s"
 
-#: src/compose.c:3138
+#: src/compose.c:3128
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "„Značka citácie” šablóny nie je platná."
 
-#: src/compose.c:3667
+#: src/compose.c:3657
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr "Nemožno zistiť veľkosť súboru „%s”."
 
-#: src/compose.c:3685
+#: src/compose.c:3675
 #, 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:3688
+#: src/compose.c:3678
 msgid "Are you sure?"
 msgstr "Ste si istý?"
 
-#: src/compose.c:3689 src/compose.c:10817 src/compose.c:11695
+#: src/compose.c:3679 src/compose.c:10844 src/compose.c:11738
 msgid "_Insert"
 msgstr "_Vložiť"
 
-#: src/compose.c:3813
+#: src/compose.c:3804
 #, c-format
 msgid "File %s is empty."
 msgstr "Súbor %s je prázdny."
 
-#: src/compose.c:3814
+#: src/compose.c:3805
 msgid "Empty file"
 msgstr "Prázdny súbor"
 
-#: src/compose.c:3815
+#: src/compose.c:3806
 msgid "_Attach anyway"
 msgstr "Pripojiť i _tak"
 
-#: src/compose.c:3824
+#: src/compose.c:3815
 #, c-format
 msgid "Can't read %s."
 msgstr "Nemožno čítať %s."
 
-#: src/compose.c:3851
+#: src/compose.c:3842
 #, c-format
 msgid "Message: %s"
 msgstr "Správa: %s"
 
-#: src/compose.c:4856 src/plugins/managesieve/sieve_editor.c:694
+#: src/compose.c:4852 src/plugins/managesieve/sieve_editor.c:696
 #: src/plugins/python/composewindowtype.c:498
 msgid " [Edited]"
-msgstr "[Upravené]"
+msgstr " [Upravené]"
 
-#: src/compose.c:4863 src/plugins/python/composewindowtype.c:501
+#: src/compose.c:4859 src/plugins/python/composewindowtype.c:501
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Písanie správy%s"
 
-#: src/compose.c:4866 src/plugins/python/composewindowtype.c:504
+#: src/compose.c:4862 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:4868 src/plugins/python/composewindowtype.c:492
+#: src/compose.c:4864 src/plugins/python/composewindowtype.c:492
 msgid "Compose message"
 msgstr "Napísať správu"
 
-#: src/compose.c:4895 src/messageview.c:903
+#: src/compose.c:4891 src/messageview.c:887
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1958,103 +1962,112 @@ msgstr ""
 "Nie je zadaný účet na odosielanie správ.\n"
 "Pred odosielaním prosím zvoľte poštový účet."
 
-#: src/compose.c:5116 src/compose.c:5153
+#: src/compose.c:5108 src/compose.c:5145
 #, 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:5118 src/compose.c:5155 src/compose.c:5198 src/compose.c:5247
-#: src/prefs_account.c:3405 src/toolbar.c:487 src/toolbar.c:519
+#: src/compose.c:5110 src/compose.c:5147 src/compose.c:5185 src/compose.c:5228
+#: src/prefs_account.c:3758 src/toolbar.c:487 src/toolbar.c:519
 msgid "Send"
 msgstr "Odoslať"
 
-#: src/compose.c:5120 src/compose.c:5157 src/compose.c:5191 src/compose.c:5240
-#: src/compose.c:5786 src/folderview.c:2543 src/messageview.c:856
-#: src/messageview.c:884 src/plugins/attachwarner/attachwarner.c:210
-#: src/toolbar.c:3030
+#: src/compose.c:5112 src/compose.c:5149 src/compose.c:5186 src/compose.c:5229
+#: src/compose.c:5794 src/folderview.c:2546 src/messageview.c:859
+#: src/plugins/attachwarner/attachwarner.c:218 src/toolbar.c:3054
 msgid "_Send"
 msgstr "_Odoslať"
 
-#: src/compose.c:5174
+#: src/compose.c:5166
 msgid "Recipient is not specified."
 msgstr "Nie je zadaný príjemca."
 
-#: src/compose.c:5193 src/compose.c:5242
-#: src/plugins/attachwarner/attachwarner.c:212
-msgid "_Queue"
-msgstr "Do _fronty"
-
-#: src/compose.c:5194
+#: src/compose.c:5181
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "Prázdny predmet. %s"
 
-#: src/compose.c:5195 src/compose.c:5244
-#: src/plugins/attachwarner/attachwarner.c:222
+#: src/compose.c:5182 src/compose.c:5225
+#: src/plugins/attachwarner/attachwarner.c:215
 msgid "Send it anyway?"
 msgstr "Poslať i tak?"
 
-#: src/compose.c:5196 src/compose.c:5245
-#: src/plugins/attachwarner/attachwarner.c:222
+#: src/compose.c:5183 src/compose.c:5226
+#: src/plugins/attachwarner/attachwarner.c:215
 msgid "Queue it anyway?"
 msgstr "Zaradiť do fronty i tak?"
 
-#: src/compose.c:5198 src/compose.c:5247 src/toolbar.c:520
+#: src/compose.c:5185 src/compose.c:5228 src/toolbar.c:520
 msgid "Send later"
 msgstr "Odoslať ho neskôr"
 
-#: src/compose.c:5243
+#: src/compose.c:5186 src/compose.c:5229
+msgid "_Queue"
+msgstr "Do _fronty"
+
+#: src/compose.c:5224
 #, c-format
 msgid "Sending to %d recipients. %s"
 msgstr "Odosielanie na %d adries. %s"
 
-#: src/compose.c:5300 src/compose.c:10259
+#: src/compose.c:5253
+msgid "Could not queue message."
+msgstr "Nemožno zaradiť správu do fronty na odoslanie."
+
+#: src/compose.c:5256
+#, c-format
 msgid ""
-"Could not queue message for sending:\n"
+"Could not queue message:\n"
 "\n"
-"Charset conversion failed."
+"%s."
 msgstr ""
 "Nemožno zaradiť správu do fronty na odoslanie:\n"
 "\n"
-"Zlyhala konverzia kódovania."
+"%s."
 
-#: src/compose.c:5303 src/compose.c:10262
+#: src/compose.c:5260
+#, c-format
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
-"Couldn't get recipient encryption key."
+"Signature failed: %s"
 msgstr ""
 "Nemožno zaradiť správu do fronty na odoslanie:\n"
 "\n"
-"Nie je dostupný šifrovací kľúč príjemcu."
+"Podpísanie zlyhalo: %s"
 
-#: src/compose.c:5309 src/compose.c:10256
+#: src/compose.c:5265
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
-"Signature failed: %s"
+"Encryption failed: %s"
 msgstr ""
 "Nemožno zaradiť správu do fronty na odoslanie:\n"
 "\n"
-"Podpísanie zlyhalo: %s"
+"Šifrovanie zlyhalo: %s"
 
-#: src/compose.c:5312
-#, c-format
+#: src/compose.c:5270
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
-"%s."
+"Charset conversion failed."
 msgstr ""
 "Nemožno zaradiť správu do fronty na odoslanie:\n"
 "\n"
-"%s."
+"Zlyhala konverzia kódovania."
 
-#: src/compose.c:5314
-msgid "Could not queue message for sending."
-msgstr "Nemožno zaradiť správu do fronty na odoslanie."
+#: src/compose.c:5274
+msgid ""
+"Could not queue message for sending:\n"
+"\n"
+"Couldn't get recipient encryption key."
+msgstr ""
+"Nemožno zaradiť správu do fronty na odoslanie:\n"
+"\n"
+"Nie je dostupný šifrovací kľúč príjemcu."
 
-#: src/compose.c:5329 src/compose.c:5389
+#: src/compose.c:5337 src/compose.c:5397
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -2062,7 +2075,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:5385
+#: src/compose.c:5393
 #, c-format
 msgid ""
 "%s\n"
@@ -2071,7 +2084,7 @@ msgstr ""
 "%s\n"
 "Použite „Odoslať správy vo fronte” z hlavného okna na opakovanie."
 
-#: src/compose.c:5782
+#: src/compose.c:5790
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2082,7 +2095,7 @@ msgstr ""
 "kódovania na %s.\n"
 "Odoslať správu v kódovaní %s?"
 
-#: src/compose.c:5844
+#: src/compose.c:5852
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2095,103 +2108,98 @@ msgstr ""
 "\n"
 "Odoslať aj tak?"
 
-#: src/compose.c:5955
-#, c-format
-msgid "Couldn't encrypt the email: %s"
-msgstr "Nemožno zašifrovať správu: %s"
-
-#: src/compose.c:6076
+#: src/compose.c:6087
 msgid "Encryption warning"
 msgstr "Upozornenie šifrovania"
 
-#: src/compose.c:6077
+#: src/compose.c:6088
 msgid "C_ontinue"
 msgstr "_Pokračovať"
 
-#: src/compose.c:6126
+#: src/compose.c:6137
 msgid "No account for sending mails available!"
 msgstr "Nie je dostupné žiadny účet na odosielanie správ!"
 
-#: src/compose.c:6135
+#: src/compose.c:6146
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "Zvolený účet nie je NNTP: Posielanie nie je možné."
 
-#: src/compose.c:6375
+#: src/compose.c:6400
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "Príloha %s už neexistuje. Ignorovať?"
 
-#: src/compose.c:6376 src/mainwindow.c:656 src/toolbar.c:276 src/toolbar.c:2560
+#: src/compose.c:6402 src/mainwindow.c:665 src/toolbar.c:276 src/toolbar.c:2563
 msgid "Cancel sending"
 msgstr "Zrušiť posielanie"
 
-#: src/compose.c:6376
+#: src/compose.c:6402
 msgid "Ignore attachment"
 msgstr "Ignorovať prílohu"
 
-#: src/compose.c:6432
+#: src/compose.c:6458
 #, c-format
 msgid "Original %s part"
 msgstr "Pôvodná časť %s"
 
-#: src/compose.c:7032
+#: src/compose.c:7058
 msgid "Add to address _book"
 msgstr "Pridať do _adresára"
 
-#: src/compose.c:7193
+#: src/compose.c:7225
 msgid "Delete entry contents"
 msgstr "Zmazať obsah položiek"
 
-#: src/compose.c:7197 src/plugins/vcalendar/vcal_meeting_gtk.c:289
+#: src/compose.c:7229 src/plugins/vcalendar/vcal_meeting_gtk.c:290
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Na automatické doplnenie z adresára použite <TAB>"
 
-#: src/compose.c:7412
+#: src/compose.c:7461
 msgid "Mime type"
 msgstr "Typ MIME"
 
-#: src/compose.c:7418 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:407
-#: src/prefs_matcher.c:630 src/prefs_summaries.c:441
-#: src/prefs_summary_column.c:84 src/summaryview.c:447
+#: src/compose.c:7467 src/mimeview.c:303 src/plugins/pgpcore/select-keys.c:452
+#: src/prefs_matcher.c:641 src/prefs_summaries.c:633
+#: src/prefs_summary_column.c:84 src/summaryview.c:472
 msgid "Size"
 msgstr "Veľkosť"
 
-#: src/compose.c:7481
+#: src/compose.c:7529
 msgid "Save Message to "
 msgstr "Uložiť správu do "
 
-#: src/compose.c:7518 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:1075
-#: src/plugins/bogofilter/bogofilter_gtk.c:229
-#: src/plugins/bogofilter/bogofilter_gtk.c:252
+#: src/compose.c:7560 src/editjpilot.c:276 src/editldap.c:518
+#: src/editvcard.c:193 src/export.c:166 src/import.c:164 src/importmutt.c:239
+#: src/importpine.c:238 src/plugins/archive/archiver_gtk.c:1081
+#: src/plugins/bogofilter/bogofilter_gtk.c:213
+#: src/plugins/bogofilter/bogofilter_gtk.c:236
 #: src/plugins/bsfilter/bsfilter_gtk.c:181
-#: src/plugins/clamd/clamav_plugin_gtk.c:300
-#: src/plugins/spamassassin/spamassassin_gtk.c:418
+#: src/plugins/clamd/clamav_plugin_gtk.c:295
+#: src/plugins/spamassassin/spamassassin_gtk.c:434
 msgid "_Browse"
 msgstr "_Prechádzať"
 
-#: src/compose.c:7540
+#: src/compose.c:7576
 msgid "Select folder to save message to"
 msgstr "Vyberte zložku na uloženie správy"
 
-#: src/compose.c:7997
+#: src/compose.c:8033
 msgid "Hea_der"
 msgstr "H_lavička"
 
-#: src/compose.c:8002
+#: src/compose.c:8038
 msgid "_Attachments"
 msgstr "_Prílohy"
 
-#: src/compose.c:8016
+#: src/compose.c:8052
 msgid "Othe_rs"
 msgstr "_Ostatné"
 
-#: src/compose.c:8031
+#: src/compose.c:8067
 msgid "S_ubject:"
 msgstr "Pre_dmet:"
 
-#: src/compose.c:8255
+#: src/compose.c:8291
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2200,19 +2208,19 @@ msgstr ""
 "Nemožno spustiť kontrolu preklepov.\n"
 "%s"
 
-#: src/compose.c:8402
+#: src/compose.c:8438
 msgid "_From:"
 msgstr "O_d:"
 
-#: src/compose.c:8419
+#: src/compose.c:8455
 msgid "Account to use for this email"
 msgstr "Účet, použitý pre tento email"
 
-#: src/compose.c:8421
+#: src/compose.c:8457
 msgid "Sender address to be used"
 msgstr "Adresa odosielateľa"
 
-#: src/compose.c:8603
+#: src/compose.c:8639
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2221,50 +2229,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:8714 src/plugins/archive/archiver_gtk.c:1174
+#: src/compose.c:8750 src/plugins/archive/archiver_gtk.c:1180
 msgid "_None"
 msgstr "Žiad_na"
 
-#: src/compose.c:8815 src/prefs_template.c:752
+#: src/compose.c:8851 src/prefs_template.c:752
 #, 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:8912
+#: src/compose.c:8948
 #, c-format
 msgctxt "'%s' stands for a header name"
 msgid "Template '%s' format error."
 msgstr "Chyba formátu šablóny „%s”."
 
-#: src/compose.c:9331
+#: src/compose.c:9372
 msgid "Invalid MIME type."
 msgstr "Neplatný typ MIME."
 
-#: src/compose.c:9346
+#: src/compose.c:9387
 msgid "File doesn't exist or is empty."
 msgstr "Súbor neexistuje alebo je prázdny."
 
-#: src/compose.c:9420
+#: src/compose.c:9461
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: src/compose.c:9437
+#: src/compose.c:9479
 msgid "MIME type"
 msgstr "Typ MIME"
 
-#: src/compose.c:9478
+#: src/compose.c:9512
 msgid "Encoding"
 msgstr "Kódovanie"
 
-#: src/compose.c:9498
+#: src/compose.c:9532
 msgid "Path"
 msgstr "Cesta"
 
-#: src/compose.c:9499
+#: src/compose.c:9533
 msgid "File name"
 msgstr "Názov súboru"
 
-#: src/compose.c:9758
+#: src/compose.c:9792
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2275,34 +2283,19 @@ msgstr ""
 "Vynútiť ukončenie procesu?\n"
 "ID skupiny procesu: %d"
 
-#: src/compose.c:10225 src/messageview.c:1105
+#: src/compose.c:10265 src/messageview.c:1088
 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:10251
-msgid "Could not queue message."
-msgstr "Nemožno zaradiť správu do fronty na odoslanie."
-
-#: src/compose.c:10253
-#, c-format
-msgid ""
-"Could not queue message:\n"
-"\n"
-"%s."
-msgstr ""
-"Nemožno zaradiť správu do fronty na odoslanie:\n"
-"\n"
-"%s"
-
-#: src/compose.c:10431
+#: src/compose.c:10458
 msgid "Could not save draft."
 msgstr "Koncept nemožno uložiť."
 
-#: src/compose.c:10435
+#: src/compose.c:10462
 msgid "Could not save draft"
 msgstr "Koncept nemožno uložiť"
 
-#: src/compose.c:10436
+#: src/compose.c:10463
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2310,24 +2303,24 @@ msgstr ""
 "Koncept nemožno uložiť.\n"
 "Chcete pokračovať v písaní, alebo zahodiť rozpísanú správu?"
 
-#: src/compose.c:10438
+#: src/compose.c:10465
 msgid "_Cancel exit"
 msgstr "+_Zrušiť skončenie"
 
-#: src/compose.c:10438
+#: src/compose.c:10465
 msgid "_Discard email"
 msgstr "_Zahodiť správu"
 
-#: src/compose.c:10628 src/compose.c:10642
+#: src/compose.c:10654 src/compose.c:10668
 msgid "Select file"
 msgstr "Zvoľte súbor"
 
-#: src/compose.c:10656
+#: src/compose.c:10682
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Súbor „%s” nemožno čítať."
 
-#: src/compose.c:10658
+#: src/compose.c:10684
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2336,50 +2329,50 @@ msgstr ""
 "Súbor „%s” obsahuje neplatné znaky pre\n"
 "súčasné kódovanie, vloženie môže byť nepresné."
 
-#: src/compose.c:10737
+#: src/compose.c:10763
 msgid "Discard message"
 msgstr "Zahodiť správu"
 
-#: src/compose.c:10738
+#: src/compose.c:10764
 msgid "This message has been modified. Discard it?"
 msgstr "Táto správa bola zmenená. Zahodiť zmeny?"
 
-#: src/compose.c:10739 src/plugins/managesieve/sieve_editor.c:433
+#: src/compose.c:10765 src/plugins/managesieve/sieve_editor.c:434
 msgid "_Discard"
 msgstr "_Zahodiť"
 
-#: src/compose.c:10739 src/compose.c:10743
+#: src/compose.c:10765 src/compose.c:10770
 msgid "_Save to Drafts"
 msgstr "Uložiť medzi _koncepty"
 
-#: src/compose.c:10741 src/plugins/managesieve/sieve_editor.c:431
+#: src/compose.c:10768 src/plugins/managesieve/sieve_editor.c:432
 msgid "Save changes"
 msgstr "Uložiť zmeny"
 
-#: src/compose.c:10742
+#: src/compose.c:10769
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Táto správa bola zmenená. Uložiť posledné zmeny?"
 
-#: src/compose.c:10743
+#: src/compose.c:10770
 msgid "_Don't save"
 msgstr "_Neukladať"
 
-#: src/compose.c:10814
+#: src/compose.c:10841
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Chcete použiť šablónu „%s”?"
 
-#: src/compose.c:10816
+#: src/compose.c:10843
 msgid "Apply template"
 msgstr "Použiť šablónu"
 
-#: src/compose.c:10817 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
+#: src/compose.c:10844 src/prefs_actions.c:331 src/prefs_filtering_action.c:583
+#: src/prefs_filtering.c:478 src/prefs_matcher.c:798 src/prefs_template.c:311
+#: src/prefs_toolbar.c:1018
 msgid "_Replace"
 msgstr "_Nahradiť"
 
-#: src/compose.c:11688
+#: src/compose.c:11731
 #, c-format
 msgid ""
 "Do you want to insert the contents of the file into the message body, or "
@@ -2397,20 +2390,20 @@ msgstr[2] ""
 "Chcete vložiť obsah %d súborov do tela správy, alebo ich chcete pripojiť k "
 "správe ako prílohy?"
 
-#: src/compose.c:11694
+#: src/compose.c:11737
 msgid "Insert or attach?"
 msgstr "Vložiť, alebo pripojiť ako prílohu?"
 
-#: src/compose.c:11695
+#: src/compose.c:11738
 msgid "_Attach"
 msgstr "_Pripojiť"
 
-#: src/compose.c:11915
+#: src/compose.c:11956
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Chyba v tvare citácie na riadku %d."
 
-#: src/compose.c:12212
+#: src/compose.c:12252
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2428,7 +2421,7 @@ msgstr "Proces Claws Mail (%ld) prijal signál %ld"
 msgid "Claws Mail has crashed"
 msgstr "Claws Mail havaroval"
 
-#: src/crash.c:202
+#: src/crash.c:203
 #, c-format
 msgid ""
 "%s.\n"
@@ -2437,31 +2430,31 @@ msgstr ""
 "%s.\n"
 "Prosím vyplňte správu o chybe a pridajte údaje uvedené nižšie."
 
-#: src/crash.c:207
+#: src/crash.c:208
 msgid "Debug log"
 msgstr "Ladiaci záznam"
 
-#: src/crash.c:251 src/toolbar.c:539
+#: src/crash.c:252 src/toolbar.c:539
 msgid "Close"
 msgstr "Zavrieť"
 
-#: src/crash.c:256
+#: src/crash.c:257
 msgid "Save..."
-msgstr "Uložiť…"
+msgstr "Uložiť..."
 
-#: src/crash.c:261
+#: src/crash.c:262
 msgid "Create bug report"
 msgstr "Vytvoriť správu o chybe"
 
-#: src/crash.c:311
+#: src/crash.c:312
 msgid "Save crash information"
 msgstr "Uložiť informácie o havárii"
 
-#: src/editaddress.c:155 src/editaddress.c:231
+#: src/editaddress.c:150 src/editaddress.c:288
 msgid "Add New Person"
 msgstr "Pridať nový kontakt"
 
-#: src/editaddress.c:157
+#: src/editaddress.c:152
 msgid ""
 "Adding a new person requires at least one of the\n"
 "following values to be set:\n"
@@ -2487,7 +2480,7 @@ msgstr ""
 "Zvoľte OK na pokračovanie v úprave kontaktu.\n"
 "Zvoľte Zrušiť na zatvorenie bez uloženia."
 
-#: src/editaddress.c:168
+#: src/editaddress.c:163
 msgid ""
 "Adding a new person requires at least one of the\n"
 "following values to be set:\n"
@@ -2509,35 +2502,35 @@ msgstr ""
 "Zvoľte OK na pokračovanie v úprave kontaktu.\n"
 "Zvoľte Zrušiť na zatvorenie bez uloženia."
 
-#: src/editaddress.c:232
+#: src/editaddress.c:289
 msgid "Edit Person Details"
 msgstr "Upraviť údaje o kontakte"
 
-#: src/editaddress.c:410
+#: src/editaddress.c:507
 msgid "An Email address must be supplied."
 msgstr "Musíte zadať emailovú adresu."
 
-#: src/editaddress.c:586 src/editaddress_other_attributes_ldap.c:198
+#: src/editaddress.c:710 src/editaddress_other_attributes_ldap.c:205
 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:1694
+#: src/editaddress.c:820 src/prefs_folder_item.c:1784
 msgid "Discard"
 msgstr "Zahodiť"
 
-#: src/editaddress.c:676
+#: src/editaddress.c:821
 msgid "Apply"
 msgstr "Použiť"
 
-#: src/editaddress.c:706 src/editaddress.c:755
+#: src/editaddress.c:851 src/editaddress.c:901
 msgid "Edit Person Data"
 msgstr "Upraviť údaje o kontakte"
 
-#: src/editaddress.c:784
+#: src/editaddress.c:930
 msgid "Choose a picture"
 msgstr "Vyberte obrázok"
 
-#: src/editaddress.c:803
+#: src/editaddress.c:949
 #, c-format
 msgid ""
 "Failed to import image: \n"
@@ -2546,58 +2539,58 @@ msgstr ""
 "Zlyhal import obrázku: \n"
 "%s"
 
-#: src/editaddress.c:845
+#: src/editaddress.c:991
 msgid "_Set picture"
 msgstr "_Nastaviť obrázok"
 
-#: src/editaddress.c:846
+#: src/editaddress.c:992
 msgid "_Unset picture"
 msgstr "_Zrušiť obrázok"
 
-#: src/editaddress.c:904
+#: src/editaddress.c:1050
 msgid "Photo"
 msgstr "Fotografia"
 
-#: src/editaddress.c:951 src/editaddress.c:953 src/expldifdlg.c:516
-#: src/exporthtml.c:761 src/ldif.c:746
+#: src/editaddress.c:1097 src/editaddress.c:1099 src/expldifdlg.c:516
+#: src/exporthtml.c:762 src/ldif.c:747
 msgid "Display Name"
 msgstr "Zobrazené meno"
 
-#: src/editaddress.c:962 src/editaddress.c:966 src/ldif.c:754
+#: src/editaddress.c:1108 src/editaddress.c:1112 src/ldif.c:755
 msgid "Last Name"
 msgstr "Priezvisko"
 
-#: src/editaddress.c:963 src/editaddress.c:965 src/ldif.c:750
+#: src/editaddress.c:1109 src/editaddress.c:1111 src/ldif.c:751
 msgid "First Name"
 msgstr "Krstné meno"
 
-#: src/editaddress.c:969 src/editaddress.c:971
+#: src/editaddress.c:1115 src/editaddress.c:1117
 msgid "Nickname"
 msgstr "Prezývka"
 
-#: src/editaddress.c:1055 src/editaddress.c:1123
+#: src/editaddress.c:1253 src/editaddress.c:1294
 msgid "Alias"
 msgstr "Alias"
 
-#: src/editaddress.c:1265 src/editaddress.c:1334 src/editaddress.c:1354
-#: src/editaddress_other_attributes_ldap.c:303
-#: src/editaddress_other_attributes_ldap.c:371 src/prefs_customheader.c:222
+#: src/editaddress.c:1479 src/editaddress.c:1512 src/editaddress.c:1528
+#: src/editaddress_other_attributes_ldap.c:376
+#: src/editaddress_other_attributes_ldap.c:413 src/prefs_customheader.c:223
 msgid "Value"
 msgstr "Hodnota"
 
-#: src/editaddress.c:1425
+#: src/editaddress.c:1594
 msgid "_User Data"
 msgstr "Údaje o _používateľovi"
 
-#: src/editaddress.c:1426
+#: src/editaddress.c:1595
 msgid "_Email Addresses"
 msgstr "_Emailové adresy"
 
-#: src/editaddress.c:1429 src/editaddress.c:1432
+#: src/editaddress.c:1598 src/editaddress.c:1601
 msgid "O_ther Attributes"
 msgstr "Ďalšie _atribúty"
 
-#: src/editaddress.c:1583
+#: src/editaddress.c:1769
 #, c-format
 msgid ""
 "Failed to save image: \n"
@@ -2618,21 +2611,21 @@ msgstr "Súbor nemá platný formát adresára."
 msgid "Could not read file."
 msgstr "Nemožno čítať súbor."
 
-#: src/editbook.c:149 src/editbook.c:262
+#: src/editbook.c:149 src/editbook.c:263
 msgid "Edit Addressbook"
 msgstr "Upraviť adresár"
 
-#: src/editbook.c:177 src/editjpilot.c:264 src/editvcard.c:180
+#: src/editbook.c:178 src/editjpilot.c:264 src/editvcard.c:181
 msgid " Check File "
-msgstr "Skontrolovať súbor"
+msgstr " Skontrolovať súbor "
 
-#: src/editbook.c:182 src/editjpilot.c:269 src/editvcard.c:185
-#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:2023
-#: src/wizard.c:1196 src/wizard.c:1616
+#: src/editbook.c:183 src/editjpilot.c:269 src/editvcard.c:186
+#: src/importmutt.c:232 src/importpine.c:231 src/prefs_account.c:2158
+#: src/wizard.c:1198 src/wizard.c:1618
 msgid "File"
 msgstr "Súbor"
 
-#: src/editbook.c:281
+#: src/editbook.c:282
 msgid "Add New Addressbook"
 msgstr "Pridať nový adresár"
 
@@ -2640,33 +2633,33 @@ msgstr "Pridať nový adresár"
 msgid "A Group Name must be supplied."
 msgstr "Musíte zadať názov skupiny."
 
-#: src/editgroup.c:294
+#: src/editgroup.c:296
 msgid "Edit Group Data"
 msgstr "Upraviť údaje skupiny"
 
-#: src/editgroup.c:323 src/exporthtml.c:597
+#: src/editgroup.c:326 src/exporthtml.c:598
 msgid "Group Name"
 msgstr "Názov skupiny"
 
-#: src/editgroup.c:342
+#: src/editgroup.c:345
 msgid "Addresses in Group"
 msgstr "Adresy v skupine"
 
-#: src/editgroup.c:377
+#: src/editgroup.c:379
 msgid "Available Addresses"
 msgstr "Dostupné adresy"
 
-#: src/editgroup.c:452
+#: src/editgroup.c:453
 msgid "Move Email Addresses to or from Group with arrow buttons"
 msgstr ""
 "Emailové adresy môžete presúvať z alebo do skupiny pomocou tlačidiel so "
 "šípkami"
 
-#: src/editgroup.c:500
+#: src/editgroup.c:501
 msgid "Edit Group Details"
 msgstr "Upraviť detaily skupiny"
 
-#: src/editgroup.c:503
+#: src/editgroup.c:504
 msgid "Add New Group"
 msgstr "Pridať novú skupinu"
 
@@ -2678,13 +2671,13 @@ 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:571 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
+#: src/editgroup.c:556 src/foldersel.c:572 src/imap_gtk.c:193 src/mh_gtk.c:144
+#: src/plugins/mailmbox/plugin_gtk.c:244 src/plugins/rssyl/rssyl_cb_menu.c:92
 msgid "New folder"
 msgstr "Nová zložka"
 
-#: src/editgroup.c:557 src/foldersel.c:572 src/mh_gtk.c:145
-#: src/plugins/mailmbox/plugin_gtk.c:245 src/plugins/rssyl/rssyl_cb_menu.c:92
+#: src/editgroup.c:557 src/foldersel.c:573 src/mh_gtk.c:145
+#: src/plugins/mailmbox/plugin_gtk.c:245 src/plugins/rssyl/rssyl_cb_menu.c:93
 msgid "Input the name of new folder:"
 msgstr "Zadajte názov novej zložky:"
 
@@ -2708,32 +2701,34 @@ msgstr "Ďalšie emailové adresy"
 msgid "Add New JPilot Entry"
 msgstr "Pridať nový záznam JPilot"
 
-#: src/editldap_basedn.c:137
+#: src/editldap_basedn.c:153
 msgid "Edit LDAP - Select Search Base"
 msgstr "Úprava LDAP - Zvoľte základ vyhľadávania"
 
-#: src/editldap_basedn.c:156 src/editldap.c:441
+#: src/editldap_basedn.c:173 src/editldap.c:441 src/prefs_account.c:2910
+#: src/prefs_proxy.c:98
 msgid "Hostname"
 msgstr "Meno počítača"
 
-#: src/editldap_basedn.c:166 src/editldap.c:458
-#: src/plugins/clamd/clamav_plugin_gtk.c:390 src/ssl_manager.c:108
+#: src/editldap_basedn.c:183 src/editldap.c:458
+#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:2917
+#: src/prefs_proxy.c:105 src/ssl_manager.c:117
 msgid "Port"
 msgstr "Port"
 
-#: src/editldap_basedn.c:176 src/editldap.c:503
+#: src/editldap_basedn.c:193 src/editldap.c:502
 msgid "Search Base"
 msgstr "Báza vyhľadávania"
 
-#: src/editldap_basedn.c:197
+#: src/editldap_basedn.c:221
 msgid "Available Search Base(s)"
 msgstr "Dostupné bázy"
 
-#: src/editldap_basedn.c:287
+#: src/editldap_basedn.c:327
 msgid "Could not read Search Base(s) from server - please set manually"
 msgstr "Nemožno načítať bázu(y) vyhľadávania zo servera - prosím zadajte ručne"
 
-#: src/editldap_basedn.c:291 src/editldap.c:281
+#: src/editldap_basedn.c:331 src/editldap.c:281
 msgid "Could not connect to server"
 msgstr "Nemožno sa pripojiť k serveru"
 
@@ -2753,7 +2748,7 @@ msgstr "Musíte zadať aspoň jeden vyhľadávací atribút LDAP."
 msgid "Connected successfully to server"
 msgstr "Úspešne pripojený k serveru"
 
-#: src/editldap.c:336 src/editldap.c:995
+#: src/editldap.c:335 src/editldap.c:991
 msgid "Edit LDAP Server"
 msgstr "Upraviť LDAP server"
 
@@ -2773,15 +2768,15 @@ msgstr ""
 "„localhost”, ak požadovaný server LDAP beží na rovnakom počítači ako Claws "
 "Mail."
 
-#: src/editldap.c:470
+#: src/editldap.c:469
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: src/editldap.c:471 src/prefs_account.c:3478
+#: src/editldap.c:470 src/prefs_account.c:3831
 msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
-#: src/editldap.c:475
+#: src/editldap.c:474
 msgid ""
 "Enable secure connection to the LDAP server via STARTTLS. Connection starts "
 "unencrypted and is secured by STARTTLS command. If connection fails, be sure "
@@ -2792,7 +2787,7 @@ msgstr ""
 "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
+#: src/editldap.c:479
 msgid ""
 "Enable secure connection to the LDAP server via SSL/TLS. If connection "
 "fails, be sure to check the correct configuration in ldap.conf "
@@ -2802,21 +2797,21 @@ msgstr ""
 "zlyhá, skontrolujte správne nastavenie v ldap.conf (polia TLS_CACERTDIR a "
 "TLS_REQCERT)."
 
-#: src/editldap.c:492
+#: src/editldap.c:491
 msgid "The port number that the server listens on. Port 389 is the default."
 msgstr ""
 "Toto je číslo portu, na ktorom server počúva. Implicitne je nastavený port "
 "389."
 
-#: src/editldap.c:495
+#: src/editldap.c:494
 msgid " Check Server "
-msgstr "Overiť server"
+msgstr " Overiť server "
 
-#: src/editldap.c:499
+#: src/editldap.c:498
 msgid "Press this button to test the connection to the server."
 msgstr "Stlačte toto tlačidlo na vyskúšanie pripojenia k serveru."
 
-#: src/editldap.c:512
+#: src/editldap.c:511
 msgid ""
 "This specifies the name of the directory to be searched on the server. "
 "Examples include:\n"
@@ -2829,18 +2824,18 @@ msgstr ""
 "  ou=people,dc=menodomeny,dc=sk\n"
 "  o=Meno organizácie,c=Krajina\n"
 
-#: src/editldap.c:523
+#: src/editldap.c:522
 msgid ""
 "Press this button to lookup the name of available directory names on the "
 "server."
 msgstr ""
 "Stlačte toto tlačidlo na vyhľadanie názvov zložiek dostupných na servere."
 
-#: src/editldap.c:579
+#: src/editldap.c:578
 msgid "Search Attributes"
 msgstr "Vyhľadávacie atribúty"
 
-#: src/editldap.c:588
+#: src/editldap.c:587
 msgid ""
 "A list of LDAP attribute names that should be searched when attempting to "
 "find a name or address."
@@ -2848,11 +2843,11 @@ msgstr ""
 "Zoznam atribútov LDAP, ktoré by mali byť prehľadávané pri hľadaní mena alebo "
 "adresy."
 
-#: src/editldap.c:591
+#: src/editldap.c:590
 msgid " Defaults "
 msgstr " Štandardné "
 
-#: src/editldap.c:595
+#: src/editldap.c:594
 msgid ""
 "This resets the attribute names to a default value that should find most "
 "names and addresses during a name or address search process."
@@ -2860,11 +2855,11 @@ msgstr ""
 "Toto nastaví názvy atribútov naspäť na prednastavenú hodnotu, ktorá by mala "
 "nájsť najviac mien a atribútov počas vyhľadávania."
 
-#: src/editldap.c:601
+#: src/editldap.c:600
 msgid "Max Query Age (secs)"
 msgstr "Max. trvanie požiadavky (v sekundách)"
 
-#: src/editldap.c:616
+#: src/editldap.c:614
 msgid ""
 "This defines the maximum period of time (in seconds) that an address search "
 "result is valid for address completion purposes. Search results are stored "
@@ -2885,11 +2880,11 @@ msgstr ""
 "zlepší čas odozvy pri vyhľadávaní na pomalých serveroch za cenu väčšej "
 "spotreby pamäte."
 
-#: src/editldap.c:633
+#: src/editldap.c:631
 msgid "Include server in dynamic search"
 msgstr "Zahrnúť server v dynamickom vyhľadávaní"
 
-#: src/editldap.c:638
+#: src/editldap.c:636
 msgid ""
 "Check this option to include this server for dynamic searches when using "
 "address completion."
@@ -2897,11 +2892,11 @@ msgstr ""
 "Zvoľte túto možnosť na zahrnutie tohoto servera do dynamického vyhľadávania "
 "pri použití dopĺňania adries."
 
-#: src/editldap.c:644
+#: src/editldap.c:642
 msgid "Match names 'containing' search term"
 msgstr "Vyhľadať mená obsahujúce reťazec"
 
-#: src/editldap.c:649
+#: src/editldap.c:647
 msgid ""
 "Searches for names and addresses can be performed either using \"begins-with"
 "\" or \"contains\" search term. Check this option to perform a \"contains\" "
@@ -2909,16 +2904,16 @@ msgid ""
 "performance reasons, address completion uses \"begins-with\" for all "
 "searches against other address interfaces."
 msgstr ""
-"hľadanie mien a adries možno realizovať pomocou vyhľadávacích výrazov "
+"Hľadanie mien a adries možno realizovať pomocou vyhľadávacích výrazov "
 "„začína” alebo ”obsahuje”. Zvoľte túto možnosť na vyhľadanie pomocou výrazu "
 "„obsahuje”. Toto zvyčajne zaberie viac času. Kvôli lepšiemu výkonu používa "
 "dokončovanie adries výraz „začína” pre všetky ostatné vyhľadávania."
 
-#: src/editldap.c:712
+#: src/editldap.c:710
 msgid "Bind DN"
 msgstr "Priradiť DN"
 
-#: src/editldap.c:721
+#: src/editldap.c:719
 msgid ""
 "The LDAP user account name to be used to connect to the server. This is "
 "usually only used for protected servers. This name is typically formatted "
@@ -2930,87 +2925,88 @@ msgstr ""
 "dc=claws-mail,dc=sk”. Pri vyhľadávaní je toto pole väčšinou ponechané "
 "prázdne."
 
-#: src/editldap.c:728
+#: src/editldap.c:726
 msgid "Bind Password"
 msgstr "Heslo bind"
 
-#: src/editldap.c:738
+#: src/editldap.c:736
 msgid "The password to be used when connecting as the \"Bind DN\" user."
 msgstr "Heslo, ktoré bude použité pri pripájaní sa ako používateľ „Bind DN”."
 
-#: src/editldap.c:741 src/prefs_account.c:1314 src/prefs_account.c:1868
-#: src/prefs_account.c:2587 src/prefs_account.c:2615
+#: src/editldap.c:739 src/prefs_account.c:1405 src/prefs_account.c:2003
+#: src/prefs_account.c:2722 src/prefs_account.c:2750 src/prefs_account.c:2955
+#: src/prefs_proxy.c:146
 msgid "Show password"
 msgstr "Zobraziť heslo"
 
-#: src/editldap.c:750
+#: src/editldap.c:748
 msgid "Timeout (secs)"
 msgstr "Časový limit (v sekundách)"
 
-#: src/editldap.c:764
+#: src/editldap.c:761
 msgid "The timeout period in seconds."
 msgstr "Časový limit v sekundách."
 
-#: src/editldap.c:768
+#: src/editldap.c:765
 msgid "Maximum Entries"
 msgstr "Maximum záznamov"
 
-#: src/editldap.c:782
+#: src/editldap.c:778
 msgid ""
 "The maximum number of entries that should be returned in the search result."
 msgstr "Najväčší počet vrátených výsledkov vyhľadávania."
 
-#: src/editldap.c:797 src/prefs_account.c:3369
+#: src/editldap.c:793 src/prefs_account.c:3722
 msgid "Basic"
 msgstr "Základné"
 
-#: src/editldap.c:799 src/gtk/quicksearch.c:708
+#: src/editldap.c:795 src/gtk/quicksearch.c:706
 msgid "Extended"
 msgstr "Rozšírené"
 
-#: src/editldap.c:1000
+#: src/editldap.c:996
 msgid "Add New LDAP Server"
 msgstr "Pridať nový LDAP server"
 
-#: src/edittags.c:187 src/prefs_filtering_action.c:1450
-#: src/prefs_summaries.c:448
+#: src/edittags.c:192 src/prefs_filtering_action.c:1403
+#: src/prefs_summaries.c:640
 msgid "Tag"
 msgstr "Značka"
 
-#: src/edittags.c:216
+#: src/edittags.c:221
 msgid "Delete tag"
 msgstr "Odstrániť značku"
 
-#: src/edittags.c:217
+#: src/edittags.c:222
 msgid "Do you really want to delete this tag?"
 msgstr "Naozaj chcete odstrániť túto značku?"
 
-#: src/edittags.c:251
+#: src/edittags.c:257
 msgid "Delete all tags"
 msgstr "Odstrániť všetky značky"
 
-#: src/edittags.c:252
+#: src/edittags.c:258
 msgid "Do you really want to delete all tags?"
 msgstr "Naozaj chcete odstrániť všetky značky?"
 
-#: src/edittags.c:423
+#: src/edittags.c:430
 msgid "You entered a reserved tag name, please choose another instead."
 msgstr "Zadali ste rezervované meno značky, prosím, vyberte iné."
 
-#: src/edittags.c:465
+#: src/edittags.c:472
 msgid "Tag is not set."
 msgstr "Značka nie je nastavená."
 
-#: src/edittags.c:530
+#: src/edittags.c:550
 msgctxt "Dialog title"
 msgid "Apply tags"
 msgstr "Použiť značky"
 
-#: src/edittags.c:544
+#: src/edittags.c:567
 msgid "New tag:"
 msgstr "Nová značka:"
 
-#: src/edittags.c:577
+#: src/edittags.c:600
 msgid "Please select tags to apply/remove. Changes are immediate."
 msgstr "Prosím zvoľte značky na použitie alebo odstránenie. Zmeny sú okamžité."
 
@@ -3022,11 +3018,11 @@ msgstr "Súbor nie je vo formáte vCard."
 msgid "Select vCard File"
 msgstr "Vyberte súbor vCard"
 
-#: src/editvcard.c:152 src/editvcard.c:256
+#: src/editvcard.c:152 src/editvcard.c:257
 msgid "Edit vCard Entry"
 msgstr "Upraviť vCard záznam"
 
-#: src/editvcard.c:261
+#: src/editvcard.c:262
 msgid "Add New vCard Entry"
 msgstr "Pridať nový vCard záznam"
 
@@ -3034,11 +3030,11 @@ msgstr "Pridať nový vCard záznam"
 msgid "Impossible to set the client certificate.\n"
 msgstr "Nemožno nastaviť certifikát klienta.\n"
 
-#: src/etpan/nntp-thread.c:865
+#: src/etpan/nntp-thread.c:949
 msgid "couldn't get xover range\n"
 msgstr "nemožno získať rozsah xover\n"
 
-#: src/etpan/nntp-thread.c:963
+#: src/etpan/nntp-thread.c:1048
 msgid "couldn't get xhdr range\n"
 msgstr "nemožno získať rozsah xhdr\n"
 
@@ -3092,30 +3088,31 @@ msgstr "Zvoľte výstupný súbor HTML"
 msgid "HTML Output File"
 msgstr "Výstupný súbor HTML"
 
-#: src/exphtmldlg.c:392 src/expldifdlg.c:409 src/export.c:171 src/import.c:170
-#: src/importldif.c:684
+#: src/exphtmldlg.c:392 src/expldifdlg.c:409 src/export.c:173 src/import.c:171
+#: src/importldif.c:568
 msgid "B_rowse"
 msgstr "P_rehliadať"
 
-#: src/exphtmldlg.c:445 src/plugins/fancy/fancy_prefs.c:300
+#: src/exphtmldlg.c:445 src/plugins/fancy/fancy_prefs.c:301
 msgid "Stylesheet"
 msgstr "Štýlopis"
 
-#: src/exphtmldlg.c:453 src/gtk/colorlabel.c:387 src/gtk/gtkaspell.c:1571
-#: src/gtk/gtkaspell.c:2225 src/gtk/menu.c:125 src/mainwindow.c:1188
+#: src/exphtmldlg.c:453 src/gtk/colorlabel.c:369 src/gtk/gtkaspell.c:1577
+#: src/gtk/gtkaspell.c:2232 src/gtk/menu.c:127 src/mainwindow.c:1181
 #: src/plugins/archive/archiver_prefs.c:313
-#: src/plugins/libravatar/libravatar_prefs.c:304 src/prefs_account.c:949
-#: src/prefs_toolbar.c:790 src/prefs_toolbar.c:1479 src/summaryview.c:6061
+#: src/plugins/libravatar/libravatar_prefs.c:304 src/prefs_account.c:1040
+#: src/prefs_toolbar.c:769 src/prefs_toolbar.c:1435 src/summaryview.c:6269
 msgid "None"
 msgstr "Žiadna"
 
-#: src/exphtmldlg.c:454 src/prefs_folder_item.c:520 src/prefs_other.c:126
-#: src/prefs_other.c:418
+#: src/exphtmldlg.c:454 src/prefs_folder_item.c:523
+#: src/prefs_folder_item.c:1198 src/prefs_folder_item.c:1230
+#: src/prefs_other.c:129 src/prefs_other.c:417
 msgid "Default"
 msgstr "Štandardné"
 
-#: src/exphtmldlg.c:455 src/plugins/pgpcore/select-keys.c:246
-#: src/plugins/pgpcore/sgpgme.c:151 src/plugins/pgpcore/sgpgme.c:167
+#: src/exphtmldlg.c:455 src/plugins/pgpcore/select-keys.c:240
+#: src/plugins/pgpcore/sgpgme.c:152 src/plugins/pgpcore/sgpgme.c:168
 msgid "Full"
 msgstr "Plné"
 
@@ -3159,11 +3156,11 @@ msgstr "Formátovať emailové odkazy"
 msgid "Format User Attributes"
 msgstr "Formátovať používateľské atribúty"
 
-#: src/exphtmldlg.c:539 src/expldifdlg.c:612 src/importldif.c:891
+#: src/exphtmldlg.c:539 src/expldifdlg.c:612 src/importldif.c:850
 msgid "Address Book:"
 msgstr "Adresár:"
 
-#: src/exphtmldlg.c:549 src/expldifdlg.c:622 src/importldif.c:901
+#: src/exphtmldlg.c:549 src/expldifdlg.c:622 src/importldif.c:860
 msgid "File Name:"
 msgstr "Meno súboru:"
 
@@ -3175,11 +3172,11 @@ msgstr "Otvoriť vo webovom prehliadači"
 msgid "Export Address Book to HTML File"
 msgstr "Exportovať adresár do HTML"
 
-#: src/exphtmldlg.c:656 src/expldifdlg.c:720 src/importldif.c:1020
+#: src/exphtmldlg.c:657 src/expldifdlg.c:721 src/importldif.c:980
 msgid "File Info"
 msgstr "Údaje o súbore"
 
-#: src/exphtmldlg.c:657
+#: src/exphtmldlg.c:658
 msgid "Format"
 msgstr "Formát"
 
@@ -3338,86 +3335,86 @@ msgstr ""
 msgid "Export Address Book to LDIF File"
 msgstr "Exportovať adresár do súboru LDIF"
 
-#: src/expldifdlg.c:721
+#: src/expldifdlg.c:722
 msgid "Distinguished Name"
 msgstr "Distguished Name"
 
-#: src/export.c:113 src/summaryview.c:8233
+#: src/export.c:113 src/summaryview.c:8482
 msgid "Export to mbox file"
 msgstr "Exportovať do súboru mbox"
 
-#: src/export.c:131
+#: src/export.c:132
 msgid "Locate the folder to export and specify the mbox file."
 msgstr "Zvoľte zložku na export a zadajte súbor mbox."
 
-#: src/export.c:142
+#: src/export.c:143
 msgid "Source folder:"
 msgstr "Zdrojová zložka:"
 
-#: src/export.c:148 src/import.c:142
+#: src/export.c:149 src/import.c:143
 msgid "Mbox file:"
 msgstr "Súbor mbox:"
 
-#: src/export.c:203
+#: src/export.c:205
 msgid "Target mbox filename can't be left empty."
 msgstr "Musíte zadať názov cieľového súboru mbox."
 
-#: src/export.c:208
+#: src/export.c:210
 msgid "Source folder can't be left empty."
 msgstr "Musíte zadať názov zdrojovej zložky."
 
-#: src/export.c:221
+#: src/export.c:223
 msgid "Couldn't find the source folder."
 msgstr "Nemožno nájsť zadanú zdrojovú zložku."
 
-#: src/export.c:245
+#: src/export.c:247
 msgid "Select exporting file"
 msgstr "Zvoľte súbor na exportovanie"
 
-#: src/export.c:268
+#: src/export.c:270
 msgid "Select folder to export"
 msgstr "Zvoľte zložku na export"
 
-#: src/exporthtml.c:767
+#: src/exporthtml.c:768
 msgid "Full Name"
 msgstr "Celé meno"
 
-#: src/exporthtml.c:771 src/importldif.c:1021
-#: src/plugins/archive/archiver_gtk.c:769
+#: src/exporthtml.c:772 src/importldif.c:981
+#: src/plugins/archive/archiver_gtk.c:772
 msgid "Attributes"
 msgstr "Atribúty"
 
-#: src/exporthtml.c:974
+#: src/exporthtml.c:975
 msgid "Claws Mail Address Book"
 msgstr "Adresár Claws Mail"
 
-#: src/exporthtml.c:1069 src/exportldif.c:606
+#: src/exporthtml.c:1070 src/exportldif.c:607
 msgid "Name already exists but is not a directory."
 msgstr "Názov už existuje, ale nie je to zložka."
 
-#: src/exporthtml.c:1072 src/exportldif.c:609
+#: src/exporthtml.c:1073 src/exportldif.c:610
 msgid "No permissions to create directory."
 msgstr "Nemáte práva na vytvorenie tejto zložky."
 
-#: src/exporthtml.c:1075 src/exportldif.c:612
+#: src/exporthtml.c:1076 src/exportldif.c:613
 msgid "Name is too long."
 msgstr "Názov je príliš dlhý."
 
-#: src/exporthtml.c:1078 src/exportldif.c:615
+#: src/exporthtml.c:1079 src/exportldif.c:616
 msgid "Not specified."
 msgstr "Nie je určený."
 
-#: src/file_checker.c:76
+#: src/file_checker.c:82
 #, c-format
 msgid "The file %s is missing! Do you want to use the backup file from %s?"
 msgstr "Súbor %s chýba! Chcete použiť záložný súbor z %s?"
 
-#: src/file_checker.c:84 src/file_checker.c:106
+#: src/file_checker.c:91 src/file_checker.c:115
 #, c-format
 msgid "Could not copy %s to %s"
 msgstr "Nemožno kopírovať %s do %s"
 
-#: src/file_checker.c:98
+#: src/file_checker.c:106
 #, c-format
 msgid ""
 "The file %s is empty or corrupted! Do you want to use the backup file from "
@@ -3523,51 +3520,51 @@ msgstr "akciu nemožno aplikovať\n"
 msgid "no further processing after action [ %s ]\n"
 msgstr "žiadne ďalšie spracovanie po akcii [ %s ]\n"
 
-#: src/filtering.c:810
+#: src/filtering.c:809
 #, c-format
 msgid "processing rule '%s' [ %s ]\n"
 msgstr "spracovanie pravidla „%s” [ %s ]\n"
 
-#: src/filtering.c:814
+#: src/filtering.c:813
 #, c-format
 msgid "processing rule <unnamed> [ %s ]\n"
 msgstr "spracovanie pravidla <bez mena> [ %s ]\n"
 
-#: src/filtering.c:832
+#: src/filtering.c:831
 #, c-format
 msgid "disabled rule '%s' [ %s ]\n"
 msgstr "vypnuté pravidlo „%s” [ %s ]\n"
 
-#: src/filtering.c:836
+#: src/filtering.c:835
 #, c-format
 msgid "disabled rule <unnamed> [ %s ]\n"
 msgstr "vypnuté pravidlo [ %s ]\n"
 
-#: src/filtering.c:874
+#: src/filtering.c:873
 msgid "undetermined"
 msgstr "neurčené"
 
-#: src/filtering.c:878
+#: src/filtering.c:877
 msgid "incorporation"
 msgstr "začlenenie"
 
-#: src/filtering.c:882
+#: src/filtering.c:881
 msgid "manually"
 msgstr "manuálne"
 
-#: src/filtering.c:886
+#: src/filtering.c:885
 msgid "folder processing"
 msgstr "spracovanie zložky"
 
-#: src/filtering.c:890
+#: src/filtering.c:889
 msgid "pre-processing"
 msgstr "pred-spracovanie"
 
-#: src/filtering.c:894
+#: src/filtering.c:893
 msgid "post-processing"
 msgstr "po-spracovanie"
 
-#: src/filtering.c:909
+#: src/filtering.c:908
 #, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
@@ -3584,11 +3581,11 @@ msgstr ""
 "%s%s %s\n"
 "%s%s %s\n"
 
-#: src/filtering.c:911 src/filtering.c:920
+#: src/filtering.c:910 src/filtering.c:919
 msgid ": "
 msgstr ": "
 
-#: src/filtering.c:918
+#: src/filtering.c:917
 #, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
@@ -3597,60 +3594,61 @@ msgstr ""
 "filtrovanie správy (%s%s%s)\n"
 "%ssúbor správy: %s\n"
 
-#: src/folder.c:1570 src/prefs_folder_item.c:315
+#: src/folder.c:1595 src/prefs_folder_item.c:319
 msgid "Inbox"
 msgstr "Prijaté"
 
-#: src/folder.c:1574
+#: src/folder.c:1599
 msgid "Sent"
 msgstr "Odoslané"
 
-#: src/folder.c:1578 src/prefs_folder_item.c:318
+#: src/folder.c:1603 src/plugins/attachwarner/attachwarner.c:218
+#: src/prefs_folder_item.c:322
 msgid "Queue"
 msgstr "Front"
 
-#: src/folder.c:1582 src/prefs_folder_item.c:319
+#: src/folder.c:1607 src/prefs_folder_item.c:323
 msgid "Trash"
 msgstr "Kôš"
 
-#: src/folder.c:1586 src/prefs_folder_item.c:317
+#: src/folder.c:1611 src/prefs_folder_item.c:321
 msgid "Drafts"
 msgstr "Koncepty"
 
-#: src/folder.c:2017
+#: src/folder.c:2042
 #, c-format
 msgid "Processing (%s)...\n"
-msgstr "Spracúvam (%s)…\n"
+msgstr "Spracúvam (%s)...\n"
 
-#: src/folder.c:3262
+#: src/folder.c:3289
 #, c-format
 msgid "Copying %s to %s...\n"
-msgstr "Kopírujem %s do %s…\n"
+msgstr "Kopírujem %s do %s...\n"
 
-#: src/folder.c:3262
+#: src/folder.c:3289
 #, c-format
 msgid "Moving %s to %s...\n"
-msgstr "Presúvam %s do %s…\n"
+msgstr "Presúvam %s do %s...\n"
 
-#: src/folder.c:3572
+#: src/folder.c:3599
 #, c-format
 msgid "Updating cache for %s..."
-msgstr "Aktualizujem vyrovnávaciu pamäť zložky %s…"
+msgstr "Aktualizujem vyrovnávaciu pamäť zložky %s..."
 
-#: src/folder.c:4434
+#: src/folder.c:4461
 msgid "Processing messages..."
-msgstr "Spracúvam správy…"
+msgstr "Spracúvam správy..."
 
-#: src/folder.c:4569
+#: src/folder.c:4596
 #, c-format
 msgid "Synchronising %s for offline use...\n"
-msgstr "Synchronizujem %s na použitie pri odpojení…\n"
+msgstr "Synchronizujem %s na použitie pri odpojení...\n"
 
-#: src/folder.c:4828
+#: src/folder.c:4855
 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:4832
+#: src/folder.c:4859
 msgid "A folder name can not end with a space."
 msgstr "Názov zložky nemôže končiť bodkou."
 
@@ -3658,31 +3656,31 @@ msgstr "Názov zložky nemôže končiť bodkou."
 msgid "Select folder"
 msgstr "Zvoľte zložku"
 
-#: src/foldersel.c:573 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
+#: src/foldersel.c:574 src/imap_gtk.c:197 src/mh_gtk.c:146
+#: src/plugins/mailmbox/plugin_gtk.c:246 src/plugins/rssyl/rssyl_cb_menu.c:94
 msgid "NewFolder"
 msgstr "Nová zložka"
 
-#: src/foldersel.c:581 src/imap_gtk.c:208 src/imap_gtk.c:214 src/imap_gtk.c:270
+#: src/foldersel.c:582 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:430
-#: src/plugins/rssyl/rssyl_cb_menu.c:204
-#: src/plugins/vcalendar/vcal_folder.c:2059
+#: src/plugins/rssyl/rssyl_cb_menu.c:202
+#: src/plugins/vcalendar/vcal_folder.c:2068
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "Názov zložky nemôže obsahovať „%c”."
 
-#: src/foldersel.c:596 src/imap_gtk.c:224 src/imap_gtk.c:282 src/mh_gtk.c:167
+#: src/foldersel.c:597 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:442 src/plugins/rssyl/rssyl_cb_menu.c:217
-#: src/plugins/vcalendar/vcal_folder.c:2066
+#: src/plugins/mailmbox/plugin_gtk.c:442 src/plugins/rssyl/rssyl_cb_menu.c:214
+#: src/plugins/vcalendar/vcal_folder.c:2075
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "Zložka „%s” už existuje."
 
-#: src/foldersel.c:603 src/imap_gtk.c:230 src/mh_gtk.c:173
+#: src/foldersel.c:604 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
+#: src/plugins/rssyl/rssyl_cb_menu.c:125
 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr "Nemožno vytvoriť zložku „%s”."
@@ -3707,54 +3705,58 @@ msgstr "Označiť všetky ako neprečítané _rekurzívne"
 msgid "R_un processing rules"
 msgstr "Sp_ustiť pravidlá spracovania"
 
-#: src/folderview.c:253 src/mainwindow.c:553
+#: src/folderview.c:253 src/mainwindow.c:562
 msgid "_Search folder..."
-msgstr "Pre_hľadať zložku…"
+msgstr "Pre_hľadať zložku..."
 
 #: src/folderview.c:255
 msgid "Process_ing..."
-msgstr "Spracovan_ie…"
+msgstr "Spracovan_ie..."
 
 #: src/folderview.c:256
 msgid "Empty _trash..."
-msgstr "V_yprázdniť kôš…"
+msgstr "V_yprázdniť kôš..."
 
 #: src/folderview.c:257
 msgid "Send _queue..."
-msgstr "Odoslať _front…"
+msgstr "Odoslať _front..."
+
+#: src/folderview.c:264
+msgid "Set Displayed columns"
+msgstr "Nastaviť zobrazované stĺpce"
 
-#: src/folderview.c:397 src/folderview.c:444
+#: src/folderview.c:403 src/folderview.c:450
 #: src/plugins/notification/notification_lcdproc.c:141
-#: src/prefs_folder_column.c:78 src/prefs_matcher.c:393 src/summaryview.c:6335
+#: src/prefs_folder_column.c:78 src/prefs_matcher.c:402 src/summaryview.c:6543
 msgid "New"
 msgstr "Nový"
 
-#: src/folderview.c:398 src/folderview.c:445
+#: src/folderview.c:404 src/folderview.c:451
 #: src/plugins/notification/notification_lcdproc.c:145
-#: src/prefs_folder_column.c:79 src/prefs_matcher.c:392 src/summaryview.c:6337
+#: src/prefs_folder_column.c:79 src/prefs_matcher.c:401 src/summaryview.c:6545
 #: src/toolbar.c:512
 msgid "Unread"
 msgstr "Neprečítané"
 
-#: src/folderview.c:399 src/plugins/notification/notification_lcdproc.c:149
+#: src/folderview.c:405 src/plugins/notification/notification_lcdproc.c:149
 #: src/prefs_folder_column.c:80
 msgid "Total"
 msgstr "Celkom"
 
 #. TRANSLATORS: This in Number sign in American style
-#: src/folderview.c:447 src/summaryview.c:448
+#: src/folderview.c:453 src/summaryview.c:473
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:782
+#: src/folderview.c:783
 msgid "Setting folder info..."
-msgstr "Nastavujem informácie zložky…"
+msgstr "Nastavujem informácie zložky..."
 
-#: src/folderview.c:867 src/summaryview.c:4182
+#: src/folderview.c:868 src/summaryview.c:4288
 msgid "Mark all as read"
 msgstr "Označiť všetky ako prečítané"
 
-#: src/folderview.c:868
+#: src/folderview.c:869
 msgid ""
 "Do you really want to mark all mails in this folder and its sub-folders as "
 "read?"
@@ -3762,15 +3764,15 @@ msgstr ""
 "Naozaj chcete označiť všetky správy tejto zložky a jej podzložiek ako "
 "prečítané?"
 
-#: src/folderview.c:870 src/summaryview.c:4183
+#: src/folderview.c:871 src/summaryview.c:4289
 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:873 src/summaryview.c:4221
+#: src/folderview.c:874 src/summaryview.c:4334
 msgid "Mark all as unread"
 msgstr "Označiť všetky ako neprečítané"
 
-#: src/folderview.c:874
+#: src/folderview.c:875
 msgid ""
 "Do you really want to mark all mails in this folder and its sub-folders as "
 "unread?"
@@ -3778,95 +3780,95 @@ 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:4222
+#: src/folderview.c:877 src/summaryview.c:4335
 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:4606
+#: src/folderview.c:1067 src/imap.c:4643
 #, c-format
 msgid "Scanning folder %s/%s..."
-msgstr "Prehľadávanie zložky %s/%s…"
+msgstr "Prehľadávanie zložky %s/%s..."
 
-#: src/folderview.c:1069 src/imap.c:4610 src/mainwindow.c:5245 src/setup.c:96
+#: src/folderview.c:1070 src/imap.c:4647 src/mainwindow.c:5280 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
-msgstr "Prehľadávanie zložky %s…"
+msgstr "Prehľadávanie zložky %s..."
 
-#: src/folderview.c:1100
+#: src/folderview.c:1101
 msgid "Rebuild folder tree"
 msgstr "Obnoviť strom zložiek"
 
-#: src/folderview.c:1101
+#: src/folderview.c:1102
 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:1111
+#: src/folderview.c:1112
 msgid "Rebuilding folder tree..."
-msgstr "Obnovujem strom zložiek…"
+msgstr "Obnovujem strom zložiek..."
 
-#: src/folderview.c:1113
+#: src/folderview.c:1114
 msgid "Scanning folder tree..."
-msgstr "Skenujem strom zložiek…"
+msgstr "Skenujem strom zložiek..."
 
-#: src/folderview.c:1204
+#: src/folderview.c:1205
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "Nemožno skenovať obsah zložky %s\n"
 
-#: src/folderview.c:1258
+#: src/folderview.c:1259
 msgid "Checking for new messages in all folders..."
-msgstr "Kontrolujem nové správy vo všetkých zložkách…"
+msgstr "Kontrolujem nové správy vo všetkých zložkách..."
 
-#: src/folderview.c:2229
+#: src/folderview.c:2233
 #, c-format
 msgid "Closing folder %s..."
-msgstr "Zatváram zložku %s…"
+msgstr "Zatváram zložku %s..."
 
-#: src/folderview.c:2324
+#: src/folderview.c:2328
 #, c-format
 msgid "Opening folder %s..."
-msgstr "Otváram zložku %s…"
+msgstr "Otváram zložku %s..."
 
-#: src/folderview.c:2342
+#: src/folderview.c:2346
 msgid "Folder could not be opened."
 msgstr "Zložku nemožno otvoriť."
 
-#: src/folderview.c:2484 src/mainwindow.c:2902 src/mainwindow.c:2906
+#: src/folderview.c:2486 src/mainwindow.c:2896 src/mainwindow.c:2901
 msgid "Empty trash"
 msgstr "Vyprázdniť kôš"
 
-#: src/folderview.c:2485
+#: src/folderview.c:2487
 msgid "Delete all messages in trash?"
 msgstr "Vymazať všetky správy z koša?"
 
-#: src/folderview.c:2486
+#: src/folderview.c:2488
 msgid "_Empty trash"
 msgstr "_Vyprázdniť kôš"
 
-#: src/folderview.c:2529 src/inc.c:1533 src/toolbar.c:3008
+#: src/folderview.c:2532 src/inc.c:1661 src/toolbar.c:3032
 msgid "Offline warning"
 msgstr "Varovanie odpojenia"
 
-#: src/folderview.c:2530 src/toolbar.c:3009
+#: src/folderview.c:2533 src/toolbar.c:3033
 msgid "You're working offline. Override?"
 msgstr "Pracujete odpojený. Pripojiť?"
 
-#: src/folderview.c:2541 src/toolbar.c:3028
+#: src/folderview.c:2544 src/toolbar.c:3052
 msgid "Send queued messages"
 msgstr "Odoslať správy vo fronte"
 
-#: src/folderview.c:2542 src/toolbar.c:3029
+#: src/folderview.c:2545 src/toolbar.c:3053
 msgid "Send all queued messages?"
 msgstr "Odoslať všetky správy vo fronte?"
 
-#: src/folderview.c:2551 src/toolbar.c:3048
+#: src/folderview.c:2554 src/toolbar.c:3072
 msgid "Some errors occurred while sending queued messages."
 msgstr "Pri odosielaní správ vo fronte nastali chyby."
 
-#: src/folderview.c:2554 src/main.c:2780 src/toolbar.c:3051
+#: src/folderview.c:2557 src/main.c:2812 src/toolbar.c:3075
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -3875,64 +3877,64 @@ msgstr ""
 "Pri odosielaní správ vo fronte nastali chyby:\n"
 "%s"
 
-#: src/folderview.c:2629
+#: src/folderview.c:2632
 #, 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:2630
+#: src/folderview.c:2633
 #, 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:2632
+#: src/folderview.c:2635
 msgid "Copy folder"
 msgstr "Kopírovať zložku"
 
-#: src/folderview.c:2632
+#: src/folderview.c:2635
 msgid "Move folder"
 msgstr "Presunúť zložku"
 
-#: src/folderview.c:2643
+#: src/folderview.c:2646
 #, c-format
 msgid "Copying %s to %s..."
-msgstr "Kopírujem %s do %s…"
+msgstr "Kopírujem %s do %s..."
 
-#: src/folderview.c:2643
+#: src/folderview.c:2646
 #, c-format
 msgid "Moving %s to %s..."
-msgstr "Presúvam %s do %s…"
+msgstr "Presúvam %s do %s..."
 
-#: src/folderview.c:2677
+#: src/folderview.c:2680
 msgid "Source and destination are the same."
 msgstr "Zdroj je identický s cieľom."
 
-#: src/folderview.c:2680
+#: src/folderview.c:2683
 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:2681
+#: src/folderview.c:2684
 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:2684
+#: src/folderview.c:2687
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "Zložky nemožno presúvať medzi rôznymi schránkami."
 
-#: src/folderview.c:2687
+#: src/folderview.c:2690
 msgid "Copy failed!"
 msgstr "Kopírovanie zlyhalo!"
 
-#: src/folderview.c:2687
+#: src/folderview.c:2690
 msgid "Move failed!"
 msgstr "Presun zlyhal!"
 
-#: src/folderview.c:2737
+#: src/folderview.c:2740
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Nastavenie spracovania zložky %s"
 
-#: src/folderview.c:3177 src/summaryview.c:4618 src/summaryview.c:4724
+#: src/folderview.c:3175 src/summaryview.c:4743 src/summaryview.c:4849
 msgid "The destination folder can only be used to store subfolders."
 msgstr "Zvolená cieľová zložka môže obsahovať len podzložky."
 
@@ -3956,7 +3958,7 @@ msgstr " Vyhľadať "
 msgid "Newsgroup name"
 msgstr "Názov diskusnej skupiny"
 
-#: src/grouplistdialog.c:205 src/prefs_send.c:184
+#: src/grouplistdialog.c:205 src/prefs_send.c:188
 msgid "Messages"
 msgstr "Správy"
 
@@ -3964,49 +3966,49 @@ msgstr "Správy"
 msgid "Type"
 msgstr "Typ"
 
-#: src/grouplistdialog.c:347
+#: src/grouplistdialog.c:346
 msgid "moderated"
 msgstr "moderovaná"
 
-#: src/grouplistdialog.c:349
+#: src/grouplistdialog.c:348
 msgid "readonly"
 msgstr "len na čítanie"
 
-#: src/grouplistdialog.c:351 src/plugins/att_remover/att_remover.c:302
-#: src/plugins/vcalendar/vcal_manager.c:114
-#: src/plugins/vcalendar/vcal_manager.c:148
+#: src/grouplistdialog.c:350 src/plugins/att_remover/att_remover.c:302
+#: src/plugins/vcalendar/vcal_manager.c:115
+#: src/plugins/vcalendar/vcal_manager.c:149
 msgid "unknown"
 msgstr "neznáme"
 
-#: src/grouplistdialog.c:422
+#: src/grouplistdialog.c:424
 msgid "Can't retrieve newsgroup list."
 msgstr "Nemožno získať zoznam diskusných skupín."
 
-#: src/grouplistdialog.c:459 src/gtk/gtkutils.c:1934 src/summaryview.c:1600
+#: src/grouplistdialog.c:461 src/gtk/gtkutils.c:1857 src/summaryview.c:1683
 msgid "Done."
 msgstr "Hotovo."
 
-#: src/grouplistdialog.c:492
+#: src/grouplistdialog.c:494
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "Prijatých %d diskusných skupín (prečítaných %s)"
 
-#: src/gtk/about.c:132
+#: src/gtk/about.c:133
 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:135
+#: src/gtk/about.c:136
 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
+#: src/gtk/about.c:141
 msgid ""
 "For support and discussion subscribe to the Claws Mail users' mailing list:"
 msgstr ""
 "Na prístup k podpore a diskusii sa prihláste do emailovej konferencie "
 "používateľov Claws Mail:"
 
-#: src/gtk/about.c:146
+#: src/gtk/about.c:147
 msgid ""
 "Claws Mail is free software released under the GPL. If you wish to donate to "
 "the Claws Mail project you can do so at:"
@@ -4014,21 +4016,21 @@ msgstr ""
 "Claws Mail je slobodný softvér vydaný pod licenciou GPL. Ak si prajete "
 "prispieť na projekt Claws Mail, môžete tak učiniť na:"
 
-#: src/gtk/about.c:162 src/gtk/about.c:850
+#: src/gtk/about.c:163 src/gtk/about.c:852
 msgid ""
-"Copyright (C) 1999-2017\n"
+"Copyright (C) 1999-2020\n"
 "The Claws Mail Team\n"
 "and Hiroyuki Yamamoto"
 msgstr ""
-"Copyright (C) 1999 – 2107\n"
+"Copyright (C) 1999 – 2020\n"
 "Tím Claws Mail\n"
 "a Hiroyuki Yamamoto"
 
-#: src/gtk/about.c:167
+#: src/gtk/about.c:168
 msgid "System Information\n"
 msgstr "Informácie o systéme\n"
 
-#: src/gtk/about.c:173
+#: src/gtk/about.c:174
 #, c-format
 msgid ""
 "Locale: %s (charset: %s)\n"
@@ -4037,7 +4039,7 @@ msgstr ""
 "Jazyk: %s (kódovanie: %s)\n"
 "Operačný systém: %s %s (%s)"
 
-#: src/gtk/about.c:182
+#: src/gtk/about.c:183
 #, c-format
 msgid ""
 "Locale: %s (charset: %s)\n"
@@ -4046,7 +4048,7 @@ msgstr ""
 "Jazyk: %s (kódovanie: %s)\n"
 "Operačný systém: %s"
 
-#: src/gtk/about.c:191
+#: src/gtk/about.c:192
 #, c-format
 msgid ""
 "Locale: %s (charset: %s)\n"
@@ -4055,94 +4057,94 @@ msgstr ""
 "Jazyk: %s (kódovanie: %s)\n"
 "Operačný systém: neznámy"
 
-#: src/gtk/about.c:247 src/prefs_themes.c:842 src/wizard.c:527
+#: src/gtk/about.c:248 src/prefs_themes.c:842 src/wizard.c:529
 msgid "The Claws Mail Team"
 msgstr "Tím Claws Mail"
 
-#: src/gtk/about.c:266
+#: src/gtk/about.c:267
 msgid "Previous team members"
 msgstr "Bývalí členovia tímu"
 
-#: src/gtk/about.c:285
+#: src/gtk/about.c:286
 msgid "The translation team"
 msgstr "Prekladateľský tím"
 
-#: src/gtk/about.c:304
+#: src/gtk/about.c:305
 msgid "Documentation team"
 msgstr "Dokumentačný tím"
 
-#: src/gtk/about.c:322
+#: src/gtk/about.c:323
 msgid "Logo"
 msgstr "Logo"
 
-#: src/gtk/about.c:341
+#: src/gtk/about.c:342
 msgid "Icons"
 msgstr "Ikony"
 
-#: src/gtk/about.c:360
+#: src/gtk/about.c:361
 msgid "Contributors"
 msgstr "Prispievatelia"
 
-#: src/gtk/about.c:408
+#: src/gtk/about.c:409
 msgid "Compiled-in Features"
 msgstr "Zabudované funkcie"
 
-#: src/gtk/about.c:425
+#: src/gtk/about.c:426
 msgctxt "compface"
 msgid "adds support for the X-Face header\n"
 msgstr "pridáva podporu hlavičky X-Face\n"
 
-#: src/gtk/about.c:435
+#: src/gtk/about.c:436
 msgctxt "Enchant"
 msgid "adds support for spell checking\n"
 msgstr "pridáva podporu kontroly preklepov\n"
 
-#: src/gtk/about.c:445
+#: src/gtk/about.c:446
 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:455
+#: src/gtk/about.c:456
 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:466
+#: src/gtk/about.c:467
 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:476
+#: src/gtk/about.c:477
 msgctxt "JPilot"
 msgid "adds support for PalmOS addressbooks\n"
 msgstr "pridáva podporu adresárov PalmOS\n"
 
-#: src/gtk/about.c:486
+#: src/gtk/about.c:487
 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:496
+#: src/gtk/about.c:497
 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:506
+#: src/gtk/about.c:507
 msgctxt "libSM"
 msgid "adds support for session handling\n"
 msgstr "pridáva podporu správy relácií\n"
 
-#: src/gtk/about.c:516
+#: src/gtk/about.c:517
 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:526
+#: src/gtk/about.c:527
 msgctxt "librSVG"
 msgid "adds support for SVG themes\n"
 msgstr "pridáva podporu tém SVG\n"
 
-#: src/gtk/about.c:558
+#: src/gtk/about.c:559
 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 "
@@ -4153,7 +4155,7 @@ msgstr ""
 "Free Software Foundation, a to vo verzii 3 alebo (podľa svojho rozhodnutia) "
 "v akejkoľvek ďalšej verzii."
 
-#: src/gtk/about.c:565
+#: src/gtk/about.c:566
 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 "
@@ -4164,153 +4166,153 @@ msgstr ""
 "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:584
+#: src/gtk/about.c:585
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program. If not, see "
 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"
+"programom; ak to tak nie je, navštívte "
 
-#: src/gtk/about.c:717 src/main.c:2604
+#: src/gtk/about.c:718 src/main.c:2636
 msgid "Session statistics\n"
 msgstr "Štatistiky relácie\n"
 
-#: src/gtk/about.c:727 src/gtk/about.c:730 src/main.c:2614 src/main.c:2617
+#: src/gtk/about.c:728 src/gtk/about.c:731 src/main.c:2646 src/main.c:2649
 #, c-format
 msgid "Started: %s\n"
 msgstr "Začatá: %s\n"
 
-#: src/gtk/about.c:737 src/main.c:2623
+#: src/gtk/about.c:738 src/main.c:2655
 msgid "Incoming traffic\n"
 msgstr "Došlá komunikácia\n"
 
-#: src/gtk/about.c:740 src/main.c:2626
+#: src/gtk/about.c:741 src/main.c:2658
 #, c-format
 msgid "Received messages: %d\n"
 msgstr "Prijaté správy: %d\n"
 
-#: src/gtk/about.c:747 src/main.c:2632
+#: src/gtk/about.c:748 src/main.c:2664
 msgid "Outgoing traffic\n"
 msgstr "Odoslaná komunikácia\n"
 
-#: src/gtk/about.c:750 src/main.c:2635
+#: src/gtk/about.c:751 src/main.c:2667
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr "Nové/presmerované správy: %d\n"
 
-#: src/gtk/about.c:755 src/main.c:2639
+#: src/gtk/about.c:756 src/main.c:2671
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr "Odpovede na správy: %d\n"
 
-#: src/gtk/about.c:760 src/main.c:2643
+#: src/gtk/about.c:761 src/main.c:2675
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr "Presmerované správy: %d\n"
 
-#: src/gtk/about.c:765 src/main.c:2647
+#: src/gtk/about.c:766 src/main.c:2679
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr "Odoslané správy celkom: %d\n"
 
-#: src/gtk/about.c:792
+#: src/gtk/about.c:793
 msgid "About Claws Mail"
 msgstr "O programe Claws Mail"
 
-#: src/gtk/about.c:864
+#: src/gtk/about.c:866
 msgid "_Info"
 msgstr "_Informácie"
 
-#: src/gtk/about.c:870
+#: src/gtk/about.c:872
 msgid "_Authors"
 msgstr "_Autori"
 
-#: src/gtk/about.c:876
+#: src/gtk/about.c:878
 msgid "_Features"
 msgstr "_Vlastnosti"
 
-#: src/gtk/about.c:882
+#: src/gtk/about.c:884
 msgid "_License"
 msgstr "_Licencia"
 
-#: src/gtk/about.c:890
+#: src/gtk/about.c:892
 msgid "_Release Notes"
 msgstr "_Poznámky k verzii"
 
-#: src/gtk/about.c:896
+#: src/gtk/about.c:898
 msgid "_Statistics"
 msgstr "Štati_stiky"
 
-#: src/gtk/colorlabel.c:38 src/prefs_common.c:362
+#: src/gtk/colorlabel.c:38 src/prefs_common.c:365
 msgid "Orange"
 msgstr "Oranžová"
 
-#: src/gtk/colorlabel.c:39 src/prefs_common.c:366
+#: src/gtk/colorlabel.c:39 src/prefs_common.c:369
 msgid "Red"
 msgstr "Červená"
 
-#: src/gtk/colorlabel.c:40 src/prefs_common.c:370
+#: src/gtk/colorlabel.c:40 src/prefs_common.c:373
 msgid "Pink"
 msgstr "Ružová"
 
-#: src/gtk/colorlabel.c:41 src/prefs_common.c:374
+#: src/gtk/colorlabel.c:41 src/prefs_common.c:377
 msgid "Sky blue"
 msgstr "Svetlomodrá"
 
-#: src/gtk/colorlabel.c:42 src/prefs_common.c:378
+#: src/gtk/colorlabel.c:42 src/prefs_common.c:381
 msgid "Blue"
 msgstr "Modrá"
 
-#: src/gtk/colorlabel.c:43 src/prefs_common.c:382
+#: src/gtk/colorlabel.c:43 src/prefs_common.c:385
 msgid "Green"
 msgstr "Zelená"
 
-#: src/gtk/colorlabel.c:44 src/prefs_common.c:386
+#: src/gtk/colorlabel.c:44 src/prefs_common.c:389
 msgid "Brown"
 msgstr "Hnedá"
 
-#: src/gtk/colorlabel.c:45 src/prefs_common.c:390
+#: src/gtk/colorlabel.c:45 src/prefs_common.c:393
 msgid "Grey"
 msgstr "Sivá"
 
-#: src/gtk/colorlabel.c:46 src/prefs_common.c:394
+#: src/gtk/colorlabel.c:46 src/prefs_common.c:397
 msgid "Light brown"
 msgstr "Svetlohnedá"
 
-#: src/gtk/colorlabel.c:47 src/prefs_common.c:398
+#: src/gtk/colorlabel.c:47 src/prefs_common.c:401
 msgid "Dark red"
 msgstr "Tmavočervená"
 
-#: src/gtk/colorlabel.c:48 src/prefs_common.c:402
+#: src/gtk/colorlabel.c:48 src/prefs_common.c:405
 msgid "Dark pink"
 msgstr "Tmavoružová"
 
-#: src/gtk/colorlabel.c:49 src/prefs_common.c:406
+#: src/gtk/colorlabel.c:49 src/prefs_common.c:409
 msgid "Steel blue"
 msgstr "Oceľovomodrá"
 
-#: src/gtk/colorlabel.c:50 src/prefs_common.c:410
+#: src/gtk/colorlabel.c:50 src/prefs_common.c:413
 msgid "Gold"
 msgstr "Zlatá"
 
-#: src/gtk/colorlabel.c:51 src/prefs_common.c:414
+#: src/gtk/colorlabel.c:51 src/prefs_common.c:417
 msgid "Bright green"
 msgstr "Svetlozelená"
 
-#: src/gtk/colorlabel.c:52 src/prefs_common.c:418
+#: src/gtk/colorlabel.c:52 src/prefs_common.c:421
 msgid "Magenta"
 msgstr "Fialová"
 
-#: src/gtk/foldersort.c:156
+#: src/gtk/foldersort.c:241
 msgid "Set mailbox order"
 msgstr "Nastaviť poradie schránok"
 
-#: src/gtk/foldersort.c:190
+#: src/gtk/foldersort.c:277
 msgid "Move mailboxes up or down to change the sort order in the Folder list."
 msgstr "Presuňte schránky hore alebo dole na zmenu poradia v Zozname zložiek."
 
-#: src/gtk/foldersort.c:216
+#: src/gtk/foldersort.c:311
 msgid "Mailboxes"
 msgstr "Schránky"
 
@@ -4336,16 +4338,16 @@ msgstr "Nemožno inicializovať slovník %s:"
 msgid "No misspelled word found."
 msgstr "Neboli nájdené žiadne preklepy."
 
-#: src/gtk/gtkaspell.c:1443
+#: src/gtk/gtkaspell.c:1451
 msgid "Replace unknown word"
 msgstr "Nahradiť neznáme slovo"
 
-#: src/gtk/gtkaspell.c:1460
+#: src/gtk/gtkaspell.c:1467
 #, c-format
 msgid "Replace \"%s\" with: "
 msgstr "Nahradiť „%s” s: "
 
-#: src/gtk/gtkaspell.c:1503
+#: src/gtk/gtkaspell.c:1510
 msgid ""
 "Holding down Control key while pressing Enter\n"
 "will learn from mistake.\n"
@@ -4353,55 +4355,55 @@ msgstr ""
 "Ak pri stlačení Enter podržíte klávesu Control,\n"
 "program sa z chyby poučí.\n"
 
-#: src/gtk/gtkaspell.c:1805 src/gtk/gtkaspell.c:1943
+#: src/gtk/gtkaspell.c:1811 src/gtk/gtkaspell.c:1949
 msgid "More..."
-msgstr "Ďalšie…"
+msgstr "Ďalšie..."
 
-#: src/gtk/gtkaspell.c:1861
+#: src/gtk/gtkaspell.c:1867
 #, c-format
 msgid "\"%s\" unknown in dictionary '%s'"
 msgstr "„%s” neznáme v slovníku „%s”"
 
-#: src/gtk/gtkaspell.c:1877
+#: src/gtk/gtkaspell.c:1883
 msgid "Accept in this session"
 msgstr "Prijať v tejto relácii"
 
-#: src/gtk/gtkaspell.c:1887
+#: src/gtk/gtkaspell.c:1893
 msgid "Add to personal dictionary"
 msgstr "Pridať do osobného slovníka"
 
-#: src/gtk/gtkaspell.c:1897
+#: src/gtk/gtkaspell.c:1903
 msgid "Replace with..."
-msgstr "Nahradiť čím…"
+msgstr "Nahradiť čím..."
 
-#: src/gtk/gtkaspell.c:1910
+#: src/gtk/gtkaspell.c:1916
 #, c-format
 msgid "Check with %s"
 msgstr "Overiť pomocou %s"
 
-#: src/gtk/gtkaspell.c:1932
+#: src/gtk/gtkaspell.c:1938
 msgid "(no suggestions)"
 msgstr "(žiadne návrhy)"
 
-#: src/gtk/gtkaspell.c:2006
+#: src/gtk/gtkaspell.c:2012
 #, c-format
 msgid "Dictionary: %s"
 msgstr "Slovník: %s"
 
-#: src/gtk/gtkaspell.c:2021
+#: src/gtk/gtkaspell.c:2027
 #, c-format
 msgid "Use alternate (%s)"
 msgstr "Použiť alternatívny (%s)"
 
-#: src/gtk/gtkaspell.c:2032
+#: src/gtk/gtkaspell.c:2038
 msgid "Use both dictionaries"
 msgstr "Použiť oba slovníky"
 
-#: src/gtk/gtkaspell.c:2048 src/prefs_spelling.c:143
+#: src/gtk/gtkaspell.c:2054 src/prefs_spelling.c:143
 msgid "Check while typing"
 msgstr "Overovať pri písaní"
 
-#: src/gtk/gtkaspell.c:2147
+#: src/gtk/gtkaspell.c:2154
 #, c-format
 msgid ""
 "The spell checker could not change dictionary.\n"
@@ -4410,7 +4412,7 @@ msgstr ""
 "Kontrola preklepov nemohla zmeniť slovník.\n"
 "%s"
 
-#: src/gtk/gtkaspell.c:2203
+#: src/gtk/gtkaspell.c:2210
 #, c-format
 msgid ""
 "The spell checker could not change the alternate dictionary.\n"
@@ -4419,26 +4421,26 @@ msgstr ""
 "Kontrola preklepov nemohla zmeniť alternatívny slovník.\n"
 "%s"
 
-#: src/gtk/gtkutils.c:1939
+#: src/gtk/gtkutils.c:1862
 msgid "Failed: no service record found."
 msgstr "Zlyhalo: nebol nájdený záznam služby."
 
-#: src/gtk/gtkutils.c:1942
+#: src/gtk/gtkutils.c:1865
 msgid "Failed: network error."
 msgstr "Zlyhalo: chyba siete."
 
-#: src/gtk/gtkutils.c:1945
+#: src/gtk/gtkutils.c:1868
 #, c-format
 msgid "Failed: unknown error (%d)."
 msgstr "Zlyhalo: neznáma chyba (%d)."
 
-#: src/gtk/gtkutils.c:2015
+#: src/gtk/gtkutils.c:1938
 msgid "Configuring..."
-msgstr "Nastavovanie…"
+msgstr "Nastavovanie..."
 
-#: src/gtk/headers.h:9 src/prefs_filtering_action.c:1262
-#: src/prefs_matcher.c:2168 src/prefs_summaries.c:442
-#: src/prefs_summary_column.c:83 src/quote_fmt.c:49 src/summaryview.c:446
+#: src/gtk/headers.h:9 src/prefs_filtering_action.c:1225
+#: src/prefs_matcher.c:646 src/prefs_matcher.c:2217 src/prefs_summaries.c:634
+#: src/prefs_summary_column.c:83 src/quote_fmt.c:49 src/summaryview.c:471
 msgid "Date"
 msgstr "Dátum"
 
@@ -4446,13 +4448,13 @@ msgstr "Dátum"
 msgid "Date:"
 msgstr "Dátum:"
 
-#: src/gtk/headers.h:10 src/prefs_filtering_action.c:1259
-#: src/prefs_matcher.c:2165 src/prefs_summaries.c:444
-#: src/prefs_summary_column.c:81 src/quote_fmt.c:50 src/summaryview.c:444
+#: src/gtk/headers.h:10 src/prefs_filtering_action.c:1222
+#: src/prefs_matcher.c:2214 src/prefs_summaries.c:636
+#: src/prefs_summary_column.c:81 src/quote_fmt.c:50 src/summaryview.c:469
 msgid "From"
 msgstr "Od"
 
-#: src/gtk/headers.h:10 src/summary_search.c:474
+#: src/gtk/headers.h:10 src/summary_search.c:415
 msgid "From:"
 msgstr "Od:"
 
@@ -4468,14 +4470,14 @@ msgstr "Odosielateľ:"
 msgid "Reply-To"
 msgstr "Odpovedať komu"
 
-#: src/gtk/headers.h:13 src/prefs_filtering_action.c:1260
-#: src/prefs_matcher.c:2166 src/prefs_summaries.c:445
-#: src/prefs_summary_column.c:82 src/quote_fmt.c:57 src/summaryview.c:445
+#: src/gtk/headers.h:13 src/prefs_filtering_action.c:1223
+#: src/prefs_matcher.c:2215 src/prefs_summaries.c:637
+#: src/prefs_summary_column.c:82 src/quote_fmt.c:57 src/summaryview.c:470
 msgid "To"
 msgstr "Komu"
 
-#: src/gtk/headers.h:14 src/prefs_filtering_action.c:1261
-#: src/prefs_matcher.c:2167 src/quote_fmt.c:58
+#: src/gtk/headers.h:14 src/prefs_filtering_action.c:1224
+#: src/prefs_matcher.c:2216 src/quote_fmt.c:58
 msgid "Cc"
 msgstr "Kópia"
 
@@ -4483,8 +4485,8 @@ msgstr "Kópia"
 msgid "Bcc"
 msgstr "Slepá kópia"
 
-#: src/gtk/headers.h:16 src/prefs_filtering_action.c:1263
-#: src/prefs_matcher.c:2169 src/quote_fmt.c:61
+#: src/gtk/headers.h:16 src/prefs_filtering_action.c:1226
+#: src/prefs_matcher.c:2218 src/quote_fmt.c:61
 msgid "Message-ID"
 msgstr "Message-ID"
 
@@ -4496,8 +4498,8 @@ msgstr "Message-ID:"
 msgid "In-Reply-To"
 msgstr "In-Reply-To"
 
-#: src/gtk/headers.h:18 src/prefs_filtering_action.c:1265
-#: src/prefs_matcher.c:2171 src/quote_fmt.c:60
+#: src/gtk/headers.h:18 src/prefs_filtering_action.c:1228
+#: src/prefs_matcher.c:2220 src/quote_fmt.c:60
 msgid "References"
 msgstr "Odkazy"
 
@@ -4505,18 +4507,18 @@ msgstr "Odkazy"
 msgid "References:"
 msgstr "Odkazy:"
 
-#: src/gtk/headers.h:19 src/prefs_filtering_action.c:1258
-#: src/prefs_matcher.c:2164 src/prefs_summaries.c:446
-#: src/prefs_summary_column.c:80 src/quote_fmt.c:56 src/summaryview.c:443
+#: src/gtk/headers.h:19 src/prefs_filtering_action.c:1221
+#: src/prefs_matcher.c:2213 src/prefs_summaries.c:638
+#: src/prefs_summary_column.c:80 src/quote_fmt.c:56 src/summaryview.c:468
 msgid "Subject"
 msgstr "Predmet"
 
-#: src/gtk/headers.h:19 src/plugins/pdf_viewer/poppler_viewer.c:702
-#: src/summary_search.c:488
+#: src/gtk/headers.h:19 src/plugins/pdf_viewer/poppler_viewer.c:705
+#: src/summary_search.c:429
 msgid "Subject:"
 msgstr "Predmet:"
 
-#: src/gtk/headers.h:20 src/plugins/rssyl/rssyl_feed_props.c:431
+#: src/gtk/headers.h:20 src/plugins/rssyl/rssyl_feed_props.c:421
 msgid "Comments"
 msgstr "Komentáre"
 
@@ -4528,7 +4530,7 @@ msgstr "Komentáre:"
 msgid "Keywords"
 msgstr "Kľúčové slová"
 
-#: src/gtk/headers.h:21 src/plugins/pdf_viewer/poppler_viewer.c:704
+#: src/gtk/headers.h:21 src/plugins/pdf_viewer/poppler_viewer.c:707
 msgid "Keywords:"
 msgstr "Kľúčové slová:"
 
@@ -4604,8 +4606,8 @@ msgstr "Received"
 msgid "Received:"
 msgstr "Received:"
 
-#: src/gtk/headers.h:33 src/prefs_filtering_action.c:1264
-#: src/prefs_matcher.c:2170 src/quote_fmt.c:59
+#: src/gtk/headers.h:33 src/prefs_filtering_action.c:1227
+#: src/prefs_matcher.c:2219 src/quote_fmt.c:59
 msgid "Newsgroups"
 msgstr "Diskusné skupiny"
 
@@ -4630,12 +4632,13 @@ msgid "Seen:"
 msgstr "Seen:"
 
 #: src/gtk/headers.h:37 src/gtk/progressdialog.c:149
-#: src/gtk/sslcertwindow.c:164 src/prefs_summaries.c:450
-#: src/prefs_summary_column.c:78 src/summaryview.c:2823
+#: src/gtk/sslcertwindow.c:190 src/prefs_summaries.c:642
+#: src/prefs_summary_column.c:78 src/prefs_themes.c:1034 src/ssl_manager.c:124
+#: src/summaryview.c:2898
 msgid "Status"
 msgstr "Status"
 
-#: src/gtk/headers.h:37 src/prefs_themes.c:1033
+#: src/gtk/headers.h:37
 msgid "Status:"
 msgstr "Status:"
 
@@ -4675,7 +4678,7 @@ msgstr "User-Agent:"
 msgid "Content-Type"
 msgstr "Content-Type"
 
-#: src/gtk/headers.h:42 src/image_viewer.c:327
+#: src/gtk/headers.h:42 src/image_viewer.c:340
 msgid "Content-Type:"
 msgstr "Content-Type:"
 
@@ -4703,7 +4706,7 @@ msgstr "Precedence"
 msgid "Precedence:"
 msgstr "Precedence:"
 
-#: src/gtk/headers.h:46 src/prefs_account.c:1078
+#: src/gtk/headers.h:46 src/prefs_account.c:1169
 msgid "Organization"
 msgstr "Organizácia"
 
@@ -4927,48 +4930,52 @@ msgstr "Poštová schránka IMAP zobrazujúca len vyžiadané zložky"
 msgid "Icon Legend"
 msgstr "Legenda k ikonám"
 
-#: src/gtk/icon_legend.c:145
+#: src/gtk/icon_legend.c:146
 msgid ""
 "The following icons are used to show the status of messages and folders:"
 msgstr "Nasledujúce ikony sú použité na zobrazenie stavu správ alebo zložiek:"
 
-#: src/gtk/inputdialog.c:233 src/gtk/inputdialog.c:255
+#: src/gtk/inputdialog.c:228 src/gtk/inputdialog.c:250
 #, c-format
 msgid "Input password for %s on %s:"
 msgstr "Zadajte heslo pre %s na %s:"
 
-#: src/gtk/inputdialog.c:236 src/gtk/inputdialog.c:239
-#: src/gtk/inputdialog.c:258 src/gtk/inputdialog.c:261
+#: src/gtk/inputdialog.c:231 src/gtk/inputdialog.c:234
+#: src/gtk/inputdialog.c:253 src/gtk/inputdialog.c:256
 #, c-format
 msgid "Input password for %s:"
 msgstr "Zadajte heslo pre %s:"
 
-#: src/gtk/inputdialog.c:242 src/gtk/inputdialog.c:264
+#: src/gtk/inputdialog.c:237 src/gtk/inputdialog.c:259
 msgid "Input password:"
 msgstr "Zadajte heslo:"
 
-#: src/gtk/inputdialog.c:243 src/gtk/inputdialog.c:271
-#: src/gtk/inputdialog.c:283
+#: src/gtk/inputdialog.c:238 src/gtk/inputdialog.c:266
+#: src/gtk/inputdialog.c:278
 msgid "Input password"
 msgstr "Zadajte heslo"
 
-#: src/gtk/inputdialog.c:273
+#: src/gtk/inputdialog.c:268
 msgid "Remember password for this session"
 msgstr "Zapamätať heslo počas tejto relácie"
 
-#: src/gtk/inputdialog.c:372 src/gtk/inputdialog.c:419
+#: src/gtk/inputdialog.c:363 src/gtk/inputdialog.c:410
 msgid "Remember this"
 msgstr "Zapamätať si"
 
-#: src/gtk/logwindow.c:447
+#: src/gtk/logwindow.c:450
+msgid "_Go to last error"
+msgstr "Prejsť na _poslednú chybu"
+
+#: src/gtk/logwindow.c:457
 msgid "Clear _Log"
 msgstr "Vyčistiť okno _záznamu"
 
-#: src/gtk/menu.c:137
+#: src/gtk/menu.c:139
 msgid "Warning:"
 msgstr "Upozornenie:"
 
-#: src/gtk/menu.c:138
+#: src/gtk/menu.c:140
 msgid ""
 "This URL was too long for displaying and\n"
 "has been truncated for safety. This message could be\n"
@@ -5011,18 +5018,18 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: src/gtk/pluginwindow.c:303 src/plugins/acpi_notifier/acpi_notifier.c:790
+#: src/gtk/pluginwindow.c:303 src/plugins/acpi_notifier/acpi_notifier.c:792
 #: 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/bogofilter/bogofilter_gtk.c:482
 #: src/plugins/bsfilter/bsfilter_gtk.c:400
-#: src/plugins/clamd/clamav_plugin_gtk.c:549
-#: src/plugins/fancy/fancy_prefs.c:114
+#: src/plugins/clamd/clamav_plugin_gtk.c:537
+#: src/plugins/fancy/fancy_prefs.c:115
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:181
 #: src/plugins/gdata/cm_gdata_prefs.c:137
 #: src/plugins/libravatar/libravatar_prefs.c:545
-#: src/plugins/managesieve/sieve_prefs.c:427
+#: src/plugins/managesieve/sieve_prefs.c:423
 #: src/plugins/notification/notification_prefs.c:398
 #: src/plugins/notification/notification_prefs.c:413
 #: src/plugins/notification/notification_prefs.c:432
@@ -5031,252 +5038,260 @@ msgstr ""
 #: src/plugins/notification/notification_prefs.c:486
 #: src/plugins/notification/notification_prefs.c:504
 #: src/plugins/notification/notification_prefs.c:522
-#: src/plugins/pgpcore/prefs_gpg.c:686 src/plugins/pgpcore/prefs_gpg.c:706
+#: src/plugins/pgpcore/prefs_gpg.c:687 src/plugins/pgpcore/prefs_gpg.c:707
 #: src/plugins/rssyl/rssyl_prefs.c:70
 #: src/plugins/spam_report/spam_report_prefs.c:82
-#: src/plugins/spamassassin/spamassassin_gtk.c:648
-#: src/plugins/vcalendar/vcal_prefs.c:774 src/prefs_toolbar.c:957
+#: src/plugins/spamassassin/spamassassin_gtk.c:670
+#: src/plugins/vcalendar/vcal_prefs.c:774 src/prefs_toolbar.c:924
 msgid "Plugins"
 msgstr "Zásuvné moduly"
 
-#: src/gtk/pluginwindow.c:336
+#: src/gtk/pluginwindow.c:337
 msgid "_Load..."
-msgstr "_Načítať…"
+msgstr "_Načítať..."
 
-#: src/gtk/pluginwindow.c:337
+#: src/gtk/pluginwindow.c:338
 msgid "_Unload"
 msgstr "_Odobrať"
 
-#: src/gtk/pluginwindow.c:351 src/prefs_summaries.c:229
+#: src/gtk/pluginwindow.c:352 src/prefs_summaries.c:237
 msgid "Description"
 msgstr "Popis"
 
-#: src/gtk/pluginwindow.c:375
+#: src/gtk/pluginwindow.c:376
 #, c-format
 msgid "For more information about plugins see the %sClaws Mail website%s."
 msgstr ""
 "Ďalšie informácie o zásuvnom module môžete nájsť na %swebovej stránke Claws "
 "Mail%s."
 
-#: src/gtk/pluginwindow.c:416
+#: src/gtk/pluginwindow.c:417
 msgid "Click here to load one or more plugins"
 msgstr "Toto tlačidlo načíta jeden alebo viac zásuvných modulov"
 
-#: src/gtk/pluginwindow.c:419
+#: src/gtk/pluginwindow.c:420
 msgid "Unload the selected plugin"
 msgstr "Odobrať zvolený zásuvný modul"
 
-#: src/gtk/pluginwindow.c:484
+#: src/gtk/pluginwindow.c:485
 msgid "Loaded plugins"
 msgstr "Načítané zásuvné moduly"
 
-#: src/gtk/prefswindow.c:639
+#: src/gtk/prefswindow.c:640
 msgid "Page Index"
 msgstr "Obsah Stránky"
 
-#: src/gtk/progressdialog.c:91 src/mainwindow.c:841
+#: src/gtk/progressdialog.c:91 src/mainwindow.c:853
 msgid "_Hide"
 msgstr "_Skryť"
 
-#: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:688
-#: src/prefs_account.c:3368 src/prefs_account.c:3386 src/prefs_account.c:3404
-#: src/prefs_account.c:3422 src/prefs_account.c:3440 src/prefs_account.c:3458
-#: src/prefs_account.c:3477 src/prefs_account.c:3570
-#: src/prefs_filtering_action.c:1425 src/prefs_filtering.c:397
-#: src/prefs_filtering.c:1879
+#: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:694
+#: src/prefs_account.c:3721 src/prefs_account.c:3739 src/prefs_account.c:3757
+#: src/prefs_account.c:3775 src/prefs_account.c:3793 src/prefs_account.c:3811
+#: src/prefs_account.c:3830 src/prefs_account.c:3923 src/prefs_account.c:3941
+#: src/prefs_filtering_action.c:1380 src/prefs_filtering.c:398
+#: src/prefs_filtering.c:1884
 msgid "Account"
 msgstr "Účet"
 
-#: src/gtk/quicksearch.c:478
+#: src/gtk/quicksearch.c:472
 msgid "all messages"
 msgstr "všetky správy"
 
-#: src/gtk/quicksearch.c:479
+#: src/gtk/quicksearch.c:473
 msgid "messages whose age is greater than # days"
 msgstr "správy, ktoré sú staršie ako # dní"
 
-#: src/gtk/quicksearch.c:480
+#: src/gtk/quicksearch.c:474
 msgid "messages whose age is less than # days"
 msgstr "správy, ktoré sú novšie ako # dní"
 
-#: src/gtk/quicksearch.c:481
+#: src/gtk/quicksearch.c:475
 msgid "messages whose age is greater than # hours"
 msgstr "správy, ktoré sú staršie ako # hodín"
 
-#: src/gtk/quicksearch.c:482
+#: src/gtk/quicksearch.c:476
 msgid "messages whose age is less than # hours"
 msgstr "správy, ktoré sú novšie ako # hodín"
 
-#: src/gtk/quicksearch.c:483
+#: src/gtk/quicksearch.c:477
 msgid "messages which contain S in the message body"
 msgstr "správy, ktorých telo obsahuje S"
 
-#: src/gtk/quicksearch.c:484
+#: src/gtk/quicksearch.c:478
 msgid "messages which contain S in the whole message"
 msgstr "správy, ktoré obsahujú S kdekoľvek"
 
-#: src/gtk/quicksearch.c:485
+#: src/gtk/quicksearch.c:479
 msgid "messages carbon-copied to S"
 msgstr "správy s kópiou v S"
 
-#: src/gtk/quicksearch.c:486
+#: src/gtk/quicksearch.c:480
 msgid "message is either To: or Cc: to S"
 msgstr "správa je buď To: alebo Cc: pre S"
 
-#: src/gtk/quicksearch.c:487
+#: src/gtk/quicksearch.c:481
 msgid "deleted messages"
 msgstr "vymazané správy"
 
-#: src/gtk/quicksearch.c:488
+#: src/gtk/quicksearch.c:482
+msgid "messages whose date is after requested date (time is optional)"
+msgstr "správy, ktorých dátum je po zadanom dátume (čas je voliteľný)"
+
+#: src/gtk/quicksearch.c:484
+msgid "messages whose date is before requested date (time is optional)"
+msgstr "správy, ktorých dátum je pred zadaným dátumom (čas je voliteľný)"
+
+#: src/gtk/quicksearch.c:486
 msgid "messages which contain S in the Sender field"
 msgstr "správy, ktoré obsahujú S v hlavičke Sender"
 
-#: src/gtk/quicksearch.c:489
+#: src/gtk/quicksearch.c:487
 msgid "true if execute \"S\" succeeds"
 msgstr "pravda, ak je „S” vykonané úspešne"
 
-#: src/gtk/quicksearch.c:490
+#: src/gtk/quicksearch.c:488
 msgid "messages originating from user S"
 msgstr "správy pochádzajúce od používateľa S"
 
-#: src/gtk/quicksearch.c:491
+#: src/gtk/quicksearch.c:489
 msgid "forwarded messages"
 msgstr "správy poslané ďalej"
 
-#: src/gtk/quicksearch.c:492
+#: src/gtk/quicksearch.c:490
 msgid "messages which have attachments"
 msgstr "správy s prílohami"
 
-#: src/gtk/quicksearch.c:493
+#: src/gtk/quicksearch.c:491
 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:494
+#: src/gtk/quicksearch.c:492
 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:495
+#: src/gtk/quicksearch.c:493
 msgid "messages which contain S in Message-ID header"
 msgstr "správy, ktoré obsahujú S v hlavičke Message-ID"
 
-#: src/gtk/quicksearch.c:496
+#: src/gtk/quicksearch.c:494
 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:497
+#: src/gtk/quicksearch.c:495
 msgid "messages which are marked with color #"
 msgstr "správy, ktoré sú označené farbou #"
 
-#: src/gtk/quicksearch.c:498
+#: src/gtk/quicksearch.c:496
 msgid "locked messages"
 msgstr "zamknuté správy"
 
-#: src/gtk/quicksearch.c:499
+#: src/gtk/quicksearch.c:497
 msgid "messages which are in newsgroup S"
 msgstr "správy, ktoré sú v diskusnej skupine S"
 
-#: src/gtk/quicksearch.c:500
+#: src/gtk/quicksearch.c:498
 msgid "new messages"
 msgstr "nové správy"
 
-#: src/gtk/quicksearch.c:501
+#: src/gtk/quicksearch.c:499
 msgid "old messages"
 msgstr "staré správy"
 
-#: src/gtk/quicksearch.c:502
+#: src/gtk/quicksearch.c:500
 msgid "incomplete messages (not entirely downloaded)"
 msgstr "neúplné správy (nestiahnuté úplne)"
 
-#: src/gtk/quicksearch.c:503
+#: src/gtk/quicksearch.c:501
 msgid "messages which you have replied to"
 msgstr "správy, na ktoré ste odpovedali"
 
-#: src/gtk/quicksearch.c:504
+#: src/gtk/quicksearch.c:502
 msgid "read messages"
 msgstr "prečítané správy"
 
-#: src/gtk/quicksearch.c:505
+#: src/gtk/quicksearch.c:503
 msgid "messages which contain S in subject"
 msgstr "správy, ktoré obsahujú S v názve"
 
-#: src/gtk/quicksearch.c:506
+#: src/gtk/quicksearch.c:504
 msgid "messages whose score is equal to # points"
 msgstr "správy, ktorých ohodnotenie je rovné # bodov"
 
-#: src/gtk/quicksearch.c:507
+#: src/gtk/quicksearch.c:505
 msgid "messages whose score is greater than # points"
 msgstr "správy, ktorých ohodnotenie je väčšie ako # bodov"
 
-#: src/gtk/quicksearch.c:508
+#: src/gtk/quicksearch.c:506
 msgid "messages whose score is lower than # points"
 msgstr "správy, ktorých ohodnotenie je menšie ako # bodov"
 
-#: src/gtk/quicksearch.c:509
+#: src/gtk/quicksearch.c:507
 msgid "messages whose size is equal to # bytes"
 msgstr "správy, ktorých veľkosť je rovná # bajtov"
 
-#: src/gtk/quicksearch.c:510
+#: src/gtk/quicksearch.c:508
 msgid "messages whose size is greater than # bytes"
 msgstr "správy, ktorých veľkosť je väčšia ako # bajtov"
 
-#: src/gtk/quicksearch.c:511
+#: src/gtk/quicksearch.c:509
 msgid "messages whose size is smaller than # bytes"
 msgstr "správy, ktorých veľkosť je menšia ako # bajtov"
 
-#: src/gtk/quicksearch.c:512
+#: src/gtk/quicksearch.c:510
 msgid "messages which have been sent to S"
 msgstr "správy, odoslané S"
 
-#: src/gtk/quicksearch.c:513
+#: src/gtk/quicksearch.c:511
 msgid "messages which tags contain S"
 msgstr "správy, ktorých značky obsahujú S"
 
-#: src/gtk/quicksearch.c:514
+#: src/gtk/quicksearch.c:512
 msgid "messages which have tag(s)"
 msgstr "správy so značkami S"
 
-#: src/gtk/quicksearch.c:515
+#: src/gtk/quicksearch.c:513
 msgid "marked messages"
 msgstr "označené správy"
 
-#: src/gtk/quicksearch.c:516
+#: src/gtk/quicksearch.c:514
 msgid "unread messages"
 msgstr "neprečítané správy"
 
-#: src/gtk/quicksearch.c:517
+#: src/gtk/quicksearch.c:515
 msgid "messages which contain S in References header"
 msgstr "správy, ktoré obsahujú S v hlavičke References"
 
-#: src/gtk/quicksearch.c:518
+#: src/gtk/quicksearch.c:516
 #, 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:519
+#: src/gtk/quicksearch.c:517
 msgid "messages which contain S in X-Label header"
 msgstr "správy, ktoré obsahujú S v hlavičke X-Label"
 
-#: src/gtk/quicksearch.c:521
+#: src/gtk/quicksearch.c:519
 msgid "logical AND operator"
 msgstr "logický operátor AND"
 
-#: src/gtk/quicksearch.c:522
+#: src/gtk/quicksearch.c:520
 msgid "logical OR operator"
 msgstr "logický operátor OR"
 
-#: src/gtk/quicksearch.c:523
+#: src/gtk/quicksearch.c:521
 msgid "logical NOT operator"
 msgstr "logický operátor NOT"
 
-#: src/gtk/quicksearch.c:524
+#: src/gtk/quicksearch.c:522
 msgid "case sensitive search"
 msgstr "záleží na veľkosti písmen"
 
-#: src/gtk/quicksearch.c:525
+#: src/gtk/quicksearch.c:523
 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:527
+#: src/gtk/quicksearch.c:525
 msgid ""
 "all filtering expressions are allowed, but cannot be mixed through logical "
 "operators with the expressions above"
@@ -5284,11 +5299,11 @@ 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:537 src/summary_search.c:521
+#: src/gtk/quicksearch.c:535 src/summary_search.c:462
 msgid "Extended Search"
 msgstr "Rozšírené vyhľadávanie"
 
-#: src/gtk/quicksearch.c:538
+#: src/gtk/quicksearch.c:536
 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"
@@ -5298,100 +5313,108 @@ 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:638
+#: src/gtk/quicksearch.c:640
 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:704
+#: src/gtk/quicksearch.c:702
 msgid "From/To/Cc/Subject/Tag"
 msgstr "Od/Komu/Kópia/Predmet/Značka"
 
-#: src/gtk/quicksearch.c:715 src/plugins/archive/archiver_prefs.c:416
+#: src/gtk/quicksearch.c:713 src/plugins/archive/archiver_prefs.c:416
 msgid "Recursive"
 msgstr "Rekurzívne"
 
-#: src/gtk/quicksearch.c:724
+#: src/gtk/quicksearch.c:722
 msgid "Sticky"
 msgstr "Trvalé"
 
-#: src/gtk/quicksearch.c:734
+#: src/gtk/quicksearch.c:732
 msgid "Type-ahead"
 msgstr "Dynamické"
 
-#: src/gtk/quicksearch.c:746
+#: src/gtk/quicksearch.c:744
 msgid "Run on select"
 msgstr "Spustiť pri zvolení"
 
-#: src/gtk/quicksearch.c:788
+#: src/gtk/quicksearch.c:780
 msgid "Clear the current search"
 msgstr "Zrušiť súčasné vyhľadávanie"
 
-#: src/gtk/quicksearch.c:798 src/summary_search.c:472
+#: src/gtk/quicksearch.c:790 src/summary_search.c:413
 msgid "Edit search criteria"
 msgstr "Upraviť vyhľadávacie kritériá"
 
-#: src/gtk/quicksearch.c:807
+#: src/gtk/quicksearch.c:799
 msgid "Information about extended symbols"
 msgstr "Informácie o rozšírených symboloch"
 
-#: src/gtk/quicksearch.c:845 src/gtk/quicksearch.c:869
+#: src/gtk/quicksearch.c:837 src/gtk/quicksearch.c:861
 msgid "_Information"
 msgstr "_Informácia"
 
-#: src/gtk/quicksearch.c:846 src/gtk/quicksearch.c:870
+#: src/gtk/quicksearch.c:838 src/gtk/quicksearch.c:862
 msgid "E_dit"
 msgstr "_Upraviť"
 
-#: 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
+#: src/gtk/quicksearch.c:839 src/gtk/quicksearch.c:863 src/prefs_actions.c:349
+#: src/prefs_filtering.c:496 src/prefs_template.c:330
 msgid "C_lear"
 msgstr "Vy_mazať"
 
-#: src/gtk/sslcertwindow.c:157 src/gtk/sslcertwindow.c:348
-#: src/gtk/sslcertwindow.c:398 src/gtk/sslcertwindow.c:462
-msgid "Correct"
-msgstr "Správne"
+#: src/gtk/sslcertwindow.c:181 src/ssl_manager.c:301
+#, c-format
+msgid "Correct%s"
+msgstr "Správne%s"
 
-#: src/gtk/sslcertwindow.c:162
+#: src/gtk/sslcertwindow.c:181 src/gtk/sslcertwindow.c:183
+#: src/ssl_manager.c:301 src/ssl_manager.c:305
+msgid " (expired)"
+msgstr " (vypršané)"
+
+#: src/gtk/sslcertwindow.c:188
 msgid "Owner"
 msgstr "Majiteľ"
 
-#: src/gtk/sslcertwindow.c:163
+#: src/gtk/sslcertwindow.c:189
 msgid "Signer"
 msgstr "Podpisovateľ"
 
-#: src/gtk/sslcertwindow.c:170 src/gtk/sslcertwindow.c:194
-#: src/prefs_themes.c:989
+#: src/gtk/sslcertwindow.c:196 src/gtk/sslcertwindow.c:220
 msgid "Name: "
 msgstr "Meno: "
 
-#: src/gtk/sslcertwindow.c:178 src/gtk/sslcertwindow.c:202
+#: src/gtk/sslcertwindow.c:204 src/gtk/sslcertwindow.c:228
 msgid "Organization: "
 msgstr "Organizácia: "
 
-#: src/gtk/sslcertwindow.c:186 src/gtk/sslcertwindow.c:210
+#: src/gtk/sslcertwindow.c:212 src/gtk/sslcertwindow.c:236
 msgid "Location: "
 msgstr "Umiestnenie: "
 
-#: src/gtk/sslcertwindow.c:218
+#: src/gtk/sslcertwindow.c:244
 msgid "Fingerprint: \n"
 msgstr "Odtlačok primárneho kľúča:\n"
 
-#: src/gtk/sslcertwindow.c:228
+#: src/gtk/sslcertwindow.c:254
 msgid "Signature status: "
 msgstr "Stav podpisu: "
 
-#: src/gtk/sslcertwindow.c:235
+#: src/gtk/sslcertwindow.c:261
+msgid "Expired on: "
+msgstr "Platnosť skončila: "
+
+#: src/gtk/sslcertwindow.c:261
 msgid "Expires on: "
 msgstr "Dátum skončenia platnosti: "
 
-#: src/gtk/sslcertwindow.c:302
+#: src/gtk/sslcertwindow.c:328
 #, c-format
 msgid "SSL/TLS certificate for %s"
 msgstr "Certifikát SSL/TLS pre %s"
 
-#: src/gtk/sslcertwindow.c:318
+#: src/gtk/sslcertwindow.c:344
 #, c-format
 msgid ""
 "Certificate is for %s, but connection is to %s.\n"
@@ -5402,7 +5425,7 @@ msgstr ""
 "Môžete byť pripojený k podvodnému serveru.\n"
 "\n"
 
-#: src/gtk/sslcertwindow.c:338
+#: src/gtk/sslcertwindow.c:364
 #, c-format
 msgid ""
 "Certificate for %s is unknown.\n"
@@ -5411,34 +5434,39 @@ msgstr ""
 "Certifikát pre %s je neznámy.\n"
 "%s Chcete ho prijať?"
 
-#: src/gtk/sslcertwindow.c:350 src/gtk/sslcertwindow.c:400
-#: src/gtk/sslcertwindow.c:464
+#: src/gtk/sslcertwindow.c:374 src/gtk/sslcertwindow.c:424
+#: src/gtk/sslcertwindow.c:488
+msgid "Correct"
+msgstr "Správne"
+
+#: src/gtk/sslcertwindow.c:376 src/gtk/sslcertwindow.c:426
+#: src/gtk/sslcertwindow.c:490
 #, c-format
 msgid "Signature status: %s"
 msgstr "Stav podpisu: %s"
 
-#: src/gtk/sslcertwindow.c:358 src/gtk/sslcertwindow.c:408
+#: src/gtk/sslcertwindow.c:384 src/gtk/sslcertwindow.c:434
 msgid "_View certificate"
 msgstr "_Zobraziť certifikát"
 
-#: src/gtk/sslcertwindow.c:364
+#: src/gtk/sslcertwindow.c:390
 msgid "SSL/TLS certificate is invalid"
 msgstr "Certifikát SSL/TLS je neplatný"
 
-#: src/gtk/sslcertwindow.c:366
+#: src/gtk/sslcertwindow.c:392
 msgid "SSL/TLS certificate is unknown"
 msgstr "Certifikát SSL/TLS je neznámy"
 
-#: src/gtk/sslcertwindow.c:369 src/gtk/sslcertwindow.c:419
-#: src/gtk/sslcertwindow.c:481
+#: src/gtk/sslcertwindow.c:395 src/gtk/sslcertwindow.c:445
+#: src/gtk/sslcertwindow.c:507
 msgid "_Cancel connection"
 msgstr "_Zrušiť spojenie"
 
-#: src/gtk/sslcertwindow.c:369 src/gtk/sslcertwindow.c:481
+#: src/gtk/sslcertwindow.c:395 src/gtk/sslcertwindow.c:507
 msgid "_Accept and save"
 msgstr "_Prijať a uložiť"
 
-#: src/gtk/sslcertwindow.c:387
+#: src/gtk/sslcertwindow.c:413
 #, c-format
 msgid ""
 "Certificate for %s is expired.\n"
@@ -5447,27 +5475,27 @@ msgstr ""
 "Certifikát pre %s vypršal.\n"
 "%s Chcete ho prijať?"
 
-#: src/gtk/sslcertwindow.c:414
+#: src/gtk/sslcertwindow.c:440
 msgid "SSL/TLS certificate is invalid and expired"
 msgstr "Certifikát SSL/TLS je neplatný a vypršal"
 
-#: src/gtk/sslcertwindow.c:416
+#: src/gtk/sslcertwindow.c:442
 msgid "SSL/TLS certificate is expired"
 msgstr "Certifikát SSL/TLS vypršal"
 
-#: src/gtk/sslcertwindow.c:419
+#: src/gtk/sslcertwindow.c:445
 msgid "_Accept"
 msgstr "_Prijať"
 
-#: src/gtk/sslcertwindow.c:439
+#: src/gtk/sslcertwindow.c:465
 msgid "New certificate:"
 msgstr "Nový certifikát:"
 
-#: src/gtk/sslcertwindow.c:444
+#: src/gtk/sslcertwindow.c:470
 msgid "Known certificate:"
 msgstr "Známy certifikát:"
 
-#: src/gtk/sslcertwindow.c:451
+#: src/gtk/sslcertwindow.c:477
 #, c-format
 msgid ""
 "Certificate for %s has changed.\n"
@@ -5476,15 +5504,15 @@ msgstr ""
 "Certifikát pre %s sa zmenil.\n"
 "%s Chcete ho prijať?"
 
-#: src/gtk/sslcertwindow.c:472
+#: src/gtk/sslcertwindow.c:498
 msgid "_View certificates"
 msgstr "_Zobraziť certifikáty"
 
-#: src/gtk/sslcertwindow.c:477
+#: src/gtk/sslcertwindow.c:503
 msgid "SSL/TLS certificate changed and is invalid"
 msgstr "Certifikát SSL/TLS sa zmenil a je neplatný"
 
-#: src/gtk/sslcertwindow.c:479
+#: src/gtk/sslcertwindow.c:505
 msgid "SSL/TLS certificate changed"
 msgstr "Certifikát SSL/TLS sa zmenil"
 
@@ -5494,224 +5522,224 @@ 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:886 src/summaryview.c:3423
-#: src/summaryview.c:3441 src/summaryview.c:3462
+#: src/plugins/notification/notification_trayicon.c:886 src/summaryview.c:3499
+#: src/summaryview.c:3517 src/summaryview.c:3556
 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:889 src/summaryview.c:3474
-#: src/summaryview.c:3477
+#: src/plugins/notification/notification_trayicon.c:889 src/summaryview.c:3568
+#: src/summaryview.c:3571
 msgid "(No Subject)"
 msgstr "(bez Predmetu)"
 
-#: src/image_viewer.c:100
+#: src/image_viewer.c:127
 msgid "Error:"
 msgstr "Chyba:"
 
-#: src/image_viewer.c:299 src/mimeview.c:2611
+#: src/image_viewer.c:312 src/mimeview.c:2666
 #: src/plugins/att_remover/att_remover.c:306
-#: src/plugins/pdf_viewer/poppler_viewer.c:698
+#: src/plugins/pdf_viewer/poppler_viewer.c:701
 msgid "Filename:"
 msgstr "Názov súboru:"
 
-#: src/image_viewer.c:306
+#: src/image_viewer.c:319
 msgid "Filesize:"
 msgstr "Veľkosť súboru:"
 
-#: src/image_viewer.c:355
+#: src/image_viewer.c:368
 msgid "Load Image"
 msgstr "Načítať obrázok"
 
-#: src/imap.c:576
+#: src/imap.c:577
 msgid "IMAP connection broken\n"
 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
+#: src/imap.c:622 src/imap.c:625 src/imap.c:628 src/imap.c:631 src/imap.c:634
+#: src/imap.c:638 src/imap.c:641 src/imap.c:644 src/imap.c:647 src/imap.c:651
+#: src/imap.c:654 src/imap.c:657 src/imap.c:660 src/imap.c:663 src/imap.c:666
+#: src/imap.c:669 src/imap.c:672 src/imap.c:675 src/imap.c:678 src/imap.c:681
+#: src/imap.c:684 src/imap.c:687 src/imap.c:690 src/imap.c:693 src/imap.c:696
+#: src/imap.c:699 src/imap.c:702 src/imap.c:705 src/imap.c:708 src/imap.c:711
+#: src/imap.c:714 src/imap.c:717 src/imap.c:720 src/imap.c:723 src/imap.c:726
+#: src/imap.c:729 src/imap.c:732 src/imap.c:735 src/imap.c:738 src/imap.c:741
+#: src/imap.c:745 src/imap.c:749
 #, c-format
 msgid "IMAP error on %s:"
 msgstr "Chyba IMAP na %s:"
 
-#: src/imap.c:615
+#: src/imap.c:622
 msgid "authenticated"
 msgstr "autentifikovaný"
 
-#: src/imap.c:618
+#: src/imap.c:625
 msgid "not authenticated"
 msgstr "neautentifikovaný"
 
-#: src/imap.c:621
+#: src/imap.c:628
 msgid "bad state"
 msgstr "zlý stav"
 
-#: src/imap.c:624
+#: src/imap.c:631
 msgid "stream error"
 msgstr "chyba streamu"
 
-#: src/imap.c:627
+#: src/imap.c:634
 msgid "parse error (very probably non-RFC compliance from the server)"
 msgstr ""
 "chyba spracovania (pravdepodobne server, ktorý nedodržiava štandard RFC)"
 
-#: src/imap.c:631
+#: src/imap.c:638
 msgid "connection refused"
 msgstr "spojenie odmietnuté"
 
-#: src/imap.c:634
+#: src/imap.c:641
 msgid "memory error"
 msgstr "chyba pamäte"
 
-#: src/imap.c:637
+#: src/imap.c:644
 msgid "fatal error"
 msgstr "fatálna chyba"
 
-#: src/imap.c:640
+#: src/imap.c:647
 msgid "protocol error (very probably non-RFC compliance from the server)"
 msgstr "chyba protokolu (pravdepodobne server, ktorý nedodržiava štandard RFC)"
 
-#: src/imap.c:644
+#: src/imap.c:651
 msgid "connection not accepted"
 msgstr "spojenie nebolo prijaté"
 
-#: src/imap.c:647
+#: src/imap.c:654
 msgid "APPEND error"
-msgstr "chyba pri APPEND"
+msgstr "Chyba pri APPEND"
 
-#: src/imap.c:650
+#: src/imap.c:657
 msgid "NOOP error"
-msgstr "chyba pri NOOP"
+msgstr "Chyba pri NOOP"
 
-#: src/imap.c:653
+#: src/imap.c:660
 msgid "LOGOUT error"
-msgstr "chyba pri LOGOUT"
+msgstr "Chyba pri LOGOUT"
 
-#: src/imap.c:656
+#: src/imap.c:663
 msgid "CAPABILITY error"
-msgstr "chyba pri CAPABILITY"
+msgstr "Chyba pri CAPABILITY"
 
-#: src/imap.c:659
+#: src/imap.c:666
 msgid "CHECK error"
-msgstr "chyba pri CHECK"
+msgstr "Chyba pri CHECK"
 
-#: src/imap.c:662
+#: src/imap.c:669
 msgid "CLOSE error"
-msgstr "chyba pri CLOSE"
+msgstr "Chyba pri CLOSE"
 
-#: src/imap.c:665
+#: src/imap.c:672
 msgid "EXPUNGE error"
-msgstr "chyba pri EXPUNGE"
+msgstr "Chyba pri EXPUNGE"
 
-#: src/imap.c:668
+#: src/imap.c:675
 msgid "COPY error"
-msgstr "chyba pri COPY"
+msgstr "Chyba pri COPY"
 
-#: src/imap.c:671
+#: src/imap.c:678
 msgid "UID COPY error"
-msgstr "chyba pri UID COPY"
+msgstr "Chyba pri UID COPY"
 
-#: src/imap.c:674
+#: src/imap.c:681
 msgid "CREATE error"
-msgstr "chyba pri CREATE"
+msgstr "Chyba pri CREATE"
 
-#: src/imap.c:677
+#: src/imap.c:684
 msgid "DELETE error"
-msgstr "chyba pri DELETE"
+msgstr "Chyba pri DELETE"
 
-#: src/imap.c:680
+#: src/imap.c:687
 msgid "EXAMINE error"
-msgstr "chyba pri EXAMINE"
+msgstr "Chyba pri EXAMINE"
 
-#: src/imap.c:683
+#: src/imap.c:690
 msgid "FETCH error"
-msgstr "chyba pri FETCH"
+msgstr "Chyba pri FETCH"
 
-#: src/imap.c:686
+#: src/imap.c:693
 msgid "UID FETCH error"
-msgstr "chyba pri UID FETCH"
+msgstr "Chyba pri UID FETCH"
 
-#: src/imap.c:689
+#: src/imap.c:696
 msgid "LIST error"
-msgstr "chyba pri LIST"
+msgstr "Chyba pri LIST"
 
-#: src/imap.c:692
+#: src/imap.c:699
 msgid "LOGIN error"
-msgstr "chyba pri LOGIN"
+msgstr "Chyba pri LOGIN"
 
-#: src/imap.c:695
+#: src/imap.c:702
 msgid "LSUB error"
-msgstr "chyba pri LSUB"
+msgstr "Chyba pri LSUB"
 
-#: src/imap.c:698
+#: src/imap.c:705
 msgid "RENAME error"
-msgstr "chyba pri RENAME"
+msgstr "Chyba pri RENAME"
 
-#: src/imap.c:701
+#: src/imap.c:708
 msgid "SEARCH error"
-msgstr "chyba pri SEARCH"
+msgstr "Chyba pri SEARCH"
 
-#: src/imap.c:704
+#: src/imap.c:711
 msgid "UID SEARCH error"
-msgstr "chyba pri UID SEARCH"
+msgstr "Chyba pri UID SEARCH"
 
-#: src/imap.c:707
+#: src/imap.c:714
 msgid "SELECT error"
-msgstr "chyba pri SELECT"
+msgstr "Chyba pri SELECT"
 
-#: src/imap.c:710
+#: src/imap.c:717
 msgid "STATUS error"
-msgstr "chyba pri STATUS"
+msgstr "Chyba pri STATUS"
 
-#: src/imap.c:713
+#: src/imap.c:720
 msgid "STORE error"
-msgstr "chyba pri STORE"
+msgstr "Chyba pri STORE"
 
-#: src/imap.c:716
+#: src/imap.c:723
 msgid "UID STORE error"
-msgstr "chyba pri UID STORE"
+msgstr "Chyba pri UID STORE"
 
-#: src/imap.c:719
+#: src/imap.c:726
 msgid "SUBSCRIBE error"
-msgstr "chyba pri SUBSCRIBE"
+msgstr "Chyba pri SUBSCRIBE"
 
-#: src/imap.c:722
+#: src/imap.c:729
 msgid "UNSUBSCRIBE error"
-msgstr "chyba pri UNSUBSCRIBE"
+msgstr "Chyba pri UNSUBSCRIBE"
 
-#: src/imap.c:725
+#: src/imap.c:732
 msgid "STARTTLS error"
-msgstr "chyba pri STARTTLS"
+msgstr "Chyba pri STARTTLS"
 
-#: src/imap.c:728
+#: src/imap.c:735
 msgid "INVAL error"
-msgstr "chyba pri INVAL"
+msgstr "Chyba pri INVAL"
 
-#: src/imap.c:731
+#: src/imap.c:738
 msgid "EXTENSION error"
-msgstr "chyba pri EXTENSION"
+msgstr "Chyba pri EXTENSION"
 
-#: src/imap.c:734
+#: src/imap.c:741
 msgid "SASL error"
-msgstr "chyba pri SASL"
+msgstr "Chyba pri SASL"
 
-#: src/imap.c:738
+#: src/imap.c:745
 msgid "SSL/TLS error"
 msgstr "Chyba pri SSL/TLS"
 
-#: src/imap.c:742
+#: src/imap.c:749
 #, c-format
 msgid "Unknown error [%d]"
 msgstr "Neznáma chyba [%d]"
 
-#: src/imap.c:946
+#: src/imap.c:955
 msgid ""
 "\n"
 "\n"
@@ -5723,7 +5751,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:952
+#: src/imap.c:961
 msgid ""
 "\n"
 "\n"
@@ -5735,7 +5763,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:958
+#: src/imap.c:967
 msgid ""
 "\n"
 "\n"
@@ -5747,7 +5775,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:964
+#: src/imap.c:973
 msgid ""
 "\n"
 "\n"
@@ -5759,7 +5787,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:970
+#: src/imap.c:979
 msgid ""
 "\n"
 "\n"
@@ -5771,36 +5799,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:977
+#: src/imap.c:986
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Spojenie k %s zlyhalo: prihlásenie odmietnuté.%s"
 
-#: src/imap.c:981
+#: src/imap.c:990
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "Spojenie k %s zlyhalo: prihlásenie odmietnuté.%s\n"
 
-#: src/imap.c:999
+#: src/imap.c:1008
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Spojenie k %s zlyhalo"
 
-#: src/imap.c:1006 src/imap.c:1009
+#: src/imap.c:1015 src/imap.c:1018
 #, c-format
 msgid "IMAP connection to %s has been disconnected. Reconnecting...\n"
-msgstr "Spojenie IMAP k %s bolo prerušené. Obnovujem…\n"
+msgstr "Spojenie IMAP k %s bolo prerušené. Obnovujem...\n"
 
-#: src/imap.c:1039 src/imap.c:3656 src/imap.c:4315 src/imap.c:4409
-#: src/imap.c:4587 src/imap.c:5398
+#: src/imap.c:1048 src/imap.c:3693 src/imap.c:4352 src/imap.c:4446
+#: src/imap.c:4624 src/imap.c:5435
 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:1148 src/inc.c:811 src/news.c:388 src/send_message.c:282
+#: src/imap.c:1158 src/inc.c:876 src/news.c:402 src/send_message.c:286
 msgid "Insecure connection"
 msgstr "Nezabezpečené spojenie"
 
-#: src/imap.c:1149 src/inc.c:812 src/news.c:389 src/send_message.c:283
+#: src/imap.c:1159 src/inc.c:877 src/news.c:403 src/send_message.c:287
 msgid ""
 "This connection is configured to be secured using SSL/TLS, but SSL/TLS is "
 "not available in this build of Claws Mail. \n"
@@ -5814,104 +5842,108 @@ msgstr ""
 "Chcete pokračovať v pripájaní na tento server? Komunikácia nebude "
 "zabezpečená."
 
-#: src/imap.c:1155 src/inc.c:818 src/news.c:395 src/send_message.c:289
+#: src/imap.c:1165 src/inc.c:883 src/news.c:409 src/send_message.c:293
 msgid "Con_tinue connecting"
 msgstr "Po_kračovať v pripájaní"
 
-#: src/imap.c:1165
+#: src/imap.c:1174
 #, c-format
 msgid "Account '%s': Connecting to IMAP server: %s:%d..."
-msgstr "Účet „%s”: Pripájanie k serveru IMAP: %s: %d…"
+msgstr "Účet „%s”: Pripájanie k serveru IMAP: %s: %d..."
 
-#: src/imap.c:1213
+#: src/imap.c:1239
 #, c-format
 msgid "Can't connect to IMAP server: %s:%d"
 msgstr "Nemožno sa pripojiť k serveru IMAP: %s:%d"
 
-#: src/imap.c:1216
+#: src/imap.c:1242
 #, c-format
 msgid "Can't connect to IMAP server: %s:%d\n"
 msgstr "Nemožno sa pripojiť k serveru IMAP: %s:%d\n"
 
-#: src/imap.c:1249 src/imap.c:4077
+#: src/imap.c:1274 src/imap.c:4114
 msgid "Can't start STARTTLS session.\n"
 msgstr "Nemožno vytvoriť reláciu STARTTLS.\n"
 
-#: src/imap.c:1316
+#: src/imap.c:1343
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Nepodarilo sa pripojiť k IMAP serveru %s.\n"
 
-#: src/imap.c:1319
+#: src/imap.c:1346
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Nepodarilo sa pripojiť k IMAP serveru %s."
 
-#: src/imap.c:1747
+#: src/imap.c:1774
 msgid "Adding messages..."
-msgstr "Pridávam správy…"
+msgstr "Pridávam správy..."
 
-#: src/imap.c:1952 src/mh.c:529
+#: src/imap.c:1979 src/mh.c:530
 msgid "Copying messages..."
-msgstr "Kopírujem správy…"
+msgstr "Kopírujem správy..."
 
-#: src/imap.c:2545
+#: src/imap.c:2504
+msgid "Search failed due to server error."
+msgstr "Hľadanie zlyhalo kvôli chybe servera."
+
+#: src/imap.c:2586
 msgid "can't set deleted flags\n"
 msgstr "nemožno nastaviť príznak zmazania\n"
 
-#: src/imap.c:2552 src/imap.c:5028
+#: src/imap.c:2593 src/imap.c:5065
 msgid "can't expunge\n"
 msgstr "nemožno odstrániť\n"
 
-#: src/imap.c:2903
+#: src/imap.c:2944
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
-msgstr "Hľadám neodoberané zložky v %s…"
+msgstr "Hľadám neodoberané zložky v %s..."
 
-#: src/imap.c:2906
+#: src/imap.c:2947
 #, c-format
 msgid "Looking for subfolders of %s..."
-msgstr "Hľadám podzložky %s…"
+msgstr "Hľadám podzložky %s..."
 
-#: src/imap.c:3196
+#: src/imap.c:3235
 msgid "can't create mailbox: LIST failed\n"
 msgstr "nemožno vytvoriť schránku: príkaz LIST zlyhal\n"
 
-#: src/imap.c:3211
+#: src/imap.c:3248
 msgid "can't create mailbox\n"
 msgstr "nemožno vytvoriť schránku\n"
 
-#: src/imap.c:3342
+#: src/imap.c:3379
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "nemožno premenovať schránku: %s na %s\n"
 
-#: src/imap.c:3455
+#: src/imap.c:3492
 msgid "can't delete mailbox\n"
 msgstr "nemožno odstrániť schránku \n"
 
-#: src/imap.c:3734
+#: src/imap.c:3771
 msgid "LIST failed\n"
 msgstr "LIST zlyhal\n"
 
-#: src/imap.c:3819
+#: src/imap.c:3856
 msgid "Flagging messages..."
-msgstr "Označujem správy…"
+msgstr "Označujem správy..."
 
-#: src/imap.c:3922
+#: src/imap.c:3959
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "nemožno vybrať zložku: %s\n"
 
-#: src/imap.c:4074
+#: src/imap.c:4111
 msgid "Server requires STARTTLS to log in.\n"
 msgstr "Server na prihlásenie vyžaduje STARTTLS.\n"
 
-#: src/imap.c:4084
+#: src/imap.c:4121
 msgid "Can't refresh capabilities.\n"
 msgstr "Nepodarilo  sa obnoviť možnosti servera.\n"
 
-#: src/imap.c:4089
+#: src/imap.c:4126
 #, c-format
 msgid ""
 "Connection to %s failed: server requires STARTTLS, but Claws Mail has been "
@@ -5920,20 +5952,20 @@ msgstr ""
 "Pripojenie k %s zlyhalo: server vyžaduje STARTTLS, ale Claws Mail bol "
 "zostavený bez podpory STARTTLS.\n"
 
-#: src/imap.c:4097
+#: src/imap.c:4134
 msgid "Server logins are disabled.\n"
 msgstr "Tento server neumožňuje prihlásenie.\n"
 
-#: src/imap.c:4320
+#: src/imap.c:4357
 msgid "Fetching message..."
-msgstr "Sťahujem správu…"
+msgstr "Sťahujem správu..."
 
-#: src/imap.c:5021
+#: src/imap.c:5058
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "nemožno nastaviť príznaky zmazania: %d\n"
 
-#: src/imap.c:6056
+#: src/imap.c:6093
 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"
@@ -5948,25 +5980,25 @@ msgstr ""
 
 #: src/imap_gtk.c:63 src/mh_gtk.c:55 src/plugins/mailmbox/plugin_gtk.c:59
 msgid "Create _new folder..."
-msgstr "Vytvoriť _novú zložku…"
+msgstr "Vytvoriť _novú zložku..."
 
 #: src/imap_gtk.c:65 src/mh_gtk.c:56 src/news_gtk.c:61
 #: src/plugins/mailmbox/plugin_gtk.c:60
 msgid "_Rename folder..."
-msgstr "_Premenovať zložku…"
+msgstr "_Premenovať zložku..."
 
 #: src/imap_gtk.c:66 src/mh_gtk.c:57 src/plugins/mailmbox/plugin_gtk.c:61
 msgid "M_ove folder..."
-msgstr "_Presunúť zložku…"
+msgstr "_Presunúť zložku..."
 
 #: src/imap_gtk.c:67 src/mh_gtk.c:58 src/plugins/mailmbox/plugin_gtk.c:62
 msgid "Cop_y folder..."
-msgstr "_Kopírovať zložku…"
+msgstr "_Kopírovať zložku..."
 
 #: src/imap_gtk.c:69 src/mh_gtk.c:59 src/plugins/mailmbox/plugin_gtk.c:63
 #: src/plugins/rssyl/rssyl_gtk.c:55
 msgid "_Delete folder..."
-msgstr "_Odstrániť zložku…"
+msgstr "_Odstrániť zložku..."
 
 #: src/imap_gtk.c:71 src/news_gtk.c:59
 msgid "Synchronise"
@@ -5982,11 +6014,11 @@ msgstr "_Odoberané zložky"
 
 #: src/imap_gtk.c:77
 msgid "_Subscribe..."
-msgstr "O_doberať…"
+msgstr "O_doberať..."
 
-#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:169
+#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:171
 msgid "_Unsubscribe..."
-msgstr "_Odhlásiť sa…"
+msgstr "_Odhlásiť sa..."
 
 #: src/imap_gtk.c:80 src/mh_gtk.c:60 src/news_gtk.c:63
 #: src/plugins/mailmbox/plugin_gtk.c:64
@@ -6016,25 +6048,25 @@ msgstr ""
 "teda bez správ, pridajte na koniec mena „/”)"
 
 #: src/imap_gtk.c:198 src/mh_gtk.c:147
-msgid "Inherit properties from parent folder"
-msgstr "Zdediť vlastnosti z rodičovskej zložky"
+msgid "Inherit properties and processing rules from parent folder"
+msgstr "Zdediť vlastnosti a pravidlá spracovania 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:419 src/plugins/rssyl/rssyl_cb_menu.c:197
-#: src/plugins/vcalendar/vcal_folder.c:2051
+#: src/plugins/mailmbox/plugin_gtk.c:419 src/plugins/rssyl/rssyl_cb_menu.c:196
+#: src/plugins/vcalendar/vcal_folder.c:2060
 #, 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:420
-#: src/plugins/rssyl/rssyl_cb_menu.c:198
-#: src/plugins/vcalendar/vcal_folder.c:2052
+#: src/plugins/rssyl/rssyl_cb_menu.c:197
+#: src/plugins/vcalendar/vcal_folder.c:2061
 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:450 src/plugins/rssyl/rssyl_cb_menu.c:224
-#: src/plugins/vcalendar/vcal_folder.c:2072
+#: src/plugins/mailmbox/plugin_gtk.c:450 src/plugins/rssyl/rssyl_cb_menu.c:220
+#: src/plugins/vcalendar/vcal_folder.c:2081
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -6052,7 +6084,7 @@ msgstr "Zvoľte cieľovú zložku na presun zložky „%s”"
 msgid "Select folder to copy folder '%s' to"
 msgstr "Zvoľte cieľovú zložku na kopírovanie zložky „%s”"
 
-#: src/imap_gtk.c:365 src/mh_gtk.c:203 src/plugins/rssyl/rssyl_cb_menu.c:152
+#: src/imap_gtk.c:365 src/mh_gtk.c:203 src/plugins/rssyl/rssyl_cb_menu.c:153
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted. Recovery "
@@ -6066,8 +6098,8 @@ msgstr ""
 "Naozaj chcete pokračovať?"
 
 #: src/imap_gtk.c:384 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:2005
+#: src/plugins/rssyl/rssyl_cb_menu.c:172
+#: src/plugins/vcalendar/vcal_folder.c:2014
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Nemožno odstrániť zložku „%s”."
@@ -6094,7 +6126,7 @@ msgstr "_Hľadať"
 msgid "Choose a subfolder of %s to subscribe to: "
 msgstr "Zvoľte podzložku %s, ktorú chcete odoberať: "
 
-#: src/imap_gtk.c:536 src/mainwindow.c:680
+#: src/imap_gtk.c:536 src/mainwindow.c:689
 msgid "Subscribe"
 msgstr "Odoberať"
 
@@ -6128,8 +6160,8 @@ msgstr "odoberať"
 msgid "unsubscribe"
 msgstr "odhlásiť"
 
-#: src/imap_gtk.c:568 src/prefs_folder_item.c:1447 src/prefs_folder_item.c:1475
-#: src/prefs_folder_item.c:1503
+#: src/imap_gtk.c:568 src/prefs_folder_item.c:1537 src/prefs_folder_item.c:1565
+#: src/prefs_folder_item.c:1593
 msgid "Apply to subfolders"
 msgstr "Použiť aj na podzložky"
 
@@ -6137,27 +6169,27 @@ msgstr "Použiť aj na podzložky"
 msgid "_Subscribe"
 msgstr "_Odoberať"
 
-#: src/imap_gtk.c:575 src/news_gtk.c:252
+#: src/imap_gtk.c:574 src/news_gtk.c:252
 msgid "_Unsubscribe"
 msgstr "_Odhlásiť sa"
 
-#: src/import.c:113 src/import.c:207
+#: src/import.c:113 src/import.c:208
 msgid "Import mbox file"
 msgstr "Importovať súbor mbox"
 
-#: src/import.c:131
+#: src/import.c:132
 msgid "Locate the mbox file and specify the destination folder."
 msgstr "Zvoľte importovaný mbox súbor a cieľovú zložku."
 
-#: src/import.c:148
+#: src/import.c:149
 msgid "Destination folder:"
 msgstr "Cieľová zložka:"
 
-#: src/import.c:202
+#: src/import.c:203
 msgid "Source mbox filename can't be left empty."
 msgstr "Musíte zadať názov zdrojového súboru mbox."
 
-#: src/import.c:207
+#: src/import.c:208
 msgid ""
 "Destination folder is not set.\n"
 "Import mbox file to the Inbox folder?"
@@ -6165,15 +6197,15 @@ msgstr ""
 "Nebola zadaná cieľová zložka.\n"
 "Chcete naimportovať správy do zložky Doručené?"
 
-#: src/import.c:229
+#: src/import.c:230
 msgid "Can't find the destination folder."
 msgstr "Nemožno nájsť cieľovú zložku."
 
-#: src/import.c:254
+#: src/import.c:263
 msgid "Select importing file"
 msgstr "Zvoľte súbor na importovanie"
 
-#: src/import.c:272
+#: src/import.c:281
 msgid "Select folder to import to"
 msgstr "Zvoľte zložku na import"
 
@@ -6189,65 +6221,65 @@ msgstr "Zvoľte a premenujte názvy LDIF polí na import."
 msgid "File imported."
 msgstr "Súbor importovaný."
 
-#: src/importldif.c:450 src/importmutt.c:122 src/importpine.c:121
+#: src/importldif.c:334 src/importmutt.c:122 src/importpine.c:121
 msgid "Please select a file."
 msgstr "Prosím zvoľte súbor."
 
-#: src/importldif.c:456 src/importmutt.c:127 src/importpine.c:126
+#: src/importldif.c:340 src/importmutt.c:127 src/importpine.c:126
 msgid "Address book name must be supplied."
 msgstr "Musíte zadať názov adresára."
 
-#: src/importldif.c:496
+#: src/importldif.c:380
 msgid "LDIF file imported successfully."
 msgstr "Súbor LDIFbol úspešne importovaný."
 
-#: src/importldif.c:581
+#: src/importldif.c:465
 msgid "Select LDIF File"
 msgstr "Zvoľte súbor LDIF"
 
-#: src/importldif.c:667
+#: src/importldif.c:551
 msgid ""
 "Specify the name for the address book that will be created from the LDIF "
 "file data."
 msgstr "Zadajte názov adresára, ktorý bude vytvorený z údajov súboru LDIF."
 
-#: src/importldif.c:672
+#: src/importldif.c:556
 msgid "File Name"
 msgstr "Názov súboru"
 
-#: src/importldif.c:682
+#: src/importldif.c:566
 msgid "The full file specification of the LDIF file to import."
 msgstr "Úplné určenie importovaného súboru LDIF."
 
-#: src/importldif.c:689
+#: src/importldif.c:573
 msgid "Select the LDIF file to import."
 msgstr "Zvoľte súbor LDIF na importovanie."
 
-#: src/importldif.c:725
+#: src/importldif.c:705
 msgid "R"
 msgstr "R"
 
-#: src/importldif.c:726 src/summaryview.c:441
+#: src/importldif.c:710 src/summaryview.c:466
 msgid "S"
 msgstr "V"
 
-#: src/importldif.c:727
+#: src/importldif.c:716
 msgid "LDIF Field Name"
 msgstr "Názov LDIF poľa"
 
-#: src/importldif.c:728
+#: src/importldif.c:721
 msgid "Attribute Name"
 msgstr "Názov atribútu"
 
-#: src/importldif.c:783
+#: src/importldif.c:740
 msgid "LDIF Field"
 msgstr "LDIF pole"
 
-#: src/importldif.c:795
+#: src/importldif.c:752
 msgid "Attribute"
 msgstr "Atribút"
 
-#: src/importldif.c:807
+#: src/importldif.c:764
 msgid ""
 "Choose the LDIF field that will be renamed or selected for import in the "
 "list above. Reserved fields (marked with a tick in the \"R\" column), are "
@@ -6264,35 +6296,35 @@ msgstr ""
 "pole vo vstupnom riadku pod zoznamom. Dvojklik kdekoľvek v riadku pridá pole "
 "medzi importované polia."
 
-#: src/importldif.c:822
+#: src/importldif.c:779
 msgid "The LDIF field can be renamed to the User Attribute name."
 msgstr "Pole ldif možno premenovať na názov používateľského atribútu."
 
-#: src/importldif.c:827
+#: src/importldif.c:784
 msgid "Select for Import"
 msgstr "Zvoľte na import"
 
-#: src/importldif.c:832
+#: src/importldif.c:789
 msgid "Select the LDIF field for import into the address book."
 msgstr "Vyberte pole LDIF na import do adresára."
 
-#: src/importldif.c:834
+#: src/importldif.c:791
 msgid " Modify "
 msgstr " Zmeniť "
 
-#: src/importldif.c:839
+#: src/importldif.c:796
 msgid "This button will update the list above with the data supplied."
 msgstr "Toto tlačidlo aktualizuje horný zoznam poskytnutými údajmi."
 
-#: src/importldif.c:911
+#: src/importldif.c:870
 msgid "Records Imported:"
 msgstr "Importované záznamy:"
 
-#: src/importldif.c:943
+#: src/importldif.c:902
 msgid "Import LDIF file into Address Book"
 msgstr "Importovať súbor LDIF do adresára"
 
-#: src/importldif.c:980
+#: src/importldif.c:940
 msgid "Proceed"
 msgstr "Pokračovať"
 
@@ -6308,7 +6340,7 @@ msgstr "Zvoľte súbor MUTT"
 msgid "Import MUTT file into Address Book"
 msgstr "Importovať súbor MUTT do adresára"
 
-#: src/importmutt.c:288 src/importpine.c:288
+#: src/importmutt.c:289 src/importpine.c:289
 msgid "Please select a file to import."
 msgstr "Prosím zvoľte súbor na import."
 
@@ -6324,32 +6356,32 @@ msgstr "Vyberte súbor Pine"
 msgid "Import Pine file into Address Book"
 msgstr "Importovať súbor Pine do adresára"
 
-#: src/inc.c:186 src/inc.c:294 src/inc.c:321
+#: src/inc.c:191 src/inc.c:299 src/inc.c:325
 msgid "Claws Mail needs network access in order to get mails."
 msgstr "Claws Mail  potrebuje na prijatie pošty pripojenie k sieti."
 
-#: src/inc.c:343
+#: src/inc.c:344
 #, c-format
 msgid "%s failed\n"
 msgstr "%s zlyhal\n"
 
-#: src/inc.c:416
+#: src/inc.c:476
 msgid "Retrieving new messages"
 msgstr "Prijímam nové správy"
 
-#: src/inc.c:474
+#: src/inc.c:534
 msgid "Standby"
 msgstr "Čakajte"
 
-#: src/inc.c:615 src/inc.c:669
+#: src/inc.c:678 src/inc.c:732
 msgid "Cancelled"
 msgstr "Zrušené"
 
-#: src/inc.c:626
+#: src/inc.c:689
 msgid "Retrieving"
 msgstr "Prijímam"
 
-#: src/inc.c:635
+#: src/inc.c:698
 #, c-format
 msgid "Done (%d message (%s) received)"
 msgid_plural "Done (%d messages (%s) received)"
@@ -6357,28 +6389,28 @@ msgstr[0] "Hotovo (%d správa (%s) prijatá)"
 msgstr[1] "Hotovo (%d správy (%s) prijaté)"
 msgstr[2] "Hotovo (%d správ (%s) prijatých)"
 
-#: src/inc.c:641
+#: src/inc.c:704
 msgid "Done (no new messages)"
 msgstr "Hotovo (žiadne nové správy)"
 
-#: src/inc.c:646
+#: src/inc.c:709
 msgid "Connection failed"
 msgstr "Spojenie zlyhalo"
 
-#: src/inc.c:649 src/plugins/managesieve/managesieve.c:887
+#: src/inc.c:712 src/plugins/managesieve/managesieve.c:888
 msgid "Auth failed"
 msgstr "Autentifikácia zlyhala"
 
-#: src/inc.c:656 src/prefs_matcher.c:398 src/prefs_summaries.c:453
-#: src/prefs_summary_column.c:87 src/summaryview.c:2819 src/summaryview.c:6361
+#: src/inc.c:719 src/prefs_matcher.c:407 src/prefs_summaries.c:645
+#: src/prefs_summary_column.c:87 src/summaryview.c:2894 src/summaryview.c:6569
 msgid "Locked"
 msgstr "Správa je zamknutá"
 
-#: src/inc.c:666 src/plugins/spamassassin/spamassassin_gtk.c:378
+#: src/inc.c:729 src/plugins/spamassassin/spamassassin_gtk.c:394
 msgid "Timeout"
 msgstr "Časový limit"
 
-#: src/inc.c:752
+#: src/inc.c:815
 #, c-format
 msgid "Finished (%d new message)"
 msgid_plural "Finished (%d new messages)"
@@ -6386,66 +6418,66 @@ msgstr[0] "Dokončené (%d nová správa)"
 msgstr[1] "Dokončené (%d nové správy)"
 msgstr[2] "Dokončené (%d nových správ)"
 
-#: src/inc.c:756
+#: src/inc.c:819
 msgid "Finished (no new messages)"
 msgstr "Dokončené (žiadne nové správy)"
 
-#: src/inc.c:795
+#: src/inc.c:860
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Prijímam nové správy"
 
-#: src/inc.c:825
+#: src/inc.c:889
 #, c-format
 msgid "Account '%s': Connecting to POP3 server: %s:%d..."
-msgstr "Účet „%s”: Pripájanie k serveru POP3: %s:%d…"
+msgstr "Účet „%s”: Pripájanie k serveru POP3: %s:%d..."
 
-#: src/inc.c:843
+#: src/inc.c:923
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "Nepodarilo sa pripojiť k serveru POP3: %s:%d"
 
-#: src/inc.c:847
+#: src/inc.c:927
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Nepodarilo sa pripojiť k serveru POP3: %s:%d\n"
 
-#: src/inc.c:927 src/plugins/managesieve/managesieve.c:423
-#: src/send_message.c:496
+#: src/inc.c:1007 src/plugins/managesieve/managesieve.c:424
+#: src/send_message.c:515
 msgid "Authenticating..."
-msgstr "Autentifikácia…"
+msgstr "Autentifikácia..."
 
-#: src/inc.c:929
+#: src/inc.c:1009
 #, c-format
 msgid "Retrieving messages from %s (%s)..."
-msgstr "Prijímanie správ z %s (%s)…"
+msgstr "Prijímanie správ z %s (%s)..."
 
-#: src/inc.c:935
+#: src/inc.c:1015
 msgid "Getting the number of new messages (STAT)..."
-msgstr "Získavam počet nových správ (STAT)…"
+msgstr "Získavam počet nových správ (STAT)..."
 
-#: src/inc.c:939
+#: src/inc.c:1019
 msgid "Getting the number of new messages (LAST)..."
-msgstr "Získavam počet nových správ (LAST)…"
+msgstr "Získavam počet nových správ (LAST)..."
 
-#: src/inc.c:943
+#: src/inc.c:1023
 msgid "Getting the number of new messages (UIDL)..."
-msgstr "Získavam počet nových správ (UIDL)…"
+msgstr "Získavam počet nových správ (UIDL)..."
 
-#: src/inc.c:947
+#: src/inc.c:1027
 msgid "Getting the size of messages (LIST)..."
-msgstr "Získavam veľkosť správ (LIST)…"
+msgstr "Získavam veľkosť správ (LIST)..."
 
-#: src/inc.c:954 src/send_message.c:514
+#: src/inc.c:1034 src/send_message.c:533
 msgid "Quitting"
 msgstr "Odpájam sa"
 
-#: src/inc.c:979
+#: src/inc.c:1059
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Prijímam správu (%d / %d) (%s / %s)"
 
-#: src/inc.c:992
+#: src/inc.c:1072
 #, c-format
 msgid "Retrieving (%d message (%s) received)"
 msgid_plural "Retrieving (%d messages (%s) received)"
@@ -6453,16 +6485,16 @@ msgstr[0] "Prijímam (%d správa (%s) prijatá)"
 msgstr[1] "Prijímam (%d správy (%s) prijaté)"
 msgstr[2] "Prijímam (%d správ (%s) prijatých)"
 
-#: src/inc.c:1151
+#: src/inc.c:1227
 #, c-format
 msgid "Connection to %s:%d failed."
 msgstr "Spojenie k %s:%d zlyhalo."
 
-#: src/inc.c:1156
+#: src/inc.c:1232
 msgid "Error occurred while processing mail."
 msgstr "Pri spracovávaní pošty nastala chyba."
 
-#: src/inc.c:1162
+#: src/inc.c:1238
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -6471,37 +6503,37 @@ msgstr ""
 "Pri spracovávaní pošty nastala chyba:\n"
 "%s"
 
-#: src/inc.c:1168
+#: src/inc.c:1244
 msgid "No disk space left."
 msgstr "Na disku už nie je miesto."
 
-#: src/inc.c:1173
+#: src/inc.c:1249
 msgid "Can't write file."
 msgstr "Nemožno zapisovať do súboru."
 
-#: src/inc.c:1178
+#: src/inc.c:1254
 msgid "Socket error."
 msgstr "Chyba soketu."
 
-#: src/inc.c:1181
+#: src/inc.c:1257
 #, c-format
 msgid "Socket error on connection to %s:%d."
 msgstr "Chyba soketu pri pripojení k %s:%d."
 
-#: src/inc.c:1186 src/send_message.c:425 src/send_message.c:688
+#: src/inc.c:1262 src/send_message.c:444 src/send_message.c:707
 msgid "Connection closed by the remote host."
 msgstr "Vzdialený hostiteľ ukončil spojenie."
 
-#: src/inc.c:1189
+#: src/inc.c:1265
 #, c-format
 msgid "Connection to %s:%d closed by the remote host."
 msgstr "Vzdialený hostiteľ %s:%d ukončil spojenie."
 
-#: src/inc.c:1194
+#: src/inc.c:1270
 msgid "Mailbox is locked."
 msgstr "Poštová schránka je zamknutá."
 
-#: src/inc.c:1198
+#: src/inc.c:1274
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -6510,11 +6542,11 @@ msgstr ""
 "Poštová schránka je zamknutá:\n"
 "%s"
 
-#: src/inc.c:1204 src/send_message.c:673
+#: src/inc.c:1280 src/send_message.c:692
 msgid "Authentication failed."
 msgstr "Autentifikácia zlyhala."
 
-#: src/inc.c:1210 src/send_message.c:676
+#: src/inc.c:1286 src/send_message.c:695
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -6523,7 +6555,7 @@ msgstr ""
 "Autentifikácia zlyhala:\n"
 "%s"
 
-#: src/inc.c:1215 src/send_message.c:692
+#: src/inc.c:1291 src/send_message.c:711
 msgid ""
 "Session timed out. You may be able to recover by increasing the timeout "
 "value in Preferences/Other/Miscellaneous."
@@ -6531,38 +6563,85 @@ msgstr ""
 "Vypršal limit relácie. Môže pomôcť úprava (zvýšenie) hodnoty časového limitu "
 "spojení v Nastavenia/Ostatné/Rôzne."
 
-#: src/inc.c:1220
+#: src/inc.c:1296
 #, c-format
 msgid "Connection to %s:%d timed out."
 msgstr "Spojenie k %s:%d zlyhalo."
 
-#: src/inc.c:1258
+#: src/inc.c:1334
 msgid "Incorporation cancelled\n"
 msgstr "Začleňovanie zrušené\n"
 
-#: src/inc.c:1523
+#: src/inc.c:1626 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:407 src/prefs_account.c:1766
+#: src/prefs_other.c:578 src/prefs_receive.c:203 src/prefs_summaries.c:551
+msgid "seconds"
+msgstr "sekúnd"
+
+#: src/inc.c:1636 src/inc.c:1646
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "minúta"
+msgstr[1] "minúty"
+msgstr[2] "minúty"
+
+#: src/inc.c:1639
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] "hodina"
+msgstr[1] "hodiny"
+msgstr[2] "hodín"
+
+#: src/inc.c:1651
 #, c-format
-msgid "%s%sYou're working offline. Override for %d minutes?"
-msgstr "%s%sPracujete odpojený. Pripojiť na nasledujúcich %d minút?"
+msgid "%s%sYou're working offline. Override for %d %s?"
+msgstr "%s%sPracujete odpojený. Zmeniť na nasledujúcich %d %s?"
 
-#: src/inc.c:1529
+#: src/inc.c:1657
 #, c-format
 msgid "%s%sYou're working offline. Override?"
 msgstr "%s%sPracujete odpojený. Pripojiť?"
 
-#: src/inc.c:1536
+#: src/inc.c:1664
 msgid "On_ly once"
 msgstr "_Len raz"
 
-#: src/ldapupdate.c:1044
+#: src/ldapupdate.c:680
+#, c-format
+msgid "LDAP error (search): for attribute '%s': %d (%s)\n"
+msgstr "Chyba LDAP (hľadať): atribút „%s”: %d (%s)\n"
+
+#: src/ldapupdate.c:918 src/ldapupdate.c:1061 src/ldapupdate.c:1289
+#: src/ldapupdate.c:1330
+#, c-format
+msgid "LDAP error (modify): for DN '%s': %d (%s)\n"
+msgstr "Chyba LDAP (zmeniť): DN „%s”: %d (%s)\n"
+
+#: src/ldapupdate.c:1046
 msgid "Some SN"
 msgstr "Niektoré SN"
 
-#: src/ldif.c:758
+#: src/ldapupdate.c:1133
+#, c-format
+msgid "LDAP error (rename): from '%s' to '%s': %d (%s)\n"
+msgstr "Chyba LDAP (premenovať): z „%s” na „%s”: %d (%s)\n"
+
+#: src/ldaputil.c:81 src/ldaputil.c:156
+msgid "LDAP (search): successful\n"
+msgstr "LDAP (hľadať): úspešné\n"
+
+#: src/ldaputil.c:112 src/ldaputil.c:200
+#, c-format
+msgid "LDAP error (search): %d (%s)\n"
+msgstr "Chyba LDAP (hľadať): %d (%s)\n"
+
+#: src/ldif.c:759
 msgid "Nick Name"
 msgstr "Prezývka"
 
-#: src/main.c:249
+#: src/main.c:250
 #, c-format
 msgid ""
 "File '%s' already exists.\n"
@@ -6571,7 +6650,7 @@ msgstr ""
 "Súbor „%s” už existuje.\n"
 "Zložku nemožno vytvoriť."
 
-#: src/main.c:370
+#: src/main.c:375
 #, c-format
 msgid ""
 "Configuration for %s found.\n"
@@ -6580,7 +6659,7 @@ msgstr ""
 "Bolo nájdené nastavenie pre %s.\n"
 "Chcete konvertovať toto nastavenie?"
 
-#: src/main.c:372
+#: src/main.c:377
 #, c-format
 msgid ""
 "\n"
@@ -6594,11 +6673,11 @@ msgstr ""
 "previesť do Claws Mail pomocou skriptu dostupného na\n"
 "%s."
 
-#: src/main.c:384
+#: src/main.c:389
 msgid "Keep old configuration"
 msgstr "Zachovať pôvodné nastavenie"
 
-#: src/main.c:387
+#: src/main.c:392
 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 "
@@ -6608,31 +6687,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:395
+#: src/main.c:400
 msgid "Migration of configuration"
 msgstr "Migrácia konfigurácie"
 
-#: src/main.c:406
+#: src/main.c:411
 msgid "Copying configuration... This may take a while..."
-msgstr "Kopírujem konfiguráciu… Môže to nejakú dobu trvať…"
+msgstr "Kopírujem konfiguráciu... Môže to nejakú dobu trvať..."
 
-#: src/main.c:415
+#: src/main.c:420
 msgid "Migration failed!"
 msgstr "Migrácia zlyhala!"
 
-#: src/main.c:424
+#: src/main.c:429
 msgid "Migrating configuration..."
-msgstr "Migrujem konfiguráciu…"
+msgstr "Migrujem konfiguráciu..."
 
-#: src/main.c:1138
+#: src/main.c:1141
 msgid "g_thread is not supported by glib.\n"
 msgstr "glib nepodporuje g_thread.\n"
 
-#: src/main.c:1158 src/main.c:1162 src/main.c:1166
+#: src/main.c:1161 src/main.c:1165 src/main.c:1169
 msgid "(or older)"
 msgstr "(alebo staršia)"
 
-#: src/main.c:1483
+#: src/main.c:1510
 #, c-format
 msgid ""
 "The following plugin failed to load. Check the Plugins configuration for "
@@ -6655,7 +6734,7 @@ msgstr[2] ""
 "nastavení zásuvných modulov.\n"
 "%s"
 
-#: src/main.c:1525
+#: src/main.c:1552
 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 "
@@ -6665,7 +6744,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:1531
+#: src/main.c:1558
 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 "
@@ -6675,36 +6754,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:1776
+#: src/main.c:1799
 msgid "Missing filename\n"
 msgstr "Chýba meno súboru\n"
 
-#: src/main.c:1783
+#: src/main.c:1806
 msgid "Cannot open filename for reading\n"
 msgstr "Súbor nemožno otvoriť na čítanie\n"
 
-#: src/main.c:1794
+#: src/main.c:1817
 msgid "Malformed header\n"
 msgstr "Nesprávny formát hlavičky\n"
 
-#: src/main.c:1801
+#: src/main.c:1824
 msgid "Duplicated 'To:' header\n"
 msgstr "Duplikovaná hlavička „To:”\n"
 
-#: src/main.c:1812
+#: src/main.c:1835
 msgid "Missing required 'To:' header\n"
 msgstr "Chýba vyžadovaná hlavička „To:”\n"
 
-#: src/main.c:1958
+#: src/main.c:1980
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
-msgstr "Použitie: %s [VOĽBY]…\n"
+msgstr "Použitie: %s [VOĽBY]...\n"
 
-#: src/main.c:1960
+#: src/main.c:1982
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adresa]     otvorí okno na písanie novej správy"
 
-#: src/main.c:1961
+#: src/main.c:1983
 msgid ""
 "  --compose-from-file file\n"
 "                         open composition window with data from given file;\n"
@@ -6723,47 +6802,47 @@ msgstr ""
 "po prázdny\n"
 "                         riadok, potom telo správy – až do konca súboru."
 
-#: src/main.c:1966
-msgid "  --subscribe [uri]      subscribe to the given URI if possible"
+#: src/main.c:1988
+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:1967
+#: src/main.c:1989
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
 "                         attached"
 msgstr ""
-"  --attach súbor1 [súbor2]…\n"
+"  --attach súbor1 [súbor2]...\n"
 "                         otvorí okno na písanie novej správy s pripojenými\n"
 "                         zadanými súbormi"
 
-#: src/main.c:1970
+#: src/main.c:1992
 msgid ""
 "  --insert file1 [file2]...\n"
 "                         open composition window with specified files\n"
 "                         inserted"
 msgstr ""
-"  --insert súbor1 [súbor2]…\n"
+"  --insert súbor1 [súbor2]...\n"
 "                         otvorí okno na písanie novej správy s pripojenými\n"
 "                         zadanými súbormi"
 
-#: src/main.c:1973
+#: src/main.c:1995
 msgid "  --receive              receive new messages"
 msgstr "  --receive              prijme nové správy"
 
-#: src/main.c:1974
+#: src/main.c:1996
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          prijme nové správy zo všetkých účtov"
 
-#: src/main.c:1975
+#: src/main.c:1997
 msgid "  --cancel-receiving     cancel receiving of messages"
 msgstr "  --cancel-receiving     zruší prijímanie nových správ"
 
-#: src/main.c:1976
+#: src/main.c:1998
 msgid "  --cancel-sending       cancel sending of messages"
 msgstr "  --cancel-sending       zruší odosielanie správ"
 
-#: src/main.c:1977
+#: src/main.c:1999
 msgid ""
 "  --search folder type request [recursive]\n"
 "                         searches mail\n"
@@ -6782,31 +6861,31 @@ msgstr ""
 "                         rekurzívne: nepravda, ak arg. začína 0, n, N, f "
 "alebo F"
 
-#: src/main.c:1984
+#: src/main.c:2006
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 pošle všetky správy vo výstupnej fronte"
 
-#: src/main.c:1985
+#: src/main.c:2007
 msgid "  --status [folder]...   show the total number of messages"
-msgstr "  --status [zložka]…   zobrazí celkový počet správ"
+msgstr "  --status [zložka]...   zobrazí celkový počet správ"
 
-#: src/main.c:1986
+#: src/main.c:2008
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr ""
-"  --status-full [zložka]…\n"
+"  --status-full [zložka]...\n"
 "                         zobrazí stav každej zložky"
 
-#: src/main.c:1988
+#: src/main.c:2010
 msgid "  --statistics           show session statistics"
 msgstr "  --statistics           zobrazí štatistiky relácie"
 
-#: src/main.c:1989
+#: src/main.c:2011
 msgid "  --reset-statistics     reset session statistics"
 msgstr "  --reset-statistics     vymaže štatistiky relácie"
 
-#: src/main.c:1990
+#: src/main.c:2012
 msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"
 "                         folder is a folder id like 'folder/sub_folder'"
@@ -6816,35 +6895,35 @@ msgstr ""
 "                         zložka je identifikátor zložky, napr. „zložka/"
 "pod_zložka”"
 
-#: src/main.c:1992
+#: src/main.c:2014
 msgid "  --online               switch to online mode"
 msgstr "  --online               prepne do online režimu"
 
-#: src/main.c:1993
+#: src/main.c:2015
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              prepne do odpojeného režimu"
 
-#: src/main.c:1994
+#: src/main.c:2016
 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr "  --exit --quit -q       ukončí Claws Mail"
 
-#: src/main.c:1995
+#: src/main.c:2017
 msgid "  --debug                debug mode"
 msgstr "  --debug                ladiaci mód"
 
-#: src/main.c:1996
+#: src/main.c:2018
 msgid "  --toggle-debug         toggle debug mode"
 msgstr "  --toggle-debug         prepne ladiaci mód"
 
-#: src/main.c:1997
+#: src/main.c:2019
 msgid "  --help -h              display this help and exit"
 msgstr "  --help -h              zobrazí tohoto pomocníka a ukončí program"
 
-#: src/main.c:1998
+#: src/main.c:2020
 msgid "  --version -v           output version information and exit"
 msgstr "  --version -v           zobrazí informácie o verzii a ukončí program"
 
-#: src/main.c:1999
+#: src/main.c:2021
 msgid ""
 "  --version-full -V      output version and built-in features information "
 "and exit"
@@ -6852,19 +6931,19 @@ msgstr ""
 "  --version-full -V      zobrazí informácie o verzii, zabudovaných "
 "vlastnostiach a ukončí program"
 
-#: src/main.c:2000
+#: src/main.c:2022
 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           výstupný konfiguračný adresár"
 
-#: src/main.c:2001
+#: src/main.c:2023
 msgid ""
-"  --alternate-config-dir [dir]\n"
+"  --alternate-config-dir directory\n"
 "                         use specified configuration directory"
 msgstr ""
 "  --alternate-config-dir [adresár]\n"
-"                         použiť iný konfiguračný adresár"
+"                         použiť zadaný konfiguračný adresár"
 
-#: src/main.c:2003
+#: src/main.c:2025
 msgid ""
 "  --geometry -geometry WxH+X+Y\n"
 "                         set geometry for main window"
@@ -6872,867 +6951,878 @@ msgstr ""
 "  --geometry -geometry WxH+X+Y\n"
 "                         nastaví geometriu hlavného okna"
 
-#: src/main.c:2056
-msgid "Unknown option\n"
-msgstr "Neznáma voľba\n"
+#: src/main.c:2078
+msgid "Unknown option. Try -h or --help for usage.\n"
+msgstr "Neznáma voľba. Skúste -h alebo --help na zobrazenie pomocníka.\n"
 
-#: src/main.c:2074
+#: src/main.c:2096
 #, c-format
 msgid "Processing (%s)..."
-msgstr "Spracovanie (%s)…"
+msgstr "Spracovanie (%s)..."
 
-#: src/main.c:2077
+#: src/main.c:2099
 msgid "top level folder"
 msgstr "zložka najvyššej úrovne"
 
-#: src/main.c:2160
+#: src/main.c:2181
 msgid "Queued messages"
 msgstr "Správy vo fronte"
 
-#: src/main.c:2161
+#: src/main.c:2182
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Vo fronte sú neodoslané správy. Ukončiť program?"
 
-#: src/main.c:2908
+#: src/main.c:2940
 msgid "NetworkManager: network is online.\n"
 msgstr "NetworkManager: sieť je pripojená.\n"
 
-#: src/main.c:2914
+#: src/main.c:2946
 msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: sieť nie je pripojená.\n"
 
-#: src/mainwindow.c:513 src/messageview.c:208
+#: src/mainwindow.c:522 src/messageview.c:211
 msgid "_File"
 msgstr "_Súbor"
 
-#: src/mainwindow.c:515 src/messageview.c:210 src/summaryview.c:436
+#: src/mainwindow.c:524 src/messageview.c:213 src/summaryview.c:447
 msgid "_View"
 msgstr "Zo_braziť"
 
-#: src/mainwindow.c:518
+#: src/mainwindow.c:527
 msgid "_Configuration"
 msgstr "Nastav_enie"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:531
 msgid "_Add mailbox"
 msgstr "Pridať m_ailbox"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:532
 msgid "MH..."
-msgstr "MH…"
+msgstr "MH..."
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:535
 msgid "Change mailbox order..."
-msgstr "Zmeniť poradie schránok…"
+msgstr "Zmeniť poradie schránok..."
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:538
 msgid "_Import mbox file..."
-msgstr "_Importovať súbor mbox"
+msgstr "_Importovať súbor mbox..."
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:539
 msgid "_Export to mbox file..."
-msgstr "_Exportovať do súboru mbox"
+msgstr "_Exportovať do súboru mbox..."
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:540
 msgid "_Export selected to mbox file..."
-msgstr "Exportovať _výber do súboru mbox…"
+msgstr "Exportovať _výber do súboru mbox..."
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:542
 msgid "Empty all _Trash folders"
 msgstr "Vyčistiť všetky _koše"
 
-#: src/mainwindow.c:536 src/messageview.c:217
+#: src/mainwindow.c:545 src/messageview.c:220
 msgid "_Save email as..."
-msgstr "_Uložiť email ako…"
+msgstr "_Uložiť email ako..."
 
-#: src/mainwindow.c:537 src/messageview.c:218
+#: src/mainwindow.c:546 src/messageview.c:221
 msgid "_Save part as..."
-msgstr "_Uložiť časť ako…"
+msgstr "_Uložiť časť ako..."
 
-#: src/mainwindow.c:540 src/messageview.c:219
+#: src/mainwindow.c:549 src/messageview.c:222
 msgid "Page setup..."
-msgstr "Nastavenie strany…"
+msgstr "Nastavenie strany..."
 
-#: src/mainwindow.c:541 src/messageview.c:220
+#: src/mainwindow.c:550 src/messageview.c:223
 msgid "_Print..."
-msgstr "_Tlačiť…"
+msgstr "_Tlačiť..."
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:552
 msgid "Synchronise folders"
 msgstr "S_ynchronizovať zložky"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:554
 msgid "E_xit"
 msgstr "_Skončiť"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:559
 msgid "Select _thread"
 msgstr "Zvoliť _vlákno"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:561
 msgid "_Find in current message..."
-msgstr "_Nájsť v aktuálnej správe"
+msgstr "_Nájsť v aktuálnej správe..."
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:563
 msgid "_Quick search"
 msgstr "_Rýchle vyhľadanie"
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:566
 msgid "Show or hi_de"
 msgstr "_Ukázať alebo skryť"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:567
 msgid "_Toolbar"
 msgstr "Panel nás_trojov"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:569
 msgid "Set displayed _columns"
 msgstr "Nastav_iť zobrazované stĺpce"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:570
 msgid "In _folder list..."
-msgstr "V _zozname zložiek…"
+msgstr "V _zozname zložiek..."
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:571
 msgid "In _message list..."
 msgstr "V zozname _správ.."
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:576
 msgid "La_yout"
 msgstr "Rozmiestnenie _okien"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:578
 msgid "_Sort"
 msgstr "_Radiť"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:580
 msgid "_Attract by subject"
 msgstr "Zos_kupiť podľa predmetu"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:582
 msgid "E_xpand all threads"
 msgstr "_Rozbaliť všetky vlákna"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:583
 msgid "Co_llapse all threads"
 msgstr "Zba_liť všetky vlákna"
 
-#: src/mainwindow.c:576 src/messageview.c:231
+#: src/mainwindow.c:585 src/messageview.c:234
 msgid "_Go to"
 msgstr "Pre_jsť na"
 
-#: src/mainwindow.c:577 src/messageview.c:232
+#: src/mainwindow.c:586 src/messageview.c:235
 msgid "_Previous message"
 msgstr "_Predošlá správa"
 
-#: src/mainwindow.c:578 src/messageview.c:233
+#: src/mainwindow.c:587 src/messageview.c:236
 msgid "_Next message"
 msgstr "Ďa_lšia správa"
 
-#: src/mainwindow.c:580 src/messageview.c:235
+#: src/mainwindow.c:589 src/messageview.c:238
 msgid "P_revious unread message"
 msgstr "P_redchádzajúca neprečítaná správa"
 
-#: src/mainwindow.c:581 src/messageview.c:236
+#: src/mainwindow.c:590 src/messageview.c:239
 msgid "N_ext unread message"
-msgstr "Ďalšia _neprečítaná správa."
+msgstr "Ďalšia _neprečítaná správa"
 
-#: src/mainwindow.c:583 src/messageview.c:238
+#: src/mainwindow.c:592 src/messageview.c:241
 msgid "Previous ne_w message"
 msgstr "Predchádzajúca no_vá správa"
 
-#: src/mainwindow.c:584 src/messageview.c:239
+#: src/mainwindow.c:593 src/messageview.c:242
 msgid "Ne_xt new message"
 msgstr "Ďalšia no_vá správa"
 
-#: src/mainwindow.c:586 src/messageview.c:241
+#: src/mainwindow.c:595 src/messageview.c:244
 msgid "Previous _marked message"
 msgstr "Predchádzajúca _označená správa"
 
-#: src/mainwindow.c:587 src/messageview.c:242
+#: src/mainwindow.c:596 src/messageview.c:245
 msgid "Next m_arked message"
 msgstr "Ďalšia _označená správa"
 
-#: src/mainwindow.c:589 src/messageview.c:244
+#: src/mainwindow.c:598 src/messageview.c:247
 msgid "Previous _labeled message"
 msgstr "Predchádzajúca správa s návestí_m"
 
-#: src/mainwindow.c:590 src/messageview.c:245
+#: src/mainwindow.c:599 src/messageview.c:248
 msgid "Next la_beled message"
 msgstr "Ďalšia správa s návestí_m"
 
-#: src/mainwindow.c:592 src/messageview.c:247
+#: src/mainwindow.c:601 src/messageview.c:250
 msgid "Previous opened message"
 msgstr "Naposledy ot_vorená správa"
 
-#: src/mainwindow.c:593 src/messageview.c:248
+#: src/mainwindow.c:602 src/messageview.c:251
 msgid "Next opened message"
 msgstr "Ďalšia o_tvorená správa"
 
-#: src/mainwindow.c:595 src/messageview.c:250
+#: src/mainwindow.c:604 src/messageview.c:253
 msgid "Parent message"
 msgstr "Rodičovská správa"
 
-#: src/mainwindow.c:597 src/messageview.c:252
+#: src/mainwindow.c:606 src/messageview.c:255
 msgid "Next unread _folder"
 msgstr "Ďalšia nepr_ečítaná zložka"
 
-#: src/mainwindow.c:598 src/messageview.c:253
+#: src/mainwindow.c:607 src/messageview.c:256
 msgid "F_older..."
 msgstr "_Zložka..."
 
-#: src/mainwindow.c:600 src/messageview.c:255 src/mimeview.c:200
+#: src/mainwindow.c:609 src/messageview.c:258 src/mimeview.c:230
 msgid "Next part"
 msgstr "Ďalšia časť"
 
-#: src/mainwindow.c:601 src/messageview.c:256 src/mimeview.c:201
+#: src/mainwindow.c:610 src/messageview.c:259 src/mimeview.c:231
 msgid "Previous part"
 msgstr "Predošlá časť"
 
-#: src/mainwindow.c:604 src/messageview.c:257
+#: src/mainwindow.c:613 src/messageview.c:260
 msgid "Message scroll"
 msgstr "Posúvanie správy"
 
-#: src/mainwindow.c:605 src/messageview.c:258
+#: src/mainwindow.c:614 src/messageview.c:261
 msgid "Previous line"
 msgstr "Predošlý riadok"
 
-#: src/mainwindow.c:606 src/messageview.c:259
+#: src/mainwindow.c:615 src/messageview.c:262
 msgid "Next line"
 msgstr "Ďalší riadok"
 
-#: src/mainwindow.c:607 src/messageview.c:260 src/printing.c:481
+#: src/mainwindow.c:616 src/messageview.c:263 src/printing.c:476
 msgid "Previous page"
 msgstr "Predošlá strana"
 
-#: src/mainwindow.c:608 src/messageview.c:261 src/printing.c:488
+#: src/mainwindow.c:617 src/messageview.c:264 src/printing.c:482
 msgid "Next page"
 msgstr "Ďalšia strana"
 
-#: src/mainwindow.c:626 src/messageview.c:279
+#: src/mainwindow.c:635 src/messageview.c:282
 msgid "Decode"
 msgstr "Dekódovať"
 
-#: src/mainwindow.c:633
+#: src/mainwindow.c:642
 msgid "Open in new _window"
 msgstr "Otvoriť v _novom okne"
 
-#: src/mainwindow.c:634 src/messageview.c:286
+#: src/mainwindow.c:643 src/messageview.c:289
 msgid "Mess_age source"
 msgstr "Zdrojový kód správ_y"
 
-#: src/mainwindow.c:636 src/messageview.c:287
+#: src/mainwindow.c:645 src/messageview.c:290
 msgid "Message part"
 msgstr "Správová časť"
 
-#: src/mainwindow.c:637 src/messageview.c:288
+#: src/mainwindow.c:646 src/messageview.c:291
 msgid "View as text"
 msgstr "Zobraziť ako text"
 
-#: src/mainwindow.c:638 src/messageview.c:289 src/toolbar.c:494
+#: src/mainwindow.c:647 src/messageview.c:292 src/toolbar.c:494
 msgid "Open"
 msgstr "Otvoriť"
 
-#: src/mainwindow.c:640 src/messageview.c:291
+#: src/mainwindow.c:649 src/messageview.c:294
 msgid "Open with..."
-msgstr "Otvoriť pomocou…"
+msgstr "Otvoriť pomocou..."
 
-#: src/mainwindow.c:644 src/messageview.c:294
+#: src/mainwindow.c:653 src/messageview.c:297
 msgid "Quotes"
 msgstr "Citácia"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:655
 msgid "_Update summary"
 msgstr "_Aktualizovať sumár"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:658
 msgid "Recei_ve"
 msgstr "P_rijať"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:659
 msgid "Get from _current account"
 msgstr "Prijať z _aktuálneho účtu"
 
-#: src/mainwindow.c:651
+#: src/mainwindow.c:660
 msgid "Get from _all accounts"
 msgstr "Prijať zo _všetkých účtov"
 
-#: src/mainwindow.c:652
+#: src/mainwindow.c:661
 msgid "Cancel receivin_g"
 msgstr "_Zrušiť prijímanie"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:664
 msgid "_Send queued messages"
 msgstr "Odoslať _správy z fronty"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:669
 msgid "Compose a_n email message"
 msgstr "_Napísať novú správu"
 
-#: src/mainwindow.c:661
+#: src/mainwindow.c:670
 msgid "Compose a news message"
 msgstr "Napísať nový príspevok"
 
-#: src/mainwindow.c:663 src/messageview.c:300
-#: src/plugins/notification/notification_banner.c:95
+#: src/mainwindow.c:672 src/messageview.c:303
+#: src/plugins/notification/notification_banner.c:95 src/summaryview.c:431
 msgid "_Reply"
 msgstr "_Odpovedať"
 
-#: src/mainwindow.c:664 src/messageview.c:301 src/summaryview.c:428
+#: src/mainwindow.c:673 src/messageview.c:304 src/summaryview.c:432
 msgid "Repl_y to"
 msgstr "O_dpovedať komu"
 
-#: src/mainwindow.c:667 src/messageview.c:304
+#: src/mainwindow.c:676 src/messageview.c:307 src/summaryview.c:435
 msgid "Mailing _list"
 msgstr "Emai_lová konferencia"
 
-#: src/mainwindow.c:668
+#: src/mainwindow.c:677
 msgid "Follow-up and reply to"
 msgstr "Sledovať a odpovedať na"
 
-#: src/mainwindow.c:671 src/messageview.c:307 src/toolbar.c:2446
+#: src/mainwindow.c:680 src/messageview.c:310 src/summaryview.c:437
+#: src/toolbar.c:2449
 msgid "_Forward"
 msgstr "_Poslať ďalej"
 
-#: src/mainwindow.c:672 src/messageview.c:308 src/toolbar.c:2447
+#: src/mainwindow.c:681 src/messageview.c:311 src/summaryview.c:438
+#: src/toolbar.c:2450
 msgid "For_ward as attachment"
 msgstr "Poslať ďale_j ako prílohu"
 
-#: src/mainwindow.c:673 src/messageview.c:309 src/toolbar.c:2448
+#: src/mainwindow.c:682 src/messageview.c:312 src/summaryview.c:439
+#: src/toolbar.c:2451
 msgid "Redirec_t"
 msgstr "P_resmerovať"
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:684
 msgid "Mailing-_List"
 msgstr "Emai_lová-Konferencia"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:685
 msgid "Post"
 msgstr "Pošta"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:687
 msgid "Help"
 msgstr "_Pomocník"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:691
 msgid "Unsubscribe"
 msgstr "_Odhlásiť sa"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:693
 msgid "View archive"
 msgstr "Zobraziť archív"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:695
 msgid "Contact owner"
-msgstr "kontaktovať vlastníka"
+msgstr "Kontaktovať vlastníka"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:699
 msgid "M_ove..."
-msgstr "Pre_sunúť…"
+msgstr "Pre_sunúť..."
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:700
 msgid "_Copy..."
-msgstr "_Kopírovať…"
+msgstr "_Kopírovať..."
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:701
 msgid "Move to _trash"
 msgstr "Presunúť _do koša"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:702
 msgid "_Delete..."
-msgstr "Z_mazať…"
+msgstr "Z_mazať..."
 
-#: src/mainwindow.c:694
+#: src/mainwindow.c:703
 msgid "Move thread to tr_ash"
 msgstr "Presunúť vlákno do _koša"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:704
 msgid "Delete t_hread"
 msgstr "_Zmazať vlákno"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:705
 msgid "Cancel a news message"
 msgstr "Zrušiť príspevo_k"
 
-#: src/mainwindow.c:699 src/mainwindow.c:700 src/summaryview.c:429
+#: src/mainwindow.c:708 src/mainwindow.c:709 src/summaryview.c:440
 msgid "_Mark"
 msgstr "O_značiť"
 
-#: src/mainwindow.c:701
+#: src/mainwindow.c:710
 msgid "_Unmark"
 msgstr "O_dznačiť"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:713
 msgid "Mark as rea_d"
 msgstr "Označiť ako _prečítané"
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:714
 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:716
+msgid "Mark all read in folder"
+msgstr "Označiť všetky v priečinku ako prečítané"
 
-#: src/mainwindow.c:708
-msgid "Mark all unread"
-msgstr "Označiť všetky ako nprečítané"
+#: src/mainwindow.c:717
+msgid "Mark all unread in folder"
+msgstr "Označiť všetky v priečinku ako neprečítané"
 
-#: src/mainwindow.c:710 src/prefs_filtering_action.c:199 src/toolbar.c:242
+#: src/mainwindow.c:719 src/prefs_filtering_action.c:193 src/toolbar.c:242
 #: src/toolbar.c:503
 msgid "Ignore thread"
 msgstr "Ignorovať vlákno"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:720
 msgid "Unignore thread"
 msgstr "Zrušiť ignorovanie vlákna"
 
-#: src/mainwindow.c:712 src/prefs_filtering_action.c:200 src/toolbar.c:243
+#: src/mainwindow.c:721 src/prefs_filtering_action.c:194 src/toolbar.c:243
 #: src/toolbar.c:504
 msgid "Watch thread"
 msgstr "Sledovať vlákno"
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:722
 msgid "Unwatch thread"
 msgstr "Zrušiť sledovanie vlákna"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:725
 msgid "Mark as _spam"
 msgstr "Označiť ako _spam"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:726
 msgid "Mark as _ham"
 msgstr "Označiť ako _nie spam"
 
-#: src/mainwindow.c:720 src/prefs_filtering_action.c:181 src/toolbar.c:507
+#: src/mainwindow.c:729 src/prefs_filtering_action.c:177 src/toolbar.c:507
 msgid "Lock"
 msgstr "Zamknúť"
 
-#: src/mainwindow.c:721 src/prefs_filtering_action.c:182 src/toolbar.c:508
+#: src/mainwindow.c:730 src/prefs_filtering_action.c:178 src/toolbar.c:508
 msgid "Unlock"
 msgstr "Odomknúť"
 
-#: src/mainwindow.c:723 src/summaryview.c:430
+#: src/mainwindow.c:732 src/summaryview.c:441
 msgid "Color la_bel"
 msgstr "_Farebné označenie"
 
-#: src/mainwindow.c:724 src/summaryview.c:431
+#: src/mainwindow.c:733 src/summaryview.c:442
 msgid "Ta_gs"
 msgstr "Z_načky"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:736
 msgid "Re-_edit"
 msgstr "Znova _upraviť"
 
-#: src/mainwindow.c:730 src/messageview.c:310 src/mimeview.c:1021
+#: src/mainwindow.c:739 src/messageview.c:313 src/mimeview.c:1048
 msgid "Check signature"
 msgstr "Overiť podpis"
 
-#: src/mainwindow.c:735 src/messageview.c:314
+#: src/mainwindow.c:744 src/messageview.c:317
 msgid "Add sender to address boo_k"
 msgstr "Pridať odosielateľa _do adresára"
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:746
 msgid "C_ollect addresses"
 msgstr "Zoz_bierať adresy"
 
-#: src/mainwindow.c:738
+#: src/mainwindow.c:747
 msgid "From current _folder..."
-msgstr "Z aktuálnej _zložky…"
+msgstr "Z aktuálnej _zložky..."
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:748
 msgid "From selected _messages..."
-msgstr "Z vybraných _správ…"
+msgstr "Z vybraných _správ..."
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:751
 msgid "_Filter all messages in folder"
 msgstr "Filtrovať _všetky správy v zložke"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:752
 msgid "Filter _selected messages"
 msgstr "Filtrovať _zvolené správy"
 
-#: src/mainwindow.c:744
+#: src/mainwindow.c:753
 msgid "Run folder pr_ocessing rules"
 msgstr "Spustiť sprac_ovanie pravidiel"
 
-#: src/mainwindow.c:746 src/messageview.c:317
+#: src/mainwindow.c:755 src/messageview.c:320
 msgid "_Create filter rule"
 msgstr "Vytvor_iť pravidlo filtra"
 
-#: src/mainwindow.c:747 src/mainwindow.c:753 src/messageview.c:318
-#: src/messageview.c:324
+#: src/mainwindow.c:756 src/mainwindow.c:762 src/messageview.c:321
+#: src/messageview.c:327
 msgid "_Automatically"
 msgstr "_Automaticky"
 
-#: src/mainwindow.c:748 src/mainwindow.c:754 src/mainwindow.c:858
-#: src/messageview.c:319 src/messageview.c:325
+#: src/mainwindow.c:757 src/mainwindow.c:763 src/mainwindow.c:870
+#: src/messageview.c:322 src/messageview.c:328
 msgid "By _From"
 msgstr "Podľa _odosielateľa"
 
-#: src/mainwindow.c:749 src/mainwindow.c:755 src/mainwindow.c:859
-#: src/messageview.c:320 src/messageview.c:326
+#: src/mainwindow.c:758 src/mainwindow.c:764 src/mainwindow.c:871
+#: src/messageview.c:323 src/messageview.c:329
 msgid "By _To"
 msgstr "Podľa _adresáta"
 
-#: src/mainwindow.c:750 src/mainwindow.c:756 src/messageview.c:321
-#: src/messageview.c:327
+#: src/mainwindow.c:759 src/mainwindow.c:765 src/messageview.c:324
+#: src/messageview.c:330
 msgid "By _Subject"
 msgstr "Podľa _predmetu"
 
-#: src/mainwindow.c:752 src/messageview.c:323 src/summaryview.c:434
+#: src/mainwindow.c:761 src/messageview.c:326 src/summaryview.c:445
 msgid "Create processing rule"
 msgstr "Vytvoriť pravidlo spracovania"
 
-#: src/mainwindow.c:759 src/messageview.c:330
+#: src/mainwindow.c:768 src/messageview.c:333
 msgid "List _URLs..."
-msgstr "Zobraziť všetky _URL…"
+msgstr "Zobraziť všetky _URL..."
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:775
 msgid "Ch_eck for new messages in all folders"
-msgstr "Skontrolovať nové správy vo všetkých pri_ečinkoch…"
+msgstr "Skontrolovať nové správy vo všetkých pri_ečinkoch"
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:776
 msgid "Delete du_plicated messages"
 msgstr "Zmazať du_plikované správy"
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:777
 msgid "In selected folder"
 msgstr "V zvolenej zložke"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:778
 msgid "In all folders"
 msgstr "Vo všetkých zložkách"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:781
 msgid "E_xecute"
 msgstr "Vyko_nať"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:782
 msgid "Exp_unge"
 msgstr "V_ymazať"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:785
 msgid "SSL/TLS cer_tificates"
 msgstr "Cer_tifikáty SSL/TLS"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:788
 msgid "Filtering Lo_g"
 msgstr "Záznam _filtra"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:789
 msgid "Network _Log"
 msgstr "Záznam _siete"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:791
+msgid "Debug _Log"
+msgstr "_Ladiaci záznam"
+
+#: src/mainwindow.c:794
 msgid "_Forget all session passwords"
 msgstr "_Zabudnúť všetky heslá relácie"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:796
 msgid "Forget _master passphrase"
 msgstr "Zabudnúť _hlavnú tajnú vetu"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:800
 msgid "C_hange current account"
 msgstr "Z_meniť aktívny účet"
 
-#: src/mainwindow.c:790
+#: src/mainwindow.c:802
 msgid "_Preferences for current account..."
-msgstr "Nastavenie aktívneho _účtu…"
+msgstr "Nastavenie aktívneho _účtu..."
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:803
 msgid "Create _new account..."
-msgstr "Vytvoriť _nový účet…"
+msgstr "Vytvoriť _nový účet..."
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:804
 msgid "_Edit accounts..."
-msgstr "_Upraviť účty…"
+msgstr "_Upraviť účty..."
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:807
 msgid "P_references..."
-msgstr "Nas_tavenia…"
+msgstr "Nas_tavenia..."
 
-#: src/mainwindow.c:796
+#: src/mainwindow.c:808
 msgid "Pre-pr_ocessing..."
-msgstr "Pred-sprac_ovanie…"
+msgstr "Pred-sprac_ovanie..."
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:809
 msgid "Post-pro_cessing..."
-msgstr "Po-spra_covanie…"
+msgstr "Po-spra_covanie..."
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:810
 msgid "_Filtering..."
-msgstr "_Filtrovanie…"
+msgstr "_Filtrovanie..."
 
-#: src/mainwindow.c:799
+#: src/mainwindow.c:811
 msgid "_Templates..."
-msgstr "Ša_blóny…"
+msgstr "Ša_blóny..."
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:812
 msgid "_Actions..."
-msgstr "_Akcie…"
+msgstr "_Akcie..."
 
-#: src/mainwindow.c:801
+#: src/mainwindow.c:813
 msgid "Tag_s..."
-msgstr "Z_načky…"
+msgstr "Z_načky..."
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:815
 msgid "Plu_gins..."
-msgstr "Zásuvné _moduly…"
+msgstr "Zásuvné _moduly..."
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:818
 msgid "_Manual"
 msgstr "_Manuál"
 
-#: src/mainwindow.c:807
+#: src/mainwindow.c:819
 msgid "_Online User-contributed FAQ"
 msgstr "_Online používateľské FAQ"
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:820
 msgid "Icon _Legend"
 msgstr "_Legenda k ikonám"
 
-#: src/mainwindow.c:810
+#: src/mainwindow.c:822
 msgid "Set as default client"
 msgstr "Nastaviť ako predvoleného klienta"
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:829
 msgid "Offline _mode"
 msgstr "Odpojený reži_m"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:830
 msgid "Men_ubar"
 msgstr "Panel nástr_ojov"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:831
 msgid "_Message view"
 msgstr "Zobraze_nie správy"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:833
 msgid "Status _bar"
 msgstr "Stavový ria_dok"
 
-#: src/mainwindow.c:823
+#: src/mainwindow.c:835
 msgid "Column headers"
 msgstr "Hlavičky stĺpcov"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:836
 msgid "Th_read view"
 msgstr "Zobraziť _vlákna"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:837 src/prefs_summaries.c:667
 msgid "Hide read threads"
 msgstr "Skryť prečítané vlákna"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:838
 msgid "_Hide read messages"
 msgstr "S_kryť prečítané správy"
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:839 src/prefs_summaries.c:673
 msgid "Hide deleted messages"
 msgstr "Skryť vymazané správy"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:840
 msgid "_Fullscreen"
 msgstr "_Celá obrazovka"
 
-#: src/mainwindow.c:829 src/messageview.c:342
+#: src/mainwindow.c:841 src/messageview.c:345
 msgid "Show all _headers"
 msgstr "Zobraziť všetky _hlavičky"
 
-#: src/mainwindow.c:830 src/messageview.c:343
+#: src/mainwindow.c:842 src/messageview.c:346
 msgid "_Collapse all"
 msgstr "Zba_liť všetky"
 
-#: src/mainwindow.c:831 src/messageview.c:344
+#: src/mainwindow.c:843 src/messageview.c:347
 msgid "Collapse from level _2"
 msgstr "Zbaliť od úrovne _2"
 
-#: src/mainwindow.c:832 src/messageview.c:345
+#: src/mainwindow.c:844 src/messageview.c:348
 msgid "Collapse from level _3"
 msgstr "Zbaliť od úrovne _3"
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:848
 msgid "Text _below icons"
 msgstr "Text _pod ikonami"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:849
 msgid "Text be_side icons"
 msgstr "Text _vedľa ikon"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:850
 msgid "_Icons only"
 msgstr "Len _ikony"
 
-#: src/mainwindow.c:839
+#: src/mainwindow.c:851
 msgid "_Text only"
 msgstr "Len _text"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:858
 msgid "_Standard"
 msgstr "Šta_ndardný"
 
-#: src/mainwindow.c:847
+#: src/mainwindow.c:859
 msgid "_Three columns"
 msgstr "_Tri stĺpce"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:860
 msgid "_Wide message"
 msgstr "Š_iroká správa"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:861
 msgid "W_ide message list"
 msgstr "Široký _zoznam správ"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:862
 msgid "S_mall screen"
 msgstr "_Malá obrazovka"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:866
 msgid "By _number"
 msgstr "Podľa _čísla"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:867
 msgid "By s_ize"
 msgstr "Podľa _veľkosti"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:868
 msgid "By _date"
 msgstr "Podľa _dátumu"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:869
 msgid "By thread date"
 msgstr "Podľa dátumu v_lákna"
 
-#: src/mainwindow.c:860
+#: src/mainwindow.c:872
 msgid "By s_ubject"
 msgstr "Podľa _predmetu"
 
-#: src/mainwindow.c:861
+#: src/mainwindow.c:873
 msgid "By _color label"
 msgstr "Podľa _farebnej menovky"
 
-#: src/mainwindow.c:862
+#: src/mainwindow.c:874
 msgid "By tag"
 msgstr "Podľa _značky"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:875
 msgid "By _mark"
 msgstr "Podľa _označenia"
 
-#: src/mainwindow.c:864
+#: src/mainwindow.c:876
 msgid "By _status"
 msgstr "Podľa _stavu"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:877
 msgid "By a_ttachment"
 msgstr "Podľa _prílohy"
 
-#: src/mainwindow.c:866
+#: src/mainwindow.c:878
 msgid "By score"
 msgstr "Podľa s_kóre"
 
-#: src/mainwindow.c:867
+#: src/mainwindow.c:879
 msgid "By locked"
 msgstr "Podľa _zamknutia"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:880
 msgid "D_on't sort"
 msgstr "_Neradiť"
 
-#: src/mainwindow.c:872 src/prefs_summaries.c:462
+#: src/mainwindow.c:884 src/prefs_summaries.c:654
 msgid "Ascending"
 msgstr "Vzostupne"
 
-#: src/mainwindow.c:873 src/prefs_summaries.c:463
+#: src/mainwindow.c:885 src/prefs_summaries.c:655
 msgid "Descending"
 msgstr "Zostupne"
 
-#: src/mainwindow.c:915 src/messageview.c:387
+#: src/mainwindow.c:927 src/messageview.c:390
 msgid "_Auto detect"
 msgstr "_Automaticky zistiť"
 
-#: src/mainwindow.c:1312 src/summaryview.c:6287
+#: src/mainwindow.c:1305 src/summaryview.c:6495
 msgid "Apply tags..."
-msgstr "Použiť značky…"
+msgstr "Použiť značky..."
 
-#: src/mainwindow.c:1958
+#: src/mainwindow.c:1961
 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:1973
+#: src/mainwindow.c:1976
 msgid "You are online. Click the icon to go offline"
 msgstr "Ste pripojený. Kliknite na ikonu ak sa chcete odpojiť"
 
-#: src/mainwindow.c:1976
+#: src/mainwindow.c:1979
 msgid "You are offline. Click the icon to go online"
 msgstr "Ste odpojený. Kliknite na ikonu ak sa chcete pripojiť"
 
-#: src/mainwindow.c:1990
+#: src/mainwindow.c:1993
 msgid "Select account"
 msgstr "Zvoliť účet"
 
-#: src/mainwindow.c:2017 src/prefs_logging.c:136
+#: src/mainwindow.c:2020 src/prefs_logging.c:136
 msgid "Network log"
 msgstr "Záznam komunikácie"
 
-#: src/mainwindow.c:2021
+#: src/mainwindow.c:2024
 msgid "Filtering/Processing debug log"
 msgstr "Záznam ladenia filtrovania/spracovania"
 
-#: src/mainwindow.c:2040 src/prefs_logging.c:378
+#: src/mainwindow.c:2043 src/prefs_logging.c:378
 msgid "filtering log enabled\n"
 msgstr "záznam filtrovania zapnutý\n"
 
-#: src/mainwindow.c:2042 src/prefs_logging.c:380
+#: src/mainwindow.c:2045 src/prefs_logging.c:380
 msgid "filtering log disabled\n"
 msgstr "záznam filtrovania vypnutý\n"
 
-#: src/mainwindow.c:2485 src/mainwindow.c:2492 src/mainwindow.c:2535
-#: src/mainwindow.c:2568 src/mainwindow.c:2600 src/mainwindow.c:2645
+#: src/mainwindow.c:2479 src/mainwindow.c:2486 src/mainwindow.c:2529
+#: src/mainwindow.c:2562 src/mainwindow.c:2594 src/mainwindow.c:2639
 #: src/plugins/notification/notification_trayicon.c:372
-#: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1077
+#: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1087
 msgid "Untitled"
 msgstr "Bez názvu"
 
-#: src/mainwindow.c:2646 src/prefs_summary_open.c:114
+#: src/mainwindow.c:2640 src/prefs_summary_open.c:114
 msgid "none"
 msgstr "žiadny"
 
-#: src/mainwindow.c:2903 src/mainwindow.c:2907
+#: src/mainwindow.c:2897 src/mainwindow.c:2902
 msgid "Delete all messages in trash folders?"
 msgstr "Zmazať všetky správy v košoch?"
 
-#: src/mainwindow.c:2904
+#: src/mainwindow.c:2898
 msgid "Don't quit"
 msgstr "Neskončiť"
 
-#: src/mainwindow.c:2933 src/plugins/mailmbox/plugin_gtk.c:189
+#: src/mainwindow.c:2929 src/plugins/mailmbox/plugin_gtk.c:189
 msgid "Add mailbox"
 msgstr "Pridať poštovú schránku"
 
-#: src/mainwindow.c:2934
+#: src/mainwindow.c:2930
 msgid ""
-"Input the location of mailbox.\n"
-"If an existing mailbox is specified, it will be\n"
+"Input the location of the mailbox.\n"
+"The location can be either the full path or relative to the \n"
+"home directory.\n"
+"If the location of an existing mailbox is specified, it will be\n"
 "scanned automatically."
 msgstr ""
 "Zadajte umiestnenie schránky.\n"
-"Ak zadáte názov existujúcej schránky, bude\n"
-"táto automaticky prehľadaná."
+"Umiestnenie môže byť buď úplná cesta alebo relatívna \n"
+"k domovskému priečinku.\n"
+"Ak zadáte názov existujúcej schránky, táto bude\n"
+"automaticky prehľadaná."
 
-#: src/mainwindow.c:2940 src/plugins/mailmbox/plugin_gtk.c:196
+#: src/mainwindow.c:2938 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:2945 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
-#: src/wizard.c:740
+#: src/mainwindow.c:2943 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
+#: src/wizard.c:742
 msgid "Mailbox"
 msgstr "Schránka"
 
-#: src/mainwindow.c:2950 src/plugins/mailmbox/plugin_gtk.c:215 src/setup.c:55
+#: src/mainwindow.c:2948 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 "
@@ -7741,47 +7831,47 @@ msgstr ""
 "Nemožno vytvoriť schránku.\n"
 "Pravdepodobne už niektoré súbory existujú, alebo tam nemáte právo zápisu."
 
-#: src/mainwindow.c:3419
+#: src/mainwindow.c:3415
 msgid "No posting allowed"
 msgstr "Prispievanie nie je povolené"
 
-#: src/mainwindow.c:4002
+#: src/mainwindow.c:3997
 msgid "Mbox import has failed."
 msgstr "Zlyhal import súboru mbox."
 
-#: src/mainwindow.c:4011 src/mainwindow.c:4020
+#: src/mainwindow.c:4006 src/mainwindow.c:4015
 msgid "Export to mbox has failed."
 msgstr "Zlyhal export do mbox."
 
-#: src/mainwindow.c:4061 src/plugins/notification/notification_trayicon.c:550
+#: src/mainwindow.c:4056 src/plugins/notification/notification_trayicon.c:550
 msgid "Exit"
 msgstr "Skončiť"
 
-#: src/mainwindow.c:4061 src/plugins/notification/notification_trayicon.c:550
+#: src/mainwindow.c:4056 src/plugins/notification/notification_trayicon.c:550
 msgid "Exit Claws Mail?"
 msgstr "Skončiť Claws Mail?"
 
-#: src/mainwindow.c:4252
+#: src/mainwindow.c:4257
 msgid "Folder synchronisation"
 msgstr "Synchronizácia zložiek"
 
-#: src/mainwindow.c:4253
+#: src/mainwindow.c:4258
 msgid "Do you want to synchronise your folders now?"
 msgstr "Chcete teraz synchronizovať svoje zložky?"
 
-#: src/mainwindow.c:4254
+#: src/mainwindow.c:4259
 msgid "_Synchronise"
 msgstr "_Synchronizovať"
 
-#: src/mainwindow.c:4702
+#: src/mainwindow.c:4737
 msgid "Deleting duplicated messages..."
-msgstr "Mažem duplicitné správy…"
+msgstr "Mažem duplicitné správy..."
 
-#: src/mainwindow.c:4712
+#: src/mainwindow.c:4747
 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:4718
+#: src/mainwindow.c:4753
 #, c-format
 msgid "Deleted %d duplicate message in selected folder.\n"
 msgid_plural "Deleted %d duplicate messages in selected folder.\n"
@@ -7789,7 +7879,7 @@ 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:4722
+#: src/mainwindow.c:4757
 #, 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"
@@ -7797,11 +7887,11 @@ 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:4760
+#: src/mainwindow.c:4795
 msgid "Deleting duplicated messages in all folders..."
-msgstr "Mažem duplicitné správy vo všetkých zložkách…"
+msgstr "Mažem duplicitné správy vo všetkých zložkách..."
 
-#: src/mainwindow.c:4766
+#: src/mainwindow.c:4801
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
@@ -7809,48 +7899,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:4771
+#: src/mainwindow.c:4806
 #, 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:4933 src/messageview.c:2657
+#: src/mainwindow.c:4968 src/messageview.c:2634
 msgid "Select folder to go to"
 msgstr "Zvoľte zložku na prechod"
 
-#: src/mainwindow.c:5034 src/summaryview.c:5778
+#: src/mainwindow.c:5069 src/summaryview.c:5938
 msgid "Processing rules to apply before folder rules"
 msgstr "Pravidlá spracovania použité pred pravidlami zložky"
 
-#: src/mainwindow.c:5042
+#: src/mainwindow.c:5077
 msgid "Processing rules to apply after folder rules"
 msgstr "Pravidlá spracovania použité po pravidlách zložky"
 
-#: src/mainwindow.c:5050 src/summaryview.c:5789
+#: src/mainwindow.c:5085 src/summaryview.c:5949
 msgid "Filtering configuration"
 msgstr "Nastavenie filtrovania"
 
-#: src/mainwindow.c:5165
+#: src/mainwindow.c:5200
 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:5224
+#: src/mainwindow.c:5259
 msgid "Claws Mail has been registered as default client."
 msgstr "Claws Mail bol zaregistrovaný ako predvolený klient."
 
-#: src/mainwindow.c:5226
+#: src/mainwindow.c:5261
 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:5240 src/setup.c:91
+#: src/mainwindow.c:5275 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
-msgstr "Prehľadávanie zložky %s%c%s…"
+msgstr "Prehľadávanie zložky %s%c%s..."
 
-#: src/mainwindow.c:5384
+#: src/mainwindow.c:5419
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
@@ -7858,56 +7948,65 @@ msgstr[0] "Zabudnuté %d heslo v %d účtoch.\n"
 msgstr[1] "Zabudnuté %d heslá v %d účtoch.\n"
 msgstr[2] "Zabudnutých %d hesiel v %d účtoch.\n"
 
-#: src/matcher.c:214 src/matcher.c:215 src/matcher.c:216 src/matcher.c:217
-#: src/matcher.c:218 src/matcher.c:219 src/matcher.c:220 src/matcher.c:221
+#: src/matcher.c:217 src/matcher.c:218 src/matcher.c:219 src/matcher.c:220
+#: src/matcher.c:221 src/matcher.c:222 src/matcher.c:223 src/matcher.c:224
 #, c-format
 msgid "%s header"
 msgstr "Hlavička %s"
 
-#: src/matcher.c:222
+#: src/matcher.c:225
 msgid "header"
 msgstr "hlavička"
 
-#: src/matcher.c:223
+#: src/matcher.c:226
 msgid "header line"
 msgstr "riadok hlavičky"
 
-#: src/matcher.c:224
+#: src/matcher.c:227
 msgid "body line"
 msgstr "riadok tela správy"
 
-#: src/matcher.c:225
+#: src/matcher.c:228
 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:743 src/summary_search.c:514
+#: src/matcher.c:538 src/matcher.c:543 src/matcher.c:562 src/matcher.c:567
+#: src/message_search.c:215 src/prefs_matcher.c:752 src/summary_search.c:455
 msgid "Case sensitive"
 msgstr "Záleží na veľkosti písmen"
 
-#: src/matcher.c:528 src/matcher.c:533 src/matcher.c:552 src/matcher.c:557
+#: src/matcher.c:538 src/matcher.c:543 src/matcher.c:562 src/matcher.c:567
 msgid "Case insensitive"
 msgstr "Nezáleží na veľkosti"
 
-#: src/matcher.c:1859
+#: src/matcher.c:1903
 #, c-format
 msgid "checking if message matches [ %s ]\n"
 msgstr "zisťujem či správa vyhovuje [ %s ]\n"
 
-#: src/matcher.c:1930 src/matcher.c:1949 src/matcher.c:1962
+#: src/matcher.c:1976 src/matcher.c:1995 src/matcher.c:2008
 msgid "message matches\n"
 msgstr "správa vyhovuje\n"
 
-#: src/matcher.c:1937 src/matcher.c:1955 src/matcher.c:1964
+#: src/matcher.c:1983 src/matcher.c:2001 src/matcher.c:2010
 msgid "message does not match\n"
 msgstr "správa nevyhovuje\n"
 
-#: src/matcher.c:2227 src/matcher.c:2228 src/matcher.c:2229 src/matcher.c:2230
-#: src/matcher.c:2231 src/matcher.c:2232 src/matcher.c:2233 src/matcher.c:2234
+#: src/matcher.c:2275 src/matcher.c:2276 src/matcher.c:2277 src/matcher.c:2278
+#: src/matcher.c:2279 src/matcher.c:2280 src/matcher.c:2281 src/matcher.c:2282
 msgid "(none)"
 msgstr "(žiadna)"
 
-#: src/mbox.c:107
+#: src/mbox.c:98
+#, c-format
+msgid ""
+"Could not stat mbox file:\n"
+"%s\n"
+msgstr ""
+"Nemožno pristupovať k súboru mbox:\n"
+"%s\n"
+
+#: src/mbox.c:104
 #, c-format
 msgid ""
 "Could not open mbox file:\n"
@@ -7916,28 +8015,27 @@ msgstr ""
 "Nemožno otvoriť súbor mbox:\n"
 "%s\n"
 
-#: src/mbox.c:144
+#: src/mbox.c:142
 #, c-format
-msgid "Importing from mbox... (%d mail imported)"
-msgid_plural "Importing from mbox... (%d mails imported)"
-msgstr[0] "Importovanie zo súboru mbox… (naimportovaná jedna správa)"
-msgstr[1] "Importovanie zo súboru mbox… (naimportované %d správy)"
-msgstr[2] "Importovanie zo súboru mbox… (naimportovaných %d správ)"
+msgid "Importing from mbox... (%ld MB imported)"
+msgid_plural "Importing from mbox... (%ld MB imported)"
+msgstr[0] "Importovanie zo súboru mbox... (importovaný %ld MB)"
+msgstr[1] "Importovanie zo súboru mbox... (importované %ld MB)"
+msgstr[2] "Importovanie zo súboru mbox... (importovaných %ld MB)"
 
-#: src/mbox.c:549
+#: src/mbox.c:550
 msgid "Overwrite mbox file"
 msgstr "Prepísať súbor mbox"
 
-#: src/mbox.c:550
+#: src/mbox.c:551
 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:1864 src/mimeview.c:1843
-#: src/prefs_themes.c:598 src/textview.c:3095
+#: src/mbox.c:552 src/mimeview.c:1897 src/prefs_themes.c:596
 msgid "Overwrite"
 msgstr "Prepísať"
 
-#: src/mbox.c:560
+#: src/mbox.c:561
 #, c-format
 msgid ""
 "Could not create mbox file:\n"
@@ -7946,51 +8044,51 @@ msgstr ""
 "Nemožno vytvoriť súbor mbox:\n"
 "%s\n"
 
-#: src/mbox.c:568
+#: src/mbox.c:565
 msgid "Exporting to mbox..."
-msgstr "Exportujem do súboru mbox…"
+msgstr "Exportujem do súboru mbox..."
 
-#: src/message_search.c:162
+#: src/message_search.c:173
 msgid "Find in current message"
 msgstr "Nájsť v aktuálnej správe"
 
-#: src/message_search.c:180
+#: src/message_search.c:192
 msgid "Find text:"
 msgstr "Hľadaný text:"
 
-#: src/message_search.c:328 src/summary_search.c:838
+#: src/message_search.c:318 src/summary_search.c:779
 msgid "Search failed"
 msgstr "Hľadanie zlyhalo"
 
-#: src/message_search.c:329 src/summary_search.c:839
+#: src/message_search.c:319 src/summary_search.c:780
 msgid "Search string not found."
 msgstr "Hľadaný reťazec nenájdený."
 
-#: src/message_search.c:338
+#: src/message_search.c:328
 msgid "Beginning of message reached; continue from end?"
 msgstr "Dosiahnutý začiatok správy; pokračovať od konca?"
 
-#: src/message_search.c:341
+#: src/message_search.c:331
 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:850
+#: src/message_search.c:334 src/summary_search.c:791
 msgid "Search finished"
 msgstr "Hľadanie dokončené"
 
-#: src/messageview.c:297 src/textview.c:252
+#: src/messageview.c:300 src/textview.c:249
 msgid "Compose _new message"
 msgstr "Napísať _novú správu"
 
-#: src/messageview.c:712 src/messageview.c:1455 src/messageview.c:1606
+#: src/messageview.c:715 src/messageview.c:1436 src/messageview.c:1587
 msgid "Claws Mail - Message View"
 msgstr "Claws Mail - Zobrazenie správy"
 
-#: src/messageview.c:842
+#: src/messageview.c:845
 msgid "<No Return-Path found>"
 msgstr "<Nenájdená adresa pre odpoveď>"
 
-#: src/messageview.c:849
+#: src/messageview.c:852
 #, c-format
 msgid ""
 "The notification address to which the return receipt is\n"
@@ -8005,82 +8103,52 @@ msgstr ""
 "Návratová cesta: %s\n"
 "Odporúčame toto potvrdenie neodoslať."
 
-#: src/messageview.c:856 src/messageview.c:884
+#: src/messageview.c:859
 msgid "_Don't Send"
 msgstr "_Neodoslať"
 
-#: 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 '%s' and '%s' headers it was not\n"
-"officially addressed to you.\n"
-"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 „'%s'” a „'%s'” nebola \n"
-"oficiálne adresovaná vám.\n"
-"Neodporúčame toto potvrdenie odoslať."
-
-#: src/messageview.c:1385
+#: src/messageview.c:1366
 #, c-format
 msgid "Fetching message (%s)..."
-msgstr "Sťahovanie správy (%s)…"
+msgstr "Sťahovanie správy (%s)..."
 
-#: src/messageview.c:1421 src/procmime.c:1009
+#: src/messageview.c:1402 src/procmime.c:957
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Nemožno dešifrovať: %s"
 
-#: src/messageview.c:1502 src/messageview.c:1510
+#: src/messageview.c:1483 src/messageview.c:1491
 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:1856 src/messageview.c:1859 src/mimeview.c:2048
-#: src/plugins/fancy/fancy_viewer.c:709 src/summaryview.c:4882
-#: src/summaryview.c:4885 src/textview.c:3083
-msgid "Save as"
-msgstr "Uložiť ako"
-
-#: src/messageview.c:1865
-msgid "Overwrite existing file?"
-msgstr "Prepísať existujúci súbor?"
-
-#: src/messageview.c:1873 src/summaryview.c:4902 src/summaryview.c:4905
-#: src/summaryview.c:4920
-#, c-format
-msgid "Couldn't save the file '%s'."
-msgstr "Nemožno uložiť súbor „%s”."
-
-#: src/messageview.c:1926
+#: src/messageview.c:1868
 #, c-format
 msgid "Show all %s."
 msgstr "Zobraziť všetky %s."
 
-#: src/messageview.c:1928
+#: src/messageview.c:1870
 msgid "Only the first megabyte of text is shown."
 msgstr "Zobrazený je len prvý megabajt textu."
 
-#: src/messageview.c:1959
+#: src/messageview.c:1901
 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:1962
+#: src/messageview.c:1904
 msgid "You asked for a return receipt in this message."
 msgstr "Vyžiadali ste si potvrdenie o prijatí tejto správy."
 
-#: src/messageview.c:1968
+#: src/messageview.c:1910
 msgid "This message asks for a return receipt."
 msgstr "Táto správa chce aby ste odoslali potvrdenie o prijatí."
 
-#: src/messageview.c:1969
+#: src/messageview.c:1911
 msgid "Send receipt"
 msgstr "Odoslať potvrdenie"
 
-#: src/messageview.c:2012
+#: src/messageview.c:1954
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -8088,7 +8156,7 @@ msgstr ""
 "Táto správa bola čiastočne prijatá,\n"
 "a bola zmazaná zo servera."
 
-#: src/messageview.c:2018
+#: src/messageview.c:1960
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8097,15 +8165,15 @@ msgstr ""
 "Táto správa vola čiastočne prijatá;\n"
 "je %s."
 
-#: src/messageview.c:2022 src/messageview.c:2044
+#: src/messageview.c:1964 src/messageview.c:1986
 msgid "Mark for download"
 msgstr "Označiť na stiahnutie"
 
-#: src/messageview.c:2023 src/messageview.c:2035
+#: src/messageview.c:1965 src/messageview.c:1977
 msgid "Mark for deletion"
 msgstr "Označiť na odstránenie"
 
-#: src/messageview.c:2028
+#: src/messageview.c:1970
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8114,12 +8182,12 @@ msgstr ""
 "Táto správa vola čiastočne prijatá;\n"
 "je %s a bude stiahnutá."
 
-#: src/messageview.c:2033 src/messageview.c:2046
-#: src/prefs_filtering_action.c:180 src/toolbar.c:506
+#: src/messageview.c:1975 src/messageview.c:1988
+#: src/prefs_filtering_action.c:176 src/toolbar.c:506
 msgid "Unmark"
 msgstr "Odznačiť"
 
-#: src/messageview.c:2039
+#: src/messageview.c:1981
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8128,11 +8196,34 @@ msgstr ""
 "Táto správa vola čiastočne prijatá;\n"
 "je %s a bude zmazaná."
 
-#: src/messageview.c:2112
+#: src/messageview.c:2058
+#, c-format
+msgctxt "'%s' stands for 'To' then 'Cc'"
+msgid ""
+"This message is asking for a return receipt notification\n"
+"but according to its '%s' and '%s' headers it was not\n"
+"officially addressed to you.\n"
+"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 „'%s'” a „'%s'” nebola \n"
+"oficiálne adresovaná vám.\n"
+"Neodporúčame toto potvrdenie odoslať."
+
+#: src/messageview.c:2066 src/messageview.c:2074
 msgid "Return Receipt Notification"
 msgstr "Potvrdenie o príjme"
 
-#: src/messageview.c:2113
+#: src/messageview.c:2068 src/messageview.c:2079
+#: src/plugins/rssyl/rssyl_feed_props.c:496
+msgid "_Cancel"
+msgstr "_Zrušiť"
+
+#: src/messageview.c:2068 src/messageview.c:2079
+msgid "_Send Notification"
+msgstr "Odo_slať potvrdenie"
+
+#: src/messageview.c:2075
 msgid ""
 "More than one of your accounts uses the address that this message was sent "
 "to.\n"
@@ -8142,19 +8233,11 @@ 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:2117 src/plugins/rssyl/rssyl_feed_props.c:506
-msgid "_Cancel"
-msgstr "_Zrušiť"
-
-#: src/messageview.c:2117
-msgid "_Send Notification"
-msgstr "Odo_slať potvrdenie"
-
-#: src/messageview.c:2206
+#: src/messageview.c:2171 src/messageview.c:2190
 msgid "Cannot print: the message doesn't contain text."
 msgstr "Nemožno tlačiť: správa neobsahuje text."
 
-#: src/messageview.c:2967
+#: src/messageview.c:2944
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -8162,7 +8245,7 @@ msgstr ""
 "\n"
 "  V tejto zložke nie sú správy"
 
-#: src/messageview.c:2975
+#: src/messageview.c:2952
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -8170,7 +8253,7 @@ msgstr ""
 "\n"
 "  Správa bola odstránená"
 
-#: src/messageview.c:2976
+#: src/messageview.c:2953
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -8178,22 +8261,22 @@ msgstr ""
 "\n"
 "  Správa bola odstránená alebo presunutá do inej zložky"
 
-#: src/messageview.c:3009 src/messageview.c:3015 src/summaryview.c:4295
-#: src/summaryview.c:7054
+#: src/messageview.c:2986 src/messageview.c:2992 src/summaryview.c:4420
+#: src/summaryview.c:7298
 msgid "An error happened while learning.\n"
 msgstr "Nastala chyba pri učení.\n"
 
-#: src/mh.c:527
+#: src/mh.c:528
 msgid "Moving messages..."
-msgstr "Presúvam správy…"
+msgstr "Presúvam správy..."
 
-#: src/mh.c:671 src/plugins/mailmbox/mailmbox_folder.c:838
+#: src/mh.c:672 src/plugins/mailmbox/mailmbox_folder.c:839
 msgid "Deleting messages..."
-msgstr "Mažem správy…"
+msgstr "Mažem správy..."
 
 #: src/mh_gtk.c:63 src/plugins/mailmbox/plugin_gtk.c:67
 msgid "Remove _mailbox..."
-msgstr "_Odstrániť schránku…"
+msgstr "_Odstrániť schránku..."
 
 #: src/mh_gtk.c:222
 #, c-format
@@ -8219,58 +8302,62 @@ msgstr ""
 msgid "Remove mailbox"
 msgstr "Odstrániť schránku"
 
-#: src/mimeview.c:192
+#: src/mimeview.c:221
 msgid "_Open"
 msgstr "_Otvoriť"
 
-#: src/mimeview.c:194
+#: src/mimeview.c:223
 msgid "Open _with..."
-msgstr "Otvoriť _pomocou…"
+msgstr "Otvoriť _pomocou..."
 
-#: src/mimeview.c:196
+#: src/mimeview.c:225 src/prefs_filtering_action.c:172
+msgid "Copy"
+msgstr "Kopírovať"
+
+#: src/mimeview.c:226
 msgid "Send to..."
-msgstr "Odoslať do…"
+msgstr "Odoslať do..."
 
-#: src/mimeview.c:197
+#: src/mimeview.c:227
 msgid "_Display as text"
 msgstr "_Zobraziť ako text"
 
-#: src/mimeview.c:198
+#: src/mimeview.c:228
 msgid "_Save as..."
-msgstr "_Uložiť ako…"
+msgstr "_Uložiť ako..."
 
-#: src/mimeview.c:199
+#: src/mimeview.c:229
 msgid "Save _all..."
-msgstr "Uložiť _všetky…"
+msgstr "Uložiť _všetky..."
 
-#: src/mimeview.c:272
+#: src/mimeview.c:302
 msgid "MIME Type"
 msgstr "MIME typ"
 
-#: src/mimeview.c:1026 src/mimeview.c:1031 src/mimeview.c:1036
-#: src/mimeview.c:1041
+#: src/mimeview.c:1053 src/mimeview.c:1058 src/mimeview.c:1063
+#: src/mimeview.c:1068
 msgid "View full information"
 msgstr "Zobraziť úplné informácie"
 
-#: src/mimeview.c:1047
+#: src/mimeview.c:1074
 msgid "Check again"
 msgstr "Znova overiť"
 
-#: src/mimeview.c:1059
+#: src/mimeview.c:1086
 #, c-format
 msgid "%s Click the icon to check it."
 msgstr "%s Na overenie kliknite na ikonu."
 
-#: src/mimeview.c:1061
+#: src/mimeview.c:1088
 #, c-format
 msgid "%s Click the icon or hit '%s' to check it."
 msgstr "%s Na overenie kliknite na ikonu alebo stlačte „%s”."
 
-#: src/mimeview.c:1071
+#: src/mimeview.c:1098
 msgid "Timeout checking the signature. Click the icon to try again."
 msgstr "Čas na overenie podpisu vypršal. Na zopakovanie kliknite na ikonu."
 
-#: src/mimeview.c:1073
+#: src/mimeview.c:1100
 #, c-format
 msgid ""
 "Timeout checking the signature. Click the icon or hit '%s' to try again."
@@ -8278,26 +8365,26 @@ msgstr ""
 "Čas na overenie podpisu vypršal. Na zopakovanie kliknite na ikonu alebo "
 "stlačte „%s”."
 
-#: src/mimeview.c:1313
+#: src/mimeview.c:1345
 msgid "Checking signature..."
-msgstr "Overovanie podpisu…"
+msgstr "Overovanie podpisu..."
 
-#: src/mimeview.c:1354
+#: src/mimeview.c:1386
 msgid "Go back to email"
 msgstr "Naspäť na správu"
 
-#: 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:449
+#: src/mimeview.c:1815 src/mimeview.c:1907 src/mimeview.c:2149
+#: src/mimeview.c:2185 src/mimeview.c:2297 src/plugins/fancy/fancy_viewer.c:440
 #, 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:1840 src/textview.c:3093
+#: src/mimeview.c:1894
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "Prepísať existujúci súbor „%s”?"
 
-#: src/mimeview.c:1864
+#: src/mimeview.c:1918
 #, c-format
 msgid ""
 "An error has occurred while saving message part #%d. Do you want to cancel "
@@ -8306,19 +8393,19 @@ 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
+#: src/mimeview.c:1921
 msgid "Error saving all message parts"
 msgstr "Chyba pri ukladaní všetkých častí správy"
 
-#: src/mimeview.c:1868
+#: src/mimeview.c:1922
 msgid "Skip"
 msgstr "Preskočiť"
 
-#: src/mimeview.c:1868
+#: src/mimeview.c:1922
 msgid "Skip all"
 msgstr "Preskočiť všetko"
 
-#: src/mimeview.c:1878
+#: src/mimeview.c:1932
 #, c-format
 msgid "%d file saved successfully."
 msgid_plural "%d files saved successfully."
@@ -8326,7 +8413,7 @@ 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
+#: src/mimeview.c:1940
 #, c-format
 msgid "%d file saved successfully"
 msgid_plural "%d files saved successfully"
@@ -8334,7 +8421,7 @@ 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
+#: src/mimeview.c:1945
 #, c-format
 msgid "%s, %d file failed."
 msgid_plural "%s, %d files failed."
@@ -8342,21 +8429,26 @@ 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:1300
+#: src/mimeview.c:1978 src/plugins/archive/archiver_prefs.c:142
+#: src/prefs_filtering_action.c:1263
 msgid "Select destination folder"
 msgstr "Zvoľte cieľovú zložku"
 
-#: src/mimeview.c:1931 src/plugins/archive/archiver_prefs.c:148
+#: src/mimeview.c:1985 src/plugins/archive/archiver_prefs.c:148
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "„%s” nie je zložka."
 
-#: src/mimeview.c:2178 src/mimeview.c:2185 src/textview.c:3010
+#: src/mimeview.c:2102 src/plugins/fancy/fancy_viewer.c:693
+#: src/summaryview.c:5032
+msgid "Save as"
+msgstr "Uložiť ako"
+
+#: src/mimeview.c:2232 src/mimeview.c:2239
 msgid "Open with"
 msgstr "Otvoriť čím"
 
-#: src/mimeview.c:2179 src/mimeview.c:2186 src/textview.c:3011
+#: src/mimeview.c:2233 src/mimeview.c:2240
 #, c-format
 msgid ""
 "Enter the command-line to open file:\n"
@@ -8365,7 +8457,7 @@ msgstr ""
 "Zadajte príkazový na otvorenie súboru:\n"
 "(„%s” bude nahradené názvom súboru)"
 
-#: src/mimeview.c:2281
+#: src/mimeview.c:2335
 #, c-format
 msgid ""
 "Could not convert attachment name to UTF-16:\n"
@@ -8376,113 +8468,113 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/mimeview.c:2289
+#: src/mimeview.c:2343
 msgid "Execute untrusted binary?"
 msgstr "Spustiť neznámy binárny súbor?"
 
-#: src/mimeview.c:2290
+#: src/mimeview.c:2344
 msgid ""
 "This attachment is an executable file. Executing untrusted binaries is "
-"dangerous and could probably lead to compromission of your computer.\n"
+"dangerous and could compromise your computer.\n"
 "\n"
 "Do you want to run this file?"
 msgstr ""
 "Táto príloha je spustiteľný súbor. Spúšťanie neznámych binárnych súborov je "
-"nebezpečné a môže spôsobiť kompromitovanie vášho stroja.\n"
+"nebezpečné a môže spôsobiť kompromitovať váš počítač.\n"
 "\n"
 "Naozaj chcete spustiť tento súbor?"
 
-#: src/mimeview.c:2294
+#: src/mimeview.c:2348
 msgid "Run binary"
 msgstr "Spustiť binárny súbor"
 
-#: src/mimeview.c:2596 src/plugins/att_remover/att_remover.c:304
+#: src/mimeview.c:2651 src/plugins/att_remover/att_remover.c:304
 msgid "Type:"
 msgstr "Typ:"
 
-#: src/mimeview.c:2597 src/plugins/att_remover/att_remover.c:305
-#: src/plugins/pdf_viewer/poppler_viewer.c:699 src/summaryview.c:2713
+#: src/mimeview.c:2652 src/plugins/att_remover/att_remover.c:305
+#: src/plugins/pdf_viewer/poppler_viewer.c:702 src/summaryview.c:2788
 msgid "Size:"
 msgstr "Veľkosť:"
 
-#: 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
+#: src/mimeview.c:2666 src/plugins/vcalendar/vcalendar.c:1240
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1595
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1605
 msgid "Description:"
 msgstr "Popis:"
 
-#: src/news.c:303
+#: src/news.c:300
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected.\n"
 msgstr "Spojenie NNTP k %s:%d bolo prerušené.\n"
 
-#: src/news.c:336
+#: src/news.c:335
 #, c-format
 msgid "Account '%s': Connecting to NNTP server: %s:%d...\n"
-msgstr "Účet „%s”: Pripájanie k serveru NNTP: %s:%d…\n"
+msgstr "Účet „%s”: Pripájanie k serveru NNTP: %s:%d...\n"
 
-#: src/news.c:357
+#: src/news.c:372
 #, c-format
 msgid "Error logging in to %s:%d...\n"
-msgstr "Chyba pri prihlasovaní k %s:%d …\n"
+msgstr "Chyba pri prihlasovaní k %s:%d ...\n"
 
-#: src/news.c:438
+#: src/news.c:451
 msgid ""
 "Libetpan does not support return code 480 so for now we choose to continue\n"
 msgstr ""
 "Libetpan nepodporuje návratový kód 480, takže teraz zvoľte pokračovať\n"
 
-#: src/news.c:447
+#: src/news.c:460
 msgid "Mode reader failed, continuing nevertheless\n"
 msgstr "Mode reader zlyhalo, napriek tomu pokračujem\n"
 
-#: src/news.c:451
+#: src/news.c:464
 #, c-format
 msgid "Error creating session with %s:%d\n"
 msgstr "Chyba pri vytváraní relácie s %s:%d\n"
 
-#: src/news.c:466
+#: src/news.c:479
 #, c-format
 msgid "Error authenticating to %s:%d...\n"
-msgstr "Chyba pri autentifikácii na %s:%d…\n"
+msgstr "Chyba pri autentifikácii na %s:%d...\n"
 
-#: src/news.c:491
+#: src/news.c:504
 msgid "Claws Mail needs network access in order to access the News server."
 msgstr "Claws Mail potrebuje na prístup k serveru News pripojenie k sieti."
 
-#: src/news.c:862
+#: src/news.c:875
 #, c-format
 msgid "couldn't select group: %s\n"
 msgstr "nemožno zvoliť skupinu: %s\n"
 
-#: src/news.c:1054 src/news.c:1232
+#: src/news.c:1067 src/news.c:1253
 #, c-format
 msgid "couldn't set group: %s\n"
 msgstr "nemožno nastaviť skupinu: %s\n"
 
-#: src/news.c:1063
+#: src/news.c:1076
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "neplatný rozsah článkov: %d - %d\n"
 
-#: src/news.c:1133 src/news.c:1160 src/news.c:1187
+#: src/news.c:1154 src/news.c:1181 src/news.c:1208
 msgid "couldn't get xhdr\n"
 msgstr "nemožno získať xhdr\n"
 
-#: src/news.c:1225
+#: src/news.c:1246
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
-msgstr "prijímam xover %d - %d v %s…\n"
+msgstr "prijímam xover %d - %d v %s...\n"
 
-#: src/news.c:1240
+#: src/news.c:1261
 msgid "couldn't get xover\n"
 msgstr "nemožno získať xover\n"
 
-#: src/news.c:1257
+#: src/news.c:1278
 msgid "invalid xover line\n"
 msgstr "neplatný xover riadok\n"
 
-#: src/news.c:1459
+#: src/news.c:1480
 msgid ""
 "You have one or more News accounts defined. However this version of Claws "
 "Mail has been built without News support; your News accounts are disabled.\n"
@@ -8497,7 +8589,7 @@ msgstr ""
 
 #: src/news_gtk.c:56
 msgid "_Subscribe to newsgroup..."
-msgstr "Prih_lásiť sa do diskusnej skupiny…"
+msgstr "Prih_lásiť sa do diskusnej skupiny..."
 
 #: src/news_gtk.c:57
 msgid "_Unsubscribe newsgroup"
@@ -8522,7 +8614,7 @@ msgstr "Zadajte hlavnú tajnú vetu"
 
 #: src/password.c:141
 msgid "Incorrect master passphrase."
-msgstr "Nesprávne hlavná tajná vetu"
+msgstr "Nesprávne hlavná tajná vetu."
 
 #: src/password_gtk.c:67
 msgid "New passphrases do not match, try again."
@@ -8556,11 +8648,11 @@ msgstr "Nová tajná veta:"
 msgid "Confirm passphrase:"
 msgstr "Potvrďte tajnú vetu:"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:51
+#: src/plugins/acpi_notifier/acpi_notifier.c:53
 msgid "Acpi Notifier"
 msgstr "Upozornenia ACPI"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:67
+#: src/plugins/acpi_notifier/acpi_notifier.c:69
 msgid ""
 "Make sure that the kernel module 'acerhk' is loaded.\n"
 "You can get it from http://www.cakey.de/acerhk/"
@@ -8568,7 +8660,7 @@ msgstr ""
 "Overte si, že je načítaný modulu jadra „acerhk”.\n"
 "Môžete ho získať z http://www.cakey.de/acerhk/"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:69
+#: src/plugins/acpi_notifier/acpi_notifier.c:71
 msgid ""
 "Make sure that the kernel module 'acer_acpi' is loaded.\n"
 "You can get it from http://code.google.com/p/aceracpi/"
@@ -8576,19 +8668,19 @@ msgstr ""
 "Overte si, že je načítaný modulu jadra „acer_acpi”.\n"
 "Môžete ho získať z http://code.google.com/p/aceracpi/"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:71
+#: src/plugins/acpi_notifier/acpi_notifier.c:73
 msgid "Make sure that the kernel module 'asus_laptop' is loaded."
 msgstr "Overte si, že je načítaný modul jadra „asus_laptop”."
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:72
+#: src/plugins/acpi_notifier/acpi_notifier.c:74
 msgid "Make sure that the kernel module 'asus_acpi' is loaded."
 msgstr "Overte si, že je načítaný modul jadra „asus_acpi”."
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:73
+#: src/plugins/acpi_notifier/acpi_notifier.c:75
 msgid "Make sure that the kernel module 'ibm_acpi' is loaded."
 msgstr "Overte si, že je načítaný modul jadra „ibm_acpi”."
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:74
+#: src/plugins/acpi_notifier/acpi_notifier.c:76
 msgid ""
 "Make sure that you have apanelc installed.\n"
 "You can get it from http://apanel.sourceforge.net/"
@@ -8596,78 +8688,78 @@ msgstr ""
 "Overte si, že je nainštalovaný apanelc.\n"
 "Môžete ho získať z http://apanel.sourceforge.net/"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:207
-#: src/plugins/acpi_notifier/acpi_notifier.c:213
-#: src/plugins/acpi_notifier/acpi_notifier.c:425
+#: src/plugins/acpi_notifier/acpi_notifier.c:209
+#: src/plugins/acpi_notifier/acpi_notifier.c:215
+#: src/plugins/acpi_notifier/acpi_notifier.c:427
 msgid "Control file doesn't exist."
 msgstr "Riadiaci súbor neexistuje."
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:305
+#: src/plugins/acpi_notifier/acpi_notifier.c:307
 msgid " : no new or unread mail"
 msgstr " : žiadna nová alebo neprečítaná pošta"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:306
+#: src/plugins/acpi_notifier/acpi_notifier.c:308
 msgid " : unread mail"
 msgstr " : neprečítaná pošta"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:307
+#: src/plugins/acpi_notifier/acpi_notifier.c:309
 msgid " : new mail"
 msgstr " : nová pošta"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:309
-#: src/plugins/acpi_notifier/acpi_notifier.c:315
-#: src/plugins/acpi_notifier/acpi_notifier.c:321
-msgid "off"
-msgstr "vypnuté"
-
 #: src/plugins/acpi_notifier/acpi_notifier.c:311
 #: src/plugins/acpi_notifier/acpi_notifier.c:317
 #: src/plugins/acpi_notifier/acpi_notifier.c:323
-msgid "blinking"
-msgstr "bliká"
+msgid "off"
+msgstr "vypnuté"
 
 #: src/plugins/acpi_notifier/acpi_notifier.c:313
 #: src/plugins/acpi_notifier/acpi_notifier.c:319
 #: src/plugins/acpi_notifier/acpi_notifier.c:325
-msgid "on"
-msgstr "svieti"
-
-#: src/plugins/acpi_notifier/acpi_notifier.c:347
-#: src/plugins/acpi_notifier/acpi_notifier.c:356
-#: src/plugins/acpi_notifier/acpi_notifier.c:371
+msgid "blinking"
+msgstr "bliká"
+
+#: src/plugins/acpi_notifier/acpi_notifier.c:315
+#: src/plugins/acpi_notifier/acpi_notifier.c:321
+#: src/plugins/acpi_notifier/acpi_notifier.c:327
+msgid "on"
+msgstr "svieti"
+
+#: src/plugins/acpi_notifier/acpi_notifier.c:349
+#: src/plugins/acpi_notifier/acpi_notifier.c:358
+#: src/plugins/acpi_notifier/acpi_notifier.c:373
 msgid "LED "
 msgstr "LED "
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:386
+#: src/plugins/acpi_notifier/acpi_notifier.c:388
 msgid "ACPI type: "
 msgstr "Typ ACPI: "
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:395
+#: src/plugins/acpi_notifier/acpi_notifier.c:397
 msgid "ACPI file: "
-msgstr "Súbor ACPI:"
+msgstr "Súbor ACPI: "
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:406
+#: src/plugins/acpi_notifier/acpi_notifier.c:408
 msgid "values - On: "
 msgstr "hodnoty - On: "
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:411
+#: src/plugins/acpi_notifier/acpi_notifier.c:413
 msgid " - Off: "
 msgstr " - Vypnuté: "
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:433
+#: src/plugins/acpi_notifier/acpi_notifier.c:435
 msgid "Blink when user interaction is required"
 msgstr "Blikať, keď je vyžadovaný zásah používateľa"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:867
+#: src/plugins/acpi_notifier/acpi_notifier.c:869
 msgid "This plugin handles various ACPI mail LEDs."
 msgstr "Tento zásuvný modul ovláda rôzne ACPI LED pošty."
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:888
+#: src/plugins/acpi_notifier/acpi_notifier.c:890
 msgid "Laptop LED"
 msgstr "LED notebooka"
 
 #: src/plugins/address_keeper/address_keeper.c:252
-#: src/plugins/attachwarner/attachwarner.c:257
+#: src/plugins/attachwarner/attachwarner.c:252
 msgid "Failed to register check before send hook"
 msgstr "Zlyhala registrácia obsluhy udalosti „check before send”"
 
@@ -8694,13 +8786,13 @@ 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:123
-#: src/plugins/bogofilter/bogofilter_gtk.c:278
+#: src/plugins/bogofilter/bogofilter_gtk.c:262
 #: src/plugins/bsfilter/bsfilter_gtk.c:201
-#: src/plugins/spamassassin/spamassassin_gtk.c:447
-#: src/prefs_filtering_action.c:573 src/prefs_filtering_action.c:580
-#: src/prefs_matcher.c:679
+#: src/plugins/spamassassin/spamassassin_gtk.c:463
+#: src/prefs_filtering_action.c:546 src/prefs_filtering_action.c:553
+#: src/prefs_matcher.c:690
 msgid "Select..."
-msgstr "Vybrať…"
+msgstr "Vybrať..."
 
 #: src/plugins/address_keeper/address_keeper_prefs.c:139
 msgid "Fields to keep addresses from"
@@ -8727,7 +8819,7 @@ msgstr "Archivácia pošty"
 
 #: src/plugins/archive/archiver.c:56
 msgid "Create Archive..."
-msgstr "Vytvoriť archív…"
+msgstr "Vytvoriť archív..."
 
 #: src/plugins/archive/archiver.c:123
 #, c-format
@@ -8777,19 +8869,19 @@ msgstr ""
 msgid "Archiver"
 msgstr "Archivácia"
 
-#: src/plugins/archive/archiver_gtk.c:107
+#: src/plugins/archive/archiver_gtk.c:108
 msgid "Archiving"
 msgstr "Archivácia"
 
-#: src/plugins/archive/archiver_gtk.c:125
+#: src/plugins/archive/archiver_gtk.c:127
 msgid "Press Cancel button to stop archiving"
 msgstr "Na zastavenie archivácie stlačte tlačidlo Zrušiť"
 
-#: src/plugins/archive/archiver_gtk.c:141
+#: src/plugins/archive/archiver_gtk.c:143
 msgid "Archiving:"
 msgstr "Archivácia:"
 
-#: src/plugins/archive/archiver_gtk.c:525
+#: src/plugins/archive/archiver_gtk.c:527
 #, c-format
 msgid ""
 "Some uninitialized data prevents from starting\n"
@@ -8800,7 +8892,7 @@ msgstr ""
 "procesu archivácie:\n"
 "%s%s"
 
-#: src/plugins/archive/archiver_gtk.c:528
+#: src/plugins/archive/archiver_gtk.c:530
 msgid ""
 "\n"
 "- the folder to archive is not set"
@@ -8808,7 +8900,7 @@ msgstr ""
 "\n"
 "- nie je nastavená zložka archívu"
 
-#: src/plugins/archive/archiver_gtk.c:529
+#: src/plugins/archive/archiver_gtk.c:531
 msgid ""
 "\n"
 "- the name for archive is not set"
@@ -8816,37 +8908,37 @@ msgstr ""
 "\n"
 "- nie je nastavený názov archívu"
 
-#: src/plugins/archive/archiver_gtk.c:552
+#: src/plugins/archive/archiver_gtk.c:554
 #, c-format
 msgid "%s: Exists. Continue anyway?"
 msgstr "%s: existuje. Pokračovať i tak?"
 
-#: src/plugins/archive/archiver_gtk.c:555
+#: src/plugins/archive/archiver_gtk.c:557
 #, c-format
 msgid "%s: Is a link. Cannot continue"
 msgstr "%s: je odkaz. Nemožno pokračovať"
 
-#: src/plugins/archive/archiver_gtk.c:558
+#: src/plugins/archive/archiver_gtk.c:560
 #, c-format
 msgid "%s: Is a directory. Cannot continue"
 msgstr "%s: je adresár. Nemožno pokračovať"
 
-#: src/plugins/archive/archiver_gtk.c:561
+#: src/plugins/archive/archiver_gtk.c:563
 #, c-format
 msgid "%s: Missing permissions. Cannot continue"
 msgstr "%s: Nedostatočné práva. Nemožno pokračovať"
 
-#: src/plugins/archive/archiver_gtk.c:564
+#: src/plugins/archive/archiver_gtk.c:566
 #, c-format
 msgid "%s: Unknown error. Cannot continue"
 msgstr "%s: Neznáma chyba. Nemožno pokračovať"
 
-#: src/plugins/archive/archiver_gtk.c:572
-#: src/plugins/archive/archiver_gtk.c:619
+#: src/plugins/archive/archiver_gtk.c:574
+#: src/plugins/archive/archiver_gtk.c:621
 msgid "Creating archive"
 msgstr "Vytváranie archívu"
 
-#: src/plugins/archive/archiver_gtk.c:585
+#: src/plugins/archive/archiver_gtk.c:587
 #, c-format
 msgid ""
 "Not a valid file name:\n"
@@ -8855,7 +8947,7 @@ msgstr ""
 "Neplatné meno súboru:\n"
 "%s."
 
-#: src/plugins/archive/archiver_gtk.c:590
+#: src/plugins/archive/archiver_gtk.c:592
 #, c-format
 msgid ""
 "Not a valid Claws Mail folder:\n"
@@ -8864,7 +8956,7 @@ msgstr ""
 "Neplatná zložka Claws Mail:\n"
 "%s."
 
-#: src/plugins/archive/archiver_gtk.c:614
+#: src/plugins/archive/archiver_gtk.c:616
 #, c-format
 msgid ""
 "Adding files in folder failed\n"
@@ -8879,7 +8971,7 @@ msgstr ""
 "\n"
 "Pokračovať?"
 
-#: src/plugins/archive/archiver_gtk.c:631
+#: src/plugins/archive/archiver_gtk.c:633
 #, c-format
 msgid ""
 "Archive creation error:\n"
@@ -8888,174 +8980,176 @@ msgstr ""
 "Chyba vytvorenia archívu:\n"
 "%s"
 
-#: src/plugins/archive/archiver_gtk.c:743
+#: src/plugins/archive/archiver_gtk.c:746
 msgid "Archive result"
 msgstr "Výsledok archívu"
 
-#: src/plugins/archive/archiver_gtk.c:773
+#: src/plugins/archive/archiver_gtk.c:776
 msgid "Values"
 msgstr "Hodnoty"
 
-#: src/plugins/archive/archiver_gtk.c:782
+#: src/plugins/archive/archiver_gtk.c:786
 msgid "Archive"
 msgstr "Archív"
 
-#: src/plugins/archive/archiver_gtk.c:788
+#: src/plugins/archive/archiver_gtk.c:792
 msgid "Archive format"
 msgstr "Formát archívu"
 
-#: src/plugins/archive/archiver_gtk.c:795
+#: src/plugins/archive/archiver_gtk.c:799
 msgid "Compression method"
-msgstr "Kompresná metóda"
+msgstr "Komprimačná metóda"
 
-#: src/plugins/archive/archiver_gtk.c:803
+#: src/plugins/archive/archiver_gtk.c:807
 msgid "Number of files"
 msgstr "Počet súborov"
 
-#: src/plugins/archive/archiver_gtk.c:811
+#: src/plugins/archive/archiver_gtk.c:815
 msgid "Archive Size"
 msgstr "Veľkosť archívu"
 
-#: src/plugins/archive/archiver_gtk.c:819
+#: src/plugins/archive/archiver_gtk.c:823
 msgid "Folder Size"
 msgstr "Veľkosť zložky"
 
-#: src/plugins/archive/archiver_gtk.c:828
+#: src/plugins/archive/archiver_gtk.c:832
 msgid "Compression level"
-msgstr "Úroveň kompresie"
+msgstr "Úroveň komprimácie"
 
-#: 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:718 src/prefs_folder_item.c:522
+#: src/plugins/archive/archiver_gtk.c:837
+#: src/plugins/archive/archiver_gtk.c:845
+#: src/plugins/archive/archiver_gtk.c:853
+#: src/plugins/pdf_viewer/poppler_viewer.c:721 src/prefs_folder_item.c:525
+#: src/prefs_folder_item.c:1200 src/prefs_folder_item.c:1232
 msgid "Yes"
 msgstr "Áno"
 
-#: 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:721 src/prefs_folder_item.c:521
-#: src/prefs_summaries.c:380
+#: src/plugins/archive/archiver_gtk.c:837
+#: src/plugins/archive/archiver_gtk.c:845
+#: src/plugins/archive/archiver_gtk.c:853
+#: src/plugins/pdf_viewer/poppler_viewer.c:724 src/prefs_folder_item.c:524
+#: src/prefs_folder_item.c:1199 src/prefs_folder_item.c:1231
+#: src/prefs_summaries.c:409
 msgid "No"
 msgstr "Nie"
 
-#: src/plugins/archive/archiver_gtk.c:836
+#: src/plugins/archive/archiver_gtk.c:840
 msgid "MD5 checksum"
 msgstr "Kontrolný súčet MD5"
 
-#: src/plugins/archive/archiver_gtk.c:844
+#: src/plugins/archive/archiver_gtk.c:848
 msgid "Descriptive names"
 msgstr "Popisné mená"
 
-#: src/plugins/archive/archiver_gtk.c:852
+#: src/plugins/archive/archiver_gtk.c:856
 msgid "Delete selected files"
 msgstr "Zmazať zvolené súbory"
 
-#: src/plugins/archive/archiver_gtk.c:861
-#: src/plugins/archive/archiver_gtk.c:1324
+#: src/plugins/archive/archiver_gtk.c:865
+#: src/plugins/archive/archiver_gtk.c:1330
 msgid "Select mails before"
 msgstr "Najprv vyberať správy"
 
-#: src/plugins/archive/archiver_gtk.c:917
+#: src/plugins/archive/archiver_gtk.c:921
 msgid "Select folder to archive"
 msgstr "Zvoľte zložka na archiváciu"
 
-#: src/plugins/archive/archiver_gtk.c:938
+#: src/plugins/archive/archiver_gtk.c:942
 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:986
+#: src/plugins/archive/archiver_gtk.c:990
 #, c-format
 msgid "%ld of %ld"
 msgstr "%ld z %ld"
 
-#: src/plugins/archive/archiver_gtk.c:1038
+#: src/plugins/archive/archiver_gtk.c:1043
 msgid "Create Archive"
 msgstr "Vytvoriť archív"
 
-#: src/plugins/archive/archiver_gtk.c:1053
+#: src/plugins/archive/archiver_gtk.c:1058
 msgid "Enter Archiver arguments"
 msgstr "Zadajte argumenty archivácie"
 
-#: src/plugins/archive/archiver_gtk.c:1066
+#: src/plugins/archive/archiver_gtk.c:1072
 msgid "Folder to archive"
 msgstr "Zložka na archiváciu"
 
-#: src/plugins/archive/archiver_gtk.c:1073
+#: src/plugins/archive/archiver_gtk.c:1079
 msgid "Folder which is the root of the archive"
 msgstr "Zložka, ktorá je koreňom archívu"
 
-#: src/plugins/archive/archiver_gtk.c:1078
+#: src/plugins/archive/archiver_gtk.c:1084
 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:1084
+#: src/plugins/archive/archiver_gtk.c:1090
 msgid "Name for archive"
 msgstr "Meno archívu"
 
-#: src/plugins/archive/archiver_gtk.c:1090
+#: src/plugins/archive/archiver_gtk.c:1096
 msgid "Archive location and name"
 msgstr "Umiestnenie a meno archívu"
 
-#: src/plugins/archive/archiver_gtk.c:1092
+#: src/plugins/archive/archiver_gtk.c:1098
 #: src/plugins/archive/archiver_prefs.c:225
-#: src/plugins/pgpcore/select-keys.c:435
+#: src/plugins/pgpcore/select-keys.c:494
 msgid "_Select"
 msgstr "_Zvoliť"
 
-#: src/plugins/archive/archiver_gtk.c:1095
+#: src/plugins/archive/archiver_gtk.c:1101
 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:1097
+#: src/plugins/archive/archiver_gtk.c:1103
 msgid "Choose compression"
-msgstr "Zvoľte kompresiu"
+msgstr "Zvoľte komprimáciu"
 
-#: 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:1127
 #: 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:1140
+#: src/plugins/archive/archiver_gtk.c:1148
 #: 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
+#: src/plugins/archive/archiver_gtk.c:1168
+#: src/plugins/archive/archiver_gtk.c:1176
+#: src/plugins/archive/archiver_gtk.c:1183
 #, 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:1226
+#: src/plugins/archive/archiver_gtk.c:1232
 msgid "Choose format"
 msgstr "Zvoľte formát"
 
-#: 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
+#: src/plugins/archive/archiver_gtk.c:1262
 #, 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:1276
+#: src/plugins/archive/archiver_gtk.c:1282
 msgid "Miscellaneous options"
 msgstr "Rôzne voľby"
 
-#: src/plugins/archive/archiver_gtk.c:1285
+#: src/plugins/archive/archiver_gtk.c:1291
 msgid "_Recursive"
 msgstr "_Rekurzívne"
 
-#: src/plugins/archive/archiver_gtk.c:1289
+#: src/plugins/archive/archiver_gtk.c:1295
 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:1291
+#: src/plugins/archive/archiver_gtk.c:1297
 msgid "_MD5sum"
 msgstr "_MD5sum"
 
-#: src/plugins/archive/archiver_gtk.c:1295
+#: src/plugins/archive/archiver_gtk.c:1301
 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"
@@ -9066,11 +9160,11 @@ msgstr ""
 "Používajte s rozvahou, pretože dramaticky zvyšuje čas potrebný \n"
 "na vytvorenie archívu"
 
-#: src/plugins/archive/archiver_gtk.c:1299
+#: src/plugins/archive/archiver_gtk.c:1305
 msgid "R_ename"
 msgstr "Pr_emenovať"
 
-#: src/plugins/archive/archiver_gtk.c:1303
+#: src/plugins/archive/archiver_gtk.c:1309
 #: src/plugins/archive/archiver_prefs.c:427
 msgid ""
 "Choose this option to use descriptive names for each file in the archive.\n"
@@ -9081,7 +9175,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:1311
+#: src/plugins/archive/archiver_gtk.c:1317
 msgid ""
 "Choose this option to delete mails after archiving\n"
 "At this point only handles IMAP4, Local mbox and POP3"
@@ -9089,11 +9183,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:1315
+#: src/plugins/archive/archiver_gtk.c:1321
 msgid "Selection options"
 msgstr "Voľby výberu"
 
-#: src/plugins/archive/archiver_gtk.c:1331
+#: src/plugins/archive/archiver_gtk.c:1337
 msgid ""
 "Select emails before a certain date\n"
 "Date must comply to ISO-8601 [YYYY-MM-DD]"
@@ -9111,7 +9205,7 @@ msgstr "Týmto tlačidlom vyberiete predvolené umiestnenie na ukladanie archív
 
 #: src/plugins/archive/archiver_prefs.c:238
 msgid "Default compression"
-msgstr "Predvolená kompresia"
+msgstr "Predvolená komprimácia"
 
 #: src/plugins/archive/archiver_prefs.c:249
 #: src/plugins/archive/archiver_prefs.c:255
@@ -9165,7 +9259,7 @@ msgstr ""
 "na vytvorenie archívov"
 
 #: src/plugins/archive/archiver_prefs.c:425
-#: src/plugins/managesieve/sieve_manager.c:765
+#: src/plugins/managesieve/sieve_manager.c:771
 msgid "Rename"
 msgstr "Premenovať"
 
@@ -9177,21 +9271,21 @@ msgstr "Zvoľte túto možnosť na zmazanie správ po archivácii"
 msgid "Remove attachments"
 msgstr "Odstrániť prílohy"
 
-#: src/plugins/att_remover/att_remover.c:362
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:324 src/prefs_themes.c:1097
+#: src/plugins/att_remover/att_remover.c:363
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:325 src/prefs_themes.c:1099
 msgid "Remove"
 msgstr "Odstrániť"
 
-#: src/plugins/att_remover/att_remover.c:370 src/prefs_summaries.c:451
-#: src/prefs_summary_column.c:79 src/summaryview.c:2807
+#: src/plugins/att_remover/att_remover.c:371 src/prefs_summaries.c:643
+#: src/prefs_summary_column.c:79 src/summaryview.c:2882
 msgid "Attachment"
 msgstr "Príloha"
 
-#: src/plugins/att_remover/att_remover.c:422
+#: src/plugins/att_remover/att_remover.c:425
 msgid "Destroy attachments"
 msgstr "Zrušiť prílohy"
 
-#: src/plugins/att_remover/att_remover.c:423
+#: src/plugins/att_remover/att_remover.c:426
 msgid ""
 "Do you really want to remove all attachments from the selected messages?\n"
 "\n"
@@ -9201,20 +9295,34 @@ msgstr ""
 "\n"
 "Odstránenie bude nevratné."
 
-#: src/plugins/att_remover/att_remover.c:484
+#: src/plugins/att_remover/att_remover.c:469
+msgid "The selected messages don't have any attachments."
+msgstr "Zvolené správy nemajú žiadne prílohy."
+
+#: src/plugins/att_remover/att_remover.c:472
+#, c-format
+msgid "Attachments removed from %d of the %d selected messages."
+msgstr "Prílohy odstránené z %d zo %d zvolených správ."
+
+#: src/plugins/att_remover/att_remover.c:475
+#, c-format
+msgid "Attachments removed from all %d selected messages."
+msgstr "Prílohy odstránené zo všetkých %d zvolených správ."
+
+#: src/plugins/att_remover/att_remover.c:504
 msgid "This message doesn't have any attachments."
 msgstr "Táto správa nemá žiadne prílohy."
 
-#: src/plugins/att_remover/att_remover.c:499
+#: src/plugins/att_remover/att_remover.c:517
 msgid "Remove attachments..."
-msgstr "Odstrániť prílohy…"
+msgstr "Odstrániť prílohy..."
 
-#: src/plugins/att_remover/att_remover.c:511
-#: src/plugins/att_remover/att_remover.c:571
+#: src/plugins/att_remover/att_remover.c:529
+#: src/plugins/att_remover/att_remover.c:589
 msgid "AttRemover"
 msgstr "AttRemover"
 
-#: src/plugins/att_remover/att_remover.c:576
+#: src/plugins/att_remover/att_remover.c:594
 msgid ""
 "This plugin removes attachments from mails.\n"
 "\n"
@@ -9226,11 +9334,11 @@ msgstr ""
 "Varovanie: táto operácia je úplne nevratná a odstránené prílohy budú navždy "
 "stratené a úplne a úplne."
 
-#: src/plugins/att_remover/att_remover.c:600
+#: src/plugins/att_remover/att_remover.c:618
 msgid "Attachment handling"
 msgstr "Spracovanie prílohy"
 
-#: src/plugins/attachwarner/attachwarner.c:217
+#: src/plugins/attachwarner/attachwarner.c:210
 #, c-format
 msgid ""
 "An attachment is mentioned in the mail you're sending, but no file was "
@@ -9243,17 +9351,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/attachwarner/attachwarner.c:223
+#: src/plugins/attachwarner/attachwarner.c:216
 msgid "Attachment warning"
 msgstr "Upozornenie na prílohu"
 
-#: src/plugins/attachwarner/attachwarner.c:250
-#: src/plugins/attachwarner/attachwarner.c:287
-#: src/plugins/attachwarner/attachwarner.c:339
+#: src/plugins/attachwarner/attachwarner.c:245
+#: src/plugins/attachwarner/attachwarner.c:282
+#: src/plugins/attachwarner/attachwarner.c:334
 msgid "Attach warner"
 msgstr "Upozornenie na prílohu"
 
-#: src/plugins/attachwarner/attachwarner.c:297
+#: src/plugins/attachwarner/attachwarner.c:292
 msgid ""
 "Warns user if some reference to attachments is found in the message text and "
 "no file is attached."
@@ -9302,7 +9410,7 @@ msgstr ""
 "Nekontroluje chýbajúce prílohy pri správach Posielaných ďalej a "
 "Presmerovaných správach"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:135 src/prefs_msg_colors.c:353
+#: src/plugins/attachwarner/attachwarner_prefs.c:135 src/prefs_msg_colors.c:310
 msgid "Signatures"
 msgstr "Podpisy"
 
@@ -9326,20 +9434,37 @@ msgstr "Vylúčenie"
 msgid "Attach Warner"
 msgstr "Upozornenie na prílohu"
 
-#: src/plugins/bogofilter/bogofilter.c:81
-#: src/plugins/bogofilter/bogofilter_gtk.c:499
+#: src/plugins/bogofilter/bogofilter.c:82
+#: src/plugins/bogofilter/bogofilter_gtk.c:483
 msgid "Bogofilter"
 msgstr "Bogofilter"
 
-#: src/plugins/bogofilter/bogofilter.c:456
+#: src/plugins/bogofilter/bogofilter.c:108
+#: src/plugins/bogofilter/bogofilter_gtk.c:258
+#: src/plugins/bogofilter/bogofilter_gtk.c:331
+#: src/plugins/bogofilter/bogofilter_gtk.c:408
+#: src/plugins/bsfilter/bsfilter.c:107 src/plugins/bsfilter/bsfilter_gtk.c:197
+#: src/plugins/bsfilter/bsfilter_gtk.c:266
+#: src/plugins/bsfilter/bsfilter_gtk.c:326
+#: src/plugins/spamassassin/spamassassin.c:118
+#: src/plugins/spamassassin/spamassassin_gtk.c:459
+#: src/plugins/spamassassin/spamassassin_gtk.c:508
+#: src/plugins/spamassassin/spamassassin_gtk.c:635 src/prefs_matcher.c:686
+#: src/prefs_matcher.c:719 src/prefs_matcher.c:1661 src/prefs_matcher.c:1668
+#: src/prefs_matcher.c:1676 src/prefs_matcher.c:1678 src/prefs_matcher.c:2586
+#: src/prefs_matcher.c:2590
+msgid "Any"
+msgstr "Všetky"
+
+#: src/plugins/bogofilter/bogofilter.c:457
 msgid "Bogofilter: fetching bodies..."
-msgstr "Bogofilter: sťahujem správy…"
+msgstr "Bogofilter: sťahujem správy..."
 
-#: src/plugins/bogofilter/bogofilter.c:469
+#: src/plugins/bogofilter/bogofilter.c:470
 msgid "Bogofilter: filtering messages..."
-msgstr "Bogofilter: filtrujem správy…"
+msgstr "Bogofilter: filtrujem správy..."
 
-#: src/plugins/bogofilter/bogofilter.c:585
+#: src/plugins/bogofilter/bogofilter.c:586
 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"
@@ -9351,7 +9476,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:592
+#: src/plugins/bogofilter/bogofilter.c:593
 #, c-format
 msgid ""
 "The Bogofilter plugin couldn't filter a message. The command `%s %s %s` "
@@ -9360,21 +9485,21 @@ msgstr ""
 "Zásuvný modul Bogofilter nemohol filtrovať správu. Nemožno spustiť príkaz `"
 "%s %s %s`."
 
-#: src/plugins/bogofilter/bogofilter.c:739
+#: src/plugins/bogofilter/bogofilter.c:740
 msgid "Bogofilter: learning from message..."
-msgstr "Bogofilter: analyzujem správu…"
+msgstr "Bogofilter: analyzujem správu..."
 
-#: src/plugins/bogofilter/bogofilter.c:752
-#: src/plugins/bogofilter/bogofilter.c:799 src/plugins/bsfilter/bsfilter.c:486
+#: src/plugins/bogofilter/bogofilter.c:753
+#: src/plugins/bogofilter/bogofilter.c:800 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:767
+#: src/plugins/bogofilter/bogofilter.c:768
 msgid "Bogofilter: learning from messages..."
-msgstr "Bogofilter: analyzujem správy…"
+msgstr "Bogofilter: analyzujem správy..."
 
-#: src/plugins/bogofilter/bogofilter.c:855
+#: src/plugins/bogofilter/bogofilter.c:856
 #, c-format
 msgid ""
 "Learning failed; `%s %s %s` returned with error:\n"
@@ -9383,7 +9508,7 @@ msgstr ""
 "Analýza zlyhala; `%s %s %s` vrátilo chybu:\n"
 "%s"
 
-#: src/plugins/bogofilter/bogofilter.c:983
+#: src/plugins/bogofilter/bogofilter.c:984
 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 "
@@ -9412,72 +9537,72 @@ msgstr ""
 "\n"
 "Nastavenia nájdete v menu Nastavenie/Nastavenia/Zásuvné moduly/Bogofilter"
 
-#: src/plugins/bogofilter/bogofilter.c:1016 src/plugins/bsfilter/bsfilter.c:649
-#: src/plugins/spamassassin/spamassassin.c:624
+#: src/plugins/bogofilter/bogofilter.c:1017 src/plugins/bsfilter/bsfilter.c:649
+#: src/plugins/spamassassin/spamassassin.c:643
 msgid "Spam detection"
 msgstr "Detekcia spamu"
 
-#: src/plugins/bogofilter/bogofilter.c:1017 src/plugins/bsfilter/bsfilter.c:650
-#: src/plugins/spamassassin/spamassassin.c:625
+#: src/plugins/bogofilter/bogofilter.c:1018 src/plugins/bsfilter/bsfilter.c:650
+#: src/plugins/spamassassin/spamassassin.c:644
 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:400
+#: src/plugins/spamassassin/spamassassin_gtk.c:416
 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:358
+#: src/plugins/spamassassin/spamassassin_gtk.c:374
 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:367
+#: src/plugins/spamassassin/spamassassin_gtk.c:383
 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:370 src/prefs_account.c:1544
+#: src/plugins/spamassassin/spamassassin_gtk.c:386 src/prefs_account.c:1616
 msgid "KB"
 msgstr "kB"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:200
+#: src/plugins/bogofilter/bogofilter_gtk.c:192
 msgid "Delete spam"
 msgstr "Odstrániť spam"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:207
+#: src/plugins/bogofilter/bogofilter_gtk.c:195
 msgid "Save spam in..."
-msgstr "Uložiť spam v…"
+msgstr "Uložiť spam v..."
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:214
+#: src/plugins/bogofilter/bogofilter_gtk.c:198
 msgid "Only mark as spam"
 msgstr "Len označiť ako spam"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:227
+#: src/plugins/bogofilter/bogofilter_gtk.c:211
 #: src/plugins/bsfilter/bsfilter_gtk.c:179
-#: src/plugins/spamassassin/spamassassin_gtk.c:416
+#: src/plugins/spamassassin/spamassassin_gtk.c:432
 msgid ""
 "Folder for storing identified spam. Leave empty to use the trash folder."
 msgstr ""
 "Zložka na uloženie nájdeného spamu. Nechajte prázdne, ak chcete použiť "
 "zložku koša."
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:233
+#: src/plugins/bogofilter/bogofilter_gtk.c:217
 #: src/plugins/bsfilter/bsfilter_gtk.c:185
-#: src/plugins/spamassassin/spamassassin_gtk.c:422
+#: src/plugins/spamassassin/spamassassin_gtk.c:438
 msgid "Click this button to select a folder for storing spam"
 msgstr "Pomocou tohoto tlačidla vyberte zložku na ukladanie spamu"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:242
+#: src/plugins/bogofilter/bogofilter_gtk.c:226
 msgid "When unsure, move to"
 msgstr "V prípade neistoty presunúť do"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:250
+#: src/plugins/bogofilter/bogofilter_gtk.c:234
 msgid ""
 "Folder for storing mail for which spam status is Unsure. Leave empty to use "
 "the Inbox folder."
@@ -9485,28 +9610,28 @@ msgstr ""
 "Zložka na uloženie správ, u ktorých nie je istota, že sú spam. Nechajte "
 "prázdne, ak chcete použiť zložku prijatej pošty."
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:256
+#: src/plugins/bogofilter/bogofilter_gtk.c:240
 msgid "Click this button to select a folder for storing Unsure mails."
 msgstr "Použite toto tlačidlo na výber zložky na uloženie neurčitých správ."
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:258
+#: src/plugins/bogofilter/bogofilter_gtk.c:242
 msgid "Insert X-Bogosity header"
 msgstr "Vložiť hlavičku X-Bogosity"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:262
+#: src/plugins/bogofilter/bogofilter_gtk.c:246
 msgid "Only done for messages in MH folders"
 msgstr "Toto je možné len so správami v zložkách MH"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:268
+#: src/plugins/bogofilter/bogofilter_gtk.c:252
 #: src/plugins/bsfilter/bsfilter_gtk.c:191
-#: src/plugins/spamassassin/spamassassin_gtk.c:437
+#: src/plugins/spamassassin/spamassassin_gtk.c:453
 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/bogofilter/bogofilter_gtk.c:256
 #: src/plugins/bsfilter/bsfilter_gtk.c:195
-#: src/plugins/spamassassin/spamassassin_gtk.c:441
+#: src/plugins/spamassassin/spamassassin_gtk.c:457
 msgid ""
 "Messages coming from your address book contacts will be received in the "
 "normal folder even if detected as spam"
@@ -9514,36 +9639,36 @@ msgstr ""
 "Správy pochádzajúce od odosielateľov z vášho adresára budú doručené do "
 "bežných zložiek aj v prípade, že budú identifikované ako spam"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:282
+#: src/plugins/bogofilter/bogofilter_gtk.c:266
 #: src/plugins/bsfilter/bsfilter_gtk.c:205
-#: src/plugins/spamassassin/spamassassin_gtk.c:451
+#: src/plugins/spamassassin/spamassassin_gtk.c:467
 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"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:284
+#: src/plugins/bogofilter/bogofilter_gtk.c:268
 #: src/plugins/bsfilter/bsfilter_gtk.c:207
 msgid "Learn whitelisted emails as ham"
 msgstr "Naučiť sa správy z povolených (whitelisted) správ ako nie spam"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:286
+#: src/plugins/bogofilter/bogofilter_gtk.c:270
 msgid ""
 "If Bogofilter thought an email was spam or unsure, but it was whitelisted, "
 "learn it as ham."
 msgstr ""
 "Ak si Bogofilter myslí, že email bol spam alebo si nie je istý, ale je v "
-"zozname dôveryhodných, naučiť sa ho ako HAM"
+"zozname dôveryhodných, naučiť sa ho ako HAM."
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:295
+#: src/plugins/bogofilter/bogofilter_gtk.c:279
 msgid "Bogofilter call"
 msgstr "Volanie Bogofilter"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:303
+#: src/plugins/bogofilter/bogofilter_gtk.c:287
 msgid "Path to bogofilter executable"
 msgstr "Cesta k programu bogofilter"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:309
+#: src/plugins/bogofilter/bogofilter_gtk.c:293
 #: src/plugins/bsfilter/bsfilter_gtk.c:232
-#: src/plugins/spamassassin/spamassassin_gtk.c:429
+#: src/plugins/spamassassin/spamassassin_gtk.c:445
 msgid "Mark spam as read"
 msgstr "Označiť všetok spam ako prečítaný"
 
@@ -9553,11 +9678,11 @@ msgstr "Bsfilter"
 
 #: src/plugins/bsfilter/bsfilter.c:273
 msgid "Bsfilter: fetching body..."
-msgstr "Bsfilter: vyberanie tela…"
+msgstr "Bsfilter: vyberanie tela..."
 
 #: src/plugins/bsfilter/bsfilter.c:282
 msgid "Bsfilter: filtering message..."
-msgstr "Bsfilter: filtrovanie správy…"
+msgstr "Bsfilter: filtrovanie správy..."
 
 #: src/plugins/bsfilter/bsfilter.c:367
 msgid ""
@@ -9581,7 +9706,7 @@ msgstr ""
 
 #: src/plugins/bsfilter/bsfilter.c:475
 msgid "Bsfilter: learning from message..."
-msgstr "Bsfilter: učenie zo správy…"
+msgstr "Bsfilter: učenie zo správy..."
 
 #: src/plugins/bsfilter/bsfilter.c:616
 msgid ""
@@ -9612,7 +9737,7 @@ msgstr ""
 "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:408
+#: src/plugins/spamassassin/spamassassin_gtk.c:424
 msgid "Save spam in"
 msgstr "Uložiť spam v"
 
@@ -9633,7 +9758,7 @@ msgid "Path to bsfilter executable"
 msgstr "Cesta k bsfilter"
 
 #: src/plugins/clamd/clamav_plugin.c:47
-#: src/plugins/clamd/clamav_plugin_gtk.c:550
+#: src/plugins/clamd/clamav_plugin_gtk.c:538
 msgid "Clam AntiVirus"
 msgstr "Clam AntiVirus"
 
@@ -9678,7 +9803,7 @@ msgstr "Súbor: %s. Veľkosť (%d) prekračuje limit (%d)\n"
 
 #: src/plugins/clamd/clamav_plugin.c:174
 msgid "ClamAV: scanning message..."
-msgstr "ClamAV: správa skenovania…"
+msgstr "ClamAV: správa skenovania..."
 
 #: src/plugins/clamd/clamav_plugin.c:280
 msgid "Failed to register mail filtering hook"
@@ -9756,55 +9881,55 @@ msgstr "Detekcia vírusu"
 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
+#: src/plugins/clamd/clamav_plugin_gtk.c:248
 msgid "Enable virus scanning"
 msgstr "Zapnúť skenovanie vírusov"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:260
+#: src/plugins/clamd/clamav_plugin_gtk.c:258
 msgid "Maximum attachment size"
 msgstr "Maximálna veľkosť prílohy"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:271
+#: src/plugins/clamd/clamav_plugin_gtk.c:269
 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:275
+#: src/plugins/clamd/clamav_plugin_gtk.c:272
 msgid "MB"
 msgstr "MB"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:284
+#: src/plugins/clamd/clamav_plugin_gtk.c:281
 msgid "Save infected mail in"
 msgstr "Uložiť nakazené emaily v"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:288
+#: src/plugins/clamd/clamav_plugin_gtk.c:285
 msgid "Save mail that contains viruses"
 msgstr "Uložiť emaily, ktoré obsahujú vírusy"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:296
+#: src/plugins/clamd/clamav_plugin_gtk.c:292
 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:304
+#: src/plugins/clamd/clamav_plugin_gtk.c:299
 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:312
+#: src/plugins/clamd/clamav_plugin_gtk.c:306
 msgid "Automatic configuration"
 msgstr "Automatická konfigurácia"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:317
+#: src/plugins/clamd/clamav_plugin_gtk.c:311
 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:325
+#: src/plugins/clamd/clamav_plugin_gtk.c:318
 msgid "Where is clamd.conf"
 msgstr "Kde sa nachádza clamd.conf"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:333
+#: src/plugins/clamd/clamav_plugin_gtk.c:326
 msgid ""
 "Full path to clamd.conf. If this field is not empty then the plugin has been "
 "able to locate the file automatically"
@@ -9812,36 +9937,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:337
+#: src/plugins/clamd/clamav_plugin_gtk.c:329
 msgid "Br_owse"
 msgstr "Pr_echádzať"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:341
+#: src/plugins/clamd/clamav_plugin_gtk.c:333
 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:349
+#: src/plugins/clamd/clamav_plugin_gtk.c:340
 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:362
+#: src/plugins/clamd/clamav_plugin_gtk.c:353
 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:370
+#: src/plugins/clamd/clamav_plugin_gtk.c:360
 msgid "Remote Host"
 msgstr "Vzdialený hostiteľ"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:378
+#: src/plugins/clamd/clamav_plugin_gtk.c:368
 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:398
+#: src/plugins/clamd/clamav_plugin_gtk.c:387
 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:525
+#: src/plugins/clamd/clamav_plugin_gtk.c:513
 msgid ""
 "New config\n"
 "No socket information.\n"
@@ -9851,7 +9976,7 @@ msgstr ""
 "Chýbajú informácie o sokete.\n"
 "Antivírus vypnutý."
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:529
+#: src/plugins/clamd/clamav_plugin_gtk.c:517
 msgid ""
 "New config\n"
 "Clamd does not respond to ping.\n"
@@ -9861,7 +9986,7 @@ msgstr ""
 "Clamd neodpovedá na ping.\n"
 "Je clamd spustený?"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:121
+#: src/plugins/clamd/libclamd/clamd-plugin.c:122
 #, c-format
 msgid ""
 "%s: Unable to open\n"
@@ -9870,7 +9995,7 @@ msgstr ""
 "%s: Nemožno otvoriť\n"
 "clamd bude vypnutý"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:216
+#: src/plugins/clamd/libclamd/clamd-plugin.c:217
 #, c-format
 msgid ""
 "%s: Not able to find required information\n"
@@ -9879,30 +10004,30 @@ msgstr ""
 "%s: Nemožno nájsť požadované informácie\n"
 "clamd bude vypnutý"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:250
+#: src/plugins/clamd/libclamd/clamd-plugin.c:251
 msgid "Could not create socket"
 msgstr "Nemožno vytvoriť soket"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:437
+#: src/plugins/clamd/libclamd/clamd-plugin.c:442
 msgid ": File does not exist"
 msgstr ": Súbor neexistuje"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:450
+#: src/plugins/clamd/libclamd/clamd-plugin.c:455
 msgid ": Unable to open"
 msgstr ": Nemožno otvoriť"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:470
-#: src/plugins/clamd/libclamd/clamd-plugin.c:475
-#: src/plugins/clamd/libclamd/clamd-plugin.c:489
+#: src/plugins/clamd/libclamd/clamd-plugin.c:474
+#: src/plugins/clamd/libclamd/clamd-plugin.c:479
+#: src/plugins/clamd/libclamd/clamd-plugin.c:493
 msgid "Socket write error"
 msgstr "Chyba zápisu soketu"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:482
+#: src/plugins/clamd/libclamd/clamd-plugin.c:486
 #, c-format
 msgid "%s: Error reading"
 msgstr "%s: Chyba čítania"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:496
+#: src/plugins/clamd/libclamd/clamd-plugin.c:500
 msgid "Socket read error"
 msgstr "Chyba čítania soketu"
 
@@ -9925,65 +10050,66 @@ msgstr ""
 "Nainštaluje obsluhu udalosti nového výstupu záznamu a vypíše ho na "
 "štandardný výstup.\n"
 "\n"
-"Nie je veľmi užitočný"
+"Nie je veľmi užitočný."
 
-#: src/plugins/fancy/fancy_prefs.c:146
+#: src/plugins/fancy/fancy_prefs.c:147
 msgid "Display images"
 msgstr "Zobraziť obrázky"
 
-#: src/plugins/fancy/fancy_prefs.c:147
+#: src/plugins/fancy/fancy_prefs.c:148
 msgid "Display embedded images"
 msgstr "Zobraziť zahrnuté obrázky"
 
-#: src/plugins/fancy/fancy_prefs.c:151
+#: src/plugins/fancy/fancy_prefs.c:152
 msgid "Execute javascript"
 msgstr "Vykonať JavaScript"
 
-#: src/plugins/fancy/fancy_prefs.c:152
+#: src/plugins/fancy/fancy_prefs.c:153
 msgid "Execute embedded javascript"
 msgstr "Vykonať zahrnutý JavaScript"
 
-#: src/plugins/fancy/fancy_prefs.c:156
+#: src/plugins/fancy/fancy_prefs.c:157
 msgid "Execute Java applets"
 msgstr "Vykonať aplety Java"
 
-#: src/plugins/fancy/fancy_prefs.c:157
+#: src/plugins/fancy/fancy_prefs.c:158
 msgid "Execute embedded Java applets"
 msgstr "Vykonať zahrnuté aplety Java"
 
-#: src/plugins/fancy/fancy_prefs.c:161
+#: src/plugins/fancy/fancy_prefs.c:162
 msgid "Render objects using plugins"
 msgstr "Spracovať objekty pomocou zásuvných modulov"
 
-#: src/plugins/fancy/fancy_prefs.c:162
+#: src/plugins/fancy/fancy_prefs.c:163
 msgid "Render embedded objects using plugins"
 msgstr "Spracovať zahrnuté objekty pomocou zásuvných modulov"
 
-#: src/plugins/fancy/fancy_prefs.c:169
-msgid "Open in viewer (remote content is enabled)"
+#: src/plugins/fancy/fancy_prefs.c:170
+msgid "Open in Viewer (remote content is enabled)"
 msgstr "Otvoriť v prehliadači (vzdialený obsah je zapnutý)"
 
-#: src/plugins/fancy/fancy_prefs.c:172
+#: src/plugins/fancy/fancy_prefs.c:173
 msgid "Do nothing (remote content is disabled)"
 msgstr "Neurobiť nič (vzdialený obsah je vypnutý)"
 
-#: src/plugins/fancy/fancy_prefs.c:209
+#: src/plugins/fancy/fancy_prefs.c:210 src/prefs_account.c:3924
+#: src/prefs_proxy.c:241
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/plugins/fancy/fancy_prefs.c:211
+#: src/plugins/fancy/fancy_prefs.c:212
 msgid "Use GNOME's proxy settings"
 msgstr "Použiť nastavenia proxy v GNOME"
 
-#: src/plugins/fancy/fancy_prefs.c:219
+#: src/plugins/fancy/fancy_prefs.c:220
 msgid "Use proxy"
 msgstr "Použiť proxy"
 
-#: src/plugins/fancy/fancy_prefs.c:237
+#: src/plugins/fancy/fancy_prefs.c:238
 msgid "Remote resources"
 msgstr "Vzdialené zdroje"
 
-#: src/plugins/fancy/fancy_prefs.c:238
+#: src/plugins/fancy/fancy_prefs.c:239
 msgid ""
 "Loading remote resources can lead to some privacy issues.\n"
 "When remote content loading is disabled, nothing will be requested\n"
@@ -9997,121 +10123,117 @@ msgstr ""
 "modulov alebo apletov Java môže byť naďalej zapnuté pre obsah,\n"
 "ktorý je súčasťou správy."
 
-#: src/plugins/fancy/fancy_prefs.c:244
+#: src/plugins/fancy/fancy_prefs.c:245
 msgid "Enable loading of remote content"
 msgstr "Povoliť načítanie vzdialeného obsahu"
 
-#: src/plugins/fancy/fancy_prefs.c:276
+#: src/plugins/fancy/fancy_prefs.c:277
 msgid "When clicking on a link, by default"
 msgstr "Pri kliknutí na odkaz, predvolene"
 
-#: src/plugins/fancy/fancy_prefs.c:284
-msgid "Open in external browser"
+#: src/plugins/fancy/fancy_prefs.c:285
+msgid "Open in External Browser"
 msgstr "Otvoriť v externom prehliadači"
 
-#: src/plugins/fancy/fancy_prefs.c:298
+#: src/plugins/fancy/fancy_prefs.c:299
 msgid "The CSS in this file will be applied to all HTML parts"
 msgstr "CSS v tomto súbore bude použité na všetky časti HTML"
 
-#: src/plugins/fancy/fancy_prefs.c:308
+#: src/plugins/fancy/fancy_prefs.c:309
 #: src/plugins/notification/notification_prefs.c:1346
-#: src/plugins/pgpcore/prefs_gpg.c:209 src/plugins/rssyl/rssyl_prefs.c:186
-#: src/prefs_account.c:1478 src/prefs_account.c:1567 src/prefs_account.c:2055
+#: src/plugins/pgpcore/prefs_gpg.c:208 src/plugins/rssyl/rssyl_prefs.c:186
+#: src/prefs_account.c:1550 src/prefs_account.c:1639 src/prefs_account.c:2190
 #: src/prefs_customheader.c:236
 msgid "Bro_wse"
 msgstr "P_rehliadať"
 
-#: src/plugins/fancy/fancy_prefs.c:350
+#: src/plugins/fancy/fancy_prefs.c:351
 msgid "Select stylesheet"
 msgstr "Vyberte štýlopis"
 
-#: src/plugins/fancy/fancy_viewer.c:418
+#: src/plugins/fancy/fancy_viewer.c:409
 msgid "Remote content loading is disabled."
 msgstr "Načítavanie vzdialeného obsahu je vypnuté."
 
-#: src/plugins/fancy/fancy_viewer.c:497
+#: src/plugins/fancy/fancy_viewer.c:488
 msgid "Load images"
 msgstr "Načítať obrázky"
 
-#: src/plugins/fancy/fancy_viewer.c:499
+#: src/plugins/fancy/fancy_viewer.c:490
 msgid "Enable remote content"
 msgstr "Zapnúť vzdialený obsah"
 
-#: src/plugins/fancy/fancy_viewer.c:501
+#: src/plugins/fancy/fancy_viewer.c:492
 msgid "Enable Javascript"
 msgstr "Povoliť JavaScript"
 
-#: src/plugins/fancy/fancy_viewer.c:503
+#: src/plugins/fancy/fancy_viewer.c:494
 msgid "Enable Plugins"
 msgstr "Povoliť zásuvné moduly"
 
-#: src/plugins/fancy/fancy_viewer.c:505
+#: src/plugins/fancy/fancy_viewer.c:496
 msgid "Enable Java"
 msgstr "Povoliť Java"
 
-#: src/plugins/fancy/fancy_viewer.c:507
+#: src/plugins/fancy/fancy_viewer.c:498
 msgid "Open links with external browser"
 msgstr "Otvoriť odkazy v externom prehliadači"
 
-#: src/plugins/fancy/fancy_viewer.c:689
+#: src/plugins/fancy/fancy_viewer.c:673
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Nastala chyba: %d\n"
 
-#: src/plugins/fancy/fancy_viewer.c:745
+#: src/plugins/fancy/fancy_viewer.c:733
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr "%s je poškodený alebo nepodporovaný kanál"
 
-#: src/plugins/fancy/fancy_viewer.c:756
+#: src/plugins/fancy/fancy_viewer.c:744
 msgid "Search the Web"
 msgstr "Hľadať na webe"
 
-#: src/plugins/fancy/fancy_viewer.c:768
+#: src/plugins/fancy/fancy_viewer.c:755
 msgid "Open in Viewer"
 msgstr "Otvoriť v prehliadači"
 
-#: src/plugins/fancy/fancy_viewer.c:770
-msgid "Open in Viewer (enable remote content)"
-msgstr "Otvoriť v prehliadači (zapnúť vzdialený obsah)"
-
-#: src/plugins/fancy/fancy_viewer.c:779
+#: src/plugins/fancy/fancy_viewer.c:764
 msgid "Open in Browser"
 msgstr "Otvoriť v prehliadači"
 
-#: src/plugins/fancy/fancy_viewer.c:789
+#: src/plugins/fancy/fancy_viewer.c:774
 msgid "Open Image"
 msgstr "Otvoriť obrázok"
 
-#: src/plugins/fancy/fancy_viewer.c:798
+#: src/plugins/fancy/fancy_viewer.c:783
 msgid "Copy Link"
 msgstr "Kopírovať odkaz"
 
-#: src/plugins/fancy/fancy_viewer.c:802
+#: src/plugins/fancy/fancy_viewer.c:787
 msgid "Download Link"
 msgstr "Stiahnuť odkaz"
 
-#: src/plugins/fancy/fancy_viewer.c:813
+#: src/plugins/fancy/fancy_viewer.c:798
 msgid "Save Image As"
 msgstr "Uložiť obrázok ako"
 
-#: src/plugins/fancy/fancy_viewer.c:823
+#: src/plugins/fancy/fancy_viewer.c:808
 msgid "Copy Image"
 msgstr "Kopírovať obrázok"
 
-#: src/plugins/fancy/fancy_viewer.c:841
+#: src/plugins/fancy/fancy_viewer.c:848
 msgid "Import feed"
 msgstr "Importovať kanál"
 
-#: src/plugins/fancy/fancy_viewer.c:1120
+#: src/plugins/fancy/fancy_viewer.c:1130
 msgid "Fancy"
 msgstr "Vkusný"
 
-#: src/plugins/fancy/fancy_viewer.c:1148
+#: src/plugins/fancy/fancy_viewer.c:1158
 msgid "Fancy HTML Viewer"
 msgstr "Vkusný zobrazovač HTML"
 
-#: src/plugins/fancy/fancy_viewer.c:1153
+#: src/plugins/fancy/fancy_viewer.c:1163
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -10291,15 +10413,15 @@ msgstr "Zásuvný modul GData: Chyba autorizácie: %s\n"
 msgid "GData plugin: Authorization successful\n"
 msgstr "Zásuvný modul GData: Autorizácia úspešná\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:464
+#: src/plugins/gdata/cm_gdata_contacts.c:474
 msgid "GData plugin: Starting interactive authorization\n"
 msgstr "Zásuvný modul GData: Štart interaktívnej autorizácie\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:474
+#: src/plugins/gdata/cm_gdata_contacts.c:481
 msgid "GData plugin: Got authorization code, requesting authorization\n"
 msgstr "Zásuvný modul GData: Získaný autorizačný kód, požadujem autorizáciu\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:481
+#: src/plugins/gdata/cm_gdata_contacts.c:488
 msgid ""
 "GData plugin: No authorization code received, authorization request "
 "cancelled\n"
@@ -10307,16 +10429,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:497
+#: src/plugins/gdata/cm_gdata_contacts.c:494
+msgid ""
+"GData plugin: Interactive authorization still running, no additional session "
+"started\n"
+msgstr ""
+"Zásuvný modul GData: Interaktívna autentifikácia stále beží, nespustené "
+"žiadne ďalšie relácie\n"
+
+#: src/plugins/gdata/cm_gdata_contacts.c:511
 #, 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:506
+#: src/plugins/gdata/cm_gdata_contacts.c:535
 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:566
+#: src/plugins/gdata/cm_gdata_contacts.c:595
 #, c-format
 msgid ""
 "GData plugin: Elapsed time since last refresh: %d minutes, refreshing now\n"
@@ -10324,17 +10454,17 @@ msgstr ""
 "Zásuvný modul GData: Od posledného obnovenia uplynulo: %d min, obnovujem "
 "teraz\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:574
+#: src/plugins/gdata/cm_gdata_contacts.c:603
 msgid "GData plugin: Trying to refresh authorization\n"
 msgstr "Zásuvný modul GData: Pokus o obnovenie autorizácie\n"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:78
-#: src/plugins/managesieve/sieve_prefs.c:203 src/prefs_account.c:1786
+#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:1921
 msgid "Authentication"
 msgstr "Autentifikácia"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:84
-#: src/plugins/spam_report/spam_report_prefs.c:172 src/wizard.c:1560
+#: src/plugins/spam_report/spam_report_prefs.c:172 src/wizard.c:1562
 msgid "Username:"
 msgstr "Používateľské meno:"
 
@@ -10384,30 +10514,30 @@ msgstr ""
 msgid "GData integration"
 msgstr "Integrácia GData"
 
-#: src/plugins/libravatar/libravatar.c:338
-#: src/plugins/libravatar/libravatar.c:403
-#: src/plugins/libravatar/libravatar.c:463
+#: src/plugins/libravatar/libravatar.c:332
+#: src/plugins/libravatar/libravatar.c:397
+#: src/plugins/libravatar/libravatar.c:457
 #: src/plugins/libravatar/libravatar_prefs.c:546
 msgid "Libravatar"
 msgstr "Libravatar"
 
-#: src/plugins/libravatar/libravatar.c:345
+#: src/plugins/libravatar/libravatar.c:339
 msgid "Failed to register avatar header update hook"
 msgstr "Zlyhala registrácia obsluhy udalosti „avatar header update”"
 
-#: src/plugins/libravatar/libravatar.c:354
+#: src/plugins/libravatar/libravatar.c:348
 msgid "Failed to register avatar image render hook"
 msgstr "Zlyhala registrácia obsluhy udalosti „avatar image render”"
 
-#: src/plugins/libravatar/libravatar.c:360
+#: src/plugins/libravatar/libravatar.c:354
 msgid "Failed to create avatar image cache directory"
 msgstr "Zlyhalo vytvorenie zložky vyrovnávacej pamäte obrázkov avatar"
 
-#: src/plugins/libravatar/libravatar.c:370
+#: src/plugins/libravatar/libravatar.c:364
 msgid "Failed to load missing items cache"
 msgstr "Zlyhalo načítanie vyrovnávacej pamäte chýbajúcich položiek"
 
-#: src/plugins/libravatar/libravatar.c:413
+#: src/plugins/libravatar/libravatar.c:407
 msgid ""
 "Display libravatar profiles' images for mail messages. More\n"
 "info about libravatar at http://www.libravatar.org/. If you have\n"
@@ -10427,7 +10557,7 @@ msgstr ""
 "máte profil gravatar.com, ale nie libravatar, budú použité i tieto\n"
 "(ak je povolené presmerovanie v nastavení zásuvného modulu).\n"
 "Stránka nastavení zásuvného modulu je dostupná z hlavného okna:\n"
-"na /Nastavenie/Nastavenia…/Zásuvné moduly/Libravatar.\n"
+"na /Nastavenie/Nastavenia.../Zásuvné moduly/Libravatar.\n"
 "\n"
 "Tento zásuvný modul používa na získanie obrázkov libcurl, takže ak ste\n"
 "za proxy, prosím, hľadajte podrobnosti o nastavení „http_proxy” v\n"
@@ -10510,8 +10640,8 @@ msgid "Cache refresh interval"
 msgstr "Interval aktualizácie vyrovnávacej pamäte"
 
 #: src/plugins/libravatar/libravatar_prefs.c:229
-#: src/plugins/vcalendar/vcal_prefs.c:323 src/prefs_account.c:1523
-#: src/prefs_matcher.c:336 src/prefs_receive.c:177
+#: src/plugins/vcalendar/vcal_prefs.c:323 src/prefs_account.c:1595
+#: src/prefs_account.c:1752 src/prefs_matcher.c:340 src/prefs_receive.c:180
 msgid "hours"
 msgstr "hodín"
 
@@ -10545,7 +10675,7 @@ msgstr "Prázdny obrázok"
 
 #: src/plugins/libravatar/libravatar_prefs.c:314
 msgid "The unobtrusive low-contrast greyish silhouette"
-msgstr "nenápadná silueta s nízkym kontrastom"
+msgstr "Nenápadná silueta s nízkym kontrastom"
 
 #: src/plugins/libravatar/libravatar_prefs.c:315
 msgid "A generated geometric pattern"
@@ -10572,8 +10702,8 @@ msgid ""
 "Enter the URL you want to be redirected when no user icon is available. "
 "Leave an empty URL to use the default libravatar orange icon."
 msgstr ""
-"zadajte URL, na ktorú chcete byť presmerovaný, ak nie je dostupná ikona "
-"používateľa. Nechajte prázdne na použitie prevolenej oranžovej ikony "
+"Zadajte URL, na ktorú chcete byť presmerovaný, ak nie je dostupná ikona "
+"používateľa. Nechajte prázdne na použitie predvolenej oranžovej ikony "
 "libravatar."
 
 #: src/plugins/libravatar/libravatar_prefs.c:382
@@ -10586,7 +10716,7 @@ msgid ""
 "services like gravatar.com"
 msgstr ""
 "Nasledovať odpovede presmerovania na iné služby avataru (napr. gravatar.com) "
-"prijaté zo servera libravatar."
+"prijaté zo servera libravatar"
 
 #: src/plugins/libravatar/libravatar_prefs.c:392
 msgid "_Enable federated servers"
@@ -10655,70 +10785,70 @@ msgstr ""
 "Všetky zložky a správy v „%s” budú odstránené.\n"
 "Naozaj chcete pokračovať?"
 
-#: src/plugins/managesieve/managesieve.c:435
+#: src/plugins/managesieve/managesieve.c:436
 msgid "No Sieve auth method available\n"
 msgstr "Nie je dostupná metóda Sieve auth\n"
 
-#: src/plugins/managesieve/managesieve.c:439
+#: src/plugins/managesieve/managesieve.c:440
 msgid "Selected Sieve auth method not available\n"
 msgstr "Zvolená metóda Sieve auth nie je dostupná\n"
 
-#: src/plugins/managesieve/managesieve.c:672
+#: src/plugins/managesieve/managesieve.c:673
 msgid "Disconnected"
 msgstr "Odpojené"
 
-#: src/plugins/managesieve/managesieve.c:676
+#: src/plugins/managesieve/managesieve.c:677
 #, c-format
 msgid "Disconnected: %s"
 msgstr "Odpojené: %s"
 
-#: src/plugins/managesieve/managesieve.c:725
-#: src/plugins/managesieve/managesieve.c:870
+#: src/plugins/managesieve/managesieve.c:726
+#: src/plugins/managesieve/managesieve.c:871
 #, 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:732
+#: src/plugins/managesieve/managesieve.c:733
 msgid "STARTTLS failed"
 msgstr "STARTTLS zlyhalo"
 
-#: 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
+#: src/plugins/managesieve/managesieve.c:798
+#: src/plugins/managesieve/managesieve.c:814
+#: src/plugins/managesieve/managesieve.c:841
+#: src/plugins/managesieve/managesieve.c:923
+#: src/plugins/managesieve/managesieve.c:941
 msgid "error occurred on SIEVE session\n"
 msgstr "nastala chyba relácie SIEVE\n"
 
-#: src/plugins/managesieve/managesieve.c:866
+#: src/plugins/managesieve/managesieve.c:867
 #, 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:875
+#: src/plugins/managesieve/managesieve.c:876
 #, 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:1132
+#: src/plugins/managesieve/managesieve.c:1153
 msgid "Sieve: retrying auth\n"
 msgstr "Sieve: opakovanie auth\n"
 
-#: src/plugins/managesieve/managesieve.c:1134
+#: src/plugins/managesieve/managesieve.c:1155
 msgid "Auth method not available"
 msgstr "Metóda auth nie je dostupná"
 
-#: src/plugins/managesieve/managesieve.c:1151
+#: src/plugins/managesieve/managesieve.c:1172
 #, 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:5676
+#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5830
 msgid "_Filter"
 msgstr "_Filtrovať"
 
 #: src/plugins/managesieve/sieve_editor.c:86
-#: src/plugins/managesieve/sieve_editor.c:630
+#: src/plugins/managesieve/sieve_editor.c:632
 msgid "Chec_k Syntax"
 msgstr "S_kontrolovať syntax"
 
@@ -10727,14 +10857,14 @@ msgid "Re_vert"
 msgstr "_Vrátiť"
 
 #: src/plugins/managesieve/sieve_editor.c:296
-#: src/plugins/managesieve/sieve_editor.c:722
-#: src/plugins/managesieve/sieve_manager.c:182
+#: src/plugins/managesieve/sieve_editor.c:724
+#: src/plugins/managesieve/sieve_manager.c:183
 msgid "Unable to get script contents"
 msgstr "Nemožno získať obsah skriptu"
 
 #: src/plugins/managesieve/sieve_editor.c:325
 msgid "Reverting..."
-msgstr "Prijímanie…"
+msgstr "Prijímanie..."
 
 #: src/plugins/managesieve/sieve_editor.c:334
 msgid "Revert script"
@@ -10754,73 +10884,73 @@ msgstr "Skript úspešne uložený."
 
 #: src/plugins/managesieve/sieve_editor.c:370
 msgid "Saving..."
-msgstr "Ukladanie…"
+msgstr "Ukladanie..."
 
 #: src/plugins/managesieve/sieve_editor.c:399
 msgid "Checking syntax..."
-msgstr "Kontrola syntaxe…"
+msgstr "Kontrola syntaxe..."
 
-#: src/plugins/managesieve/sieve_editor.c:432
+#: src/plugins/managesieve/sieve_editor.c:433
 msgid "This script has been modified. Save the latest changes?"
 msgstr "Tento skript bol zmenený. Uložiť posledné zmeny?"
 
-#: src/plugins/managesieve/sieve_editor.c:693
+#: src/plugins/managesieve/sieve_editor.c:695
 #, c-format
 msgid "%s - Sieve Filter%s"
 msgstr "%s – Filter Sieve%s"
 
-#: src/plugins/managesieve/sieve_editor.c:742
-#: src/plugins/pdf_viewer/poppler_viewer.c:1282
+#: src/plugins/managesieve/sieve_editor.c:744
+#: src/plugins/pdf_viewer/poppler_viewer.c:1315
 msgid "Loading..."
-msgstr "Načítanie…"
+msgstr "Načítanie..."
 
-#: src/plugins/managesieve/sieve_manager.c:159
-#: src/plugins/managesieve/sieve_manager.c:241
+#: src/plugins/managesieve/sieve_manager.c:160
+#: src/plugins/managesieve/sieve_manager.c:246
 msgid "Add Sieve script"
 msgstr "Pridať skript Sieve"
 
-#: src/plugins/managesieve/sieve_manager.c:160
+#: src/plugins/managesieve/sieve_manager.c:161
 msgid "Enter name for a new Sieve filter script."
 msgstr "Zadajte meno nového skriptu Sieve."
 
-#: src/plugins/managesieve/sieve_manager.c:242
+#: src/plugins/managesieve/sieve_manager.c:247
 msgid "Enter new name for the script."
 msgstr "Zadajte nové meno skriptu."
 
-#: src/plugins/managesieve/sieve_manager.c:323
+#: src/plugins/managesieve/sieve_manager.c:328
 #, c-format
 msgid "Do you really want to delete the filter '%s'?"
 msgstr "Naozaj chcete odstrániť filter „%s”?"
 
-#: src/plugins/managesieve/sieve_manager.c:324
+#: src/plugins/managesieve/sieve_manager.c:329
 msgid "Delete filter"
 msgstr "Odstrániť filter"
 
-#: src/plugins/managesieve/sieve_manager.c:478
+#: src/plugins/managesieve/sieve_manager.c:483
 msgid "Active"
 msgstr "Aktívne"
 
-#: src/plugins/managesieve/sieve_manager.c:489
+#: src/plugins/managesieve/sieve_manager.c:494
 msgid "An account can only have one active script at a time."
 msgstr "Účet môže mať v jednom okamihu len jeden aktívny skript."
 
-#: src/plugins/managesieve/sieve_manager.c:576
+#: src/plugins/managesieve/sieve_manager.c:581
 msgid "Unable to connect"
 msgstr "Nemožno sa pripojiť"
 
-#: src/plugins/managesieve/sieve_manager.c:623
+#: src/plugins/managesieve/sieve_manager.c:628
 msgid "Listing scripts..."
-msgstr "Výpis skriptov…"
+msgstr "Výpis skriptov..."
 
-#: src/plugins/managesieve/sieve_manager.c:626
+#: src/plugins/managesieve/sieve_manager.c:631
 msgid "Connecting..."
-msgstr "Pripájanie…"
+msgstr "Pripájanie..."
 
-#: src/plugins/managesieve/sieve_manager.c:658
+#: src/plugins/managesieve/sieve_manager.c:663
 msgid "Manage Sieve Filters"
 msgstr "Spravovať skripty Sieve"
 
-#: src/plugins/managesieve/sieve_manager.c:800
+#: src/plugins/managesieve/sieve_manager.c:806
 msgid "To use Sieve, enable it in an account's preferences."
 msgstr "Na použitie Sieve, zapnite ho v nastavení účtu."
 
@@ -10831,7 +10961,7 @@ msgstr "ManageSieve"
 
 #: src/plugins/managesieve/sieve_plugin.c:46
 msgid "Manage Sieve Filters..."
-msgstr "Spravovať filtre Sieve…"
+msgstr "Spravovať filtre Sieve..."
 
 #: src/plugins/managesieve/sieve_plugin.c:114
 msgid "Manage sieve filters on a server using the ManageSieve protocol."
@@ -10841,109 +10971,110 @@ msgstr "Spravovanie filtrov Sieve na serveri pomocou protokolu ManageSieve."
 msgid "Enable Sieve"
 msgstr "Povoliť Sieve"
 
-#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1102
+#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1193
 msgid "Server information"
 msgstr "Informácie o servere"
 
-#: src/plugins/managesieve/sieve_prefs.c:165
+#: src/plugins/managesieve/sieve_prefs.c:163
 msgid "Server name"
 msgstr "Meno servera"
 
-#: src/plugins/managesieve/sieve_prefs.c:174
+#: src/plugins/managesieve/sieve_prefs.c:172
 msgid "Connect to this host instead of the host used for receiving mail"
 msgstr ""
 "Pripojiť sa k tomuto stroju, namiesto stroja použitého na prijatie správy"
 
-#: src/plugins/managesieve/sieve_prefs.c:178
+#: src/plugins/managesieve/sieve_prefs.c:176
 msgid "Server port"
 msgstr "Port servera"
 
-#: src/plugins/managesieve/sieve_prefs.c:185
+#: src/plugins/managesieve/sieve_prefs.c:183
 msgid "Connect to this port instead of the default"
 msgstr "Pripojiť sa na tento port, namiesto predovleného"
 
-#: src/plugins/managesieve/sieve_prefs.c:189
+#: src/plugins/managesieve/sieve_prefs.c:187
 msgid "Encryption"
 msgstr "Šifrovanie"
 
-#: src/plugins/managesieve/sieve_prefs.c:194
+#: src/plugins/managesieve/sieve_prefs.c:190
 msgid "No encryption"
 msgstr "Bez šifrovania"
 
-#: src/plugins/managesieve/sieve_prefs.c:196
+#: src/plugins/managesieve/sieve_prefs.c:192
 msgid "Use STARTTLS when available"
 msgstr "Použiť STARTTLS, keď je dostupné"
 
-#: src/plugins/managesieve/sieve_prefs.c:198
+#: src/plugins/managesieve/sieve_prefs.c:194
 msgid "Require STARTTLS"
 msgstr "Vyžadovať STARTTLS"
 
-#: src/plugins/managesieve/sieve_prefs.c:206
-#: src/plugins/rssyl/rssyl_feed_props.c:262
+#: src/plugins/managesieve/sieve_prefs.c:202
+#: src/plugins/rssyl/rssyl_feed_props.c:268
 msgid "No authentication"
 msgstr "Bez autentifikácie"
 
-#: src/plugins/managesieve/sieve_prefs.c:208
+#: src/plugins/managesieve/sieve_prefs.c:204
 msgid "Use same authentication as for receiving mail"
 msgstr "Použiť rovnakú autentifikáciu ako na prijímanie pošty"
 
-#: src/plugins/managesieve/sieve_prefs.c:210
+#: src/plugins/managesieve/sieve_prefs.c:206
 msgid "Specify authentication"
 msgstr "Zadať autentifikáciu"
 
-#: src/plugins/managesieve/sieve_prefs.c:240
+#: src/plugins/managesieve/sieve_prefs.c:236
 #: src/plugins/vcalendar/vcal_prefs.c:391
-#: src/plugins/vcalendar/vcal_prefs.c:510 src/prefs_account.c:1297
-#: src/prefs_account.c:1832
+#: src/plugins/vcalendar/vcal_prefs.c:510 src/prefs_account.c:1388
+#: src/prefs_account.c:1967
 msgid "User ID"
 msgstr "Prihlasovacie meno"
 
-#: src/plugins/managesieve/sieve_prefs.c:250
-#: src/plugins/rssyl/rssyl_feed_props.c:393
+#: src/plugins/managesieve/sieve_prefs.c:246
+#: src/plugins/rssyl/rssyl_feed_props.c:383
 #: src/plugins/vcalendar/vcal_prefs.c:399
-#: src/plugins/vcalendar/vcal_prefs.c:518 src/prefs_account.c:1303
-#: src/prefs_account.c:1855 src/prefs_account.c:2583 src/prefs_account.c:2611
-#: src/wizard.c:1214 src/wizard.c:1634
+#: src/plugins/vcalendar/vcal_prefs.c:518 src/prefs_account.c:1394
+#: src/prefs_account.c:1990 src/prefs_account.c:2718 src/prefs_account.c:2746
+#: src/prefs_account.c:2943 src/prefs_proxy.c:134 src/wizard.c:1216
+#: src/wizard.c:1636
 msgid "Password"
 msgstr "Heslo"
 
-#: src/plugins/managesieve/sieve_prefs.c:266 src/prefs_account.c:1606
-#: src/prefs_account.c:1804
+#: src/plugins/managesieve/sieve_prefs.c:262 src/prefs_account.c:1678
+#: src/prefs_account.c:1939
 msgid "Authentication method"
 msgstr "Metóda autentifikácie"
 
-#: src/plugins/managesieve/sieve_prefs.c:275 src/prefs_account.c:1616
-#: src/prefs_account.c:1813 src/prefs_send.c:261 src/prefs_send.c:332
-#: src/prefs_themes.c:1112
+#: src/plugins/managesieve/sieve_prefs.c:271 src/prefs_account.c:1688
+#: src/prefs_account.c:1948 src/prefs_send.c:265 src/prefs_send.c:336
+#: src/prefs_themes.c:1114
 msgid "Automatic"
 msgstr "Automatické"
 
-#: src/plugins/managesieve/sieve_prefs.c:394
+#: src/plugins/managesieve/sieve_prefs.c:390
 msgid "Sieve server must not contain a space."
 msgstr "Server Sieve nesmie obsahovať medzery."
 
-#: src/plugins/managesieve/sieve_prefs.c:400
+#: src/plugins/managesieve/sieve_prefs.c:396
 msgid "Sieve server is not entered."
 msgstr "Nebol zadaný server Sieve."
 
-#: src/plugins/managesieve/sieve_prefs.c:428
+#: src/plugins/managesieve/sieve_prefs.c:424
 msgid "Sieve"
 msgstr "Sieve"
 
-#: src/plugins/newmail/newmail.c:106 src/plugins/newmail/newmail.c:149
+#: src/plugins/newmail/newmail.c:107 src/plugins/newmail/newmail.c:150
 msgid "NewMail"
 msgstr "NewMail"
 
-#: src/plugins/newmail/newmail.c:111
+#: src/plugins/newmail/newmail.c:112
 msgid "Failed to register newmail hook"
 msgstr "Zlyhala registrácia obsluhy udalosti „newmail”"
 
-#: src/plugins/newmail/newmail.c:128
+#: src/plugins/newmail/newmail.c:129
 #, c-format
 msgid "Could not open log file %s: %s\n"
 msgstr "Nemožno otvoriť súbor záznamu: %s: %s\n"
 
-#: src/plugins/newmail/newmail.c:141
+#: src/plugins/newmail/newmail.c:142
 #, c-format
 msgid ""
 "This plugin writes a header summary to a log file for each mail received "
@@ -10960,11 +11091,11 @@ msgstr ""
 "\n"
 "Aktuálny záznam je %s"
 
-#: src/plugins/newmail/newmail.c:175
+#: src/plugins/newmail/newmail.c:176
 msgid "Log file"
 msgstr "Súbor záznamu"
 
-#: src/plugins/notification/notification_banner.c:356
+#: src/plugins/notification/notification_banner.c:357
 msgid "Folder:"
 msgstr "Zložka:"
 
@@ -11001,7 +11132,7 @@ msgstr "Zásuvný modul Upozornenia potrebuje podporu vlákien (threading)."
 msgid "Failed to register folder item update hook in the Notification plugin"
 msgstr ""
 "V zásuvnom module Upozornenia zlyhala registrácia obsluhy udalosti „item "
-"update” "
+"update”"
 
 #: src/plugins/notification/notification_plugin.c:236
 msgid "Failed to register folder update hook in the Notification plugin"
@@ -11170,8 +11301,8 @@ msgstr "Titulkový pruh"
 msgid "Popup"
 msgstr "Vyskakovacie okno"
 
-#: src/plugins/notification/notification_prefs.c:470 src/prefs_actions.c:263
-#: src/prefs_receive.c:152
+#: src/plugins/notification/notification_prefs.c:470 src/prefs_actions.c:265
+#: src/prefs_receive.c:155
 msgid "Command"
 msgstr "Príkaz"
 
@@ -11236,13 +11367,13 @@ msgid "Show banner"
 msgstr "Zobraziť titulkový pruh"
 
 #: src/plugins/notification/notification_prefs.c:766
-#: src/plugins/pgpcore/select-keys.c:240 src/plugins/pgpcore/sgpgme.c:147
-#: src/prefs_receive.c:228
+#: src/plugins/pgpcore/select-keys.c:234 src/plugins/pgpcore/sgpgme.c:148
+#: src/prefs_receive.c:231
 msgid "Never"
 msgstr "Nikdy"
 
-#: src/plugins/notification/notification_prefs.c:768 src/prefs_receive.c:226
-#: src/prefs_summaries.c:493 src/prefs_summaries.c:503
+#: src/plugins/notification/notification_prefs.c:768 src/prefs_receive.c:229
+#: src/prefs_summaries.c:523 src/prefs_summaries.c:576
 msgid "Always"
 msgstr "Vždy"
 
@@ -11268,7 +11399,7 @@ msgstr "Šírka pruhu"
 
 #: src/plugins/notification/notification_prefs.c:847
 msgid "Limit the size of banner, use 0 for screen width"
-msgstr "maximálna šírka pruhu (0 pre šírku obrazovky)"
+msgstr "Maximálna šírka pruhu (0 pre šírku obrazovky)"
 
 #: src/plugins/notification/notification_prefs.c:849
 msgid "pixel(s)"
@@ -11294,7 +11425,7 @@ msgstr "Zahrnúť len vybraté zložky"
 #: src/plugins/notification/notification_prefs.c:1385
 #: src/plugins/notification/notification_prefs.c:1620
 msgid "Select folders..."
-msgstr "Vybrať zložky…"
+msgstr "Vybrať zložky..."
 
 #: src/plugins/notification/notification_prefs.c:897
 msgid "Banner colors"
@@ -11317,8 +11448,8 @@ msgstr "Farba popredia"
 
 #: src/plugins/notification/notification_prefs.c:927
 #: src/plugins/notification/notification_prefs.c:1146
-#: src/prefs_msg_colors.c:276 src/prefs_msg_colors.c:296
-#: src/prefs_msg_colors.c:316
+#: src/prefs_msg_colors.c:260 src/prefs_msg_colors.c:273
+#: src/prefs_msg_colors.c:286
 msgid "Background"
 msgstr "Pozadie"
 
@@ -11337,14 +11468,6 @@ msgstr "Zapnúť vyskakovacie okno"
 msgid "Popup timeout"
 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:391 src/prefs_other.c:574
-#: src/prefs_receive.c:200 src/prefs_summaries.c:542
-msgid "seconds"
-msgstr "sekúnd"
-
 #: src/plugins/notification/notification_prefs.c:1101
 msgid "Make popup sticky"
 msgstr "Vyskakovacie okno na všetky plochy"
@@ -11378,7 +11501,7 @@ msgstr "Vybrať príkaz"
 msgid "Enable command"
 msgstr "Zapnúť vykonanie príkazu"
 
-#: src/plugins/notification/notification_prefs.c:1339
+#: src/plugins/notification/notification_prefs.c:1339 src/prefs_receive.c:268
 msgid "Command to execute"
 msgstr "Príkaz na spustenie"
 
@@ -11530,128 +11653,128 @@ msgstr[0] "Prišiel %d nový článok kanála RSS"
 msgstr[1] "Prišli %d nové články kanála RSS"
 msgstr[2] "Prišlo %d nových článkov kanála RSS"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:701
+#: src/plugins/pdf_viewer/poppler_viewer.c:704
 msgid "Title:"
 msgstr "Názov:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:703
+#: src/plugins/pdf_viewer/poppler_viewer.c:706
 msgid "Author:"
 msgstr "Autor:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:705
+#: src/plugins/pdf_viewer/poppler_viewer.c:708
 msgid "Creator:"
 msgstr "Vytvoril:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:706
+#: src/plugins/pdf_viewer/poppler_viewer.c:709
 msgid "Producer:"
 msgstr "Výrobca:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:709
+#: src/plugins/pdf_viewer/poppler_viewer.c:712
 msgid "Created:"
 msgstr "Vytvorené:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:713
+#: src/plugins/pdf_viewer/poppler_viewer.c:716
 msgid "Modified:"
 msgstr "Upravené:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:716
+#: src/plugins/pdf_viewer/poppler_viewer.c:719
 msgid "Format:"
 msgstr "Formát:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:718
 #: src/plugins/pdf_viewer/poppler_viewer.c:721
+#: src/plugins/pdf_viewer/poppler_viewer.c:724
 msgid "Optimized:"
 msgstr "Optimalizované:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1185
+#: src/plugins/pdf_viewer/poppler_viewer.c:1217
 msgid "PDF properties"
 msgstr "Vlastnosti PDF"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1333
+#: src/plugins/pdf_viewer/poppler_viewer.c:1366
 msgid "Enter password"
 msgstr "Zadajte heslo"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1334
+#: src/plugins/pdf_viewer/poppler_viewer.c:1367
 msgid ""
 "This document is locked and requires a password before it can be opened."
 msgstr "Tento dokument je zamknutý a na otvorenie vyžaduje heslo."
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1349
+#: src/plugins/pdf_viewer/poppler_viewer.c:1382
 #, c-format
 msgid "%s Document"
 msgstr "Dokument %s"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1355
+#: src/plugins/pdf_viewer/poppler_viewer.c:1388
 #, c-format
 msgid "of %d"
 msgstr "z %d"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1371
+#: src/plugins/pdf_viewer/poppler_viewer.c:1404
 msgid "PDF rendering failed for an unknown reason."
 msgstr "Spracovanie PDF zlyhalo z neznámeho dôvodu."
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1735
-#: src/plugins/pdf_viewer/poppler_viewer.c:1950
+#: src/plugins/pdf_viewer/poppler_viewer.c:1776
+#: src/plugins/pdf_viewer/poppler_viewer.c:1993
 msgid "Document Index"
 msgstr "Obsah dokumentu"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1915
+#: src/plugins/pdf_viewer/poppler_viewer.c:1958
 msgid "First Page"
 msgstr "Prvá strana"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1918
+#: src/plugins/pdf_viewer/poppler_viewer.c:1961
 msgid "Previous Page"
 msgstr "Predošlá strana"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1921
+#: src/plugins/pdf_viewer/poppler_viewer.c:1964
 msgid "Next Page"
 msgstr "Ďalšia strana"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1924
+#: src/plugins/pdf_viewer/poppler_viewer.c:1967
 msgid "Last Page"
 msgstr "Posledná strana"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1927
+#: src/plugins/pdf_viewer/poppler_viewer.c:1970
 msgid "Zoom In"
 msgstr "Zväčšiť"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1929
+#: src/plugins/pdf_viewer/poppler_viewer.c:1972
 msgid "Zoom Out"
 msgstr "Zmenšiť"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1932
+#: src/plugins/pdf_viewer/poppler_viewer.c:1975
 msgid "Fit Page"
 msgstr "Celá strana"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1935
+#: src/plugins/pdf_viewer/poppler_viewer.c:1978
 msgid "Fit Page Width"
 msgstr "Celá šírka"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1938
+#: src/plugins/pdf_viewer/poppler_viewer.c:1981
 msgid "Rotate Left"
 msgstr "Otočiť vľavo"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1941
+#: src/plugins/pdf_viewer/poppler_viewer.c:1984
 msgid "Rotate Right"
 msgstr "Otočiť vpravo"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1944
+#: src/plugins/pdf_viewer/poppler_viewer.c:1987
 msgid "Print Document"
 msgstr "Vytlačiť dokument"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1947
+#: src/plugins/pdf_viewer/poppler_viewer.c:1990
 msgid "Document Info"
 msgstr "Informácie o dokumente"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1952
+#: src/plugins/pdf_viewer/poppler_viewer.c:1995
 msgid "Page Number"
 msgstr "Číslo strany"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1954
+#: src/plugins/pdf_viewer/poppler_viewer.c:1997
 msgid "Zoom Factor"
 msgstr "Mierka"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2064
+#: src/plugins/pdf_viewer/poppler_viewer.c:2108
 #, c-format
 msgid ""
 "This plugin enables the viewing of PDF and PostScript attachments using the "
@@ -11664,13 +11787,13 @@ msgstr ""
 "\n"
 "Akákoľvek spätná väzba je vítaná: iwkse@claws-mail.org"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2070
-#: src/plugins/pdf_viewer/poppler_viewer.c:2078
-#: src/plugins/pdf_viewer/poppler_viewer.c:2098
+#: src/plugins/pdf_viewer/poppler_viewer.c:2114
+#: src/plugins/pdf_viewer/poppler_viewer.c:2122
+#: src/plugins/pdf_viewer/poppler_viewer.c:2142
 msgid "PDF Viewer"
 msgstr "Zobrazovať PDF"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2074
+#: src/plugins/pdf_viewer/poppler_viewer.c:2118
 #, c-format
 msgid ""
 "Warning: could not find ghostscript binary (gs) required for %s plugin to "
@@ -11688,7 +11811,7 @@ msgstr ""
 
 #: src/plugins/perl/perl_gtk.c:50
 msgid "Edit perl filter rules (ext)..."
-msgstr "Upraviť filtrovacie pravidlá perl (ext)…"
+msgstr "Upraviť filtrovacie pravidlá perl (ext)..."
 
 #: src/plugins/pgpcore/autocompletion.c:133
 msgid "Failed to register PGP address autocompletion hook"
@@ -11698,27 +11821,27 @@ msgstr "Zlyhala registrácia obsluhy udalosti „PGP address autocompletion”"
 msgid "Passphrase"
 msgstr "Heslo"
 
-#: src/plugins/pgpcore/passphrase.c:248
+#: src/plugins/pgpcore/passphrase.c:249
 msgid "[no user id]"
 msgstr "[žiadne id používateľa]"
 
-#: src/plugins/pgpcore/passphrase.c:260
+#: src/plugins/pgpcore/passphrase.c:261
 msgid "Please enter the passphrase for the new key:"
 msgstr "Prosím zadajte heslo nového kľúča:"
 
-#: src/plugins/pgpcore/passphrase.c:263
+#: src/plugins/pgpcore/passphrase.c:264
 msgid "Passphrases did not match.\n"
 msgstr "Heslá nesúhlasia.\n"
 
-#: src/plugins/pgpcore/passphrase.c:267
+#: src/plugins/pgpcore/passphrase.c:268
 msgid "Please re-enter the passphrase for the new key:"
 msgstr "Prosím zadajte znova heslo nového kľúča:"
 
-#: src/plugins/pgpcore/passphrase.c:272
+#: src/plugins/pgpcore/passphrase.c:273
 msgid "Please enter the passphrase for:"
 msgstr "Prosím, zadajte heslo pre:"
 
-#: src/plugins/pgpcore/passphrase.c:275
+#: src/plugins/pgpcore/passphrase.c:276
 msgid "Bad passphrase.\n"
 msgstr "Neplatné heslo.\n"
 
@@ -11740,7 +11863,7 @@ msgid ""
 "  Key ID "
 msgstr ""
 "\n"
-"  ID kľúča"
+"  ID kľúča "
 
 #: src/plugins/pgpcore/pgp_viewer.c:184
 msgid "   This key is not in your keyring.\n"
@@ -11853,140 +11976,140 @@ msgstr "Uložiť heslo v pamäti"
 msgid "Expire after"
 msgstr "Vymazať z pamäte po"
 
-#: src/plugins/pgpcore/prefs_gpg.c:179
+#: src/plugins/pgpcore/prefs_gpg.c:178
 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:183 src/plugins/rssyl/rssyl_feed_props.c:474
-#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1921
-#: src/prefs_receive.c:187
+#: src/plugins/pgpcore/prefs_gpg.c:182 src/plugins/rssyl/rssyl_feed_props.c:464
+#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1759
+#: src/prefs_account.c:2056 src/prefs_receive.c:190
 msgid "minutes"
 msgstr "minút"
 
-#: src/plugins/pgpcore/prefs_gpg.c:193
+#: src/plugins/pgpcore/prefs_gpg.c:192
 msgid "Grab input while entering a passphrase"
 msgstr "Zachytiť vstup počas zadávania hesla"
 
-#: src/plugins/pgpcore/prefs_gpg.c:200
+#: src/plugins/pgpcore/prefs_gpg.c:199
 msgid "Display warning on start-up if GnuPG doesn't work"
 msgstr "Pri spustení zobraziť varovanie v prípade, že GnuPG nemožno použiť"
 
-#: src/plugins/pgpcore/prefs_gpg.c:203
+#: src/plugins/pgpcore/prefs_gpg.c:202
 msgid "Path to GnuPG executable"
 msgstr "Cesta k programu GnuPG"
 
-#: src/plugins/pgpcore/prefs_gpg.c:208
+#: src/plugins/pgpcore/prefs_gpg.c:207
 msgid ""
 "If left blank the location of the GnuPG executable will be automatically "
 "determined."
 msgstr "Ak ponecháte prázdne, bude cesta k programu GnuPG určená automaticky."
 
-#: src/plugins/pgpcore/prefs_gpg.c:249
+#: src/plugins/pgpcore/prefs_gpg.c:248
 msgid "Select GnuPG executable"
 msgstr "Vyberte program GnuPG"
 
-#: src/plugins/pgpcore/prefs_gpg.c:361
+#: src/plugins/pgpcore/prefs_gpg.c:358
 msgid "Sign key"
 msgstr "Kľúč podpisu"
 
-#: src/plugins/pgpcore/prefs_gpg.c:369
+#: src/plugins/pgpcore/prefs_gpg.c:366
 msgid "Use default GnuPG key"
 msgstr "Použiť predvolený kľúč GnuPG"
 
-#: src/plugins/pgpcore/prefs_gpg.c:380
+#: src/plugins/pgpcore/prefs_gpg.c:377
 msgid "Select key by your email address"
 msgstr "Zvoliť kľúč podľa vašej emailovej adresy"
 
-#: src/plugins/pgpcore/prefs_gpg.c:391
+#: src/plugins/pgpcore/prefs_gpg.c:388
 msgid "Specify key manually"
 msgstr "Zadať kľúč ručne"
 
-#: src/plugins/pgpcore/prefs_gpg.c:401
+#: src/plugins/pgpcore/prefs_gpg.c:398
 msgid "User or key ID:"
 msgstr "Používateľ alebo ID kľúča:"
 
-#: src/plugins/pgpcore/prefs_gpg.c:445
+#: src/plugins/pgpcore/prefs_gpg.c:442
 msgid "No secret key found."
 msgstr "Nebol nájdený žiadny súkromný kľúč."
 
-#: src/plugins/pgpcore/prefs_gpg.c:448
+#: src/plugins/pgpcore/prefs_gpg.c:445
 msgid "Generate a new key pair"
 msgstr "Vygenerovať nový pár kľúčov"
 
-#: src/plugins/pgpcore/prefs_gpg.c:687
+#: src/plugins/pgpcore/prefs_gpg.c:688
 msgid "GPG"
 msgstr "GPG"
 
-#: src/plugins/pgpcore/prefs_gpg.c:707 src/plugins/smime/plugin.c:38
-#: src/plugins/smime/plugin.c:54 src/plugins/smime/smime.c:913
+#: src/plugins/pgpcore/prefs_gpg.c:708 src/plugins/smime/plugin.c:38
+#: src/plugins/smime/plugin.c:54 src/plugins/smime/smime.c:920
 msgid "S/MIME"
 msgstr "S/MIME"
 
-#: src/plugins/pgpcore/select-keys.c:94
+#: src/plugins/pgpcore/select-keys.c:98
 #, c-format
 msgid "No exact match for '%s'; please select the key."
-msgstr "nenájdená presná zhoda s/so „%s”, prosím zvoľte kľúč."
+msgstr "Nenájdená presná zhoda s/so „%s”, prosím zvoľte kľúč."
 
-#: src/plugins/pgpcore/select-keys.c:97
+#: src/plugins/pgpcore/select-keys.c:101
 #, c-format
 msgid "Collecting info for '%s' ... %c"
-msgstr "Zhromažďujem informácie pre „%s” … %c"
+msgstr "Zhromažďujem informácie pre „%s” ... %c"
 
-#: src/plugins/pgpcore/select-keys.c:237 src/plugins/pgpcore/sgpgme.c:145
+#: src/plugins/pgpcore/select-keys.c:231 src/plugins/pgpcore/sgpgme.c:146
 msgid "Undefined"
 msgstr "Nezadaná"
 
-#: src/plugins/pgpcore/select-keys.c:243 src/plugins/pgpcore/sgpgme.c:149
-#: src/plugins/pgpcore/sgpgme.c:165
+#: src/plugins/pgpcore/select-keys.c:237 src/plugins/pgpcore/sgpgme.c:150
+#: src/plugins/pgpcore/sgpgme.c:166
 msgid "Marginal"
 msgstr "Čiastočná"
 
-#: src/plugins/pgpcore/select-keys.c:249 src/plugins/pgpcore/sgpgme.c:153
-#: src/plugins/pgpcore/sgpgme.c:169
+#: src/plugins/pgpcore/select-keys.c:243 src/plugins/pgpcore/sgpgme.c:154
+#: src/plugins/pgpcore/sgpgme.c:170
 msgid "Ultimate"
 msgstr "Úplná"
 
-#: src/plugins/pgpcore/select-keys.c:381
+#: src/plugins/pgpcore/select-keys.c:408
 msgid "Select Keys"
 msgstr "Zvoľte kľúče"
 
-#: src/plugins/pgpcore/select-keys.c:408
+#: src/plugins/pgpcore/select-keys.c:458
 msgid "Key ID"
 msgstr "ID kľúča"
 
-#: src/plugins/pgpcore/select-keys.c:411
+#: src/plugins/pgpcore/select-keys.c:476
 msgid "Trust"
 msgstr "Dôveryhodný"
 
-#: src/plugins/pgpcore/select-keys.c:436
+#: src/plugins/pgpcore/select-keys.c:495
 msgid "_Other"
 msgstr "_Ostatné"
 
-#: src/plugins/pgpcore/select-keys.c:437
+#: src/plugins/pgpcore/select-keys.c:496
 msgid "Do_n't encrypt"
 msgstr "_Nešifrovať"
 
-#: src/plugins/pgpcore/select-keys.c:596
+#: src/plugins/pgpcore/select-keys.c:677
 msgid "Add key"
 msgstr "Pridať kľúč"
 
-#: src/plugins/pgpcore/select-keys.c:597
+#: src/plugins/pgpcore/select-keys.c:678
 msgid "Enter another user or key ID:"
 msgstr "Zadajte iného používateľa alebo ID kľúča:"
 
-#: src/plugins/pgpcore/select-keys.c:619
+#: src/plugins/pgpcore/select-keys.c:700
 #, c-format
 msgid "Encrypt to %s <%s>"
 msgstr "Šifrovanie pre %s <%s>"
 
-#: src/plugins/pgpcore/select-keys.c:620
+#: src/plugins/pgpcore/select-keys.c:701
 #, c-format
 msgid ""
 "This encryption key is not fully trusted.\n"
 "If you choose to encrypt the message with this key, you don't\n"
 "know for sure that it will go to the person you mean it to.\n"
 "\n"
-"Key details: ID %s, primary identity %s <%s>\n"
+"Key details: ID %s, primary identity %s &lt;%s&gt;\n"
 "\n"
 "Do you trust this key enough to use it anyway?"
 msgstr ""
@@ -11994,184 +12117,184 @@ msgstr ""
 "Ak zvolíte šifrovanie správy pomocou tohoto kľúča, nemôžete si\n"
 "byť úplne istý, či bude zašifrovaná pre správnu osobu.\n"
 "\n"
-"Podrobnosti kľúča: ID %s, primárna identita %s <%s>\n"
+"Podrobnosti kľúča: ID %s, primárna identita  %s &lt;%s&gt;\n"
 "\n"
 "Dôverujete tomuto kľúču natoľko, že ho i tak chcete použiť?"
 
-#: src/plugins/pgpcore/sgpgme.c:83 src/privacy.c:249 src/privacy.c:253
+#: src/plugins/pgpcore/sgpgme.c:84 src/privacy.c:249 src/privacy.c:253
 #: src/privacy.c:270 src/privacy.c:274
 msgid "No signature found"
 msgstr "Nebol nájdený žiadny podpis"
 
-#: src/plugins/pgpcore/sgpgme.c:163
+#: src/plugins/pgpcore/sgpgme.c:164
 msgid "Untrusted"
 msgstr "Nedôveryhodné"
 
-#: src/plugins/pgpcore/sgpgme.c:237 src/plugins/pgpcore/sgpgme.c:256
+#: src/plugins/pgpcore/sgpgme.c:238 src/plugins/pgpcore/sgpgme.c:257
 #, c-format
 msgid "The signature can't be checked - %s"
 msgstr "Digitálny podpis nemožno overiť - %s"
 
-#: src/plugins/pgpcore/sgpgme.c:241 src/plugins/pgpcore/sgpgme.c:245
+#: src/plugins/pgpcore/sgpgme.c:242 src/plugins/pgpcore/sgpgme.c:246
 msgid "The signature has not been checked."
-msgstr "Podpis nebol overený"
+msgstr "Podpis nebol overený."
 
-#: src/plugins/pgpcore/sgpgme.c:251
+#: src/plugins/pgpcore/sgpgme.c:252
 msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr "PGP Core: Nemožno získať kľúč – nie je spustený gpg-agent."
 
-#: src/plugins/pgpcore/sgpgme.c:269
+#: src/plugins/pgpcore/sgpgme.c:270
 #, c-format
 msgid "Good signature from \"%s\" [ultimate]"
 msgstr "Platný podpis od „%s” [absolútna]"
 
-#: src/plugins/pgpcore/sgpgme.c:272
+#: src/plugins/pgpcore/sgpgme.c:273
 #, c-format
 msgid "Good signature from \"%s\" [full]"
 msgstr "Platný podpis od „%s” [plná]"
 
-#: src/plugins/pgpcore/sgpgme.c:275
+#: src/plugins/pgpcore/sgpgme.c:276
 #, c-format
 msgid "Good signature from \"%s\" [marginal]"
 msgstr "Platný podpis od „%s” [čiastočná]"
 
-#: src/plugins/pgpcore/sgpgme.c:282
+#: src/plugins/pgpcore/sgpgme.c:283
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Platný podpis od „%s”"
 
-#: src/plugins/pgpcore/sgpgme.c:284 src/plugins/pgpcore/sgpgme.c:302
+#: src/plugins/pgpcore/sgpgme.c:285 src/plugins/pgpcore/sgpgme.c:303
 #, c-format
 msgid "Key 0x%s not available to verify this signature"
 msgstr "Nie je dostupný kľúč 0x%s na overenie tohoto podpisu"
 
-#: src/plugins/pgpcore/sgpgme.c:290
+#: src/plugins/pgpcore/sgpgme.c:291
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Vypršaný podpis od „%s”"
 
-#: src/plugins/pgpcore/sgpgme.c:293
+#: src/plugins/pgpcore/sgpgme.c:294
 #, c-format
 msgid "Good signature from \"%s\", but the key has expired"
 msgstr "Platný podpis od „%s”, ale kľúču vypršala platnosť"
 
-#: src/plugins/pgpcore/sgpgme.c:296
+#: src/plugins/pgpcore/sgpgme.c:297
 #, c-format
 msgid "Good signature from \"%s\", but the key has been revoked"
 msgstr "Platný podpis od „%s”, ale kľúč bol odvolaný"
 
-#: src/plugins/pgpcore/sgpgme.c:299
+#: src/plugins/pgpcore/sgpgme.c:300
 #, c-format
 msgid "Bad signature from \"%s\""
 msgstr "Chybný podpis od „%s”."
 
-#: src/plugins/pgpcore/sgpgme.c:306
+#: src/plugins/pgpcore/sgpgme.c:307
 msgid "The signature has not been checked"
 msgstr "Podpis nebol overený"
 
-#: src/plugins/pgpcore/sgpgme.c:325
+#: src/plugins/pgpcore/sgpgme.c:330
 msgid "Error checking signature: no status\n"
 msgstr "Chyba kontroly podpisu: žiadny stav\n"
 
-#: src/plugins/pgpcore/sgpgme.c:343
+#: src/plugins/pgpcore/sgpgme.c:348
 #, c-format
 msgid "Error checking signature: %s\n"
 msgstr "Chyba overenia podpisu: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:361
+#: src/plugins/pgpcore/sgpgme.c:366
 #, c-format
 msgid "Signature made on %s using %s key ID %s\n"
 msgstr "%s podpísané pomocou kľúča %s s ID %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:367
+#: src/plugins/pgpcore/sgpgme.c:372
 #, c-format
 msgid "Good signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Platný podpis od uid „%s” (Dôveryhodnosť %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:372
+#: src/plugins/pgpcore/sgpgme.c:377
 #, c-format
 msgid "Expired key uid \"%s\"\n"
 msgstr "Kľúču od %s skončila platnosť.\n"
 
-#: src/plugins/pgpcore/sgpgme.c:377
+#: src/plugins/pgpcore/sgpgme.c:382
 #, c-format
 msgid "Expired signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Skončená platnosť podpisu od uid „%s” (Dôveryhodnosť: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:382
+#: src/plugins/pgpcore/sgpgme.c:387
 #, c-format
 msgid "Revoked key uid \"%s\"\n"
 msgstr "Odvolaný kľúč od uid \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:387
+#: src/plugins/pgpcore/sgpgme.c:392
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "ZLÝ podpis od „%s”\n"
 
-#: src/plugins/pgpcore/sgpgme.c:400
+#: src/plugins/pgpcore/sgpgme.c:405
 #, c-format
 msgid "uid \"%s\" (Validity: %s)\n"
 msgstr "uid „%s” (Dôveryhodnosť %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:402
+#: src/plugins/pgpcore/sgpgme.c:407
 msgid "Revoked"
 msgstr "Odvolaný"
 
-#: src/plugins/pgpcore/sgpgme.c:407
+#: src/plugins/pgpcore/sgpgme.c:412
 #, c-format
 msgid "Owner Trust: %s\n"
 msgstr "Dôvera vlastníka: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:408
+#: src/plugins/pgpcore/sgpgme.c:413
 msgid "No key!"
 msgstr "Bez kľúča!"
 
-#: src/plugins/pgpcore/sgpgme.c:410
+#: src/plugins/pgpcore/sgpgme.c:415
 msgid "Primary key fingerprint:"
 msgstr "Odtlačok primárneho kľúča:"
 
-#: src/plugins/pgpcore/sgpgme.c:428
+#: src/plugins/pgpcore/sgpgme.c:433
 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr "UPOZORNENIE: Adresa podpisu „%s” sa nezhoduje so záznamom DNS\n"
 
-#: src/plugins/pgpcore/sgpgme.c:434
+#: src/plugins/pgpcore/sgpgme.c:439
 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr "Overená adresa podpisu je „%s”\n"
 
-#: src/plugins/pgpcore/sgpgme.c:468
+#: src/plugins/pgpcore/sgpgme.c:473
 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr "Nemožno získať údaje zo správy, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:484
+#: src/plugins/pgpcore/sgpgme.c:489
 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr "Nemožno inicializovať údaje, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:661
+#: src/plugins/pgpcore/sgpgme.c:666
 msgid "Secret key specification is ambiguous"
 msgstr "Zadanie súkromného kľúča je nejednoznačné"
 
-#: src/plugins/pgpcore/sgpgme.c:671
+#: src/plugins/pgpcore/sgpgme.c:676
 #, c-format
 msgid "Secret key not found (%s)"
 msgstr "Súkromný kľúč nebol nájdený (%s)"
 
-#: src/plugins/pgpcore/sgpgme.c:684
+#: src/plugins/pgpcore/sgpgme.c:689
 #, c-format
 msgid "Error setting secret key: %s"
 msgstr "Chyba pri určení súkromného kľúča: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:777
+#: src/plugins/pgpcore/sgpgme.c:782
 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 msgstr ""
 "Protokol Gpgme „%s” je nepoužiteľný. Systém „%s” nie je správne "
 "nainštalovaný."
 
-#: src/plugins/pgpcore/sgpgme.c:783
+#: src/plugins/pgpcore/sgpgme.c:788
 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
@@ -12180,12 +12303,12 @@ msgstr ""
 "Protokol Gpgme „%s” je nepoužiteľný. Systém „%s” je nainštalovaný vo verzii "
 "%s, ale je potrebná verzia %s.\n"
 
-#: src/plugins/pgpcore/sgpgme.c:791
+#: src/plugins/pgpcore/sgpgme.c:796
 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr "Protokol Gpgme „%s” je nepoužiteľný (neznámy problém)"
 
-#: src/plugins/pgpcore/sgpgme.c:807
+#: src/plugins/pgpcore/sgpgme.c:812
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
@@ -12193,18 +12316,18 @@ msgstr ""
 "GnuPG nie je správne nainštalované, alebo používate zastaralú\n"
 "verziu. Podpora OpenPGP bude vypnutá."
 
-#: src/plugins/pgpcore/sgpgme.c:884
+#: src/plugins/pgpcore/sgpgme.c:889
 msgid ""
 "You have to save the account's information with \"OK\" before being able to "
 "generate a key pair.\n"
 msgstr ""
 "Pred vygenerovaním páru kľúčov musíte uložiť údaje o účte pomocou „OK”.\n"
 
-#: src/plugins/pgpcore/sgpgme.c:889
+#: src/plugins/pgpcore/sgpgme.c:894
 msgid "No PGP key found"
 msgstr "Nebol nájdený žiadny PGP kľúč"
 
-#: src/plugins/pgpcore/sgpgme.c:890
+#: src/plugins/pgpcore/sgpgme.c:895
 msgid ""
 "Claws Mail did not find a secret PGP key, which means that you won't be able "
 "to sign emails or receive encrypted emails.\n"
@@ -12214,24 +12337,24 @@ msgstr ""
 "podpisovať správy, ani prijímať šifrované správy.\n"
 "Prajete si teraz vygenerovať nový pár kľúčov?"
 
-#: src/plugins/pgpcore/sgpgme.c:979 src/plugins/pgpcore/sgpgme.c:1001
+#: src/plugins/pgpcore/sgpgme.c:984 src/plugins/pgpcore/sgpgme.c:1006
 #, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr "Nemožno vygenerovať nový pár kľúčov: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:989
+#: src/plugins/pgpcore/sgpgme.c:994
 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
 msgstr ""
-"Prebieha generácia vášho nového páru kľúčov… Prosím, pohybujte myšou, aby "
-"ste zvýšili entropiu v systéme…"
+"Prebieha generácia vášho nového páru kľúčov... Prosím, pohybujte myšou, aby "
+"ste zvýšili entropiu v systéme..."
 
-#: src/plugins/pgpcore/sgpgme.c:1007
+#: src/plugins/pgpcore/sgpgme.c:1012
 msgid "Couldn't generate a new key pair: unknown error"
 msgstr "Nemožno vygenerovať nový pár kľúčov: neznáma chyba"
 
-#: src/plugins/pgpcore/sgpgme.c:1011
+#: src/plugins/pgpcore/sgpgme.c:1016
 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
@@ -12244,62 +12367,62 @@ msgstr ""
 "\n"
 "Prajete si exportovať tento pár na kľúčový server?"
 
-#: src/plugins/pgpcore/sgpgme.c:1015
+#: src/plugins/pgpcore/sgpgme.c:1020
 msgid "Key generated"
 msgstr "Kľúč vygenerovaný"
 
-#: src/plugins/pgpcore/sgpgme.c:1091
+#: src/plugins/pgpcore/sgpgme.c:1096
 msgid "Key exported."
 msgstr "Kľúč vyexportovaný."
 
-#: src/plugins/pgpcore/sgpgme.c:1093
+#: src/plugins/pgpcore/sgpgme.c:1098
 msgid "Couldn't export key."
 msgstr "Nemožno exportovať kľúč."
 
-#: src/plugins/pgpinline/pgpinline.c:155
+#: src/plugins/pgpinline/pgpinline.c:156
 msgid "Incorrect part"
 msgstr "Nesprávna časť"
 
-#: src/plugins/pgpinline/pgpinline.c:159
+#: src/plugins/pgpinline/pgpinline.c:160
 msgid "Not a text part"
 msgstr "Iná ako textová časť"
 
-#: src/plugins/pgpinline/pgpinline.c:170 src/plugins/pgpinline/pgpinline.c:322
+#: src/plugins/pgpinline/pgpinline.c:171 src/plugins/pgpinline/pgpinline.c:323
 msgid "Couldn't get text data."
 msgstr "Nemožno získať textové dáta."
 
-#: src/plugins/pgpinline/pgpinline.c:188
+#: src/plugins/pgpinline/pgpinline.c:189
 msgid "Couldn't convert text data to any sane charset."
 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:511 src/plugins/pgpmime/pgpmime.c:654
-#: src/plugins/smime/smime.c:413
+#: src/plugins/pgpinline/pgpinline.c:197 src/plugins/pgpinline/pgpinline.c:519
+#: src/plugins/pgpinline/pgpinline.c:658 src/plugins/pgpinline/pgpinline.c:714
+#: src/plugins/pgpmime/pgpmime.c:184 src/plugins/pgpmime/pgpmime.c:330
+#: src/plugins/pgpmime/pgpmime.c:512 src/plugins/pgpmime/pgpmime.c:656
+#: src/plugins/smime/smime.c:418
 #, c-format
 msgid "Couldn't initialize GPG context, %s"
 msgstr "Nemožno inicializovať kontext GPG, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:315
+#: src/plugins/pgpinline/pgpinline.c:316
 msgid "Couldn't parse mime part."
 msgstr "Nemožno spracovať časť MIME."
 
-#: src/plugins/pgpinline/pgpinline.c:345 src/plugins/pgpmime/pgpmime.c:352
+#: src/plugins/pgpinline/pgpinline.c:346 src/plugins/pgpmime/pgpmime.c:353
 #, c-format
 msgid "Couldn't open decrypted file %s"
 msgstr "Nemožno otvoriť dešifrovaný súbor %s"
 
-#: src/plugins/pgpinline/pgpinline.c:362 src/plugins/pgpinline/pgpinline.c:371
-#: src/plugins/pgpinline/pgpinline.c:380 src/plugins/pgpinline/pgpinline.c:388
-#: src/plugins/pgpinline/pgpinline.c:398 src/plugins/pgpinline/pgpinline.c:407
-#: src/plugins/pgpmime/pgpmime.c:363 src/plugins/pgpmime/pgpmime.c:377
+#: src/plugins/pgpinline/pgpinline.c:363 src/plugins/pgpinline/pgpinline.c:372
+#: src/plugins/pgpinline/pgpinline.c:381 src/plugins/pgpinline/pgpinline.c:389
+#: src/plugins/pgpinline/pgpinline.c:399 src/plugins/pgpinline/pgpinline.c:408
+#: src/plugins/pgpmime/pgpmime.c:364 src/plugins/pgpmime/pgpmime.c:378
 #, c-format
 msgid "Couldn't write to decrypted file %s"
 msgstr "Nemožno zapísať do dešifrovaného súboru %s"
 
-#: src/plugins/pgpinline/pgpinline.c:376 src/plugins/pgpinline/pgpinline.c:377
-#: src/plugins/pgpinline/pgpinline.c:378
+#: src/plugins/pgpinline/pgpinline.c:377 src/plugins/pgpinline/pgpinline.c:378
+#: src/plugins/pgpinline/pgpinline.c:379
 msgid ""
 "\n"
 "--- Start of PGP/Inline encrypted data ---\n"
@@ -12307,53 +12430,53 @@ msgstr ""
 "\n"
 "--- Začiatok dát šifrovaných PGP/Inline ---\n"
 
-#: src/plugins/pgpinline/pgpinline.c:394 src/plugins/pgpinline/pgpinline.c:395
-#: src/plugins/pgpinline/pgpinline.c:396
+#: src/plugins/pgpinline/pgpinline.c:395 src/plugins/pgpinline/pgpinline.c:396
+#: src/plugins/pgpinline/pgpinline.c:397
 msgid "--- End of PGP/Inline encrypted data ---\n"
 msgstr "--- Koniec dát šifrovaných PGP/Inline ---\n"
 
-#: src/plugins/pgpinline/pgpinline.c:415 src/plugins/pgpmime/pgpmime.c:389
+#: src/plugins/pgpinline/pgpinline.c:416 src/plugins/pgpmime/pgpmime.c:390
 #, c-format
 msgid "Couldn't close decrypted file %s"
 msgstr "Nemožno zatvoriť dešifrovaný súbor %s"
 
-#: src/plugins/pgpinline/pgpinline.c:427
+#: src/plugins/pgpinline/pgpinline.c:428
 msgid "Couldn't scan decrypted file."
 msgstr "Nemožno prečítať dešifrovaný súbor."
 
-#: src/plugins/pgpinline/pgpinline.c:435
+#: src/plugins/pgpinline/pgpinline.c:436
 msgid "Couldn't scan decrypted file parts."
 msgstr "Nemožno prečítať dešifrované časti súboru."
 
-#: src/plugins/pgpinline/pgpinline.c:492 src/plugins/pgpinline/pgpinline.c:684
+#: src/plugins/pgpinline/pgpinline.c:493 src/plugins/pgpinline/pgpinline.c:685
 msgid "Malformed message"
 msgstr "Nesprávny formát správy"
 
-#: src/plugins/pgpinline/pgpinline.c:503 src/plugins/pgpinline/pgpinline.c:695
-#: src/plugins/pgpmime/pgpmime.c:694
+#: src/plugins/pgpinline/pgpinline.c:504 src/plugins/pgpinline/pgpinline.c:696
+#: src/plugins/pgpmime/pgpmime.c:696
 #, 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:538
+#: src/plugins/pgpinline/pgpinline.c:543 src/plugins/pgpmime/pgpmime.c:539
 #, 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:565
+#: src/plugins/pgpinline/pgpinline.c:561 src/plugins/pgpmime/pgpmime.c:566
 #, 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:574
+#: src/plugins/pgpinline/pgpinline.c:570 src/plugins/pgpmime/pgpmime.c:575
 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:585
+#: src/plugins/pgpinline/pgpinline.c:580 src/plugins/pgpmime/pgpmime.c:586
 msgid "Data signing failed, no contents."
 msgstr "Podpísanie dát zlyhalo, žiadny obsah."
 
-#: src/plugins/pgpinline/pgpinline.c:623
+#: src/plugins/pgpinline/pgpinline.c:624
 msgid ""
 "Please note that attachments are not encrypted by the PGP/Inline system, nor "
 "are email headers, like Subject."
@@ -12361,17 +12484,17 @@ 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:664
+#: src/plugins/pgpinline/pgpinline.c:668 src/plugins/pgpmime/pgpmime.c:666
 #, c-format
 msgid "Couldn't add GPG key %s, %s"
 msgstr "Nemožno pridať GPG kľúč %s, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:726 src/plugins/pgpmime/pgpmime.c:722
+#: src/plugins/pgpinline/pgpinline.c:727 src/plugins/pgpmime/pgpmime.c:724
 #, c-format
 msgid "Encryption failed, %s"
 msgstr "Šifrovanie zlyhalo, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:795
+#: src/plugins/pgpinline/pgpinline.c:796
 msgid "PGP/Inline"
 msgstr "PGP/Inline"
 
@@ -12405,34 +12528,34 @@ msgstr ""
 "\n"
 "Na GPGME sa vzťahuje copyright 2001 by Werner Koch <dd9jn@gnu.org>"
 
-#: src/plugins/pgpmime/pgpmime.c:203
+#: src/plugins/pgpmime/pgpmime.c:204
 msgid "Signature boundary not found."
 msgstr "Hranica podpisu nebola nájdená."
 
-#: src/plugins/pgpmime/pgpmime.c:401 src/plugins/smime/smime.c:494
+#: src/plugins/pgpmime/pgpmime.c:402 src/plugins/smime/smime.c:499
 msgid "Couldn't parse decrypted file."
 msgstr "Nemožno spracovať dešifrovaný súbor."
 
-#: src/plugins/pgpmime/pgpmime.c:407 src/plugins/smime/smime.c:501
+#: src/plugins/pgpmime/pgpmime.c:408 src/plugins/smime/smime.c:506
 msgid "Couldn't parse decrypted file parts."
 msgstr "Nemožno spracovať dešifrované časti súboru."
 
-#: src/plugins/pgpmime/pgpmime.c:456 src/plugins/pgpmime/pgpmime.c:495
+#: src/plugins/pgpmime/pgpmime.c:457 src/plugins/pgpmime/pgpmime.c:496
 #, c-format
 msgid "Couldn't create temporary file: %s"
 msgstr "Nemožno vytvoriť dočasný súbor: %s"
 
-#: src/plugins/pgpmime/pgpmime.c:598
+#: src/plugins/pgpmime/pgpmime.c:599
 msgid "OpenPGP digital signature"
 msgstr "Digitálny podpis OpenPGP"
 
-#: src/plugins/pgpmime/pgpmime.c:620
+#: src/plugins/pgpmime/pgpmime.c:622
 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:794
+#: src/plugins/pgpmime/pgpmime.c:798
 msgid "PGP/Mime"
 msgstr "PGP/Mime"
 
@@ -12465,38 +12588,38 @@ msgstr ""
 "\n"
 "Na GPGME sa vzťahuje copyright 2001 by Werner Koch <dd9jn@gnu.org>"
 
-#: src/plugins/python/python_plugin.c:358
-#: src/plugins/python/python_plugin.c:502
+#: src/plugins/python/python_plugin.c:379
+#: src/plugins/python/python_plugin.c:523
 msgid "Python scripts"
 msgstr "Skripty Python"
 
-#: src/plugins/python/python_plugin.c:497
+#: src/plugins/python/python_plugin.c:518
 msgid "Show Python console..."
-msgstr "Zobraziť konzolu Python…"
+msgstr "Zobraziť konzolu Python..."
 
-#: src/plugins/python/python_plugin.c:503
-#: src/plugins/rssyl/rssyl_feed_props.c:481
+#: src/plugins/python/python_plugin.c:524
+#: src/plugins/rssyl/rssyl_feed_props.c:471
 msgid "Refresh"
 msgstr "Obnoviť"
 
-#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2572
-#: src/prefs_account.c:2600 src/prefs_account.c:2883 src/wizard.c:1204
-#: src/wizard.c:1624
+#: src/plugins/python/python_plugin.c:526 src/prefs_account.c:2707
+#: src/prefs_account.c:2735 src/prefs_account.c:3172 src/wizard.c:1206
+#: src/wizard.c:1626
 msgid "Browse"
 msgstr "Prechádzať"
 
-#: src/plugins/python/python_plugin.c:651
-#: src/plugins/python/python_plugin.c:735
+#: src/plugins/python/python_plugin.c:672
+#: src/plugins/python/python_plugin.c:762
 msgid "Python"
 msgstr "Python"
 
-#: src/plugins/python/python_plugin.c:657
+#: src/plugins/python/python_plugin.c:681
 msgid "Failed to register \"compose create hook\" in the Python plugin"
 msgstr ""
 "V zásuvnom module Python zlyhala registrácia obsluhy udalosti „compose "
 "create hook”"
 
-#: src/plugins/python/python_plugin.c:740
+#: src/plugins/python/python_plugin.c:767
 msgid ""
 "This plugin provides Python integration features.\n"
 "Python code can be entered interactively into an embedded Python console, "
@@ -12585,7 +12708,7 @@ msgstr ""
 "\n"
 "Spätná väzba na <berndth@gmx.de> je vítaná."
 
-#: src/plugins/python/python_plugin.c:791
+#: src/plugins/python/python_plugin.c:818
 msgid "Python integration"
 msgstr "Integrácia Python"
 
@@ -12598,23 +12721,23 @@ msgstr ""
 "Nemožno čítať obsah starého súboru feeds.xml:\n"
 "%s"
 
-#: src/plugins/rssyl/opml_export.c:110
+#: src/plugins/rssyl/opml_export.c:111
 #, c-format
 msgid "RSSyl: Error while writing '%s' to feed export list.\n"
 msgstr "RSSyl: Chyba počas zápisu „%s” do exportu zoznamu kanálov.\n"
 
-#: src/plugins/rssyl/opml_export.c:131
+#: src/plugins/rssyl/opml_export.c:132
 #, c-format
 msgid "RSSyl: Couldn't delete old OPML file '%s': %s\n"
 msgstr "RSSyl: Nemožno odstrániť starý súbor OPML „%s”: %s\n"
 
-#: src/plugins/rssyl/opml_export.c:141
+#: src/plugins/rssyl/opml_export.c:142
 #, c-format
 msgid "RSSyl: Couldn't open file '%s' for feed list exporting: %s\n"
 msgstr ""
 "RSSyl: Nemožno otvoriť súbor „%s” na exportovanie zoznamu kanálov: %s\n"
 
-#: src/plugins/rssyl/opml_export.c:182
+#: src/plugins/rssyl/opml_export.c:183
 msgid "RSSyl: Error during writing feed export file.\n"
 msgstr "RSSyl: Chyba počas zápisu súboru exportu kanála.\n"
 
@@ -12650,45 +12773,46 @@ msgstr ""
 msgid "RSS feed"
 msgstr "RSS kanál"
 
-#: src/plugins/rssyl/rssyl_add_item.c:296
+#: src/plugins/rssyl/rssyl_add_item.c:304
 msgctxt "Empty RSS feed title placeholder"
 msgid "(empty)"
 msgstr "(prázdne)"
 
-#: src/plugins/rssyl/rssyl.c:156 src/plugins/rssyl/rssyl.c:167
+#: src/plugins/rssyl/rssyl.c:157 src/plugins/rssyl/rssyl.c:169
 msgid "Refresh all feeds"
 msgstr "Obnoviť všetky kanály"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:65
+#: src/plugins/rssyl/rssyl_cb_menu.c:66
 msgid "Subscribe feed"
 msgstr "Odoberať kanál"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:66
+#: src/plugins/rssyl/rssyl_cb_menu.c:67
 msgid "Input the URL of the news feed you wish to subscribe:"
 msgstr "Zadajte URL kanála noviniek, ktoré chcete odoberať:"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:98
+#: src/plugins/rssyl/rssyl_cb_menu.c:99
 #, c-format
 msgid "'%c' can't be used in folder name."
 msgstr "„%c” nemožno použiť v názve zložky."
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:251
+#: src/plugins/rssyl/rssyl_cb_menu.c:248 src/plugins/rssyl/rssyl_cb_menu.c:295
+#: src/plugins/rssyl/rssyl_feed_props.c:201
 msgid "Claws Mail needs network access in order to update the feed."
 msgid_plural "Claws Mail needs network access in order to update feeds."
 msgstr[0] "Claws Mail potrebuje na aktualizáciu kanála sieťový prístup."
 msgstr[1] "Claws Mail potrebuje na aktualizáciu kanálov sieťový prístup."
 msgstr[2] "Claws Mail potrebuje na aktualizáciu kanálov sieťový prístup."
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:314
+#: src/plugins/rssyl/rssyl_cb_menu.c:321
 #, c-format
 msgid "Really remove the feed tree `%s' ?\n"
 msgstr "Naozaj odstrániť strom kanálov „%s” ?\n"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:315
+#: src/plugins/rssyl/rssyl_cb_menu.c:322
 msgid "Remove feed tree"
 msgstr "Odstráni strom kanálov"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:349
+#: src/plugins/rssyl/rssyl_cb_menu.c:356
 msgid "Select an OPML file"
 msgstr "Vybrať súbor OPML"
 
@@ -12732,105 +12856,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:268
+#: src/plugins/rssyl/rssyl_feed_props.c:270
 msgid "HTTP Basic authentication"
 msgstr "Základná autentifikácia HTTP"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:289
+#: src/plugins/rssyl/rssyl_feed_props.c:292
 msgid "Use default refresh interval"
 msgstr "Použiť predvolený interval aktualizácie"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:301
+#: src/plugins/rssyl/rssyl_feed_props.c:304
 msgid "Keep old items"
 msgstr "Zachovať staré položky"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:307
+#: src/plugins/rssyl/rssyl_feed_props.c:310
 msgid "_Trim"
 msgstr "_Orezať"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:309
+#: src/plugins/rssyl/rssyl_feed_props.c:312
 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:312
+#: src/plugins/rssyl/rssyl_feed_props.c:315
 msgid "Fetch comments if possible"
 msgstr "Sťahovať komentáre, ak je to možné"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:337
+#: src/plugins/rssyl/rssyl_feed_props.c:335
 msgid "Always mark it as new"
 msgstr "Vždy označiť ako novú"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:343
+#: src/plugins/rssyl/rssyl_feed_props.c:337
 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:349
+#: src/plugins/rssyl/rssyl_feed_props.c:339
 msgid "Never mark it as new"
 msgstr "Nikdy neoznačovať ako novú"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:354
+#: src/plugins/rssyl/rssyl_feed_props.c:344
 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:361
+#: src/plugins/rssyl/rssyl_feed_props.c:351
 msgid "Ignore title rename"
 msgstr "Ignorovať zmenu nadpisu"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:366
+#: src/plugins/rssyl/rssyl_feed_props.c:356
 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:370
+#: src/plugins/rssyl/rssyl_feed_props.c:360
 #: src/plugins/vcalendar/vcal_prefs.c:593
 msgid "Verify SSL/TLS certificate validity"
 msgstr "Overiť platnosť certifikátu SSL/TLS"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:390
+#: src/plugins/rssyl/rssyl_feed_props.c:380
 msgid "User name"
 msgstr "Meno používateľa"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:403
+#: src/plugins/rssyl/rssyl_feed_props.c:393
 msgid "Source URL"
-msgstr "Zdrojová URL:"
+msgstr "Zdrojová URL"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:416
+#: src/plugins/rssyl/rssyl_feed_props.c:406
 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:424
-#: src/plugins/vcalendar/day-view.c:614 src/plugins/vcalendar/month-view.c:711
-#: src/prefs_account.c:1513 src/prefs_folder_item.c:568 src/prefs_matcher.c:337
+#: src/plugins/rssyl/rssyl_feed_props.c:414
+#: src/plugins/vcalendar/day-view.c:615 src/plugins/vcalendar/month-view.c:711
+#: src/prefs_account.c:1585 src/prefs_folder_item.c:571 src/prefs_matcher.c:341
 msgid "days"
 msgstr "dní"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:425
+#: src/plugins/rssyl/rssyl_feed_props.c:415
 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:449
+#: src/plugins/rssyl/rssyl_feed_props.c:439
 msgid "If an item changes"
 msgstr "Ak sa položka zmení"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:454
+#: src/plugins/rssyl/rssyl_feed_props.c:444
 msgid "Items"
 msgstr "Položiek"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:467
+#: src/plugins/rssyl/rssyl_feed_props.c:457
 msgid "Refresh interval"
 msgstr "Interval obnovenia"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:475
+#: src/plugins/rssyl/rssyl_feed_props.c:465
 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:527
+#: src/plugins/rssyl/rssyl_feed_props.c:517
 msgid "_OK"
 msgstr "_OK"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:535
+#: src/plugins/rssyl/rssyl_feed_props.c:525
 msgid "Set feed properties"
 msgstr "Nastaviť vlastnosti kanála"
 
@@ -12840,11 +12964,11 @@ msgstr "_Obnoviť kanál"
 
 #: src/plugins/rssyl/rssyl_gtk.c:49
 msgid "Feed pr_operties"
-msgstr "V_lastnosti kanála.."
+msgstr "V_lastnosti kanála"
 
 #: src/plugins/rssyl/rssyl_gtk.c:50
 msgid "Rena_me..."
-msgstr "Pre_menovať…"
+msgstr "Pre_menovať..."
 
 #: src/plugins/rssyl/rssyl_gtk.c:51
 msgid "R_efresh recursively"
@@ -12852,15 +12976,15 @@ msgstr "Obnoviť r_ekurzívne"
 
 #: src/plugins/rssyl/rssyl_gtk.c:52
 msgid "Subscribe _new feed..."
-msgstr "Prihlásiť _nový kanál…"
+msgstr "Prihlásiť _nový kanál..."
 
 #: src/plugins/rssyl/rssyl_gtk.c:53
 msgid "Create new _folder..."
-msgstr "V_ytvoriť novú zložku…"
+msgstr "V_ytvoriť novú zložku..."
 
 #: src/plugins/rssyl/rssyl_gtk.c:54
 msgid "Import feed list..."
-msgstr "Importovať zoznam kanálov…"
+msgstr "Importovať zoznam kanálov..."
 
 #: src/plugins/rssyl/rssyl_gtk.c:56
 msgid "Remove tree"
@@ -12936,7 +13060,7 @@ msgstr "Zložka kanála:"
 msgid ""
 "Instead of using official title, you can enter a different folder name for "
 "the feed."
-msgstr "namiesto oficiálneho nadpisu môžete zadať iné meno zložky kanály."
+msgstr "Namiesto oficiálneho nadpisu môžete zadať iné meno zložky kanály."
 
 #: src/plugins/rssyl/rssyl_subscribe_gtk.c:77
 msgid "_Edit feed properties after subscribing"
@@ -12945,29 +13069,28 @@ msgstr "_Upraviť vlastnosti kanála po prihlásení"
 #: src/plugins/rssyl/rssyl_update_comments.c:107
 #, c-format
 msgid "Updating comments for '%s'..."
-msgstr "Aktualizácia komentárov pre „%s”…"
+msgstr "Aktualizácia komentárov pre „%s”..."
 
-#: src/plugins/rssyl/rssyl_update_feed.c:105
-#: src/plugins/vcalendar/vcal_folder.c:1620
+#: src/plugins/rssyl/rssyl_update_feed.c:107
+#: src/plugins/vcalendar/vcal_folder.c:1624
 msgid "401 (Authorisation required)"
 msgstr "401 (Vyžadovaná autorizácia)"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:108
-#: src/plugins/vcalendar/vcal_folder.c:1623
-msgid "403 (Unauthorised)"
-msgstr "403 (Neautorizované)"
+#: src/plugins/rssyl/rssyl_update_feed.c:110
+msgid "403 (Forbidden)"
+msgstr "403 (Neprístupné)"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:111
-#: src/plugins/vcalendar/vcal_folder.c:1626
+#: src/plugins/rssyl/rssyl_update_feed.c:113
+#: src/plugins/vcalendar/vcal_folder.c:1630
 msgid "404 (Not found)"
 msgstr "404 (Nenájdené)"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:114
+#: src/plugins/rssyl/rssyl_update_feed.c:116
 #, c-format
 msgid "Error %d"
 msgstr "Chyba %d"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:127
+#: src/plugins/rssyl/rssyl_update_feed.c:129
 #, c-format
 msgctxt "First parameter is URL, second is error text"
 msgid ""
@@ -12981,7 +13104,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:140
+#: src/plugins/rssyl/rssyl_update_feed.c:142
 #, c-format
 msgid ""
 "No valid feed found at\n"
@@ -12990,21 +13113,21 @@ msgstr ""
 "Nenájdený platný kanál na\n"
 "<b>%s</b>"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:152
+#: src/plugins/rssyl/rssyl_update_feed.c:154
 msgid "Untitled feed"
 msgstr "Kanál bez názvu"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:154
+#: src/plugins/rssyl/rssyl_update_feed.c:156
 #, c-format
 msgid "RSSyl: Possibly invalid feed without title at %s.\n"
 msgstr "RSSyl: Pravdepodobne neplatný kanál bez názvu na %s.\n"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:231
+#: src/plugins/rssyl/rssyl_update_feed.c:233
 #, c-format
 msgid "Updating feed '%s'..."
-msgstr "Aktualizácia kanála „%s”…"
+msgstr "Aktualizácia kanála „%s”..."
 
-#: src/plugins/rssyl/rssyl_update_feed.c:258
+#: src/plugins/rssyl/rssyl_update_feed.c:270
 #, c-format
 msgid ""
 "Couldn't process feed at\n"
@@ -13017,11 +13140,11 @@ msgstr ""
 "\n"
 "Prosím, kontaktujte vývojára, toto by nemalo nastať."
 
-#: src/plugins/rssyl/rssyl_update_feed.c:342
+#: src/plugins/rssyl/rssyl_update_feed.c:356
 msgid "Claws Mail needs network access in order to update your feeds."
 msgstr "Claws Mail potrebuje na aktualizáciu kanálov sieťový prístup."
 
-#: src/plugins/rssyl/rssyl_update_format.c:127
+#: src/plugins/rssyl/rssyl_update_format.c:128
 msgid ""
 "Internal problem while upgrading storage format. This should not happen. "
 "Please report this, with debug output attached.\n"
@@ -13064,46 +13187,46 @@ msgstr ""
 "\n"
 "GPGME je copyright 2001 by Werner Koch <dd9jn@gnu.org>"
 
-#: src/plugins/smime/smime.c:421
+#: src/plugins/smime/smime.c:426
 #, c-format
 msgid "Couldn't set GPG protocol, %s"
 msgstr "Nemožno nastaviť protokol GPG, %s"
 
-#: src/plugins/smime/smime.c:449
+#: src/plugins/smime/smime.c:454
 msgid "Couldn't open temporary file"
-msgstr "Nemožno otvoriť dočasný súbor."
+msgstr "Nemožno otvoriť dočasný súbor"
 
-#: src/plugins/smime/smime.c:460 src/plugins/smime/smime.c:475
+#: src/plugins/smime/smime.c:465 src/plugins/smime/smime.c:480
 msgid "Couldn't write to temporary file"
-msgstr "Nemožno zapisovať do dočasného súboru."
+msgstr "Nemožno zapisovať do dočasného súboru"
 
-#: src/plugins/smime/smime.c:486
+#: src/plugins/smime/smime.c:491
 msgid "Couldn't close temporary file"
-msgstr "nemožno zatvoriť dočasný súbor."
+msgstr "Nemožno zatvoriť dočasný súbor"
 
-#: src/plugins/smime/smime.c:708
+#: src/plugins/smime/smime.c:714
 msgid ""
 "Please note that email headers, like Subject, are not encrypted by the S/"
 "MIME system."
 msgstr ""
-"prosím dajte pozor na to, že hlavičky emailu, ako predmet, nie sú systémom S/"
+"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:301
+#: src/plugins/spam_report/spam_report.c:307
 msgid "Reporting spam..."
-msgstr "Ohlasovanie SPAM…"
+msgstr "Ohlasovanie SPAM..."
 
-#: src/plugins/spam_report/spam_report.c:336
+#: src/plugins/spam_report/spam_report.c:342
 msgid "Report spam online..."
-msgstr "Ohlásiť SPAM online…"
+msgstr "Ohlásiť SPAM online..."
 
-#: src/plugins/spam_report/spam_report.c:347
-#: src/plugins/spam_report/spam_report.c:385
+#: src/plugins/spam_report/spam_report.c:353
+#: src/plugins/spam_report/spam_report.c:391
 #: src/plugins/spam_report/spam_report_prefs.c:83
 msgid "SpamReport"
 msgstr "Hlásenie SPAM"
 
-#: src/plugins/spam_report/spam_report.c:390
+#: src/plugins/spam_report/spam_report.c:396
 msgid ""
 "This plugin reports spam to various places.\n"
 "Currently the following sites or methods are supported:\n"
@@ -13119,7 +13242,7 @@ msgstr ""
 " * spamcop.net\n"
 " * nominačný systém lists.debian.org"
 
-#: src/plugins/spam_report/spam_report.c:415
+#: src/plugins/spam_report/spam_report.c:421
 msgid "Spam reporting"
 msgstr "Hlásenie SPAM"
 
@@ -13131,32 +13254,32 @@ msgstr "Zapnuté"
 msgid "Forward to:"
 msgstr "Poslať ďalej na:"
 
-#: src/plugins/spam_report/spam_report_prefs.c:185 src/wizard.c:1572
+#: src/plugins/spam_report/spam_report_prefs.c:185 src/wizard.c:1574
 msgid "Password:"
 msgstr "Heslo:"
 
-#: src/plugins/spamassassin/spamassassin.c:77
-#: src/plugins/spamassassin/spamassassin_gtk.c:649
+#: src/plugins/spamassassin/spamassassin.c:78
+#: src/plugins/spamassassin/spamassassin_gtk.c:671
 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 
-#: src/plugins/spamassassin/spamassassin.c:169
+#: src/plugins/spamassassin/spamassassin.c:182
 msgid "SpamAssassin plugin couldn't connect to spamd.\n"
 msgstr "Zlyhalo pripojenie zásuvného modulu SpamAssassin k serveru spamd.\n"
 
-#: src/plugins/spamassassin/spamassassin.c:185
+#: src/plugins/spamassassin/spamassassin.c:198
 msgid "SpamAssassin plugin filtering failed.\n"
 msgstr "Filtrovanie zásuvného modulu SpamAssassin zlyhalo.\n"
 
-#: src/plugins/spamassassin/spamassassin.c:211
+#: src/plugins/spamassassin/spamassassin.c:224
 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:216
+#: src/plugins/spamassassin/spamassassin.c:229
 msgid "SpamAssassin: filtering message..."
-msgstr "SpamAssassin: filtrujem správu…"
+msgstr "SpamAssassin: filtrujem správu..."
 
-#: src/plugins/spamassassin/spamassassin.c:345
+#: src/plugins/spamassassin/spamassassin.c:358
 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 "
@@ -13166,7 +13289,7 @@ msgstr ""
 "príčina je nedostupnosť servera spamd. Uistite sa, že server spamd beží a je "
 "dostupný."
 
-#: src/plugins/spamassassin/spamassassin.c:402
+#: src/plugins/spamassassin/spamassassin.c:416
 msgid ""
 "Claws Mail needs network access in order to feed the mail to the remote "
 "learner."
@@ -13174,17 +13297,17 @@ msgstr ""
 "Claws Mail potrebuje sieťové pripojenie, aby mohol dodať správu vzdialenému "
 "učiacemu sa."
 
-#: src/plugins/spamassassin/spamassassin.c:547
+#: src/plugins/spamassassin/spamassassin.c:561
 msgid "Failed to get username"
 msgstr "Zlyhalo získanie mena používateľa"
 
-#: src/plugins/spamassassin/spamassassin.c:559
+#: src/plugins/spamassassin/spamassassin.c:578
 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:593
+#: src/plugins/spamassassin/spamassassin.c:612
 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 "
@@ -13208,66 +13331,74 @@ msgstr ""
 "\n"
 "Nastavenia nájdete v menu Nastavenie/Nastavenia/Zásuvné moduly/SpamAssassin"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:90
+#: src/plugins/spamassassin/spamassassin_gtk.c:91
 msgid "Localhost"
 msgstr "Localhost"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:91
+#: src/plugins/spamassassin/spamassassin_gtk.c:92
 msgid "TCP"
 msgstr "TCP"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:92
+#: src/plugins/spamassassin/spamassassin_gtk.c:94
 msgid "Unix Socket"
 msgstr "Unixový soket"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:119
+#: src/plugins/spamassassin/spamassassin_gtk.c:122
 msgid "Select folder to save spam to"
 msgstr "Vyberte zložku na uloženie SPAMu"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:269
+#: src/plugins/spamassassin/spamassassin_gtk.c:274
 msgid "Enable SpamAssassin plugin"
 msgstr "Aktivovať zásuvný modul SpamAssassin"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:273
+#: src/plugins/spamassassin/spamassassin_gtk.c:278
 msgid "Transport"
 msgstr "Prenos"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:281
+#: src/plugins/spamassassin/spamassassin_gtk.c:286
 msgid "Type of transport"
 msgstr "Typ prenosu"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:302
+#: src/plugins/spamassassin/spamassassin_gtk.c:307
 msgid "User"
 msgstr "Meno používateľa"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:315
+#: src/plugins/spamassassin/spamassassin_gtk.c:320
 msgid "User to use with spamd server"
 msgstr "Používateľ na spamd servere"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:317
+#: src/plugins/spamassassin/spamassassin_gtk.c:322
 msgid "spamd"
 msgstr "spamd"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:335
+#: src/plugins/spamassassin/spamassassin_gtk.c:340
 msgid "Hostname or IP address of spamd server"
 msgstr "Názov hostiteľa alebo IP adresa servera spamd"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:346
+#: src/plugins/spamassassin/spamassassin_gtk.c:351
 msgid "Port of spamd server"
 msgstr "Port serveru spamd"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:352
+#: src/plugins/spamassassin/spamassassin_gtk.c:357
 msgid "Path of Unix socket"
 msgstr "Cesta k unixovému soketu"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:387
+#: src/plugins/spamassassin/spamassassin_gtk.c:364
+msgid "Use compression"
+msgstr "Požiť komprimáciu"
+
+#: src/plugins/spamassassin/spamassassin_gtk.c:368
+msgid "Enable compression if spamd uses it, otherwise disable it."
+msgstr "Zapnite komprimáciu, ak ju spamd používa, inak ju vypnite."
+
+#: src/plugins/spamassassin/spamassassin_gtk.c:403
 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:73
+#: src/plugins/tnef_parse/tnef_parse.c:74
 #, c-format
 msgid ""
 "\n"
@@ -13280,29 +13411,29 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: src/plugins/tnef_parse/tnef_parse.c:130
-#: src/plugins/tnef_parse/tnef_parse.c:137
+#: src/plugins/tnef_parse/tnef_parse.c:131
+#: src/plugins/tnef_parse/tnef_parse.c:138
 msgid "Failed to write the part data."
 msgstr "Zlyhal zápis časti dát."
 
-#: src/plugins/tnef_parse/tnef_parse.c:182
+#: src/plugins/tnef_parse/tnef_parse.c:183
 msgid "Failed to parse VCalendar data."
 msgstr "Zlyhalo spracovanie dát VCalendar."
 
-#: src/plugins/tnef_parse/tnef_parse.c:221
+#: src/plugins/tnef_parse/tnef_parse.c:222
 msgid "Failed to parse VTask data."
 msgstr "Zlyhalo spracovanie dát VTask."
 
-#: src/plugins/tnef_parse/tnef_parse.c:273
+#: src/plugins/tnef_parse/tnef_parse.c:274
 msgid "Failed to parse VCard data."
 msgstr "Zlyhalo spracovanie dát VCard."
 
-#: src/plugins/tnef_parse/tnef_parse.c:413
-#: src/plugins/tnef_parse/tnef_parse.c:437
+#: src/plugins/tnef_parse/tnef_parse.c:414
+#: src/plugins/tnef_parse/tnef_parse.c:438
 msgid "TNEF Parser"
 msgstr "TNEF Analyzátor"
 
-#: src/plugins/tnef_parse/tnef_parse.c:442
+#: src/plugins/tnef_parse/tnef_parse.c:443
 msgid ""
 "This Claws Mail plugin allows you to read application/ms-tnef attachments.\n"
 "\n"
@@ -13316,25 +13447,25 @@ msgstr ""
 
 #: src/plugins/vcalendar/common-views.c:62
 msgid "_Edit this meeting..."
-msgstr "Upraviť toto str_etnutie…"
+msgstr "Upraviť toto str_etnutie..."
 
 #: src/plugins/vcalendar/common-views.c:63
 msgid "_Cancel this meeting..."
-msgstr "_Zrušiť toto stretnutie…"
+msgstr "_Zrušiť toto stretnutie..."
 
 #: src/plugins/vcalendar/common-views.c:65
 msgid "_Create new meeting..."
-msgstr "_Vytvoriť nové stretnutie…"
+msgstr "_Vytvoriť nové stretnutie..."
 
 #: src/plugins/vcalendar/common-views.c:67
 msgid "_Go to today"
 msgstr "Pre_jsť na dnes"
 
-#: src/plugins/vcalendar/day-view.c:593 src/plugins/vcalendar/month-view.c:690
+#: src/plugins/vcalendar/day-view.c:594 src/plugins/vcalendar/month-view.c:690
 msgid "Start"
 msgstr "Začiatok"
 
-#: src/plugins/vcalendar/day-view.c:606 src/plugins/vcalendar/month-view.c:703
+#: src/plugins/vcalendar/day-view.c:607 src/plugins/vcalendar/month-view.c:703
 msgid "Show"
 msgstr "Zobraziť"
 
@@ -13414,15 +13545,15 @@ msgstr "November"
 msgid "December"
 msgstr "December"
 
-#: src/plugins/vcalendar/month-view.c:796
+#: src/plugins/vcalendar/month-view.c:798
 msgid "Week number"
 msgstr "Číslo týždňa"
 
-#: src/plugins/vcalendar/month-view.c:886
+#: src/plugins/vcalendar/month-view.c:889
 msgid "Previous month"
 msgstr "Minulý mesiac"
 
-#: src/plugins/vcalendar/month-view.c:906
+#: src/plugins/vcalendar/month-view.c:909
 msgid "Next month"
 msgstr "Ďalší mesiac"
 
@@ -13450,7 +13581,7 @@ msgstr ""
 "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"
+"Stretnutia a zvoľte „Nové stretnutie...”.\n"
 "\n"
 "Môžete sa tiež prihlásiť k externým kanálom webCal, exportovať svoje "
 "stretnutia a kalendáre, zverejňovať informácie o svojom čase a prijímať "
@@ -13462,7 +13593,7 @@ msgstr "Kalendár"
 
 #: src/plugins/vcalendar/vcalendar.c:100
 msgid "Create meeting from message..."
-msgstr "Vytvoriť zo správy stretnutie…"
+msgstr "Vytvoriť zo správy stretnutie..."
 
 #: src/plugins/vcalendar/vcalendar.c:120
 #, c-format
@@ -13470,65 +13601,65 @@ msgid ""
 "You are about to create %d meetings, one by one. Do you want to continue?"
 msgstr "Vytvárate %d stretnutia, jedno po druhom. Chcete pokračovať?"
 
-#: src/plugins/vcalendar/vcalendar.c:139
+#: src/plugins/vcalendar/vcalendar.c:140
 msgid "Creating meeting..."
-msgstr "Vytváranie stretnutia…"
+msgstr "Vytváranie stretnutia..."
 
-#: src/plugins/vcalendar/vcalendar.c:158
+#: src/plugins/vcalendar/vcalendar.c:159
 msgid "no subject"
 msgstr "bez predmetu"
 
-#: src/plugins/vcalendar/vcalendar.c:384
+#: src/plugins/vcalendar/vcalendar.c:385
 msgid "Accept"
 msgstr "Prijať"
 
-#: src/plugins/vcalendar/vcalendar.c:385
+#: src/plugins/vcalendar/vcalendar.c:386
 msgid "Tentatively accept"
 msgstr "Nezáväzne prijať"
 
-#: src/plugins/vcalendar/vcalendar.c:386
+#: src/plugins/vcalendar/vcalendar.c:387
 msgid "Decline"
 msgstr "Odmietnuť"
 
-#: src/plugins/vcalendar/vcalendar.c:473
+#: src/plugins/vcalendar/vcalendar.c:474
 msgid "You have a Todo item."
 msgstr "Máte položku ToDo."
 
-#: src/plugins/vcalendar/vcalendar.c:474 src/plugins/vcalendar/vcalendar.c:481
-#: src/plugins/vcalendar/vcalendar.c:486 src/plugins/vcalendar/vcalendar.c:494
-#: src/plugins/vcalendar/vcalendar.c:503 src/plugins/vcalendar/vcalendar.c:744
+#: src/plugins/vcalendar/vcalendar.c:475 src/plugins/vcalendar/vcalendar.c:482
+#: src/plugins/vcalendar/vcalendar.c:487 src/plugins/vcalendar/vcalendar.c:495
+#: src/plugins/vcalendar/vcalendar.c:504 src/plugins/vcalendar/vcalendar.c:716
 msgid "Details follow:"
 msgstr "Detaily:"
 
-#: src/plugins/vcalendar/vcalendar.c:480
+#: src/plugins/vcalendar/vcalendar.c:481
 msgid "You have created a meeting."
 msgstr "Vytvorili ste stretnutie."
 
-#: src/plugins/vcalendar/vcalendar.c:485
+#: src/plugins/vcalendar/vcalendar.c:486
 msgid "You have been invited to a meeting."
 msgstr "Boli ste pozvaný na stretnutie."
 
-#: src/plugins/vcalendar/vcalendar.c:493
+#: src/plugins/vcalendar/vcalendar.c:494
 msgid "A meeting to which you had been invited has been cancelled."
 msgstr "Stretnutie, na ktoré ste boli pozvaný, bolo zrušené."
 
-#: src/plugins/vcalendar/vcalendar.c:502
+#: src/plugins/vcalendar/vcalendar.c:503
 msgid "You have been forwarded an appointment."
 msgstr "Boli ste poslaný na stretnutie."
 
-#: src/plugins/vcalendar/vcalendar.c:556
+#: src/plugins/vcalendar/vcalendar.c:557
 msgid "(this event recurs)"
 msgstr "(opakovaná udalosť)"
 
-#: src/plugins/vcalendar/vcalendar.c:563
+#: src/plugins/vcalendar/vcalendar.c:564
 msgid "(this event is part of a recurring event)"
 msgstr "(táto udalosť je časťou opakovanej udalosti)"
 
-#: src/plugins/vcalendar/vcalendar.c:743
+#: src/plugins/vcalendar/vcalendar.c:715
 msgid "You have received an answer to an unknown meeting proposal."
 msgstr "Prijali ste odpoveď na neznámu ponuku na stretnutie."
 
-#: src/plugins/vcalendar/vcalendar.c:747
+#: src/plugins/vcalendar/vcalendar.c:719
 #, c-format
 msgid ""
 "You have received an answer to a meeting proposal.\n"
@@ -13537,35 +13668,35 @@ msgstr ""
 "Prijali ste odpoveď na ponuku na stretnutie.\n"
 "%s je %s pozvaný s týmito podrobnosťami:"
 
-#: src/plugins/vcalendar/vcalendar.c:826
+#: src/plugins/vcalendar/vcalendar.c:798
 msgid "Error - could not get the calendar MIME part."
 msgstr "Chyba: Nemožno získať MIME časť kalendára."
 
-#: src/plugins/vcalendar/vcalendar.c:833
+#: src/plugins/vcalendar/vcalendar.c:805
 msgid "Error - no calendar part found."
 msgstr "Chyba: Nenájdená kalendárová časť."
 
-#: src/plugins/vcalendar/vcalendar.c:847
+#: src/plugins/vcalendar/vcalendar.c:819
 msgid "Error - Unknown calendar component type."
 msgstr "Chyba: Neznámy typ kalendárového komponentu."
 
-#: src/plugins/vcalendar/vcalendar.c:976
+#: src/plugins/vcalendar/vcalendar.c:951
 msgid "Send a notification to the attendees"
 msgstr "Poslať upozornenie účastníkom"
 
-#: src/plugins/vcalendar/vcalendar.c:985
+#: src/plugins/vcalendar/vcalendar.c:960
 msgid "Cancel meeting"
 msgstr "Zrušiť stretnutie"
 
-#: src/plugins/vcalendar/vcalendar.c:986
+#: src/plugins/vcalendar/vcalendar.c:961
 msgid "Are you sure you want to cancel this meeting?"
 msgstr "Naozaj chcete zrušiť toto stretnutie?"
 
-#: src/plugins/vcalendar/vcalendar.c:1081
+#: src/plugins/vcalendar/vcalendar.c:1056
 msgid "No account found"
 msgstr "Účet nenájdený"
 
-#: src/plugins/vcalendar/vcalendar.c:1082
+#: src/plugins/vcalendar/vcalendar.c:1057
 msgid ""
 "You have no account matching any attendee.\n"
 "Do you want to reply anyway?"
@@ -13573,128 +13704,128 @@ msgstr ""
 "Nemáte účet, ktorý zodpovedá tomuto účastníkovi.\n"
 "Chcete napriek tomu odpovedať?"
 
-#: src/plugins/vcalendar/vcalendar.c:1084
+#: src/plugins/vcalendar/vcalendar.c:1059
 msgid "Reply anyway"
 msgstr "Odpovedať i tak"
 
-#: src/plugins/vcalendar/vcalendar.c:1213
+#: src/plugins/vcalendar/vcalendar.c:1188
 msgid "Answer"
 msgstr "Odpovedať"
 
-#: src/plugins/vcalendar/vcalendar.c:1214
+#: src/plugins/vcalendar/vcalendar.c:1189
 msgid "Edit meeting..."
-msgstr "Upraviť stretnutie…"
+msgstr "Upraviť stretnutie..."
 
-#: src/plugins/vcalendar/vcalendar.c:1215
+#: src/plugins/vcalendar/vcalendar.c:1190
 msgid "Cancel meeting..."
-msgstr "Zrušiť stretnutie…"
+msgstr "Zrušiť stretnutie..."
 
-#: src/plugins/vcalendar/vcalendar.c:1216
+#: src/plugins/vcalendar/vcalendar.c:1191
 msgid "Launch website"
 msgstr "Pozrieť webovú stránku"
 
-#: src/plugins/vcalendar/vcalendar.c:1220
+#: src/plugins/vcalendar/vcalendar.c:1195
 msgid "You are already busy at this time."
 msgstr "V tej dobe ste obsadený."
 
-#: src/plugins/vcalendar/vcalendar.c:1259
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1727
+#: src/plugins/vcalendar/vcalendar.c:1234
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1613
 msgid "Event:"
 msgstr "Udalosť:"
 
-#: src/plugins/vcalendar/vcalendar.c:1260
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1705
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1716
+#: src/plugins/vcalendar/vcalendar.c:1235
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1591
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1602
 msgid "Organizer:"
 msgstr "Organizátor:"
 
-#: src/plugins/vcalendar/vcalendar.c:1261
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1708
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1718
+#: src/plugins/vcalendar/vcalendar.c:1236
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1594
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1604
 msgid "Location:"
 msgstr "Miesto:"
 
-#: src/plugins/vcalendar/vcalendar.c:1262
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1706
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1717
+#: src/plugins/vcalendar/vcalendar.c:1237
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1592
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1603
 msgid "Summary:"
 msgstr "Zhrnutie:"
 
-#: src/plugins/vcalendar/vcalendar.c:1263
+#: src/plugins/vcalendar/vcalendar.c:1238
 msgid "Starting:"
 msgstr "Začiatok:"
 
-#: src/plugins/vcalendar/vcalendar.c:1264
+#: src/plugins/vcalendar/vcalendar.c:1239
 msgid "Ending:"
 msgstr "Koniec:"
 
-#: src/plugins/vcalendar/vcalendar.c:1266
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1710
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1720
+#: src/plugins/vcalendar/vcalendar.c:1241
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1596
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1606
 msgid "Attendees:"
 msgstr "Účastníci:"
 
-#: src/plugins/vcalendar/vcalendar.c:1268
+#: src/plugins/vcalendar/vcalendar.c:1243
 msgid "Action:"
 msgstr "Akcia:"
 
-#: src/plugins/vcalendar/vcal_folder.c:166
+#: src/plugins/vcalendar/vcal_folder.c:168
 msgid "_New meeting..."
-msgstr "_Nové stretnutie…"
+msgstr "_Nové stretnutie..."
 
-#: src/plugins/vcalendar/vcal_folder.c:167
+#: src/plugins/vcalendar/vcal_folder.c:169
 msgid "_Export calendar..."
-msgstr "_Exportovať kalendár…"
+msgstr "_Exportovať kalendár..."
 
-#: src/plugins/vcalendar/vcal_folder.c:168
+#: src/plugins/vcalendar/vcal_folder.c:170
 msgid "_Subscribe to Webcal..."
-msgstr "Prihlá_siť sa do Webcal…"
+msgstr "Prihlá_siť sa do Webcal..."
 
-#: src/plugins/vcalendar/vcal_folder.c:170
+#: src/plugins/vcalendar/vcal_folder.c:172
 msgid "_Rename..."
-msgstr "P_remenovať…"
+msgstr "P_remenovať..."
 
-#: src/plugins/vcalendar/vcal_folder.c:171
+#: src/plugins/vcalendar/vcal_folder.c:173
 msgid "U_pdate subscriptions"
 msgstr "Aktualizovať _prihlásenia"
 
-#: src/plugins/vcalendar/vcal_folder.c:172
+#: src/plugins/vcalendar/vcal_folder.c:174
 msgid "_List view"
 msgstr "Zobrazenie _zoznamu"
 
-#: src/plugins/vcalendar/vcal_folder.c:173
+#: src/plugins/vcalendar/vcal_folder.c:175
 msgid "_Week view"
 msgstr "_Týždenný pohľad"
 
-#: src/plugins/vcalendar/vcal_folder.c:174
+#: src/plugins/vcalendar/vcal_folder.c:176
 msgid "_Month view"
 msgstr "_Mesačný pohľad"
 
-#: src/plugins/vcalendar/vcal_folder.c:1101
+#: src/plugins/vcalendar/vcal_folder.c:1103
 msgid "Meetings"
 msgstr "Stretnutia"
 
-#: src/plugins/vcalendar/vcal_folder.c:1500
+#: src/plugins/vcalendar/vcal_folder.c:1502
 msgid "in the past"
 msgstr "v minulosti"
 
-#: src/plugins/vcalendar/vcal_folder.c:1503
+#: src/plugins/vcalendar/vcal_folder.c:1505
 msgid "today"
 msgstr "dnes"
 
-#: src/plugins/vcalendar/vcal_folder.c:1506
+#: src/plugins/vcalendar/vcal_folder.c:1508
 msgid "tomorrow"
 msgstr "zajtra"
 
-#: src/plugins/vcalendar/vcal_folder.c:1509
+#: src/plugins/vcalendar/vcal_folder.c:1511
 msgid "this week"
 msgstr "tento týždeň"
 
-#: src/plugins/vcalendar/vcal_folder.c:1512
+#: src/plugins/vcalendar/vcal_folder.c:1514
 msgid "later"
 msgstr "neskôr"
 
-#: src/plugins/vcalendar/vcal_folder.c:1516
+#: src/plugins/vcalendar/vcal_folder.c:1518
 #, c-format
 msgid ""
 "\n"
@@ -13703,17 +13834,21 @@ msgstr ""
 "\n"
 "Toto sú plánované udalosti %s:\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1611
+#: src/plugins/vcalendar/vcal_folder.c:1615
 #, 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:1629
+#: src/plugins/vcalendar/vcal_folder.c:1627
+msgid "403 (Unauthorised)"
+msgstr "403 (Neautorizované)"
+
+#: src/plugins/vcalendar/vcal_folder.c:1633
 #, c-format
 msgid "Error %ld"
 msgstr "Chyba %ld"
 
-#: src/plugins/vcalendar/vcal_folder.c:1811
+#: src/plugins/vcalendar/vcal_folder.c:1815
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -13726,7 +13861,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1837
+#: src/plugins/vcalendar/vcal_folder.c:1846
 #, c-format
 msgid ""
 "This URL does not look like a Webcal URL:\n"
@@ -13737,130 +13872,130 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1868
-#: src/plugins/vcalendar/vcal_folder.c:1871
+#: src/plugins/vcalendar/vcal_folder.c:1877
+#: src/plugins/vcalendar/vcal_folder.c:1880
 #, c-format
 msgid "Could not create directory %s"
 msgstr "Nemožno vytvoriť adresár %s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1911
+#: src/plugins/vcalendar/vcal_folder.c:1920
 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:1922
+#: src/plugins/vcalendar/vcal_folder.c:1931
 #, c-format
 msgid "Fetching calendar for %s..."
-msgstr "Prijímanie kalendára pre %s…"
+msgstr "Prijímanie kalendára pre %s..."
 
-#: src/plugins/vcalendar/vcal_folder.c:1923
+#: src/plugins/vcalendar/vcal_folder.c:1932
 msgid "new subscription"
 msgstr "nové prihlásenie"
 
-#: src/plugins/vcalendar/vcal_folder.c:1934
+#: src/plugins/vcalendar/vcal_folder.c:1943
 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:1946
+#: src/plugins/vcalendar/vcal_folder.c:1955
 msgid "Subscribe to Webcal"
 msgstr "Prihlásiť sa do Webcal"
 
-#: src/plugins/vcalendar/vcal_folder.c:1946
-msgid "Enter the WebCal URL:"
-msgstr "Zadajte WebCal URL:"
+#: src/plugins/vcalendar/vcal_folder.c:1955
+msgid "Enter the Webcal URL:"
+msgstr "Zadajte URL WebCal:"
 
-#: src/plugins/vcalendar/vcal_folder.c:1958
+#: src/plugins/vcalendar/vcal_folder.c:1967
 msgid "Could not parse the URL."
 msgstr "Nemožno spracovať URL."
 
-#: src/plugins/vcalendar/vcal_folder.c:1986
+#: src/plugins/vcalendar/vcal_folder.c:1995
 msgid "Do you really want to unsubscribe?"
 msgstr "Naozaj sa chcete odhlásiť?"
 
-#: src/plugins/vcalendar/vcal_folder.c:1987
+#: src/plugins/vcalendar/vcal_folder.c:1996
 msgid "Delete subscription"
 msgstr "Odstrániť prihlásenie"
 
-#: src/plugins/vcalendar/vcal_manager.c:110
+#: src/plugins/vcalendar/vcal_manager.c:111
 msgid "accepted"
 msgstr "prijaté"
 
-#: src/plugins/vcalendar/vcal_manager.c:111
+#: src/plugins/vcalendar/vcal_manager.c:112
 msgid "tentatively accepted"
 msgstr "nezáväzne prijaté"
 
-#: src/plugins/vcalendar/vcal_manager.c:112
+#: src/plugins/vcalendar/vcal_manager.c:113
 msgid "declined"
 msgstr "odmietnuté"
 
-#: src/plugins/vcalendar/vcal_manager.c:113
+#: src/plugins/vcalendar/vcal_manager.c:114
 msgid "did not answer"
 msgstr "neodpovedal"
 
-#: src/plugins/vcalendar/vcal_manager.c:144
+#: src/plugins/vcalendar/vcal_manager.c:145
 msgid "individual"
 msgstr "individuálne"
 
-#: src/plugins/vcalendar/vcal_manager.c:145
+#: src/plugins/vcalendar/vcal_manager.c:146
 msgid "group"
 msgstr "skupina"
 
-#: src/plugins/vcalendar/vcal_manager.c:146
+#: src/plugins/vcalendar/vcal_manager.c:147
 msgid "resource"
 msgstr "zdroj"
 
-#: src/plugins/vcalendar/vcal_manager.c:147
+#: src/plugins/vcalendar/vcal_manager.c:148
 msgid "room"
 msgstr "miestnosť"
 
-#: src/plugins/vcalendar/vcal_manager.c:558
+#: src/plugins/vcalendar/vcal_manager.c:560
 msgid "Past"
 msgstr "V minulosti"
 
-#: src/plugins/vcalendar/vcal_manager.c:561
+#: src/plugins/vcalendar/vcal_manager.c:563
 msgid "Today"
 msgstr "Dnes"
 
-#: src/plugins/vcalendar/vcal_manager.c:564
+#: src/plugins/vcalendar/vcal_manager.c:566
 msgid "Tomorrow"
 msgstr "Zajtra"
 
-#: src/plugins/vcalendar/vcal_manager.c:567
+#: src/plugins/vcalendar/vcal_manager.c:569
 msgid "This week"
 msgstr "Tento týždeň"
 
-#: src/plugins/vcalendar/vcal_manager.c:570
+#: src/plugins/vcalendar/vcal_manager.c:572
 msgid "Later"
 msgstr "Neskôr"
 
-#: src/plugins/vcalendar/vcal_manager.c:1246
+#: src/plugins/vcalendar/vcal_manager.c:1248
 msgid "Accepted: "
-msgstr "Prijaté:"
+msgstr "Prijaté: "
 
-#: src/plugins/vcalendar/vcal_manager.c:1248
+#: src/plugins/vcalendar/vcal_manager.c:1250
 msgid "Declined: "
-msgstr "Odmietnuté:"
+msgstr "Odmietnuté: "
 
-#: src/plugins/vcalendar/vcal_manager.c:1250
+#: src/plugins/vcalendar/vcal_manager.c:1252
 msgid "Tentatively Accepted: "
-msgstr "Nezáväzne prijaté:"
+msgstr "Nezáväzne prijaté: "
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:307
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:308
 msgid "Individual"
 msgstr "Individuálne"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:309
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:310
 msgid "Resource"
 msgstr "Zdroj"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:310
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:311
 msgid "Room"
 msgstr "Miestnosť"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:323
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:324
 msgid "Add..."
-msgstr "Pridať…"
+msgstr "Pridať..."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:779
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:728
 msgid ""
 "The following people are busy at the time of your planned meeting:\n"
 "- "
@@ -13868,62 +14003,62 @@ msgstr ""
 "Nasledujúca osoba(y) je v čase vami plánovaného stretnutia obsadená:\n"
 "- "
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:780
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:869
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:955
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:729
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:818
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:904
 msgid "You"
 msgstr "Vy"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:781
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:730
 msgid "You are busy at the time of your planned meeting"
 msgstr "V čase plánovaného stretnutia ste zaneprázdnený"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:783
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:732
 #, c-format
 msgid "%s is busy at the time of your planned meeting"
 msgstr "%s je v čase plánovaného stretnutia ste zaneprázdnený"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:785
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:734
 #, c-format
 msgid "%d hour sooner"
 msgstr "%d hodinu skôr"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:787
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:736
 #, c-format
 msgid "%d hours sooner"
 msgstr "%d hodín skôr"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:789
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:738
 #, c-format
 msgid "%d hours and %d minutes sooner"
 msgstr "%d hodín a %d minúť skôr"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:791
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:740
 #, c-format
 msgid "%d minutes sooner"
 msgstr "%d minút skôr"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:796
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:745
 #, c-format
 msgid "%d hour later"
 msgstr "%d hodinu neskôr"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:798
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:747
 #, c-format
 msgid "%d hours later"
 msgstr "%d hodím neskôr"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:800
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:749
 #, c-format
 msgid "%d hours and %d minutes later"
 msgstr "%d hodín a %d minút neskôr"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:802
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:751
 #, c-format
 msgid "%d minutes later"
 msgstr "%d minúť neskôr"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:808
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:757
 #, c-format
 msgid ""
 "\n"
@@ -13934,7 +14069,7 @@ msgstr ""
 "\n"
 "Všetci budú dostupní %s alebo %s."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:810
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:759
 #, c-format
 msgid ""
 "\n"
@@ -13945,7 +14080,7 @@ msgstr ""
 "\n"
 "Všetci budú dostupní %s."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:812
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:761
 msgid ""
 "\n"
 "\n"
@@ -13957,74 +14092,74 @@ msgstr ""
 "Nie je možné stretnúť sa so všetkými v predchádzajúcich alebo nasledujúcich "
 "6 hodinách."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:817
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:766
 #, c-format
 msgid "would be available %s or %s"
 msgstr "bude dostupný %s alebo %s"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:819
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:768
 #, c-format
 msgid "would be available %s"
 msgstr "bude dostupný %s"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:821
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:882
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:952
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:770
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:831
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:901
 msgid "not available"
 msgstr "nedostupný"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:824
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:773
 #, c-format
 msgid ", but would be available %s or %s."
 msgstr ", ale bude dostupný %s alebo %s."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:826
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:775
 #, c-format
 msgid ", but would be available %s."
 msgstr ", ale bude dostupný %s."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:828
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:777
 msgid ", and isn't available in the previous or next 6 hours."
 msgstr ", a nebude dostupný ani predchádzajúcich, ani nasledujúcich 6 hodín."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:885
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:834
 msgid "available"
 msgstr "dostupný"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:887
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1136
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:836
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1087
 msgid "Free/busy retrieval failed"
 msgstr "Zlyhalo získanie voľný/obsadený"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:969
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:918
 msgid "Not everyone is available"
 msgstr "Nikto nie je dostupný"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:970
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:919
 msgid "Send anyway"
 msgstr "Poslať i tak"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:981
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:930
 msgid "Not everyone is available. See tooltips for more info..."
 msgstr ""
-"Nikto nie je dostupný. Pozrite si nástrojové tipy s ďalšími informáciami…"
+"Nikto nie je dostupný. Pozrite si nástrojové tipy s ďalšími informáciami..."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1118
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1069
 #, c-format
 msgid "Fetching planning for %s..."
-msgstr "Prijímanie plánovania pre %s…"
+msgstr "Prijímanie plánovania pre %s..."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1145
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1096
 msgid "Available"
 msgstr "Dostupný"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1158
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1165
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1173
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1109
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1116
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1124
 msgid "Everyone is available."
 msgstr "Všetci sú dostupní."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1174
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1125
 msgid ""
 "Everyone seems available, but some free/busy information failed to be "
 "retrieved."
@@ -14032,7 +14167,7 @@ msgstr ""
 "Všetci vyzerajú byť dostupní, ale niektoré informácie o dostupnosti sa "
 "nepodarilo získať."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1340
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1295
 msgid ""
 "Could not send the meeting invitation.\n"
 "Check the recipients."
@@ -14040,42 +14175,42 @@ msgstr ""
 "Nemožno poslať pozvánku na stretnutie.\n"
 "Skontrolujte adresárov."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1461
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1376
 msgid "Save & Send"
 msgstr "Uložiť a Poslať"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1462
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1377
 msgid "Check availability"
 msgstr "Overiť dostupnosť"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1585
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1471
 msgid "Starts at:"
 msgstr "Začína o:"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1591
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1615
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1477
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1501 src/prefs_matcher.c:771
 msgid "on:"
 msgstr "o:"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1609
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1495
 msgid "Ends at:"
 msgstr "Končí o:"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1650
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1536
 msgid "New meeting"
 msgstr "Nové stretnutie"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1652
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1538
 #, c-format
 msgid "%s - Edit meeting"
 msgstr "%s - Upravuje stretnutie"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1707
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1731
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1593
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1617
 msgid "Time:"
 msgstr "Čas:"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1864
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1739
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -14083,7 +14218,7 @@ msgstr[0] "%d hodina"
 msgstr[1] "%d hodiny"
 msgstr[2] "%d hodín"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1867
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1742
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -14091,12 +14226,12 @@ msgstr[0] "%d minúta"
 msgstr[1] "%d minúty"
 msgstr[2] "%d minút"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1878
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1753
 #, c-format
 msgid "Upcoming event: %s"
 msgstr "Nadchádzajúca udalosť: %s"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1879
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1754
 #, c-format
 msgid ""
 "You have a meeting or event soon.\n"
@@ -14113,7 +14248,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1896
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1771
 #, c-format
 msgid "Remind me in %d minute"
 msgid_plural "Remind me in %d minutes"
@@ -14121,32 +14256,32 @@ msgstr[0] "Pripomeň mi za %d minútu"
 msgstr[1] "Pripomeň mi za %d minúty"
 msgstr[2] "Pripomeň mi za %d minút"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2022
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1897
 msgid "Empty calendar"
 msgstr "Prázdny kalendár"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2023
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1898
 msgid "There is nothing to export."
 msgstr "Nie je čo exportovať."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2063
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1938
 msgid "Could not export the calendar."
 msgstr "Nemožno exportovať kalendár."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2080
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1955
 msgid "Export calendar to ICS"
 msgstr "Export kalendára do ICS"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2103
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1978
 #, c-format
 msgid "Couldn't export calendar to '%s'\n"
 msgstr "Nemožno exportovať kalendár do „%s”\n"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2219
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2094
 msgid "Could not export the freebusy info."
 msgstr "Nemožno exportovať informácie o voľný/obsadený."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2251
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2126
 #, c-format
 msgid "Couldn't export free/busy to '%s'\n"
 msgstr "Nemožno exportovať voľný/obsadený do „%s”\n"
@@ -14225,7 +14360,7 @@ msgstr "Príkaz, spustený po exporte voľný/obsadený"
 
 #: src/plugins/vcalendar/vcal_prefs.c:559
 msgid "Get free/busy status of others from"
-msgstr "Získať stav voľný/obsadený ostatných z "
+msgstr "Získať stav voľný/obsadený ostatných z"
 
 #: src/plugins/vcalendar/vcal_prefs.c:567
 #, c-format
@@ -14240,107 +14375,107 @@ msgstr ""
 msgid "SSL/TLS options"
 msgstr "Voľby SSL/TLS"
 
-#: src/pop.c:152
+#: src/pop.c:153
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "V pozdrave nebola nájdená vyžadovaná APOP časová značka\n"
 
-#: src/pop.c:159
+#: src/pop.c:160
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Chybná časová značka v pozdrave\n"
 
-#: src/pop.c:166
+#: src/pop.c:167
 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
+#: src/pop.c:191 src/pop.c:218
 msgid "POP protocol error\n"
 msgstr "Chyba protokolu POP\n"
 
-#: src/pop.c:263
+#: src/pop.c:264
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "neplatná UIDL odpoveď: %s\n"
 
-#: src/pop.c:841
+#: src/pop.c:843
 #, c-format
 msgid "POP: Deleting expired message %d [%s]\n"
 msgstr "POP: Odstraňujem starú správu %d [%s]\n"
 
-#: src/pop.c:857
+#: src/pop.c:859
 #, c-format
 msgid "POP: Skipping message %d [%s] (%d bytes)\n"
 msgstr "POP: Preskakujem správu %d [%s] (%d B)\n"
 
-#: src/pop.c:889
+#: src/pop.c:891
 msgid "mailbox is locked\n"
 msgstr "poštová schránka je zamknutá\n"
 
-#: src/pop.c:892
+#: src/pop.c:894
 msgid "Session timeout\n"
 msgstr "Čas spojenia vypršal\n"
 
-#: src/pop.c:911
+#: src/pop.c:913
 msgid "command not supported\n"
 msgstr "príkaz nie je podporovaný\n"
 
-#: src/pop.c:916
+#: src/pop.c:918
 msgid "error occurred on POP session\n"
 msgstr "nastala chyba relácie POP\n"
 
-#: src/pop.c:1111
+#: src/pop.c:1113
 msgid "TOP command unsupported\n"
-msgstr "príkaz TOP nie je podporovaný\n"
+msgstr "Príkaz TOP nie je podporovaný\n"
 
-#: src/prefs_account.c:335 src/prefs_account.c:1487 src/prefs_account.c:2500
+#: src/prefs_account.c:364 src/prefs_account.c:1559 src/prefs_account.c:2635
 msgid "POP"
 msgstr "POP"
 
-#: src/prefs_account.c:336 src/prefs_account.c:1600 src/prefs_account.c:2515
-#: src/wizard.c:1499
+#: src/prefs_account.c:365 src/prefs_account.c:1672 src/prefs_account.c:2650
+#: src/wizard.c:1501
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/prefs_account.c:337
+#: src/prefs_account.c:366
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
-#: src/prefs_account.c:338 src/wizard.c:1500
+#: src/prefs_account.c:367 src/wizard.c:1502
 msgid "Local mbox file"
 msgstr "Lokálna schránka mbox"
 
-#: src/prefs_account.c:339
+#: src/prefs_account.c:368
 msgid "None (SMTP only)"
 msgstr "Žiadne (len SMTP)"
 
-#: src/prefs_account.c:1040
+#: src/prefs_account.c:1131
 msgid "Name of account"
 msgstr "Názov účtu"
 
-#: src/prefs_account.c:1049
+#: src/prefs_account.c:1140
 msgid "Set as default"
 msgstr "Nastaviť ako predvolené"
 
-#: src/prefs_account.c:1057
+#: src/prefs_account.c:1148
 msgid "Personal information"
 msgstr "Osobné informácie"
 
-#: src/prefs_account.c:1066
+#: src/prefs_account.c:1157
 msgid "Full name"
 msgstr "Celé meno"
 
-#: src/prefs_account.c:1072
+#: src/prefs_account.c:1163
 msgid "Mail address"
 msgstr "Emailová adresa"
 
-#: src/prefs_account.c:1135 src/wizard.c:1523
+#: src/prefs_account.c:1226 src/wizard.c:1525
 msgid "Auto-configure"
 msgstr "Automatická konfigurácia"
 
-#: src/prefs_account.c:1137 src/wizard.c:1524
+#: src/prefs_account.c:1228 src/wizard.c:1526
 msgid "Cancel"
 msgstr "Zrušiť"
 
-#: src/prefs_account.c:1154
+#: src/prefs_account.c:1245
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP and News support."
@@ -14348,77 +14483,77 @@ msgstr ""
 "Varovanie: táto verzia Claws Mail\n"
 "bola zostavená bez podpory protokolu IMAP a News."
 
-#: src/prefs_account.c:1185
+#: src/prefs_account.c:1276
 msgid "This server requires authentication"
 msgstr "Tento server vyžaduje autentifikáciu"
 
-#: src/prefs_account.c:1192
+#: src/prefs_account.c:1283
 msgid "Authenticate on connect"
 msgstr "Autentifikovať pri pripojení"
 
-#: src/prefs_account.c:1254
+#: src/prefs_account.c:1345
 msgid "News server"
 msgstr "News server"
 
-#: src/prefs_account.c:1260
+#: src/prefs_account.c:1351
 msgid "Server for receiving"
 msgstr "Server pre prijímanie"
 
-#: src/prefs_account.c:1266
+#: src/prefs_account.c:1357
 msgid "Local mailbox"
 msgstr "Lokálna poštová schránka"
 
-#: src/prefs_account.c:1273
+#: src/prefs_account.c:1364
 msgid "SMTP server (send)"
 msgstr "SMTP server (odosielanie)"
 
-#: src/prefs_account.c:1281
+#: src/prefs_account.c:1372
 msgid "Use mail command rather than SMTP server"
 msgstr "Použiť príkaz miesto SMTP serveru"
 
-#: src/prefs_account.c:1290
+#: src/prefs_account.c:1381
 msgid "command to send mails"
 msgstr "príkaz na odosielanie pošty"
 
-#: src/prefs_account.c:1365
+#: src/prefs_account.c:1454
 #, c-format
 msgid "Account%d"
 msgstr "Účet%d"
 
-#: src/prefs_account.c:1461
+#: src/prefs_account.c:1533
 msgid "Local"
 msgstr "Lokálne"
 
-#: src/prefs_account.c:1467 src/prefs_account.c:1556
+#: src/prefs_account.c:1539 src/prefs_account.c:1628
 msgid "Default Inbox"
 msgstr "Predvolený inbox"
 
-#: src/prefs_account.c:1474 src/prefs_account.c:1481 src/prefs_account.c:1563
-#: src/prefs_account.c:1570
+#: src/prefs_account.c:1546 src/prefs_account.c:1553 src/prefs_account.c:1635
+#: src/prefs_account.c:1642
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Nefiltrované správy budú umiestnené v tejto zložke"
 
-#: src/prefs_account.c:1489
+#: src/prefs_account.c:1561
 msgid "Use secure authentication (APOP)"
 msgstr "Použiť bezpečnú autentifikáciu (APOP)"
 
-#: src/prefs_account.c:1492
+#: src/prefs_account.c:1564
 msgid "Remove messages on server when received"
 msgstr "Vymazať správy na servere po ich prijatí"
 
-#: src/prefs_account.c:1503
+#: src/prefs_account.c:1575
 msgid "Remove after"
 msgstr "Vymazať po"
 
-#: src/prefs_account.c:1510 src/prefs_account.c:1520
+#: src/prefs_account.c:1582 src/prefs_account.c:1592
 msgid "0 days and 0 hours : remove immediately"
 msgstr "0 dní a 0 hodín: mazať ihneď"
 
-#: src/prefs_account.c:1533
+#: src/prefs_account.c:1605
 msgid "Receive size limit"
 msgstr "Prijať správu veľkú najviac"
 
-#: src/prefs_account.c:1536
+#: src/prefs_account.c:1608
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
@@ -14426,82 +14561,94 @@ msgstr ""
 "Správy väčšie ako táto hodnota budú stiahnuté čiastočne. Po ich zvolení ich "
 "bude možné buď stiahnuť úplne, alebo ich odstrániť."
 
-#: src/prefs_account.c:1576 src/prefs_account.c:2530
+#: src/prefs_account.c:1648 src/prefs_account.c:2665
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account.c:1583
+#: src/prefs_account.c:1655
 msgid "Maximum number of articles to download"
 msgstr "Maximálny počet príspevkov na stiahnutie"
 
-#: src/prefs_account.c:1593
+#: src/prefs_account.c:1665
 msgid "unlimited if 0 is specified"
 msgstr "neobmedzené, ak je zadané 0"
 
-#: src/prefs_account.c:1618
+#: src/prefs_account.c:1690
 msgid "Plain text"
 msgstr "Prostý text"
 
-#: src/prefs_account.c:1631
+#: src/prefs_account.c:1703
 msgid "IMAP server directory"
 msgstr "Zložka servera IMAP"
 
-#: src/prefs_account.c:1635
+#: src/prefs_account.c:1707
 msgid "(usually empty)"
 msgstr "(zväčša prázdne)"
 
-#: src/prefs_account.c:1649
+#: src/prefs_account.c:1721
 msgid "Show subscribed folders only"
 msgstr "Zobraziť len odoberané zložky"
 
-#: src/prefs_account.c:1656
+#: src/prefs_account.c:1728
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr "Na šírku pásma efektívny režim (bráni prijímaniu vzdialených značiek)"
 
-#: src/prefs_account.c:1658
+#: src/prefs_account.c:1730
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr ""
 "V tomto režime je prenášaných menej dát, ale komunikácia s niektorými "
 "servermi môže byť pomalšia."
 
-#: src/prefs_account.c:1665
+#: src/prefs_account.c:1737 src/prefs_receive.c:164
+msgid "Automatic checking"
+msgstr "Automatická kontrola"
+
+#: src/prefs_account.c:1740
+msgid "Use global settings"
+msgstr "Použiť globálne nastavenia"
+
+#: src/prefs_account.c:1746 src/prefs_receive.c:171
+msgid "Check for new mail every"
+msgstr "Automaticky kontrolovať novú poštu každých"
+
+#: src/prefs_account.c:1785
 msgid "Filter messages on receiving"
 msgstr "Filtrovať správy pri prijatí"
 
-#: src/prefs_account.c:1672
+#: src/prefs_account.c:1801
 msgid "Allow filtering using plugins on receiving"
 msgstr "Filtrovať správy pri prijatí aj pomocou zásuvných modulov"
 
-#: src/prefs_account.c:1676
+#: src/prefs_account.c:1805
 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:1759 src/prefs_customheader.c:208
-#: src/prefs_matcher.c:623 src/prefs_matcher.c:1970 src/prefs_matcher.c:1992
+#: src/prefs_account.c:1894 src/prefs_customheader.c:210
+#: src/prefs_matcher.c:634 src/prefs_matcher.c:2014 src/prefs_matcher.c:2042
 msgid "Header"
 msgstr "Hlavička"
 
-#: src/prefs_account.c:1761
+#: src/prefs_account.c:1896
 msgid "Generate Message-ID"
 msgstr "Generovať hlavičku Message-ID"
 
-#: src/prefs_account.c:1764
+#: src/prefs_account.c:1899
 msgid "Send account mail address in Message-ID"
 msgstr "Poslať emailovú adresu účtu v Message-ID"
 
-#: src/prefs_account.c:1767
+#: src/prefs_account.c:1902
 msgid "Add user agent header"
 msgstr "Pridať hlavičku „user agent”"
 
-#: src/prefs_account.c:1774
+#: src/prefs_account.c:1909
 msgid "Add user-defined header"
 msgstr "Pridať používateľom definované hlavičky"
 
-#: src/prefs_account.c:1789
+#: src/prefs_account.c:1924
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autentifikácia SMTP (SMTP AUTH)"
 
-#: src/prefs_account.c:1887
+#: src/prefs_account.c:2022
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -14509,164 +14656,199 @@ msgstr ""
 "Ak necháte tieto polia prázdne, bude použité to isté prihlasovacie meno a "
 "heslo ako pri prijímaní."
 
-#: src/prefs_account.c:1898
+#: src/prefs_account.c:2033
 msgid "Authenticate with POP before sending"
 msgstr "Autentifikovať cez POP pred odosielaním"
 
-#: src/prefs_account.c:1913
-msgid "POP authentication timeout: "
-msgstr "Časový limit autentifikácie POP: "
+#: src/prefs_account.c:2048
+msgid "POP authentication timeout"
+msgstr "Časový limit autentifikácie POP"
 
-#: src/prefs_account.c:2001 src/prefs_account.c:2047
+#: src/prefs_account.c:2136 src/prefs_account.c:2182
 msgid "Signature"
 msgstr "Podpis"
 
-#: src/prefs_account.c:2004
+#: src/prefs_account.c:2139
 msgid "Automatically insert signature"
 msgstr "Automaticky vložiť podpis"
 
-#: src/prefs_account.c:2009
+#: src/prefs_account.c:2144
 msgid "Signature separator"
 msgstr "Oddeľovač podpisu"
 
-#: src/prefs_account.c:2034
+#: src/prefs_account.c:2169
 msgid "Command output"
 msgstr "Výstup príkazu"
 
-#: src/prefs_account.c:2067
+#: src/prefs_account.c:2202
 msgid "Automatically set the following addresses"
 msgstr "Automaticky nastaviť nasledujúce adresy"
 
-#: src/prefs_account.c:2119
+#: src/prefs_account.c:2254
 msgid "Spell check dictionaries"
 msgstr "Slovníky kontroly preklepov"
 
-#: src/prefs_account.c:2129 src/prefs_folder_item.c:1104
+#: src/prefs_account.c:2264 src/prefs_folder_item.c:1114
 #: src/prefs_spelling.c:162
 msgid "Default dictionary"
 msgstr "Predvolený slovník"
 
-#: src/prefs_account.c:2142 src/prefs_folder_item.c:1138
+#: src/prefs_account.c:2277 src/prefs_folder_item.c:1148
 #: src/prefs_spelling.c:174
 msgid "Default alternate dictionary"
 msgstr "Prednastavený alternatívny slovník"
 
-#: src/prefs_account.c:2228 src/prefs_account.c:3423
-#: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1449
-#: src/prefs_folder_item.c:1842 src/prefs_quote.c:119 src/prefs_quote.c:237
+#: src/prefs_account.c:2363 src/prefs_account.c:3776
+#: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1539
+#: src/prefs_folder_item.c:1924 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:332 src/prefs_wrapping.c:152
 msgid "Compose"
 msgstr "Nová"
 
-#: src/prefs_account.c:2243 src/prefs_folder_item.c:1477 src/prefs_quote.c:134
+#: src/prefs_account.c:2378 src/prefs_folder_item.c:1567 src/prefs_quote.c:134
 #: src/toolbar.c:490
 msgid "Reply"
 msgstr "Odpovedať"
 
-#: src/prefs_account.c:2258 src/prefs_filtering_action.c:191
-#: src/prefs_folder_item.c:1505 src/prefs_quote.c:149 src/toolbar.c:495
+#: src/prefs_account.c:2393 src/prefs_filtering_action.c:185
+#: src/prefs_folder_item.c:1595 src/prefs_quote.c:149 src/toolbar.c:495
 msgid "Forward"
 msgstr "Poslať ďalej"
 
-#: src/prefs_account.c:2305
+#: src/prefs_account.c:2440
 msgid "Default privacy system"
 msgstr "Predvolený systém súkromia"
 
-#: src/prefs_account.c:2334
+#: src/prefs_account.c:2469 src/prefs_folder_item.c:1188
 msgid "Always sign messages"
 msgstr "Vždy podpisovať správy"
 
-#: src/prefs_account.c:2336
+#: src/prefs_account.c:2471 src/prefs_folder_item.c:1220
 msgid "Always encrypt messages"
 msgstr "Vždy šifrovať správy"
 
-#: src/prefs_account.c:2338
+#: src/prefs_account.c:2473
 msgid "Always sign messages when replying to a signed message"
 msgstr "Vždy podpísať správy pri odpovedi na podpísanú správu"
 
-#: src/prefs_account.c:2341
+#: src/prefs_account.c:2476
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Vždy šifrovať odpoveď na šifrovanú správu"
 
-#: src/prefs_account.c:2344
+#: src/prefs_account.c:2479
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr "Zašifrovať odoslané správy aj vlastným kľúčom"
 
-#: src/prefs_account.c:2346
+#: src/prefs_account.c:2481
 msgid "Save sent encrypted messages as clear text"
 msgstr "Uložiť odoslané zašifrované správy ako prostý text"
 
-#: src/prefs_account.c:2504 src/prefs_account.c:2519 src/prefs_account.c:2533
+#: src/prefs_account.c:2639 src/prefs_account.c:2654 src/prefs_account.c:2668
 msgid "Don't use SSL/TLS"
 msgstr "Nepoužívať SSL/TLS"
 
-#: src/prefs_account.c:2507 src/prefs_account.c:2522 src/prefs_account.c:2542
-#: src/prefs_account.c:2553
+#: src/prefs_account.c:2642 src/prefs_account.c:2657 src/prefs_account.c:2677
+#: src/prefs_account.c:2688
 msgid "Use SSL/TLS"
 msgstr "Použiť SSL/TLS"
 
-#: src/prefs_account.c:2510 src/prefs_account.c:2525 src/prefs_account.c:2556
+#: src/prefs_account.c:2645 src/prefs_account.c:2660 src/prefs_account.c:2691
 msgid "Use STARTTLS command to start encrypted session"
 msgstr "Použiť príkaz STARTTLS na vytvorenie šifrovanej relácie"
 
-#: src/prefs_account.c:2546
+#: src/prefs_account.c:2681
 msgid "Send (SMTP)"
 msgstr "Odoslať (SMTP)"
 
-#: src/prefs_account.c:2550
+#: src/prefs_account.c:2685
 msgid "Don't use SSL/TLS (but, if necessary, use STARTTLS)"
 msgstr "Nepoužívať SSL/TLS (v prípade potreby použiť STARTTLS)"
 
-#: src/prefs_account.c:2561
+#: src/prefs_account.c:2696
 msgid "Client certificates"
 msgstr "Certifikáty klienta"
 
-#: src/prefs_account.c:2569
+#: src/prefs_account.c:2704
 msgid "Certificate for receiving"
 msgstr "Certifikát na prijímanie"
 
-#: src/prefs_account.c:2574 src/prefs_account.c:2576 src/prefs_account.c:2602
-#: src/prefs_account.c:2604
+#: src/prefs_account.c:2709 src/prefs_account.c:2711 src/prefs_account.c:2737
+#: src/prefs_account.c:2739
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr "Súbor klientského certifikátu ako súbor PKCS12 alebo PEM"
 
-#: src/prefs_account.c:2597
+#: src/prefs_account.c:2732
 msgid "Certificate for sending"
 msgstr "Certifikát na odosielanie"
 
-#: src/prefs_account.c:2637
+#: src/prefs_account.c:2772
 msgid "Automatically accept valid SSL/TLS certificates"
 msgstr "Automaticky akceptovať platné certifikáty SSL/TLS"
 
-#: src/prefs_account.c:2640
+#: src/prefs_account.c:2775
 msgid "Use non-blocking SSL/TLS"
 msgstr "Použiť neblokujúce SSL/TLS"
 
-#: src/prefs_account.c:2652
+#: src/prefs_account.c:2787
 msgid "Turn this off if you have SSL/TLS connection problems"
 msgstr "Vypnite túto voľbu ak máte problémy pri spojeniach SSL/TLS"
 
-#: src/prefs_account.c:2787
+#: src/prefs_account.c:2879 src/prefs_proxy.c:73
+msgid "Use proxy server"
+msgstr "Použiť proxy server"
+
+#: src/prefs_account.c:2888
+msgctxt ""
+"In account preferences, referring to whether or not use proxy settings from "
+"common preferences"
+msgid "Use default settings"
+msgstr "Použiť predvolené nastavenia"
+
+#: src/prefs_account.c:2890
+msgid "Use global proxy server settings"
+msgstr "Použiť globálne nastavenia proxy servera"
+
+#: src/prefs_account.c:2927 src/prefs_proxy.c:115 src/wizard.c:1120
+msgid "Use authentication"
+msgstr "Použiť autentifikáciu"
+
+#: src/prefs_account.c:2932 src/prefs_proxy.c:123
+msgid "Username"
+msgstr "Používateľské meno"
+
+#: src/prefs_account.c:2966
+msgid "Use proxy server for sending"
+msgstr "Na odosielanie použiť proxy server"
+
+#: src/prefs_account.c:2968
+msgid ""
+"If disabled, messages will be sent using direct connection to configured "
+"outgoing server, bypassing any configured proxy server."
+msgstr ""
+"Ak je vypnuté, správy budú odoslané priamym spojením s nastaveným serverom "
+"odosielania pošty, bez použitia nastavené servera proxy."
+
+#: src/prefs_account.c:3079
 msgid "SMTP port"
 msgstr "SMTP port"
 
-#: src/prefs_account.c:2794
+#: src/prefs_account.c:3086
 msgid "POP port"
 msgstr "POP port"
 
-#: src/prefs_account.c:2801
+#: src/prefs_account.c:3093
 msgid "IMAP port"
 msgstr "IMAP port"
 
-#: src/prefs_account.c:2808
+#: src/prefs_account.c:3100
 msgid "NNTP port"
 msgstr "NNTP port"
 
-#: src/prefs_account.c:2814
+#: src/prefs_account.c:3106
 msgid "Domain name"
 msgstr "Doménové meno"
 
-#: src/prefs_account.c:2817
+#: src/prefs_account.c:3109
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
@@ -14674,218 +14856,238 @@ msgstr ""
 "Názov domény bude použitý na generovanie Message-ID, a pri pripájaní k "
 "serverom SMTP."
 
-#: src/prefs_account.c:2831
+#: src/prefs_account.c:3123
 msgid "Use command to communicate with server"
 msgstr "Použiť príkaz na komunikáciu so serverom"
 
-#: src/prefs_account.c:2840
+#: src/prefs_account.c:3132
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Označiť správy posielané ďalej ako prečítané a zafarbiť:"
 
-#: src/prefs_account.c:2896
+#: src/prefs_account.c:3185
 msgid "Put sent messages in"
 msgstr "Uložiť odoslané správy do"
 
-#: src/prefs_account.c:2898
+#: src/prefs_account.c:3187
 msgid "Put queued messages in"
 msgstr "Uložiť správy do fronty"
 
-#: src/prefs_account.c:2900
+#: src/prefs_account.c:3189
 msgid "Put draft messages in"
 msgstr "Uložiť koncepty do"
 
-#: src/prefs_account.c:2902
+#: src/prefs_account.c:3191
 msgid "Put deleted messages in"
 msgstr "Uložiť vymazané správy do"
 
-#: src/prefs_account.c:2961
+#: src/prefs_account.c:3248
 msgid "Account name is not entered."
 msgstr "Nebol zadaný názov účtu."
 
-#: src/prefs_account.c:2965
+#: src/prefs_account.c:3252
 msgid "Mail address is not entered."
 msgstr "Nebola zadaná emailová adresa."
 
-#: src/prefs_account.c:2973
+#: src/prefs_account.c:3260
 msgid "SMTP server is not entered."
 msgstr "Nebol zadaný SMTP server."
 
-#: src/prefs_account.c:2978
+#: src/prefs_account.c:3265
 msgid "User ID is not entered."
 msgstr "Nebolo zadané ID používateľa."
 
-#: src/prefs_account.c:2983
+#: src/prefs_account.c:3270
 msgid "POP server is not entered."
 msgstr "Nebol zadaný POP server."
 
-#: src/prefs_account.c:3003
+#: src/prefs_account.c:3290
 msgid "The default Inbox folder doesn't exist."
 msgstr "Predvolená zložka doručených správ neexistuje."
 
-#: src/prefs_account.c:3009
+#: src/prefs_account.c:3296
 msgid "IMAP server is not entered."
 msgstr "Nebol zadaný IMAP server."
 
-#: src/prefs_account.c:3014
+#: src/prefs_account.c:3301
 msgid "NNTP server is not entered."
 msgstr "Nebol zadaný NNTP server."
 
-#: src/prefs_account.c:3020
+#: src/prefs_account.c:3307
 msgid "local mailbox filename is not entered."
 msgstr "Nebol zadaný názov lokálnej schránky."
 
-#: src/prefs_account.c:3026
+#: src/prefs_account.c:3313
 msgid "mail command is not entered."
 msgstr "Nebol zadaný príkaz na odosielanie pošty."
 
-#: src/prefs_account.c:3036
+#: src/prefs_account.c:3323
 msgid "User ID cannot contain a newline character."
 msgstr "ID používateľa nesmie obsahovať znak nového riadku."
 
-#: src/prefs_account.c:3041
+#: src/prefs_account.c:3328
 msgid "Password cannot contain a newline character."
 msgstr "Heslo nesmie obsahovať znak nového riadku."
 
-#: src/prefs_account.c:3069
+#: src/prefs_account.c:3356
 msgid "SMTP user ID cannot contain a newline character."
 msgstr "ID používateľa SMTP nesmie obsahovať znak nového riadku."
 
-#: src/prefs_account.c:3074
+#: src/prefs_account.c:3361
 msgid "SMTP password cannot contain a newline character."
 msgstr "Heslo SMTP nesmie obsahovať znak nového riadku."
 
-#: src/prefs_account.c:3387
+#: src/prefs_account.c:3437
+msgid "domain is not specified."
+msgstr "nie je zadaná doména."
+
+#: src/prefs_account.c:3442
+msgid "sent folder is not selected."
+msgstr "nie je zvolená zložka odoslaných."
+
+#: src/prefs_account.c:3447
+msgid "queue folder is not selected."
+msgstr "nie je zvolená zložka fronty."
+
+#: src/prefs_account.c:3452
+msgid "draft folder is not selected."
+msgstr "nie je zvolená zložka konceptov."
+
+#: src/prefs_account.c:3457
+msgid "trash folder is not selected."
+msgstr "nie je zvolená zložka koša."
+
+#: src/prefs_account.c:3740
 msgid "Receive"
 msgstr "Prijať"
 
-#: src/prefs_account.c:3441 src/prefs_folder_item.c:1858 src/prefs_quote.c:238
+#: src/prefs_account.c:3794 src/prefs_folder_item.c:1940 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Šablóny"
 
-#: src/prefs_account.c:3459
+#: src/prefs_account.c:3812
 msgid "Privacy"
 msgstr "Súkromie"
 
-#: src/prefs_account.c:3571
+#: src/prefs_account.c:3942
 msgid "Advanced"
 msgstr "Rozšírené"
 
-#: src/prefs_account.c:3906
+#: src/prefs_account.c:4291
 msgid "Preferences for new account"
 msgstr "Nastavenie nového účtu"
 
-#: src/prefs_account.c:3908
+#: src/prefs_account.c:4293
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s – Nastavenie účtu"
 
-#: src/prefs_account.c:4029 src/wizard.c:1388
+#: src/prefs_account.c:4412 src/wizard.c:1390
 msgid "Failed (wrong address)"
 msgstr "Zlyhalo (zlá adresa)"
 
-#: src/prefs_account.c:4114
+#: src/prefs_account.c:4497
 msgid "Select signature file"
 msgstr "Vyberte súbor so podpisom"
 
-#: src/prefs_account.c:4132 src/prefs_account.c:4149 src/wizard.c:1065
+#: src/prefs_account.c:4515 src/prefs_account.c:4532 src/wizard.c:1067
 msgid "Select certificate file"
 msgstr "Zvoľte súbor certifikátu"
 
-#: src/prefs_account.c:4245
+#: src/prefs_account.c:4628
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: src/prefs_account.c:4385
+#: src/prefs_account.c:4799
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (zásuvný modul nie je načítaný)"
 
-#: src/prefs_actions.c:223
+#: src/prefs_actions.c:225
 msgid "Actions configuration"
 msgstr "Nastavenie akcií"
 
-#: src/prefs_actions.c:250
+#: src/prefs_actions.c:252
 msgid "Menu name"
 msgstr "Názov menu"
 
-#: src/prefs_actions.c:283
+#: src/prefs_actions.c:285
 msgid "Shell command"
 msgstr "Príkaz shellu"
 
-#: src/prefs_actions.c:293
+#: src/prefs_actions.c:295
 msgid "Filter action"
 msgstr "Filtrovacie akcie"
 
-#: src/prefs_actions.c:299
+#: src/prefs_actions.c:301
 msgid "Edit filter action"
 msgstr "Upraviť filtrovacie akcie"
 
-#: src/prefs_actions.c:327
+#: src/prefs_actions.c:329
 msgid "Append the new action above to the list"
 msgstr "Pridať novú akciu na začiatok zoznamu"
 
-#: src/prefs_actions.c:335
+#: src/prefs_actions.c:337
 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:780 src/prefs_template.c:320
-#: src/prefs_toolbar.c:1069
+#: src/prefs_actions.c:339 src/prefs_filtering_action.c:589
+#: src/prefs_filtering.c:487 src/prefs_matcher.c:804 src/prefs_template.c:320
+#: src/prefs_toolbar.c:1024
 msgid "D_elete"
 msgstr "O_dstrániť"
 
-#: src/prefs_actions.c:345
+#: src/prefs_actions.c:347
 msgid "Delete the selected action from the list"
 msgstr "Zmazať zvolenú akciu zo zoznamu"
 
-#: src/prefs_actions.c:355 src/prefs_filtering.c:503 src/prefs_template.c:338
+#: src/prefs_actions.c:357 src/prefs_filtering.c:504 src/prefs_template.c:338
 msgid "Clear all the input fields in the dialog"
 msgstr "Vymazať všetky vstupné polia dialógu"
 
-#: src/prefs_actions.c:363
+#: src/prefs_actions.c:365
 msgid "Show information on configuring actions"
 msgstr "Zobraziť informácie o konfigurácii akcií"
 
-#: src/prefs_actions.c:394
+#: src/prefs_actions.c:396
 msgid "Move the selected action up"
 msgstr "Posunúť zvolenú akciu vyššie"
 
-#: src/prefs_actions.c:402
+#: src/prefs_actions.c:404
 msgid "Move selected action down"
 msgstr "Posunúť zvolenú akciu nižšie"
 
-#: src/prefs_actions.c:535 src/prefs_filtering_action.c:707
-#: 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_actions.c:537 src/prefs_filtering_action.c:678
+#: src/prefs_filtering.c:839 src/prefs_filtering.c:841
+#: src/prefs_filtering.c:842 src/prefs_filtering.c:952 src/prefs_matcher.c:922
 #: src/prefs_template.c:472
 msgid "(New)"
 msgstr "(Nová)"
 
-#: src/prefs_actions.c:600
+#: src/prefs_actions.c:602
 msgid "Menu name is not set."
 msgstr "Nebol zadaný názov menu."
 
-#: src/prefs_actions.c:605
+#: src/prefs_actions.c:607
 msgid "A leading '/' is not allowed in the menu name."
 msgstr "Lomka „/” nie je na začiatku názvu položky menu povolená."
 
-#: src/prefs_actions.c:610
+#: src/prefs_actions.c:612
 msgid "Colon ':' is not allowed in the menu name."
 msgstr "Dvojbodka „:” nie je v názve menu povolená."
 
-#: src/prefs_actions.c:629
+#: src/prefs_actions.c:631
 msgid "Menu name is too long."
 msgstr "Názov menu je príliš dlhý."
 
-#: src/prefs_actions.c:638
+#: src/prefs_actions.c:640
 msgid "Command-line not set."
 msgstr "Nebol zadaný príkazový riadok."
 
-#: src/prefs_actions.c:643
+#: src/prefs_actions.c:645
 msgid "Menu name and command are too long."
 msgstr "Názov menu a príkazový riadok sú príliš dlhé."
 
-#: src/prefs_actions.c:649
+#: src/prefs_actions.c:651
 #, c-format
 msgid ""
 "The command\n"
@@ -14896,136 +15098,136 @@ msgstr ""
 "%s\n"
 "má syntaktickú chybu."
 
-#: src/prefs_actions.c:707
+#: src/prefs_actions.c:709
 msgid "Delete action"
 msgstr "Zmazať akciu"
 
-#: src/prefs_actions.c:708
+#: src/prefs_actions.c:710
 msgid "Do you really want to delete this action?"
 msgstr "Naozaj chcete zmazať túto akciu?"
 
-#: src/prefs_actions.c:728
+#: src/prefs_actions.c:730
 msgid "Delete all actions"
 msgstr "Zmazať všetky akcie"
 
-#: src/prefs_actions.c:729
+#: src/prefs_actions.c:731
 msgid "Do you really want to delete all the actions?"
 msgstr "Naozaj chcete zmazať všetky akcie?"
 
-#: src/prefs_actions.c:892 src/prefs_actions.c:923 src/prefs_filtering.c:1501
-#: src/prefs_filtering.c:1523 src/prefs_matcher.c:2117 src/prefs_template.c:572
+#: src/prefs_actions.c:894 src/prefs_actions.c:925 src/prefs_filtering.c:1504
+#: src/prefs_filtering.c:1526 src/prefs_matcher.c:2165 src/prefs_template.c:572
 #: src/prefs_template.c:597
 msgid "Entry not saved"
 msgstr "Záznam nebol uložený"
 
-#: src/prefs_actions.c:893 src/prefs_actions.c:924 src/prefs_filtering.c:1502
-#: src/prefs_filtering.c:1524 src/prefs_template.c:573 src/prefs_template.c:598
+#: src/prefs_actions.c:895 src/prefs_actions.c:926 src/prefs_filtering.c:1505
+#: src/prefs_filtering.c:1527 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:894 src/prefs_actions.c:899 src/prefs_actions.c:925
-#: src/prefs_filtering.c:1481 src/prefs_filtering.c:1503
-#: src/prefs_filtering.c:1525 src/prefs_matcher.c:2120 src/prefs_template.c:574
+#: src/prefs_actions.c:896 src/prefs_actions.c:901 src/prefs_actions.c:927
+#: src/prefs_filtering.c:1484 src/prefs_filtering.c:1506
+#: src/prefs_filtering.c:1528 src/prefs_matcher.c:2168 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:897
+#: src/prefs_actions.c:899
 msgid "Actions list not saved"
 msgstr "Zoznam akcií nebol uložený"
 
-#: src/prefs_actions.c:898
+#: src/prefs_actions.c:900
 msgid "The actions list has been modified. Close anyway?"
 msgstr "Zoznam akcií bol zmenený. Zavrieť napriek tomu?"
 
-#: src/prefs_actions.c:968
+#: src/prefs_actions.c:970
 msgid "<span weight=\"bold\" underline=\"single\">Menu name:</span>"
 msgstr "<span weight=\"bold\" underline=\"single\">Názov menu:</span>"
 
-#: src/prefs_actions.c:969
+#: src/prefs_actions.c:971
 msgid "Use / in menu name to make submenus."
 msgstr "Použite „/” v názve menu na tvorbu podmenu."
 
-#: src/prefs_actions.c:971
+#: src/prefs_actions.c:973
 msgid "<span weight=\"bold\" underline=\"single\">Command-line:</span>"
 msgstr "<span weight=\"bold\" underline=\"single\">Príkazový riadok:</span>"
 
-#: src/prefs_actions.c:972
+#: src/prefs_actions.c:974
 msgid "<span weight=\"bold\">Begin with:</span>"
 msgstr "<span weight=\"bold\">Začať s:</span>"
 
-#: src/prefs_actions.c:973
+#: src/prefs_actions.c:975
 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:974
+#: src/prefs_actions.c:976
 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:975
+#: src/prefs_actions.c:977
 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:976
+#: src/prefs_actions.c:978
 msgid "<span weight=\"bold\">End with:</span>"
 msgstr "<span weight=\"bold\">Skončiť s:</span>"
 
-#: src/prefs_actions.c:977
+#: src/prefs_actions.c:979
 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:978
+#: src/prefs_actions.c:980
 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:979
+#: src/prefs_actions.c:981
 msgid "to run command asynchronously"
 msgstr "na asynchrónne vykonanie príkazu"
 
-#: src/prefs_actions.c:980
+#: src/prefs_actions.c:982
 msgid "<span weight=\"bold\">Use:</span>"
 msgstr "<span weight=\"bold\">Použiť:</span>"
 
-#: src/prefs_actions.c:981
+#: src/prefs_actions.c:983
 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:982
+#: src/prefs_actions.c:984
 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:983
+#: src/prefs_actions.c:985
 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:984
+#: src/prefs_actions.c:986
 msgid "for a user provided argument"
 msgstr "pre parameter zadaný používateľom"
 
-#: src/prefs_actions.c:985
+#: src/prefs_actions.c:987
 msgid "for a user provided hidden argument (e.g. password)"
 msgstr "pre skrytý parameter zadaný používateľom (napr. heslo)"
 
-#: src/prefs_actions.c:986
+#: src/prefs_actions.c:988
 msgid "for the text selection"
 msgstr "pre textový výber"
 
-#: src/prefs_actions.c:987
+#: src/prefs_actions.c:989
 msgid "apply filtering actions between {} to selected messages"
 msgstr "aplikuje akcie medzi {} na zvolené správy"
 
-#: src/prefs_actions.c:988
+#: src/prefs_actions.c:990
 msgid "for a literal %"
 msgstr "pre znak %"
 
-#: src/prefs_actions.c:998 src/prefs_themes.c:1088
+#: src/prefs_actions.c:1000 src/prefs_themes.c:1090
 msgid "Actions"
 msgstr "Akcie"
 
-#: src/prefs_actions.c:999
+#: src/prefs_actions.c:1001
 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."
@@ -15033,29 +15235,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:1086 src/prefs_filtering.c:1699
-#: src/prefs_template.c:1113
+#: src/prefs_actions.c:1088 src/prefs_filtering.c:1702
+#: src/prefs_template.c:1114
 msgid "D_uplicate"
 msgstr "D_uplikovať"
 
-#: src/prefs_actions.c:1206
+#: src/prefs_actions.c:1208
 msgid "Current actions"
 msgstr "Aktuálne akcie"
 
-#: src/prefs_actions.c:1305 src/prefs_filtering.c:1078
-#: src/prefs_filtering.c:1136
+#: src/prefs_actions.c:1307 src/prefs_filtering.c:1079
+#: src/prefs_filtering.c:1137
 msgid "Action string is not valid."
 msgstr "Reťazec akcie je neplatný."
 
-#: src/prefs_common.c:236 src/prefs_quote.c:69
+#: src/prefs_common.c:239 src/prefs_quote.c:69
 msgid "Hello,\\n"
 msgstr "Dobrý deň,\\n"
 
-#: src/prefs_common.c:314
+#: src/prefs_common.c:317
 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:320 src/prefs_quote.c:85
+#: src/prefs_common.c:323 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"
@@ -15064,7 +15266,7 @@ msgstr ""
 "t{Komu: %t\\n}?c{Cc: %c\\n}?n{Diskusné skupiny: %n\\n}?s{Predmet: %s\\n}\\n"
 "\\n%M"
 
-#: src/prefs_common.c:448
+#: src/prefs_common.c:451
 msgid "%x(%a) %H:%M"
 msgstr "%x(%a) %H:%M"
 
@@ -15094,7 +15296,7 @@ msgstr "Automaticky spustiť externý editor"
 
 #: 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 "
+msgstr "Automaticky ukladať text správy medzi Koncepty každých"
 
 #: src/prefs_compose_writing.c:162 src/prefs_wrapping.c:100
 msgid "characters"
@@ -15114,7 +15316,7 @@ msgstr "Upozorniť pri vložení súboru väčšieho ako"
 
 #: src/prefs_compose_writing.c:208
 msgid "KB into message body "
-msgstr "kB do tela správy."
+msgstr "kB do tela správy"
 
 #: src/prefs_compose_writing.c:214
 msgid "Replying"
@@ -15132,7 +15334,7 @@ msgstr "Tlačidlo Odpovedať zvolí odpoveď do emailovej konferencie"
 msgid "Forwarding"
 msgstr "Posielanie ďalej"
 
-#: src/prefs_compose_writing.c:225 src/prefs_filtering_action.c:192
+#: src/prefs_compose_writing.c:225 src/prefs_filtering_action.c:186
 msgid "Forward as attachment"
 msgstr "Poslať ďalej ako prílohu"
 
@@ -15161,97 +15363,97 @@ msgstr "Pripojiť"
 msgid "Writing"
 msgstr "Písanie"
 
-#: src/prefs_customheader.c:183
+#: src/prefs_customheader.c:185
 msgid "Custom header configuration"
 msgstr "Nastavenie dodatočných hlavičiek"
 
-#: src/prefs_customheader.c:506 src/prefs_display_header.c:601
-#: src/prefs_matcher.c:1597 src/prefs_matcher.c:1612
+#: src/prefs_customheader.c:504 src/prefs_display_header.c:589
+#: src/prefs_matcher.c:1637 src/prefs_matcher.c:1652
 msgid "Header name is not set."
 msgstr "Nebol zadaný názov hlavičky."
 
-#: src/prefs_customheader.c:516
+#: src/prefs_customheader.c:514
 msgid "This Header name is not allowed as a custom header."
 msgstr "Táto hlavička nie je povolená ako dodatočná."
 
-#: src/prefs_customheader.c:563
+#: src/prefs_customheader.c:561
 msgid "Choose a PNG file"
 msgstr "Vyberte súbor PNG"
 
-#: src/prefs_customheader.c:565
+#: src/prefs_customheader.c:563
 msgid "Choose an XBM file"
 msgstr "Vyberte súbor XBM"
 
-#: src/prefs_customheader.c:567
+#: src/prefs_customheader.c:565
 msgid "Choose a text file"
 msgstr "Vyberte textový súbor"
 
-#: src/prefs_customheader.c:580
+#: src/prefs_customheader.c:578
 msgid "This file isn't an image."
 msgstr "Toto nie je obrázkový súbor."
 
-#: src/prefs_customheader.c:585
+#: src/prefs_customheader.c:583
 msgid "The chosen image isn't the correct size (48x48)."
 msgstr "Zvolený obrázok nie je v požadovanej veľkosti (48x48)."
 
-#: src/prefs_customheader.c:591
+#: src/prefs_customheader.c:589
 msgid "The image is too big; it must be maximum 725 bytes."
 msgstr "Obrázok je príliš veľký, maximálna veľkosť je 725 bajtov."
 
-#: src/prefs_customheader.c:596
+#: src/prefs_customheader.c:594
 msgid "The image isn't in the correct format (PNG)."
 msgstr "Obrázok nie je v správnom formáte (PNG)."
 
-#: src/prefs_customheader.c:605
+#: src/prefs_customheader.c:603
 msgid "The image isn't in the correct format (XBM)."
 msgstr "Obrázok nie je v správnom formáte (XBM)."
 
-#: src/prefs_customheader.c:614
+#: src/prefs_customheader.c:612
 msgid "Couldn't call `compface`. Make sure it's in your $PATH."
 msgstr "Nemožno vykonať `compface`. Preverte, či je v premennej $PATH."
 
-#: src/prefs_customheader.c:620
+#: src/prefs_customheader.c:618
 #, c-format
 msgid "Compface error: %s"
 msgstr "Chyba compface: %s"
 
-#: src/prefs_customheader.c:673
+#: src/prefs_customheader.c:671
 msgid "This file contains newlines."
 msgstr "Tento súbor obsahuje zalomenia riadkov."
 
-#: src/prefs_customheader.c:703
+#: src/prefs_customheader.c:701
 msgid "Delete header"
 msgstr "Zmazať hlavičku"
 
-#: src/prefs_customheader.c:704
+#: src/prefs_customheader.c:702
 msgid "Do you really want to delete this header?"
 msgstr "Naozaj chcete zmazať túto hlavičku?"
 
-#: src/prefs_customheader.c:877
+#: src/prefs_customheader.c:875
 msgid "Current custom headers"
 msgstr "Aktuálne dodatočné hlavičky"
 
-#: src/prefs_display_header.c:252
+#: src/prefs_display_header.c:254
 msgid "Displayed header configuration"
 msgstr "Nastavenie zobrazovaných hlavičiek"
 
-#: src/prefs_display_header.c:276
+#: src/prefs_display_header.c:278
 msgid "Header name"
 msgstr "Názov hlavičky"
 
-#: src/prefs_display_header.c:319
-msgid "Displayed Headers"
-msgstr "Zobrazované hlavičky"
-
-#: src/prefs_display_header.c:381
+#: src/prefs_display_header.c:313
 msgid "Hidden headers"
 msgstr "Skryté hlavičky"
 
-#: src/prefs_display_header.c:407
+#: src/prefs_display_header.c:354
+msgid "Displayed Headers"
+msgstr "Zobrazované hlavičky"
+
+#: src/prefs_display_header.c:399
 msgid "Show all unspecified headers"
 msgstr "Zobraziť všetky neurčené hlavičky"
 
-#: src/prefs_display_header.c:611
+#: src/prefs_display_header.c:599
 msgid "This header is already in the list."
 msgstr "Táto hlavička už je v zozname."
 
@@ -15286,10 +15488,10 @@ msgid ""
 "script when using the 'Display as text' contextual menu item"
 msgstr ""
 "Toto nastavenie umožňuje zobraziť MIME časti v zobrazení správy pomocou "
-"skriptu, pri použití voľby „Zobraziť ako text” z kontextového menu."
+"skriptu, pri použití voľby „Zobraziť ako text” z kontextového menu"
 
 #: src/prefs_ext_prog.c:282 src/prefs_image_viewer.c:138
-#: src/prefs_message.c:354
+#: src/prefs_message.c:351
 msgid "Message View"
 msgstr "Zobrazenie správy"
 
@@ -15297,177 +15499,173 @@ msgstr "Zobrazenie správy"
 msgid "External Programs"
 msgstr "Externé programy"
 
-#: src/prefs_filtering_action.c:175
+#: src/prefs_filtering_action.c:171
 msgid "Move"
 msgstr "Presunúť"
 
-#: src/prefs_filtering_action.c:176
-msgid "Copy"
-msgstr "Kopírovať"
-
-#: src/prefs_filtering_action.c:178
+#: src/prefs_filtering_action.c:174
 msgid "Hide"
 msgstr "Skryť"
 
+#: src/prefs_filtering_action.c:175 src/prefs_filtering_action.c:176
+#: src/prefs_filtering_action.c:177 src/prefs_filtering_action.c:178
 #: src/prefs_filtering_action.c:179 src/prefs_filtering_action.c:180
 #: src/prefs_filtering_action.c:181 src/prefs_filtering_action.c:182
-#: src/prefs_filtering_action.c:183 src/prefs_filtering_action.c:184
-#: src/prefs_filtering_action.c:185 src/prefs_filtering_action.c:186
 msgid "Message flags"
 msgstr "Príznaky správy"
 
-#: src/prefs_filtering_action.c:179 src/prefs_summaries.c:449
-#: src/prefs_summary_column.c:77 src/summaryview.c:2813 src/toolbar.c:505
+#: src/prefs_filtering_action.c:175 src/prefs_summaries.c:641
+#: src/prefs_summary_column.c:77 src/summaryview.c:2888 src/toolbar.c:505
 msgid "Mark"
 msgstr "Označiť"
 
-#: src/prefs_filtering_action.c:183
+#: src/prefs_filtering_action.c:179
 msgid "Mark as read"
 msgstr "Označiť ako prečítané"
 
-#: src/prefs_filtering_action.c:184
+#: src/prefs_filtering_action.c:180
 msgid "Mark as unread"
 msgstr "Označiť ako neprečítané"
 
-#: src/prefs_filtering_action.c:185
+#: src/prefs_filtering_action.c:181
 msgid "Mark as spam"
 msgstr "Označiť ako spam"
 
-#: src/prefs_filtering_action.c:186
+#: src/prefs_filtering_action.c:182
 msgid "Mark as ham"
 msgstr "Označiť ako nie spam"
 
-#: src/prefs_filtering_action.c:187 src/prefs_filtering_action.c:1442
-#: src/toolbar.c:238 src/toolbar.c:499 src/toolbar.c:2465
+#: src/prefs_filtering_action.c:183 src/prefs_filtering_action.c:1395
+#: src/toolbar.c:238 src/toolbar.c:499 src/toolbar.c:2468
 msgid "Execute"
 msgstr "Vykonať"
 
-#: src/prefs_filtering_action.c:189 src/prefs_summaries.c:447
+#: src/prefs_filtering_action.c:184 src/prefs_summaries.c:639
 msgid "Color label"
 msgstr "Farebná menovka"
 
-#: src/prefs_filtering_action.c:191 src/prefs_filtering_action.c:192
-#: src/prefs_filtering_action.c:193
+#: src/prefs_filtering_action.c:185 src/prefs_filtering_action.c:186
+#: src/prefs_filtering_action.c:187
 msgid "Resend"
 msgstr "Poslať znova"
 
-#: src/prefs_filtering_action.c:193
+#: src/prefs_filtering_action.c:187
 msgid "Redirect"
 msgstr "Presmerovať"
 
-#: src/prefs_filtering_action.c:194 src/prefs_filtering_action.c:195
-#: src/prefs_filtering_action.c:1446 src/prefs_matcher.c:629
-#: src/prefs_summaries.c:452 src/prefs_summary_column.c:86
-#: src/summaryview.c:449
+#: src/prefs_filtering_action.c:188 src/prefs_filtering_action.c:189
+#: src/prefs_filtering_action.c:1399 src/prefs_matcher.c:640
+#: src/prefs_summaries.c:644 src/prefs_summary_column.c:86
+#: src/summaryview.c:474
 msgid "Score"
 msgstr "Ohodnotenie"
 
-#: src/prefs_filtering_action.c:194
+#: src/prefs_filtering_action.c:188
 msgid "Change score"
 msgstr "Zmeniť ohodnotenie"
 
-#: src/prefs_filtering_action.c:195
+#: src/prefs_filtering_action.c:189
 msgid "Set score"
 msgstr "Nastaviť ohodnotenie"
 
-#: src/prefs_filtering_action.c:196 src/prefs_filtering_action.c:197
-#: src/prefs_filtering_action.c:198 src/prefs_matcher.c:633
-#: src/prefs_summary_column.c:88 src/summaryview.c:451
+#: src/prefs_filtering_action.c:190 src/prefs_filtering_action.c:191
+#: src/prefs_filtering_action.c:192 src/prefs_matcher.c:644
+#: src/prefs_summary_column.c:88 src/summaryview.c:476
 msgid "Tags"
 msgstr "Značky"
 
-#: src/prefs_filtering_action.c:196
+#: src/prefs_filtering_action.c:190
 msgid "Apply tag"
 msgstr "Použiť značku"
 
-#: src/prefs_filtering_action.c:197
+#: src/prefs_filtering_action.c:191
 msgid "Unset tag"
 msgstr "Odstrániť značku"
 
-#: src/prefs_filtering_action.c:198
+#: src/prefs_filtering_action.c:192
 msgid "Clear tags"
 msgstr "Odstrániť značky"
 
-#: src/prefs_filtering_action.c:199 src/prefs_filtering_action.c:200
+#: src/prefs_filtering_action.c:193 src/prefs_filtering_action.c:194
 msgid "Threads"
 msgstr "Vlákna"
 
-#: src/prefs_filtering_action.c:202
+#: src/prefs_filtering_action.c:196
 msgid "Stop filter"
 msgstr "Zastaviť filtrovanie"
 
-#: src/prefs_filtering_action.c:410
+#: src/prefs_filtering_action.c:401
 msgid "Action configuration"
 msgstr "Nastavenie akcie"
 
-#: src/prefs_filtering_action.c:427 src/prefs_filtering.c:1890
-#: src/prefs_matcher.c:586
+#: src/prefs_filtering_action.c:418 src/prefs_filtering.c:1895
+#: src/prefs_matcher.c:597
 msgid "Rule"
 msgstr "Pravidlo"
 
-#: src/prefs_filtering_action.c:440 src/prefs_filtering.c:433
+#: src/prefs_filtering_action.c:431 src/prefs_filtering.c:434
 msgid "Action"
 msgstr "Akcia"
 
-#: src/prefs_filtering_action.c:938
+#: src/prefs_filtering_action.c:907
 msgid "Command-line not set"
 msgstr "Nebol zadaný príkazový riadok"
 
-#: src/prefs_filtering_action.c:939
+#: src/prefs_filtering_action.c:908
 msgid "Destination is not set."
 msgstr "Nebol zadaný cieľ."
 
-#: src/prefs_filtering_action.c:950
+#: src/prefs_filtering_action.c:919
 msgid "Recipient is not set."
 msgstr "Nebol zadaný príjemca."
 
-#: src/prefs_filtering_action.c:968
+#: src/prefs_filtering_action.c:935
 msgid "Score is not set"
 msgstr "Nebolo zadané ohodnotenie"
 
-#: src/prefs_filtering_action.c:976
+#: src/prefs_filtering_action.c:943
 msgid "Header is not set."
 msgstr "Nebol zadaný názov hlavičky."
 
-#: src/prefs_filtering_action.c:983
+#: src/prefs_filtering_action.c:950
 msgid "Target addressbook/folder is not set."
 msgstr "Nie je nastavený cieľový adresár/zložka."
 
-#: src/prefs_filtering_action.c:997
+#: src/prefs_filtering_action.c:960
 msgid "Tag name is empty."
 msgstr "Meno značky je prázdne."
 
-#: src/prefs_filtering_action.c:1219
+#: src/prefs_filtering_action.c:1182
 msgid "No action was defined."
 msgstr "Nebola definovaná žiadna akcia."
 
-#: src/prefs_filtering_action.c:1257 src/prefs_matcher.c:2163
+#: src/prefs_filtering_action.c:1220 src/prefs_matcher.c:2212
 #: src/quote_fmt.c:79
 msgid "literal %"
-msgstr "Znak %"
+msgstr "znak %"
 
-#: src/prefs_filtering_action.c:1266 src/prefs_matcher.c:2172
+#: src/prefs_filtering_action.c:1229 src/prefs_matcher.c:2221
 msgid "filename (should not be modified)"
 msgstr "názov súboru (nemal by byť menený)"
 
-#: src/prefs_filtering_action.c:1267 src/prefs_matcher.c:2173
+#: src/prefs_filtering_action.c:1230 src/prefs_matcher.c:2222
 #: src/quote_fmt.c:87
 msgid "new line"
 msgstr "nový riadok"
 
-#: src/prefs_filtering_action.c:1268 src/prefs_matcher.c:2174
+#: src/prefs_filtering_action.c:1231 src/prefs_matcher.c:2223
 msgid "escape character for quotes"
 msgstr "únikový znak citácie"
 
-#: src/prefs_filtering_action.c:1269 src/prefs_matcher.c:2175
+#: src/prefs_filtering_action.c:1232 src/prefs_matcher.c:2224
 msgid "quote character"
 msgstr "znak úvodzoviek"
 
-#: src/prefs_filtering_action.c:1278
+#: src/prefs_filtering_action.c:1241
 msgid "Filtering Action: 'Execute'"
 msgstr "Filtrovacia akcia: „Vykonať”"
 
-#: src/prefs_filtering_action.c:1279
+#: src/prefs_filtering_action.c:1242
 msgid ""
 "'Execute' allows you to send a message or message element to an external "
 "program or script.\n"
@@ -15477,145 +15675,145 @@ msgstr ""
 "programu, alebo skriptu.\n"
 "Môžete použiť tieto symboly:"
 
-#: src/prefs_filtering_action.c:1426
+#: src/prefs_filtering_action.c:1381
 msgid "Recipient"
 msgstr "Príjemca"
 
-#: src/prefs_filtering_action.c:1430
+#: src/prefs_filtering_action.c:1385
 msgid "Book/Folder"
 msgstr "_Adresár/Zložka"
 
-#: src/prefs_filtering_action.c:1434
+#: src/prefs_filtering_action.c:1389
 msgid "Destination"
 msgstr "Cieľ"
 
-#: src/prefs_filtering_action.c:1438
+#: src/prefs_filtering_action.c:1392
 msgid "Color"
 msgstr "Zafarbiť"
 
-#: src/prefs_filtering_action.c:1524
+#: src/prefs_filtering_action.c:1477
 msgid "Current action list"
 msgstr "Zoznam aktuálnych akcií"
 
-#: src/prefs_filtering.c:197 src/prefs_filtering.c:359
+#: src/prefs_filtering.c:197 src/prefs_filtering.c:360
 msgid "Filtering/Processing configuration"
 msgstr "Nastavenie filtrovania"
 
-#: src/prefs_filtering.c:266 src/prefs_filtering.c:869
-#: src/prefs_filtering.c:985
+#: src/prefs_filtering.c:266 src/prefs_filtering.c:870
+#: src/prefs_filtering.c:986
 msgctxt "Filtering Account Menu"
 msgid "All"
 msgstr "Všetky"
 
-#: src/prefs_filtering.c:411
+#: src/prefs_filtering.c:412
 msgid "Condition"
 msgstr "Podmienka"
 
-#: src/prefs_filtering.c:424
+#: src/prefs_filtering.c:425
 msgid " Def_ine... "
-msgstr " D_efinovať… "
+msgstr " D_efinovať... "
 
-#: src/prefs_filtering.c:446
+#: src/prefs_filtering.c:447
 msgid " De_fine... "
-msgstr " D_efinovať… "
+msgstr " D_efinovať... "
 
-#: src/prefs_filtering.c:475
+#: src/prefs_filtering.c:476
 msgid "Append the new rule above to the list"
 msgstr "Priať nové pravidlo na začiatok zoznamu"
 
-#: src/prefs_filtering.c:484
+#: src/prefs_filtering.c:485
 msgid "Replace the selected rule in list with the rule above"
 msgstr "Nahradiť zvolené pravidlo v zozname pravidlom vyššie"
 
-#: src/prefs_filtering.c:493
+#: src/prefs_filtering.c:494
 msgid "Delete the selected rule from the list"
 msgstr "Zmazať zvolené pravidlo zo zoznamu"
 
-#: src/prefs_filtering.c:534
+#: src/prefs_filtering.c:535
 msgid "Move the selected rule to the top"
 msgstr "Presunúť zvolené pravidlo na začiatok"
 
-#: src/prefs_filtering.c:537
+#: src/prefs_filtering.c:538
 msgid "Page u_p"
 msgstr "O stranu _vyššie"
 
-#: src/prefs_filtering.c:545
+#: src/prefs_filtering.c:546
 msgid "Move the selected rule one page up"
 msgstr "Presunúť zvolené pravidlo na začiatok strany"
 
-#: src/prefs_filtering.c:554
+#: src/prefs_filtering.c:555
 msgid "Move the selected rule up"
 msgstr "Posunúť zvolené pravidlo vyššie"
 
-#: src/prefs_filtering.c:562
+#: src/prefs_filtering.c:563
 msgid "Move the selected rule down"
 msgstr "Posunúť zvolené pravidlo nižšie"
 
-#: src/prefs_filtering.c:565
+#: src/prefs_filtering.c:566
 msgid "Page dow_n"
 msgstr "O stranu _nižšie"
 
-#: src/prefs_filtering.c:573
+#: src/prefs_filtering.c:574
 msgid "Move the selected rule one page down"
 msgstr "Presunúť zvolené pravidlo na koniec strany"
 
-#: src/prefs_filtering.c:582
+#: src/prefs_filtering.c:583
 msgid "Move the selected rule to the bottom"
 msgstr "Presunúť zvolené pravidlo na koniec"
 
-#: src/prefs_filtering.c:1042 src/prefs_filtering.c:1128
+#: src/prefs_filtering.c:1043 src/prefs_filtering.c:1129
 msgid "Condition string is not valid."
 msgstr "Reťazec podmienky je neplatný."
 
-#: src/prefs_filtering.c:1115
+#: src/prefs_filtering.c:1116
 msgid "Condition string is empty."
 msgstr "Reťazec podmienky je prázdny."
 
-#: src/prefs_filtering.c:1121
+#: src/prefs_filtering.c:1122
 msgid "Action string is empty."
 msgstr "Reťazec akcie je prázdny."
 
-#: src/prefs_filtering.c:1209
+#: src/prefs_filtering.c:1211
 msgid "Delete rule"
 msgstr "Odstrániť pravidlo"
 
-#: src/prefs_filtering.c:1210
+#: src/prefs_filtering.c:1212
 msgid "Do you really want to delete this rule?"
 msgstr "Naozaj chcete odstrániť toto pravidlo?"
 
-#: src/prefs_filtering.c:1228
+#: src/prefs_filtering.c:1230
 msgid "Delete all rules"
 msgstr "Zmazať všetky pravidlá"
 
-#: src/prefs_filtering.c:1229
+#: src/prefs_filtering.c:1231
 msgid "Do you really want to delete all the rules?"
 msgstr "Naozaj chcete odstrániť všetky pravidlá?"
 
-#: src/prefs_filtering.c:1479
+#: src/prefs_filtering.c:1482
 msgid "Filtering rules not saved"
 msgstr "Pravidlá filtrovania neboli uložené"
 
-#: src/prefs_filtering.c:1480
+#: src/prefs_filtering.c:1483
 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:1702
+#: src/prefs_filtering.c:1705
 msgid "Move one page up"
 msgstr "Posunúť o stranu vyššie"
 
-#: src/prefs_filtering.c:1703
+#: src/prefs_filtering.c:1706
 msgid "Move one page down"
 msgstr "Posunúť o stranu nižšie"
 
-#: src/prefs_filtering.c:1858
+#: src/prefs_filtering.c:1863
 msgid "Enable"
 msgstr "Povoliť"
 
-#: src/prefs_folder_column.c:211
+#: src/prefs_folder_column.c:212
 msgid "Folder list columns configuration"
 msgstr "Nastavenie stĺpcov zoznamu správ"
 
-#: src/prefs_folder_column.c:228
+#: src/prefs_folder_column.c:229
 msgid ""
 "Select columns to be displayed in the folder list. You can modify\n"
 "the order by using the Up / Down buttons or by dragging the items."
@@ -15623,21 +15821,21 @@ msgstr ""
 "Vyberte položky ktoré majú byť zobrazené v zozname správ. Môžete\n"
 "meniť poradie pomocou tlačidiel Nahor/Nadol, alebo presúvaním pomocou myši."
 
-#: src/prefs_folder_column.c:258 src/prefs_summary_column.c:272
+#: src/prefs_folder_column.c:259 src/prefs_summary_column.c:273
 msgid "Hidden columns"
 msgstr "Skryté položky"
 
-#: src/prefs_folder_column.c:299 src/prefs_summaries.c:416
-#: src/prefs_summaries.c:591 src/prefs_summary_column.c:313
+#: src/prefs_folder_column.c:300 src/prefs_summaries.c:386
+#: src/prefs_summaries.c:451 src/prefs_summary_column.c:314
 msgid "Displayed columns"
 msgstr "Zobrazené položky"
 
-#: src/prefs_folder_column.c:332 src/prefs_msg_colors.c:484
-#: src/prefs_summary_column.c:346 src/prefs_toolbar.c:1077
+#: src/prefs_folder_column.c:333 src/prefs_msg_colors.c:464
+#: src/prefs_summary_column.c:347 src/prefs_toolbar.c:1032
 msgid " Use default "
 msgstr " Použiť predvolené "
 
-#: src/prefs_folder_item.c:210
+#: src/prefs_folder_item.c:214
 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 "
@@ -15646,7 +15844,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:886
+#: src/prefs_folder_item.c:293 src/prefs_folder_item.c:896
 msgid ""
 "Apply to\n"
 "subfolders"
@@ -15654,55 +15852,55 @@ msgstr ""
 "Použiť aj na\n"
 "podzložky"
 
-#: src/prefs_folder_item.c:314
+#: src/prefs_folder_item.c:318
 msgid "Normal"
 msgstr "Normálny"
 
-#: src/prefs_folder_item.c:316
+#: src/prefs_folder_item.c:320
 msgid "Outbox"
 msgstr "Odoslaná pošta"
 
-#: src/prefs_folder_item.c:332
+#: src/prefs_folder_item.c:336
 msgid "Folder type"
 msgstr "Typ zložky"
 
-#: src/prefs_folder_item.c:344
+#: src/prefs_folder_item.c:348
 msgid "Simplify Subject RegExp"
 msgstr "Zjednodušiť regulárny výraz predmetu"
 
-#: src/prefs_folder_item.c:370
-msgid "Test string:"
-msgstr "Testovací reťazec:"
+#: src/prefs_folder_item.c:374
+msgid "Test string"
+msgstr "Testovací reťazec"
 
-#: src/prefs_folder_item.c:387
-msgid "Result:"
-msgstr "Výsledok:"
+#: src/prefs_folder_item.c:391
+msgid "Result"
+msgstr "Výsledok"
 
-#: src/prefs_folder_item.c:402
+#: src/prefs_folder_item.c:406
 msgid "Folder chmod"
 msgstr "Chmod zložky"
 
-#: src/prefs_folder_item.c:428
+#: src/prefs_folder_item.c:432
 msgid "Folder color"
 msgstr "Farba zložky"
 
-#: src/prefs_folder_item.c:441 src/prefs_folder_item.c:1678
+#: src/prefs_folder_item.c:444 src/prefs_folder_item.c:1768
 msgid "Pick color for folder"
 msgstr "Vyberte farbu zložky"
 
-#: src/prefs_folder_item.c:459
+#: src/prefs_folder_item.c:462
 msgid "Run Processing rules at start-up"
 msgstr "Spustiť spracovanie pravidiel pri štarte"
 
-#: src/prefs_folder_item.c:474
+#: src/prefs_folder_item.c:477
 msgid "Run Processing rules when opening"
 msgstr "Spustiť spracovanie pravidiel pri otvorení"
 
-#: src/prefs_folder_item.c:488
+#: src/prefs_folder_item.c:491
 msgid "Scan for new mail"
 msgstr "Zistiť novú poštu"
 
-#: src/prefs_folder_item.c:490
+#: src/prefs_folder_item.c:493
 msgid ""
 "Turn this option on if mail is delivered directly to this folder by server "
 "side filtering on IMAP or by an external application"
@@ -15710,11 +15908,11 @@ msgstr ""
 "Zapnite túto voľbu ak je pošta do tejto zložky doručovaná priamo na servere, "
 "alebo inou aplikáciou"
 
-#: src/prefs_folder_item.c:510
+#: src/prefs_folder_item.c:513
 msgid "Select the HTML part of multipart messages"
 msgstr "Zvoliť HTML časť zložených správ"
 
-#: src/prefs_folder_item.c:527
+#: src/prefs_folder_item.c:530
 msgid ""
 "\"Default\" will follow global preference (found in /Preferences/Message "
 "View/Text Options)"
@@ -15722,65 +15920,69 @@ msgstr ""
 "„Predvolené” bude nasledovať všeobecné nastavenie (nájdete v /Nastavenia/"
 "Zobrazenie správy/Textové možnosti)"
 
-#: src/prefs_folder_item.c:537
+#: src/prefs_folder_item.c:540
 msgid "Synchronise for offline use"
 msgstr "Synchronizovať na použitie pri odpojení"
 
-#: src/prefs_folder_item.c:558
+#: src/prefs_folder_item.c:561
 msgid "Fetch message bodies from the last"
 msgstr "Stiahnuť telá správ za posledných"
 
-#: src/prefs_folder_item.c:565
+#: src/prefs_folder_item.c:568
 msgid "0: all bodies"
 msgstr "0: všetky"
 
-#: src/prefs_folder_item.c:573
+#: src/prefs_folder_item.c:576
 msgid "Remove older messages bodies"
 msgstr "Odstrániť telá starších správ"
 
-#: src/prefs_folder_item.c:590
+#: src/prefs_folder_item.c:593
 msgid "Discard folder cache"
 msgstr "Vymazať vyrovnávaciu pamäť zložky"
 
-#: src/prefs_folder_item.c:895
+#: src/prefs_folder_item.c:905
 msgid "Request Return Receipt"
 msgstr "Vyžiadať potvrdenie o príjme"
 
-#: src/prefs_folder_item.c:910
+#: src/prefs_folder_item.c:920
 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:924 src/prefs_folder_item.c:976
-#: src/prefs_folder_item.c:1002 src/prefs_folder_item.c:1028
+#: src/prefs_folder_item.c:934 src/prefs_folder_item.c:986
+#: src/prefs_folder_item.c:1012 src/prefs_folder_item.c:1038
 #, c-format
 msgctxt "folder properties: %s stands for a header name"
 msgid "Default %s"
 msgstr "Predvolene %s"
 
-#: src/prefs_folder_item.c:950
+#: src/prefs_folder_item.c:960
 #, 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:1053
+#: src/prefs_folder_item.c:1063
 msgid "Default account"
 msgstr "Predvolený účet"
 
-#: src/prefs_folder_item.c:1691
+#: src/prefs_folder_item.c:1205 src/prefs_folder_item.c:1237
+msgid "\"Default\" will follow the applicable account preference"
+msgstr "„Predvolené” použije použiteľné nastavenia účtu"
+
+#: src/prefs_folder_item.c:1781
 msgid "Discard cache"
 msgstr "Zrušiť lokálne uložené dáta"
 
-#: src/prefs_folder_item.c:1692
+#: src/prefs_folder_item.c:1782
 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:1825
+#: src/prefs_folder_item.c:1907
 msgid "General"
 msgstr "Všeobecné"
 
-#: src/prefs_folder_item.c:1904
+#: src/prefs_folder_item.c:1986
 #, c-format
 msgid "Properties for folder %s"
 msgstr "Vlastnosti zložky %s"
@@ -15789,7 +15991,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:2038
+#: src/prefs_fonts.c:99 src/prefs_matcher.c:2086
 msgid "Message"
 msgstr "Správa"
 
@@ -15813,8 +16015,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:830 src/prefs_summaries.c:766
-#: src/prefs_themes.c:421
+#: src/prefs_fonts.c:268 src/prefs_msg_colors.c:776 src/prefs_summaries.c:869
+#: src/prefs_themes.c:422
 msgid "Display"
 msgstr "Zobrazenie"
 
@@ -15822,7 +16024,7 @@ msgstr "Zobrazenie"
 msgid "Fonts"
 msgstr "Písma"
 
-#: src/prefs_gtk.c:910 src/toolbar.c:256 src/toolbar.c:517
+#: src/prefs_gtk.c:895 src/toolbar.c:256 src/toolbar.c:517
 msgid "Preferences"
 msgstr "Nastavenia"
 
@@ -15884,7 +16086,7 @@ msgstr ""
 
 #: src/prefs_logging.c:181
 msgid "Log filtering/processing when..."
-msgstr "Zaznamenať filtrovanie/spracúvanie pri…"
+msgstr "Zaznamenať filtrovanie/spracúvanie pri..."
 
 #: src/prefs_logging.c:185
 msgid "filtering at incorporation"
@@ -15948,7 +16150,7 @@ msgstr "Záznam disku"
 
 #: src/prefs_logging.c:276
 msgid "Write the following information to disk..."
-msgstr "Zapísať nasledujúce informácie na disk…"
+msgstr "Zapísať nasledujúce informácie na disk..."
 
 #: src/prefs_logging.c:284
 msgid "Warning messages"
@@ -15966,7 +16168,7 @@ msgstr "Chybové správy"
 msgid "Status messages for filtering/processing log"
 msgstr "Záznam stavových správ filtrovania/spracovania"
 
-#: src/prefs_logging.c:410 src/prefs_msg_colors.c:144 src/prefs_other.c:776
+#: src/prefs_logging.c:410 src/prefs_msg_colors.c:153 src/prefs_other.c:815
 msgid "Other"
 msgstr "Ostatné"
 
@@ -15974,247 +16176,267 @@ msgstr "Ostatné"
 msgid "Logging"
 msgstr "Záznam"
 
-#: src/prefs_matcher.c:331
+#: src/prefs_matcher.c:335
 msgid "more than"
 msgstr "viac ako"
 
-#: src/prefs_matcher.c:332
+#: src/prefs_matcher.c:336
 msgid "less than"
 msgstr "menej ako"
 
-#: src/prefs_matcher.c:338
+#: src/prefs_matcher.c:342
 msgid "weeks"
 msgstr "týždne"
 
-#: src/prefs_matcher.c:342
+#: src/prefs_matcher.c:346
+msgid "after"
+msgstr "po"
+
+#: src/prefs_matcher.c:347
+msgid "before"
+msgstr "pred"
+
+#: src/prefs_matcher.c:351
 msgid "higher than"
 msgstr "vyšší ako"
 
-#: src/prefs_matcher.c:343
+#: src/prefs_matcher.c:352
 msgid "lower than"
 msgstr "nižší ako"
 
-#: src/prefs_matcher.c:344 src/prefs_matcher.c:350
+#: src/prefs_matcher.c:353 src/prefs_matcher.c:359
 msgid "exactly"
 msgstr "presne"
 
-#: src/prefs_matcher.c:348
+#: src/prefs_matcher.c:357
 msgid "greater than"
 msgstr "väčší ako"
 
-#: src/prefs_matcher.c:349
+#: src/prefs_matcher.c:358
 msgid "smaller than"
 msgstr "menší ako"
 
-#: src/prefs_matcher.c:354
+#: src/prefs_matcher.c:363
 msgid "bytes"
 msgstr "bajty"
 
-#: src/prefs_matcher.c:355
+#: src/prefs_matcher.c:364
 msgid "kilobytes"
 msgstr "kilobajty"
 
-#: src/prefs_matcher.c:356
+#: src/prefs_matcher.c:365
 msgid "megabytes"
 msgstr "megabajty"
 
-#: src/prefs_matcher.c:360
+#: src/prefs_matcher.c:369
 msgid "contains"
 msgstr "obsahuje"
 
-#: src/prefs_matcher.c:361
+#: src/prefs_matcher.c:370
 msgid "doesn't contain"
 msgstr "neobsahuje"
 
-#: src/prefs_matcher.c:385
+#: src/prefs_matcher.c:394
 msgid "headers part"
-msgstr "Hlavička správy"
+msgstr "hlavička správy"
 
-#: src/prefs_matcher.c:386
+#: src/prefs_matcher.c:395
 msgid "headers values"
 msgstr "hodnoty hlavičky"
 
-#: src/prefs_matcher.c:387
+#: src/prefs_matcher.c:396
 msgid "body part"
-msgstr "Telo správy"
+msgstr "telo správy"
 
-#: src/prefs_matcher.c:388
+#: src/prefs_matcher.c:397
 msgid "whole message"
-msgstr "Celá správa"
+msgstr "celá správa"
 
-#: src/prefs_matcher.c:394 src/summaryview.c:6351
+#: src/prefs_matcher.c:403 src/summaryview.c:6559
 msgid "Marked"
 msgstr "Označená"
 
-#: src/prefs_matcher.c:395 src/summaryview.c:6349
+#: src/prefs_matcher.c:404 src/summaryview.c:6557
 msgid "Deleted"
 msgstr "Zmazaná"
 
-#: src/prefs_matcher.c:396
+#: src/prefs_matcher.c:405
 msgid "Replied"
 msgstr "Odpovedaná"
 
-#: src/prefs_matcher.c:397 src/summaryview.c:6343
+#: src/prefs_matcher.c:406 src/summaryview.c:6551
 msgid "Forwarded"
 msgstr "Poslané ďalej"
 
-#: src/prefs_matcher.c:399 src/summaryview.c:6333 src/toolbar.c:515
-#: src/toolbar.c:988 src/toolbar.c:2339
+#: src/prefs_matcher.c:408 src/summaryview.c:6541 src/toolbar.c:515
+#: src/toolbar.c:988 src/toolbar.c:2342
 msgid "Spam"
 msgstr "Spam"
 
-#: src/prefs_matcher.c:400
+#: src/prefs_matcher.c:409
 msgid "Has attachment"
 msgstr "Má prílohu"
 
-#: src/prefs_matcher.c:401 src/summaryview.c:6369
+#: src/prefs_matcher.c:410 src/summaryview.c:6577
 msgid "Signed"
 msgstr "Podpísané"
 
-#: src/prefs_matcher.c:405
+#: src/prefs_matcher.c:414
 msgid "set"
 msgstr "nastavené"
 
-#: src/prefs_matcher.c:406
+#: src/prefs_matcher.c:415
 msgid "not set"
 msgstr "nenastavené"
 
-#: src/prefs_matcher.c:410
+#: src/prefs_matcher.c:419
 msgid "yes"
 msgstr "áno"
 
-#: src/prefs_matcher.c:411
+#: src/prefs_matcher.c:420
 msgid "no"
 msgstr "nie"
 
-#: src/prefs_matcher.c:415
+#: src/prefs_matcher.c:424
 msgid "Any tags"
 msgstr "Žiadne značky"
 
-#: src/prefs_matcher.c:416
+#: src/prefs_matcher.c:425
 msgid "Specific tag"
 msgstr "Špecifická značka"
 
-#: src/prefs_matcher.c:420
+#: src/prefs_matcher.c:429
 msgid "ignored"
 msgstr "ignorované"
 
-#: src/prefs_matcher.c:421
+#: src/prefs_matcher.c:430
 msgid "not ignored"
 msgstr "neignorované"
 
-#: src/prefs_matcher.c:422
+#: src/prefs_matcher.c:431
 msgid "watched"
 msgstr "sledované"
 
-#: src/prefs_matcher.c:423
+#: src/prefs_matcher.c:432
 msgid "not watched"
 msgstr "nesledované"
 
-#: src/prefs_matcher.c:427
+#: src/prefs_matcher.c:436
 msgid "found"
 msgstr "nájdené"
 
-#: src/prefs_matcher.c:428
+#: src/prefs_matcher.c:437
 msgid "not found"
 msgstr "nenájdené"
 
-#: src/prefs_matcher.c:432
+#: src/prefs_matcher.c:441
 msgid "0 (Passed)"
 msgstr "0 (Prešlo)"
 
-#: src/prefs_matcher.c:433
+#: src/prefs_matcher.c:442
 msgid "non-0 (Failed)"
 msgstr "nenulové (Zlyhalo)"
 
-#: src/prefs_matcher.c:569
+#: src/prefs_matcher.c:580
 msgid "Condition configuration"
 msgstr "Nastavenie podmienok"
 
-#: src/prefs_matcher.c:613
-msgid "Match criteria:"
-msgstr "Vyhľadávacie kritériá"
+#: src/prefs_matcher.c:624
+msgid "Match criteria"
+msgstr "Kritériá zhody"
 
-#: src/prefs_matcher.c:622
+#: src/prefs_matcher.c:633
 msgid "All messages"
 msgstr "Všetky správy"
 
-#: src/prefs_matcher.c:624
+#: src/prefs_matcher.c:635
 msgid "Age"
 msgstr "Vek"
 
-#: src/prefs_matcher.c:625
+#: src/prefs_matcher.c:636
 msgid "Phrase"
 msgstr "Fráza"
 
-#: src/prefs_matcher.c:626
+#: src/prefs_matcher.c:637
 msgid "Flags"
 msgstr "Príznaky"
 
-#: src/prefs_matcher.c:627 src/prefs_msg_colors.c:399
+#: src/prefs_matcher.c:638 src/prefs_msg_colors.c:380
 msgid "Color labels"
 msgstr "Farebné označenia"
 
-#: src/prefs_matcher.c:628
+#: src/prefs_matcher.c:639
 msgid "Thread"
 msgstr "Vlákno"
 
-#: src/prefs_matcher.c:631
+#: src/prefs_matcher.c:642
 msgid "Partially downloaded"
 msgstr "Čiastočne stiahnutá"
 
-#: src/prefs_matcher.c:634
+#: src/prefs_matcher.c:645
 msgid "External program test"
 msgstr "Kontrola externým programom"
 
-#: src/prefs_matcher.c:710 src/prefs_matcher.c:1618 src/prefs_matcher.c:1633
-#: src/prefs_matcher.c:2519
+#: src/prefs_matcher.c:674
+msgid ""
+"Use selector on the right to pick the header name. Type the name of the "
+"header if not available in the list."
+msgstr ""
+"Použite výber vpravo na výber mena hlavičky. Ak nie je meno hlavičky "
+"dostupné v zozname, napíšte ho."
+
+#: src/prefs_matcher.c:719 src/prefs_matcher.c:1658 src/prefs_matcher.c:1673
+#: src/prefs_matcher.c:2583
 msgctxt "Filtering Matcher Menu"
 msgid "All"
 msgstr "Všetky"
 
-#: src/prefs_matcher.c:744
+#: src/prefs_matcher.c:753
 msgid "Use regexp"
 msgstr "Použiť regulárny výraz"
 
-#: src/prefs_matcher.c:820
+#: src/prefs_matcher.c:844
 msgid "Message must match"
 msgstr "Správa musí vyhovovať"
 
-#: src/prefs_matcher.c:824
+#: src/prefs_matcher.c:848
 msgid "at least one"
 msgstr "aspoň jedno"
 
-#: src/prefs_matcher.c:825
+#: src/prefs_matcher.c:849
 msgid "all"
 msgstr "všetky"
 
-#: src/prefs_matcher.c:828
+#: src/prefs_matcher.c:852
 msgid "of above rules"
 msgstr "predošlých pravidiel"
 
-#: src/prefs_matcher.c:1536 src/prefs_matcher.c:1602
+#: src/prefs_matcher.c:1564 src/prefs_matcher.c:1642
 msgid "Search pattern is not set."
 msgstr "Nebol zadaný vyhľadávací vzor."
 
-#: src/prefs_matcher.c:1545
+#: src/prefs_matcher.c:1578
+msgid "Invalid hour."
+msgstr "Neplatná hodina."
+
+#: src/prefs_matcher.c:1587
 msgid "Test command is not set."
 msgstr "Nie je nastavený testovací príkaz."
 
-#: src/prefs_matcher.c:1619
+#: src/prefs_matcher.c:1659
 msgid "all addresses in all headers"
 msgstr "všetky adresy vo všetkých hlavičkách"
 
-#: src/prefs_matcher.c:1622
+#: src/prefs_matcher.c:1662
 msgid "any address in any header"
 msgstr "akákoľvek adresa v akejkoľvek hlavičke"
 
-#: src/prefs_matcher.c:1624
+#: src/prefs_matcher.c:1664
 #, c-format
 msgid "the address(es) in header '%s'"
 msgstr "adresy v hlavičke „%s”"
 
-#: src/prefs_matcher.c:1625
+#: src/prefs_matcher.c:1665
 #, c-format
 msgid ""
 "Book/folder path is not set.\n"
@@ -16227,83 +16449,87 @@ 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:1844
+#: src/prefs_matcher.c:1884
 msgid "Headers part"
 msgstr "Záhlavie správy"
 
-#: src/prefs_matcher.c:1848
+#: src/prefs_matcher.c:1888
 msgid "Headers values"
 msgstr "Hodnoty hlavičky"
 
-#: src/prefs_matcher.c:1852
+#: src/prefs_matcher.c:1892
 msgid "Body part"
 msgstr "Telo správy"
 
-#: src/prefs_matcher.c:1856
+#: src/prefs_matcher.c:1896
 msgid "Whole message"
 msgstr "Celá správa"
 
-#: src/prefs_matcher.c:1969 src/prefs_matcher.c:2011
+#: src/prefs_matcher.c:2013 src/prefs_matcher.c:2059
 msgid "in"
 msgstr "v"
 
-#: src/prefs_matcher.c:1971
+#: src/prefs_matcher.c:2015
 msgid "content is"
 msgstr "obsahuje"
 
-#: src/prefs_matcher.c:1980
+#: src/prefs_matcher.c:2019
+msgid "Date is"
+msgstr "Dátum je"
+
+#: src/prefs_matcher.c:2030
 msgid "Age is"
 msgstr "Vek je"
 
-#: src/prefs_matcher.c:1985
+#: src/prefs_matcher.c:2035
 msgid "Flag"
 msgstr "Príznak"
 
-#: src/prefs_matcher.c:1986 src/prefs_matcher.c:2001
+#: src/prefs_matcher.c:2036 src/prefs_matcher.c:2050
 msgid "is"
 msgstr "je"
 
-#: src/prefs_matcher.c:1991
+#: src/prefs_matcher.c:2041
 msgid "Name:"
-msgstr "Meno: "
+msgstr "Meno:"
 
-#: src/prefs_matcher.c:2000
+#: src/prefs_matcher.c:2049
 msgid "Label"
 msgstr "Menovka"
 
-#: src/prefs_matcher.c:2006
+#: src/prefs_matcher.c:2054
 msgid "Value:"
 msgstr "Hodnota:"
 
-#: src/prefs_matcher.c:2021
+#: src/prefs_matcher.c:2069
 msgid "Score is"
 msgstr "Skóre je"
 
-#: src/prefs_matcher.c:2022
+#: src/prefs_matcher.c:2070
 msgid "points"
 msgstr "bodov"
 
-#: src/prefs_matcher.c:2032
+#: src/prefs_matcher.c:2080
 msgid "Size is"
 msgstr "Veľkosť je"
 
-#: src/prefs_matcher.c:2037
+#: src/prefs_matcher.c:2085
 msgid "Scope:"
 msgstr "Rozsah:"
 
-#: src/prefs_matcher.c:2039
+#: src/prefs_matcher.c:2087
 msgid "tags"
-msgstr "Značky"
+msgstr "značky"
 
-#: src/prefs_matcher.c:2044
+#: src/prefs_matcher.c:2092
 msgid "type is"
 msgstr "typ je"
 
-#: src/prefs_matcher.c:2048
+#: src/prefs_matcher.c:2096
 msgid "Program returns"
 msgstr "Návratová hodnota programu"
 
-#: src/prefs_matcher.c:2118
+#: src/prefs_matcher.c:2166
 msgid ""
 "The entry was not saved.\n"
 "Close anyway?"
@@ -16311,11 +16537,11 @@ msgstr ""
 "Pravidlo nebolo uložené.\n"
 "Zavrieť napriek tomu?"
 
-#: src/prefs_matcher.c:2184
+#: src/prefs_matcher.c:2233
 msgid "Match Type: 'Test'"
 msgstr "Typ zhody: „Test”"
 
-#: src/prefs_matcher.c:2185
+#: src/prefs_matcher.c:2234
 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"
@@ -16327,91 +16553,91 @@ msgstr ""
 "\n"
 "Môžete použiť tieto symboly:"
 
-#: src/prefs_matcher.c:2284
+#: src/prefs_matcher.c:2333
 msgid "Current condition rules"
 msgstr "Aktuálne pravidlá"
 
-#: src/prefs_message.c:120
+#: src/prefs_message.c:119
 msgid "Headers"
 msgstr "Hlavičky"
 
-#: src/prefs_message.c:123
+#: src/prefs_message.c:122
 msgid "Display header pane above message view"
 msgstr "Zobraziť panel s hlavičkami nad správou"
 
-#: src/prefs_message.c:127
+#: src/prefs_message.c:126
 msgid "Display (X-)Face in message view"
 msgstr "Zobraziť (X-)Face v zobrazení správy"
 
-#: src/prefs_message.c:130
+#: src/prefs_message.c:129
 msgid "Display Face in message view"
 msgstr "Zobraziť Face v zobrazení správy"
 
-#: src/prefs_message.c:144
+#: src/prefs_message.c:143
 msgid "Display headers in message view"
 msgstr "Zobraziť hlavičky v správe"
 
-#: src/prefs_message.c:156
+#: src/prefs_message.c:155
 msgid "HTML messages"
 msgstr "HTML správy"
 
-#: src/prefs_message.c:159
+#: src/prefs_message.c:158
 msgid "Render HTML messages as text"
 msgstr "Vykresľovať HTML správy ako text"
 
-#: src/prefs_message.c:162
+#: src/prefs_message.c:161
 msgid "Render HTML-only messages with plugin if possible"
 msgstr "Zobraziť HTML správy pomocou zásuvného modulu, ak je to možné"
 
-#: src/prefs_message.c:165
+#: src/prefs_message.c:164
 msgid "Select the HTML part of multipart/alternative messages"
 msgstr "Zvoliť HTML časť zložených/alternatívnych správ"
 
-#: src/prefs_message.c:175
+#: src/prefs_message.c:174
 msgid "Line space"
 msgstr "Medzera medzi riadkami"
 
-#: src/prefs_message.c:189 src/prefs_message.c:223
+#: src/prefs_message.c:187 src/prefs_message.c:220
 msgid "pixels"
 msgstr "pixely"
 
-#: src/prefs_message.c:195
+#: src/prefs_message.c:193
 msgid "Scroll"
 msgstr "Posúvanie"
 
-#: src/prefs_message.c:197
+#: src/prefs_message.c:195
 msgid "Half page"
 msgstr "Pol stránky"
 
-#: src/prefs_message.c:203
+#: src/prefs_message.c:201
 msgid "Smooth scroll"
 msgstr "Plynulé posúvanie"
 
-#: src/prefs_message.c:209
+#: src/prefs_message.c:207
 msgid "Step"
 msgstr "Posun"
 
-#: src/prefs_message.c:230
+#: src/prefs_message.c:227
 msgid "Show attachment descriptions (rather than names)"
 msgstr "Zobraziť popisy príloh miesto ich názvov"
 
-#: src/prefs_message.c:233
+#: src/prefs_message.c:230
 msgid "Quotation"
 msgstr "Citácia"
 
-#: src/prefs_message.c:242
+#: src/prefs_message.c:239
 msgid "Collapse quoted text on double click"
 msgstr "Zbaliť citovaný text po dvojkliku"
 
-#: src/prefs_message.c:249
-msgid "Treat these characters as quotation marks: "
-msgstr "Brať tieto znaky ako znaky citácie: "
+#: src/prefs_message.c:246
+msgid "Treat these characters as quotation marks"
+msgstr "Za úvodzovky považovať tieto znaky"
 
-#: src/prefs_message.c:355
+#: src/prefs_message.c:352
 msgid "Text Options"
 msgstr "Textové možnosti"
 
-#: src/prefs_migration.c:50
+#: src/prefs_migration.c:51
 #, c-format
 msgid ""
 "Your Claws Mail configuration is from a newer version than the version which "
@@ -16432,36 +16658,36 @@ msgstr ""
 "\n"
 "Chcete teraz skončiť?"
 
-#: src/prefs_migration.c:59
+#: src/prefs_migration.c:60
 msgid "Configuration warning"
 msgstr "Konfiguračné upozornenie"
 
-#: src/prefs_msg_colors.c:146
+#: src/prefs_msg_colors.c:155
 msgid "Message view"
 msgstr "Zobrazenie správy"
 
-#: src/prefs_msg_colors.c:153
+#: src/prefs_msg_colors.c:162
 msgid "Enable coloration of message text"
 msgstr "Povoliť farby v texte správy"
 
-#: src/prefs_msg_colors.c:161
+#: src/prefs_msg_colors.c:170
 msgid "Quote"
 msgstr "Citácia"
 
-#: src/prefs_msg_colors.c:173
+#: src/prefs_msg_colors.c:182
 msgid "Cycle quote colors"
 msgstr "Opakovať farby citátov"
 
-#: src/prefs_msg_colors.c:177
+#: src/prefs_msg_colors.c:186
 msgid "If there are more than 3 quote levels, the colors will be reused"
 msgstr "Pri viac ako troch úrovniach citácií budú farby opakované"
 
-#: src/prefs_msg_colors.c:183
+#: src/prefs_msg_colors.c:192
 msgid "1st Level"
 msgstr "Prvá úroveň"
 
-#: src/prefs_msg_colors.c:189 src/prefs_msg_colors.c:214
-#: src/prefs_msg_colors.c:239
+#: src/prefs_msg_colors.c:198 src/prefs_msg_colors.c:216
+#: src/prefs_msg_colors.c:234
 msgid "Text"
 msgstr "Text"
 
@@ -16470,62 +16696,98 @@ msgctxt "Tooltip"
 msgid "Pick color for 1st level text"
 msgstr "Vyberte farbu prvej úrovne textu"
 
-#: src/prefs_msg_colors.c:208
+#: src/prefs_msg_colors.c:210
 msgid "2nd Level"
 msgstr "Druhá úroveň"
 
-#: src/prefs_msg_colors.c:227
+#: src/prefs_msg_colors.c:220
 msgctxt "Tooltip"
 msgid "Pick color for 2nd level text"
 msgstr "Vyberte farbu druhej úrovne textu"
 
-#: src/prefs_msg_colors.c:233
+#: src/prefs_msg_colors.c:228
 msgid "3rd Level"
 msgstr "Tretia úroveň"
 
-#: src/prefs_msg_colors.c:252
+#: src/prefs_msg_colors.c:238
 msgctxt "Tooltip"
 msgid "Pick color for 3rd level text"
 msgstr "Vyberte farbu tretej úrovne textu"
 
-#: src/prefs_msg_colors.c:259
+#: src/prefs_msg_colors.c:247
 msgid "Enable coloration of text background"
 msgstr "Povoliť zafarbenie pozadia textu"
 
-#: src/prefs_msg_colors.c:274
+#: src/prefs_msg_colors.c:256
 msgctxt "Tooltip"
 msgid "Pick color for 1st level text background"
 msgstr "Vyberte farbu pozadia prvej úrovne textu"
 
-#: src/prefs_msg_colors.c:294
+#: src/prefs_msg_colors.c:269
 msgctxt "Tooltip"
 msgid "Pick color for 2nd level text background"
 msgstr "Vyberte farbu pozadia druhej úrovne textu"
 
-#: src/prefs_msg_colors.c:314
+#: src/prefs_msg_colors.c:282
 msgctxt "Tooltip"
 msgid "Pick color for 3rd level text background"
 msgstr "Vyberte farbu pozadia tretej úrovne textu"
 
-#: src/prefs_msg_colors.c:333
+#: src/prefs_msg_colors.c:294
 msgctxt "Tooltip"
 msgid "Pick color for links"
 msgstr "Vyberte farbu odkazov"
 
-#: src/prefs_msg_colors.c:335
+#: src/prefs_msg_colors.c:298
 msgid "URI link"
 msgstr "URI odkaz"
 
-#: src/prefs_msg_colors.c:351
+#: src/prefs_msg_colors.c:306
 msgctxt "Tooltip"
 msgid "Pick color for signatures"
 msgstr "Vyberte farbu podpisov"
 
-#: src/prefs_msg_colors.c:358 src/prefs_summaries.c:365
+#. TRANSLATORS: A patch is a text file listing the differences between 2 or more different
+#. versions of the same text file
+#: src/prefs_msg_colors.c:316
+msgid "Patch messages and attachments"
+msgstr "Správy a prílohy záplat"
+
+#: src/prefs_msg_colors.c:324
+msgctxt "Tooltip"
+msgid "Pick color for inserted lines"
+msgstr "Vyberte farbu vložených riadkov"
+
+#: src/prefs_msg_colors.c:326
+msgid "Inserted lines"
+msgstr "Vložené riadky"
+
+#: src/prefs_msg_colors.c:333
+msgctxt "Tooltip"
+msgid "Pick color for removed lines"
+msgstr "Vyberte farbu odstránených riadkov"
+
+#: src/prefs_msg_colors.c:336
+msgid "Removed lines"
+msgstr "Odstránené riadky"
+
+#. TRANSLATORS: A hunk is a section of the patch indicating how the files differ
+#: src/prefs_msg_colors.c:344
+msgctxt "Tooltip."
+msgid "Pick color for hunk lines"
+msgstr "Vyberte farbu skupiny riadkov"
+
+#. TRANSLATORS: A hunk is a section of the patch indicating how the files differ
+#: src/prefs_msg_colors.c:348
+msgid "Hunk lines"
+msgstr "Skupiny riadkov"
+
+#: src/prefs_msg_colors.c:350 src/prefs_summaries.c:380
 msgid "Folder list"
 msgstr "Zoznam správ"
 
-#: src/prefs_msg_colors.c:370
+#: src/prefs_msg_colors.c:357
+msgctxt "Tooltip"
 msgid ""
 "Pick color for Target folder. Target folder is used when the option 'Execute "
 "immediately when moving or deleting messages' is turned off"
@@ -16533,21 +16795,22 @@ msgstr ""
 "Vyberte farbu cieľovej zložky. Bude použitá, ak je vypnutá voľba „Pri "
 "presúvaní alebo mazaní správ toto vykonať okamžite”"
 
-#: src/prefs_msg_colors.c:374
+#: src/prefs_msg_colors.c:362
 msgid "Target folder"
 msgstr "Cieľová zložka"
 
-#: src/prefs_msg_colors.c:388
+#: src/prefs_msg_colors.c:369
+msgctxt "Tooltip"
 msgid "Pick color for folders containing new messages"
 msgstr "Vyberte farbu zložiek s novými správami"
 
-#: src/prefs_msg_colors.c:390
+#: src/prefs_msg_colors.c:373
 msgid "Folder containing new messages"
 msgstr "Zložka s novými správami"
 
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated
-#: src/prefs_msg_colors.c:417 src/prefs_msg_colors.c:449
+#: src/prefs_msg_colors.c:398 src/prefs_msg_colors.c:430
 #, c-format
 msgctxt "Tooltip"
 msgid "Pick color for 'color %d'"
@@ -16555,82 +16818,97 @@ msgstr "Vyberte farbu pre „color %d”"
 
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated
-#: src/prefs_msg_colors.c:421 src/prefs_msg_colors.c:453
+#: src/prefs_msg_colors.c:402 src/prefs_msg_colors.c:434
 #, c-format
 msgid "Set label for 'color %d'"
 msgstr "Nastaviť menovku pre „color %d”"
 
-#. TRANSLATORS: 'color %d' refers to the filtering/processing
-#. rule name and should not be translated
-#: src/prefs_msg_colors.c:582
-#, c-format
-msgctxt "Dialog title"
-msgid "Pick color for 'color %d'"
-msgstr "Vyberte farbu pre „color %d”"
-
-#: src/prefs_msg_colors.c:590
+#: src/prefs_msg_colors.c:529
 msgctxt "Dialog title"
 msgid "Pick color for 1st level text"
 msgstr "Vyberte farbu prvej úrovne textu"
 
-#: src/prefs_msg_colors.c:593
+#: src/prefs_msg_colors.c:531
 msgctxt "Dialog title"
 msgid "Pick color for 2nd level text"
 msgstr "Vyberte farbu druhej úrovne textu"
 
-#: src/prefs_msg_colors.c:596
+#: src/prefs_msg_colors.c:533
 msgctxt "Dialog title"
 msgid "Pick color for 3rd level text"
 msgstr "Vyberte farbu tretej úrovne textu"
 
-#: src/prefs_msg_colors.c:599
+#: src/prefs_msg_colors.c:535
 msgctxt "Dialog title"
 msgid "Pick color for 1st level text background"
 msgstr "Vyberte farbu pozadia prvej úrovne textu"
 
-#: src/prefs_msg_colors.c:602
+#: src/prefs_msg_colors.c:537
 msgctxt "Dialog title"
 msgid "Pick color for 2nd level text background"
 msgstr "Vyberte farbu pozadia druhej úrovne textu"
 
-#: src/prefs_msg_colors.c:605
+#: src/prefs_msg_colors.c:539
 msgctxt "Dialog title"
 msgid "Pick color for 3rd level text background"
 msgstr "Vyberte farbu pozadia tretej úrovne textu"
 
-#: src/prefs_msg_colors.c:608
+#: src/prefs_msg_colors.c:541
 msgctxt "Dialog title"
 msgid "Pick color for links"
 msgstr "Vyberte farbu odkazov"
 
-#: src/prefs_msg_colors.c:611
+#: src/prefs_msg_colors.c:543
 msgctxt "Dialog title"
 msgid "Pick color for target folder"
 msgstr "Vyberte farbu cieľovej zložky"
 
-#: src/prefs_msg_colors.c:614
+#: src/prefs_msg_colors.c:545
 msgctxt "Dialog title"
 msgid "Pick color for signatures"
 msgstr "Vyberte farbu podpisov"
 
-#: src/prefs_msg_colors.c:617
+#: src/prefs_msg_colors.c:547
 msgctxt "Dialog title"
 msgid "Pick color for folder"
 msgstr "Vyberte farbu zložky"
 
-#: src/prefs_msg_colors.c:831
+#: src/prefs_msg_colors.c:549
+msgctxt "Dialog title"
+msgid "Pick color for inserted lines"
+msgstr "Vyberte farbu vložených riadkov"
+
+#: src/prefs_msg_colors.c:551
+msgctxt "Dialog title"
+msgid "Pick color for removed lines"
+msgstr "Vyberte farbu odstránených riadkov"
+
+#: src/prefs_msg_colors.c:553
+msgctxt "Dialog title"
+msgid "Pick color for hunk lines"
+msgstr "Vyberte farbu skupiny riadkov"
+
+#. TRANSLATORS: 'color %d' refers to the filtering/processing
+#. rule name and should not be translated
+#: src/prefs_msg_colors.c:576
+#, c-format
+msgctxt "Dialog title"
+msgid "Pick color for 'color %d'"
+msgstr "Vyberte farbu pre „color %d”"
+
+#: src/prefs_msg_colors.c:777
 msgid "Colors"
 msgstr "Farby"
 
-#: src/prefs_other.c:107
+#: src/prefs_other.c:109
 msgid "Choose preset keyboard shortcuts"
 msgstr "Zvoliť predvolené klávesové skratky"
 
-#: src/prefs_other.c:121
+#: src/prefs_other.c:124
 msgid "Select preset:"
 msgstr "Zvoľte sadu klávesových skratiek:"
 
-#: src/prefs_other.c:136
+#: src/prefs_other.c:139
 msgid ""
 "You can also modify each menu shortcut by pressing\n"
 "any key(s) when focusing the mouse pointer on the item."
@@ -16638,35 +16916,39 @@ msgstr ""
 "Môžete modifikovať skratky každého menu stlačením\n"
 "požadovanej skratky po ukázaní myšou na položku."
 
-#: src/prefs_other.c:496
+#: src/prefs_other.c:497
 msgid "Add address to destination when double-clicked"
 msgstr "Pridať adresu k príjemcom po dvojitom kliknutí"
 
-#: src/prefs_other.c:499
+#: src/prefs_other.c:500
 msgid "On exit"
 msgstr "Pri ukončení"
 
-#: src/prefs_other.c:502
+#: src/prefs_other.c:503
 msgid "Confirm on exit"
 msgstr "Potvrdiť ukončenie"
 
-#: src/prefs_other.c:509
+#: src/prefs_other.c:510
 msgid "Empty trash on exit"
 msgstr "Vyprázdniť kôš pri ukončení"
 
-#: src/prefs_other.c:512
+#: src/prefs_other.c:513
 msgid "Warn if there are queued messages"
 msgstr "Upozorniť, ak sú správy vo fronte"
 
-#: src/prefs_other.c:514
+#: src/prefs_other.c:515
 msgid "Keyboard shortcuts"
 msgstr "Klávesové skratky"
 
-#: src/prefs_other.c:517
+#: src/prefs_other.c:518
+msgid "Enable keyboard shortcuts"
+msgstr "Zapnúť klávesové skratky"
+
+#: src/prefs_other.c:521
 msgid "Enable customisable keyboard shortcuts"
 msgstr "Povoliť prispôsobenie klávesových skratiek"
 
-#: src/prefs_other.c:520
+#: src/prefs_other.c:524
 msgid ""
 "If checked, you can change the keyboard shortcuts of most of the menu items "
 "by focusing on the menu item and pressing a key combination.\n"
@@ -16676,15 +16958,15 @@ msgstr ""
 "vybratím položky menu a stlačením kombinácie kláves.\n"
 "Zrušte túto voľbu, ak chcete zamknúť klávesové skratky."
 
-#: src/prefs_other.c:527
+#: src/prefs_other.c:531
 msgid " Choose preset keyboard shortcuts... "
-msgstr " Zvoliť predvolené klávesové skratky… "
+msgstr " Zvoliť predvolené klávesové skratky... "
 
-#: src/prefs_other.c:537
+#: src/prefs_other.c:541
 msgid "Metadata handling"
 msgstr "Spracovanie metadát"
 
-#: src/prefs_other.c:538
+#: src/prefs_other.c:542
 msgid ""
 "Safer mode asks the OS to write metadata to disk directly;\n"
 "it avoids data loss after crashes but can take some time."
@@ -16692,33 +16974,44 @@ msgstr ""
 "Bezpečnejší režim požiada OS o zápis metadát priamo;\n"
 "priamy zápis predchádza strate dát pri havárii, ale trvá dlhšie."
 
-#: src/prefs_other.c:542
+#: src/prefs_other.c:546
 msgid "Safer"
 msgstr "Bezpečnejšie"
 
-#: src/prefs_other.c:544
+#: src/prefs_other.c:548
 msgid "Faster"
 msgstr "Rýchlejšie"
 
-#: src/prefs_other.c:562
+#: src/prefs_other.c:566
 msgid "Socket I/O timeout"
 msgstr "Časový limit spojení"
 
-#: src/prefs_other.c:583
+#: src/prefs_other.c:587
+msgid "Translate header names"
+msgstr "Prekladať názvy hlavičiek"
+
+#: src/prefs_other.c:589
+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_other.c:592
 msgid "Ask before emptying trash"
 msgstr "Potvrdiť vyprázdnenie koša"
 
-#: src/prefs_other.c:585
+#: src/prefs_other.c:594
 msgid "Ask about account specific filtering rules when filtering manually"
 msgstr ""
 "Potvrdiť filtrovacie pravidlá špecifické pre jednotlivé účty pri ručnom "
 "filtrovaní"
 
-#: src/prefs_other.c:590
+#: src/prefs_other.c:599
 msgid "Use secure file deletion if possible"
 msgstr "Použiť bezpečné mazanie súborov, ak je to možné"
 
-#: src/prefs_other.c:594
+#: src/prefs_other.c:603
 msgid ""
 "Use secure file deletion if possible\n"
 "(the 'shred' program is not available)"
@@ -16726,7 +17019,7 @@ msgstr ""
 "Použiť bezpečné mazanie súborov, ak je to možné\n"
 "(program „shred” nie je dostupný)"
 
-#: src/prefs_other.c:599
+#: src/prefs_other.c:608
 msgid ""
 "Use the 'shred' program to overwrite files with random data before deleting "
 "them. This slows down deletion. Be sure to read shred's man page for caveats."
@@ -16735,19 +17028,19 @@ msgstr ""
 "zmazaním, čo umožňuje bezpečné zmazanie. Podrobnosti hľadajte v manuálovej "
 "stránke shred."
 
-#: src/prefs_other.c:603
+#: src/prefs_other.c:612
 msgid "Synchronise offline folders as soon as possible"
 msgstr "Synchronizovať zložky hneď ako je to možné"
 
-#: src/prefs_other.c:606
+#: src/prefs_other.c:615
 msgid "Master passphrase"
 msgstr "Hlavná tajná veta"
 
-#: src/prefs_other.c:609
+#: src/prefs_other.c:618
 msgid "Use a master passphrase"
 msgstr "Použiť hlavnú tajnú vetu"
 
-#: src/prefs_other.c:612
+#: src/prefs_other.c:621
 msgid ""
 "If checked, your saved account passwords will be protected by a master "
 "passphrase. If no master passphrase is set, you will be prompted to set one."
@@ -16755,128 +17048,116 @@ msgstr ""
 "Ak je zvolené, uložené heslá k účtom budú chránené hlavnou tajnou vetou. Ak "
 "ešte nebola nastavená žiadna tajná veta, budete vyzvaný na jej nastavenie."
 
-#: src/prefs_other.c:617
+#: src/prefs_other.c:626
 msgid "Change master passphrase"
 msgstr "Zmeniť hlavnú tajnú vetu"
 
-#: src/prefs_other.c:777
+#: src/prefs_other.c:816
 msgid "Miscellaneous"
 msgstr "Rôzne"
 
+#: src/prefs_proxy.c:240 src/prefs_receive.c:415 src/prefs_send.c:419
+msgid "Mail Handling"
+msgstr "Správa pošty"
+
 #: src/prefs_quote.c:77
 msgid "On %d\\n%f wrote:\\n\\n%q"
 msgstr "Dňa %d\\n%f napísal:\\n\\n%q"
 
-#: src/prefs_receive.c:142
+#: src/prefs_receive.c:145
 msgid "External incorporation program"
 msgstr "Externý program na príjem"
 
-#: src/prefs_receive.c:145
+#: src/prefs_receive.c:148
 msgid "Use external program for receiving mail"
 msgstr "Na príjem pošty použiť externý program"
 
-#: src/prefs_receive.c:161
-msgid "Automatic checking"
-msgstr "Automatická kontrola"
-
-#: src/prefs_receive.c:168
-msgid "Check for new mail every"
-msgstr "Automaticky kontrolovať novú poštu každých"
-
-#: src/prefs_receive.c:212
+#: src/prefs_receive.c:215
 msgid "Check for new mail on start-up"
 msgstr "Skontrolovať novú poštu pri spustení"
 
-#: src/prefs_receive.c:215
+#: src/prefs_receive.c:218
 msgid "Dialogs"
 msgstr "Dialógy"
 
-#: src/prefs_receive.c:217
+#: src/prefs_receive.c:220
 msgid "Show receive dialog"
 msgstr "Zobraziť okno prijímania"
 
-#: src/prefs_receive.c:227
+#: src/prefs_receive.c:230
 msgid "Only on manual receiving"
 msgstr "Len pri manuálnom prijímaní"
 
-#: src/prefs_receive.c:238
+#: src/prefs_receive.c:241
 msgid "Close receive dialog when finished"
 msgstr "Po skončení zavrieť okno prijímania"
 
-#: src/prefs_receive.c:241
+#: src/prefs_receive.c:244
 msgid "Don't popup error dialog on receive error"
 msgstr "Nezobrazovať upozornenie pri chybe pri prijímaní"
 
-#: src/prefs_receive.c:244
+#: src/prefs_receive.c:247
 msgid "After receiving new mail"
 msgstr "Po prijatí novej správy"
 
-#: src/prefs_receive.c:246
+#: src/prefs_receive.c:249
 msgid "Go to Inbox"
 msgstr "Prejsť do zložky doručenej pošty"
 
-#: src/prefs_receive.c:248
+#: src/prefs_receive.c:251
 msgid "Update all local folders"
 msgstr "Aktualizovať všetky miestne zložky"
 
-#: src/prefs_receive.c:250
+#: src/prefs_receive.c:253
 msgid "Run command"
 msgstr "Spustiť príkaz"
 
-#: src/prefs_receive.c:255
+#: src/prefs_receive.c:258
 msgid "after automatic check"
 msgstr "po automatickej kontrole"
 
-#: src/prefs_receive.c:257
+#: src/prefs_receive.c:260
 msgid "after manual check"
 msgstr "po ručnej kontrole"
 
-#: src/prefs_receive.c:265
+#: src/prefs_receive.c:280
 #, c-format
-msgid ""
-"Command to execute:\n"
-"(use %d as number of new mails)"
-msgstr ""
-"Vykonať príkaz:\n"
-"(použite %d ako počet nových správ)"
+msgid "Use %d as number of new mails"
+msgstr "Použite %d ako počet nových správ"
 
-#: src/prefs_receive.c:408 src/prefs_send.c:415
-msgid "Mail Handling"
-msgstr "Správa pošty"
-
-#: src/prefs_receive.c:409
+#: src/prefs_receive.c:416
 msgid "Receiving"
 msgstr "Príjem pošty"
 
-#: src/prefs_send.c:172
+#: src/prefs_send.c:176
 msgid "Save sent messages"
 msgstr "Uložiť odoslané správy"
 
-#: src/prefs_send.c:175
+#: src/prefs_send.c:179
 msgid "Never send Return Receipts"
 msgstr "Neposielať potvrdenia o doručení"
 
-#: src/prefs_send.c:193
+#: src/prefs_send.c:197
 msgid "Confirm before sending queued messages"
 msgstr "Potvrdiť odoslanie správ vo fronte"
 
-#: src/prefs_send.c:196
+#: src/prefs_send.c:200
 msgid "Show send dialog"
 msgstr "Zobraziť okno odosielania"
 
-#: src/prefs_send.c:199
+#: src/prefs_send.c:203
 msgid "Warn when Subject is empty"
 msgstr "Upozorniť na prázdny predmet"
 
-#: src/prefs_send.c:205
-msgid "Warn when sending to more recipients than:"
-msgstr "Upozorniť pri posielaní viacerým používateľom ako:"
+#: src/prefs_send.c:209
+msgid "Warn when sending to more recipients than"
+msgstr "Upozorniť pri odosielaní viacerým adresátom ako"
 
-#: src/prefs_send.c:221
+#: src/prefs_send.c:225
 msgid "Outgoing encoding"
 msgstr "Výstupné kódovanie"
 
-#: src/prefs_send.c:246
+#: src/prefs_send.c:250
 msgid ""
 "If 'Automatic' is selected, the optimal encoding for the current locale will "
 "be used"
@@ -16884,131 +17165,131 @@ msgstr ""
 "Po zvolení „Automatické” bude zvolené optimálne kódovanie pre súčasnú "
 "lokalizáciu"
 
-#: src/prefs_send.c:263
+#: src/prefs_send.c:267
 msgid "7bit ASCII (US-ASCII)"
 msgstr "7bit ASCII (US-ASCII)"
 
-#: src/prefs_send.c:264
+#: src/prefs_send.c:268
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_send.c:266
+#: src/prefs_send.c:270
 msgid "Western European (ISO-8859-1)"
 msgstr "Západná Európa (ISO-8859-1)"
 
-#: src/prefs_send.c:267
+#: src/prefs_send.c:271
 msgid "Western European (ISO-8859-15)"
 msgstr "Západná Európa (ISO-8859-15)"
 
-#: src/prefs_send.c:269
+#: src/prefs_send.c:273
 msgid "Central European (ISO-8859-2)"
 msgstr "Stredná Európa (ISO-8859-2)"
 
-#: src/prefs_send.c:271
+#: src/prefs_send.c:275
 msgid "Baltic (ISO-8859-13)"
 msgstr "Pobaltie (ISO-8859-13)"
 
-#: src/prefs_send.c:272
+#: src/prefs_send.c:276
 msgid "Baltic (ISO-8859-4)"
 msgstr "Pobaltie (ISO-8859-4)"
 
-#: src/prefs_send.c:274
+#: src/prefs_send.c:278
 msgid "Greek (ISO-8859-7)"
 msgstr "Grécko (ISO-8859-7)"
 
-#: src/prefs_send.c:276
+#: src/prefs_send.c:280
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Hebrejské (ISO-8859-8)"
 
-#: src/prefs_send.c:277
+#: src/prefs_send.c:281
 msgid "Hebrew (Windows-1255)"
 msgstr "Hebrejské (Windows-1255)"
 
-#: src/prefs_send.c:279
+#: src/prefs_send.c:283
 msgid "Arabic (ISO-8859-6)"
 msgstr "Arabské (ISO-8859-6)"
 
-#: src/prefs_send.c:280
+#: src/prefs_send.c:284
 msgid "Arabic (Windows-1256)"
 msgstr "Arabské (Windows-1256)"
 
-#: src/prefs_send.c:282
+#: src/prefs_send.c:286
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turecko (ISO-8859-9)"
 
-#: src/prefs_send.c:284
+#: src/prefs_send.c:288
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cyrilika (ISO-8859-5)"
 
-#: src/prefs_send.c:285
+#: src/prefs_send.c:289
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cyrilika (KOI8-R)"
 
-#: src/prefs_send.c:286
+#: src/prefs_send.c:290
 msgid "Cyrillic (X-MAC-CYRILLIC)"
 msgstr "Cyrilika (X-MAC-CYRILLIC)"
 
-#: src/prefs_send.c:287
+#: src/prefs_send.c:291
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cyrilika (KOI8-U)"
 
-#: src/prefs_send.c:288
+#: src/prefs_send.c:292
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cyrilika (Windows-1251)"
 
-#: src/prefs_send.c:290
+#: src/prefs_send.c:294
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonsko (ISO-2022-JP)"
 
-#: src/prefs_send.c:292
+#: src/prefs_send.c:296
 msgid "Japanese (EUC-JP)"
 msgstr "Japonsko (EUC-JP)"
 
-#: src/prefs_send.c:293
+#: src/prefs_send.c:297
 msgid "Japanese (Shift_JIS)"
 msgstr "Japonsko (Shift_JIS)"
 
-#: src/prefs_send.c:296
+#: src/prefs_send.c:300
 msgid "Simplified Chinese (GB18030)"
 msgstr "Zjednodušená čínština (GB18030)"
 
-#: src/prefs_send.c:297
+#: src/prefs_send.c:301
 msgid "Simplified Chinese (GB2312)"
 msgstr "Zjednodušená čínština (GB2312)"
 
-#: src/prefs_send.c:298
+#: src/prefs_send.c:302
 msgid "Simplified Chinese (GBK)"
 msgstr "Zjednodušená čínština (GBK)"
 
-#: src/prefs_send.c:299
+#: src/prefs_send.c:303
 msgid "Traditional Chinese (Big5)"
 msgstr "Tradičná čínština (Big5)"
 
-#: src/prefs_send.c:301
+#: src/prefs_send.c:305
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Tradičná čínština (EUC-TW)"
 
-#: src/prefs_send.c:302
+#: src/prefs_send.c:306
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Čínština (ISO-2022-CN)"
 
-#: src/prefs_send.c:305
+#: src/prefs_send.c:309
 msgid "Korean (EUC-KR)"
 msgstr "Kórea (EUC-KR)"
 
-#: src/prefs_send.c:307
+#: src/prefs_send.c:311
 msgid "Thai (TIS-620)"
 msgstr "Thajsko (TIS-620)"
 
-#: src/prefs_send.c:308
+#: src/prefs_send.c:312
 msgid "Thai (Windows-874)"
 msgstr "Thajsko (Windows-874)"
 
-#: src/prefs_send.c:312
+#: src/prefs_send.c:316
 msgid "Transfer encoding"
 msgstr "Kódovanie pri prenose"
 
-#: src/prefs_send.c:323
+#: src/prefs_send.c:327
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters"
@@ -17016,8 +17297,8 @@ msgstr ""
 "Zadajte hodnotu Content-Transfer-Encoding, ktorá bude použitá, keď bude "
 "správa obsahovať iné znaky ako ASCII"
 
-#: src/prefs_send.c:416 src/send_message.c:501 src/send_message.c:505
-#: src/send_message.c:510
+#: src/prefs_send.c:420 src/send_message.c:520 src/send_message.c:524
+#: src/send_message.c:529
 msgid "Sending"
 msgstr "Odosielanie"
 
@@ -17055,7 +17336,7 @@ msgstr "Skontrolovať podľa oboch slovníkov"
 
 #: src/prefs_spelling.c:194
 msgid "Get more dictionaries..."
-msgstr "Získať ďalšie slovníky…"
+msgstr "Získať ďalšie slovníky..."
 
 #: src/prefs_spelling.c:204
 msgid "Misspelled word color"
@@ -17069,243 +17350,270 @@ msgstr "Vyberte farbu nesprávneho slova. Použite čiernu na podčiarkovanie"
 msgid "Spell Checking"
 msgstr "Kontrola preklepov"
 
-#: src/prefs_summaries.c:160
+#: src/prefs_summaries.c:167
 msgid "the abbreviated weekday name"
 msgstr "skrátený názov dňa v týždni"
 
-#: src/prefs_summaries.c:161
+#: src/prefs_summaries.c:168
 msgid "the full weekday name"
 msgstr "názov dňa v týždni"
 
-#: src/prefs_summaries.c:162
+#: src/prefs_summaries.c:169
 msgid "the abbreviated month name"
 msgstr "skrátený názov mesiaca"
 
-#: src/prefs_summaries.c:163
+#: src/prefs_summaries.c:170
 msgid "the full month name"
 msgstr "názov mesiaca"
 
-#: src/prefs_summaries.c:164
+#: src/prefs_summaries.c:171
 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:165
+#: src/prefs_summaries.c:172
 msgid "the century number (year/100)"
 msgstr "storočie (rok/100)"
 
-#: src/prefs_summaries.c:166
+#: src/prefs_summaries.c:173
 msgid "the day of the month as a decimal number"
 msgstr "deň v mesiaci"
 
-#: src/prefs_summaries.c:167
+#: src/prefs_summaries.c:174
 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:168
+#: src/prefs_summaries.c:175
 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:169
+#: src/prefs_summaries.c:176
 msgid "the day of the year as a decimal number"
 msgstr "číslo dňa v roku"
 
-#: src/prefs_summaries.c:170
+#: src/prefs_summaries.c:177
 msgid "the month as a decimal number"
 msgstr "číslo mesiaca"
 
-#: src/prefs_summaries.c:171
+#: src/prefs_summaries.c:178
 msgid "the minute as a decimal number"
 msgstr "minúty"
 
-#: src/prefs_summaries.c:172
+#: src/prefs_summaries.c:179
 msgid "either AM or PM"
 msgstr "AM alebo PM"
 
-#: src/prefs_summaries.c:173
+#: src/prefs_summaries.c:180
 msgid "the second as a decimal number"
 msgstr "sekundy"
 
-#: src/prefs_summaries.c:174
+#: src/prefs_summaries.c:181
 msgid "the day of the week as a decimal number"
 msgstr "poradie dňa v týždni"
 
-#: src/prefs_summaries.c:175
+#: src/prefs_summaries.c:182
 msgid "the preferred date for the current locale"
 msgstr "uprednostňovaný dátum aktuálnej lokalizácie"
 
-#: src/prefs_summaries.c:176
+#: src/prefs_summaries.c:183
 msgid "the last two digits of a year"
 msgstr "posledné dve číslice roku"
 
-#: src/prefs_summaries.c:177
+#: src/prefs_summaries.c:184
 msgid "the year as a decimal number"
 msgstr "rok"
 
-#: src/prefs_summaries.c:178
+#: src/prefs_summaries.c:185
 msgid "the time zone or name or abbreviation"
 msgstr "časová zóna, jej názov alebo skratka"
 
-#: src/prefs_summaries.c:199 src/prefs_summaries.c:247
-#: src/prefs_summaries.c:565
+#: src/prefs_summaries.c:206 src/prefs_summaries.c:255
+#: src/prefs_summaries.c:486
 msgid "Date format"
 msgstr "Formát dátumu"
 
-#: src/prefs_summaries.c:223
+#: src/prefs_summaries.c:231
 msgid "Specifier"
 msgstr "Symbol"
 
-#: src/prefs_summaries.c:265
+#: src/prefs_summaries.c:273
 msgid "Example"
 msgstr "Príklad"
 
-#: src/prefs_summaries.c:371
+#: src/prefs_summaries.c:400
 msgid "Display message count next to folder name"
 msgstr "Zobraziť počet správ vedľa názvu zložky"
 
-#: src/prefs_summaries.c:381
+#: src/prefs_summaries.c:410
 msgid "Unread messages"
 msgstr "Počet neprečítaných správ"
 
-#: src/prefs_summaries.c:382
+#: src/prefs_summaries.c:411
 msgid "Unread and Total messages"
 msgstr "Počet neprečítaných a všetkých správ"
 
-#: src/prefs_summaries.c:392
+#: src/prefs_summaries.c:417
 msgid "Open last opened folder at start-up"
 msgstr "Pri štarte otvoriť poslednú otvorenú zložku"
 
-#: src/prefs_summaries.c:395
+#: src/prefs_summaries.c:424
 msgid "Abbreviate newsgroup names longer than"
 msgstr "Skrátiť diskusné skupiny dlhšie ako"
 
-#: src/prefs_summaries.c:408
+#: src/prefs_summaries.c:437
 msgid "letters"
 msgstr "písmen"
 
-#: src/prefs_summaries.c:426
+#: src/prefs_summaries.c:445
 msgid "Message list"
 msgstr "Zoznam správ"
 
-#: src/prefs_summaries.c:432
-msgid "Sort new folders by"
-msgstr "Zoradiť nové zložky podľa"
+#: src/prefs_summaries.c:462
+msgid "Lock column headers"
+msgstr "Zamknúť hlavičky stĺpcov"
 
-#: src/prefs_summaries.c:440 src/prefs_summary_column.c:85
-msgid "Number"
-msgstr "Číslo"
+#: src/prefs_summaries.c:468
+msgid "Displayed in From column"
+msgstr "Zobrazené v stĺpci Od"
 
-#: src/prefs_summaries.c:443
-msgid "Thread date"
-msgstr "Dátumu vlákna"
+#: src/prefs_summaries.c:479
+msgid "Name and Address"
+msgstr "Meno a adresa"
 
-#: src/prefs_summaries.c:454
-msgid "Don't sort"
-msgstr "Neradiť"
+#: src/prefs_summaries.c:505
+msgid "Date format help"
+msgstr "Pomôcka formátu dátumu"
 
-#: src/prefs_summaries.c:471
-msgid "Set default selection when entering a folder"
+#: src/prefs_summaries.c:511
+msgid "Set message selection when entering a folder"
 msgstr "Nastaviť predvolený výber pri vstupe do zložky"
 
-#: src/prefs_summaries.c:484
-msgid "Show \"no unread (or new) message\" dialog"
-msgstr "Zobraziť dialóg „žiadne neprečítané (alebo nové) správy”"
-
-#: src/prefs_summaries.c:494
-msgid "Assume 'Yes'"
-msgstr "Predpokladať „Áno”"
-
-#: src/prefs_summaries.c:495
-msgid "Assume 'No'"
-msgstr "Predpokladať „Nie”"
-
-#: src/prefs_summaries.c:500
+#: src/prefs_summaries.c:520
 msgid "Open message when selected"
 msgstr "Otvoriť správu pri vybratí"
 
-#: src/prefs_summaries.c:505
+#: src/prefs_summaries.c:525
 msgid "When opening a folder"
 msgstr "Pri otvorení zložky"
 
-#: src/prefs_summaries.c:507
+#: src/prefs_summaries.c:527
 msgid "When displaying search results"
 msgstr "Pri zobrazení výsledkov hľadania"
 
-#: src/prefs_summaries.c:509
+#: src/prefs_summaries.c:529
 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:511
+#: src/prefs_summaries.c:531
 msgid "When deleting or moving messages"
 msgstr "Pri mazaní alebo presúvaní správ"
 
-#: src/prefs_summaries.c:513
+#: src/prefs_summaries.c:533
 msgid "When using directional keys"
 msgstr "Pri použití kláves šipiek"
 
-#: src/prefs_summaries.c:517
-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:521
-msgid "Execute immediately when moving or deleting messages"
-msgstr "Pri presúvaní alebo mazaní správ toto vykonať okamžite"
-
-#: src/prefs_summaries.c:523
-msgid ""
-"Defers moving, copying and deleting of messages until you choose 'Tools/"
-"Execute'"
-msgstr ""
-"Odloží presun, kopírovanie a mazanie správ do doby než zvolíte „Nástroje/"
-"Vykonať”"
-
-#: src/prefs_summaries.c:526
+#: src/prefs_summaries.c:535
 msgid "Mark message as read"
 msgstr "Označiť správu ako prečítanú"
 
-#: src/prefs_summaries.c:529
+#: src/prefs_summaries.c:538
 msgid "when selected, after"
 msgstr "keď je vybratá, za"
 
-#: src/prefs_summaries.c:548
+#: src/prefs_summaries.c:557
 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:555
+#: src/prefs_summaries.c:567
+msgid "Show \"no unread (or new) message\" dialog"
+msgstr "Zobraziť dialóg „žiadne neprečítané (alebo nové) správy”"
+
+#: src/prefs_summaries.c:577
+msgid "Assume 'Yes'"
+msgstr "Predpokladať „Áno”"
+
+#: src/prefs_summaries.c:578
+msgid "Assume 'No'"
+msgstr "Predpokladať „Nie”"
+
+#: src/prefs_summaries.c:584
 msgid "Display sender using address book"
 msgstr "Zobraziť odosielateľa pomocou adresára"
 
-#: src/prefs_summaries.c:559
+#: src/prefs_summaries.c:588
+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:592
+msgid "Execute immediately when moving or deleting messages"
+msgstr "Pri presúvaní alebo mazaní správ toto vykonať okamžite"
+
+#: src/prefs_summaries.c:594
+msgid ""
+"When unchecked moving, copying and deleting of messages is deferred until "
+"you use 'Tools/Execute'"
+msgstr ""
+"Ak nie je zvolené, tak je presun, kopírovanie a mazanie správ odložený kým "
+"nezvolíte „Nástroje/Vykonať”"
+
+#: src/prefs_summaries.c:599
+msgid "Confirm when marking all messages as read or unread"
+msgstr ""
+"Potvrdiť pred označením všetkých správ v zložke ako prečítané alebo "
+"neprečítané"
+
+#: src/prefs_summaries.c:602
+msgid "Confirm when changing color labels"
+msgstr "Potvrdiť pred prepísaním menovky farby"
+
+#: src/prefs_summaries.c:606
 msgid "Show tooltips"
 msgstr "Zobraziť nástrojové tipy"
 
-#: src/prefs_summaries.c:585
-msgid "Date format help"
-msgstr "Pomôcka formátu dátumu"
+#: src/prefs_summaries.c:616 src/quote_fmt.c:539
+msgid "Defaults"
+msgstr "Predvolené"
 
-#: src/prefs_summaries.c:603
-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:618
+msgid "New folders"
+msgstr "Nové zložky"
 
-#: src/prefs_summaries.c:606
-msgid "Translate header names"
-msgstr "Prekladať názvy hlavičiek"
+#: src/prefs_summaries.c:624
+msgid "Sort by"
+msgstr "Radiť podľa"
 
-#: src/prefs_summaries.c:608
-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:632 src/prefs_summary_column.c:85
+msgid "Number"
+msgstr "Číslo"
+
+#: src/prefs_summaries.c:635
+msgid "Thread date"
+msgstr "Dátumu vlákna"
+
+#: src/prefs_summaries.c:646
+msgid "Don't sort"
+msgstr "Neradiť"
+
+#: src/prefs_summaries.c:661
+msgid "Thread view"
+msgstr "Zobraziť vlákna"
 
-#: src/prefs_summaries.c:767
+#: src/prefs_summaries.c:664
+msgid "Collapse all threads"
+msgstr "Zbaliť všetky vlákna"
+
+#: src/prefs_summaries.c:670
+msgid "Hide read messages"
+msgstr "Skryť prečítané správy"
+
+#: src/prefs_summaries.c:870
 msgid "Summaries"
 msgstr "Súhrny"
 
-#: src/prefs_summary_column.c:225
+#: src/prefs_summary_column.c:226
 msgid "Message list columns configuration"
 msgstr "Nastavenie stĺpcov zoznamu správ"
 
-#: src/prefs_summary_column.c:242
+#: src/prefs_summary_column.c:243
 msgid ""
 "Select columns to be displayed in the message list. You can modify\n"
 "the order by using the Up / Down buttons or by dragging the items."
@@ -17314,40 +17622,52 @@ msgstr ""
 "meniť poradie pomocou tlačidiel Nahor / Nadol, alebo presúvaním pomocou myši."
 
 #: src/prefs_summary_open.c:109
-msgid "first marked email"
-msgstr "prvá označená správa"
+msgid "oldest marked email"
+msgstr "najstaršia označená správa"
 
 #: src/prefs_summary_open.c:110
-msgid "first new email"
-msgstr "prvá nová správa"
+msgid "oldest new email"
+msgstr "najstaršia nová správa"
 
 #: src/prefs_summary_open.c:111
-msgid "first unread email"
-msgstr "prvá neprečítaná správa"
+msgid "oldest unread email"
+msgstr "najstaršia neprečítaná správa"
 
 #: src/prefs_summary_open.c:112
 msgid "last opened email"
 msgstr "posledná otvorená správa"
 
 #: src/prefs_summary_open.c:113
-msgid "last email in the list"
-msgstr "posledná správa v zozname"
+msgid "newest email in the list"
+msgstr "najnovšia správa v zozname"
 
 #: src/prefs_summary_open.c:115
-msgid "first email in the list"
-msgstr "prvá správa v zozname"
+msgid "oldest email in the list"
+msgstr "najstaršia správa v zozname"
+
+#: src/prefs_summary_open.c:116
+msgid "newest marked email"
+msgstr "najnovšia označená správa"
+
+#: src/prefs_summary_open.c:117
+msgid "newest new email"
+msgstr "najnovšia nová správa"
+
+#: src/prefs_summary_open.c:118
+msgid "newest unread email"
+msgstr "najnovšia neprečítaná správa"
 
-#: src/prefs_summary_open.c:184
-msgid " Selection when entering a folder"
-msgstr " Výber správy pri vstupe do zložky"
+#: src/prefs_summary_open.c:189
+msgid "Message selection when entering a folder"
+msgstr "Výber správy pri vstupe do zložky"
 
-#: src/prefs_summary_open.c:230
-msgid "Possible selections"
-msgstr "Možné voľby"
+#: src/prefs_summary_open.c:234
+msgid "Available selections"
+msgstr "Dostupné výbery"
 
-#: src/prefs_summary_open.c:266
-msgid "Selection on folder opening"
-msgstr "Výber pri otvorení zložky"
+#: src/prefs_summary_open.c:269
+msgid "Current selections"
+msgstr "Aktuálne výbery"
 
 #: src/prefs_template.c:80
 msgid "This name is used as the Menu item"
@@ -17448,41 +17768,37 @@ msgstr "Zmazať všetky šablóny"
 msgid "Do you really want to delete all the templates?"
 msgstr "Naozaj chcete zmazať všetky šablóny?"
 
-#: src/prefs_template.c:1233
+#: src/prefs_template.c:1234
 msgid "Current templates"
 msgstr "Aktuálne šablóny"
 
-#: src/prefs_template.c:1261
+#: src/prefs_template.c:1262
 msgid "Template"
 msgstr "Šablóna"
 
-#: src/prefs_themes.c:400 src/prefs_themes.c:841
+#: src/prefs_themes.c:401 src/prefs_themes.c:841
 msgid "Default internal theme"
 msgstr "Predvolená interná téma"
 
-#: src/prefs_themes.c:422
+#: src/prefs_themes.c:423
 msgid "Themes"
 msgstr "Témy"
 
-#: src/prefs_themes.c:501
-msgid "Only root can remove system themes"
-msgstr "Len root môže odstrániť systémové témy"
-
-#: src/prefs_themes.c:504
+#: src/prefs_themes.c:500
 #, c-format
 msgid "Remove system theme '%s'"
 msgstr "Odstrániť systémovú tému: „%s”"
 
-#: src/prefs_themes.c:507
+#: src/prefs_themes.c:502
 #, c-format
 msgid "Remove theme '%s'"
 msgstr "Odstrániť tému „%s”"
 
-#: src/prefs_themes.c:513
+#: src/prefs_themes.c:507
 msgid "Are you sure you want to remove this theme?"
 msgstr "Naozaj chcete zmazať túto tému?"
 
-#: src/prefs_themes.c:523
+#: src/prefs_themes.c:517
 #, c-format
 msgid ""
 "File %s failed\n"
@@ -17491,40 +17807,40 @@ msgstr ""
 "Chyba pri súbore %s\n"
 "počas odstraňovania témy."
 
-#: src/prefs_themes.c:527
+#: src/prefs_themes.c:521
 msgid "Removing theme directory failed."
 msgstr "Chyba pri odstraňovaní zložky témy."
 
-#: src/prefs_themes.c:530
+#: src/prefs_themes.c:524
 msgid "Theme removed successfully"
 msgstr "Téma bola úspešne odstránená"
 
-#: src/prefs_themes.c:550
+#: src/prefs_themes.c:544
 msgid "Select theme folder"
 msgstr "Zvoľte zložku témy"
 
-#: src/prefs_themes.c:565
+#: src/prefs_themes.c:559
 #, c-format
 msgid "Install theme '%s'"
 msgstr "Nainštalovať tému „%s”"
 
-#: src/prefs_themes.c:568
+#: src/prefs_themes.c:562
 msgid ""
-"This folder doesn't seem to be a theme folder.\n"
+"This folder doesn't seem to be a themefolder.\n"
 "Install anyway?"
 msgstr ""
 "Táto zložka nevyzerá ako zložka s témou.\n"
-"Nainštalovať aj napriek tomu?"
+"Nainštalovať aj tak?"
 
-#: src/prefs_themes.c:575
+#: src/prefs_themes.c:572
 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:595
+#: src/prefs_themes.c:592
 msgid "Theme exists"
 msgstr "Téma existuje"
 
-#: src/prefs_themes.c:596
+#: src/prefs_themes.c:593
 msgid ""
 "A theme with the same name is\n"
 "already installed in this location.\n"
@@ -17536,12 +17852,12 @@ msgstr ""
 "\n"
 "Chcete ju nahradiť?"
 
-#: src/prefs_themes.c:602
+#: src/prefs_themes.c:600
 #, c-format
 msgid "Couldn't delete the old theme in %s."
 msgstr "Nemožno zmazať starú tému v %s."
 
-#: src/prefs_themes.c:610
+#: src/prefs_themes.c:609
 #, c-format
 msgid "Couldn't create destination directory %s."
 msgstr "Nemožno vytvoriť cieľový adresár %s."
@@ -17592,41 +17908,41 @@ msgstr "Výber"
 
 #: src/prefs_themes.c:967
 msgid "Install new..."
-msgstr "Inštalovať novú…"
+msgstr "Inštalovať novú..."
 
 #: src/prefs_themes.c:972
 msgid "Get more..."
-msgstr "Získať ďalšie…"
+msgstr "Získať ďalšie..."
 
 #: src/prefs_themes.c:983
 msgid "Information"
 msgstr "Informácie"
 
-#: src/prefs_themes.c:997
-msgid "Author: "
-msgstr "Autor: "
+#: src/prefs_themes.c:998
+msgid "Author"
+msgstr "Autor"
 
-#: src/prefs_themes.c:1005
-msgid "URL:"
-msgstr "URL:"
+#: src/prefs_themes.c:1006
+msgid "URL"
+msgstr "URL"
 
-#: src/prefs_themes.c:1047
+#: src/prefs_themes.c:1048
 msgid "Preview"
 msgstr "Náhľad"
 
-#: src/prefs_themes.c:1103
+#: src/prefs_themes.c:1105
 msgid "SVG rendering"
 msgstr "Vykreslenie SVG"
 
-#: src/prefs_themes.c:1110
+#: src/prefs_themes.c:1112
 msgid "Enable alpha channel"
 msgstr "Povoliť priehľadnosť"
 
-#: src/prefs_themes.c:1111
+#: src/prefs_themes.c:1113
 msgid "Force scaling"
 msgstr "Vynútiť zväčšenie"
 
-#: src/prefs_themes.c:1117
+#: src/prefs_themes.c:1119
 msgid "Pixels per inch (PPI)"
 msgstr "Pixelov na palec (PPI)"
 
@@ -17646,67 +17962,67 @@ msgstr "Položka nemá určenú ikonu."
 msgid "Item has no text defined."
 msgstr "Položka nemá určený text."
 
-#: src/prefs_toolbar.c:929
+#: src/prefs_toolbar.c:896
 msgid "Toolbar item"
 msgstr "Položka panela nástrojov"
 
-#: src/prefs_toolbar.c:945
+#: src/prefs_toolbar.c:912
 msgid "Item type"
 msgstr "Typ položky"
 
-#: src/prefs_toolbar.c:955
+#: src/prefs_toolbar.c:922
 msgid "Internal Function"
 msgstr "Interná funkcia"
 
-#: src/prefs_toolbar.c:956
+#: src/prefs_toolbar.c:923
 msgid "User Action"
 msgstr "Akcia"
 
-#: src/prefs_toolbar.c:958 src/toolbar.c:279
+#: src/prefs_toolbar.c:925 src/toolbar.c:279
 msgid "Separator"
 msgstr "Oddeľovač"
 
-#: src/prefs_toolbar.c:965
+#: src/prefs_toolbar.c:932
 msgid "Event executed on click"
 msgstr "Vykonať pri kliknutí"
 
-#: src/prefs_toolbar.c:1004
+#: src/prefs_toolbar.c:959
 msgid "Toolbar text"
 msgstr "Text panela nástrojov"
 
-#: src/prefs_toolbar.c:1019 src/prefs_toolbar.c:1395
+#: src/prefs_toolbar.c:974 src/prefs_toolbar.c:1351
 msgid "Icon"
 msgstr "Ikona"
 
-#: src/prefs_toolbar.c:1055
+#: src/prefs_toolbar.c:1010
 msgid "A_dd"
 msgstr "Pri_dať"
 
-#: src/prefs_toolbar.c:1275 src/prefs_toolbar.c:1289 src/prefs_toolbar.c:1303
+#: src/prefs_toolbar.c:1230 src/prefs_toolbar.c:1244 src/prefs_toolbar.c:1258
 msgid "Toolbars"
 msgstr "Panely nástrojov"
 
-#: src/prefs_toolbar.c:1276
+#: src/prefs_toolbar.c:1231
 msgid "Main Window"
 msgstr "Hlavné okno"
 
-#: src/prefs_toolbar.c:1290
+#: src/prefs_toolbar.c:1245
 msgid "Message Window"
 msgstr "Okno správy"
 
-#: src/prefs_toolbar.c:1304
+#: src/prefs_toolbar.c:1259
 msgid "Compose Window"
 msgstr "Okno písania správy"
 
-#: src/prefs_toolbar.c:1418
+#: src/prefs_toolbar.c:1374
 msgid "Icon text"
 msgstr "Text ikony"
 
-#: src/prefs_toolbar.c:1427
+#: src/prefs_toolbar.c:1383
 msgid "Mapped event"
 msgstr "Priradená udalosť"
 
-#: src/prefs_toolbar.c:1724
+#: src/prefs_toolbar.c:1690
 msgid "Toolbar item icon"
 msgstr "Ikona panela nástrojov"
 
@@ -17734,35 +18050,35 @@ msgstr "Zalomiť text na"
 msgid "Wrapping"
 msgstr "Zalamovanie"
 
-#: src/printing.c:436
+#: src/printing.c:431
 msgid "Print preview"
 msgstr "Náhľad tlače"
 
-#: src/printing.c:479
+#: src/printing.c:474
 msgid "First page"
 msgstr "Prvá strana"
 
-#: src/printing.c:490
+#: src/printing.c:484
 msgid "Last page"
 msgstr "Posledná strana"
 
-#: src/printing.c:496
+#: src/printing.c:490
 msgid "Zoom 100%"
 msgstr "Veľkosť 100%"
 
-#: src/printing.c:498
+#: src/printing.c:492
 msgid "Zoom fit"
 msgstr "Prispôsobiť veľkosť"
 
-#: src/printing.c:500
+#: src/printing.c:494
 msgid "Zoom in"
 msgstr "Zväčšiť"
 
-#: src/printing.c:502
+#: src/printing.c:496
 msgid "Zoom out"
 msgstr "Zmenšiť"
 
-#: src/printing.c:701
+#: src/printing.c:676
 #, c-format
 msgid "Page %d"
 msgstr "Strana %d"
@@ -17775,35 +18091,39 @@ msgstr "Nie sú dostupné žiadne informácie"
 msgid "No recipient keys defined."
 msgstr "Neboli definované žiadne kľúče príjemcov."
 
-#: src/procmime.c:433 src/procmime.c:435 src/procmime.c:436
+#: src/procmime.c:402 src/procmime.c:404 src/procmime.c:405
 msgid "[Error decoding BASE64]\n"
 msgstr "[Chyba pri dekódovaní BASE64]\n"
 
-#: src/procmsg.c:937 src/procmsg.c:940
+#: src/procmime.c:2755
+msgid "Could not decode part"
+msgstr "Nemožno dekódovať časť"
+
+#: src/procmsg.c:936 src/procmsg.c:939
 msgid "Already trying to send."
 msgstr "Pokus o doručenie už prebieha."
 
-#: src/procmsg.c:1558 src/procmsg.c:1619
+#: src/procmsg.c:1563 src/procmsg.c:1624
 #, c-format
 msgid "Couldn't open file %s."
 msgstr "Nemožno otvoriť súbor %s."
 
-#: src/procmsg.c:1629
+#: src/procmsg.c:1634
 msgid "Queued message header is broken."
 msgstr "Hlavička správy vo fronte je poškodená."
 
-#: src/procmsg.c:1649
+#: src/procmsg.c:1654
 msgid "An error happened during SMTP session."
-msgstr "nastala chyba počas relácie SMTP."
+msgstr "Nastala chyba počas relácie SMTP."
 
-#: src/procmsg.c:1663
+#: src/procmsg.c:1668
 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:1671
+#: src/procmsg.c:1676
 msgid ""
 "Couldn't determine sending information. Maybe the email hasn't been "
 "generated by Claws Mail."
@@ -17811,22 +18131,22 @@ msgstr ""
 "Nemožno zistiť informácie na odoslanie. Správa asi nebola vygenerovaná "
 "programom Claws Mail."
 
-#: src/procmsg.c:1694
+#: src/procmsg.c:1699
 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:1707
+#: src/procmsg.c:1712
 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:1721
+#: src/procmsg.c:1726
 #, c-format
 msgid "Error occurred while posting the message to %s."
 msgstr "Pri odosielaní správy na %s nastala chyba."
 
-#: src/procmsg.c:2273
+#: src/procmsg.c:2286
 msgid "Filtering messages...\n"
-msgstr "Filtrujem správy…\n"
+msgstr "Filtrujem správy...\n"
 
 #: src/quote_fmt.c:47
 msgid "<span weight=\"bold\">symbols:</span>"
@@ -18075,146 +18395,142 @@ msgstr "Môžete použiť tieto symboly a príkazy:"
 msgid "Use template when composing new messages"
 msgstr "Použiť pri komponovaní nových správ šablónu"
 
-#: src/quote_fmt.c:198
+#: src/quote_fmt.c:197
 msgid ""
 "Override From header. This doesn't change the account used to compose the "
 "new message."
 msgstr ""
 "Prepísať hlavičku Od. Toto nezmení účet použitý na vytvorenie novej správy."
 
-#: src/quote_fmt.c:300
+#: src/quote_fmt.c:297
 msgid "Use template when replying to messages"
 msgstr "Použiť pri komponovaní nových správ šablónu"
 
-#: src/quote_fmt.c:324
+#: src/quote_fmt.c:320
 msgid "Override From header. This doesn't change the account used to reply."
 msgstr "Prepíše hlavičku Od. Toto nezmení účet použitý na odpoveď."
 
-#: src/quote_fmt.c:335 src/quote_fmt.c:465
+#: src/quote_fmt.c:331 src/quote_fmt.c:459
 msgid "Quotation mark"
 msgstr "Značka citácie"
 
-#: src/quote_fmt.c:430
+#: src/quote_fmt.c:425
 msgid "Use template when forwarding messages"
 msgstr "Pri posielaní ďalej použiť šablónu"
 
-#: src/quote_fmt.c:454
+#: src/quote_fmt.c:448
 msgid "Override From header. This doesn't change the account used to forward."
 msgstr "Prepíše hlavičku Od. Nezmení účet použitý na poslanie ďalej."
 
-#: src/quote_fmt.c:546
-msgid "Defaults"
-msgstr "Predvolené"
-
-#: src/quote_fmt.c:564
+#: src/quote_fmt.c:557
 msgid ""
 "The \"From\" field of the \"New message\" template contains an invalid email "
 "address."
 msgstr "Pole „Od” šablóny „Nová správa” obsahuje neplatnú emailovú adresu."
 
-#: src/quote_fmt.c:567
+#: src/quote_fmt.c:560
 msgid "The \"Subject\" field of the \"New message\" template is invalid."
 msgstr "Pole „Predmet” šablóny „Nová správa” nie je platné."
 
-#: src/quote_fmt.c:584
+#: src/quote_fmt.c:577
 msgid "The \"Quotation mark\" field of the \"Reply\" template is invalid."
 msgstr "Pole „Značka citácie” šablóny „Odpovedať” nie je platné."
 
-#: src/quote_fmt.c:604
+#: src/quote_fmt.c:597
 msgid "The \"Quotation mark\" field of the \"Forward\" template is invalid."
 msgstr "Pole „Značka citácie” šablóny „Poslať ďalej” nie je platné."
 
-#: src/quote_fmt_parse.y:541
+#: src/quote_fmt_parse.y:544
 #, c-format
 msgid "Enter text to replace '%s'"
 msgstr "Zadajte text, ktorým má nahradiť „%s”"
 
-#: src/quote_fmt_parse.y:542
+#: src/quote_fmt_parse.y:545
 msgid "Enter variable"
 msgstr "Zadajte premennú"
 
-#: src/send_message.c:152
+#: src/send_message.c:154
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Odosielam správu pomocou príkazu: %s\n"
 
-#: src/send_message.c:166
+#: src/send_message.c:168
 #, c-format
 msgid "Couldn't execute command: %s"
 msgstr "Nemožno vykonať príkaz: %s"
 
-#: src/send_message.c:202
+#: src/send_message.c:204
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Pri odosielaní správy nastala chyba: %s"
 
-#: src/send_message.c:350
+#: src/send_message.c:353
 msgid "Connecting"
 msgstr "Pripájanie"
 
-#: src/send_message.c:355
+#: src/send_message.c:358
 msgid "Doing POP before SMTP..."
-msgstr "Robím POP pred SMTP…"
+msgstr "Robím POP pred SMTP..."
 
-#: src/send_message.c:358
+#: src/send_message.c:361
 msgid "POP before SMTP"
 msgstr "POP pred SMTP"
 
-#: src/send_message.c:363
+#: src/send_message.c:366
 #, c-format
 msgid "Account '%s': Connecting to SMTP server: %s:%d..."
-msgstr "Účet „%s”: Pripájanie k serveru SMTP: %s:%d…"
+msgstr "Účet „%s”: Pripájanie k serveru SMTP: %s:%d..."
 
-#: src/send_message.c:420
+#: src/send_message.c:439
 msgid "Mail sent successfully."
 msgstr "Správa bola odoslaná úspešne."
 
-#: src/send_message.c:486
+#: src/send_message.c:505
 msgid "Sending HELO..."
-msgstr "Posielam HELO…"
+msgstr "Posielam HELO..."
 
-#: src/send_message.c:487 src/send_message.c:492 src/send_message.c:497
+#: src/send_message.c:506 src/send_message.c:511 src/send_message.c:516
 msgid "Authenticating"
 msgstr "Autentifikácia"
 
-#: src/send_message.c:488 src/send_message.c:493
+#: src/send_message.c:507 src/send_message.c:512
 msgid "Sending message..."
-msgstr "Odosielam správu…"
+msgstr "Odosielam správu..."
 
-#: src/send_message.c:491
+#: src/send_message.c:510
 msgid "Sending EHLO..."
-msgstr "Odosielam EHLO…"
+msgstr "Odosielam EHLO..."
 
-#: src/send_message.c:500
+#: src/send_message.c:519
 msgid "Sending MAIL FROM..."
-msgstr "Odosielam MAIL FROM…"
+msgstr "Odosielam MAIL FROM..."
 
-#: src/send_message.c:504
+#: src/send_message.c:523
 msgid "Sending RCPT TO..."
-msgstr "Odosielam RCPT TO…"
+msgstr "Odosielam RCPT TO..."
 
-#: src/send_message.c:509
+#: src/send_message.c:528
 msgid "Sending DATA..."
-msgstr "Odosielam DATA…"
+msgstr "Odosielam DATA..."
 
-#: src/send_message.c:513
+#: src/send_message.c:532
 msgid "Quitting..."
-msgstr "Odpájam sa…"
+msgstr "Odpájam sa..."
 
-#: src/send_message.c:542
+#: src/send_message.c:561
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Odosielam správu (%d / %d bajtov)"
 
-#: src/send_message.c:595
+#: src/send_message.c:614
 msgid "Sending message"
 msgstr "Odosielam správu"
 
-#: src/send_message.c:664 src/send_message.c:684
+#: src/send_message.c:683 src/send_message.c:703
 msgid "Error occurred while sending the message."
 msgstr "Pri odosielaní správy nastala chyba."
 
-#: src/send_message.c:667
+#: src/send_message.c:686
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -18239,271 +18555,287 @@ msgstr ""
 "ak nejakú máte.\n"
 "Ak si nie ste istý, jednoducho zvoľte OK."
 
-#: src/sourcewindow.c:64
+#: src/sourcewindow.c:65
 msgid "Source of the message"
 msgstr "Zdroj správy"
 
-#: src/sourcewindow.c:159
+#: src/sourcewindow.c:161
 #, c-format
 msgid "%s - Source"
 msgstr "%s – Zdroj"
 
-#: src/ssl_manager.c:156
+#: src/ssl_manager.c:131
+msgid "Expiry"
+msgstr "Vyprší"
+
+#: src/ssl_manager.c:195
 msgid "Saved SSL/TLS certificates"
 msgstr "Uložené certifikáty SSL/TLS"
 
-#: src/ssl_manager.c:410
+#: src/ssl_manager.c:445
 msgid "Delete certificate"
 msgstr "Vymazať certifikát"
 
-#: src/ssl_manager.c:411
+#: src/ssl_manager.c:446
 msgid "Do you really want to delete this certificate?"
 msgstr "Naozaj chcete vymazať tento certifikát?"
 
-#: src/summary_search.c:305
+#: src/summary_search.c:290
 msgid "Search messages"
 msgstr "Vyhľadať v správach"
 
-#: src/summary_search.c:327
+#: src/summary_search.c:313
 msgid "Match any of the following"
 msgstr "Spĺňa aspoň jednu z nasledujúcich podmienok"
 
-#: src/summary_search.c:329
+#: src/summary_search.c:315
 msgid "Match all of the following"
 msgstr "Spĺňa všetky z nasledujúcich podmienok"
 
-#: src/summary_search.c:495
+#: src/summary_search.c:436
 msgid "Body:"
 msgstr "Telo:"
 
-#: src/summary_search.c:502
+#: src/summary_search.c:443
 msgid "Condition:"
 msgstr "Podmienka:"
 
-#: src/summary_search.c:536
+#: src/summary_search.c:477
 msgid "Find _all"
 msgstr "Nájsť _všetky"
 
-#: src/summary_search.c:751 src/summaryview.c:1090 src/summaryview.c:1352
+#: src/summary_search.c:692 src/summaryview.c:1148 src/summaryview.c:1411
 #, c-format
 msgid "Searching in %s... \n"
-msgstr "Hľadám v %s… \n"
+msgstr "Hľadám v %s... \n"
 
-#: src/summary_search.c:846
+#: src/summary_search.c:787
 msgid "Beginning of list reached; continue from end?"
 msgstr "Bol dosiahnutý začiatok zoznamu; pokračovať od konca?"
 
-#: src/summary_search.c:848
+#: src/summary_search.c:789
 msgid "End of list reached; continue from beginning?"
 msgstr "Bol dosiahnutý koniec zoznamu; pokračovať od začiatku?"
 
-#: src/summaryview.c:432
+#: src/summaryview.c:430
+msgid "Re-edit"
+msgstr "Znova upraviť"
+
+#: src/summaryview.c:443
 msgid "Create _filter rule"
 msgstr "Vytvor_iť pravidlo filtra"
 
-#: src/summaryview.c:560
+#: src/summaryview.c:456
+msgid "_Set displayed columns"
+msgstr "Nastav_iť zobrazované stĺpce"
+
+#: src/summaryview.c:461
+msgid "_Lock column headers"
+msgstr "_Zamknúť hlavičky stĺpcov"
+
+#: src/summaryview.c:598
 msgid "Toggle quick search bar"
 msgstr "Zap/vyp. panel rýchleho vyhľadávania"
 
-#: src/summaryview.c:597
+#: src/summaryview.c:635
 msgid "Toggle multiple selection"
 msgstr "Prepnúť skupinovú voľbu"
 
-#: src/summaryview.c:1280
+#: src/summaryview.c:1339
 msgid "Process mark"
 msgstr "Spracovať značku"
 
-#: src/summaryview.c:1281
+#: src/summaryview.c:1340
 msgid "Some marks are left. Process them?"
 msgstr "Niektoré značky ostali. Spracovať ich?"
 
-#: src/summaryview.c:1331
+#: src/summaryview.c:1390
 #, c-format
 msgid "Scanning folder (%s)..."
-msgstr "Prehľadávam zložku (%s)…"
+msgstr "Prehľadávam zložku (%s)..."
 
-#: src/summaryview.c:1883 src/summaryview.c:1931
+#: src/summaryview.c:1950 src/summaryview.c:1998
 msgid "No more unread messages"
 msgstr "Žiadne neprečítané správy"
 
-#: src/summaryview.c:1884
+#: src/summaryview.c:1951
 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:1896 src/summaryview.c:1944 src/summaryview.c:1981
-#: src/summaryview.c:2029 src/summaryview.c:2096
+#: src/summaryview.c:1963 src/summaryview.c:2011 src/summaryview.c:2048
+#: src/summaryview.c:2096 src/summaryview.c:2163
 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:1908
+#: src/summaryview.c:1975
 msgid "No unread messages."
 msgstr "Žiadne neprečítané správy."
 
-#: src/summaryview.c:1932
+#: src/summaryview.c:1999
 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:1968 src/summaryview.c:2016
+#: src/summaryview.c:2035 src/summaryview.c:2083
 msgid "No more new messages"
 msgstr "Žiadne nové správy"
 
-#: src/summaryview.c:1969
+#: src/summaryview.c:2036
 msgid "No new message found. Search from the end?"
 msgstr "Neboli nájdené žiadne nové správy. Hľadať od konca?"
 
-#: src/summaryview.c:1993
+#: src/summaryview.c:2060
 msgid "No new messages."
 msgstr "Žiadne nové správy."
 
-#: src/summaryview.c:2017
+#: src/summaryview.c:2084
 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:2050 src/summaryview.c:2083
+#: src/summaryview.c:2117 src/summaryview.c:2150
 msgid "No more marked messages"
 msgstr "Žiadne označené správy"
 
-#: src/summaryview.c:2051
+#: src/summaryview.c:2118
 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:2060
+#: src/summaryview.c:2127
 msgid "No marked messages."
 msgstr "Žiadne označené správy."
 
-#: src/summaryview.c:2084
+#: src/summaryview.c:2151
 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:2117 src/summaryview.c:2146
+#: src/summaryview.c:2184 src/summaryview.c:2213
 msgid "No more labeled messages"
 msgstr "Žiadne zafarbené správy"
 
-#: src/summaryview.c:2118
+#: src/summaryview.c:2185
 msgid "No labeled message found. Search from the end?"
 msgstr "Neboli nájdené žiadne zafarbené správy. Hľadať od konca?"
 
-#: src/summaryview.c:2127 src/summaryview.c:2160
+#: src/summaryview.c:2194 src/summaryview.c:2227
 msgid "No labeled messages."
 msgstr "Žiadne zafarbené správy."
 
-#: src/summaryview.c:2147
+#: src/summaryview.c:2214
 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:2464
+#: src/summaryview.c:2537
 msgid "Attracting messages by subject..."
-msgstr "Zoskupujem správy podľa predmetu…"
+msgstr "Zoskupujem správy podľa predmetu..."
 
-#: src/summaryview.c:2649
+#: src/summaryview.c:2722
 #, c-format
 msgid "%d deleted"
 msgstr "%d zmazaných"
 
-#: src/summaryview.c:2653
+#: src/summaryview.c:2726
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d presunutých"
 
-#: src/summaryview.c:2654 src/summaryview.c:2661
+#: src/summaryview.c:2727 src/summaryview.c:2734
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2659
+#: src/summaryview.c:2732
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d skopírovaných"
 
-#: src/summaryview.c:2673
+#: src/summaryview.c:2746
 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:2691 src/summaryview.c:2734
+#: src/summaryview.c:2764 src/summaryview.c:2809
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nových, %d neprečítaných, %d celkovo (%s)"
 
-#: src/summaryview.c:2709
+#: src/summaryview.c:2784
 msgid "Message summary"
 msgstr "Zhrnutie správy"
 
-#: src/summaryview.c:2710
+#: src/summaryview.c:2785
 msgid "New:"
 msgstr "Nové:"
 
-#: src/summaryview.c:2711
+#: src/summaryview.c:2786
 msgid "Unread:"
 msgstr "Neprečítané:"
 
-#: src/summaryview.c:2712
+#: src/summaryview.c:2787
 msgid "Total:"
 msgstr "Celkom:"
 
-#: src/summaryview.c:2714
+#: src/summaryview.c:2789
 msgid "Marked:"
 msgstr "Označené:"
 
-#: src/summaryview.c:2715
+#: src/summaryview.c:2790
 msgid "Replied:"
 msgstr "Odpovedané:"
 
-#: src/summaryview.c:2716
+#: src/summaryview.c:2791
 msgid "Forwarded:"
 msgstr "Poslané ďalej:"
 
-#: src/summaryview.c:2717
+#: src/summaryview.c:2792
 msgid "Locked:"
 msgstr "Zamknuté:"
 
-#: src/summaryview.c:2718
+#: src/summaryview.c:2793
 msgid "Ignored:"
 msgstr "Ignorované:"
 
-#: src/summaryview.c:2719
+#: src/summaryview.c:2794
 msgid "Watched:"
 msgstr "Sledované:"
 
-#: src/summaryview.c:2729
+#: src/summaryview.c:2804
 #, c-format
 msgid "%d/%d selected (%s/%s), %d unread"
 msgstr "%d/%d zvolených (%s/%s), %d neprečítaných"
 
-#: src/summaryview.c:3022
+#: src/summaryview.c:3097
 msgid "Sorting summary..."
-msgstr "Triedim zoznam správ…"
+msgstr "Triedim zoznam správ..."
 
-#: src/summaryview.c:3190
+#: src/summaryview.c:3265
 msgid "Setting summary from message data..."
-msgstr "Vytváram zoznam správ…"
+msgstr "Vytváram zoznam správ..."
 
-#: src/summaryview.c:3395
+#: src/summaryview.c:3471
 msgid "(No Date)"
 msgstr "(Bez dátumu)"
 
-#: src/summaryview.c:3447
+#: src/summaryview.c:3528
 msgid "(No Recipient)"
 msgstr "(Žiadny príjemca)"
 
-#: src/summaryview.c:3482
+#: src/summaryview.c:3576
 #, c-format
 msgid "From: %s, on %s"
 msgstr "Od: %s, na %s"
 
-#: src/summaryview.c:3491
+#: src/summaryview.c:3585
 #, c-format
 msgid "To: %s, on %s"
 msgstr "Komu: %s, na %s"
 
-#: src/summaryview.c:4356
-msgid "You're not the author of the article.\n"
-msgstr "Nie ste autorom tohoto príspevku.\n"
+#: src/summaryview.c:4481
+msgid "You're not the author of the article."
+msgstr "Nie ste autorom tohoto príspevku."
 
-#: src/summaryview.c:4446
+#: src/summaryview.c:4571
 #, c-format
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the %d selected messages?"
@@ -18511,78 +18843,83 @@ 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:4449
+#: src/summaryview.c:4574
 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:4613
+#: src/summaryview.c:4738
 msgid "Destination is same as current folder."
 msgstr "Cieľ je rovnaký ako aktuálna zložka."
 
-#: src/summaryview.c:4668
+#: src/summaryview.c:4793
 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/summaryview.c:4719
+#: src/summaryview.c:4844
 msgid "Destination to copy is same as current folder."
 msgstr "Cieľ kopírovania je rovnaký ako aktuálna zložka."
 
-#: src/summaryview.c:4753
+#: src/summaryview.c:4878
 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/summaryview.c:4889
+#: src/summaryview.c:5036
 msgid "Append or Overwrite"
 msgstr "Pripojiť alebo prepísať"
 
-#: src/summaryview.c:4890
+#: src/summaryview.c:5037
 msgid "Append or overwrite existing file?"
 msgstr "Pripojiť alebo prepísať existujúci súbor?"
 
-#: src/summaryview.c:4891
+#: src/summaryview.c:5038
 msgid "_Append"
 msgstr "Pri_pojiť"
 
-#: src/summaryview.c:4891
+#: src/summaryview.c:5038
 msgid "_Overwrite"
 msgstr "_Prepísať"
 
-#: src/summaryview.c:4932
+#: src/summaryview.c:5049 src/summaryview.c:5052 src/summaryview.c:5067
+#, c-format
+msgid "Couldn't save the file '%s'."
+msgstr "Nemožno uložiť súbor „%s”."
+
+#: src/summaryview.c:5086
 #, 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:5390
+#: src/summaryview.c:5544
 msgid "Building threads..."
-msgstr "Vytváram vlákna…"
+msgstr "Vytváram vlákna..."
 
-#: src/summaryview.c:5638
+#: src/summaryview.c:5792
 msgid "Skip these rules"
 msgstr "Preskočiť tieto pravidlá"
 
-#: src/summaryview.c:5641
+#: src/summaryview.c:5795
 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:5644
+#: src/summaryview.c:5798
 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:5673
+#: src/summaryview.c:5827
 msgid "Filtering"
 msgstr "Filtrovanie"
 
-#: src/summaryview.c:5674
+#: src/summaryview.c:5828
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
@@ -18590,55 +18927,71 @@ msgstr ""
 "Niektoré pravidlá patria konkrétnemu účtu.\n"
 "Prosím vyberte si, ako pristupovať k týmto pravidlám:"
 
-#: src/summaryview.c:5704
+#: src/summaryview.c:5860
 msgid "Filtering..."
-msgstr "Filtrujem…"
+msgstr "Filtrujem..."
 
-#: src/summaryview.c:5783
+#: src/summaryview.c:5943
 msgid "Processing configuration"
 msgstr "Nastavenie spracovania"
 
-#: src/summaryview.c:6329
+#: src/summaryview.c:6091
+msgid "Do you really want to reset the color label of all selected messages?"
+msgstr "Naozaj chcete resetovať farebnú menovku všetkých zvolených správ?"
+
+#: src/summaryview.c:6093
+msgid "Do you really want to apply this color label to all selected messages?"
+msgstr "Naozaj chcete použiť túto farebnú menovku na všetky zvolené správy?"
+
+#: src/summaryview.c:6094
+msgid "Reset color label"
+msgstr "Obnoviť menovku farby"
+
+#: src/summaryview.c:6094
+msgid "Set color label"
+msgstr "Nastaviť farebnú menovku"
+
+#: src/summaryview.c:6537
 msgid "Ignored thread"
 msgstr "Ignorované vlákno"
 
-#: src/summaryview.c:6331
+#: src/summaryview.c:6539
 msgid "Watched thread"
 msgstr "Sledované vlákno"
 
-#: src/summaryview.c:6339
+#: src/summaryview.c:6547
 msgid "Replied but also forwarded - click to see reply"
 msgstr "Odpovedané, ale aj presmerované – kliknite na zobrazenie odpovede"
 
-#: src/summaryview.c:6341
+#: src/summaryview.c:6549
 msgid "Replied - click to see reply"
 msgstr "Odpovedané – kliknite na zobrazenie odpovede"
 
-#: src/summaryview.c:6353
+#: src/summaryview.c:6561
 msgid "To be moved"
 msgstr "Presunuté"
 
-#: src/summaryview.c:6355
+#: src/summaryview.c:6563
 msgid "To be copied"
 msgstr "Skopírované"
 
-#: src/summaryview.c:6367
+#: src/summaryview.c:6575
 msgid "Signed, has attachment(s)"
 msgstr "Podpísané, má prílohu(y)"
 
-#: src/summaryview.c:6371
+#: src/summaryview.c:6579
 msgid "Encrypted, has attachment(s)"
 msgstr "Zašifrované, má prílohu(y)"
 
-#: src/summaryview.c:6373
+#: src/summaryview.c:6581
 msgid "Encrypted"
 msgstr "Zašifrované"
 
-#: src/summaryview.c:6375
+#: src/summaryview.c:6583
 msgid "Has attachment(s)"
 msgstr "Má prílohu(y)"
 
-#: src/summaryview.c:8046
+#: src/summaryview.c:8295
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -18647,53 +19000,45 @@ msgstr ""
 "Chyba v regulárnom výraze:\n"
 "%s"
 
-#: src/summaryview.c:8149
+#: src/summaryview.c:8398
 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:8154
+#: src/summaryview.c:8403
 msgid "Go back to the folder list"
 msgstr "Prejsť naspäť na zoznam zložiek"
 
-#: src/textview.c:245
+#: src/textview.c:242
 msgid "_Open in web browser"
 msgstr "Otvoriť vo _webovom prehliadači"
 
-#: src/textview.c:246
+#: src/textview.c:243
 msgid "Copy this _link"
 msgstr "Kopírovať tento _odkaz"
 
-#: src/textview.c:253
+#: src/textview.c:250
 msgid "_Reply to this address"
 msgstr "_Odpovedať na túto adresu"
 
-#: src/textview.c:254
+#: src/textview.c:251
 msgid "Add to _Address book"
 msgstr "Pridať do _adresára"
 
-#: src/textview.c:255
+#: src/textview.c:252
 msgid "Copy this add_ress"
 msgstr "_Kopírovať túto adresu"
 
-#: src/textview.c:261
-msgid "_Open image"
-msgstr "_Otvoriť obrázok"
-
-#: src/textview.c:262
-msgid "_Save image..."
-msgstr "_Uložiť obrázok…"
-
-#: src/textview.c:724
+#: src/textview.c:702
 #, c-format
 msgid "[%s  %s (%d bytes)]"
 msgstr "[%s  %s (%d bajtov)]"
 
-#: src/textview.c:727
+#: src/textview.c:705
 #, c-format
 msgid "[%s (%d bytes)]"
 msgstr "[%s (%d bajtov)]"
 
-#: src/textview.c:917
+#: src/textview.c:875
 msgid ""
 "\n"
 "  This message can't be displayed.\n"
@@ -18707,68 +19052,67 @@ msgstr ""
 "\n"
 "Použite "
 
-#: src/textview.c:922
+#: src/textview.c:880
 msgid "'Network Log'"
 msgstr "„Záznam siete”"
 
-#: src/textview.c:923
+#: src/textview.c:881
 msgid " in the Tools menu for more information."
 msgstr " v menu Nástroje s ďalšími informáciami."
 
-#: src/textview.c:986
+#: src/textview.c:947
 msgid "  The following can be performed on this part\n"
 msgstr "  S touto časťou môžete urobiť\n"
 
-#: src/textview.c:988
+#: src/textview.c:949
 msgid "  by right-clicking the icon or list item:"
 msgstr "  pravým kliknutím na ikonu alebo položku zoznamu:"
 
-#: src/textview.c:992
+#: src/textview.c:953
 msgid "     - To save, select "
 msgstr "     – Ak ju chcete uložiť, zvoľte "
 
-#: src/textview.c:993
+#: src/textview.c:954
 msgid "'Save as...'"
-msgstr "„Uložiť ako…”"
+msgstr "„Uložiť ako...”"
 
-#: src/textview.c:995 src/textview.c:1007 src/textview.c:1019
-#: src/textview.c:1029
+#: src/textview.c:956 src/textview.c:968 src/textview.c:980 src/textview.c:990
 msgid " (Shortcut key: '"
 msgstr " (klávesová skratka: „"
 
-#: src/textview.c:1003
+#: src/textview.c:964
 msgid "     - To display as text, select "
 msgstr "     – Ak ju chcete zobraziť ako text, vyberte "
 
-#: src/textview.c:1004
+#: src/textview.c:965
 msgid "'Display as text'"
 msgstr "„Zobraziť ako text”"
 
-#: src/textview.c:1015
+#: src/textview.c:976
 msgid "     - To open with an external program, select "
 msgstr "     – Ak ju chcete otvoriť v inej aplikácii, vyberte "
 
-#: src/textview.c:1016
+#: src/textview.c:977
 msgid "'Open'"
 msgstr "„Otvoriť”"
 
-#: src/textview.c:1024
+#: src/textview.c:985
 msgid "       (alternately double-click, or click the middle "
 msgstr "       (alebo dvojklik, alebo kliknutie stredným "
 
-#: src/textview.c:1025
+#: src/textview.c:986
 msgid "mouse button)\n"
 msgstr "tlačidlom myši)\n"
 
-#: src/textview.c:1027
+#: src/textview.c:988
 msgid "     - Or use "
-msgstr "     – Alebo použite"
+msgstr "     – Alebo použite "
 
-#: src/textview.c:1028
+#: src/textview.c:989
 msgid "'Open with...'"
-msgstr "„Otvoriť pomocou…”"
+msgstr "„Otvoriť pomocou...”"
 
-#: src/textview.c:1147
+#: src/textview.c:1111
 #, c-format
 msgid ""
 "The command to view attachment as text failed:\n"
@@ -18779,7 +19123,7 @@ msgstr ""
 "    %s\n"
 "Návratový kód %d\n"
 
-#: src/textview.c:2206
+#: src/textview.c:2195
 msgid "Tags: "
 msgstr "Značky: "
 
@@ -18807,19 +19151,19 @@ msgstr "Varovanie pred phishingovým podvodom"
 msgid "_Open URL"
 msgstr "_Otvoriť URL"
 
-#: src/toolbar.c:224 src/toolbar.c:2291
+#: src/toolbar.c:224 src/toolbar.c:2294
 msgid "Receive Mail from all Accounts"
 msgstr "Prijať správy zo všetkých účtov"
 
-#: src/toolbar.c:225 src/toolbar.c:2296
+#: src/toolbar.c:225 src/toolbar.c:2299
 msgid "Receive Mail from current Account"
 msgstr "Prijať poštu z aktuálneho účtu"
 
-#: src/toolbar.c:226 src/toolbar.c:2300
+#: src/toolbar.c:226 src/toolbar.c:2303
 msgid "Send Queued Messages"
 msgstr "Odoslať správy vo fronte"
 
-#: src/toolbar.c:227 src/toolbar.c:959 src/toolbar.c:2318 src/toolbar.c:2329
+#: src/toolbar.c:227 src/toolbar.c:959 src/toolbar.c:2321 src/toolbar.c:2332
 msgid "Compose Email"
 msgstr "Nová správa"
 
@@ -18827,35 +19171,35 @@ msgstr "Nová správa"
 msgid "Compose News"
 msgstr "Nový príspevok News"
 
-#: src/toolbar.c:229 src/toolbar.c:2373 src/toolbar.c:2383
+#: src/toolbar.c:229 src/toolbar.c:2376 src/toolbar.c:2386
 msgid "Reply to Message"
 msgstr "Odpovedať na správu"
 
-#: src/toolbar.c:230 src/toolbar.c:2390 src/toolbar.c:2400
+#: src/toolbar.c:230 src/toolbar.c:2393 src/toolbar.c:2403
 msgid "Reply to Sender"
 msgstr "Odpovedať odosielateľovi"
 
-#: src/toolbar.c:231 src/toolbar.c:2407 src/toolbar.c:2417
+#: src/toolbar.c:231 src/toolbar.c:2410 src/toolbar.c:2420
 msgid "Reply to All"
 msgstr "Odpovedať odosielateľovi i všetkým príjemcom"
 
-#: src/toolbar.c:232 src/toolbar.c:2424 src/toolbar.c:2434
+#: src/toolbar.c:232 src/toolbar.c:2427 src/toolbar.c:2437
 msgid "Reply to Mailing-list"
 msgstr "Odpovedať do diskusnej skupiny"
 
-#: src/toolbar.c:233 src/toolbar.c:2312
+#: src/toolbar.c:233 src/toolbar.c:2315
 msgid "Open email"
 msgstr "Otvoriť správu"
 
-#: src/toolbar.c:234 src/toolbar.c:2441 src/toolbar.c:2452
+#: src/toolbar.c:234 src/toolbar.c:2444 src/toolbar.c:2455
 msgid "Forward Message"
 msgstr "Poslať správu ďalej"
 
-#: src/toolbar.c:235 src/toolbar.c:2457
+#: src/toolbar.c:235 src/toolbar.c:2460
 msgid "Trash Message"
 msgstr "Presunúť správu do koša"
 
-#: src/toolbar.c:236 src/toolbar.c:2461
+#: src/toolbar.c:236 src/toolbar.c:2464
 msgid "Delete Message"
 msgstr "Zmazať správu"
 
@@ -18863,11 +19207,11 @@ msgstr "Zmazať správu"
 msgid "Delete duplicate messages"
 msgstr "Zmazať duplikované správy"
 
-#: src/toolbar.c:239 src/toolbar.c:2469
+#: src/toolbar.c:239 src/toolbar.c:2472
 msgid "Go to Previous Unread Message"
 msgstr "Prejsť na predošlú neprečítanú správu"
 
-#: src/toolbar.c:240 src/toolbar.c:2473
+#: src/toolbar.c:240 src/toolbar.c:2476
 msgid "Go to Next Unread Message"
 msgstr "Prejsť na ďalšiu neprečítanú správu"
 
@@ -18915,55 +19259,55 @@ msgstr "Učiť sa ako SPAM alebo nie SPAM"
 msgid "Open folder/Go to folder list"
 msgstr "Otvoriť zložku/Prejsť na zoznam zložiek"
 
-#: src/toolbar.c:258 src/toolbar.c:2479
+#: src/toolbar.c:258 src/toolbar.c:2482
 msgid "Send Message"
 msgstr "Odoslať správu"
 
-#: src/toolbar.c:259 src/toolbar.c:2483
+#: src/toolbar.c:259 src/toolbar.c:2486
 msgid "Put into queue folder and send later"
 msgstr "Zaradiť správu do fronty a odoslať neskôr"
 
-#: src/toolbar.c:260 src/toolbar.c:2487
+#: src/toolbar.c:260 src/toolbar.c:2490
 msgid "Save to draft folder"
 msgstr "Uložiť medzi koncepty"
 
-#: src/toolbar.c:261 src/toolbar.c:2491
+#: src/toolbar.c:261 src/toolbar.c:2494
 msgid "Insert file"
 msgstr "Vložiť súbor"
 
-#: src/toolbar.c:262 src/toolbar.c:2495
+#: src/toolbar.c:262 src/toolbar.c:2498
 msgid "Attach file"
 msgstr "Pripojiť súbor"
 
-#: src/toolbar.c:263 src/toolbar.c:2499
+#: src/toolbar.c:263 src/toolbar.c:2502
 msgid "Insert signature"
 msgstr "Vložiť podpis"
 
-#: src/toolbar.c:264 src/toolbar.c:2503
+#: src/toolbar.c:264 src/toolbar.c:2506
 msgid "Replace signature"
 msgstr "Nahradiť podpis"
 
-#: src/toolbar.c:265 src/toolbar.c:2507
+#: src/toolbar.c:265 src/toolbar.c:2510
 msgid "Edit with external editor"
 msgstr "Upraviť pomocou externého editoru"
 
-#: src/toolbar.c:266 src/toolbar.c:2511
+#: src/toolbar.c:266 src/toolbar.c:2514
 msgid "Wrap long lines of current paragraph"
 msgstr "Zalomiť dlhé riadky aktuálneho odstavca"
 
-#: src/toolbar.c:267 src/toolbar.c:2515
+#: src/toolbar.c:267 src/toolbar.c:2518
 msgid "Wrap all long lines"
 msgstr "Zalomiť všetky dlhé riadky"
 
-#: src/toolbar.c:270 src/toolbar.c:531 src/toolbar.c:2524
+#: src/toolbar.c:270 src/toolbar.c:531 src/toolbar.c:2527
 msgid "Check spelling"
 msgstr "Skontrolovať preklepy"
 
-#: src/toolbar.c:272 src/toolbar.c:533 src/toolbar.c:2529
+#: src/toolbar.c:272 src/toolbar.c:533 src/toolbar.c:2532
 msgid "Sign"
 msgstr "Podpísať"
 
-#: src/toolbar.c:273 src/toolbar.c:534 src/toolbar.c:2537
+#: src/toolbar.c:273 src/toolbar.c:534 src/toolbar.c:2540
 msgid "Encrypt"
 msgstr "Šifrovať"
 
@@ -18971,15 +19315,15 @@ msgstr "Šifrovať"
 msgid "Claws Mail Actions Feature"
 msgstr "Akcie Claws Mail"
 
-#: src/toolbar.c:275 src/toolbar.c:2556
+#: src/toolbar.c:275 src/toolbar.c:2559
 msgid "Cancel receiving"
 msgstr "Prerušiť príjem"
 
-#: src/toolbar.c:277 src/toolbar.c:2564
+#: src/toolbar.c:277 src/toolbar.c:2567
 msgid "Cancel receiving/sending"
 msgstr "Zrušiť prijímanie/odosielanie"
 
-#: src/toolbar.c:278 src/toolbar.c:2304
+#: src/toolbar.c:278 src/toolbar.c:2307
 msgid "Close window"
 msgstr "Zatvoriť okno"
 
@@ -19018,7 +19362,7 @@ msgstr "Všetkým"
 msgid "List"
 msgstr "Do diskusie"
 
-#: src/toolbar.c:498 src/toolbar.c:2357 src/toolbar.c:2366
+#: src/toolbar.c:498 src/toolbar.c:2360 src/toolbar.c:2369
 msgid "Delete duplicates"
 msgstr "Zmazať duplikáty"
 
@@ -19052,11 +19396,11 @@ msgstr "Koncept"
 
 #: src/toolbar.c:524
 msgid "Insert sig."
-msgstr "Vložiť podpis"
+msgstr "Vložiť pod."
 
 #: src/toolbar.c:525
 msgid "Replace sig."
-msgstr "Nahradiť podpis"
+msgstr "Nahradiť podp."
 
 #: src/toolbar.c:526
 msgid "Edit"
@@ -19064,7 +19408,7 @@ msgstr "Upraviť"
 
 #: src/toolbar.c:527
 msgid "Wrap para."
-msgstr "Zalomiť odstavec"
+msgstr "Zalomiť odst."
 
 #: src/toolbar.c:528
 msgid "Wrap all"
@@ -19110,101 +19454,101 @@ msgstr "Správa bude šifrovaná"
 msgid "Message will not be encrypted"
 msgstr "Správa nebude šifrovaná"
 
-#: src/toolbar.c:2286
+#: src/toolbar.c:2289
 msgid "Go to folder list"
 msgstr "Prejsť na zoznam zložiek"
 
-#: src/toolbar.c:2292
+#: src/toolbar.c:2295
 msgid "Receive Mail from selected Account"
 msgstr "Prijať poštu zo zvoleného účtu"
 
-#: src/toolbar.c:2308
+#: src/toolbar.c:2311
 msgid "Open preferences"
 msgstr "Otvoriť nastavenia"
 
-#: src/toolbar.c:2319
+#: src/toolbar.c:2322
 msgid "Compose with selected Account"
 msgstr "Napísať správu zo zvoleného účtu"
 
-#: src/toolbar.c:2340
+#: src/toolbar.c:2343
 msgid "Learn as..."
-msgstr "Naučiť ako…"
+msgstr "Naučiť ako..."
 
-#: src/toolbar.c:2350
+#: src/toolbar.c:2353
 msgid "Learn as _Spam"
 msgstr "Naučiť ako _spam"
 
-#: src/toolbar.c:2351
+#: src/toolbar.c:2354
 msgid "Learn as _Ham"
 msgstr "Naučiť ako _nie spam"
 
-#: src/toolbar.c:2358
+#: src/toolbar.c:2361
 msgid "Delete duplicates options"
 msgstr "Voľby mazania duplikátov"
 
-#: src/toolbar.c:2362
+#: src/toolbar.c:2365
 msgid "Delete duplicates in selected folder"
 msgstr "Zmazať duplikáty v zvolenej zložke"
 
-#: src/toolbar.c:2363
+#: src/toolbar.c:2366
 msgid "Delete duplicates in all folders"
 msgstr "Zmazať duplikáty vo všetkých zložkách"
 
-#: src/toolbar.c:2374
+#: src/toolbar.c:2377
 msgid "Reply to Message options"
 msgstr "Voľby Odpovede na správu"
 
-#: src/toolbar.c:2378 src/toolbar.c:2395 src/toolbar.c:2412 src/toolbar.c:2429
+#: src/toolbar.c:2381 src/toolbar.c:2398 src/toolbar.c:2415 src/toolbar.c:2432
 msgid "_Reply with quote"
 msgstr "Odpovedať s _citáciou"
 
-#: src/toolbar.c:2379 src/toolbar.c:2396 src/toolbar.c:2413 src/toolbar.c:2430
+#: src/toolbar.c:2382 src/toolbar.c:2399 src/toolbar.c:2416 src/toolbar.c:2433
 msgid "Reply without _quote"
 msgstr "_Odpovedať bez citácie"
 
-#: src/toolbar.c:2391
+#: src/toolbar.c:2394
 msgid "Reply to Sender options"
 msgstr "Voľby Odpoveď odosielateľovi"
 
-#: src/toolbar.c:2408
+#: src/toolbar.c:2411
 msgid "Reply to All options"
 msgstr "Voľby Odpovedať všetkým"
 
-#: src/toolbar.c:2425
+#: src/toolbar.c:2428
 msgid "Reply to Mailing-list options"
 msgstr "Voľby Odpovede do emailovej konferencie"
 
-#: src/toolbar.c:2442
+#: src/toolbar.c:2445
 msgid "Forward Message options"
 msgstr "Voľby Poslania správy ďalej"
 
-#: src/uri_opener.c:88
+#: src/uri_opener.c:87
 msgid "There are no URLs in this email."
 msgstr "V tejto správe nie sú žiadne linky."
 
-#: src/uri_opener.c:116
+#: src/uri_opener.c:115
 msgid "Available URLs:"
 msgstr "Dostupné linky:"
 
-#: src/uri_opener.c:181
+#: src/uri_opener.c:189
 msgctxt "Dialog title"
 msgid "Open URLs"
 msgstr "Otvoriť URL"
 
-#: src/uri_opener.c:206
+#: src/uri_opener.c:217
 msgid "Please select the URL to open."
 msgstr "Prosím zvoľte linku."
 
-#: src/uri_opener.c:214
+#: src/uri_opener.c:225
 msgid "Select All"
 msgstr "Vybrať všetko"
 
-#: src/wizard.c:521
+#: src/wizard.c:523
 msgctxt "Welcome Mail Subject"
 msgid "Welcome to Claws Mail"
 msgstr "Víta vás Claws Mail"
 
-#: src/wizard.c:544
+#: src/wizard.c:546
 #, c-format
 msgid ""
 "\n"
@@ -19295,128 +19639,124 @@ msgstr ""
 "učiniť na adrese <%s>.\n"
 "\n"
 
-#: src/wizard.c:619
+#: src/wizard.c:621
 msgid "Please enter the mailbox name."
 msgstr "Prosím, zadajte názov schránky."
 
-#: src/wizard.c:647
+#: src/wizard.c:649
 msgid "Please enter your name and email address."
 msgstr "Prosím, zadajte svoje meno a emailovú adresu."
 
-#: src/wizard.c:658
+#: src/wizard.c:660
 msgid "Please enter your receiving server and username."
 msgstr "Prosím, zadajte váš server príchodzej pošty, a používateľské meno."
 
-#: src/wizard.c:668
+#: src/wizard.c:670
 msgid "Please enter your username."
 msgstr "Prosím, zadajte svoje používateľské meno."
 
-#: src/wizard.c:678
+#: src/wizard.c:680
 msgid "Please enter your SMTP server."
 msgstr "Prosím, zadajte svoj SMTP server."
 
-#: src/wizard.c:689
+#: src/wizard.c:691
 msgid "Please enter your SMTP username."
 msgstr "Prosím, zadajte svoje používateľské meno SMTP."
 
-#: src/wizard.c:974
+#: src/wizard.c:976
 msgid "Your name:"
 msgstr "Vaše meno:"
 
-#: src/wizard.c:985
+#: src/wizard.c:987
 msgid "Your email address:"
 msgstr "Vaša emailová adresa:"
 
-#: src/wizard.c:996
+#: src/wizard.c:998
 msgid "Your organization:"
 msgstr "Vaša organizácia:"
 
-#: src/wizard.c:1030
+#: src/wizard.c:1032
 msgid "Mailbox name:"
 msgstr "Meno poštovej schránky:"
 
-#: src/wizard.c:1038
+#: src/wizard.c:1040
 msgid ""
 "You can also specify an absolute path, for example: \"/home/john/Documents/"
 "Mail\""
 msgstr ""
 "Môžete zadať aj absolútnu cestu k zložke, napr.: „/home/jozef/Dokumenty/Mail”"
 
-#: src/wizard.c:1109
+#: src/wizard.c:1111
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:25\""
 msgstr ""
 "Číslo portu môžete zadať tak, že ho pridáte na koniec: „mail.firma.sk:25”"
 
-#: src/wizard.c:1112
+#: src/wizard.c:1114
 msgid "SMTP server address:"
 msgstr "Adresa servera SMTP:"
 
-#: src/wizard.c:1118
-msgid "Use authentication"
-msgstr "Použiť autentifikáciu"
-
-#: src/wizard.c:1127
+#: src/wizard.c:1129
 msgid "(empty to use the same as receive)"
 msgstr "(nechajte prázdne, ak je rovnaké ako na príjem)"
 
-#: src/wizard.c:1141
+#: src/wizard.c:1143
 msgid "SMTP username:"
 msgstr "Meno SMTP:"
 
-#: src/wizard.c:1152
+#: src/wizard.c:1154
 msgid "SMTP password:"
 msgstr "Heslo SMTP:"
 
-#: src/wizard.c:1165
+#: src/wizard.c:1167
 msgid "Use SSL/TLS to connect to SMTP server"
 msgstr "Použiť SSL/TLS na pripojenie k serveru SMTP"
 
-#: src/wizard.c:1176 src/wizard.c:1596
+#: src/wizard.c:1178 src/wizard.c:1598
 msgid "Use STARTTLS command to start encryption"
 msgstr "Použiť príkaz STARTTLS na začatie šifrovania"
 
-#: src/wizard.c:1188 src/wizard.c:1608
+#: src/wizard.c:1190 src/wizard.c:1610
 msgid "Client SSL/TLS certificate (optional)"
 msgstr "Certifikát SSL/TLS klienta (voliteľné)"
 
-#: src/wizard.c:1256 src/wizard.c:1288 src/wizard.c:1543
+#: src/wizard.c:1258 src/wizard.c:1290 src/wizard.c:1545
 msgid "Server address:"
 msgstr "Adresa servera:"
 
-#: src/wizard.c:1320
+#: src/wizard.c:1322
 msgid "Local mailbox:"
 msgstr "Lokálna poštová schránka:"
 
-#: src/wizard.c:1489
+#: src/wizard.c:1491
 msgid "Server type:"
 msgstr "Typ servera:"
 
-#: src/wizard.c:1498
+#: src/wizard.c:1500
 msgid "POP3"
 msgstr "POP3"
 
-#: src/wizard.c:1554
+#: src/wizard.c:1556
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:110\""
 msgstr ""
 "Číslo portu môžete zadať tak, že ho pridáte na koniec: „mail.priklad.sk:110”"
 
-#: src/wizard.c:1585
+#: src/wizard.c:1587
 msgid "Use SSL/TLS to connect to receiving server"
 msgstr "Použiť SSL/TLS na pripojenie k serveru prijímania"
 
-#: src/wizard.c:1650
+#: src/wizard.c:1652
 msgid "IMAP server directory:"
 msgstr "Zložka servera IMAP:"
 
-#: src/wizard.c:1661
+#: src/wizard.c:1663
 msgid "Show only subscribed folders"
 msgstr "Zobraziť len odoberané zložky"
 
-#: src/wizard.c:1669
+#: src/wizard.c:1671
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP support."
@@ -19424,15 +19764,15 @@ msgstr ""
 "Varovanie: táto verzia Claws Mail\n"
 "bola zostavená bez podpory protokolu IMAP."
 
-#: src/wizard.c:1787
+#: src/wizard.c:1789
 msgid "Claws Mail Setup Wizard"
 msgstr "Sprievodca nastavením Claws Mail"
 
-#: src/wizard.c:1821
+#: src/wizard.c:1822
 msgid "Welcome to Claws Mail"
 msgstr "Claws Mail vás víta"
 
-#: src/wizard.c:1828
+#: src/wizard.c:1829
 msgid ""
 "Welcome to the Claws Mail setup wizard.\n"
 "\n"
@@ -19445,46 +19785,34 @@ msgstr ""
 "Začneme získaním základných údajov o vás, a vašich poštových nastaveniach, "
 "aby ste mohli začať Claws Mail používať za menej ako päť minút."
 
-#: src/wizard.c:1841
+#: src/wizard.c:1842
 msgid "About You"
 msgstr "O vás"
 
-#: src/wizard.c:1849 src/wizard.c:1864 src/wizard.c:1879 src/wizard.c:1895
+#: src/wizard.c:1850 src/wizard.c:1865 src/wizard.c:1880 src/wizard.c:1896
 msgid "Bold fields must be completed"
 msgstr "Polia, označené tučným písmom, musia byť vyplnené"
 
-#: src/wizard.c:1856
+#: src/wizard.c:1857
 msgid "Receiving mail"
 msgstr "Príjímanie pošty"
 
-#: src/wizard.c:1871
+#: src/wizard.c:1872
 msgid "Sending mail"
 msgstr "Odosielanie pošty"
 
-#: src/wizard.c:1887
+#: src/wizard.c:1888
 msgid "Saving mail on disk"
 msgstr "Ukladanie správy na disk"
 
-#: src/wizard.c:1903
+#: src/wizard.c:1904
 msgid "Configuration finished"
 msgstr "Konfigurácia dokončená"
 
-#: src/wizard.c:1910
+#: src/wizard.c:1911
 msgid ""
 "Claws Mail is now ready.\n"
 "Click Save to start."
 msgstr ""
 "Program Claws Mail je pripravený.\n"
 "Kliknite na Uložiť a začnite."
-
-#~ msgid ""
-#~ "Copyright (C) 1999-2017\n"
-#~ "The Claws Mail Team\n"
-#~ " and Hiroyuki Yamamoto"
-#~ msgstr ""
-#~ "Copyright (C) 1999 – 2017\n"
-#~ "Tím Claws Mail\n"
-#~ " a Hiroyuki Yamamoto"
-
-#~ msgid "Change to..."
-#~ msgstr "Zmeniť na…"